From cf91288ecebb860a48f885261fb3620059fbfb16 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 26 四月 2024 13:45:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/result/detail/index1.vue | 87 ++++++++++++++++++++-----------------------
1 files changed, 41 insertions(+), 46 deletions(-)
diff --git a/src/views/system/result/detail/index1.vue b/src/views/system/result/detail/index1.vue
index 44b2338..f0f402b 100644
--- a/src/views/system/result/detail/index1.vue
+++ b/src/views/system/result/detail/index1.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>
@@ -63,8 +63,9 @@
</div>
<div style="text-align: right; margin-top: 10px">
- <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage4"
- :page-sizes="[5, 10, 20]" :page-size="5" layout="total, sizes, prev, pager, next, jumper" :total="4">
+ <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+ :current-page="queryParams.pageNum" :page-sizes="[10, 20, 50]" :page-size="queryParams.pageSize"
+ layout="total, sizes, prev, pager, next, jumper" :total="tableData.length">
</el-pagination>
</div>
@@ -83,38 +84,18 @@
dicts: ['platform_examine_use', 'platform_examine_category'],
data() {
return {
- activeIndex: '1',
- activeIndex2: '2',
+ activeIndex: '0',
areaList: [],
date: '',
dateRange: '',
- company: '',
queryParams: {
pageNum: 1,
pageSize: 10,
deptId: null,
+ examinTag:0
},
- dataList: [
- {
- name: '鍏ㄩ儴',
- complete: {
- '4.5': 95.5, '4.6': 95.3, '4.7': 96.0, '4.8': 97.2, '4.9': 96.5,
- '4.10': 95.5, '4.11': 95.3, '4.12': 96.0, '4.13': 97.2, '4.14': 96.5,
- '4.15': 95.5, '4.16': 95.3, '4.17': 96.0, '4.18': 97.2, '4.19': 96.5,
- '4.20': 95.5, '4.21': 95.3, '4.22': 96.0, '4.23': 97.2, '4.24': 96.5,
- '4.25': 95.5, '4.26': 95.3, '4.27': 96.0, '4.28': 97.2, '4.29': 96.5
- },
- waiting: {
- '4.5': 94.8, '4.6': 91.3, '4.7': 95.3, '4.8': 92.3, '4.9': 93.3,
- '4.10': 94.8, '4.11': 91.3, '4.12': 95.3, '4.13': 92.3, '4.14': 93.3
- },
- pending: {
- '4.5': 91.6, '4.6': 92.6, '4.7': 93.7, '4.8': 94.0, '4.9': 95.9
- , '4.10': 91.6, '4.11': 92.6, '4.12': 93.7, '4.13': 94.0, '4.14': 95.9
- }
- }
- ],
tableData: [],
+ loading: false,
searchForm: {
time: null,
}
@@ -130,13 +111,11 @@
const year = date.getFullYear();
const month = (date.getMonth() + 1) >= 10 ? date.getMonth() + 1 : '0' + (date.getMonth() + 1);
this.date = year + '-' + month;
- console.log(this.date);
this.queryParams.date = this.date;
- this.getList(this.$route.query.index);
this.areaSelect();
},
computed: {
- ...mapState('dict', ['dict'])
+
},
methods: {
// 鍖哄煙涓嬫媺鏁版嵁
@@ -151,16 +130,17 @@
},
/** 瀵艰埅鍒囨崲 */
handleSelect(key) {
- this.activeIndex = key; // 鏇存柊褰撳墠婵�娲荤殑鑿滃崟椤�
- this.getList();
+ this.activeIndex = key;
+ this.queryParams.examinTag = key;
+ this.getList(this.queryParams.deptId);
},
/** 鏌ヨ鑰冩牳妯℃澘鍒楄〃 */
getList(deptId) {
this.loading = true;
+ lineChart.showLoading();
listScore(this.queryParams).then(response => {
this.tableData = response.data[deptId];
this.loading = false;
-
this.initChart(response.data[deptId]);
});
},
@@ -204,7 +184,7 @@
series: [
{
name: '杞﹁締鑰冩牳',
- data: this.filterData(dataList,0),
+ data: this.filterData(dataList, 0),
type: 'line',
itemStyle: {
color: 'rgba(62, 144, 247, 1)'
@@ -212,7 +192,7 @@
},
{
name: '浜鸿劯鑰冩牳',
- data: this.filterData(dataList,1),
+ data: this.filterData(dataList, 1),
type: 'line',
itemStyle: {
color: 'rgba(85, 192, 191, 1)'
@@ -220,7 +200,7 @@
},
{
name: '瑙嗛鑰冩牳',
- data: this.filterData(dataList,2),
+ data: this.filterData(dataList, 2),
type: 'line',
itemStyle: {
color: 'rgba(255, 165, 0, 1)'
@@ -229,30 +209,47 @@
]
};
lineChart.setOption(option, true);
+ lineChart.hideLoading();
},
groupByData(data) {
- if(!data) return [];
+ if (!data) return this.getAllDay().map((item) => [item, []]);
const tempGroup = {};
data.forEach((item) => {
- const { createTime } = item;
+ let { createTime } = item;
+ let tempTime = createTime.split('-');
+ createTime = tempTime[1] + '-' + tempTime[2];
if (!tempGroup[createTime]) {
tempGroup[createTime] = [];
}
tempGroup[createTime].push(item);
})
const tempArray = Object.entries(tempGroup).sort(([keyA], [keyB]) => new Date([keyA]) - new Date([keyB]));
-
return tempArray;
},
- filterData(data,tag) {
- if(!data) return [0];
+ filterData(data, tag) {
const scoreList = data.map((item) => {
let temp = item[1].find((exam) => exam.examineCategory === tag);
- return temp.score;
+ if (temp) {
+ return temp.score;
+ } else {
+ return;
+ }
});
- console.log(scoreList);
return scoreList;
+ },
+
+ getAllDay() {
+ const currentDate = this.date.split('-');
+ const currentYear = currentDate[0];
+ const currentMonth = currentDate[1];
+ const daysInMonth = new Date(currentYear, currentMonth, 0).getDate();
+ const datesOfMonth = [];
+ for (var day = 1; day <= daysInMonth; day++) {
+ const formattedDate = currentMonth + '-' + (day.toString().padStart(2, '0'));
+ datesOfMonth.push(formattedDate);
+ }
+ return datesOfMonth;
},
// 鐩戝惉鍙樺寲
@@ -279,10 +276,8 @@
},
mounted() {
- this.acitveData = this.dataList[0];
- this.company = this.acitveData.name;
lineChart = echarts.init(this.$refs.chartContent);
- this.initChart();
+ this.getList(this.$route.query.index);
this.observe();
},
beforeDestroy() {
--
Gitblit v1.8.0