From a048f3627eb431546c666a51046e7797139e29cc Mon Sep 17 00:00:00 2001
From: zcxlsm <patrickstarlsm@163.com>
Date: Wed, 6 Aug 2025 20:38:29 +0800
Subject: [PATCH 1/5] =?UTF-8?q?refactor(sis):=20-=20=E5=B0=86=E5=8E=9F?=
 =?UTF-8?q?=E6=9C=89=E7=9A=84=E5=8D=95=E4=B8=80=E5=A4=96=E9=83=A8=E9=80=9A?=
 =?UTF-8?q?=E9=81=93=E5=8F=B7=E6=8B=86=E5=88=86=E4=B8=BA=E4=B8=8A=E9=94=AE?=
 =?UTF-8?q?=E9=80=9A=E9=81=93=E5=8F=B7=E5=92=8C=E4=B8=8B=E9=94=AE=E9=80=9A?=
 =?UTF-8?q?=E9=81=93=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sis/elevatorInfo/elevatorInfo-modal.vue   | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/apps/web-antd/src/views/sis/elevatorInfo/elevatorInfo-modal.vue b/apps/web-antd/src/views/sis/elevatorInfo/elevatorInfo-modal.vue
index 34dabeef..616c6704 100644
--- a/apps/web-antd/src/views/sis/elevatorInfo/elevatorInfo-modal.vue
+++ b/apps/web-antd/src/views/sis/elevatorInfo/elevatorInfo-modal.vue
@@ -111,11 +111,12 @@ async function handleConfirm() {
     const data = cloneDeep(await formApi.getValues())
     // 通道信息
     const filteredChannels = dynamicValidateForm.floor
-      .filter(item => !(item.out.length === 0 && item.in.length === 0))
+      .filter(item => !(item.outUp.length === 0 && item.outDown.length === 0 && item.in.length === 0))
       .map(item => ({
         floorId: item.id,
         inChannel: item.in,
-        outChannel: item.out
+        upChannel: item.outUp,
+        downChannel: item.outDown,
       }))
 
     data.channels = filteredChannels
@@ -223,7 +224,8 @@ async function setupCommunitySelect() {
 }
 
 interface floor {
-  out: string
+  outUp: string
+  outDown: string
   in: string
   num: string | number
   id: string | number
@@ -238,7 +240,8 @@ async function handleGetFloor(unitId: string | number) {
     floorList.value = []
     res.forEach((item) => {
       floorList.value.push({
-        out: '',
+        outUp: '',
+        outDown: '',
         in: '',
         num: item.floorNumber,
         id: item.id,
@@ -268,10 +271,14 @@ async function handleClosed() {
         <Form :model="dynamicValidateForm" layout="inline">
           <Space v-for="(floor, index) in dynamicValidateForm.floor" :key="floor.id"
             style="display: flex; margin-bottom: 8px" align="baseline">
-            <FormItem :label="'楼层' + (floor.num)" :name="['floor', index, 'out']">
-              <Input v-model:value="floor.out" placeholder="外部按键通道" />
+            <span>{{ "楼层"+floor.num }}</span>
+            <FormItem label="上键通道" :name="['floor', index, 'outUp']">
+              <Input v-model:value="floor.outUp" placeholder="外部按键通道" />
             </FormItem>
-            <FormItem :name="['floor', index, 'in']">
+            <FormItem label="下键通道" :name="['floor', index, 'outDown']">
+              <Input v-model:value="floor.outDown" placeholder="内部按键通道" />
+            </FormItem>
+            <FormItem label="楼层通道" :name="['floor', index, 'in']">
               <Input v-model:value="floor.in" placeholder="内部按键通道" />
             </FormItem>
           </Space>

From 80d3739fb7df59bd5d26ad4c1b06aeff2d7b06b8 Mon Sep 17 00:00:00 2001
From: 15683799673 <liao@1234567>
Date: Wed, 6 Aug 2025 22:29:04 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=A4=84=E7=90=86=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web-antd/src/views/sis/acAdmin/dp-tree.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/web-antd/src/views/sis/acAdmin/dp-tree.vue b/apps/web-antd/src/views/sis/acAdmin/dp-tree.vue
index 06d54792..97997178 100644
--- a/apps/web-antd/src/views/sis/acAdmin/dp-tree.vue
+++ b/apps/web-antd/src/views/sis/acAdmin/dp-tree.vue
@@ -116,8 +116,8 @@ function onTreeCheck(_keys: any, nodes: any) {
       delete checkData[id];
     }
   });
-  const nodes = toRaw(checkedNodes);
-  emit('checked', nodes);
+  const data = toRaw(checkedNodes);
+  emit('checked', data);
 }
 
 onMounted(loadChannelTree);

From e0cf2f99f9b27ea29f077694a2789ce9de832f9b Mon Sep 17 00:00:00 2001
From: lxj <15683799673@163.com>
Date: Thu, 7 Aug 2025 09:48:58 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E9=97=A8=E7=A6=81=E5=8F=AF=E8=A7=86?=
 =?UTF-8?q?=E5=8C=96=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/sis/accessControl/index.ts        | 31 +++++++-----
 .../src/views/sis/acAdmin/dp-tree.vue         | 13 +++--
 apps/web-antd/src/views/sis/acAdmin/index.vue | 50 +++++++++----------
 3 files changed, 51 insertions(+), 43 deletions(-)

diff --git a/apps/web-antd/src/api/sis/accessControl/index.ts b/apps/web-antd/src/api/sis/accessControl/index.ts
index e6798260..b209b5ef 100644
--- a/apps/web-antd/src/api/sis/accessControl/index.ts
+++ b/apps/web-antd/src/api/sis/accessControl/index.ts
@@ -2,12 +2,12 @@ import type {
   AccessControlForm,
   AccessControlQuery,
   AccessControlVO,
-} from './model'
+} from './model';
 
-import type { ID, IDS, PageResult, TreeNode } from '#/api/common'
+import type { ID, IDS, PageResult, TreeNode } from '#/api/common';
 
-import { commonExport } from '#/api/helper'
-import { requestClient } from '#/api/request'
+import { commonExport } from '#/api/helper';
+import { requestClient } from '#/api/request';
 
 /**
  * 查询门禁管理列表
@@ -18,7 +18,7 @@ export function accessControlList(params?: AccessControlQuery) {
   return requestClient.get<PageResult<AccessControlVO>>(
     '/sis/accessControl/list',
     { params },
-  )
+  );
 }
 
 /**
@@ -27,7 +27,7 @@ export function accessControlList(params?: AccessControlQuery) {
  * @returns 门禁管理列表
  */
 export function accessControlExport(params?: AccessControlQuery) {
-  return commonExport('/sis/accessControl/export', params ?? {})
+  return commonExport('/sis/accessControl/export', params ?? {});
 }
 
 /**
@@ -36,7 +36,7 @@ export function accessControlExport(params?: AccessControlQuery) {
  * @returns 门禁管理详情
  */
 export function accessControlInfo(id: ID) {
-  return requestClient.get<AccessControlVO>(`/sis/accessControl/${id}`)
+  return requestClient.get<AccessControlVO>(`/sis/accessControl/${id}`);
 }
 
 /**
@@ -45,7 +45,7 @@ export function accessControlInfo(id: ID) {
  * @returns void
  */
 export function accessControlAdd(data: AccessControlForm) {
-  return requestClient.postWithMsg<void>('/sis/accessControl', data)
+  return requestClient.postWithMsg<void>('/sis/accessControl', data);
 }
 
 /**
@@ -54,7 +54,7 @@ export function accessControlAdd(data: AccessControlForm) {
  * @returns void
  */
 export function accessControlUpdate(data: AccessControlForm) {
-  return requestClient.putWithMsg<void>('/sis/accessControl', data)
+  return requestClient.putWithMsg<void>('/sis/accessControl', data);
 }
 
 /**
@@ -63,7 +63,7 @@ export function accessControlUpdate(data: AccessControlForm) {
  * @returns void
  */
 export function accessControlRemove(id: ID | IDS) {
-  return requestClient.deleteWithMsg<void>(`/sis/accessControl/${id}`)
+  return requestClient.deleteWithMsg<void>(`/sis/accessControl/${id}`);
 }
 
 /**
@@ -71,7 +71,7 @@ export function accessControlRemove(id: ID | IDS) {
  * @returns void
  */
 export function queryTree() {
-  return requestClient.get<TreeNode<Number>[]>(`/sis/accessControl/tree`)
+  return requestClient.get<TreeNode<Number>[]>(`/sis/accessControl/tree`);
 }
 
 /**
@@ -79,5 +79,12 @@ export function queryTree() {
  * @returns void
  */
 export function accessControlSync() {
-  return requestClient.get<void>(`/sis/accessControl/sync`)
+  return requestClient.get<void>(`/sis/accessControl/sync`);
+}
+
+export function remoteOpenDoor(params: any) {
+  return requestClient.post<void>(
+    `/sis/accessControl/e8/remoteOpenDoor`,
+    params,
+  );
 }
diff --git a/apps/web-antd/src/views/sis/acAdmin/dp-tree.vue b/apps/web-antd/src/views/sis/acAdmin/dp-tree.vue
index 06d54792..790828d6 100644
--- a/apps/web-antd/src/views/sis/acAdmin/dp-tree.vue
+++ b/apps/web-antd/src/views/sis/acAdmin/dp-tree.vue
@@ -2,7 +2,7 @@
 import { onMounted, ref, toRaw } from 'vue';
 import { SyncOutlined } from '@ant-design/icons-vue';
 import { InputSearch, message, Skeleton, Tree } from 'ant-design-vue';
-import { queryTree } from '#/api/sis/accessControl';
+import { queryTree, remoteOpenDoor } from '#/api/sis/accessControl';
 import type { TreeNode } from '#/api/common';
 
 defineOptions({ inheritAttrs: false });
@@ -57,13 +57,14 @@ function open() {
   const acArr = checkNodeData();
   if (acArr) {
     console.log(acArr);
+    remoteOpenDoor({ acIds: acArr, type: 0 });
   }
 }
 
 function close() {
   const acArr = checkNodeData();
   if (acArr) {
-    console.log(acArr);
+    remoteOpenDoor({ acIds: acArr, type: 1 });
   }
 }
 
@@ -71,6 +72,7 @@ function alwaysOpen() {
   const acArr = checkNodeData();
   if (acArr) {
     console.log(acArr);
+    remoteOpenDoor({ acIds: acArr, type: 2 });
   }
 }
 
@@ -78,6 +80,7 @@ function reSet() {
   const acArr = checkNodeData();
   if (acArr) {
     console.log(acArr);
+    remoteOpenDoor({ acIds: acArr, type: 4 });
   }
 }
 
@@ -92,7 +95,7 @@ function checkNodeData() {
   arr.forEach((item) => {
     const node: any = checkData[item];
     if (node.level == 5) {
-      acArr.push(node);
+      acArr.push(node.id);
     }
   });
   if (!acArr || acArr.length === 0) {
@@ -116,8 +119,8 @@ function onTreeCheck(_keys: any, nodes: any) {
       delete checkData[id];
     }
   });
-  const nodes = toRaw(checkedNodes);
-  emit('checked', nodes);
+  const data = toRaw(checkedNodes);
+  emit('checked', checked, data);
 }
 
 onMounted(loadChannelTree);
diff --git a/apps/web-antd/src/views/sis/acAdmin/index.vue b/apps/web-antd/src/views/sis/acAdmin/index.vue
index 47fcb088..2274bee2 100644
--- a/apps/web-antd/src/views/sis/acAdmin/index.vue
+++ b/apps/web-antd/src/views/sis/acAdmin/index.vue
@@ -1,7 +1,7 @@
 <template>
   <Page :auto-content-height="true">
     <div class="flex h-full gap-[8px]">
-      <DpTree class="h-[87vh] w-[300px]" @check="onNodeChecked" />
+      <DpTree class="h-[87vh] w-[300px]" @checked="onNodeChecked" />
       <div class="bg-background flex-1">
         <div class="video-play-area flex h-full flex-wrap">
           <div
@@ -28,9 +28,9 @@
 import DpTree from './dp-tree.vue';
 import { Page } from '@vben/common-ui';
 import { ref } from 'vue';
-import mpegts from "mpegts.js";
-import {addStreamProxy} from "#/api/sis/stream";
-import {message} from "ant-design-vue";
+import mpegts from 'mpegts.js';
+import { addStreamProxy } from '#/api/sis/stream';
+import { message } from 'ant-design-vue';
 
 /**
  * 屏幕播放器数量
@@ -61,14 +61,28 @@ const setItemRef = (el: any) => {
   }
 };
 
-function onNodeChecked(nodes: any[]) {
-  console.log(nodes);
+function onNodeChecked(checked, nodes: any[]) {
+  if (checked) {
+    console.log(nodes);
+    nodes.forEach((node: any) => {
+      const { data, level } = node;
+      // 只播放视频节点
+      if (level == 6) {
+        const index =
+          currentSelectPlayerIndex.value === -1
+            ? 0
+            : currentSelectPlayerIndex.value;
+        doPlayer(data, index);
+      }
+    });
+  } else {
+
+  }
 }
 
 // 播放器数据, 每一个位置代表页面上行的一个矩形
 const playerList: any[] = [];
 
-
 /**
  * 开始播放视频流
  * @param nodeData 播放的节点数据
@@ -77,24 +91,13 @@ const playerList: any[] = [];
 function doPlayer(nodeData: any, index: number = 0) {
   console.log('index=', index);
   if (mpegts.isSupported()) {
-    let params = {};
-    // if (nodeData.nvrIp) {
-    //   params = {
-    //     videoIp: nodeData.nvrIp,
-    //     videoPort: nodeData.nvrPort,
-    //     factoryNo: nodeData.nvrFactoryNo,
-    //     account: nodeData.nvrAccount,
-    //     pwd: nodeData.nvrPwd,
-    //     channelId: nodeData.nvrChannelNo,
-    //   };
-    // } else {
-    params = {
+    const params = {
       videoIp: nodeData.deviceIp,
-      videoPort: nodeData.devicePort,
+      videoPort: 554,
       factoryNo: nodeData.factoryNo,
       account: nodeData.deviceAccount,
       pwd: nodeData.devicePwd,
-      channelId: nodeData.channelNo,
+      channelId: nodeData.channelNo ? nodeData.channelNo : 101,
     };
     // }
     addStreamProxy(params).then((res) => {
@@ -136,7 +139,6 @@ function doPlayer(nodeData: any, index: number = 0) {
   }
 }
 
-
 function changeElPlayer(playerInfo: any, index: number) {
   const playerData = playerInfo.data;
   const oldPlayer = playerInfo.player;
@@ -173,7 +175,6 @@ function changeElPlayer(playerInfo: any, index: number) {
   }
 }
 
-
 function closePlayVieo(plInfo: any) {
   if (plInfo) {
     try {
@@ -201,9 +202,6 @@ function closePlayer(index: number) {
     }
   }
 }
-
-
-
 </script>
 <style>
 .player {

From 09db75ae58e7f361b8e21cbe7bab5011bdc35369 Mon Sep 17 00:00:00 2001
From: dev_ljl <2590379346@qq.com>
Date: Thu, 7 Aug 2025 11:16:44 +0800
Subject: [PATCH 4/5] =?UTF-8?q?feat:=E4=BF=9D=E6=B4=81=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=AD=BE=E5=88=B0=E6=96=B9=E5=BC=8F=E3=80=81?=
 =?UTF-8?q?=E7=AD=BE=E5=88=B0=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/property/visitorManagement/model.d.ts |  4 +++
 .../clean/cleanOrders/clean-modal.vue         | 26 ++++++++++++++++++-
 .../visitorTodo/visitorTodo-detail.vue        |  8 +++++-
 3 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/apps/web-antd/src/api/property/visitorManagement/model.d.ts b/apps/web-antd/src/api/property/visitorManagement/model.d.ts
index eec10054..c687f880 100644
--- a/apps/web-antd/src/api/property/visitorManagement/model.d.ts
+++ b/apps/web-antd/src/api/property/visitorManagement/model.d.ts
@@ -70,6 +70,10 @@ export interface VisitorManagementVO {
    * 预约状态（0：待确认，1：已确认，2：已取消，3：已完成）
    */
   serveStatus: number;
+  /**
+   * 身份证号
+   */
+  idCard: string;
 }
 
 export interface VisitorManagementForm extends BaseEntity {
diff --git a/apps/web-antd/src/views/property/clean/cleanOrders/clean-modal.vue b/apps/web-antd/src/views/property/clean/cleanOrders/clean-modal.vue
index 34527570..d534c4d0 100644
--- a/apps/web-antd/src/views/property/clean/cleanOrders/clean-modal.vue
+++ b/apps/web-antd/src/views/property/clean/cleanOrders/clean-modal.vue
@@ -188,7 +188,7 @@ const modalSchema = [
     },
   },
   {
-    label: '联系电话',
+    label: '评价图片',
     fieldName: 'imgUrl',
     component: 'Input',
     dependencies: {
@@ -196,6 +196,30 @@ const modalSchema = [
       triggerFields: [''],
     },
   },
+  {
+    label: '签到方式',
+    fieldName: 'signType',
+    component: 'Select',
+    componentProps: {
+      options:getDictOptions('wy_bjqdfs')
+    },
+    dependencies: {
+      show: () => (isReadonly.value ? true : false),
+      triggerFields: [''],
+    },
+  },
+  {
+    label: '签到图片',
+    fieldName: 'signImgUrl',
+    component: 'ImageUpload',
+    componentProps: {
+      helpMessage:false
+    },
+    dependencies: {
+      show: (formValue) => (isReadonly.value&&formValue.signImgUrl ? true : false),
+      triggerFields: [''],
+    },
+  },
 ];
 const [BasicForm, formApi] = useVbenForm({
   commonConfig: {
diff --git a/apps/web-antd/src/views/property/visitorManagement/visitorTodo/visitorTodo-detail.vue b/apps/web-antd/src/views/property/visitorManagement/visitorTodo/visitorTodo-detail.vue
index 828a3df9..16c92028 100644
--- a/apps/web-antd/src/views/property/visitorManagement/visitorTodo/visitorTodo-detail.vue
+++ b/apps/web-antd/src/views/property/visitorManagement/visitorTodo/visitorTodo-detail.vue
@@ -34,13 +34,19 @@ async function handleOpenChange(open: boolean) {
 
 <template>
   <BasicModal :footer="false" :fullscreen-button="false" title="访客管理信息" class="w-[70%]">
-    <Descriptions v-if="visitorTodoDetail" size="small" :column="2" bordered :labelStyle="{width:'100px'}">
+    <Descriptions v-if="visitorTodoDetail" size="small" :column="2" bordered :labelStyle="{width:'120px'}">
       <DescriptionsItem label="访客姓名">
         {{ visitorTodoDetail.visitorName }}
       </DescriptionsItem>
       <DescriptionsItem label="访客电话">
         {{ visitorTodoDetail.visitorPhone }}
       </DescriptionsItem>
+      <DescriptionsItem label="访客身份证">
+        {{ visitorTodoDetail.idCard }}
+      </DescriptionsItem>
+      <DescriptionsItem label="人脸图片">
+        {{ visitorTodoDetail.facePictures }}
+      </DescriptionsItem>
       <DescriptionsItem label="所属公司">
         {{ visitorTodoDetail.visitorUnit}}
       </DescriptionsItem>

From ed8fa0f5b4b4ff3e1b627e4cca7b33c94acdd7a0 Mon Sep 17 00:00:00 2001
From: FLL <2162874245@qq.com>
Date: Thu, 7 Aug 2025 16:49:46 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E8=B7=AF=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shiftSetting/shift-modal.vue              |  1 -
 .../customerService/centerConsole/index.vue   |  9 +++-
 .../inspectionRoute/index.vue                 |  2 +-
 .../inspectionRoute/inspectionRoute-modal.vue | 32 ++++++++++-----
 .../inspectionRoute/point-modal.vue           | 41 ++++++++++++++-----
 5 files changed, 60 insertions(+), 25 deletions(-)

diff --git a/apps/web-antd/src/views/property/attendanceManagement/shiftSetting/shift-modal.vue b/apps/web-antd/src/views/property/attendanceManagement/shiftSetting/shift-modal.vue
index dc2ff70d..838d5b3e 100644
--- a/apps/web-antd/src/views/property/attendanceManagement/shiftSetting/shift-modal.vue
+++ b/apps/web-antd/src/views/property/attendanceManagement/shiftSetting/shift-modal.vue
@@ -63,7 +63,6 @@ const [BasicModal, modalApi] = useVbenModal({
         ];
       }
       record.status = record.status?.toString();
-      console.log(record);
       await formApi.setValues(record);
     }
     await markInitialized();
diff --git a/apps/web-antd/src/views/property/customerService/centerConsole/index.vue b/apps/web-antd/src/views/property/customerService/centerConsole/index.vue
index 95c4f82f..13a5bd7c 100644
--- a/apps/web-antd/src/views/property/customerService/centerConsole/index.vue
+++ b/apps/web-antd/src/views/property/customerService/centerConsole/index.vue
@@ -115,7 +115,6 @@ async function fetchOrderTyper() {
   const totalQuantity = board.value.satisfactionChartList.reduce((sum, item) => {
     return sum + Number(item.quantity || 0);
   }, 0);
-  console.log(seriesData.value)
   renderOrderTyper({
     title: {text: '工单类型分类占比',left: '18px',top: '18px'},
     tooltip: {
@@ -127,7 +126,13 @@ async function fetchOrderTyper() {
       orient: 'vertical',
       icon: 'circle',
       itemWidth: 8,
-      itemHeight: 8
+      itemHeight: 8,
+      formatter: (name) => {
+        const dataItem = seriesData.value.find(item => item.name === name);
+        const value = dataItem?.value || 0;
+        const percentage = totalQuantity ? ((value / totalQuantity) * 100).toFixed(1) : 0;
+        return `${name}    ${percentage}%    ${value}个`;
+      },
     },
     series: [
       {
diff --git a/apps/web-antd/src/views/property/inspectionManagement/inspectionRoute/index.vue b/apps/web-antd/src/views/property/inspectionManagement/inspectionRoute/index.vue
index a5a30d0e..1bc29de5 100644
--- a/apps/web-antd/src/views/property/inspectionManagement/inspectionRoute/index.vue
+++ b/apps/web-antd/src/views/property/inspectionManagement/inspectionRoute/index.vue
@@ -154,6 +154,6 @@ const handleUpdate = (dataSet) => {
         </Space>
       </template>
     </BasicTable>
-    <InspectionRouteModal @reload="tableApi.query()" @update-data="handleUpdate"/>
+    <InspectionRouteModal @update-data="handleUpdate"/>
   </Page>
 </template>
diff --git a/apps/web-antd/src/views/property/inspectionManagement/inspectionRoute/inspectionRoute-modal.vue b/apps/web-antd/src/views/property/inspectionManagement/inspectionRoute/inspectionRoute-modal.vue
index 18f22086..284f9a52 100644
--- a/apps/web-antd/src/views/property/inspectionManagement/inspectionRoute/inspectionRoute-modal.vue
+++ b/apps/web-antd/src/views/property/inspectionManagement/inspectionRoute/inspectionRoute-modal.vue
@@ -7,7 +7,6 @@ import { useVbenForm } from '#/adapter/form';
 import {
   inspectionRouteAdd,
   inspectionRouteInfo,
-  inspectionRouteList,
   inspectionRouteUpdate
 } from '#/api/property/inspectionManagement/inspectionRoute';
 import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
@@ -62,11 +61,14 @@ const [BasicModal, modalApi] = useVbenModal({
     if (isUpdate.value && id) {
       const record = await inspectionRouteInfo(id);
       pointList.value = (record.inspectionRoutePointVoList || []).map(item => ({
+        id: item.id,
         pointId: item.pointId ?? '',
         pointName: item.pointName ?? '',
+        startTime: item.startTime ?? '',
+        endTime: item.endTime ?? '',
+        sort: item.sort ?? '',
       }));
       await tableApi.reload();
-      console.log(pointList.value,111)
       await formApi.setValues(record);
     }
     await markInitialized();
@@ -83,10 +85,10 @@ async function handleConfirm() {
     }
     let data = {
       ...cloneDeep(await formApi.getValues()),
-      inspectionRoutePointBoList:[pointData.value]
+      inspectionRoutePointBoList:[...pointList.value]
     }
-    console.log(data,333)
     await (isUpdate.value ? inspectionRouteUpdate(data) : inspectionRouteAdd(data));
+    pointList.value = []
     resetInitialized();
     emit('reload');
     modalApi.close();
@@ -99,9 +101,11 @@ async function handleConfirm() {
 
 async function handleClosed() {
   await formApi.resetForm();
+  pointList.value = []
   resetInitialized();
 }
 
+const pointItem = ref([])
 async function queryWorkOrdersType() {
   let params = {
     pageSize: 1000,
@@ -112,6 +116,10 @@ async function queryWorkOrdersType() {
     label: item.pointName,
     value: item.id,
   }));
+  pointItem.value = res.rows.map((item) => ({
+    pointId: item.id,
+    pointName: item.pointName,
+  }));
   tableApi.formApi.updateSchema([{
     componentProps: () => ({
       options: options,
@@ -166,7 +174,6 @@ const gridOptions: VxeGridProps = {
 };
 
 const [BasicTable, tableApi] = useVbenVxeGrid({
-  formOptions,
   gridOptions,
 });
 
@@ -180,15 +187,20 @@ function handleAdd() {
 }
 
 async function handleEdit(row: Required<InspectionRouteForm>) {
-  pointModalApi.setData({ id: row.id });
+  pointModalApi.setData({ row });
   pointModalApi.open();
 }
 
-const pointData = ref({})
 const handlePoint = (data) => {
   data.startTime = dayjs(data.startTime).format('YYYY-MM-DD HH:mm:ss')
   data.endTime = dayjs(data.endTime).format('YYYY-MM-DD HH:mm:ss')
-  pointData.value = data;
+  data.pointName = pointItem.value.find(item => item.pointId === data.pointId)?.pointName;
+  const existingIndex = pointList.value.findIndex(item => item.pointId === data.pointId);
+  if (existingIndex !== -1) {
+    pointList.value[existingIndex] = data;
+  } else {
+    pointList.value.push(data);
+  }
 };
 </script>
 
@@ -196,7 +208,7 @@ const handlePoint = (data) => {
   <BasicModal :title="title">
     <BasicForm />
     <Page :auto-content-height="true" style="background-color: #F1F3F6">
-      <BasicTable table-title="巡检点" :grid-options="gridOptions">
+      <BasicTable table-title="巡检点" :grid-options="{ ...gridOptions, data: pointList, pagerConfig: { total: pointList.length } }">
         <template #toolbar-tools>
           <Space>
             <a-button
@@ -217,7 +229,7 @@ const handlePoint = (data) => {
           </Space>
         </template>
       </BasicTable>
-      <PointModal @reload="tableApi.query()"  @update-data="handlePoint"/>
+      <PointModal @reload="tableApi.query()"  @update-data="handlePoint" :pointList="pointList"/>
     </Page>
   </BasicModal>
 </template>
diff --git a/apps/web-antd/src/views/property/inspectionManagement/inspectionRoute/point-modal.vue b/apps/web-antd/src/views/property/inspectionManagement/inspectionRoute/point-modal.vue
index c21b83c9..34623aed 100644
--- a/apps/web-antd/src/views/property/inspectionManagement/inspectionRoute/point-modal.vue
+++ b/apps/web-antd/src/views/property/inspectionManagement/inspectionRoute/point-modal.vue
@@ -2,7 +2,7 @@
 import { useVbenModal } from '@vben/common-ui';
 import { cloneDeep } from '@vben/utils';
 import { useVbenForm } from '#/adapter/form';
-import { inspectionRouteInfo } from '#/api/property/inspectionManagement/inspectionRoute';
+import dayjs from 'dayjs';
 import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
 import {
   inspectionPointList,
@@ -34,6 +34,13 @@ const { onBeforeClose, markInitialized, resetInitialized } = useBeforeCloseDiff(
   },
 );
 
+const props = defineProps({
+  pointList: {
+    type: Array,
+    default: () => [],
+  },
+});
+
 const [BasicModal, modalApi] = useVbenModal({
   class: 'w-[550px]',
   fullscreenButton: false,
@@ -45,13 +52,14 @@ const [BasicModal, modalApi] = useVbenModal({
       return null;
     }
     modalApi.modalLoading(true);
+    const { row } = modalApi.getData() as { row?: number | string };
+    isUpdate.value = !!row;
     await queryWorkOrdersType()
-    const { id } = modalApi.getData() as { id?: number | string };
-    isUpdate.value = !!id;
-
-    if (isUpdate.value && id) {
-      const record = await inspectionRouteInfo(id);
-      await formApi.setValues(record);
+    if (isUpdate.value && row ){
+      row.startTime = dayjs(row.startTime)
+      row.endTime = dayjs(row.endTime)
+      console.log(row,456)
+      await formApi.setValues(row);
     }
     await markInitialized();
 
@@ -89,15 +97,26 @@ async function queryWorkOrdersType() {
     pageNum: 1
   }
   const res = await inspectionPointList(params)
-  const options = res.rows.map((item) => ({
-    label: item.pointName,
-    value: item.id,
-  }));
+  let options = []
+  if(isUpdate.value){
+    options = res.rows.map((item) => ({
+      label: item.pointName,
+      value: item.id,
+    }));
+  }else{
+    const existingIds = props.pointList.map(item => item.pointId);
+    const filteredRows = res.rows.filter(item => !existingIds.includes(item.id));
+    options = filteredRows.map((item) => ({
+      label: item.pointName,
+      value: item.id,
+    }));
+  }
   formApi.updateSchema([{
     componentProps: () => ({
       options: options,
       showSearch: true,
       filterOption: filterOption,
+      disabled: isUpdate.value,
     }),
     fieldName: 'pointId',
   }])