From 9e8d1bd0b6fb495920921214775b84d490e032a3 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 06 九月 2024 16:43:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/check/result/detail/index.vue | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/src/views/system/check/result/detail/index.vue b/src/views/system/check/result/detail/index.vue
index 227acca..f72a15c 100644
--- a/src/views/system/check/result/detail/index.vue
+++ b/src/views/system/check/result/detail/index.vue
@@ -4,7 +4,7 @@
<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="1">鍖哄幙鑰冩牳</el-menu-item>
</el-menu>
</div>
@@ -37,7 +37,7 @@
</el-table-column>
<el-table-column label="鏍囩" prop="examineTag" align="center">
<template slot-scope="scope">
- {{ scope.row.examineTag == 0 ? '鐪佸巺鑰冩牳' : '甯傚眬鑰冩牳' }}
+ {{ scope.row.examineTag == 0 ? '鐪佸巺鑰冩牳' : '鍖哄幙鑰冩牳' }}
</template>
</el-table-column>
<el-table-column label="鑰冩牳绫诲瀷" prop="examineCategory" align="center">
@@ -84,7 +84,7 @@
</template>
<script>
-import { listScore, getScore, delScore, addScore, updateScore, publishScore, detailScore } from "@/api/platform/check-score";
+import { chartScore, getScore, delScore, addScore, updateScore, publishScore, detailScore } from "@/api/platform/check-score";
import { areaSelect } from '@/api/system/dept';
import * as echarts from 'echarts';
let lineChart = null;
@@ -135,9 +135,12 @@
const month = (date.getMonth() + 1) >= 10 ? date.getMonth() + 1 : '0' + (date.getMonth() + 1);
this.date = year + '-' + month;
this.queryParams.date = this.date;
- this.queryParams.examineTag =this.$route.query.examineTag;
- this.queryParamsList.examineTag =this.$route.query.examineTag;
- this.activeIndex = this.$route.query.examineTag;
+ let examineTag = this.$route.query.examineTag;
+ if (examineTag === '2') { examineTag = '0' }
+ if (examineTag === '3') { examineTag = '1' }
+ this.queryParams.examineTag = examineTag;
+ this.queryParamsList.examineTag = examineTag;
+ this.activeIndex = examineTag;
this.areaSelect();
this.getList(this.$route.query.index);
},
@@ -198,7 +201,7 @@
getChart(deptId) {
this.loading = true;
lineChart.showLoading();
- listScore(this.queryParams).then(response => {
+ chartScore(this.queryParams).then(response => {
this.initChart(response.data[deptId]);
this.loading = false;
});
@@ -364,10 +367,6 @@
observer.unobserve(this.$refs.chartContent);
}
},
- handleSelect(key, keyPath) {
- console.log(key, keyPath);
- },
-
}
</script>
--
Gitblit v1.8.0