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/exam/paper/list.vue | 36 +++++++++++++++++-
src/views/exam/personalRandomTemplate/list.vue | 37 +++++++++++++++++-
2 files changed, 69 insertions(+), 4 deletions(-)
diff --git a/src/views/exam/paper/list.vue b/src/views/exam/paper/list.vue
index 3b10078..5867102 100644
--- a/src/views/exam/paper/list.vue
+++ b/src/views/exam/paper/list.vue
@@ -50,7 +50,12 @@
<el-form-item label="鑰冪敓锛�" prop="menuIds" required>
<!-- <el-cascader v-model="form.menuIds" :options="options" :props="{ multiple: true }" clearable collapse-tags></el-cascader> -->
<!-- 鏀规垚涓嬫媺 -->
- <el-select v-model="form.menuIds" multiple clearable placeholder="璇烽�夋嫨">
+ <el-select v-model="form.menuIds" multiple clearable placeholder="璇烽�夋嫨" collapse-tags @change="changeSelect">
+ <div class="checkboxWrapper">
+ <el-checkbox v-model="checked" @change.native="checkChange">
+ 鍏ㄩ��
+ </el-checkbox>
+ </div>
<el-option v-for="item in options" :key="item.id" :label="item.realName" :value="item.id"></el-option>
</el-select>
</el-form-item>
@@ -80,6 +85,7 @@
components: { Pagination },
data () {
return {
+ checked: false,
depts: [],
form: {
menuIds: [],
@@ -161,6 +167,27 @@
}
})
},
+ checkChange() {
+ let resValues = this.options.map(item => item.id);
+ // 濡傛灉checkbox涓篺alse锛屽垯涓哄弽閫夛紝閫夋嫨鏁扮粍涓虹┖
+ if (!this.checked) {
+ this.form.menuIds = [];
+ } else {
+ // 濡傛灉checkbox涓簍rue锛屽垯涓哄叏閫夛紝閫夋嫨鏁扮粍娣诲姞鎵�鏈夋暟鎹�
+ let res = [...resValues];
+ this.form.menuIds = res;
+ }
+ },
+ changeSelect(val) {
+ let resValues = this.options.map(item => item.value);
+ // 濡傛灉閫夋嫨鏁扮粍闀垮害绛変簬options鐨勯暱搴︼紝checkbox璁句负true锛屽弽涔嬭涓篺alse
+ if (val.length === resValues.length) {
+ this.checked = true;
+ } else {
+ this.checked = false;
+ }
+ this.form.menuIds = val;
+ },
missExam(item) {
this.form = {
menuIds: [],
@@ -170,7 +197,6 @@
}
this.dialogVisible = true;
this.examPaper = item;
- console.log('item.id', item.id);
userApi.getFailExamUser(item.id).then(res => {
this.options = res.response;
})
@@ -216,3 +242,9 @@
}
}
</script>
+<style lang="scss" scoped>
+.checkboxWrapper {
+ padding: 8px 20px;
+ border-bottom: 1px solid #ccc;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/exam/personalRandomTemplate/list.vue b/src/views/exam/personalRandomTemplate/list.vue
index dd85102..1ec3776 100644
--- a/src/views/exam/personalRandomTemplate/list.vue
+++ b/src/views/exam/personalRandomTemplate/list.vue
@@ -62,7 +62,12 @@
<el-form :model="form" ref="form">
<el-form-item label="鑰冪敓锛�" prop="menuIds" required>
<!-- <el-cascader v-model="form.menuIds" :options="options" :props="{ multiple: true }" clearable collapse-tags></el-cascader> -->
- <el-select v-model="form.menuIds" multiple clearable placeholder="璇烽�夋嫨">
+ <el-select v-model="form.menuIds" multiple clearable placeholder="璇烽�夋嫨" collapse-tags @change="changeSelect">
+ <div class="checkboxWrapper">
+ <el-checkbox v-model="checked" @change.native="checkChange">
+ 鍏ㄩ��
+ </el-checkbox>
+ </div>
<el-option v-for="item in options" :key="item.id" :label="item.realName" :value="item.id"></el-option>
</el-select>
</el-form-item>
@@ -86,6 +91,7 @@
components: { Pagination },
data () {
return {
+ checked: false,
pickerOptions: {
shortcuts: [{
text: '鏈�杩戜竴鍛�',
@@ -162,6 +168,27 @@
})
},
methods: {
+ checkChange() {
+ let resValues = this.options.map(item => item.id);
+ // 濡傛灉checkbox涓篺alse锛屽垯涓哄弽閫夛紝閫夋嫨鏁扮粍涓虹┖
+ if (!this.checked) {
+ this.form.menuIds = [];
+ } else {
+ // 濡傛灉checkbox涓簍rue锛屽垯涓哄叏閫夛紝閫夋嫨鏁扮粍娣诲姞鎵�鏈夋暟鎹�
+ let res = [...resValues];
+ this.form.menuIds = res;
+ }
+ },
+ changeSelect(val) {
+ let resValues = this.options.map(item => item.value);
+ // 濡傛灉閫夋嫨鏁扮粍闀垮害绛変簬options鐨勯暱搴︼紝checkbox璁句负true锛屽弽涔嬭涓篺alse
+ if (val.length === resValues.length) {
+ this.checked = true;
+ } else {
+ this.checked = false;
+ }
+ this.form.menuIds = val;
+ },
missExam(item) {
this.form = {
menuIds: [],
@@ -170,7 +197,7 @@
limitDateTime: []
}
this.examPaper = item;
- userApi.getFailExamUser(item.id).then(res => {
+ userApi.getFailTemplateUser(item.id).then(res => {
this.options = res.response;
this.dialogVisible = true;
})
@@ -292,3 +319,9 @@
}
}
</script>
+<style lang="scss" scoped>
+.checkboxWrapper {
+ padding: 8px 20px;
+ border-bottom: 1px solid #ccc;
+}
+</style>
\ No newline at end of file
--
Gitblit v1.8.0