模型判分修复

src/components/Panel/index.vue

@@ -496,16 +496,19 @@ const submit = async () => {
 
       let score = 0;
       // 给判分列表添加分数和运行结果
-       taskList.value.map((e) => {
+      taskList.value.map((e) => {
-         const item = retMap?.scoreInfo.find((n) => n.lcId === e.judgmentId);
+        const item = retMap?.scoreInfo.find((n) => n.lcId === e.judgmentId);
-         if (item) {
+        console.log('🚀 ~ taskList.value.map ~ item:', item);
-           e.examScore = item.questionScore;
+        try {
-           e.finishedResult = item.calculate; // 1：正确，2：错误
+          if (item) {
-           score += item.questionScore; // 计算总分
+            e.examScore = item.questionScore;
-         } else {
+            e.finishedResult = item.calculate; // 1：正确，2：错误
-           e.examScore = 0;
+            score += item.questionScore; // 计算总分
-         }
+          } else {
-       });
+            e.examScore = 0;
+          }
+        } catch (e) {}
+      });
       grade.value = score < 10 ? '0' + score : score;
       reportId.value = retMap.reportId;
       Cookies.set('sand-reportId', retMap.reportId);

src/views/Home.vue

@@ -145,6 +145,8 @@ onMounted(() => {
   --line6: 840px;
   --line7: 1000px;
   --line8: 1160px;
+  --line9: 1320px;
+  --line10: 1480px;
   @apply absolute w-[218px] h-[120px] text-white bg-[url('@/assets/images/level/8.png')] bg-[length:100%_100%] bg-no-repeat cursor-pointer;
   &:before,
   &:after {
@@ -355,11 +357,41 @@ onMounted(() => {
       @include verticalLine;
     }
   }
-  &:last-child {
+  &:nth-child(41) {
+    @apply top-[var(--line9)];
     &:before {
       display: none;
     }
   }
+  &:nth-child(42) {
+    @apply top-[var(--line10)] left-[160px];
+  }
+  &:nth-child(43) {
+    @apply top-[var(--line9)] left-[var(--w)];
+  }
+  &:nth-child(44) {
+    @apply top-[var(--line10)] left-[510px];
+  }
+  &:nth-child(45) {
+    @apply top-[var(--line9)] left-[calc(var(--w)*2)];
+  }
+  &:nth-child(46) {
+    @apply top-[var(--line10)] left-[820px];
+  }
+  &:nth-child(47) {
+    @apply top-[var(--line9)] left-[calc(var(--w)*3)];
+  }
+  &:nth-child(48) {
+    @apply top-[var(--line10)] left-[1170px];
+  }
+  &:nth-child(49) {
+    @apply top-[var(--line9)] left-[calc(var(--w)*4)];
+  }
+  // &:last-child {
+  //   &:before {
+  //     display: none;
+  //   }
+  // }
 }
 .arrow {
   @apply fixed bg-[length:100%_100%] bg-no-repeat animate-bounce cursor-pointer;

src/views/config/level/Index.vue

@@ -212,26 +212,30 @@ watch([params, () => route.query], getList);
 const save = async () => {
   if (saveLoading.value) return false;
   saveLoading.value = true;
-  // 编辑
+  try {
-  const param = list.value
+    // 编辑
-    .filter((e) => e.checkpointId)
+    const param = list.value
-    .map((e, i) => {
+      .filter((e) => e.checkpointId)
-      e.serialNumber = i + 1;
+      .map((e, i) => {
-      return {
+        e.serialNumber = i + 1;
-        checkpointId: e.checkpointId,
+        return {
-        customsPassName: e.customsPassName,
+          checkpointId: e.checkpointId,
-        isEnable: e.isEnable,
+          customsPassName: e.customsPassName,
-        serialNumber: e.serialNumber,
+          isEnable: e.isEnable,
-      };
+          serialNumber: e.serialNumber,
-    });
+        };
-  await updatePass(param);
+      });
-  // 新增
+    await updatePass(param);
-  const addList = list.value.filter((e) => !e.checkpointId && e.customsPassName);
+    // 新增
-  await savePass(addList);
+    const addList = list.value.filter((e) => !e.checkpointId && e.customsPassName);
-  getList();
+    await savePass(addList);
-  ElMessage.success('保存成功！');
+    getList();
-  saveLoading.value = false;
+    ElMessage.success('保存成功！');
-  hadChange.value = 0;
+    saveLoading.value = false;
+    hadChange.value = 0;
+  } catch (e) {
+    saveLoading.value = false;
+  }
 };
 // 输入序号排序
 const submitSerial = (row: Record<string, any>, oldIndex: number, newIndex: number) => {
@@ -277,15 +281,17 @@ const cancel = async (row: Record<string, any>) => {
 };
 // 删除
 const handleDelete = async (id: number[]) => {
-  const param = id.map((e) => {
+  try {
-    return {
+    const param = id.map((e) => {
-      checkpointId: e,
+      return {
-      isDel: 1,
+        checkpointId: e,
-    };
+        isDel: 1,
-  });
+      };
-  await updatePass(param);
+    });
-  getList();
+    await updatePass(param);
-  ElMessage.success('删除成功！');
+    getList();
+    ElMessage.success('删除成功！');
+  } catch (e) {}
 };
 // 批量删除
 const delAll = async () => {

src/views/product/bank/Info.vue

@@ -10,7 +10,7 @@
       {{ info.opinionDescription }}
     </div>
     <p class="mb-2 text-sm text-[#333] text-right">审查日期：{{ info.approvalTime }}</p>
-    <p class="mb-2 text-sm text-[#333] text-right">审查员：公瑾</p>
+    <p class="mb-2 text-sm text-[#333] text-right">审查员：{{ userName }}</p>
   </div>
   <div class="info mt-2">
     <h6 class="step-name">一、产品定义</h6>
@@ -123,6 +123,7 @@
 <script setup lang="ts">
 import { ref, computed, watch, defineExpose } from 'vue';
 import { findById } from '@/api/bank';
+import { getTheCurrentUserName } from '@/api/config';
 import { useRouter, useRoute } from 'vue-router';
 import { getStatus } from '@/store/useProduct';
 
@@ -131,6 +132,7 @@ const route = useRoute();
 const id = computed(() => +route.query.id);
 const info = ref<Record<string, any>>({});
 const riskInfo = ref<Record<string, any>>(null);
+const userName = ref<string>();
 
 // 详情
 const getDetail = async () => {
@@ -143,10 +145,16 @@ const getDetail = async () => {
     }
   }
 };
+// 获取审查员姓名
+const getName = async () => {
+  const res = await getTheCurrentUserName();
+  userName.value = res.userName;
+};
 watch(
   () => route.query,
   () => {
     getDetail();
+    getName();
   },
   {
     immediate: true,

src/views/product/strategy/151.vue

@@ -19,7 +19,7 @@
         <div v-if="row.stRecordId == 204"
              class="flex items-center">
           <span class="whitespace-nowrap">{{ row?.recordChildren[0]?.name }}</span>
-          <el-input class="w-[80px] mx-2"
+          <el-input class="w-[150px] mx-2"
                     v-model="row.ruleOne"></el-input>
           <span class="whitespace-nowrap">的信用卡</span>
         </div>
@@ -207,12 +207,13 @@ const addRecord = async (data: Record<string, any>) => {
 
   data[1].ruleOne && rule.push(handleId(234, 81, data[1].ruleOne, preIds + ',204,234', 3));
   data[27].ruleOne && rule.push(handleId(267, 114, data[27].ruleOne === '有' ? 306 : 305, preIds + ',230,267', 1));
-  data[28].ruleOne && rule.push(handleId(268, 115, data[28].ruleOne === '有' ? 308 : 307, preIds + ',231,267', 1));
+  data[28].ruleOne && rule.push(handleId(268, 115, data[28].ruleOne === '有' ? 308 : 307, preIds + ',231,268', 1));
   data.map((e, i) => {
     if (e.stRecordId != 204 && e.stRecordId != 230 && e.stRecordId != 231) {
       const len = e?.recordChildren?.length - 1;
       e?.recordChildren.map((n, j) => {
-        j !== len && rule.push(handleId(n.id, e.subjectId, j ? e.ruleTwo : e.ruleOne, preIds + ',' + e.stRecordId + ',' + n.id, 5));
+        console.log('🚀 ~ e?.recordChildren.map ~ n:', n);
+        j !== len && rule.push(handleId(n.id, n.subjectId, j ? e.ruleTwo : e.ruleOne, preIds + ',' + e.stRecordId + ',' + n.id, 5));
       });
     }
     // 多选框

src/views/product/strategy/156.vue

@@ -48,14 +48,14 @@
         <el-checkbox v-model="row.spouseEnterprise"></el-checkbox>
       </template>
     </el-table-column>
-    <!-- <el-table-column label="可以准入"
+    <el-table-column label="可以准入"
-      min-width="150"
+                     min-width="150"
-                       align="center">
+                     align="center">
-        <template #default="{ row }">
+      <template #default="{ row }">
-          <el-checkbox v-model="row.hitAccess"
+        <el-checkbox v-model="row.admittance"
-                       @change="checkNone(row)"></el-checkbox>
+                     @change="checkNone(row)"></el-checkbox>
-        </template>
+      </template>
-      </el-table-column> -->
+    </el-table-column>
   </el-table>
 
   <div class="flex justify-end">
@@ -106,6 +106,7 @@ const getConfig = async () => {
       temp.myselfWorkplace = !!cur?.myselfWorkplace;
       temp.spouseEnterprise = !!cur?.spouseEnterprise;
       temp.spouseWorkplace = !!cur?.spouseWorkplace;
+      temp.admittance = !!cur?.admittance;
       result.push(temp);
     });
   });
@@ -146,7 +147,7 @@ const span = ({ row, column, rowIndex, columnIndex }: SpanMethodProps) => {
     if (!columnIndex) {
       return {
         rowspan: 1,
-        colspan: 6,
+        colspan: 7,
       };
     } else {
       return {
@@ -156,6 +157,14 @@ const span = ({ row, column, rowIndex, columnIndex }: SpanMethodProps) => {
     }
   }
 };
+const checkNone = (row: Record<string, any>) => {
+  if (row.admittance) {
+    row.myselfEnterprise = false;
+    row.myselfWorkplace = false;
+    row.spouseEnterprise = false;
+    row.spouseWorkplace = false;
+  }
+};
 // 提交
 const submit = async () => {
   let param = [];
@@ -170,6 +179,7 @@ const submit = async () => {
         myselfWorkplace: e.myselfWorkplace ? 1 : 0,
         spouseEnterprise: e.spouseEnterprise ? 1 : 0,
         spouseWorkplace: e.spouseWorkplace ? 1 : 0,
+        admittance: e.admittance ? 1 : 0,
       });
     }
   });
@@ -190,6 +200,7 @@ const addRecord = async (data: Record<string, any>) => {
       e.spouseWorkplace && temp.push(384);
       e.myselfEnterprise && temp.push(385);
       e.spouseEnterprise && temp.push(386);
+      e.admittance && temp.push(758);
       temp.length && rule.push(handleId(e.stRecordId, e.subjectId, temp.join(), preIds + ',' + e.parentId + ',' + e.stRecordId, 1));
     }
   });