fix

src/pages/allocationReview/list/index.vue

@@ -305,7 +305,7 @@ export default {
         i: 1,
         url: `${this.$route.path}?${Qs.stringify(this.filter)}&page=${this.page}&pageSize=${this.pageSize}`
       })
-      localStorage.setItem('review_row', JSON.stringify(row))
+      localStorage.setItem('reviewRow', JSON.stringify(row))
       this.$router.push(`records?competitionId=${row.id}&stageId=${row.stageId}`)
     },
   }

src/pages/allocationReview/list/setup.vue

@@ -36,7 +36,7 @@
             </el-form-item>
             <el-form-item prop="name" label="每题的评阅人数">
               <el-input class="hide-spin" style="width: 200px;" placeholder="请输入" type="number"
-                v-model.number="form.reviewersPerQuestion" /> 人
+                v-model.number="form.reviewersPerQuestion" />&emsp;人<span class="fs-12">（人工判分题和整体评分表的评阅人数）</span>
             </el-form-item>
             <el-form-item prop="name" label="人工判分题最终得分">
               <el-radio-group v-model="form.scoreAggregationRule">
@@ -65,13 +65,14 @@
 
         <el-form class="info" label-width="110px" disabled>
           <h6>答卷信息</h6>
-          <el-form-item prop="name" label="答卷信息">
+          <el-form-item prop="name" label="答卷类型">
             <el-radio v-for="(item, i) in types" v-model="row.method" :key="i" :label="item.id">{{ item.name
               }}</el-radio>
           </el-form-item>
-          <el-form-item prop="name" label="题目判分类型">
+          <el-form-item prop="name" label="判分类型">
             <el-checkbox v-model="row.hasAutoScoreType" :true-label="1">自动判分题</el-checkbox>
             <el-checkbox v-model="row.hasManualScoreType" :true-label="1">人工判分题</el-checkbox>
+            <el-checkbox v-model="row.hasManualScoreType1" :true-label="1">整体评分表评分</el-checkbox>
           </el-form-item>
           <el-form-item prop="name" label="成绩是否公布">
             <el-radio v-model="row.resultsDetails" :label="0">是</el-radio>
@@ -198,22 +199,29 @@ export default {
         await this.$post(this.api.evaluationSave, form)
         this.submiting = false
 
-        try {
+        if (this.$route.path === '/allocationReview/list') {
-          await this.$confirm('保存成功！', '提示', {
+          try {
-            confirmButtonText: '前往任务分配',
+            await this.$confirm('保存成功！', '提示', {
-            cancelButtonText: '关闭',
+              confirmButtonText: '前往任务分配',
-            type: 'warning',
+              cancelButtonText: '关闭',
-            closeOnClickModal: false,
+              type: 'warning',
-          })
+              closeOnClickModal: false,
-          this.$router.push(`records`)
+            })
-        } catch (e) {
+            this.$router.push(`records?competitionId=${row.id}&stageId=${row.stageId}`)
-          this.$parent.initData()
+          } catch (e) {
-          this.setupVisible = false
+            this.close()
+          }
+        } else {
+          this.close()
         }
       } catch (e) {
         this.submiting = false
       }
     },
+    close () {
+      this.$parent.initData()
+      this.setupVisible = false
+    },
     // 弹框关闭回调
     closeDia () {
       this.$emit('update:visible', false)

src/pages/allocationReview/records/allocation.vue

@@ -17,9 +17,9 @@
           </ul>
         </div>
 
-        <!-- <People /> -->
+        <People />
 
-        <div>
+        <!-- <div>
           <div class="flex a-center m-b-10">
             <h6 class="page-name m-r-10" style="margin-bottom: 0">选择评阅人员</h6>
             <el-button type="primary" size="mini" @click="batchAlloc">批量分配</el-button>
@@ -33,9 +33,9 @@
               <template slot-scope="scope">
                 <i class="el-icon-edit-outline"></i>
               </template>
-            </el-table-column>
+</el-table-column>
-          </el-table>
+</el-table>
-        </div>
+</div> -->
       </div>
 
       <div class="btns">

src/pages/allocationReview/records/index.vue

@@ -153,7 +153,7 @@ export default {
     },
   },
   mounted () {
-    const row = localStorage.getItem('review_row')
+    const row = localStorage.getItem('reviewRow')
     if (row) this.curRow = JSON.parse(row)
     const { referrer1 } = this.$store.state.user
     this.crumbs = [
@@ -232,8 +232,8 @@ export default {
     },
     // 清除省份
     clearprovince () {
-      this.filter.cityId = '',
+      this.filter.cityId = ''
-        this.filter.realSchoolId = ''
+      this.filter.realSchoolId = ''
     },
     // 省份选择回调
     provinceChange () {

src/pages/allocationReview/records/people.vue

@@ -9,7 +9,7 @@
         </el-radio-group>
 
         <el-tree :data="nakadais" default-expand-all ref="nakadais" node-key="id" highlight-current
-          :expand-on-click-node="false" @node-click="getNakadaiUser"
+          :expand-on-click-node="false" @node-click="depClick"
           :props="{ children: 'children', label: 'organizationName', isLeaf: 'leaf' }"></el-tree>
       </div>
       <div class="item">
@@ -82,6 +82,7 @@ export default {
   data () {
     return {
       nakadais: [],
+      curDep: {},
       searchTimer: null,
 
       userType: 0,
@@ -106,11 +107,12 @@ export default {
     },
   },
   mounted () {
-    this.getNakadais()
+    this.getNakadaiDep()
+    this.getNakadaiUser()
   },
   methods: {
     // 获取中台部门
-    async getNakadais () {
+    async getNakadaiDep () {
       const res = await this.$post(this.api.treeListArch)
       const list = res.treeList
       this.handleList(list)
@@ -126,53 +128,29 @@ export default {
         }
       })
     },
-    async getNakadaiUser (data) {
+    // 部门点击
-      console.log(11, data)
+    depClick (data) {
+      this.curDep = data
+      this.userCheck = false
+      this.getNakadaiUser()
+    },
+    // 查询中台用户
+    async getNakadaiUser () {
       const { page } = await this.$post(this.api.staffList, {
         type: 1,
-        staffArchitectureId: data.id || '',
+        staffArchitectureId: this.curDep.id || '',
         keyWord: this.userKeyword,
         pageNum: 1,
         pageSize: 1000
       })
-      this.users = page.records
+      const list = page.records
-    },
+      const { checked } = this
-    nakadaiClick () {
+      list.forEach(e => {
-
+        e.check = !!checked.find(n => n.userId === e.userId)
-    },
-    // 获取题库
-    async getQuesBank () {
-      try {
-        const type = this.quesBankTypeVal
-        const res = await this.$post(this.api.questionBankList, {
-          status: 1,
-          pageNum: 1,
-          pageSize: 1000,
-          questionCategoryId: type.length ? type[type.length - 1] : '',
-          name: this.quesBankKeyword
-        })
-        this.quesBanks = res.message.records
-        this.totalQuesBank = res.message.total
-      } catch (e) { }
-    },
-    // 题目多选回调
-    questionBankClick (item) {
-      this.curQuesBank = item
-      this.userCheck = false
-      this.getKnowledgeType()
-      this.getKnowledge()
-    },
-
-    // 处理树形
-    handleList (list) {
-      list.map(e => {
-        if (e.children && e.children.length) {
-          this.handleList(e.children)
-        } else {
-          delete e.children
-        }
       })
+      this.users = list
     },
+
     // 用户全选回调
     userAllCheckChange (val) {
       this.users.map(e => {
@@ -195,10 +173,6 @@ export default {
         cur >= 0 && this.checked.splice(cur, 1)
       }
     },
-    // 处理大纲列表
-    handleQuesList () {
-      this.list = _.cloneDeep(this.$parent.form.paperOutline)
-    },
     // 已选全选回调
     checkedAllCheckChange (val) {
       this.checked.map(e => e.check = val)