From 3bc00a9f9ccfad8cacc78c3fb68b6880f5522d5c Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 27 五月 2024 14:19:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/exam/paper/edit.vue | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/views/exam/paper/edit.vue b/src/views/exam/paper/edit.vue
index 795212a..d15ce0e 100644
--- a/src/views/exam/paper/edit.vue
+++ b/src/views/exam/paper/edit.vue
@@ -100,8 +100,8 @@
</el-form>
<el-dialog :visible.sync="questionPage.showDialog" width="70%">
<el-form :model="questionPage.queryParam" ref="queryForm" :inline="true">
- <el-form-item label="ID锛�">
- <el-input v-model="questionPage.queryParam.id" clearable></el-input>
+ <el-form-item label="棰樺共锛�">
+ <el-input v-model="questionPage.queryParam.titleContent" clearable></el-input>
</el-form-item>
<el-form-item label="棰樺瀷锛�">
<el-select v-model="questionPage.queryParam.questionType" clearable>
@@ -131,7 +131,12 @@
<el-dialog :visible.sync="studentDialog" width="70%">
<el-form :model="student" ref="queryForm" :inline="true">
<el-form-item label="鏍囩锛�">
- <el-select v-model="student.tagId" clearable>
+ <el-select v-model="student.tagIds" clearable multiple>
+ <el-option v-for="item in tags" :key="item.id" :value="item.id" :label="item.name"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鎺掗櫎鏍囩锛�">
+ <el-select v-model="student.excludeTagIds" clearable multiple>
<el-option v-for="item in tags" :key="item.id" :value="item.id" :label="item.name"></el-option>
</el-select>
</el-form-item>
@@ -181,7 +186,8 @@
pageIndex: 1,
pageSize: 5,
listLoading: true,
- multipleSelection: []
+ multipleSelection: [],
+ excludeTagIds: []
},
tableData: [],
total: 0,
@@ -235,7 +241,7 @@
multipleSelection: [],
showDialog: false,
queryParam: {
- id: null,
+ titleContent: "",
questionType: null,
subjectId: 1,
pageIndex: 1,
@@ -443,7 +449,7 @@
};
});
this.form.examineeList = this.student.multipleSelection.map((item) => item.realName);
-
+
this.studentDialog = false;
},
--
Gitblit v1.8.0