odc.xiaohui
2023-06-15 d1e5f96ad319e7ab035317b0f1e9a03e83d5de4f
修改课目列表
12个文件已修改
53 ■■■■ 已修改文件
src/store/modules/exam.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/education/subject/edit.vue 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/education/subject/list.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/exam/paper/edit.vue 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/exam/paper/list.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/exam/question/edit/gap-filling.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/exam/question/edit/multiple-choice.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/exam/question/edit/short-answer.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/exam/question/edit/single-choice.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/exam/question/edit/true-false.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/exam/question/list.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/task/edit.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/store/modules/exam.js
@@ -12,7 +12,7 @@
      for (let k of key) {
        // console.log(j,k)
            if (j.id ==k){
              str+= j.name + ' ( ' + j.levelName + ' )'+'  /'
              str+= j.name + '  /'
            }
      }
    }
src/views/education/subject/edit.vue
@@ -5,11 +5,11 @@
      <el-form-item label="课目:" required>
        <el-input v-model="form.name"></el-input>
      </el-form-item>
      <el-form-item label="部门:" required>
        <el-select  ref="departRef" v-model="form.level" placeholder="部门">
          <el-option v-for="item in depart" :key="item.id" :value="item.id" :label="item.name"></el-option>
        </el-select>
      </el-form-item>
<!--      <el-form-item label="部门:" required>-->
<!--        <el-select  ref="departRef" v-model="form.level" placeholder="部门">-->
<!--          <el-option v-for="item in depart" :key="item.id" :value="item.id" :label="item.name"></el-option>-->
<!--        </el-select>-->
<!--      </el-form-item>-->
      <el-form-item>
        <el-button type="primary" @click="submitForm">提交</el-button>
        <el-button @click="resetForm">重置</el-button>
@@ -66,9 +66,9 @@
    submitForm () {
      let _this = this
      this.formLoading = true
      console.log(_this.$refs.departRef.selected.label)
      // console.log(_this.$refs.departRef.selected.label)
      // this.form.levelName = this.enumFormat(this.levelEnum, this.form.level)
      this.form.levelName = _this.$refs.departRef.selected.label
      // this.form.levelName = _this.$refs.departRef.selected.label
      subjectApi.edit(this.form).then(data => {
        if (data.code === 1) {
          _this.$message.success(data.message)
src/views/education/subject/list.vue
@@ -18,7 +18,7 @@
    <el-table v-loading="listLoading" :data="tableData" border fit highlight-current-row style="width: 100%">
      <el-table-column prop="id" label="Id" />
      <el-table-column prop="name" label="课目"/>
      <el-table-column prop="levelName" label="部门" />
<!--      <el-table-column prop="levelName" label="部门" />-->
      <el-table-column width="220px" label="操作" align="center">
        <template slot-scope="{row}">
          <router-link :to="{path:'/education/subject/edit', query:{id:row.id}}" class="link-left">
src/views/exam/paper/edit.vue
@@ -11,7 +11,7 @@
        <el-select ref="subjectIdRef" v-model="form.subjectId" placeholder="课目" multiple
                   collapse-tags  @visible-change="subjectIdEvent" >
          <el-option v-for="item in subjectFilter" :key="item.id" :value="item.id"
                     :label="item.name+' ( '+item.levelName+' )'"></el-option>
                     :label="item.name+' '"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="试卷类型:" prop="paperType" required>
@@ -269,14 +269,15 @@
      // this.subjectFilter = this.subjects.filter(data =>{
      //   return this.form.departmentIds.forEach(item=>{data.level == item})
      // })
      this.subjectFilter = []
      this.form.departmentIds.forEach(item=>{
        this.subjects.forEach(jectitem=>{
          if (item==jectitem.level){
            this.subjectFilter.push(jectitem)
          }
        })
      })
      //
      // this.subjectFilter = []
      // this.form.departmentIds.forEach(item=>{
      //   this.subjects.forEach(jectitem=>{
      //     if (item==jectitem.level){
      //       this.subjectFilter.push(jectitem)
      //     }
      //   })
      // })
      console.log(this.subjects,this.form.departmentIds)
      // this.subjectFilter = this.subjects
    },
src/views/exam/paper/list.vue
@@ -11,7 +11,7 @@
      </el-form-item>
      <el-form-item label="课目:" >
        <el-select v-model="queryParam.subjectId"  clearable>
          <el-option v-for="item in subjectFilter" :key="item.id" :value="item.id" :label="item.name+' ( '+item.levelName+' )'"></el-option>
          <el-option v-for="item in subjectFilter" :key="item.id" :value="item.id" :label="item.name+' '"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item>
src/views/exam/question/edit/gap-filling.vue
@@ -9,7 +9,7 @@
      <el-form-item label="课目:" prop="subjectIds" required>
        <el-select v-model="form.subjectIds" placeholder="课目"  multiple
                   collapse-tags>
          <el-option v-for="item in subjectFilter" :key="item.id" :value="item.id" :label="item.name+' ( '+item.levelName+' )'"></el-option>
          <el-option v-for="item in subjectFilter" :key="item.id" :value="item.id" :label="item.name+' '"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="题干:" prop="title" required>
src/views/exam/question/edit/multiple-choice.vue
@@ -9,7 +9,7 @@
      <el-form-item label="课目:" prop="subjectIds" required>
        <el-select v-model="form.subjectIds" placeholder="课目"  multiple
                   collapse-tags>
          <el-option v-for="item in subjectFilter" :key="item.id" :value="item.id" :label="item.name+' ( '+item.levelName+' )'"></el-option>
          <el-option v-for="item in subjectFilter" :key="item.id" :value="item.id" :label="item.name+' '"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="题干:" prop="title" required>
src/views/exam/question/edit/short-answer.vue
@@ -9,7 +9,7 @@
      <el-form-item label="课目:" prop="subjectIds" required>
        <el-select v-model="form.subjectIds" placeholder="课目"  multiple
                   collapse-tags>
          <el-option v-for="item in subjectFilter" :key="item.id" :value="item.id" :label="item.name+' ( '+item.levelName+' )'"></el-option>
          <el-option v-for="item in subjectFilter" :key="item.id" :value="item.id" :label="item.name+' '"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="题干:" prop="title" required>
src/views/exam/question/edit/single-choice.vue
@@ -9,7 +9,7 @@
      <el-form-item label="课目:" prop="subjectIds" required>
        <el-select v-model="form.subjectIds" placeholder="课目"  multiple
                   collapse-tags>
          <el-option v-for="item in subjectFilter" :key="item.id" :value="item.id" :label="item.name+' ( '+item.levelName+' )'"></el-option>
          <el-option v-for="item in subjectFilter" :key="item.id" :value="item.id" :label="item.name+' '"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="题干:" prop="title" required>
src/views/exam/question/edit/true-false.vue
@@ -9,7 +9,7 @@
      <el-form-item label="课目:" prop="subjectIds" required>
        <el-select v-model="form.subjectIds" placeholder="课目"  multiple
                   collapse-tags>
          <el-option v-for="item in subjectFilter" :key="item.id" :value="item.id" :label="item.name+' ( '+item.levelName+' )'"></el-option>
          <el-option v-for="item in subjectFilter" :key="item.id" :value="item.id" :label="item.name+' '"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="题干:" prop="title" required>
src/views/exam/question/list.vue
@@ -16,7 +16,7 @@
      <el-form-item label="课目:">
        <el-select v-model="queryParam.subjectId" clearable>
          <el-option v-for="item in subjectFilter" :key="item.id" :value="item.id"
                     :label="item.name+' ( '+item.levelName+' )'"></el-option>
                     :label="item.name+' '"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="题型:">
src/views/task/edit.vue
@@ -33,7 +33,7 @@
      <el-form :model="paperPage.queryParam" ref="queryForm" :inline="true">
        <el-form-item label="课目:" >
          <el-select v-model="paperPage.queryParam.subjectId"  clearable>
            <el-option v-for="item in paperPage.subjectFilter" :key="item.id" :value="item.id" :label="item.name+' ( '+item.levelName+' )'"></el-option>
            <el-option v-for="item in paperPage.subjectFilter" :key="item.id" :value="item.id" :label="item.name+' '"></el-option>
          </el-select>
        </el-form-item>
        <el-form-item>