From 10ec0d1db5179d90a82e7d534cda6e9bcf597c08 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期日, 01 九月 2024 22:41:52 +0800
Subject: [PATCH] 报备功能优化
---
src/views/system/check/result/index.vue | 44 ++++++++++++++++++++++++++++++++------------
1 files changed, 32 insertions(+), 12 deletions(-)
diff --git a/src/views/system/check/result/index.vue b/src/views/system/check/result/index.vue
index 090956a..451a168 100644
--- a/src/views/system/check/result/index.vue
+++ b/src/views/system/check/result/index.vue
@@ -3,8 +3,10 @@
<div>
<el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal" @select="handleSelect"
style="margin-bottom: 10px">
- <el-menu-item index="0">鐪佸巺鑰冩牳</el-menu-item>
- <el-menu-item index="1">甯傚眬鑰冩牳</el-menu-item>
+ <el-menu-item index="0">鐪佸巺鏈堝害</el-menu-item>
+ <el-menu-item index="2">鐪佸巺瀛ｅ害</el-menu-item>
+ <el-menu-item index="1">甯傚眬鏈堝害</el-menu-item>
+ <el-menu-item index="3">甯傚眬瀛ｅ害</el-menu-item>
</el-menu>
</div>
@@ -31,9 +33,9 @@
</div>
<div class="score-warp">
<div class="score-item">
- <div style="font-size: 15px; margin-bottom: 15px">{{ formatCreateDate(city[0].createTime) }}</div>
+ <div style="font-size: 15px; margin-bottom: 15px">{{ formatCreateDate(city[0]) }}</div>
</div>
- <div v-for="(score, scoreIndex) in city" :key="scoreIndex">
+ <div v-for="(score, scoreIndex) in filterRepeat(city)" :key="scoreIndex">
<div class="score-item">
<div v-if="score.examineCategory == 2">杞﹁締锛�</div>
<div v-else-if="score.examineCategory == 3">浜鸿劯锛�</div>
@@ -43,10 +45,10 @@
</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>
+ <el-button size="medium" @click="jumpDetail(index)" type="primary">璇︽儏</el-button>
</div>
</div>
</div>
@@ -138,6 +140,7 @@
type: 'bar',
name: '瑙嗛鑰冩牳',
data: this.dataList.data1,
+ barWidth: '40',
itemStyle: {
color: 'rgba(255, 165, 0, 1)'
}
@@ -146,6 +149,7 @@
type: 'bar',
name: '浜鸿劯鑰冩牳',
data: this.dataList.data2,
+ barWidth: '40',
itemStyle: {
color: 'rgba(85, 192, 191, 1)'
}
@@ -154,6 +158,7 @@
type: 'bar',
name: '杞﹁締鑰冩牳',
data: this.dataList.data3,
+ barWidth: '40',
itemStyle: {
color: 'rgba(62, 144, 247, 1)'
}
@@ -196,33 +201,37 @@
axisLabel: {
},
data: nameArray
+
},
yAxis: {
- min: 90,
+ min: 0
},
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)',
}
},
]
@@ -259,8 +268,8 @@
// 妫�鏌� city 鐨� score 鏁扮粍涓槸鍚︽湁浠讳綍涓�涓殑 publish 灞炴�т负 'UNPUBLISHED'
return city.some(score => score.publish === 'UNPUBLISHED');
},
- formatCreateDate(dateString) {
- const date = new Date(dateString);
+ formatCreateDate(item) {
+ const date = new Date(item.createTime);
const year = date.getFullYear();
const month = date.getMonth() + 1; // getMonth() 杩斿洖鐨勬湀浠芥槸浠� 0 寮�濮嬬殑锛屾墍浠ヨ鍔� 1
const day = date.getDate();
@@ -271,6 +280,17 @@
return `${year}骞�${formattedMonth}鏈�${formattedDay}鍙穈;
},
+ filterRepeat(city) {
+ let list = [];
+ let examineCategorys = [];
+ city.forEach(item => {
+ if (examineCategorys.indexOf(item.examineCategory) === -1) {
+ examineCategorys.push(item.examineCategory);
+ list.push(item);
+ }
+ });
+ return list;
+ },
/** 瀵艰埅鍒囨崲 */
handleSelect(key) {
this.activeIndex = key; // 鏇存柊褰撳墠婵�娲荤殑鑿滃崟椤�
--
Gitblit v1.8.0