From f539747c03959581d8297a38d040746590d1b7e7 Mon Sep 17 00:00:00 2001
From: njdaoyehu <vmuser!>
Date: Thu, 8 May 2025 11:37:08 +0800
Subject: [PATCH] fixed

---
 package.json                       |   1 +
 public/预埋件信息.xlsx             | Bin 0 -> 10124 bytes
 src/assets/custom.scss             |   4 +
 src/assets/style.css               |  18 +++-
 src/components/PdfViewer/index.vue |   3 +-
 src/views/data/task/drawer.vue     | 159 +++++++++++++++++++++++------
 src/views/data/task/index.vue      |  84 +++++++--------
 src/views/data/task/result.vue     | 131 ++++++++++++------------
 src/views/data/task/schema.ts      |  87 +++++++++++++++-
 9 files changed, 347 insertions(+), 140 deletions(-)
 create mode 100644 public/预埋件信息.xlsx

diff --git a/package.json b/package.json
index fad88b4..197bf09 100644
--- a/package.json
+++ b/package.json
@@ -85,6 +85,7 @@
     "lodash-es": "^4.17.21",
     "lodash.get": "^4.4.2",
     "mockjs": "^1.1.0",
+    "moment": "^2.30.1",
     "nprogress": "^0.2.0",
     "path-to-regexp": "^6.2.1",
     "pdfjs-dist": "^4.10.38",
diff --git a/public/预埋件信息.xlsx b/public/预埋件信息.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..5e38b3cd22b3baea00b8599885762f12142fc3f1
GIT binary patch
literal 10124
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

literal 0
HcmV?d00001

diff --git a/src/assets/custom.scss b/src/assets/custom.scss
index 17a3396..10f02ac 100644
--- a/src/assets/custom.scss
+++ b/src/assets/custom.scss
@@ -256,6 +256,10 @@
   height: 36px !important;
 }
 
+:deep(.ant-select-disabled .ant-select-selection-item) {
+  color: #bbbbbb !important;
+}
+
 :deep(.ant-pagination-options .ant-select-selector) {
   height: 28px !important;
 }
diff --git a/src/assets/style.css b/src/assets/style.css
index 2d3da5d..fefac82 100644
--- a/src/assets/style.css
+++ b/src/assets/style.css
@@ -36,6 +36,17 @@
   border: none;
 }
 
+.ant-btn-primary:disabled,
+.ant-btn-primary:disabled:hover {
+  color: #AAAAAA !important;
+  background-color: #3793d4;
+  box-shadow: inset 0 0 20px 2px #006CC6;
+}
+
+.ant-btn-primary:disabled svg {
+  color: #AAAAAA !important;
+}
+
 .ant-btn-default {
   font-family: "Noto Sans SC", serif;
   font-size: 14px;
@@ -59,13 +70,16 @@
 }
 
 .ant-btn-default:disabled,
-.ant-btn-default:disabled:hover,
-.ant-btn-default:disabled svg {
+.ant-btn-default:disabled:hover {
   color: #AAAAAA !important;
   background-color: rgba(58,98,203,0.8);
   box-shadow: inset 0 0 20px 2px #3A62CB;
 }
 
+.ant-btn-default:disabled svg {
+  color: #AAAAAA !important;
+}
+
 .ant-spin-container {
   margin: 0 5px;
 }
diff --git a/src/components/PdfViewer/index.vue b/src/components/PdfViewer/index.vue
index 50a1255..10c804f 100644
--- a/src/components/PdfViewer/index.vue
+++ b/src/components/PdfViewer/index.vue
@@ -35,7 +35,7 @@
     data() {
       return {
         open: false,
-        zoomLevel: 1,
+        zoomLevel: 1.75,
         start: false,
         selection: null,
         startPoint: null,
@@ -59,7 +59,6 @@
         const viewport = page.getViewport({scale: this.zoomLevel});
         const canvas = this.$refs.pdfCanvas;
         const context = canvas.getContext('2d');
-        console.log(viewport.width + '' + viewport.height);
         canvas.width = viewport.width;
         canvas.height = viewport.height;
         await page.render({
diff --git a/src/views/data/task/drawer.vue b/src/views/data/task/drawer.vue
index d375037..38ba8bb 100644
--- a/src/views/data/task/drawer.vue
+++ b/src/views/data/task/drawer.vue
@@ -1,12 +1,11 @@
 <template>
   <BasicDrawer v-bind="$attrs" @register="registerDrawer" showFooter :title="getTitle" width="960px" @ok="handleSubmit">
-    <BasicForm @register="registerForm" />
+    <BasicForm @register="registerForm" @field-value-change="handleValuesChanged" />
     <BasicTable @register="registerTable">
       <template #toolbar>
-        <a-button type="primary" @click="handleCreate" :icon="h(PlusOutlined)">新 增</a-button>
-        <div style="width: 5px" />
-        <a-button type="primary" :icon="h(EyeOutlined)" @click="handleOpenFileDialog">OCR识别</a-button>
-        <div style="width: 5px" />
+        <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(FileExcelOutlined)" :disabled="importDisabled" @click="handleImport">导入Excel</a-button>
         <Popconfirm
             title="确定要清空预埋件列表吗?"
             ok-text="确定"
@@ -15,7 +14,6 @@
         >
           <a-button type="primary" :icon="h(MinusOutlined)">清空列表</a-button>
         </Popconfirm>
-        <div style="width: 5px" />
       </template>
       <template #bodyCell="{ column, record }">
         <template v-if="column.dataIndex === 'x'">
@@ -63,25 +61,23 @@
   </BasicDrawer>
 </template>
 <script lang="ts" setup>
-import {defineEmits, ref, computed, unref, h} from 'vue';
+import { defineEmits, ref, computed, unref, h } from 'vue';
 import { BasicForm, useForm } from '@/components/Form/index';
 import { formSchema } from './schema';
 import { BasicDrawer, useDrawerInner } from '@/components/Drawer';
 import * as TaskApi from '@/api/data/taskApi';
 import { BasicTable, useTable, TableAction } from '@/components/Table';
-import { EyeOutlined, PlusOutlined, MinusOutlined } from "@ant-design/icons-vue";
+import { EyeOutlined, PlusOutlined, MinusOutlined, FileExcelOutlined } from "@ant-design/icons-vue";
 import { Popconfirm } from 'ant-design-vue';
 import Modal from "@/views/data/task/modal.vue";
 import { useModal } from '/@/components/Modal';
 const [register, { openModal }] = useModal();
-
 const columns = [
   {
     title: '序号',
     dataIndex: 'sn',
     key: 'sn',
     width: '50px',
-    // customRender: ({ index }) => `${index + 1}`,
   },
   {
     title: '预埋件编号',
@@ -129,9 +125,10 @@ const paramData = ref<any>([]);
 
 const emit = defineEmits(['success', 'register', 'ocrClick']);
 const isUpdate = ref(true);
+const importDisabled = ref(true);
 const entity = ref();
 
-const [registerForm, { resetFields, setFieldsValue, validate, getFieldsValue }] = useForm({
+const [registerForm, { resetFields, setFieldsValue, validate, getFieldsValue, updateSchema }] = useForm({
   labelWidth: 120,
   schemas: formSchema,
   showActionButtonGroup: false,
@@ -139,7 +136,7 @@ const [registerForm, { resetFields, setFieldsValue, validate, getFieldsValue }]
 
 const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
   await resetFields();
-  setDrawerProps({ confirmLoading: false });
+  setDrawerProps({confirmLoading: false});
   isUpdate.value = !!data?.isUpdate;
   entity.value = data?.record;
   paramData.value = [];
@@ -148,28 +145,28 @@ const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (
     if (Object.keys(d).includes('sn')) {
       paramData.value.push({...d});
     } else {
-      paramData.value.push({ sn: (index + 1) + '', ...d});
+      paramData.value.push({sn: (index + 1) + '', ...d});
     }
   });
   await setFieldsValue({
     ...data.record,
   });
+  await updateSchema([
+    {
+      field: 'wallType',
+      componentProps: {
+        disabled: unref(isUpdate)
+      }
+    },
+    {
+      field: 'direction',
+      componentProps: {
+        disabled: unref(isUpdate)
+      }
+    }]);
+  handleValuesChanged();
 });
 
-const setParamData = (items: any) => {
-  if (!paramData.value)
-    paramData.value = [];
-  items.forEach((d: any) => {
-    const items = paramData.value.filter((p: any) => p.code === d.code);
-    if (items.length === 0) {
-      paramData.value.push({...d});
-    }
-    else {
-      items[0] = {...d};
-    }
-  });
-};
-
 const [registerTable] = useTable({
   title: '预埋件列表',
   columns,
@@ -210,8 +207,12 @@ async function handleSubmit() {
     );
   let p: any = [];
   paramData.value.forEach((d: any) => {
-    delete d.index;
-    p.push(d);
+    // 添加 墙体类型 方向（正面、背面） 堆芯坐标
+    d.wallType = data.wallType;
+    d.direction = data.direction;
+    d.coreA = data.coreA;
+    d.coreB = data.coreB;
+    p.push({ ...d });
   });
   data.paramJson = JSON.stringify(p);
   await action(data);
@@ -247,6 +248,41 @@ const handleOpenFileDialog = () => {
   emit("ocrClick", data);
 };
 
+const handleImport = () => {
+  WebViewService.importExcel().then((res: any) => {
+    const data = getFieldsValue();
+    if (res === "") {
+      WebViewService.setMessage('没有预埋件数据！', 'information').then(() => {});
+      return;
+    }
+    const items = JSON.parse(res);
+    if (items.length === 0) {
+      WebViewService.setMessage('没有预埋件数据！', 'information').then(() => {});
+      return;
+    }
+    if (!paramData.value) {
+      paramData.value = [];
+    }
+    items.forEach((d: any) => {
+      if (d.wallType.toUpperCase() === data.wallType && d.direction === data.direction) {
+        const items = paramData.value.filter((p: any) => p.code === d.code);
+        // if (data.wallType === "B类") {
+        //   const nX: any = d["y"];
+        //   const nY: any = d["x"];
+        //   d.x = nX;
+        //   d.y = nY;
+        // }
+        if (items.length === 0) {
+          paramData.value.push({...d});
+        } else {
+          items[0] = {...d};
+        }
+      }
+    });
+    WebViewService.setMessage('数据导入成功！', "success").then(() => {});
+  })
+}
+
 const handleDeleteAll = (e: MouseEvent) => {
   paramData.value = [];
 };
@@ -275,6 +311,71 @@ const markField = computed(() => {
   };
 });
 
+const handleValuesChanged = () => {
+  const data = getFieldsValue();
+  importDisabled.value = data.wallType === undefined || data.direction === undefined;
+};
+
+const setParamData = (data: any) => {
+  const items = handleParamData(data);
+  if (!paramData.value)
+    paramData.value = [];
+  items.forEach((d: any) => {
+    if (d.hasOwnProperty("zm")) {
+      delete d.zm;
+    }
+    if (d.hasOwnProperty("nX")) {
+      delete d.nX;
+    }
+    if (d.hasOwnProperty("nY")) {
+      delete d.nY;
+    }
+    const items = paramData.value.filter((p: any) => p.code === d.code);
+    if (items.length === 0) {
+      paramData.value.push({...d});
+    }
+    else {
+      items[0] = {...d};
+    }
+  });
+  WebViewService.setMessage('数据导入成功！', "success").then(() => {});
+};
+
+const handleParamData = (items: any) => {
+  const data = getFieldsValue();
+  const wallType = data.wallType;
+  const direction = data.direction;
+  // x去重
+  const uniqueListX = Array.from(new Map(items.map((item: any) => [item.x, item])).values());
+  // y去重
+  const uniqueListY = Array.from(new Map(items.map((item: any) => [item.y, item])).values());
+  // 墙体类型为 B
+  items.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;
+    }
+  });
+  // 判断正面、背面
+  const uniqueY = Array.from(new Map(items.map((item: any) => [item.nY, item])).values());
+  const maxY = Math.max(...uniqueY.map((item: any) => Number(item.nY)));
+  const minY = Math.min(...uniqueY.map((item: any) => Number(item.nY)));
+  items.forEach((d: any) => {
+    if (Number(d.nY) === minY) {
+      d.zm = 1;
+    } else if (Number(d.nY) === maxY) {
+      d.zm = 0;
+    } else if (maxY - Number(d.nY) < Number(d.nY) - minY) {
+      d.zm = 0;
+    } else {
+      d.zm = 1;
+    }
+  });
+  return direction === "正面" ? items.filter((d: any) => { return d.zm === 1 }).map((d: any) => ({...d})) : items.filter((d: any) => { return d.zm === 0 }).map((d: any) => ({...d}));
+}
+
 defineExpose({
   setParamData
 });
diff --git a/src/views/data/task/index.vue b/src/views/data/task/index.vue
index 2f3bb98..c07cccf 100644
--- a/src/views/data/task/index.vue
+++ b/src/views/data/task/index.vue
@@ -7,8 +7,8 @@
     <BasicTable @register="registerTable">
       <template #toolbar>
         <a-button type="primary" @click="handleCreate" :icon="h(PlusOutlined)">新 增</a-button>
-        <div style="width: 5px" />
-        <a-button type="default" :icon="h(EyeOutlined)" @click="handleOpenFileDialog(null)">OCR识别</a-button>
+<!--        <div style="width: 5px" />-->
+<!--        <a-button type="default" :icon="h(EyeOutlined)" @click="handleOpenFileDialog(null)">OCR识别</a-button>-->
         <input
           type="file"
           ref="fileInput"
@@ -30,6 +30,11 @@
           :icon="h(SyncOutlined)"
           :disabled="checkedKeys.length === 0"
           >同步数据</a-button>
+        <a-button
+            type="default"
+            @click="handleDownloadTemplate"
+            :icon="h(CloudDownloadOutlined)"
+        >下载模板</a-button>
       </template>
       <template #bodyCell="{ column, record }">
         <template v-if="column.dataIndex === 'action'">
@@ -60,7 +65,7 @@
                 icon: 'ant-design:eye-outlined',
                 onClick: handleView.bind(null, record),
                 divider: true,
-                disabled: record.endTime === undefined || record.endTime === null,
+                disabled: record.paramJson === undefined || record.paramJson === null || record.paramJson === '',
               },
               {
                 label: '下发数据',
@@ -109,12 +114,13 @@
   import { columns, searchFormSchema } from './schema';
   import { SvgIcon } from '@/components/Icon';
   import { computed, h, onMounted, onUnmounted, ref } from 'vue';
-  import { DownloadOutlined, EyeOutlined, PlusOutlined, SyncOutlined } from '@ant-design/icons-vue';
+  import { DownloadOutlined, PlusOutlined, SyncOutlined, CloudDownloadOutlined } from '@ant-design/icons-vue';
   import PdfViewer from '@/components/PdfViewer/index.vue';
   import { useModal } from '@/components/Modal';
   import Result from '@/views/data/task/result.vue';
   import { Loading } from '@/components/Loading';
   import { SizeEnum } from '@/enums/sizeEnum';
+  import axios from 'axios';
 
   const [register, { openModal }] = useModal();
 
@@ -217,40 +223,20 @@
     reload();
   };
 
-  const getCode = (code1: string, code2: string) => {
-    const hasPt = code1.indexOf("PT") !== -1;
-    if (hasPt) {
-      let code = code1.split("PT")[0] + "PT";
-      for (let i = 0; i < code1.split("PT")[1].length - code2.length; i++) {
-        code += "0";
-      }
-      code += code2;
-      return code
-    } else {
-      return code2
-    }
-  };
-
   const getResults = (record: any) => {
     const params = JSON.parse(record.paramJson);
-    if (record.results === undefined || record.results === null)
-      return undefined;
-    const results = JSON.parse(record.results);
+    const results = !record.results || record.results === "" || record.results === "[]" ? [] : JSON.parse(record.results);
     params.forEach((param: any) => {
-      const l = results.filter((d: any) => param["code"] === d["code"] || param["code"] === getCode(param["code"], d["code"]+''));
-      if (l.length > 0) {
-        param["x1"] = l[0]["x1"];
-        param["y1"] = l[0]["y1"];
-        param["x2"] = l[0]["x2"];
-        param["y2"] = l[0]["y2"];
-        param["x3"] = l[0]["x3"];
-        param["y3"] = l[0]["y3"];
-        param["x4"] = l[0]["x4"];
-        param["y4"] = l[0]["y4"];
-        param["base"] = l[0]["base"];
-        param["actual_value"] = l[0]["actual_value"];
-        param["status"] = l[0]["status"];
-      }
+      const l = results.filter((d: any) => param["code"] === d["code"]);
+      param["w"] = l.length == 0 ? "" : l[0]["best_cal_width"];
+      param["h"] = l.length == 0 ? "" : l[0]["best_cal_height"];
+      param["average_deviation"] = l.length == 0 ? "" : l[0]["average_deviation"];
+      param["m_x"] = l.length == 0 ? "" : l[0]["m_x"];
+      param["m_y"] = l.length == 0 ? "" : l[0]["m_y"];
+      param["x_deviation"] = l.length == 0 ? "" : l[0]["x_deviation"];
+      param["y_deviation"] = l.length == 0 ? "" : l[0]["y_deviation"];
+      param["base"] = l.length == 0 ? "" : l[0]["base"];
+      param["status"] = l.length == 0 ? "" : l[0]["status"];
     });
     return params;
   }
@@ -258,7 +244,7 @@
   const handleView = (record: any) => {
     const results = getResults(record);
     if (!results) return;
-    record.resultJson1 = JSON.stringify(results);
+    record.reportJson = JSON.stringify(results);
     openModal(true, { record });
   };
 
@@ -294,18 +280,15 @@
       (res: any) => {
         if (res === "") {
           isLoading.value = false;
+          WebViewService.setMessage('没有预埋件数据！', 'information').then(() => {});
           return;
         }
         const data = JSON.parse(res);
         if (data.length === 0) {
           isLoading.value = false;
+          WebViewService.setMessage('没有预埋件数据！', 'information').then(() => {});
           return;
         }
-        // if (data[0].length > 5) {
-        //   wallCode = data[0].code.substring(0, data.length - 5);
-        // } else {
-        //   wallCode = null;
-        // }
         if (ocrData === null) {
           const record = {
             name: '',
@@ -358,6 +341,25 @@
     );
   };
 
+  const handleDownloadTemplate = async () => {
+    try {
+      const response = await axios({
+        url: `${import.meta.env.VITE_PUBLIC_PATH}预埋件信息.xlsx`, // 请求地址
+        method: 'GET',
+        responseType: 'blob' // 确保返回类型是blob
+      });
+      const url = window.URL.createObjectURL(new Blob([response.data]));
+      const link = document.createElement('a');
+      link.href = url;
+      link.setAttribute('download', '预埋件信息.xlsx'); // 设置下载的文件名
+      document.body.appendChild(link);
+      link.click();
+      link.remove(); // 下载后移除元素
+    } catch (error) {
+      console.error('下载失败', error);
+    }
+  }
+
   const deviceConnectedList = ref([]);
 
   const getDeviceConnected = computed(() => {
diff --git a/src/views/data/task/result.vue b/src/views/data/task/result.vue
index bae636c..d8a28ff 100644
--- a/src/views/data/task/result.vue
+++ b/src/views/data/task/result.vue
@@ -29,11 +29,43 @@ import { CheckOutlined, CloseOutlined, FileExcelOutlined, FileTextOutlined } fro
 import ExcelJS from 'exceljs';
 import { saveAs } from 'file-saver';
 
+
+// #        '预埋件编号': item['code'],
+// # '预埋件类型': item['type'],
+// # '中心x': item['x'],
+// # '中心y': item['y'],
+// # '中心点标高': item['center'],
+// # '宽度': item['best_cal_width'],
+// # '高度': item['best_cal_height'],
+// # '大概偏差': item['average_deviation'],
+// # '人工测量x': item['m_x'],
+// # '人工测量标高': item['m_z'],
+// # '水平位置偏差': item['x_deviation'],
+// # '垂直位置偏差': item['y_deviation'],
+// # '偏差基准值': item['base'],
+// # '是否需要调整': item['status'],  # good or bad
+
+// layout.addWidget(self.add_param_item("编号", 180, True), row, 0)
+// layout.addWidget(self.add_param_item("类型", -1, True), row, 1)
+// layout.addWidget(self.add_param_item("X", 65, True), row, 2)
+// layout.addWidget(self.add_param_item("Y", 65, True), row, 3)
+// layout.addWidget(self.add_param_item("中心标高", 100, True), row, 4)
+// layout.addWidget(self.add_param_item("宽度", 65, True), row, 5)
+// layout.addWidget(self.add_param_item("高度", 65, True), row, 6)
+// layout.addWidget(self.add_param_item("大概偏差", 100, True), row, 7)
+// layout.addWidget(self.add_param_item("人工测量X", 100, True), row, 8)
+// layout.addWidget(self.add_param_item("人工测量标高", 140, True), row, 9)
+// layout.addWidget(self.add_param_item("水平位置偏差", 140, True), row, 10)
+// layout.addWidget(self.add_param_item("垂直位置偏差", 140, True), row, 11)
+// layout.addWidget(self.add_param_item("偏差基准值", 140, True), row, 12)
+// layout.addWidget(self.add_param_item("是否需要调整", 140, True), row, 13)
+
 const columns = [
   {
     title: '序号',
     dataIndex: 'sn',
     key: 'sn',
+    width: '60px',
   },
   {
     title: '预埋件编号',
@@ -41,105 +73,80 @@ const columns = [
     key: 'code',
   },
   {
-    title: '类型',
+    title: '预埋件类型',
     dataIndex: 'type',
     key: 'type',
   },
   {
-    title: 'X(mm)',
+    title: '中心x',
     dataIndex: 'x',
     key: 'x',
     width: '80px',
   },
   {
-    title: 'Y(mm)',
+    title: '中心y',
     dataIndex: 'y',
     key: 'y',
     width: '80px',
   },
   {
-    title: 'w(mm)',
-    dataIndex: 'w',
-    key: 'w',
-    width: '80px',
-  },
-  {
-    title: 'h(mm)',
-    dataIndex: 'h',
-    key: 'h',
-    width: '80px',
-  },
-  {
-    title: '中心(m)',
+    title: '中心标高',
     dataIndex: 'center',
     key: 'center',
     width: '110px',
   },
   {
-    title: 'X1',
-    dataIndex: 'x1',
-    key: 'x1',
-    width: '70px',
+    title: '宽度',
+    dataIndex: 'w',
+    key: 'w',
+    width: '80px',
   },
   {
-    title: 'Y1',
-    dataIndex: 'y1',
-    key: 'y1',
-    width: '70px',
+    title: '高度',
+    dataIndex: 'h',
+    key: 'h',
+    width: '80px',
   },
   {
-    title: 'X2',
-    dataIndex: 'x2',
-    key: 'x2',
-    width: '70px',
+    title: '大概偏差',
+    dataIndex: 'average_deviation',
+    key: 'average_deviation',
+    width: '80px',
   },
   {
-    title: 'Y2',
-    dataIndex: 'y2',
-    key: 'y2',
-    width: '70px',
+    title: '人工测量X',
+    dataIndex: 'm_x',
+    key: 'm_x',
+    width: '100px',
   },
   {
-    title: 'X3',
-    dataIndex: 'x3',
-    key: 'x3',
-    width: '70px',
+    title: '人工测量标高',
+    dataIndex: 'm_y',
+    key: 'm_y',
+    width: '100px',
   },
   {
-    title: 'Y3',
-    dataIndex: 'y3',
-    key: 'y3',
-    width: '70px',
+    title: '水平位置偏差',
+    dataIndex: 'x_deviation',
+    key: 'x_deviation',
+    width: '100px',
   },
   {
-    title: 'X4',
-    dataIndex: 'x4',
-    key: 'x4',
-    width: '70px',
+    title: '垂直位置偏差',
+    dataIndex: 'y_deviation',
+    key: 'y_deviation',
+    width: '100px',
   },
   {
-    title: 'Y4',
-    dataIndex: 'y4',
-    key: 'y4',
-    width: '70px',
-  },
-  {
-    title: '标准值',
+    title: '偏差基准值',
     dataIndex: 'base',
     key: 'base',
-    width: '60px',
+    width: '90px',
   },
   {
-    title: '实际值',
-    dataIndex: 'actual_value',
-    key: 'actual_value',
-    width: '70px',
-  },
-  {
-    title: '结果',
+    title: '是否需要调整',
     dataIndex: 'status',
     key: 'status',
-    width: '50px',
   },
 ];
 
@@ -154,7 +161,7 @@ const [register, { closeModal, setModalProps }] = useModalInner(async (data) =>
   entity.value = data?.record;
   title.value = data?.record.name + " - 任务结果详情";
   paramData.value = [];
-  const items = entity.value && entity.value.resultJson ? JSON.parse(entity.value.resultJson1) : [];
+  const items = JSON.parse(entity.value.reportJson);
   items.forEach((d: any, index: number) => {
     paramData.value.push({ index, ...d });
   });
@@ -197,8 +204,6 @@ const handleExport = async () => {
     worksheet.addRow(data);
     setCellStyle(worksheet.getRow(index + 2));
   });
-  worksheet.getColumn(1).width = 22;
-  worksheet.getColumn(2).width = 22;
   // 导出文件
   const buffer = await workbook.xlsx.writeBuffer();
   const blob = new Blob([buffer], {type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'});
diff --git a/src/views/data/task/schema.ts b/src/views/data/task/schema.ts
index 3ccf400..7e0c7e9 100644
--- a/src/views/data/task/schema.ts
+++ b/src/views/data/task/schema.ts
@@ -9,6 +9,7 @@
 import { BasicColumn } from '@/components/Table';
 import { FormSchema } from '@/components/Table';
 import * as DeviceApi from '@/api/data/deviceApi'
+import moment from "moment";
 
 
 
@@ -49,6 +50,7 @@ export const schema = {
         rules: [{ required: true, message: '请输入任务名称！' }],
       },
       table: {
+        width: 200,
       },
     },
     {
@@ -73,6 +75,81 @@ export const schema = {
       table: {
       },
     },
+    {
+      field: 'wallType',
+      label: '墙体类型',
+      defaultValue: undefined,
+      form: {
+        colProps,
+        component: 'Select',
+        componentProps: {
+          allowClear: true,
+          placeholder: '请选择墙体类型',
+          options: [{value: 'A类', label: 'A类'}, {value: 'B类', label: 'B类'}],
+          labelField: 'label',
+          valueField: 'value',
+          disabled: true,
+        },
+        rules: [{ required: true, message: '请选择墙体类型！' }],
+      },
+      table: {
+        width: 80,
+      },
+    },
+    {
+      field: 'direction',
+      label: '方向',
+      defaultValue: undefined,
+      form: {
+        colProps,
+        component: 'Select',
+        componentProps: {
+          allowClear: true,
+          placeholder: '请选择方向',
+          options: [{value: '正面', label: '正面'}, {value: '背面', label: '背面'}],
+          labelField: 'label',
+          valueField: 'value',
+        },
+        rules: [{ required: true, message: '请选择方向！' }],
+      },
+      table: {
+        width: 80,
+      },
+    },
+    {
+      field: 'coreA',
+      label: '堆芯A点',
+      defaultValue: undefined,
+      form: {
+        componentProps: {
+          allowClear: false,
+          placeholder: '堆芯A点',
+        },
+        colProps,
+        component: 'Input',
+        rules: [{ required: true, message: '请输入堆芯A点！' }],
+      },
+      table: {
+        width: 80,
+      },
+    },
+    {
+      field: 'coreB',
+      label: '堆芯B点',
+      defaultValue: undefined,
+      form: {
+        componentProps: {
+          allowClear: false,
+          placeholder: '堆芯B点',
+        },
+        colProps,
+        component: 'Input',
+        rules: [{ required: true, message: '请输入堆芯B点！' }],
+      },
+      table: {
+        width: 80,
+      },
+    },
     {
       field: 'paramJson',
       label: '任务参数',
@@ -189,6 +266,7 @@ export const schema = {
         rules: [{ required: true, message: '请选择状态！' }],
       },
       table: {
+        width: 60,
         customRender: ({ text, record }) => {
           if (record.state === 0)
             return '未开始';
@@ -216,6 +294,9 @@ export const schema = {
         rules: [{ required: true, message: '请输入CreateTime！' }],
       },
       table: {
+        customRender: ({ text, record }) => {
+          return moment(record.createTime).format('YYYY-MM-DD HH:mm');
+        },
       },
     },
     {
@@ -242,9 +323,9 @@ export const schema = {
 
 const queryFields = ['name','deviceSn','startTimeQuery','state'];
 // const editFields = ['name','deviceSn','paramJson'];
-const editFields = ['name', 'deviceSn'];
-const tableFields = ['name','deviceSn','startTime','endTime','state','createTime'];
-const descriptionFields = ['name','deviceSn','paramJson','resultJson','startTime','endTime','state'];
+const editFields = ['name','deviceSn','wallType','direction','coreA','coreB'];
+const tableFields = ['name','deviceSn','wallType','direction','coreA','coreB','startTime','endTime','state','createTime'];
+const descriptionFields = ['name','deviceSn','wallType','direction','coreA','coreB','paramJson','resultJson','startTime','endTime','state'];
 
 const queryFieldsIndexMap = new Map(queryFields.map((field, index) => [field, index]));
 export const searchFormSchema: FormSchema[] = schema.properties.filter(item => queryFields.includes(item.field))