From 20e20706af12877626724a24818a7b1f3eead15f Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期六, 06 五月 2023 13:05:38 +0800
Subject: [PATCH] 1.系统首页优化
---
src/views/xtsy/index.vue | 76 ++++++++++++------------
vue.config.js | 6 +-
src/views/jcsz/jsqd.vue | 28 +++++----
src/views/kb/zhkb.vue | 16 ++--
4 files changed, 64 insertions(+), 62 deletions(-)
diff --git a/src/views/jcsz/jsqd.vue b/src/views/jcsz/jsqd.vue
index 0813aea..3e28ad7 100644
--- a/src/views/jcsz/jsqd.vue
+++ b/src/views/jcsz/jsqd.vue
@@ -1056,7 +1056,7 @@
},
/* 鍏宠仈鐢ㄦ埛妯″潡*/
- async userClick(row) {
+ userClick(row) {
if (row.role_code === 'S001') {
return this.$message.info('姝よ鑹叉棤娉曟搷浣滐紒')
}
@@ -1070,29 +1070,31 @@
this.userForm.roleName = row.role_name
this.dialogFormUser.rolecode = row.role_code
- const res = await this.getRoleAssociationUser()
- if (res.code === '200') {
- setTimeout(() => {
- loading.close()
- this.userDialogVisible = true
- this.$nextTick(() => {
- this.$refs.multipleTable.doLayout()
+ this.getRoleAssociationUser().then(res => {
+ if (res.code === '200') {
+ setTimeout(() => {
+ loading.close()
+
+ this.$nextTick(() => {
+ this.$refs.multipleTableRef.doLayout()
+ })
})
- }, 1000)
- } else {
- loading.close()
- }
+ } else {
+ loading.close()
+ }
+ })
},
// 鑾峰彇瑙掕壊娓呭崟鍏宠仈鐢ㄦ埛
async getRoleAssociationUser() {
const res = await RoleAssociationUser(this.dialogFormUser)
this.dialogFormUserTable = res.data
this.dialogFormUserTableLength = res.count
+ this.userDialogVisible = true
this.$nextTick(() => {
this.dialogFormUserTable.forEach((item, index) => {
if (item.flag === 'Y') {
- this.$refs.multipleTable.toggleRowSelection(this.dialogFormUserTable[index], true)
+ this.$refs.multipleTableRef.toggleRowSelection(this.dialogFormUserTable[index], true)
}
})
})
diff --git a/src/views/kb/zhkb.vue b/src/views/kb/zhkb.vue
index ef76dc1..a9a08b0 100644
--- a/src/views/kb/zhkb.vue
+++ b/src/views/kb/zhkb.vue
@@ -31,8 +31,8 @@
<div class="circle" style="background-color: rgb(255 255 255)"></div>
<div style="margin-left: 10px" >鏈紑濮�</div>
- <div class="circle" style="margin-left: 10px;background-color: blue;"></div>
- <div style="margin-left: 10px" >寮�宸�</div>
+<!-- <div class="circle" style="margin-left: 10px;background-color: blue;"></div>-->
+<!-- <div style="margin-left: 10px" >寮�宸�</div>-->
<div class="circleYellow" style="margin-left: 10px"></div>
<div style="margin-left: 10px" >鎵ц涓�</div>
@@ -91,14 +91,14 @@
class="kb_block03_02_content flex_c_c"
>
<div class="flex_c_c content01">
- <div
- v-if="it.status==='START'&&(parseFloat(it.ngqty)===0||it.ngqty==='')&&(parseFloat(it.goodqty)===0||it.goodqty==='')"
- class="circle"
- style="background-color: blue;"
- />
+<!-- <div-->
+<!-- v-if="it.status==='START'&&(parseFloat(it.ngqty)===0||it.ngqty==='')&&(parseFloat(it.goodqty)===0||it.goodqty==='')"-->
+<!-- class="circle"-->
+<!-- style="background-color: blue;"-->
+<!-- />-->
<div
- v-else-if="it.status==='ALLO'&&(parseFloat(it.ngqty)===0||it.ngqty==='')&&(parseFloat(it.goodqty)===0||it.goodqty==='')"
+ v-if="it.status==='ALLO'&&(parseFloat(it.ngqty)===0||it.ngqty==='')&&(parseFloat(it.goodqty)===0||it.goodqty==='')"
class="circle"
style="background-color: rgb(255 255 255)"
/>
diff --git a/src/views/xtsy/index.vue b/src/views/xtsy/index.vue
index 5cd29bf..7191217 100644
--- a/src/views/xtsy/index.vue
+++ b/src/views/xtsy/index.vue
@@ -11,18 +11,18 @@
<div class="top_card_content_flex">
<div class="content" style="width: 84%">
<div class="content_title1">浠婃棩鐧诲綍</div>
- <div class="content_end1" :style="{color:`rgb(${barTopColor01[0]})`}">1/
- <countTo :start-val="0" :end-val="999" :duration="3000" />
+ <div class="content_end1" :style="{color:`rgb(${barTopColor01[0]})`}">5/
+ <countTo :start-val="0" :end-val="19" :duration="3000" />
</div>
</div>
- <div id="barTop01" class="barTop" style="width: 100%;" />
+ <div id="barTop01" class="barTop" style="width: 87%;" />
<div class="content" style="width: 84%">
<div class="content_title1">鏄ㄦ棩鐧诲綍</div>
- <div class="content_end1">0/
- <countTo :start-val="0" :end-val="999" :duration="3000" />
+ <div class="content_end1">6/
+ <countTo :start-val="0" :end-val="19" :duration="3000" />
</div>
</div>
- <div id="barTop02" class="barTop" />
+ <div id="barTop02" class="barTop" style="width: 100%;" />
</div>
</div>
</div>
@@ -33,18 +33,18 @@
<div class="top_card_content_flex">
<div class="content" style="width: 84%">
<div class="content_title1">浠婃棩娲昏穬</div>
- <div class="content_end1" :style="{color:`rgb(${barTopColor02[0]})`}">0/
- <countTo :start-val="0" :end-val="999" :duration="3000" />
+ <div class="content_end1" :style="{color:`rgb(${barTopColor02[0]})`}">5/
+ <countTo :start-val="0" :end-val="19" :duration="3000" />
</div>
</div>
- <div id="barTop03" class="barTop" />
+ <div id="barTop03" class="barTop" style="width: 87%;" />
<div class="content" style="width: 84%">
<div class="content_title1">鏄ㄦ棩娲昏穬</div>
- <div class="content_end1">0/
- <countTo :start-val="0" :end-val="999" :duration="3000" />
+ <div class="content_end1">6/
+ <countTo :start-val="0" :end-val="19" :duration="3000" />
</div>
</div>
- <div id="barTop04" class="barTop" />
+ <div id="barTop04" class="barTop" style="width: 100%;" />
</div>
</div>
</div>
@@ -55,18 +55,18 @@
<div class="top_card_content_flex">
<div class="content" style="width: 84%">
<div class="content_title1">浠婃棩娲昏穬</div>
- <div class="content_end1" :style="{color:`rgb(${barTopColor03[0]})`}">0/
- <countTo :start-val="0" :end-val="999" :duration="3000" />
+ <div class="content_end1" :style="{color:`rgb(${barTopColor03[0]})`}">5/
+ <countTo :start-val="0" :end-val="19" :duration="3000" />
</div>
</div>
- <div id="barTop05" class="barTop" />
+ <div id="barTop05" class="barTop" style="width: 87%;" />
<div class="content" style="width: 84%">
<div class="content_title1">鏄ㄦ棩娲昏穬</div>
- <div class="content_end1">0/
- <countTo :start-val="0" :end-val="999" :duration="3000" />
+ <div class="content_end1">6/
+ <countTo :start-val="0" :end-val="19" :duration="3000" />
</div>
</div>
- <div id="barTop06" class="barTop" />
+ <div id="barTop06" class="barTop" style="width: 100%;" />
</div>
</div>
</div>
@@ -78,14 +78,14 @@
<div class="content" style="width: 84%">
<div class="content_title1">浠婃棩娲昏穬</div>
<div class="content_end1" :style="{color:`rgb(${barTopColor04[0]})`}">0/
- <countTo :start-val="0" :end-val="999" :duration="3000" />
+ <countTo :start-val="0" :end-val="19" :duration="3000" />
</div>
</div>
<div id="barTop07" class="barTop" />
<div class="content" style="width: 84%">
<div class="content_title1">鏄ㄦ棩娲昏穬</div>
<div class="content_end1">0/
- <countTo :start-val="0" :end-val="999" :duration="3000" />
+ <countTo :start-val="0" :end-val="19" :duration="3000" />
</div>
</div>
<div id="barTop08" class="barTop" />
@@ -134,7 +134,7 @@
mainHeight: 0,
tableHeight: 0,
barTopColor01: ['42,197,137', '187,236,218'],
- barTopColor02: ['248,216,76', '255,250,238'],
+ barTopColor02: ['248,216,76', '255,250,188'],
barTopColor03: ['42,197,137', '187,236,218'],
barTopColor04: ['232,103,103', '253,240,240']
}
@@ -167,28 +167,28 @@
this.getLine01()
},
getTopData() {
- loadEcharts('barTop01', barTop(1, this.barTopColor01))
- loadEcharts('barTop02', barTop(0, this.barTopColor01))
- loadEcharts('barTop03', barTop(0, this.barTopColor02))
- loadEcharts('barTop04', barTop(0, this.barTopColor02))
- loadEcharts('barTop05', barTop(0, this.barTopColor03))
- loadEcharts('barTop06', barTop(0, this.barTopColor03))
+ loadEcharts('barTop01', barTop(5, this.barTopColor01))
+ loadEcharts('barTop02', barTop(6, this.barTopColor01))
+ loadEcharts('barTop03', barTop(5, this.barTopColor02))
+ loadEcharts('barTop04', barTop(6, this.barTopColor02))
+ loadEcharts('barTop05', barTop(5, this.barTopColor03))
+ loadEcharts('barTop06', barTop(6, this.barTopColor03))
loadEcharts('barTop07', barTop(0, this.barTopColor04))
loadEcharts('barTop08', barTop(0, this.barTopColor04))
},
async getBar01() {
// const res=await xxx()
let data = [
- { key: '鏂界鑺�', value: 300 },
- { key: '鐜嬪涓�', value: 310 },
- { key: '鍚夎吹鐞�', value: 180 },
- { key: '寰愪簯', value: 190 },
- { key: '浼嶅繝鍏�', value: 120 },
- { key: '椹厜浣�', value: 230 },
- { key: '鐜嬫澃', value: 270 },
- { key: '鐜嬪弻浼�', value: 250 },
- { key: '鐜嬪叴鑻�', value: 260 },
- { key: '鏉ㄦ', value: 180 }
+ { key: '鏂界鑺�', value: 305 },
+ { key: '鐜嬪涓�', value: 311 },
+ { key: '鍚夎吹鐞�', value: 184 },
+ { key: '寰愪簯', value: 192 },
+ { key: '浼嶅繝鍏�', value: 122 },
+ { key: '椹厜浣�', value: 210 },
+ { key: '鐜嬫澃', value: 272 },
+ { key: '鐜嬪弻浼�', value: 253 },
+ { key: '鐜嬪叴鑻�', value: 263 },
+ { key: '鏉ㄦ', value: 182 }
]
data = data.sort((a, b) => b.value - a.value)
loadEcharts('bar01', bar01(data))
@@ -204,7 +204,7 @@
{ key: '2', value: 0 },
{ key: '4', value: 0 },
{ key: '6', value: 0 },
- { key: '8', value: 8 },
+ { key: '8', value: 6 },
{ key: '10', value: 6 },
{ key: '12', value: 3 },
{ key: '14', value: 6 },
diff --git a/vue.config.js b/vue.config.js
index b27dcb4..8a18c07 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -53,11 +53,11 @@
proxy: {
[process.env.VUE_APP_BASE_API]: {
// target: 'http://121.196.36.24:8011', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 鏈湴寮�鍙戞湇鍔″櫒
- target: 'http://192.168.1.102:8001', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 鑾辩 锛堟湭涓婁簯锛�
- // target: 'http://tr3b6v.natappfree.cc', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 鑾辩 (涓婁簯)
+ // target: 'http://192.168.1.102:8001', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 鑾辩 锛堟湭涓婁簯锛�
+ target: 'http://tr3b6v.natappfree.cc', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 鑾辩 (涓婁簯)
changeOrigin: true, // 璇锋眰璺ㄥ煙鏃讹紝闇� 閰嶇疆姝ら」
- pathRewrite: { // 璺緞閲嶅啓,鏇挎崲target涓殑璇锋眰鍦板潃
+ pathRewrite: { // 璺緞閲嶅啓,鏇挎崲target涓殑璇穤姹傚湴鍧�
['^' + process.env.VUE_APP_BASE_API]: '/api/'
}
// ws: true;//寮�鍚痺s, 濡傛灉鏄痟ttp浠ｇ悊姝ゅ鍙互涓嶇敤璁剧疆
--
Gitblit v1.9.3