bug fix

server.config.ts

@@ -4,10 +4,10 @@ const server: ServerOptions = {
   proxy: {
     '^/?(api|file)/': {
       // target: 'http://192.168.10.41:8200',
-      target: 'http://192.168.10.178:8200',
+      // target: 'http://192.168.10.178:8200',
       // target: 'http://192.168.10.107:8200',
       // target: 'http://cet-test.markingtool.cn',
-      // target: 'http://192.168.10.136:80',
+      target: 'http://192.168.10.136:80',
       // target: 'http://cet-dev.markingtool.cn:8200',
     },
   },

src/modules/marking/assess/index.vue

@@ -48,7 +48,7 @@
       </base-table>
     </div>
 
-    <base-dialog v-model="forceCheckVisible" :title="dialogTitle" destroy-on-close :width="500">
+    <base-dialog v-model="forceCheckVisible" :title="dialogTitle" destroy-on-close :width="550">
       <div class="dialog-body-wrap">
         <div class="q-title flex items-center">
           <img src="../../../assets/images/main_question.png" />
@@ -57,12 +57,15 @@
         <div class="choose-list-box">
           <div class="row">
             <span class="label"> 强制考核卷组： </span>
-            <div class="value">{{ `${model.forceGroupNumber} 试卷共${paperCount}份` }}</div>
+            <div class="value">{{ `${model.forceGroupNumber} （试卷共${paperCount}份）` }}</div>
           </div>
           <div class="row">
             <span class="label"> 分发给： </span>
             <div class="value">
-              {{ previewChecked }}
+              <!-- {{ previewChecked }} -->
+              <div v-for="(item, index) in previewChecked" :key="index">
+                第{{ item.markingGroupNumber }}组（{{ item.names.join('；') }}）
+              </div>
             </div>
           </div>
         </div>
@@ -292,19 +295,32 @@ const questionName = computed(() => {
   })
   return `${target?.label}`
 })
-const previewChecked = ref('')
+const previewChecked = ref<any[]>([])
 const sendHandler = () => {
   const checked: any = treeRef?.value?.getCheckedNodes()
   if (!checked.length) {
     ElMessage.error('请选择评卷员')
     return
   }
-  previewChecked.value = checked
-    .filter((person: any) => !!person.name)
-    .map((person: any) => {
-      return `第${person.markingGroupNumber}组:${person.name}`
-    })
-    .join(';   ')
+  let map: any = {}
+  let arr = checked.filter((person: any) => !!person.name)
+  for (let i = 0; i < arr.length; i++) {
+    if (!map[arr[i].markingGroupNumber + '']) {
+      map[arr[i].markingGroupNumber + ''] = [arr[i].name]
+    } else {
+      map[arr[i].markingGroupNumber + ''].push(arr[i].name)
+    }
+  }
+  previewChecked.value = []
+  for (let k in map) {
+    previewChecked.value.push({ markingGroupNumber: k, names: map[k] })
+  }
+  // previewChecked.value = checked
+  //   .filter((person: any) => !!person.name)
+  //   .map((person: any) => {
+  //     return `第${person.markingGroupNumber}组:${person.name}`
+  //   })
+  //   .join(';   ')
   console.log('checked:', checked)
   forceCheckVisible.value = true
 }
@@ -316,7 +332,7 @@ const sendHandler = () => {
     background-color: #f5f5f5;
     border-radius: 6px;
     padding: 20px;
-    max-height: 600px;
+    max-height: 400px;
     overflow: auto;
     .row {
       display: flex;