取消重复判断

龚焕茏

2024-05-17 2b0bd5dd65c44e759d83edc85a991e36ac37df60

 src/views/exam/personalRandomTemplate/edit.vue

@@ -2,8 +2,7 @@
  <div class="app-container">
    <el-form :model="form" ref="form" label-width="200px" v-loading="formLoading" :rules="rules">
      <el-form-item label="考生：" prop="menuIds" required>
        <el-cascader v-model="form.menuIds" :options="options" :props="props" clearable collapse-tags>
        </el-cascader>
        <el-select v-model="form.menuIds" :collapse-tags="true" multiple placeholder="请选择" @focus="selectStudent"></el-select>
      </el-form-item>
      <el-form-item label="课目：" prop="subjectId" required >
        <el-select ref="subjectIdRef" v-model="form.subjectId" placeholder="课目" multiple
@@ -12,12 +11,18 @@
                     :label="item.name+' '"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="部门：" prop="deptId" required>
        <el-select v-model="form.deptId" collapse-tags placeholder="部门">
          <el-option v-for="item in depts" :key="item.id" :value="item.id" :label="item.name"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="试卷类型：" prop="paperType" required >
        <el-select v-model="form.paperType" placeholder="试卷类型"  @visible-change="subjectIdEvent" disabled>
          <el-option v-for="item in paperTypeEnum" :key="item.key" :value="item.key" :label="item.value" ></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="时间限制：" required v-show="form.paperType===4">

      <el-form-item label="时间限制：">
        <el-date-picker v-model="form.limitDateTime" value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange"
                        range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
        </el-date-picker>
@@ -85,6 +90,7 @@
      <el-form-item label="建议时长：" prop="suggestTime" required>
        <el-input v-model="form.suggestTime" placeholder="分钟"/>
      </el-form-item>

      <el-form-item>
        <el-button type="primary" @click="submitForm">提交</el-button>
        <el-button @click="resetForm">重置</el-button>
@@ -119,6 +125,35 @@
          <el-button type="primary" @click="confirmQuestionSelect">确定</el-button>
     </span>
    </el-dialog>

    <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-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.deptId" clearable>
            <el-option v-for="item in depts" :key="item.id" :value="item.id" :label="item.name"></el-option>
          </el-select>
        </el-form-item>
        <el-form-item>
          <el-button type="primary" @click="selectStudent">查询</el-button>
        </el-form-item>
      </el-form>
      <el-table v-loading="student.listLoading" :data="tableData" border fit highlight-current-row style="width: 100%" @selection-change="handleSelection">
        <el-table-column type="selection"></el-table-column>
        <el-table-column prop="realName" label="用户"/>
      </el-table>
      <pagination v-show="total > 0" :total="total"
                  :page.sync="student.pageIndex" :limit.sync="student.pageSize"
                  @pagination="selectStudent"/>
      <span slot="footer" class="dialog-footer">
          <el-button @click="studentDialog = false">取 消</el-button>
          <el-button type="primary" @click="confirmStudentSelect">确定</el-button>
     </span>
    </el-dialog>
  </div>
</template>

@@ -128,14 +163,27 @@
import Pagination from '@/components/Pagination'
import QuestionShow from '../question/components/Show'
import examPaperApi from '@/api/examPaper'
import userApi from '@/api/user'
import questionApi from '@/api/question'
import departmentApi from '@/api/department'

import allCascader from '@/components/Cascader'
export default {
  components: { Pagination, QuestionShow },
  components: { Pagination, QuestionShow ,allCascader},

  data () {
    return {
      tags: [],
      depts: [],
      student: {},
      studentDialog: false,
      student: {
        pageIndex: 1,
        pageSize: 5,
        listLoading: true,
        multipleSelection: []
      },
      tableData: [],
      total: 0,
      props: {
        multiple: true
        // lazy: true,
@@ -151,7 +199,9 @@
        //   })
        // }
      },
      depts: [],
      options: [],
      optionsData:[],
      departCascaderProps:{
        multiple: true
      },
@@ -160,7 +210,7 @@
        aggregateSource:'100',
        id: null,
        departmentIds: [],

        menuIds:[],
        subjectId: [],
        paperType: 7,
        limitDateTime: [],
@@ -173,9 +223,11 @@
      subjectFilter: null,
      formLoading: false,
      rules: {

        subjectId: [
          { required: true, message: '请选择课目', trigger: 'change' }
        ],
        deptId: [
          { required: true, message: '请选择部门', trigger: 'change' }
        ],
        paperType: [
          { required: true, message: '请选择试卷类型', trigger: 'change' }
@@ -209,6 +261,9 @@
      console.log(res)
      this.subjectFilter = res.response
    })
    departmentApi.getDeptAdmins().then(res => {
      this.depts = res.response
    })
  },
   async mounted () {

@@ -223,7 +278,9 @@
       await examPaperApi.selfselect(id).then(re => {
         _this.form = re.response
         _this.form.menuIds = JSON.parse(re.response.menuIds)
         _this.optionsData = _this.form.menuIds
         console.log(_this.form)

         _this.formLoading = false
       })
     }
@@ -242,6 +299,33 @@
     // this.subjectIdEvent(false)
   },
  methods: {
    handleSelection (val) {
      this.student.multipleSelection = val
    },
    confirmStudentSelect () {
      this.student.multipleSelection.forEach(q => {
          this.form.menuIds.push(q.id)
      })
      this.studentDialog = false
    },
    getTags () {
      userApi.tagList(null).then(data => {
        this.tags = data.response
      })
    },
    selectStudent() {
     this.getTags();
      this.studentDialog = true;
      examPaperApi.selectStudent(this.student).then(res => {
        this.tableData = res.response.list
        this.total = res.response.total
        this.student.listLoading = false
      })
    },
    cascaderChangeFun(event){
      console.log(event)
      this.form.menuIds = event
    },
    titlejs(val){
      console.log(val)
      let str = ''
@@ -318,12 +402,19 @@
          if (this.subjectIdList.length == 1){
            this.form.subjectId= this.form.subjectId
          };
          let op = [];
          for(var ele of this.form.menuIds){
            op.push(ele[1])
          };

          let lastHasAll = this.form.menuIds.find(arr => {
            return arr[0] === 'all';
          });
          if (lastHasAll){
            this.form.menuIds = this.form.menuIds.slice(1)
          }
          // let op = [];
          // for(var ele of this.form.menuIds){
          //   op.push(ele[1])
          // };
          this.form.userIds = this.form.menuIds;
          this.form.menuIds = JSON.stringify(this.form.menuIds);
          this.form.userIds = op;
          console.log("laks",this.form)
          if(this.form.questionTypeVMS == null){
            this.form.questionTypeVMS = [];