From c8107a39f7611e256c473d72df58e45bc02ad7eb Mon Sep 17 00:00:00 2001 From: whycq <10027870+whycq@user.noreply.gitee.com> Date: 星期三, 11 十月 2023 16:54:04 +0800 Subject: [PATCH] # --- pages/api/index.js | 33 ++++++++++++++++ pages/index/index.vue | 49 +++++++++++++++++++++--- 2 files changed, 76 insertions(+), 6 deletions(-) diff --git a/pages/api/index.js b/pages/api/index.js new file mode 100644 index 0000000..a8498ff --- /dev/null +++ b/pages/api/index.js @@ -0,0 +1,33 @@ +function isEmpty(obj) { + if (JSON.stringify(obj) === '{}') { + return true + } + return obj == "undefined" || obj == null || obj === "" || obj == {}; +} + +const baseUrl = 'http://127.0.0.1:9528' + +async function getCompanyData() { + let _this = this,item = []; + var ress = await uni.request({ + url: `${baseUrl}/dashboard/companyData/auth`, + header:{'token':uni.getStorageSync('token')}, + }).then((res)=> { + res = res[1].data + if (res.code === 200) { + item = [ + {name: '骞村害閿�鍞洰鏍�',content: res.data.yearTarget,unit: '涓囧厓'}, + {name: '宸插畬鎴愰攢鍞换鍔�',content: res.data.successMoney,unit: '涓囧厓'}, + {name: '鏈畬鎴愰攢鍞换鍔�',content: res.data.progressMoney,unit: '涓囧厓'}, + {name: '瀹屾垚鐜�',content: res.data.yearTransactionRate,unit: '%'} + ] + } + },(result)=>{ + // console.log(res); + }) + return item +} + +module.exports = { + getCompanyData: getCompanyData +} \ No newline at end of file diff --git a/pages/index/index.vue b/pages/index/index.vue index 1c397f5..8d56aff 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -26,6 +26,17 @@ </view> </view> + <view class="top-box"> + <view class="box-title">鍏徃鍏憡</view> + <view class="box-item"> + <view style="display: flex;align-items: stretch;margin: 4px 0 ;" v-for="(item,i) in notices" :key="i"> + <text style="flex: 1;align-self: center;padding: 8px 4px;">{{item.notice}}</text> + <text style="width: 150rpx;align-self: center;padding: 0 2px;">{{item.update_time}}</text> + </view> + <view>鏌ョ湅鏇村 >></view> + </view> + </view> + <view class="charts-box"> <qiun-data-charts type="column" canvasId="scrollcolumnid" :opts="{enableScroll:true,xAxis:{scrollShow:true,itemCount:4,disableGrid:true}}" :ontouch="true" :canvas2d="true" :chartData="chartsDataColumn4" :background="red"/> </view> @@ -34,6 +45,7 @@ <script> import demodata from '@/mockdata/demodata.json'; + import getCompanyData from '@/pages/api/index.js' export default { data() { return { @@ -71,7 +83,22 @@ {name: '鏉庝笘璞�1绾�',performance:'112涓囧厓'} ], bgs: ['bg-blue','bg-red'], - red: '#aaffff' + red: '#aaffff', + 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'}, + {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: '杩欐槸涓�鏉℃祴璇曞叕鍛�',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: '杩欐槸涓�鏉℃祴璇曞叕鍛�',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: '杩欐槸涓�鏉℃祴璇曞叕鍛�',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: '杩欐槸涓�鏉℃祴璇曞叕鍛�',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'} + ] + } }, @@ -80,7 +107,12 @@ }, onReady() { //妯℃嫙浠庢湇鍔″櫒鑾峰彇鏁版嵁 - this.getServerData() + this.getServerData() + this.getCompanyData() + + }, + mounted() { + }, methods: { getServerData() { @@ -100,8 +132,14 @@ this.mainItem[k]['bg'] = this.bgs[i] i++ } - console.log(this.mainItem); - } + // console.log(this.mainItem); + }, + async getCompanyData() { + let companyDatas = await getCompanyData.getCompanyData() + this.mainItem[0].title = '鍥㈤槦娲诲姩瀹炴椂浜ゆ槗鎯呭喌' + this.mainItem[0].subTitle = '鍥㈤槦鏁版嵁' + this.mainItem[0].items = companyDatas + }, } } </script> @@ -132,7 +170,7 @@ margin: 8px; font-size: 26rpx; font-weight: 700; - min-height: 240rpx; + min-height: 80rpx; background-color: rgba(255,255,255,.3); border-radius: 10rpx; } @@ -157,7 +195,6 @@ .top-box { margin: 8px; border-radius: 10rpx; - /* height: 100rpx; */ color: #FFF; background: #D38312; /* fallback for old browsers */ background: -webkit-linear-gradient(to right, #A83279, #D38312); /* Chrome 10-25, Safari 5.1-6 */ -- Gitblit v1.9.1