From 94ed9c21bf8364b71e881476d572a4df192607f3 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 17 十月 2023 10:33:00 +0800
Subject: [PATCH] #
---
pages/api/index.js | 25 ++++++++++++++++++++++++-
pages/index/index.vue | 24 ++++++++++++++++++++----
2 files changed, 44 insertions(+), 5 deletions(-)
diff --git a/pages/api/index.js b/pages/api/index.js
index 8af7a6f..48472c5 100644
--- a/pages/api/index.js
+++ b/pages/api/index.js
@@ -85,6 +85,28 @@
header: {'token':uni.getStorageSync('token')},
method: 'POST',
}).then((res)=> {
+ res = res[1].data
+ if (res.code === 200) {
+ item = {
+ code: res.code,
+ data: res.data
+ }
+ } else if(res.code === 403){
+ item = {code: 403,msg: '璇烽噸鏂扮櫥褰�'}
+ }
+ },(result)=>{
+ // console.log(res);
+ })
+ return item
+}
+
+async function getMonthData() {
+ let item = [];
+ let ress = await uni.request({
+ url: `${common.baseUrl}/dashboard/currentMonthData/auth`,
+ header: {'token':uni.getStorageSync('token')},
+ method: 'POST',
+ }).then((res)=> {
console.log(res);
res = res[1].data
if (res.code === 200) {
@@ -105,5 +127,6 @@
getCompanyData,
getPersonData,
getStaffRank,
- getCompanyPostList
+ getCompanyPostList,
+ getMonthData
}
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index de00ab1..80b782e 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -83,7 +83,7 @@
{username: '鏉庝笘璞�1绾�',money:'112涓囧厓'}
],
bgs: ['bg-blue','bg-red'],
- red: '#aaffff',
+ red: '#4286db',
notices: [
{notice: '杩欐潯娴嬭瘯鍏憡琚慨鏀逛簡asdas杩欐潯娴嬭瘯鍏憡琚慨鏀逛簡杩欐潯娴嬭瘯鍏憡琚慨鏀逛簡',crtate_time: '2023-09-09 13:49:46',update_time: '2023-10-09 13:49:46'},
{notice: '杩欐槸涓�鏉℃祴璇曞叕鍛�',crtate_time: '2023-09-09 13:49:46',update_time: '2023-10-09 13:49:46'},
@@ -97,7 +97,14 @@
{notice: '杩欐槸涓�鏉℃祴璇曞叕鍛�',crtate_time: '2023-09-09 13:49:46',update_time: '2023-10-09 13:49:46'},
{notice: '杩欐槸涓�鏉℃祴璇曞叕鍛�',crtate_time: '2023-09-09 13:49:46',update_time: '2023-10-09 13:49:46'},
{notice: '娴欐睙涓壃绔嬪簱鎶�鏈湁闄愬叕鍙告槸涓壃闆嗗洟鏃椾笅涓撲笟鐨勬櫤鑳戒粨鍌ㄧ墿娴佽澶囨簮澶存湇鍔″晢锛岃嚧鍔涗簬璁╁埗閫犱笌鐗╂祦鏇撮珮鏁堛�傞泦鍥㈠勾閿�鍞瓒�5浜夸汉姘戝竵锛屾槸涓浗绔嬩綋浠撳簱澶у瀷鍘傚涔嬩竴锛岄泦绉戠爺銆佺敓浜с�侀攢鍞�佸敭鍚庝负涓�浣撶殑鍥藉楂樻柊鎶�鏈紒涓氾紝娴欐睙鐪佲�滀笓绮剧壒鏂扳�濅紒涓氾紝娴欐睙鐪佲�滃皷鍏点�侀闆佲�濅紒涓氾紝娴欐睙鐪侀噸鐐瑰煿鑲蹭紒涓氾紝缁煎悎瀹炲姏浣嶅眳琛屼笟鍓嶅垪',crtate_time: '2023-09-09 13:49:46',update_time: '2023-10-09 13:49:46'}
- ]
+ ],
+ Column: {
+ categories: ["1鏈�", "2鏈�", "3鏈�", "4鏈�", "5鏈�", "6鏈�","7鏈�", "8鏈�", "9鏈�", "10鏈�", "11鏈�", "12鏈�"],
+ series: [{
+ name: "閿�鍞",
+ data: [35, 36, 31, 33, 13, 34,18, 27, 21, 24, 6, 28]
+ }]
+ }
}
@@ -112,6 +119,7 @@
this.getPersonData()
this.getStaffRank()
this.getCompanyPostList()
+ this.getMonthData()
},
mounted() {
@@ -121,7 +129,7 @@
setTimeout(() => {
//鍥犻儴鍒嗘暟鎹牸寮忎竴鏍凤紝杩欓噷涓嶅悓鍥捐〃寮曠敤鍚屼竴鏁版嵁婧愮殑璇濓紝闇�瑕佹繁鎷疯礉涓�涓嬫瀯閫犱笉鍚岀殑瀵硅薄
//寮�鍙戣�呴渶瑕佽嚜琛屽鐞嗘湇鍔″櫒杩斿洖鐨勬暟鎹紝搴斾笌鏍囧噯鏁版嵁鏍煎紡涓�鑷达紝娉ㄦ剰series鐨刣ata鏁板�煎簲涓烘暟瀛楁牸寮�
- this.chartsDataColumn4=JSON.parse(JSON.stringify(demodata.Column))
+ this.chartsDataColumn4=JSON.parse(JSON.stringify(this.Column))
}, 1500);
},
backGroundRepeat() {
@@ -166,13 +174,21 @@
},
async getCompanyPostList() {
let res = await getCompanyData.getCompanyPostList()
- console.log(res);
if (res.code === 200) {
this.notices = res.data.records.splice(0,5)
} else if (res.code === 403) {
this.backLogin(res)
}
},
+
+ async getMonthData() {
+ let res = await getCompanyData.getMonthData()
+ if (res.code === 200) {
+ this.Column.series[0].data = res.data
+ } else if (res.code === 403) {
+ this.backLogin(res)
+ }
+ },
backLogin(res) {
uni.showToast({title: res.msg, icon: "none", position: 'top'})
setTimeout(() => {
--
Gitblit v1.9.1