From 72f13e697d40c8fffc7aa0197fec4509bbe41569 Mon Sep 17 00:00:00 2001
From: ZhangXianQiang <1135831638@qq.com>
Date: 星期一, 06 五月 2024 11:36:10 +0800
Subject: [PATCH] Merge branch 'master' into dev-threejs
---
src/views/system/check/result/index.vue | 37 +++++++++++++++----------------------
1 files changed, 15 insertions(+), 22 deletions(-)
diff --git a/src/views/system/result/index.vue b/src/views/system/check/result/index.vue
similarity index 91%
rename from src/views/system/result/index.vue
rename to src/views/system/check/result/index.vue
index c08c57f..090956a 100644
--- a/src/views/system/result/index.vue
+++ b/src/views/system/check/result/index.vue
@@ -3,8 +3,8 @@
<div>
<el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal" @select="handleSelect"
style="margin-bottom: 10px">
- <el-menu-item index="1">鐪佸巺鑰冩牳</el-menu-item>
- <el-menu-item index="2">甯傚眬鑰冩牳</el-menu-item>
+ <el-menu-item index="0">鐪佸巺鑰冩牳</el-menu-item>
+ <el-menu-item index="1">甯傚眬鑰冩牳</el-menu-item>
</el-menu>
</div>
@@ -13,10 +13,6 @@
<div class="card-content">
<div class="title-container">
<h1>鑰冩牳鎴愮哗</h1>
- <div class="select-container">
- <el-date-picker v-model="date" type="date" placeholder="閫夋嫨鏃ユ湡">
- </el-date-picker>
- </div>
</div>
<div class="echart-container">
<div id="barChart" ref="barChart"></div>
@@ -39,9 +35,9 @@
</div>
<div v-for="(score, scoreIndex) in city" :key="scoreIndex">
<div class="score-item">
- <div v-if="score.examineCategory == 0">杞﹁締锛�</div>
- <div v-else-if="score.examineCategory == 1">浜鸿劯锛�</div>
- <div v-else-if="score.examineCategory == 2">瑙嗛锛�</div>
+ <div v-if="score.examineCategory == 2">杞﹁締锛�</div>
+ <div v-else-if="score.examineCategory == 3">浜鸿劯锛�</div>
+ <div v-else-if="score.examineCategory == 1">瑙嗛锛�</div>
<div class="score">{{ score.score }}</div>
</div>
</div>
@@ -77,8 +73,7 @@
},
checkScoreList: [],
areaList: [],
- activeIndex: '1',
- activeIndex2: '2',
+ activeIndex: '0',
date: '',
company: '',
dataList: {
@@ -95,6 +90,7 @@
}
},
created() {
+ this.queryParams.examineTag = this.activeIndex
this.getList();
this.areaSelect();
},
@@ -105,9 +101,10 @@
methods: {
jumpDetail(index) {
this.$router.push({
- path: '/examine/detail',
+ path: '/check/detail',
query: {
- index: index
+ index: index,
+ examineTag: this.activeIndex
}
})
},
@@ -176,9 +173,9 @@
}
});
const nameArray = mapData.map(item => item.name);
- const data1 = this.filterData(mapData, 0);
- const data2 = this.filterData(mapData, 1);
- const data3 = this.filterData(mapData, 2);
+ const data1 = this.filterData(mapData, 1);
+ const data2 = this.filterData(mapData, 2);
+ const data3 = this.filterData(mapData, 3);
const option = {
grid: {
left: 0,
@@ -277,16 +274,12 @@
/** 瀵艰埅鍒囨崲 */
handleSelect(key) {
this.activeIndex = key; // 鏇存柊褰撳墠婵�娲荤殑鑿滃崟椤�
+ this.queryParams.examineTag = key;
this.getList();
},
/** 鏌ヨ鑰冩牳鎴愮哗鍒楄〃 */
getList() {
this.loading = true;
- if (this.activeIndex === '1') {
- this.queryParams.examineTag = '0'; // 鐪佸巺鑰冩牳
- } else if (this.activeIndex === '2') {
- this.queryParams.examineTag = '1'; // 鍖哄煙鑰冩牳
- }
// 鑾峰彇褰撳墠鏃ユ湡
const today = new Date();
@@ -310,7 +303,7 @@
const cityName = this.translateDeptId(parseInt(city[0].deptId));
this.province.publish = text === "鍙戝竷" ? "PUBLISHED" : "UNPUBLISHED";
this.province.id = city.map(city => city.id);
- this.$modal.confirm('鏄惁纭' + text + '鑰冩牳鍚嶄负"' + cityName + '"鐨勬暟鎹」锛�')
+ this.$modal.confirm('鏄惁纭' + text + '鑰冩牳鍚嶄负"' + cityName + '"鐨勬垚缁╋紵')
.then(() => {
return publishScore(this.province);
})
--
Gitblit v1.8.0