zhangjie 7 сар өмнө
parent
commit
d6cf45a5b7

+ 8 - 0
src/render/utils/tool.ts

@@ -405,3 +405,11 @@ export function getBoxImageSize({
   imageSize.top = (box.height - imageSize.height) / 2;
   return imageSize;
 }
+
+export function recogResultTransform(val: string): string {
+  const trans = {
+    "#": "空",
+    "?": "异常",
+  };
+  return trans[val] || val;
+}

+ 8 - 17
src/render/views/DataCheck/ModifyPaperType.vue

@@ -23,24 +23,12 @@
       <a-form-item label="更改卷型">
         <ul class="type-list">
           <li
-            :class="['type-item', { 'is-active': paperType === '#' }]"
-            @click="selectPaperType('#')"
-          >
-            空
-          </li>
-          <li
-            v-for="item in paperTypeBarcodeContent"
+            v-for="item in typeOptions"
             :key="item"
             :class="['type-item', { 'is-active': paperType === item }]"
             @click="selectPaperType(item)"
           >
-            {{ item }}
-          </li>
-          <li
-            :class="['type-item', { 'is-active': paperType === '?' }]"
-            @click="selectPaperType('?')"
-          >
-            异常
+            {{ recogResultTransform(item) }}
           </li>
         </ul>
       </a-form-item>
@@ -55,6 +43,7 @@ import { message } from "ant-design-vue";
 import { getBaseDataConfig } from "@/ap/baseDataConfig";
 import { useUserStore, useDataCheckStore } from "@/store";
 import useModal from "@/hooks/useModal";
+import { recogResultTransform } from "@/utils/tool";
 
 defineOptions({
   name: "ModifyPaperType",
@@ -78,9 +67,11 @@ const userStore = useUserStore();
 const paperType = ref("");
 
 const areaResultDisplay = computed(() => {
-  if (props.areaResult === "#") return "空";
-  if (props.areaResult === "?") return "异常";
-  return props.areaResult;
+  return recogResultTransform(props.areaResult);
+});
+
+const typeOptions = computed(() => {
+  return ["#", ...paperTypeBarcodeContent.value, "?"];
 });
 
 async function getConfig() {

+ 2 - 4
src/render/views/DataCheck/QuestionPanel.vue

@@ -110,7 +110,7 @@ import ModifyPaperType from "./ModifyPaperType.vue";
 import { useDataCheckStore } from "@/store";
 
 import { vEleClickOutsideDirective } from "@/directives/eleClickOutside";
-import { getSliceFileUrl } from "@/utils/tool";
+import { getSliceFileUrl, recogResultTransform } from "@/utils/tool";
 
 // defineOptions({
 //   name: "QuestionPanel",
@@ -232,9 +232,7 @@ const paperTypeResult = ref("");
 const paperTypeOrcResult = ref("");
 const paperTypeType = ref("");
 const paperTypeDisplay = computed(() => {
-  if (paperTypeResult.value === "#") return "空";
-  if (paperTypeResult.value === "?") return "异常";
-  return paperTypeResult.value;
+  return recogResultTransform(paperTypeResult.value);
 });
 function onEditPaperType() {
   if (!dataCheckStore.curPage) return;

+ 2 - 2
src/render/views/DataCheck/ScanImage/RecogEditDialog.vue

@@ -59,7 +59,7 @@
               :key="option"
               :type="selectResult.includes(option) ? 'primary' : 'default'"
               @click="selectOption(option)"
-              >{{ option === "#" ? "空" : option }}</a-button
+              >{{ recogResultTransform(option) }}</a-button
             >
           </div>
         </div>
@@ -79,7 +79,7 @@ import { ref, computed, watch } from "vue";
 import { message } from "ant-design-vue";
 import useModal from "@/hooks/useModal";
 import { RecogBlock } from "@/utils/recog/recog";
-import { getBoxImageSize } from "@/utils/tool";
+import { getBoxImageSize, recogResultTransform } from "@/utils/tool";
 import { useUserStore } from "@/store";
 
 defineOptions({

+ 2 - 2
src/render/views/RecognizeCheck/RecogArbitrateEditDialog.vue

@@ -66,7 +66,7 @@
               :key="option"
               :type="selectResult.includes(option) ? 'primary' : 'default'"
               @click="selectOption(option)"
-              >{{ option === "#" ? "空" : option }}</a-button
+              >{{ recogResultTransform(option) }}</a-button
             >
           </div>
         </div>
@@ -87,7 +87,7 @@ import { message } from "ant-design-vue";
 import useModal from "@/hooks/useModal";
 
 import { RecognizeArbitrateTaskDetail } from "@/ap/types/recognizeCheck";
-import { getBoxImageSize } from "@/utils/tool";
+import { getBoxImageSize, recogResultTransform } from "@/utils/tool";
 import { useUserStore } from "@/store";
 
 defineOptions({

+ 1 - 1
src/render/views/RecognizeCheck/RecognizeArbitrate.vue

@@ -211,7 +211,7 @@ function parseDetails(
           0,
           []
         ),
-        options: ["#", ...paperTypeBarcodeContent.value],
+        options: ["#", ...paperTypeBarcodeContent.value, "?"],
         result1: page.paperType ? page.paperType[0] : "",
         result2: page.paperType ? page.paperType[1] : "",
         pageIndex: page.index,