题库、试卷更改

src/views/examTrain/exam/testPaper/components/TestPaper-optional.vue

@@ -92,11 +92,11 @@ const state = reactive({
 	loading: false, // 加载
 	queryParams: {
 		PageIndex: 1, // 当前页
-		PageSize: 10, // 每页条数
+		PageSize: 20, // 每页条数
 		tagIds: null, // 标签id集合
         difficultyLevel: null, // 难易程度
 	},
-	tableCheckbox: '', // 已选择的试题
+	tableCheckbox: [], // 已选择的试题
 	tagData: [], // 标签数据
 });
 const ruleDialogFormRef = ref<FormInstance>(); // 表单
@@ -141,7 +141,7 @@ const queryList = () => {
 			state.loading = false;
             const rows = [];
             state.tableCheckbox.forEach(item => {
-                rows.push(state.tableData.find((it) => it.id === item.questionId));
+                rows.push(state.tableData.find(it => it.id === item.questionId));
             })
             tableRef.value.setCheckboxRow(rows, true);
 		})

src/views/examTrain/exam/testPaper/edit.vue

@@ -185,13 +185,16 @@ const onAdd = () => {
     if (state.ruleForm.mode == 0){
         TestPaperRandomRef.value.openDialog(state.ruleForm.testPaperItemDtos);
     }else if (state.ruleForm.mode == 1) {
-        TestPaperOptionalRef .value.openDialog(state.ruleForm.testPaperItemDtos);
+        TestPaperOptionalRef.value.openDialog(state.ruleForm.testPaperItemDtos);
     }
 };
 // 确定选择试题
 const chooseQuestion = (data: any) => {
-	state.ruleForm.testPaperItemDtos = state.ruleForm.testPaperItemDtos.concat(data);
-    console.log(state.ruleForm.testPaperItemDtos)
+	if (state.ruleForm.mode == 0){
+		state.ruleForm.testPaperItemDtos = state.ruleForm.testPaperItemDtos.concat(data);
+    }else if (state.ruleForm.mode == 1) {
+		state.ruleForm.testPaperItemDtos = other.deepClone(data);
+    }
 };
 // 删除试题
 const onRowDel = (row: any) => {

src/views/examTrain/exam/testPaper/index.vue

@@ -16,7 +16,7 @@
                 </el-form-item>
                 <el-form-item>
                     <el-button type="primary" @click="handleQuery" :loading="state.tableLoading"> <SvgIcon name="ele-Search" class="mr5" />查询 </el-button>
-                    <el-button @click="resetQuery(ruleFormRef)" class="default-button"> <SvgIcon name="ele-Refresh" class="mr5" />重置</el-button>
+                    <el-button @click="drawer = true" class="default-button"> <SvgIcon name="ele-Search" class="mr5" />更多查询</el-button>
                 </el-form-item>
             </el-form>
             <vxe-toolbar
@@ -144,6 +144,7 @@ const handleQuery = () => {
 const requestParams = ref<EmptyObjectType>({});
 const queryList = () => {
 	state.tableLoading = true;
+	requestParams.value = Other.deepClone(state.queryParams);
 	getTestPaperData(requestParams.value)
 		.then((response: any) => {
 			state.tableData = response?.result.items ?? [];

src/views/examTrain/questionBank/index.vue

@@ -166,12 +166,8 @@ const requestParams = ref<EmptyObjectType>({});
 const queryList = () => {
 	state.tableLoading = true;
     requestParams.value = Other.deepClone(state.queryParams);
-	requestParams.value.tagId = state.queryParams.tagIds || '';
-	Reflect.deleteProperty(requestParams.value, 'tagIds'); 
-    console.log(requestParams.value)
 	getQuestionData(requestParams.value)
 		.then((response: any) => {
-            console.log(response)
 			state.tableData = response?.result.items ?? [];
 			state.total = response?.result.pagination.totalCount;
 			state.tableLoading = false;