From b62c6c9ab29e933fd0333ac183ef837d00aba5d2 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 12 七月 2024 18:09:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/answer/sheetStatistics.vue | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/views/answer/sheetStatistics.vue b/src/views/answer/sheetStatistics.vue
index 5bdaec8..80973e4 100644
--- a/src/views/answer/sheetStatistics.vue
+++ b/src/views/answer/sheetStatistics.vue
@@ -2,14 +2,21 @@
<div style="padding: 10px" ref="pageContent">
<el-form :model="queryParam" ref="queryForm" :inline="true" style="display: flex">
<el-form-item label="璇曞嵎锛�">
- <el-select v-model="queryParam.examPaperId" filterable placeholder="璇曞嵎">
+ <el-select v-model="queryParam.examPaperId" filterable placeholder="璇曞嵎" @change="getType">
<el-option v-for="item in examPaperList" :key="item.id" :value="item.id" :label="item.name" />
</el-select>
</el-form-item>
<el-form-item label="閮ㄩ棬锛�" v-if="admin">
- <el-select v-model="queryParam.departmentId" multiple filterable placeholder="閮ㄩ棬" clearable>
+ <!-- <el-select v-model="queryParam.departmentId" collapse-tags multiple filterable placeholder="閮ㄩ棬" clearable>
<el-option v-for="item in levelEnum" :key="item.key" :value="item.key" :label="item.value" />
- </el-select>
+ </el-select> -->
+ <el-cascader
+ clearable
+ filterable
+ v-model="queryParam.departmentId"
+ :options="levelEnum"
+ :props="{ multiple: true, emitPath: false, value: 'id', label: 'name', checkStrictly: true }"
+ ></el-cascader>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="submitForm">鏌ヨ</el-button>
@@ -173,7 +180,8 @@
chartLoading2: false,
queryParam: {
examPaperId: '',
- departmentId: []
+ departmentId: [],
+ examPaperType: 1
},
admin: true
};
@@ -187,11 +195,17 @@
dashboardApi.examPaperList().then(res => {
this.examPaperList = res.response;
this.queryParam.examPaperId = this.examPaperList[0].id
+ this.queryParam.examPaperType = this.examPaperList[0].paperType
this.getChartData();
this.observe();
});
},
methods: {
+ getType(val) {
+ const selectedItem = this.examPaperList.find(item => item.id === val);
+ this.queryParam.examPaperType = selectedItem.paperType;
+ this.getChartData();
+ },
getChartData() {
this.chartLoading1 = true;
this.chartLoading2 = true;
--
Gitblit v1.8.0