From ea3796f9a0098858f5726e03db56a339b6eab3cc Mon Sep 17 00:00:00 2001
From: ZhangXianQiang <1135831638@qq.com>
Date: 星期二, 21 五月 2024 09:13:19 +0800
Subject: [PATCH] Merge branch 'master' into dev-threejs
---
src/views/system/check/result/index.vue | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/views/system/check/result/index.vue b/src/views/system/check/result/index.vue
index 090956a..1013586 100644
--- a/src/views/system/check/result/index.vue
+++ b/src/views/system/check/result/index.vue
@@ -43,7 +43,7 @@
</div>
</div>
<div class="bottom-publish">
- <el-button size="medium" :type="isAnyUnpublished(city) ? 'success' : 'danger'" @click="publish(city)">
+ <el-button v-hasPermi="['check:score:publish']" size="medium" :type="isAnyUnpublished(city) ? 'success' : 'danger'" @click="publish(city)">
{{ isAnyUnpublished(city) ? '鍙戝竷' : '鍙栨秷' }}
</el-button>
<el-button size="medium" @click="jumpDetail(index)" type="info">璇︽儏</el-button>
@@ -138,6 +138,7 @@
type: 'bar',
name: '瑙嗛鑰冩牳',
data: this.dataList.data1,
+ barWidth: '40',
itemStyle: {
color: 'rgba(255, 165, 0, 1)'
}
@@ -146,6 +147,7 @@
type: 'bar',
name: '浜鸿劯鑰冩牳',
data: this.dataList.data2,
+ barWidth: '40',
itemStyle: {
color: 'rgba(85, 192, 191, 1)'
}
@@ -154,6 +156,7 @@
type: 'bar',
name: '杞﹁締鑰冩牳',
data: this.dataList.data3,
+ barWidth: '40',
itemStyle: {
color: 'rgba(62, 144, 247, 1)'
}
@@ -196,33 +199,37 @@
axisLabel: {
},
data: nameArray
+
},
yAxis: {
- min: 90,
+ min: 60
},
series: [
{
type: 'bar',
name: '瑙嗛鑰冩牳',
data: data1,
+ barWidth: '40',
itemStyle: {
- color: 'rgba(255, 165, 0, 1)'
+ color: 'rgba(255, 165, 0, 1)',
}
},
{
type: 'bar',
name: '浜鸿劯鑰冩牳',
data: data2,
+ barWidth: '40',
itemStyle: {
- color: 'rgba(85, 192, 191, 1)'
+ color: 'rgba(85, 192, 191, 1)',
}
},
{
type: 'bar',
name: '杞﹁締鑰冩牳',
data: data3,
+ barWidth: '40',
itemStyle: {
- color: 'rgba(62, 144, 247, 1)'
+ color: 'rgba(62, 144, 247, 1)',
}
},
]
--
Gitblit v1.8.0