Merge remote-tracking branch 'origin/master'

xiangpei

2024-05-27 73547fa9052823e939f95d2e1b711f02d693966b

Merge remote-tracking branch 'origin/master'

 src/views/exam/paper/edit.vue

@@ -186,7 +186,8 @@
        pageIndex: 1,
        pageSize: 5,
        listLoading: true,
        multipleSelection: []
        multipleSelection: [],
        excludeTagIds: []
      },
      tableData: [],
      total: 0,
@@ -448,7 +449,7 @@
        };
      });
      this.form.examineeList = this.student.multipleSelection.map((item) => item.realName);
      

      this.studentDialog = false;
    },


 src/views/exam/personalRandomTemplate/edit.vue

@@ -134,7 +134,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>
@@ -184,7 +189,8 @@
        pageIndex: 1,
        pageSize: 5,
        listLoading: true,
        multipleSelection: []
        multipleSelection: [],
        excludeTagIds: []
      },
      tableData: [],
      total: 0,