From afbe9b59adba065de73bae66616ed5b1438ba915 Mon Sep 17 00:00:00 2001
From: njdaoyehu <vmuser!>
Date: Mon, 26 May 2025 17:00:24 +0800
Subject: [PATCH] fixed

---
 public/预埋件信息.xlsx         | Bin 10124 -> 10135 bytes
 src/assets/style.css           |   5 +
 src/utils/http/axios/index.ts  |   2 +-
 src/views/data/task/drawer.vue | 181 ++++++++++++++++++++-------------
 src/views/data/task/schema.ts  |   2 +-
 5 files changed, 120 insertions(+), 70 deletions(-)

diff --git a/public/预埋件信息.xlsx b/public/预埋件信息.xlsx
index 5e38b3cd22b3baea00b8599885762f12142fc3f1..f21283c4e9ff020c176d6633b29f4ce83f734f49 100644
GIT binary patch
delta 1092
zcmeD2pYFe5G9#-{#L4@ilV>o>)jRqfHV|<A?r}%)likM2mx3ZawHRM@DXDaI-H7~V
z(mTsyVy;Iun}D|k-*U!vjgz-1it0?*^YM@U`Fb}#_1QMXa*i*zOc4BJ+axn#kHAVF
zr4sA;yON(|9A1(Tsi^1_eIY|gUcPnDl05+hYrBM|csg27Q!#y-+7fnbib(R=@Co(C
zZzJ2cJlYgsY5Z-KP>j*OG|mSN69ms4G&sm}*z|&~wbCs`*7p;hHlLDecpzbP!cnTX
z_WW`CIA*Qu^=2ks=VvZYi@r6ptnhcv!RU>}`6ag`SFifC%2D|6v+p18zWKCF@~Us@
zUTr=NKGx+ijK-~9>x1@{iTS80z6*WLo8~inW_|28Bi6!gz5C<l+1<Nu7eC+mPxO`}
zX$@lBhc-^kus#qM$#YKsS+EGZio~uX^DfTe(U1&wdiQ!e|F72_xr+Byf3O>FaGB3{
z{L7Oq?su3UseOOAy<<OPfHyOX2m=EH2SdBxBZn+|CPOVo1_nVU1_oiEXi9!^Kv8}{
zv3_!C@nn5w;rdCxXYjwivS^x=a!+i|hIQMWO|~_uO*)d7`ewiW($~lI$~MQ!ojZN_
z^SsIH;*KA*=E$v5HFl`su~C%1`mJbs<8oit<Oh<`r?<&X5s|duVh;QHHT2hlt14UG
zwtkdxn#J>G?c8Y`Gt=~s-TINIdv{rI)ta@^U-?$9do3NfDow6+OMORDP4ldq5vGS;
za<iY?^Yq|9(VMHDrKE40{rE}A=P$x_Uv^#mmdkeU)P$+29nKz=hZGJjY4DujB5+*d
za?>WQ$j{{ue3u)r&RgRi{&!lg?CXT-hrcAPIrq4WRq*kgfJ5R_HqX%268dPM!yLAu
z^ruggNbT|9l8Zl<2NVeIs@_v>t8jbg#-n%m--f-AuM=q(5qh<I`L8JxI{u_J`(3yC
zZ}gvGawCh><SG_NmOaeRdN%K8DQ0B+y4jdbiG$PAa`K`GV9=UQj^n#uzir3Eo7di@
zUoNwoYaqDB`SHzLNA;iUF}<p|c!xP9W6|r1U910R{x2)JIK4Y+-nsX6o2qYrw!Qqp
ztNCu*I%}q+(mcJk+=&*c^WH@KE~)?gdD+|q(eq+k_Q%*dGhc2HKdo+icPmfQshz$O
z&zhas@0v~!a1by3)NQcAWCKqzSAm&`fq~<6UISBu3ttTlja)rmFfYE#xA`Rh1!2ZV
zlV>SAFnUkEt!&JgKbc=;GBgJ+SFw^oPaeP&!obL&03<n?Co3|GPX3}MGg(iSk1=Jk
zt*Qaz^vQXuW=#7OCZAW3(GKutWD;ROBsF+=0FxR>6a*k<c~5?;>d1I*vc8%X<L}8?
zYG#Z|lNYKvFkYSfNX>?^b+Wv=qBJOYMVJ{F>^T@1Bp{lhx;IXaR@Y{$QU(bE0R2$R
AQvd(}

delta 1029
zcmV+g1p51zPmE8nlK}<vK7x5slb8V>f6+?AFcgOG1>d3MzD>HhA))O+WmirFCll{N
za@LhKX-T5po<Z?aAIGOrU&FNBYKLA3xykwe^W{H>M3aroy+_a{D^!fafFKVPFGQx&
z7~RgN{weZ|WlFHTP!OXn7&J+ak0M@DUTC=1MG4wwU_3`shVn8-D{D)NvEeI_f6N5V
zp`5rZv}D#@b&5;I*DM7*AY_asSSFZdxCZ)VM?^cM;2pAj(0Kz8977Hglr=aELj2>k
zpr!e<p;3BHnb~dWX4=K=vjuO(&b={NXRN9!sD@1pmp{aJv&)-iR6kSot~j715}a}k
z%oaMi%J|w_FqKBQSFJagGh=6NW7*3L#Mw6adU^VIfBSrWj__~M5t{*8EC|m<qU`{C
zWidRzm`_nMAcK)l+!@cwkdjkM$bJ3xL4O^wEy!Jhe-cM@MCeJ_Bklo7ll$;nB;Qa=
z0|XQR000O8hfd-^fYh6<lN$poe<Amp59`#TmKr0BU2L$fw?j0xf=R^0Ze{GhFQx0o
zE_SnB9?r|d^PZEgUgZD|Vlur}86-Z2K&VEyz1n5)X;XPI1jg2?tp}|{29LtPRepVy
zK1_NPlkJ584xvm2_tuU}giNy+vNpb3E4S(NBx~!&X@_*z^^GWXGfSZ?f1()Qpk_8!
zOK<$b!831puzy9ix;fdI?dCW--8}t-A3-N=-)8Ww3|U!*IP@q_m`5-vyd+2>562kO
zg0d=E^LGfwQ<y@aYU!%qvaMqs>~a`ijGgkhVnM_>CzS97<t%24ibOmN%YYSZT|Sc_
zMc?rhT{QkF6kLSv9`9YxAa-tSG515e71IwtibLuV>bs}<6i4ymHyd=i*7=wD2ap<*
zegr`TkQn*Vv%>^)0RhdkHwGdI3Bb5sf>8kg056kb4&Q$^ZRgVo6TxaVo~>Q{a_%Ca
z+850|K!zr|+NZnvpZ0G@7k#;?<>~zHC%d;j-!l!bG}u+>x+5S~=jLMA7Ku~l$&R&8
z_cuRp+6h+iY(e|W)iX3O4S2D9($ihbAf}w#gke4?T+m$u2?2CbC%*^-O9RU=rvPUI
z0~2)F08<SE16>~zBU6NgJ}|=Vv(yjJ69Lzgr6WKDKpy}AlYb=^lm8<c0c4XJB$Ea7
zK7x5sld>c_1c20=t&{L176Ap52PHrUU<3dFcx*3||0W!hY9$T<jFWjKHUYDfuq7=U
zz_?z5Q2_t|F9HAn6aWAK000000RSKX002jm_$5IB!;?BDIsx~SbtX0e9+RvlKmp2=
z?It_{fs-mHAq0>Z`O%Y4Cl&&&1e47K8WvDX1qJ{B000pH5da4S003_z00000LzTeO

diff --git a/src/assets/style.css b/src/assets/style.css
index fefac82..20f4b94 100644
--- a/src/assets/style.css
+++ b/src/assets/style.css
@@ -88,6 +88,11 @@
   padding-top: 10px;
 }
 
+.ant-checkbox-group-item {
+  font-family: "Noto Sans SC", serif;
+  font-size: 14px;
+  color: #FFFFFF;
+}
 .ant-tree-checkbox-inner,
 .ant-checkbox-inner {
   border: 1px solid rgba(45, 119, 243, 0.3) !important;
diff --git a/src/utils/http/axios/index.ts b/src/utils/http/axios/index.ts
index 74bae52..9f87f50 100644
--- a/src/utils/http/axios/index.ts
+++ b/src/utils/http/axios/index.ts
@@ -230,7 +230,7 @@ function createAxios(opt?: Partial<CreateAxiosOptions>) {
         // authentication schemes，e.g: Bearer
         // authenticationScheme: 'Bearer',
         authenticationScheme: '',
-        timeout: 10 * 1000,
+        timeout: 60 * 1000,
         // 基础接口地址
         // baseURL: globSetting.apiUrl,
 
diff --git a/src/views/data/task/drawer.vue b/src/views/data/task/drawer.vue
index 98e0d48..71e025b 100644
--- a/src/views/data/task/drawer.vue
+++ b/src/views/data/task/drawer.vue
@@ -4,18 +4,26 @@
     <BasicTable @register="registerTable">
       <template #toolbar>
         <div style="margin-right: 20px; color: #ffffff; font-size: 14px;">共 {{ paramData.length }} 件</div>
-        <a-button type="primary" :icon="h(PlusOutlined)" @click="handleCreate">新 增</a-button>
-        <a-button type="primary" :icon="h(EyeOutlined)" :disabled="importDisabled" @click="handleOpenFileDialog">OCR识别</a-button>
-        <a-button type="primary" :icon="h(FileSyncOutlined)" style="font-size: 10px;" :disabled="importDisabled" @click="handleParamData">根据墙体类型和方向整理OCR识别的数据</a-button>
-        <a-button type="primary" :icon="h(FileExcelOutlined)" :disabled="importDisabled" @click="handleImport">导入Excel</a-button>
-        <Popconfirm
-            title="确定要清空预埋件列表吗?"
-            ok-text="确定"
-            cancel-text="取消"
-            @confirm="handleDeleteAll"
-        >
-          <a-button type="primary" :icon="h(MinusOutlined)">清空列表</a-button>
-        </Popconfirm>
+        <div>
+          <div style="margin-bottom: 10px">
+            <a-button type="primary" style="margin-left: 10px" :icon="h(PlusOutlined)" @click="handleCreate">新 增</a-button>
+            <a-button type="primary" style="margin-left: 10px" :icon="h(EyeOutlined)" :disabled="importDisabled" @click="handleOpenFileDialog">OCR识别</a-button>
+            <a-button type="primary" style="margin-left: 10px" :icon="h(FileExcelOutlined)" :disabled="importDisabled" @click="handleImport">导入Excel</a-button>
+            <Popconfirm
+                title="确定要清空预埋件列表吗?"
+                ok-text="确定"
+                cancel-text="取消"
+                @confirm="handleDeleteAll"
+            >
+              <a-button type="primary" style="margin-left: 10px" :icon="h(MinusOutlined)">清空列表</a-button>
+            </Popconfirm>
+          </div>
+          <div>
+            <span v-if="numberList.length !== 0" style="font-family: 'Noto Sans SC', serif; font-size: 14px; color: #ffffff; padding-right: 10px">{{ valueLabel }}</span>
+            <CheckboxGroup v-if="numberList.length !== 0" v-model:value="numberCheckedList" :options="numberList" />
+            <a-button type="primary" style="margin-left: 10px" :icon="h(FileSyncOutlined)" :disabled="importDisabled" @click="handleParamData">整理OCR数据</a-button>
+          </div>
+        </div>
       </template>
       <template #bodyCell="{ column, record }">
         <template v-if="column.dataIndex === 'x'">
@@ -70,7 +78,7 @@ import { BasicDrawer, useDrawerInner } from '@/components/Drawer';
 import * as TaskApi from '@/api/data/taskApi';
 import { BasicTable, useTable, TableAction } from '@/components/Table';
 import { EyeOutlined, PlusOutlined, MinusOutlined, FileSyncOutlined, FileExcelOutlined } from "@ant-design/icons-vue";
-import { Popconfirm } from 'ant-design-vue';
+import { Popconfirm, CheckboxGroup } from 'ant-design-vue';
 import Modal from "@/views/data/task/modal.vue";
 import { useModal } from '/@/components/Modal';
 const [register, { openModal }] = useModal();
@@ -123,6 +131,10 @@ const columns = [
   },
 ];
 
+const valueLabel = ref<string>("");
+const numberList = ref<any>([]);
+const numberCheckedList = ref<any>([]);
+const paramRawData = ref<any>([]);
 const paramData = ref<any>([]);
 
 const emit = defineEmits(['success', 'register', 'ocrClick']);
@@ -141,6 +153,10 @@ const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (
   setDrawerProps({confirmLoading: false});
   isUpdate.value = !!data?.isUpdate;
   entity.value = data?.record;
+  valueLabel.value = "";
+  numberList.value = [];
+  numberCheckedList.value = [];
+  paramRawData.value = [];
   paramData.value = [];
   const items = entity.value && entity.value.paramJson ? JSON.parse(entity.value.paramJson) : [];
   items.forEach((d: any, index: number) => {
@@ -227,7 +243,7 @@ const handleCreate = () => {
   openModal(true, { isUpdate: false });
 };
 
-const handleEdit = (record: Recordable, index: number) => {
+const handleEdit = (record: Recordable) => {
   openModal(true, { record, isUpdate: true });
 };
 
@@ -315,8 +331,6 @@ const handleValuesChanged = () => {
 
 // OCR识别
 const setParamData = (data: any) => {
-  if (!paramData.value)
-    paramData.value = [];
   data.forEach((d: any) => {
     const items = paramData.value.filter((p: any) => p.code === d.code);
     if (items.length === 0) {
@@ -326,63 +340,94 @@ const setParamData = (data: any) => {
       items[0] = {...d};
     }
   });
-  WebViewService.setMessage('数据导入成功！', "success").then(() => {});
-};
-
-// OCR识别数据整理
-const handleParamData = () => {
-  const data = getFieldsValue();
-  const wallType = data.wallType;
-  const direction = data.direction;
+  numberList.value = [];
+  numberCheckedList.value = [];
+  const wallType = getFieldsValue().wallType;
   // x去重
   const uniqueListX = Array.from(new Map(paramData.value.map((item: any) => [item.x, item])).values());
   // y去重
   const uniqueListY = Array.from(new Map(paramData.value.map((item: any) => [item.y, item])).values());
-  // 墙体类型为 B
-  paramData.value.forEach((d: any) => {
-    if (wallType === "B类" && uniqueListX.length <= 3 && uniqueListY.length > 3) {
-      const nX: any = d["y"];
-      const nY: any = d["x"];
-      d.nX = nX;
-      d.nY = nY;
-    } else {
-      const nX: any = d["x"];
-      const nY: any = d["y"];
-      d.nX = nX;
-      d.nY = nY;
-    }
-  });
-  // 判断正面、背面
-  const uniqueY = Array.from(new Map(paramData.value.map((item: any) => [item.nY, item])).values());
-  const maxY = Math.max(...uniqueY.map((item: any) => Math.abs(Number(item.nY))));
-  const minY = Math.min(...uniqueY.map((item: any) => Math.abs(Number(item.nY))));
-  paramData.value.forEach((d: any) => {
-    if (Math.abs(Number(d.nY)) === minY) {
-      d.zm = 1;
-    } else if (Math.abs(Number(d.nY)) === maxY) {
-      d.zm = 0;
-    } else if (maxY - Math.abs(Number(d.nY)) < Math.abs(Number(d.nY)) - minY) {
-      d.zm = 0;
-    } else {
-      d.zm = 1;
-    }
-  });
-  paramData.value = direction === "正面" ? paramData.value.filter((d: any) => {
-    return d.zm === 1
-  }).map((d: any) => ({...d})) : paramData.value.filter((d: any) => {
-    return d.zm === 0
-  }).map((d: any) => ({...d}));
-  paramData.value.forEach((d: any) => {
-    if (d.hasOwnProperty("zm")) {
-      delete d.zm;
-    }
-    if (d.hasOwnProperty("nX")) {
-      delete d.nX;
-    }
-    if (d.hasOwnProperty("nY")) {
-      delete d.nY;
-    }
+  if (wallType === "B类" && uniqueListX.length <= 3 && uniqueListY.length > 3) {
+    valueLabel.value = "选择X值:";
+    uniqueListX.forEach((item: any) => { numberList.value.push(item.x); });
+  }
+  if (wallType === "A类" && uniqueListY.length <= 3 && uniqueListX.length > 3) {
+    valueLabel.value = "选择Y值:";
+    uniqueListY.forEach((item: any) => { numberList.value.push(item.y); });
+  }
+};
+
+// OCR识别数据整理
+const handleParamData = () => {
+  if (valueLabel.value === "") return;
+
+  if (numberCheckedList.value.length === 0) {
+    WebViewService.setMessage('没有' + valueLabel.value, 'information').then(() => {});
+    return;
+  }
+
+  if (paramRawData.value.length === 0) {
+    paramData.value.forEach((d: any) => {
+      paramRawData.value.push({ ...d });
+    })
+  }
+
+  paramData.value = paramRawData.value.filter((d: any) => {
+    return (valueLabel.value.includes("X") && numberCheckedList.value.join(",").includes(d.x)) ||
+        (valueLabel.value.includes("Y") && numberCheckedList.value.join(",").includes(d.y))
   });
+  // const data = getFieldsValue();
+  // const wallType = data.wallType;
+  // const direction = data.direction;
+  // x去重
+  // const uniqueListX = Array.from(new Map(paramData.value.map((item: any) => [item.x, item])).values());
+  // // y去重
+  // const uniqueListY = Array.from(new Map(paramData.value.map((item: any) => [item.y, item])).values());
+  // // 墙体类型为 B
+  // paramData.value.forEach((d: any) => {
+  //   if (wallType === "B类" && uniqueListX.length <= 4 && uniqueListY.length > 3) {
+  //     const nX: any = d["y"];
+  //     const nY: any = d["x"];
+  //     d.nX = nX;
+  //     d.nY = nY;
+  //   } else {
+  //     const nX: any = d["x"];
+  //     const nY: any = d["y"];
+  //     d.nX = nX;
+  //     d.nY = nY;
+  //   }
+  // });
+  // // 判断正面、背面
+  // const uniqueY = Array.from(new Map(paramData.value.map((item: any) => [item.nY, item])).values());
+  // const maxY = Math.max(...uniqueY.map((item: any) => Math.abs(Number(item.nY))));
+  // const minY = Math.min(...uniqueY.map((item: any) => Math.abs(Number(item.nY))));
+  // paramData.value.forEach((d: any) => {
+  //   if (Math.abs(Number(d.nY)) === minY) {
+  //     d.zm = 1;
+  //   } else if (Math.abs(Number(d.nY)) === maxY) {
+  //     d.zm = 0;
+  //   } else if (maxY - Math.abs(Number(d.nY)) < Math.abs(Number(d.nY)) - minY) {
+  //     d.zm = 0;
+  //   } else {
+  //     d.zm = 1;
+  //   }
+  // });
+  // paramData.value = direction === "正面" ? paramData.value.filter((d: any) => {
+  //   return d.zm === 1
+  // }).map((d: any) => ({...d})) : paramData.value.filter((d: any) => {
+  //   return d.zm === 0
+  // }).map((d: any) => ({...d}));
+  // paramData.value.forEach((d: any) => {
+  //   if (d.hasOwnProperty("zm")) {
+  //     delete d.zm;
+  //   }
+  //   if (d.hasOwnProperty("nX")) {
+  //     delete d.nX;
+  //   }
+  //   if (d.hasOwnProperty("nY")) {
+  //     delete d.nY;
+  //   }
+  // });
   WebViewService.setMessage('数据整理完成！', "success").then(() => {});
 }
 
diff --git a/src/views/data/task/schema.ts b/src/views/data/task/schema.ts
index 7e0c7e9..4e98682 100644
--- a/src/views/data/task/schema.ts
+++ b/src/views/data/task/schema.ts
@@ -98,7 +98,7 @@ export const schema = {
     },
     {
       field: 'direction',
-      label: '方向',
+      label: '检测方向',
       defaultValue: undefined,
       form: {
         colProps,