From 90c803dfa335ce95a9cab8575d2848eff5446b56 Mon Sep 17 00:00:00 2001
From: lxj <15683799673@163.com>
Date: Mon, 28 Jul 2025 20:27:58 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E8=A7=86=E9=A2=91=E7=9B=91=E6=8E=A7?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=80=BB=E8=BE=91=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/sis/deviceChannel/model.d.ts      | 14 +++-
 apps/web-antd/src/views/sis/video/index.vue   | 78 +++++++++++--------
 apps/web-antd/vite.config.mts                 |  2 +-
 3 files changed, 57 insertions(+), 37 deletions(-)

diff --git a/apps/web-antd/src/api/sis/deviceChannel/model.d.ts b/apps/web-antd/src/api/sis/deviceChannel/model.d.ts
index 37055ca9..95496871 100644
--- a/apps/web-antd/src/api/sis/deviceChannel/model.d.ts
+++ b/apps/web-antd/src/api/sis/deviceChannel/model.d.ts
@@ -1,4 +1,4 @@
-import type { PageQuery, BaseEntity } from '#/api/common';
+import type { BaseEntity, PageQuery } from '#/api/common';
 
 export interface DeviceChannelVO {
   /**
@@ -51,6 +51,13 @@ export interface DeviceChannelVO {
    */
   channelNo: string;
 
+  nvrId: string;
+  nvrFactoryNo: string;
+  nvrIp: string;
+  nvrPort: number;
+  nvrAccount: string;
+  nvrPwd: string;
+  nvrChannelNo: string;
 }
 
 export interface DeviceChannelForm extends BaseEntity {
@@ -103,7 +110,6 @@ export interface DeviceChannelForm extends BaseEntity {
    * 设备通道编号
    */
   channelNo?: string;
-
 }
 
 export interface DeviceChannelQuery extends PageQuery {
@@ -153,7 +159,7 @@ export interface DeviceChannelQuery extends PageQuery {
   channelNo?: string;
 
   /**
-    * 日期范围参数
-    */
+   * 日期范围参数
+   */
   params?: any;
 }
diff --git a/apps/web-antd/src/views/sis/video/index.vue b/apps/web-antd/src/views/sis/video/index.vue
index 79401ff4..4261a4cb 100644
--- a/apps/web-antd/src/views/sis/video/index.vue
+++ b/apps/web-antd/src/views/sis/video/index.vue
@@ -194,31 +194,26 @@ function onNodeChecked(
     }
     // 批量播放 currentSelectPlayerIndex 将不再生效
     else {
-      checkNode.forEach((item: any) => {
-        // 判断当前摄像数据是否已经在播放，如果在播放则此次不进行播放处理.默认选中最后一个
-        let firstFreePlayerIndex = playerNum.value - 1;
-        // 记录第一个空播放器是否已找到
-        let isRecord = false;
-        // 此次选中的设备是否播放
-        let isPlayer = true;
+      // 如果此次播放数量小于当前播能播放
+      const freeArr: number[] = []; // 空闲播放器数量
+      for (let i = 0; i < playerNum.value; i++) {
+        const playerData = playerList[i];
+        if (!playerData) {
+          freeArr.push(i);
+        }
+      }
+      // 要播放的视频数量，小于等于空闲播放器数量，则填充空闲即可
+      if (checkNode.length <= freeArr.length) {
+        for (let j = 0; j < checkNode.length; j++) {
+          doPlayer(checkNode[j], freeArr[j]);
+        }
+      }
+      // 直接覆盖原有的播放视频
+      else {
         for (let i = 0; i < playerNum.value; i++) {
-          // 记录第一个出现空播放器的索引
-          const playerData = playerList[i];
-          // 没找到空播放器，并且此次循环播放器为null
-          if (!isRecord && !playerData) {
-            firstFreePlayerIndex = i;
-            isRecord = true;
-          }
-
-          if (playerData && playerData.data.id == item.id) {
-            isRecord = false;
-            break;
-          }
+          doPlayer(checkNode[i], i);
         }
-        if (isPlayer) {
-          doPlayer(item, firstFreePlayerIndex);
-        }
-      });
+      }
     }
   }
   // 删除
@@ -275,16 +270,29 @@ function changeElPlayer(playerInfo: any, index: number) {
  * @param nodeData 播放的节点数据
  * @param index 播放器的索引信息
  */
-function doPlayer(nodeData: any, index: number) {
+function doPlayer(nodeData: any, index: number = 0) {
+  console.log('index=', index);
   if (mpegts.isSupported()) {
-    const params = {
-      videoIp: nodeData.deviceIp,
-      videoPort: nodeData.devicePort,
-      factoryNo: nodeData.factoryNo,
-      account: nodeData.deviceAccount,
-      pwd: nodeData.devicePwd,
-      channelId: nodeData.channelNo,
-    };
+    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 = {
+        videoIp: nodeData.deviceIp,
+        videoPort: nodeData.devicePort,
+        factoryNo: nodeData.factoryNo,
+        account: nodeData.deviceAccount,
+        pwd: nodeData.devicePwd,
+        channelId: nodeData.channelNo,
+      };
+    }
     addStreamProxy(params).then((res) => {
       const url = res.wsFlv;
       // 将url 绑定到 nodeData
@@ -367,6 +375,12 @@ onUnmounted(() => {
 .player {
   border: 1px solid #e4e4e7;
   cursor: pointer;
+
+  video {
+    width: 100%;
+    height: 100%;
+    object-fit: fill;
+  }
 }
 
 .player.selected {
diff --git a/apps/web-antd/vite.config.mts b/apps/web-antd/vite.config.mts
index 29bf5bc4..65f4cb57 100644
--- a/apps/web-antd/vite.config.mts
+++ b/apps/web-antd/vite.config.mts
@@ -29,7 +29,7 @@ export default defineConfig(async () => {
             // mock代理目标地址
             // target: 'http://192.168.43.169:8080',
             // target: 'https://by.missmoc.top/api/',
-            target: 'http://127.0.0.1:8080',
+            target: 'http://192.168.13.27:8080',
             // target: 'http://192.168.0.106:8080',
             // target: 'http://47.109.37.87:3010',
             ws: true,

From d9856230e69ef4474056953353e774d1d0761a91 Mon Sep 17 00:00:00 2001
From: dev_ljl <2590379346@qq.com>
Date: Mon, 4 Aug 2025 10:09:12 +0800
Subject: [PATCH 2/9] =?UTF-8?q?fix:=E4=BA=BA=E5=91=98=E5=8D=95=E4=BD=8D?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resident/person/query-unit-list.vue       | 38 ++++++++++---------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/apps/web-antd/src/views/property/resident/person/query-unit-list.vue b/apps/web-antd/src/views/property/resident/person/query-unit-list.vue
index d0f6220f..a788c0c3 100644
--- a/apps/web-antd/src/views/property/resident/person/query-unit-list.vue
+++ b/apps/web-antd/src/views/property/resident/person/query-unit-list.vue
@@ -1,35 +1,35 @@
 <script lang="ts" setup>
-import {ref, watch} from 'vue';
+import {onMounted, ref, watch} from 'vue';
 import {Select} from 'ant-design-vue';
-import {resident_unitList,resident_unitInfo} from "#/api/property/resident/unit";
+import {resident_unitList, resident_unitInfo} from "#/api/property/resident/unit";
 
 defineOptions({name: 'QueryUnitList'});
 
-const props= withDefaults(defineProps<{
+const props = withDefaults(defineProps<{
   disabled?: boolean;
   placeholder?: string;
-  isUpdate?:boolean;
-  unitId?:string;
+  isUpdate?: boolean;
+  unitId?: string;
 }>(), {
   disabled: false,
   placeholder: '可根据单位名称进行搜索...',
-  isUpdate:false,
-  unitId:'',
+  isUpdate: false,
+  unitId: '',
 });
 
-async function queryUnit(value: string, callback: any) {
+async function queryUnit(value: string|undefined, callback: any) {
   const queryData = {
     name: value,
     pageSize: 100,
     pageNum: 1,
-    state:1,
+    state: 1,
   }
   const res = await resident_unitList(queryData);
   const options = res.rows.map((unit) => ({
-    label: unit.name+'-'+unit.id,
+    label: unit.name + '-' + unit.id,
     value: unit.id,
-    name:unit.name,
-    unitNumber:unit.unitNumber,
+    name: unit.name,
+    unitNumber: unit.unitNumber,
   }));
   callback(options);
 }
@@ -46,24 +46,28 @@ const handleChange = (val: string) => {
   emit('update:unitInfo', unitInfo);
 };
 
-async function getUnitInfo(val:string) {
+async function getUnitInfo(val: string) {
   const unit = await resident_unitInfo(val)
   if (unit) {
     data.value = [{
-      label: unit.name+'-'+unit.id,
+      label: unit.name + '-' + unit.id,
       value: unit.id,
-      name:unit.name,
-      unitNumber:unit.id,
+      name: unit.name,
+      unitNumber: unit.id,
     }]
   }
 }
 
 watch(() => props.unitId,
   (newX) => {
-    if (props.isUpdate&&newX) {
+    if (props.isUpdate && newX) {
       getUnitInfo(newX)
     }
   }, {immediate: true})
+
+onMounted(()=>{
+  queryUnit(undefined, (d: any[]) => (data.value = d));
+})
 </script>
 
 <template>

From 6f7c26a5694b474f834d79767fb21ab0dae0076c Mon Sep 17 00:00:00 2001
From: FLL <2162874245@qq.com>
Date: Mon, 4 Aug 2025 10:21:51 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E8=AE=BF=E5=AE=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../businessManagement/workOrders/workOrders-modal.vue       | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/web-antd/src/views/property/businessManagement/workOrders/workOrders-modal.vue b/apps/web-antd/src/views/property/businessManagement/workOrders/workOrders-modal.vue
index 8de52792..b7af6349 100644
--- a/apps/web-antd/src/views/property/businessManagement/workOrders/workOrders-modal.vue
+++ b/apps/web-antd/src/views/property/businessManagement/workOrders/workOrders-modal.vue
@@ -48,6 +48,7 @@ const {onBeforeClose, markInitialized, resetInitialized} = useBeforeCloseDiff(
   },
 );
 
+const recordEdit = ref({});
 const [BasicModal, modalApi] = useVbenModal({
   // 在这里更改宽度
   class: 'w-[70%]',
@@ -69,6 +70,7 @@ const [BasicModal, modalApi] = useVbenModal({
       const record = await workOrdersInfo(id);
       record.isTimeOut = record.isTimeOut?.toString()
       await formApi.setValues(record);
+      recordEdit.value = record;
     }
     await markInitialized();
 
@@ -85,6 +87,9 @@ async function handleConfirm() {
     }
     // getValues获取为一个readonly的对象 需要修改必须先深拷贝一次
     const data = cloneDeep(await formApi.getValues());
+    if(isUpdate.value){
+      data.status = recordEdit?.value.status
+    }
     await (isUpdate.value ? workOrdersUpdate(data) : workOrdersAdd(data));
     resetInitialized();
     emit('reload');

From 523810a1dabb5531d02b39491d03d982a5d78055 Mon Sep 17 00:00:00 2001
From: zcxlsm <patrickstarlsm@163.com>
Date: Mon, 4 Aug 2025 16:55:08 +0800
Subject: [PATCH 4/9] =?UTF-8?q?feat(sis):=20=E5=88=9D=E5=A7=8B=E5=8C=96?=
 =?UTF-8?q?=E8=B5=8B=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/sis/elevatorInfo/model.d.ts       |  17 ++-
 .../sis/elevatorInfo/elevatorInfo-modal.vue   | 133 ++++++++++--------
 2 files changed, 87 insertions(+), 63 deletions(-)

diff --git a/apps/web-antd/src/api/sis/elevatorInfo/model.d.ts b/apps/web-antd/src/api/sis/elevatorInfo/model.d.ts
index 5fd773eb..c7a38573 100644
--- a/apps/web-antd/src/api/sis/elevatorInfo/model.d.ts
+++ b/apps/web-antd/src/api/sis/elevatorInfo/model.d.ts
@@ -96,6 +96,17 @@ export interface ElevatorInfoVO {
    */
   controlPwd: string
 
+  elevatorControlDeviceId: {
+    value: number,
+    deviceIp: string,
+    deviceId: number,
+  }
+
+  remoteCallElevatorDeviceId: {
+    value: number,
+    deviceIp: string,
+    deviceId: number,
+  }[]
 }
 
 export interface ElevatorInfoForm extends BaseEntity {
@@ -299,9 +310,9 @@ export interface ElevatorInfoQuery extends PageQuery {
 }
 
 export interface ElevatorFloorRefVo {
-   /**
-   * 
-   */
+  /**
+  * 
+  */
   elevatorId: string | number
 
   /**
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 3f5d0801..5807619c 100644
--- a/apps/web-antd/src/views/sis/elevatorInfo/elevatorInfo-modal.vue
+++ b/apps/web-antd/src/views/sis/elevatorInfo/elevatorInfo-modal.vue
@@ -1,29 +1,29 @@
 <script setup lang="ts">
-import { computed, ref } from 'vue';
+import { computed, ref } from 'vue'
 
-import { useVbenModal } from '@vben/common-ui';
-import { $t } from '@vben/locales';
-import { cloneDeep, getPopupContainer, handleNode } from '@vben/utils';
+import { useVbenModal } from '@vben/common-ui'
+import { $t } from '@vben/locales'
+import { cloneDeep, getPopupContainer, handleNode } from '@vben/utils'
 
-import { useVbenForm } from '#/adapter/form';
+import { useVbenForm } from '#/adapter/form'
 import {
   elevatorInfoAdd,
   elevatorInfoInfo,
   elevatorInfoUpdate,
-} from '#/api/sis/elevatorInfo';
-import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
+} from '#/api/sis/elevatorInfo'
+import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup'
 
-import { modalSchema } from './data';
-import { communityTree } from '#/api/property/community';
-import type { DeviceManageForm, DeviceManageQuery } from '#/api/sis/deviceManage/model';
-import { deviceManageList } from '#/api/sis/deviceManage';
+import { modalSchema } from './data'
+import { communityTree } from '#/api/property/community'
+import type { DeviceManageForm, DeviceManageQuery } from '#/api/sis/deviceManage/model'
+import { deviceManageList } from '#/api/sis/deviceManage'
 
-const emit = defineEmits<{ reload: [] }>();
+const emit = defineEmits<{ reload: [] }>()
 
-const isUpdate = ref(false);
+const isUpdate = ref(false)
 const title = computed(() => {
-  return isUpdate.value ? $t('pages.common.edit') : $t('pages.common.add');
-});
+  return isUpdate.value ? $t('pages.common.edit') : $t('pages.common.add')
+})
 
 const [BasicForm, formApi] = useVbenForm({
   commonConfig: {
@@ -39,14 +39,14 @@ const [BasicForm, formApi] = useVbenForm({
   schema: modalSchema(),
   showDefaultActions: false,
   wrapperClass: 'grid-cols-2',
-});
+})
 
 const { onBeforeClose, markInitialized, resetInitialized } = useBeforeCloseDiff(
   {
     initializedGetter: defaultFormValueGetter(formApi),
     currentGetter: defaultFormValueGetter(formApi),
   },
-);
+)
 
 const [BasicModal, modalApi] = useVbenModal({
   // 在这里更改宽度
@@ -57,57 +57,70 @@ const [BasicModal, modalApi] = useVbenModal({
   onConfirm: handleConfirm,
   onOpenChange: async (isOpen) => {
     if (!isOpen) {
-      return null;
+      return null
     }
-    modalApi.modalLoading(true);
+    modalApi.modalLoading(true)
     // 加载社区树
-    setupCommunitySelect();
+    setupCommunitySelect()
     // 加载未绑定的设备
-    loadDeviceList();
-    const { id } = modalApi.getData() as { id?: number | string };
-    isUpdate.value = !!id;
+    loadDeviceList()
+    const { id } = modalApi.getData() as { id?: number | string }
+    isUpdate.value = !!id
 
     if (isUpdate.value && id) {
-      const record = await elevatorInfoInfo(id);
-      await formApi.setValues(record);
-    }
-    await markInitialized();
+      const record = await elevatorInfoInfo(id)
+      record.elevatorControlDeviceId = {
+        value: record.elevatorControlDeviceId.deviceId,
+        deviceIp: record.elevatorControlDeviceId.deviceIp,
+        deviceId: record.elevatorControlDeviceId.deviceId,
+      }
 
-    modalApi.modalLoading(false);
+      record.remoteCallElevatorDeviceId = record.remoteCallElevatorDeviceId.map(item => ({
+        value: item.deviceId,
+        deviceIp: item.deviceIp,
+        deviceId: item.deviceId,
+      }));
+
+      await formApi.setValues(record)
+    }
+    await markInitialized()
+
+    modalApi.modalLoading(false)
   },
-});
+})
 
 async function handleConfirm() {
   try {
-    modalApi.lock(true);
-    const { valid } = await formApi.validate();
+    modalApi.lock(true)
+    const { valid } = await formApi.validate()
     if (!valid) {
-      return;
+      return
     }
     // getValues获取为一个readonly的对象 需要修改必须先深拷贝一次
-    const data = cloneDeep(await formApi.getValues());
-    await (isUpdate.value ? elevatorInfoUpdate(data) : elevatorInfoAdd(data));
-    resetInitialized();
-    emit('reload');
-    modalApi.close();
+    const data = cloneDeep(await formApi.getValues())
+    console.log(data)
+    await (isUpdate.value ? elevatorInfoUpdate(data) : elevatorInfoAdd(data))
+    resetInitialized()
+    emit('reload')
+    modalApi.close()
   } catch (error) {
-    console.error(error);
+    console.error(error)
   } finally {
-    modalApi.lock(false);
+    modalApi.lock(false)
   }
 }
 
-let rows: any = [];
+let rows: any = []
 
 async function loadDeviceList() {
   if (rows.length === 0) {
     const params: DeviceManageQuery = {
       pageNum: 1,
       pageSize: 500,
-    };
-    const res = await deviceManageList(params);
+    }
+    const res = await deviceManageList(params)
     if (res && res.rows && res.rows.length > 0) {
-      rows = res.rows;
+      rows = res.rows
     }
   }
   const arr = rows.map((item: DeviceManageForm) => {
@@ -116,8 +129,8 @@ async function loadDeviceList() {
       value: item.id,
       deviceIp: item.deviceIp,
       deviceId: item.id,
-    };
-  });
+    }
+  })
 
   formApi.updateSchema([
     {
@@ -125,9 +138,9 @@ async function loadDeviceList() {
         options: arr,
         mode: 'multiple', // 关键属性，启用多选模式
         onChange: async (value: string, option: any) => {
-          const data = cloneDeep(await formApi.getValues());
-          data.remoteCallElevatorDeviceId = option;
-          formApi.setValues(data);
+          const data = cloneDeep(await formApi.getValues())
+          data.remoteCallElevatorDeviceId = option
+          formApi.setValues(data)
         },
       }),
       fieldName: 'remoteCallElevatorDeviceId',
@@ -137,29 +150,29 @@ async function loadDeviceList() {
         options: arr,
         allowClear: true,
         onChange: async (value: string, option: any) => {
-          const data = cloneDeep(await formApi.getValues());
-          data.elevatorControlDeviceId = option;
-          formApi.setValues(data);
+          const data = cloneDeep(await formApi.getValues())
+          data.elevatorControlDeviceId = option
+          formApi.setValues(data)
         },
       }),
       fieldName: 'elevatorControlDeviceId',
     },
-  ]);
+  ])
 }
 
 /**
  * 初始化城市
  */
 async function setupCommunitySelect() {
-  const areaList = await communityTree(3);
+  const areaList = await communityTree(2)
   // 选中后显示在输入框的值 即父节点 / 子节点
   // addFullName(areaList, 'areaName', ' / ');
-  const splitStr = '/';
+  const splitStr = '/'
   handleNode(areaList, 'label', splitStr, function (node: any) {
-    if (node.level != 3) {
-      node.disabled = true;
+    if (node.level != 2) {
+      node.disabled = true
     }
-  });
+  })
   formApi.updateSchema([
     {
       componentProps: () => ({
@@ -183,12 +196,12 @@ async function setupCommunitySelect() {
       }),
       fieldName: 'unitId',
     },
-  ]);
+  ])
 }
 
 async function handleClosed() {
-  await formApi.resetForm();
-  resetInitialized();
+  await formApi.resetForm()
+  resetInitialized()
 }
 </script>
 

From 7ad4613fc876384c97f9675f3b6081b6b61da383 Mon Sep 17 00:00:00 2001
From: FLL <2162874245@qq.com>
Date: Mon, 4 Aug 2025 17:06:09 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E8=AE=BF=E5=AE=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../businessManagement/workOrders/data.ts     | 29 +++++++++++++-
 .../workOrders/work-orders-detail.vue         |  8 ++++
 .../workOrders/workOrders-modal.vue           | 26 +------------
 .../inspectionPoint/inspectionPoint-modal.vue | 28 ++++++++++++-
 .../inspectionRoute/data.ts                   | 12 +++++-
 .../inspectionRoute/inspectionRoute-modal.vue | 39 ++++++++++++++++---
 6 files changed, 107 insertions(+), 35 deletions(-)

diff --git a/apps/web-antd/src/views/property/businessManagement/workOrders/data.ts b/apps/web-antd/src/views/property/businessManagement/workOrders/data.ts
index e25fafe2..5ecf2907 100644
--- a/apps/web-antd/src/views/property/businessManagement/workOrders/data.ts
+++ b/apps/web-antd/src/views/property/businessManagement/workOrders/data.ts
@@ -24,6 +24,14 @@ export const querySchema: FormSchemaGetter = () => [
     fieldName: 'status',
     label: '状态',
   },
+  {
+    component: 'Select',
+    componentProps: {
+      options: getDictOptions('pro_processing_weight'),
+    },
+    fieldName: 'processingWeight',
+    label: '处理权重',
+  },
 ];
 
 export const columns: VxeGridProps['columns'] = [
@@ -148,6 +156,15 @@ export const modalSchema: FormSchemaGetter = () => [
     componentProps: {},
     rules: 'selectRequired',
   },
+  {
+    label: '处理权重',
+    fieldName: 'processingWeight',
+    component: 'Select',
+    componentProps: {
+      options: getDictOptions('pro_processing_weight'),
+    },
+    rules: 'selectRequired',
+  },
   // {
   //   label: '状态',
   //   fieldName: 'status',
@@ -216,9 +233,8 @@ export const modalSchema: FormSchemaGetter = () => [
   // },
   {
     label: '备注',
-    fieldName: 'remarkremark',
+    fieldName: 'remark',
     component: 'Textarea',
-    rules: 'required',
   },
   // {
   //   label: '是否超时',
@@ -230,6 +246,15 @@ export const modalSchema: FormSchemaGetter = () => [
   //   },
   //   rules: 'selectRequired',
   // },
+  {
+    label: '工单图片',
+    fieldName: 'orderImgUrl',
+    component: 'ImageUpload',
+    componentProps: {
+      maxCount: 1,
+    },
+    formItemClass: 'col-span-2',
+  },
 ];
 export const ordersModalSchema: FormSchemaGetter = () => [
   {
diff --git a/apps/web-antd/src/views/property/businessManagement/workOrders/work-orders-detail.vue b/apps/web-antd/src/views/property/businessManagement/workOrders/work-orders-detail.vue
index bcd5349b..95c8420c 100644
--- a/apps/web-antd/src/views/property/businessManagement/workOrders/work-orders-detail.vue
+++ b/apps/web-antd/src/views/property/businessManagement/workOrders/work-orders-detail.vue
@@ -77,6 +77,11 @@ async function handleOpenChange(open: boolean) {
         <DescriptionsItem label="完成时间">
           {{ orderDetail.compleTime }}
         </DescriptionsItem>
+        <DescriptionsItem label="处理权重">
+          <component
+            :is="renderDict(orderDetail.processingWeight,'pro_processing_weight')"
+          />
+        </DescriptionsItem>
         <DescriptionsItem label="是否超时" v-if="orderDetail.isTimeOut!=null">
           <component
             :is="renderDict(orderDetail.isTimeOut,'wy_sf')"
@@ -91,6 +96,9 @@ async function handleOpenChange(open: boolean) {
         <DescriptionsItem label="评价图片" v-if="orderDetail.imgUrl" :span="2">
           {{ orderDetail.imgUrl }}
         </DescriptionsItem>
+        <DescriptionsItem label="工单图片" v-if="orderDetail.orderImgUrl" :span="2">
+          {{ orderDetail.orderImgUrl }}
+        </DescriptionsItem>
       </Descriptions>
       <Divider orientation="left" orientation-margin="0px">
         处理记录
diff --git a/apps/web-antd/src/views/property/businessManagement/workOrders/workOrders-modal.vue b/apps/web-antd/src/views/property/businessManagement/workOrders/workOrders-modal.vue
index b7af6349..a641283f 100644
--- a/apps/web-antd/src/views/property/businessManagement/workOrders/workOrders-modal.vue
+++ b/apps/web-antd/src/views/property/businessManagement/workOrders/workOrders-modal.vue
@@ -62,7 +62,7 @@ const [BasicModal, modalApi] = useVbenModal({
     }
     modalApi.modalLoading(true);
     await queryPersonData()
-    await queryWorkOrdersType()
+
     const {id} = modalApi.getData() as { id?: number | string };
     isUpdate.value = !!id;
 
@@ -134,30 +134,6 @@ async function queryPersonData() {
     }])
 }
 
-async function queryWorkOrdersType() {
-  let params = {
-    pageSize: 1000,
-    pageNum: 1
-  }
-  const res = await workOrdersTypeList(params)
-  const options = res.rows.map((item) => ({
-    label: item.orderTypeName,
-    value: item.id,
-  }));
-  formApi.updateSchema([{
-    componentProps: () => ({
-      options: options,
-      filterOption: filterOption,
-      showSearch:true,
-    }),
-    fieldName: 'type',
-  }])
-}
-
-const filterOption = (input: string, option: any) => {
-  return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0;
-};
-
 </script>
 
 <template>
diff --git a/apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/inspectionPoint-modal.vue b/apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/inspectionPoint-modal.vue
index aeeabe8a..4b1fd745 100644
--- a/apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/inspectionPoint-modal.vue
+++ b/apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/inspectionPoint-modal.vue
@@ -10,6 +10,7 @@ import { inspectionPointAdd, inspectionPointInfo, inspectionPointUpdate } from '
 import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
 
 import { modalSchema } from './data';
+import {workOrdersTypeList} from "#/api/property/businessManagement/workOrdersType";
 
 const emit = defineEmits<{ reload: [] }>();
 
@@ -53,7 +54,7 @@ const [BasicModal, modalApi] = useVbenModal({
       return null;
     }
     modalApi.modalLoading(true);
-
+    await queryWorkOrdersType()
     const { id } = modalApi.getData() as { id?: number | string };
     isUpdate.value = !!id;
 
@@ -91,6 +92,31 @@ async function handleClosed() {
   await formApi.resetForm();
   resetInitialized();
 }
+
+
+async function queryWorkOrdersType() {
+  let params = {
+    pageSize: 1000,
+    pageNum: 1
+  }
+  const res = await workOrdersTypeList(params)
+  const options = res.rows.map((item) => ({
+    label: item.orderTypeName,
+    value: item.id,
+  }));
+  formApi.updateSchema([{
+    componentProps: () => ({
+      options: options,
+      filterOption: filterOption,
+      showSearch:true,
+    }),
+    fieldName: 'type',
+  }])
+}
+
+const filterOption = (input: string, option: any) => {
+  return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+};
 </script>
 
 <template>
diff --git a/apps/web-antd/src/views/property/inspectionManagement/inspectionRoute/data.ts b/apps/web-antd/src/views/property/inspectionManagement/inspectionRoute/data.ts
index fc90d78d..db36a106 100644
--- a/apps/web-antd/src/views/property/inspectionManagement/inspectionRoute/data.ts
+++ b/apps/web-antd/src/views/property/inspectionManagement/inspectionRoute/data.ts
@@ -1,4 +1,4 @@
-import type { FormSchemaGetter } from '#/adapter/form';
+import {type FormSchemaGetter, z} from '#/adapter/form';
 import type { VxeGridProps } from '#/adapter/vxe-table';
 
 
@@ -61,6 +61,16 @@ export const modalSchema: FormSchemaGetter = () => [
     component: 'Input',
     rules: 'required',
   },
+  {
+    label: '巡检点',
+    fieldName: 'pointId',
+    component: 'ApiSelect',
+    componentProps:{
+      mode: 'multiple',
+    },
+    rules: z.array(z.string()).min(1, { message: '请选择' }),
+    formItemClass: 'col-span-2',
+  },
   {
     label: '备注',
     fieldName: 'remark',
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 96c0e4d3..5a223913 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
@@ -1,14 +1,14 @@
 <script setup lang="ts">
 import { computed, ref } from 'vue';
-
 import { useVbenModal } from '@vben/common-ui';
 import { $t } from '@vben/locales';
 import { cloneDeep } from '@vben/utils';
-
 import { useVbenForm } from '#/adapter/form';
 import { inspectionRouteAdd, inspectionRouteInfo, inspectionRouteUpdate } from '#/api/property/inspectionManagement/inspectionRoute';
 import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
-
+import {
+  inspectionPointList,
+} from '#/api/property/inspectionManagement/inspectionPoint';
 import { modalSchema } from './data';
 
 const emit = defineEmits<{ reload: [] }>();
@@ -21,7 +21,7 @@ const title = computed(() => {
 const [BasicForm, formApi] = useVbenForm({
   commonConfig: {
     // 默认占满两列
-    formItemClass: 'col-span-2',
+    formItemClass: 'col-span-1',
     // 默认label宽度 px
     labelWidth: 100,
     // 通用配置项 会影响到所有表单项
@@ -43,7 +43,7 @@ const { onBeforeClose, markInitialized, resetInitialized } = useBeforeCloseDiff(
 
 const [BasicModal, modalApi] = useVbenModal({
   // 在这里更改宽度
-  class: 'w-[550px]',
+  class: 'w-[60%]',
   fullscreenButton: false,
   onBeforeClose,
   onClosed: handleClosed,
@@ -53,12 +53,13 @@ const [BasicModal, modalApi] = useVbenModal({
       return null;
     }
     modalApi.modalLoading(true);
-
+    await queryWorkOrdersType()
     const { id } = modalApi.getData() as { id?: number | string };
     isUpdate.value = !!id;
 
     if (isUpdate.value && id) {
       const record = await inspectionRouteInfo(id);
+      record.pointId = record.pointId?.split(',')
       await formApi.setValues(record);
     }
     await markInitialized();
@@ -76,6 +77,7 @@ async function handleConfirm() {
     }
     // getValues获取为一个readonly的对象 需要修改必须先深拷贝一次
     const data = cloneDeep(await formApi.getValues());
+    data.pointId = data.pointId?.join(',')
     await (isUpdate.value ? inspectionRouteUpdate(data) : inspectionRouteAdd(data));
     resetInitialized();
     emit('reload');
@@ -91,6 +93,31 @@ async function handleClosed() {
   await formApi.resetForm();
   resetInitialized();
 }
+
+async function queryWorkOrdersType() {
+  let params = {
+    pageSize: 1000,
+    pageNum: 1
+  }
+  const res = await inspectionPointList(params)
+  const options = res.rows.map((item) => ({
+    label: item.pointName,
+    value: item.id,
+  }));
+  formApi.updateSchema([{
+    componentProps: () => ({
+      options: options,
+      showSearch: true,
+      filterOption: filterOption,
+      mode: 'multiple',
+    }),
+    fieldName: 'pointId',
+  }])
+}
+
+const filterOption = (input: string, option: any) => {
+  return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+};
 </script>
 
 <template>

From 98d6dd0d9be9b58de5559099de98f01f65369d33 Mon Sep 17 00:00:00 2001
From: dev_ljl <2590379346@qq.com>
Date: Mon, 4 Aug 2025 17:27:37 +0800
Subject: [PATCH 6/9] =?UTF-8?q?feat:=E5=87=BA=E5=BA=93=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/property/assetManage/asset/model.d.ts |   2 +-
 .../application/application-modal.vue         |  88 +++++----
 .../property/assetManage/application/data.ts  | 118 ++++++------
 .../assetManage/application/index.vue         |  61 ++++--
 .../assetManage/asset/asset-modal.vue         |  23 +--
 .../views/property/assetManage/asset/data.ts  |  91 +++++----
 .../property/assetManage/asset/index.vue      |  49 +++--
 .../views/property/assetManage/log/data.ts    | 177 +++++++++---------
 .../views/property/assetManage/log/index.vue  |  78 ++++----
 9 files changed, 391 insertions(+), 296 deletions(-)

diff --git a/apps/web-antd/src/api/property/assetManage/asset/model.d.ts b/apps/web-antd/src/api/property/assetManage/asset/model.d.ts
index 213c5268..505a3b25 100644
--- a/apps/web-antd/src/api/property/assetManage/asset/model.d.ts
+++ b/apps/web-antd/src/api/property/assetManage/asset/model.d.ts
@@ -59,7 +59,7 @@ export interface AssetVO {
   /**
    * 固定资产类型
    */
-  type: number;
+  type: string;
 
   /**
    * 创建时间
diff --git a/apps/web-antd/src/views/property/assetManage/application/application-modal.vue b/apps/web-antd/src/views/property/assetManage/application/application-modal.vue
index 9c9dac78..0ba82bec 100644
--- a/apps/web-antd/src/views/property/assetManage/application/application-modal.vue
+++ b/apps/web-antd/src/views/property/assetManage/application/application-modal.vue
@@ -1,20 +1,25 @@
 <script setup lang="ts">
-import { computed, ref } from 'vue';
+import {computed, ref} from 'vue';
 
-import { useVbenModal } from '@vben/common-ui';
-import { $t } from '@vben/locales';
-import { cloneDeep } from '@vben/utils';
+import {useVbenModal} from '@vben/common-ui';
+import {$t} from '@vben/locales';
+import {cloneDeep} from '@vben/utils';
 
-import { type FormSchemaGetter, useVbenForm } from "#/adapter/form";
-import { applicationAdd, applicationInfo, applicationUpdate } from '#/api/property/assetManage/application';
-import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
+import {type FormSchemaGetter, useVbenForm} from "#/adapter/form";
+import {
+  applicationAdd,
+  applicationInfo,
+  applicationUpdate
+} from '#/api/property/assetManage/application';
+import {defaultFormValueGetter, useBeforeCloseDiff} from '#/utils/popup';
 
-import { modalSchema } from './data';
-import { assetTypeselect } from "#/api/property/assetType";
-import { depotList } from "#/api/property/assetManage/depot";
-import { suppliersList } from "#/api/property/assetManage/suppliers";
-import { assetList } from "#/api/property/assetManage/asset";
-import { userList } from "#/api/system/user";
+import {modalSchema} from './data';
+import {assetTypeselect} from "#/api/property/assetType";
+import {depotList} from "#/api/property/assetManage/depot";
+import {suppliersList} from "#/api/property/assetManage/suppliers";
+import {assetList} from "#/api/property/assetManage/asset";
+import {userList} from "#/api/system/user";
+import type {AssetVO} from "#/api/property/assetManage/asset/model";
 
 const emit = defineEmits<{ reload: [] }>();
 
@@ -39,7 +44,7 @@ const [BasicForm, formApi] = useVbenForm({
   wrapperClass: 'grid-cols-2',
 });
 
-const { onBeforeClose, markInitialized, resetInitialized } = useBeforeCloseDiff(
+const {onBeforeClose, markInitialized, resetInitialized} = useBeforeCloseDiff(
   {
     initializedGetter: defaultFormValueGetter(formApi),
     currentGetter: defaultFormValueGetter(formApi),
@@ -48,15 +53,15 @@ const { onBeforeClose, markInitialized, resetInitialized } = useBeforeCloseDiff(
 
 formApi.getValues().then(setupPackageSelect);
 
-async function upSelectUser(nickName: string){
-  const list=await userList({
-    nickName:nickName,
+async function upSelectUser(nickName: string) {
+  const list = await userList({
+    nickName: nickName,
     pageNum: 1,
     pageSize: 10,
   });
-  const options=list.map(item=>{
-    item.label=item.userName;
-    item.value=item.id;
+  const options = list.map(item => {
+    item.label = item.userName;
+    item.value = item.id;
   })
   fromApi.updateSchema([
     {
@@ -71,15 +76,15 @@ async function upSelectUser(nickName: string){
   ]);
 }
 
-async function upSelectAssets(assetsName: string){
-  const list=await assetList({
-    assetsName:assetsName,
+async function upSelectAssets(assetsName: string) {
+  const list = await assetList({
+    assetsName: assetsName,
     pageNum: 1,
     pageSize: 10,
   });
-  const options=list.map(item=>{
-    item.label=item.assetsName;
-    item.value=item.id;
+  const options = list.map(item => {
+    item.label = item.assetsName;
+    item.value = item.id;
   })
   fromApi.updateSchema([
     {
@@ -94,15 +99,18 @@ async function upSelectAssets(assetsName: string){
   ]);
 }
 
+const assetsData = ref<AssetVO[]>([])
+
 async function setupPackageSelect() {
   const users = await userList({
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 1000,
   });
   const assets = await assetList({
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 1000,
   });
+  assetsData.value = assets.rows
   const options = users.rows.map((item) => ({
     label: item.nickName,
     value: item.userId,
@@ -121,7 +129,7 @@ async function setupPackageSelect() {
       },
       async select(userId) {
         await upSelectUser(userId);
-        userId=""
+        userId = ""
       },
       fieldName: 'userId',
     },
@@ -131,18 +139,30 @@ async function setupPackageSelect() {
         optionLabelProp: 'label',
         options: assetOptions,
         showSearch: true,
+        onChange: async (value: string) => {
+          // 找到选中的服务数据
+          const assetInfo = assetsData.value.find(item => item.id === value);
+          if (assetInfo) {
+            formApi.updateSchema([{
+              componentProps: {
+               max:assetInfo.stock
+              },
+              fieldName: 'number',
+            }])
+          }
+        },
       },
       async select(assetsId) {
         await upSelectAssets(assetsId);
-        assetsId=""
+        assetsId = ""
       },
       fieldName: 'assetId',
     },
 
   ]);
-
 }
 
+
 const [BasicModal, modalApi] = useVbenModal({
   // 在这里更改宽度
   class: 'w-[550px]',
@@ -156,7 +176,7 @@ const [BasicModal, modalApi] = useVbenModal({
     }
     modalApi.modalLoading(true);
 
-    const { id } = modalApi.getData() as { id?: number | string };
+    const {id} = modalApi.getData() as { id?: number | string };
     isUpdate.value = !!id;
 
     if (isUpdate.value && id) {
@@ -172,7 +192,7 @@ const [BasicModal, modalApi] = useVbenModal({
 async function handleConfirm() {
   try {
     modalApi.lock(true);
-    const { valid } = await formApi.validate();
+    const {valid} = await formApi.validate();
     if (!valid) {
       return;
     }
@@ -197,7 +217,7 @@ async function handleClosed() {
 
 <template>
   <BasicModal :title="title">
-    <BasicForm />
+    <BasicForm/>
   </BasicModal>
 </template>
 
diff --git a/apps/web-antd/src/views/property/assetManage/application/data.ts b/apps/web-antd/src/views/property/assetManage/application/data.ts
index aad2f7e8..8afff06c 100644
--- a/apps/web-antd/src/views/property/assetManage/application/data.ts
+++ b/apps/web-antd/src/views/property/assetManage/application/data.ts
@@ -2,65 +2,65 @@ import type { FormSchemaGetter } from '#/adapter/form';
 import type { VxeGridProps } from '#/adapter/vxe-table';
 import { renderDict } from "#/utils/render";
 import { DictEnum } from '@vben/constants';
+import {getDictOptions} from "#/utils/dict";
 
 
 
 export const querySchema: FormSchemaGetter = () => [
+  // {
+  //   component: 'Input',
+  //   fieldName: 'assetId',
+  //   label: '资产id',
+  // },
+  // {
+  //   component: 'Input',
+  //   fieldName: 'userId',
+  //   label: '领用人id',
+  // },
+  // {
+  //   component: 'Input',
+  //   fieldName: 'number',
+  //   label: '数量',
+  // },
   {
-    component: 'Input',
-    fieldName: 'assetId',
-    label: '资产id',
-  },
-  {
-    component: 'Input',
-    fieldName: 'userId',
-    label: '领用人id',
-  },
-  {
-    component: 'Input',
-    fieldName: 'number',
-    label: '数量',
-  },
-  {
-    component: 'Input',
+    component: 'Select',
+    componentProps:{
+      options:getDictOptions(DictEnum.WY_ZCSHZT)
+    },
     fieldName: 'state',
-    label: '状态',
-  },
-  {
-    component: 'Input',
-    fieldName: 'acceptanceUserId',
-    label: '审批人id',
-  },
-  {
-    component: 'DatePicker',
-    componentProps: {
-      showTime: true,
-      format: 'YYYY-MM-DD HH:mm:ss',
-      valueFormat: 'YYYY-MM-DD HH:mm:ss',
-    },
-    fieldName: 'acceptanceTime',
-    label: '审批时间',
-  },
-  {
-    component: 'DatePicker',
-    componentProps: {
-      showTime: true,
-      format: 'YYYY-MM-DD HH:mm:ss',
-      valueFormat: 'YYYY-MM-DD HH:mm:ss',
-    },
-    fieldName: 'applicationTime',
-    label: '申请时间',
+    label: '领用状态',
   },
+  // {
+  //   component: 'Input',
+  //   fieldName: 'acceptanceUserId',
+  //   label: '审批人id',
+  // },
+  // {
+  //   component: 'DatePicker',
+  //   componentProps: {
+  //     showTime: true,
+  //     format: 'YYYY-MM-DD HH:mm:ss',
+  //     valueFormat: 'YYYY-MM-DD HH:mm:ss',
+  //   },
+  //   fieldName: 'acceptanceTime',
+  //   label: '审批时间',
+  // },
+  // {
+  //   component: 'DatePicker',
+  //   componentProps: {
+  //     showTime: true,
+  //     format: 'YYYY-MM-DD HH:mm:ss',
+  //     valueFormat: 'YYYY-MM-DD HH:mm:ss',
+  //   },
+  //   fieldName: 'applicationTime',
+  //   label: '申请时间',
+  // },
 ];
 
 // 需要使用i18n注意这里要改成getter形式 否则切换语言不会刷新
 // export const columns: () => VxeGridProps['columns'] = () => [
 export const columns: VxeGridProps['columns'] = [
   { type: 'checkbox', width: 60 },
-  {
-    title: '主键',
-    field: 'id',
-  },
   {
     title: '资产',
     field: 'assetName',
@@ -74,7 +74,11 @@ export const columns: VxeGridProps['columns'] = [
     field: 'number',
   },
   {
-    title: '状态',
+    title: '申请时间',
+    field: 'applicationTime',
+  },
+  {
+    title: '领用状态',
     field: 'state',
     slots: {
       default: ({ row }) => {
@@ -90,14 +94,6 @@ export const columns: VxeGridProps['columns'] = [
     title: '审批时间',
     field: 'acceptanceTime',
   },
-  {
-    title: '申请时间',
-    field: 'applicationTime',
-  },
-  {
-    title: '创建时间',
-    field: 'createTime',
-  },
   {
     field: 'action',
     fixed: 'right',
@@ -118,19 +114,25 @@ export const modalSchema: FormSchemaGetter = () => [
     },
   },
   {
-    label: '资产id',
+    label: '资产',
     fieldName: 'assetId',
     component: 'Select',
+    rules:'selectRequired'
   },
   {
-    label: '领用人id',
+    label: '领用人',
     fieldName: 'userId',
     component: 'Select',
+    rules:'selectRequired'
   },
   {
     label: '数量',
     fieldName: 'number',
-    component: 'Input',
+    component: 'InputNumber',
+    componentProps:{
+      min:1,
+    },
+    rules:'required'
   },
   // {
   //   label: '状态',
diff --git a/apps/web-antd/src/views/property/assetManage/application/index.vue b/apps/web-antd/src/views/property/assetManage/application/index.vue
index 4ca020dc..2569b981 100644
--- a/apps/web-antd/src/views/property/assetManage/application/index.vue
+++ b/apps/web-antd/src/views/property/assetManage/application/index.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
 
-import { Page, useVbenModal, type VbenFormProps } from '@vben/common-ui';
-import { getVxePopupContainer } from '@vben/utils';
+import {Page, useVbenModal, type VbenFormProps} from '@vben/common-ui';
+import {getVxePopupContainer} from '@vben/utils';
 
-import { Modal, Popconfirm, Space } from 'ant-design-vue';
+import {Modal, Popconfirm, Space} from 'ant-design-vue';
 
 import {
   useVbenVxeGrid,
@@ -14,14 +14,15 @@ import {
 import {
   applicationExport,
   applicationList,
-  applicationRemove,
+  applicationRemove, applicationUpdate,
 } from '#/api/property/assetManage/application';
-import type { ApplicationForm } from '#/api/property/assetManage/application/model';
-import { commonDownloadExcel } from '#/utils/file/download';
+import type {ApplicationForm} from '#/api/property/assetManage/application/model';
+import {commonDownloadExcel} from '#/utils/file/download';
 
 import applicationModal from './application-modal.vue';
-import { columns, querySchema } from './data';
-
+import {columns, querySchema} from './data';
+import {useUserStore} from "@vben/stores";
+import { cloneDeep } from '@vben/utils';
 const formOptions: VbenFormProps = {
   commonConfig: {
     labelWidth: 80,
@@ -50,7 +51,7 @@ const gridOptions: VxeGridProps = {
   pagerConfig: {},
   proxyConfig: {
     ajax: {
-      query: async ({ page }, formValues = {}) => {
+      query: async ({page}, formValues = {}) => {
         return await applicationList({
           pageNum: page.currentPage,
           pageSize: page.pageSize,
@@ -81,7 +82,7 @@ function handleAdd() {
 }
 
 async function handleEdit(row: Required<ApplicationForm>) {
-  modalApi.setData({ id: row.id });
+  modalApi.setData({id: row.id});
   modalApi.open();
 }
 
@@ -90,6 +91,17 @@ async function handleDelete(row: Required<ApplicationForm>) {
   await tableApi.query();
 }
 
+const userStore = useUserStore();
+
+async function handleAudit(row: Required<ApplicationForm>, status: number) {
+  const info = cloneDeep(row)
+  info.state = status
+  info.acceptanceTime = new Date()
+  info.acceptanceUserId = userStore.userInfo?.userId
+  await applicationUpdate(info)
+  await tableApi.query();
+}
+
 function handleMultiDelete() {
   const rows = tableApi.grid.getCheckboxRecords();
   const ids = rows.map((row: Required<ApplicationForm>) => row.id);
@@ -141,12 +153,29 @@ function handleDownloadExcel() {
       </template>
       <template #action="{ row }">
         <Space>
-          <ghost-button
-            v-access:code="['property:application:edit']"
-            @click.stop="handleEdit(row)"
+          <!--          <ghost-button-->
+          <!--            v-access:code="['property:application:edit']"-->
+          <!--            @click.stop="handleEdit(row)"-->
+          <!--          >-->
+          <!--            {{ $t('pages.common.edit') }}-->
+          <!--          </ghost-button>-->
+          <Popconfirm
+            :get-popup-container="getVxePopupContainer"
+            placement="left"
+            title="资产领用审核"
+            @confirm="handleAudit(row,1)"
+            cancelText="不通过"
+            okText="通过"
+            @cancel="handleAudit(row,2)"
           >
-            {{ $t('pages.common.edit') }}
-          </ghost-button>
+            <ghost-button
+              v-access:code="['property:application:edit']"
+              @click.stop=""
+              :disabled="row.state!=0"
+            >
+              审核
+            </ghost-button>
+          </Popconfirm>
           <Popconfirm
             :get-popup-container="getVxePopupContainer"
             placement="left"
@@ -164,6 +193,6 @@ function handleDownloadExcel() {
         </Space>
       </template>
     </BasicTable>
-    <ApplicationModal @reload="tableApi.query()" />
+    <ApplicationModal @reload="tableApi.query()"/>
   </Page>
 </template>
diff --git a/apps/web-antd/src/views/property/assetManage/asset/asset-modal.vue b/apps/web-antd/src/views/property/assetManage/asset/asset-modal.vue
index c3c13dea..6a80a1eb 100644
--- a/apps/web-antd/src/views/property/assetManage/asset/asset-modal.vue
+++ b/apps/web-antd/src/views/property/assetManage/asset/asset-modal.vue
@@ -10,8 +10,6 @@ import { assetAdd, assetInfo, assetUpdate } from '#/api/property/assetManage/ass
 import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
 
 import { modalSchema } from './data';
-import { packageSelectList } from "#/api/system/tenant-package";
-import { assetTypeselect } from "#/api/property/assetType";
 import { depotList } from "#/api/property/assetManage/depot";
 import { suppliersList } from "#/api/property/assetManage/suppliers";
 
@@ -25,9 +23,9 @@ const title = computed(() => {
 const [BasicForm, formApi] = useVbenForm({
   commonConfig: {
     // 默认占满两列
-    formItemClass: 'col-span-2',
+    formItemClass: 'col-span-1',
     // 默认label宽度 px
-    labelWidth: 80,
+    labelWidth: 100,
     // 通用配置项 会影响到所有表单项
     componentProps: {
       class: 'w-full',
@@ -45,14 +43,9 @@ const { onBeforeClose, markInitialized, resetInitialized } = useBeforeCloseDiff(
   },
 );
 
-async function setupPackageSelect() {
-  const tenantPackageList = await assetTypeselect();
+async function setupPackageSelect(assetTypeOptions) {
   const depot = await depotList();
   const suppliers =await suppliersList();
-  const options = tenantPackageList.rows.map((item) => ({
-    label: item.assetTypeName,
-    value: item.id,
-  }));
   const depotoptions = depot.rows.map((item) => ({
     label: item.depotName,
     value: item.id,
@@ -67,7 +60,7 @@ async function setupPackageSelect() {
       componentProps: {
         optionFilterProp: 'label',
         optionLabelProp: 'label',
-        options,
+        options:assetTypeOptions,
         showSearch: true,
       },
       fieldName: 'model',
@@ -96,7 +89,7 @@ async function setupPackageSelect() {
 
 const [BasicModal, modalApi] = useVbenModal({
   // 在这里更改宽度
-  class: 'w-[550px]',
+  class: 'w-[70%]',
   fullscreenButton: false,
   onBeforeClose,
   onClosed: handleClosed,
@@ -108,15 +101,15 @@ const [BasicModal, modalApi] = useVbenModal({
 
     modalApi.modalLoading(true);
 
-    const { id } = modalApi.getData() as { id?: number | string };
+    const { id,assetTypeOptions } = modalApi.getData() as { id?: number | string,assetTypeOptions:any[] };
     isUpdate.value = !!id;
-
     if (isUpdate.value && id) {
       const record = await assetInfo(id);
+      record.type=record.type.toString()
       await formApi.setValues(record);
     }
     await markInitialized();
-    await setupPackageSelect();
+    await setupPackageSelect(assetTypeOptions);
     modalApi.modalLoading(false);
   },
 });
diff --git a/apps/web-antd/src/views/property/assetManage/asset/data.ts b/apps/web-antd/src/views/property/assetManage/asset/data.ts
index 2b381f74..cae7d005 100644
--- a/apps/web-antd/src/views/property/assetManage/asset/data.ts
+++ b/apps/web-antd/src/views/property/assetManage/asset/data.ts
@@ -6,7 +6,7 @@ import { DictEnum } from '@vben/constants';
 
 
 
-export const querySchema: FormSchemaGetter = () => [
+export const querySchema: FormSchemaGetter = (assetTypeOptions) => [
   {
     component: 'Input',
     fieldName: 'name',
@@ -14,6 +14,9 @@ export const querySchema: FormSchemaGetter = () => [
   },
   {
     component: 'Select',
+    componentProps:{
+      options: assetTypeOptions
+    },
     fieldName: 'model',
     label: '资产类型',
   },
@@ -32,54 +35,50 @@ export const querySchema: FormSchemaGetter = () => [
 // export const columns: () => VxeGridProps['columns'] = () => [
 export const columns: VxeGridProps['columns'] = [
   {type: 'checkbox', width: 60},
-  {
-    title: '序号',
-    field: 'id',
-    slots: {
-      default: ({ rowIndex }) => {
-        return (rowIndex + 1).toString();
-      },
-    },
-  },
   {
     title: '资产名称',
     field: 'name',
+    minWidth: 180,
   },
   {
     title: '资产类型',
     field: 'modelName',
+    width: 150,
   },
   {
     title: '规格',
     field: 'specs',
+    width: 100,
   },
   {
     title: '价格',
     field: 'price',
-  },
-  {
-    title: '库存',
-    field: 'stock',
+    width: 100,
   },
   {
     title: '计量单位',
     field: 'unit',
-  },
-  {
-    title: '仓库',
-    field: 'depotName',
-  },
-  {
-    title: '描述信息',
-    field: 'msg',
+    width: 100,
   },
   {
     title: '供应商',
     field: 'suppliersName',
+    width: 180,
+  },
+  {
+    title: '仓库',
+    field: 'depotName',
+    width: 180,
+  },
+  {
+    title: '库存',
+    field: 'stock',
+    width: 100,
   },
   {
     title: '入库时间',
     field: 'storageTime',
+    width: 150,
   },
   {
     title: '固定资产',
@@ -89,10 +88,12 @@ export const columns: VxeGridProps['columns'] = [
         return renderDict(row.type, DictEnum.WY_SF);
       },
     },
+    width: 80,
   },
   {
-    title: '创建时间',
-    field: 'createTime',
+    title: '描述信息',
+    field: 'msg',
+    width: 150,
   },
   {
     field: 'action',
@@ -117,46 +118,56 @@ export const modalSchema: FormSchemaGetter = () => [
     label: '资产名称',
     fieldName: 'name',
     component: 'Input',
+    rules:'required',
   },
   {
     label: '类型',
     fieldName: 'model',
     component: 'Select',
+    rules:'selectRequired',
   },
   {
     label: '规格',
     fieldName: 'specs',
-    component: 'Textarea',
+    component: 'Input',
+    rules:'required',
   },
   {
     label: '价格',
     fieldName: 'price',
-    component: 'Input',
+    component: 'InputNumber',
+    componentProps:{
+      min:0,
+      precision:2,
+    },
+    rules:'required',
   },
   {
     label: '库存',
     fieldName: 'stock',
-    component: 'Input',
+    component: 'InputNumber',
+    componentProps:{
+      min:0,
+    },
+    rules:'required',
   },
   {
     label: '计量单位',
     fieldName: 'unit',
     component: 'Input',
+    rules:'required',
   },
   {
     label: '仓库',
     fieldName: 'depotId',
     component: 'Select',
+    rules:'required',
   },
   {
-    label: '描述信息',
-    fieldName: 'msg',
-    component: 'Textarea',
-  },
-  {
-    label: '供应商id',
+    label: '供应商',
     fieldName: 'suppliersId',
     component: 'Select',
+    rules:'required',
   },
   {
     label: '入库时间',
@@ -167,13 +178,23 @@ export const modalSchema: FormSchemaGetter = () => [
       format: 'YYYY-MM-DD HH:mm:ss',
       valueFormat: 'YYYY-MM-DD HH:mm:ss',
     },
+    rules:'required',
   },
   {
-    label: '固定资产类型',
+    label: '是否固定资产',
     fieldName: 'type',
-    component: 'Select',
+    component: 'RadioGroup',
     componentProps: {
+      buttonStyle: 'solid',
       options: getDictOptions('wy_sf'),
     },
+    defaultValue:'0',
+    rules:'required',
+  },
+  {
+    label: '描述信息',
+    fieldName: 'msg',
+    component: 'Textarea',
+    formItemClass:'col-span-2'
   },
 ];
diff --git a/apps/web-antd/src/views/property/assetManage/asset/index.vue b/apps/web-antd/src/views/property/assetManage/asset/index.vue
index 8c559e90..b8b5bffd 100644
--- a/apps/web-antd/src/views/property/assetManage/asset/index.vue
+++ b/apps/web-antd/src/views/property/assetManage/asset/index.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
 
-import { Page, useVbenModal, type VbenFormProps } from '@vben/common-ui';
-import { getVxePopupContainer } from '@vben/utils';
+import {Page, useVbenModal, type VbenFormProps} from '@vben/common-ui';
+import {getVxePopupContainer} from '@vben/utils';
 
-import { Modal, Popconfirm, Space } from 'ant-design-vue';
+import {Modal, Popconfirm, Space} from 'ant-design-vue';
 
 import {
   useVbenVxeGrid,
@@ -16,22 +16,27 @@ import {
   assetList,
   assetRemove,
 } from '#/api/property/assetManage/asset';
-import type { AssetForm } from '#/api/property/assetManage/asset/model';
-import { commonDownloadExcel } from '#/utils/file/download';
+import type {AssetForm} from '#/api/property/assetManage/asset/model';
+import {commonDownloadExcel} from '#/utils/file/download';
 
 import assetModal from './asset-modal.vue';
-import { columns, querySchema } from './data';
+import {columns, querySchema} from './data';
+import {assetTypeList} from "#/api/property/assetManage/assetType";
+import type {AssertType} from "vitest";
+import {computed, onMounted, ref} from "vue";
 
-const formOptions: VbenFormProps = {
+const assetTypeOptions=ref<AssertType[]>([])
+
+const formOptions = computed(() => ({
   commonConfig: {
     labelWidth: 80,
     componentProps: {
       allowClear: true,
     },
   },
-  schema: querySchema(),
+  schema: querySchema(assetTypeOptions.value),
   wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4',
-};
+}));
 
 const gridOptions: VxeGridProps = {
   checkboxConfig: {
@@ -47,7 +52,7 @@ const gridOptions: VxeGridProps = {
   pagerConfig: {},
   proxyConfig: {
     ajax: {
-      query: async ({ page }, formValues = {}) => {
+      query: async ({page}, formValues = {}) => {
         return await assetList({
           pageNum: page.currentPage,
           pageSize: page.pageSize,
@@ -73,12 +78,12 @@ const [AssetModal, modalApi] = useVbenModal({
 });
 
 function handleAdd() {
-  modalApi.setData({});
+  modalApi.setData({assetTypeOptions:assetTypeOptions.value});
   modalApi.open();
 }
 
 async function handleEdit(row: Required<AssetForm>) {
-  modalApi.setData({ id: row.id });
+  modalApi.setData({id: row.id,assetTypeOptions:assetTypeOptions.value});
   modalApi.open();
 }
 
@@ -106,6 +111,24 @@ function handleDownloadExcel() {
     fieldMappingTime: formOptions.fieldMappingTime,
   });
 }
+
+async function queryAssetType() {
+  let params = {
+    pageSize: 1000,
+    pageNum: 1,
+  }
+  const res = await assetTypeList(params)
+  assetTypeOptions.value = res.rows.map((item) => ({
+    label: item.assetTypeName,
+    value: item.id,
+  }));
+  return assetTypeOptions.value
+}
+
+onMounted(()=>{
+  queryAssetType()
+})
+
 </script>
 
 <template>
@@ -161,6 +184,6 @@ function handleDownloadExcel() {
         </Space>
       </template>
     </BasicTable>
-    <AssetModal @reload="tableApi.query()" />
+    <AssetModal @reload="tableApi.query()"/>
   </Page>
 </template>
diff --git a/apps/web-antd/src/views/property/assetManage/log/data.ts b/apps/web-antd/src/views/property/assetManage/log/data.ts
index 142c10c5..96bed83e 100644
--- a/apps/web-antd/src/views/property/assetManage/log/data.ts
+++ b/apps/web-antd/src/views/property/assetManage/log/data.ts
@@ -1,130 +1,137 @@
 import type { FormSchemaGetter } from '#/adapter/form';
 import type { VxeGridProps } from '#/adapter/vxe-table';
+import {getDictOptions} from "#/utils/dict";
 
 
 export const querySchema: FormSchemaGetter = () => [
-  {
-    component: 'Input',
-    fieldName: 'depotId',
-    label: '仓库id',
-  },
-  {
-    component: 'Input',
-    fieldName: 'assetId',
-    label: '资产id',
-  },
+  // {
+  //   component: 'Input',
+  //   fieldName: 'depotId',
+  //   label: '仓库id',
+  // },
+  // {
+  //   component: 'Input',
+  //   fieldName: 'assetId',
+  //   label: '资产id',
+  // },
   {
     component: 'Select',
     componentProps: {
+      options:getDictOptions('wy_cklzlx')
     },
     fieldName: 'type',
     label: '流转类型',
   },
-  {
-    component: 'DatePicker',
-    componentProps: {
-      showTime: true,
-      format: 'YYYY-MM-DD HH:mm:ss',
-      valueFormat: 'YYYY-MM-DD HH:mm:ss',
-    },
-    fieldName: 'time',
-    label: '流转时间',
-  },
-  {
-    component: 'Input',
-    fieldName: 'userId',
-    label: '操作人id',
-  },
-  {
-    component: 'Input',
-    fieldName: 'state',
-    label: '状态',
-  },
-  {
-    component: 'Input',
-    fieldName: 'price',
-    label: '价格',
-  },
-  {
-    component: 'Input',
-    fieldName: 'priceSum',
-    label: '总价',
-  },
-  {
-    component: 'Input',
-    fieldName: 'number',
-    label: '数量',
-  },
-  {
-    component: 'Input',
-    fieldName: 'supplierId',
-    label: '供应商id',
-  },
+  // {
+  //   component: 'DatePicker',
+  //   componentProps: {
+  //     showTime: true,
+  //     format: 'YYYY-MM-DD HH:mm:ss',
+  //     valueFormat: 'YYYY-MM-DD HH:mm:ss',
+  //   },
+  //   fieldName: 'time',
+  //   label: '流转时间',
+  // },
+  // {
+  //   component: 'Input',
+  //   fieldName: 'userId',
+  //   label: '操作人id',
+  // },
+  // {
+  //   component: 'Input',
+  //   fieldName: 'state',
+  //   label: '状态',
+  // },
+  // {
+  //   component: 'Input',
+  //   fieldName: 'price',
+  //   label: '价格',
+  // },
+  // {
+  //   component: 'Input',
+  //   fieldName: 'priceSum',
+  //   label: '总价',
+  // },
+  // {
+  //   component: 'Input',
+  //   fieldName: 'number',
+  //   label: '数量',
+  // },
+  // {
+  //   component: 'Input',
+  //   fieldName: 'supplierId',
+  //   label: '供应商id',
+  // },
 ];
 
 // 需要使用i18n注意这里要改成getter形式 否则切换语言不会刷新
 // export const columns: () => VxeGridProps['columns'] = () => [
 export const columns: VxeGridProps['columns'] = [
   { type: 'checkbox', width: 60 },
-  {
-    title: '主键',
-    field: 'id',
-  },
   {
     title: '仓库id',
     field: 'depotId',
+    minWidth:150,
   },
   {
     title: '资产id',
     field: 'assetId',
+    width:180,
   },
   {
     title: '流转类型',
     field: 'type',
+    width:120,
+  },
+
+  {
+    title: '数量',
+    field: 'number',
+    width:120,
   },
   {
     title: '流转时间',
     field: 'time',
+    width:150,
   },
   {
     title: '操作人id',
     field: 'userId',
-  },
-  {
-    title: '状态',
-    field: 'state',
+    width:150,
   },
   {
     title: '备注',
     field: 'remark',
+    width:180,
   },
-  {
-    title: '价格',
-    field: 'price',
-  },
-  {
-    title: '总价',
-    field: 'priceSum',
-  },
-  {
-    title: '数量',
-    field: 'number',
-  },
-  {
-    title: '供应商id',
-    field: 'supplierId',
-  },
-  {
-    title: '创建时间',
-    field: 'createTime',
-  },
-  {
-    field: 'action',
-    fixed: 'right',
-    slots: { default: 'action' },
-    title: '操作',
-    width: 180,
-  },
+  // {
+  //   title: '状态',
+  //   field: 'state',
+  //   width:150,
+  // },
+  // {
+  //   title: '价格',
+  //   field: 'price',
+  // },
+  // {
+  //   title: '总价',
+  //   field: 'priceSum',
+  // },
+  // {
+  //   title: '供应商id',
+  //   field: 'supplierId',
+  // },
+  // {
+  //   title: '创建时间',
+  //   field: 'createTime',
+  // },
+  // {
+  //   field: 'action',
+  //   fixed: 'right',
+  //   slots: { default: 'action' },
+  //   title: '操作',
+  //   width: 180,
+  // },
 ];
 
 export const modalSchema: FormSchemaGetter = () => [
diff --git a/apps/web-antd/src/views/property/assetManage/log/index.vue b/apps/web-antd/src/views/property/assetManage/log/index.vue
index a4767f2e..d0162211 100644
--- a/apps/web-antd/src/views/property/assetManage/log/index.vue
+++ b/apps/web-antd/src/views/property/assetManage/log/index.vue
@@ -135,47 +135,47 @@ function handleDownloadExcel() {
           >
             {{ $t('pages.common.export') }}
           </a-button>
-          <a-button
-            :disabled="!vxeCheckboxChecked(tableApi)"
-            danger
-            type="primary"
-            v-access:code="['property:log:remove']"
-            @click="handleMultiDelete">
-            {{ $t('pages.common.delete') }}
-          </a-button>
-          <a-button
-            type="primary"
-            v-access:code="['property:log:add']"
-            @click="handleAdd"
-          >
-            {{ $t('pages.common.add') }}
-          </a-button>
-        </Space>
-      </template>
-      <template #action="{ row }">
-        <Space>
-          <ghost-button
-            v-access:code="['property:log:edit']"
-            @click.stop="handleEdit(row)"
-          >
-            {{ $t('pages.common.edit') }}
-          </ghost-button>
-          <Popconfirm
-            :get-popup-container="getVxePopupContainer"
-            placement="left"
-            title="确认删除？"
-            @confirm="handleDelete(row)"
-          >
-            <ghost-button
-              danger
-              v-access:code="['property:log:remove']"
-              @click.stop=""
-            >
-              {{ $t('pages.common.delete') }}
-            </ghost-button>
-          </Popconfirm>
+<!--          <a-button-->
+<!--            :disabled="!vxeCheckboxChecked(tableApi)"-->
+<!--            danger-->
+<!--            type="primary"-->
+<!--            v-access:code="['property:log:remove']"-->
+<!--            @click="handleMultiDelete">-->
+<!--            {{ $t('pages.common.delete') }}-->
+<!--          </a-button>-->
+<!--          <a-button-->
+<!--            type="primary"-->
+<!--            v-access:code="['property:log:add']"-->
+<!--            @click="handleAdd"-->
+<!--          >-->
+<!--            {{ $t('pages.common.add') }}-->
+<!--          </a-button>-->
         </Space>
       </template>
+<!--      <template #action="{ row }">-->
+<!--        <Space>-->
+<!--          <ghost-button-->
+<!--            v-access:code="['property:log:edit']"-->
+<!--            @click.stop="handleEdit(row)"-->
+<!--          >-->
+<!--            {{ $t('pages.common.edit') }}-->
+<!--          </ghost-button>-->
+<!--          <Popconfirm-->
+<!--            :get-popup-container="getVxePopupContainer"-->
+<!--            placement="left"-->
+<!--            title="确认删除？"-->
+<!--            @confirm="handleDelete(row)"-->
+<!--          >-->
+<!--            <ghost-button-->
+<!--              danger-->
+<!--              v-access:code="['property:log:remove']"-->
+<!--              @click.stop=""-->
+<!--            >-->
+<!--              {{ $t('pages.common.delete') }}-->
+<!--            </ghost-button>-->
+<!--          </Popconfirm>-->
+<!--        </Space>-->
+<!--      </template>-->
     </BasicTable>
     <LogModal @reload="tableApi.query()" />
   </Page>

From 17c7bc0512ccd5984aaabca70c6b45e64dc9ecb5 Mon Sep 17 00:00:00 2001
From: zcxlsm <patrickstarlsm@163.com>
Date: Mon, 4 Aug 2025 23:31:39 +0800
Subject: [PATCH 7/9] =?UTF-8?q?feat(sis):=20=E7=94=B5=E6=A2=AF=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=85=B3=E8=81=94=E6=A5=BC=E5=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web-antd/src/api/property/floor/index.ts |  6 +-
 .../src/api/sis/elevatorInfo/model.d.ts       | 10 +-
 .../src/views/sis/elevatorInfo/data.ts        |  2 +-
 .../sis/elevatorInfo/elevatorInfo-modal.vue   | 96 ++++++++++++++++---
 4 files changed, 94 insertions(+), 20 deletions(-)

diff --git a/apps/web-antd/src/api/property/floor/index.ts b/apps/web-antd/src/api/property/floor/index.ts
index 69cee4af..bc47ff77 100644
--- a/apps/web-antd/src/api/property/floor/index.ts
+++ b/apps/web-antd/src/api/property/floor/index.ts
@@ -61,9 +61,9 @@ export function floorRemove(id: ID | IDS) {
 }
 
 /**
- * 根据单元ID查询楼层
+ * 根据楼层ID查询楼层
  * @param id id
  */
-export function queryByUnitId(id: ID | IDS) {
-  return requestClient.get<FloorVO[]>(`/property/floor/queryByUnitId/${id}`);
+export function queryByBuildingId(id: ID | IDS) {
+  return requestClient.get<FloorVO[]>(`/property/floor/queryByBuildingId/${id}`);
 }
diff --git a/apps/web-antd/src/api/sis/elevatorInfo/model.d.ts b/apps/web-antd/src/api/sis/elevatorInfo/model.d.ts
index c7a38573..0e25360d 100644
--- a/apps/web-antd/src/api/sis/elevatorInfo/model.d.ts
+++ b/apps/web-antd/src/api/sis/elevatorInfo/model.d.ts
@@ -107,6 +107,11 @@ export interface ElevatorInfoVO {
     deviceIp: string,
     deviceId: number,
   }[]
+
+  /**
+   * 建筑ID
+   */
+  buildingId?: number | string
 }
 
 export interface ElevatorInfoForm extends BaseEntity {
@@ -206,10 +211,9 @@ export interface ElevatorInfoForm extends BaseEntity {
   controlPwd?: string
 
   /**
-   * 单元ID
+   * 建筑ID
    */
-  unitId?: number
-
+  buildingId?: number
 }
 
 export interface ElevatorInfoQuery extends PageQuery {
diff --git a/apps/web-antd/src/views/sis/elevatorInfo/data.ts b/apps/web-antd/src/views/sis/elevatorInfo/data.ts
index e3c6c2b7..dfbba972 100644
--- a/apps/web-antd/src/views/sis/elevatorInfo/data.ts
+++ b/apps/web-antd/src/views/sis/elevatorInfo/data.ts
@@ -105,7 +105,7 @@ export const modalSchema: FormSchemaGetter = () => [
   },
   {
     component: 'TreeSelect',
-    fieldName: 'unitId',
+    fieldName: 'buildingId',
     defaultValue: undefined,
     label: '社区建筑',
     rules: 'selectRequired',
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 5807619c..34dabeef 100644
--- a/apps/web-antd/src/views/sis/elevatorInfo/elevatorInfo-modal.vue
+++ b/apps/web-antd/src/views/sis/elevatorInfo/elevatorInfo-modal.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
-import { computed, ref } from 'vue'
+import { computed, ref, reactive } from 'vue'
+import { Tabs, TabPane, Form, FormItem, Space, Input } from 'ant-design-vue'
 
 import { useVbenModal } from '@vben/common-ui'
 import { $t } from '@vben/locales'
@@ -15,9 +16,11 @@ import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup'
 
 import { modalSchema } from './data'
 import { communityTree } from '#/api/property/community'
+import { queryByBuildingId } from '#/api/property/floor'
 import type { DeviceManageForm, DeviceManageQuery } from '#/api/sis/deviceManage/model'
 import { deviceManageList } from '#/api/sis/deviceManage'
 
+
 const emit = defineEmits<{ reload: [] }>()
 
 const isUpdate = ref(false)
@@ -69,18 +72,26 @@ const [BasicModal, modalApi] = useVbenModal({
 
     if (isUpdate.value && id) {
       const record = await elevatorInfoInfo(id)
-      record.elevatorControlDeviceId = {
-        value: record.elevatorControlDeviceId.deviceId,
-        deviceIp: record.elevatorControlDeviceId.deviceIp,
-        deviceId: record.elevatorControlDeviceId.deviceId,
+
+      if (record.elevatorControlDeviceId) {
+        record.elevatorControlDeviceId = {
+          value: record.elevatorControlDeviceId.deviceId,
+          deviceIp: record.elevatorControlDeviceId.deviceIp,
+          deviceId: record.elevatorControlDeviceId.deviceId,
+        }
       }
 
-      record.remoteCallElevatorDeviceId = record.remoteCallElevatorDeviceId.map(item => ({
-        value: item.deviceId,
-        deviceIp: item.deviceIp,
-        deviceId: item.deviceId,
-      }));
+      if (record.remoteCallElevatorDeviceId) {
+        record.remoteCallElevatorDeviceId = record.remoteCallElevatorDeviceId.map(item => {
+          return {
+            value: item.deviceId,
+            deviceIp: item.deviceIp,
+            deviceId: item.deviceId,
+          }
+        })
+      }
 
+      await handleGetFloor(record.buildingId)
       await formApi.setValues(record)
     }
     await markInitialized()
@@ -98,7 +109,16 @@ async function handleConfirm() {
     }
     // getValues获取为一个readonly的对象 需要修改必须先深拷贝一次
     const data = cloneDeep(await formApi.getValues())
-    console.log(data)
+    // 通道信息
+    const filteredChannels = dynamicValidateForm.floor
+      .filter(item => !(item.out.length === 0 && item.in.length === 0))
+      .map(item => ({
+        floorId: item.id,
+        inChannel: item.in,
+        outChannel: item.out
+      }))
+
+    data.channels = filteredChannels
     await (isUpdate.value ? elevatorInfoUpdate(data) : elevatorInfoAdd(data))
     resetInitialized()
     emit('reload')
@@ -183,6 +203,9 @@ async function setupCommunitySelect() {
           value: 'code',
           children: 'children',
         },
+        onChange: async (value: any) => {
+          await handleGetFloor(value)
+        },
         getPopupContainer,
         placeholder: '请选择建筑',
         showSearch: true,
@@ -194,11 +217,41 @@ async function setupCommunitySelect() {
         // 选中后显示在输入框的值
         treeNodeLabelProp: 'fullName',
       }),
-      fieldName: 'unitId',
+      fieldName: 'buildingId',
     },
   ])
 }
 
+interface floor {
+  out: string
+  in: string
+  num: string | number
+  id: string | number
+}
+const floorList = ref<floor[]>([])
+const dynamicValidateForm = reactive<{ floor: floor[] }>({
+  floor: [],
+})
+async function handleGetFloor(unitId: string | number) {
+  try {
+    const res = await queryByBuildingId(unitId)
+    floorList.value = []
+    res.forEach((item) => {
+      floorList.value.push({
+        out: '',
+        in: '',
+        num: item.floorNumber,
+        id: item.id,
+      })
+    })
+
+    dynamicValidateForm.floor = floorList.value
+  } catch (error) {
+    console.error('获取楼层列表失败:', error)
+    floorList.value = []
+  }
+}
+
 async function handleClosed() {
   await formApi.resetForm()
   resetInitialized()
@@ -207,6 +260,23 @@ async function handleClosed() {
 
 <template>
   <BasicModal :title="title">
-    <BasicForm />
+    <Tabs style="height: 600px !important">
+      <TabPane key="1" tab="基本信息">
+        <BasicForm />
+      </TabPane>
+      <TabPane key="2" tab="楼层信息">
+        <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="外部按键通道" />
+            </FormItem>
+            <FormItem :name="['floor', index, 'in']">
+              <Input v-model:value="floor.in" placeholder="内部按键通道" />
+            </FormItem>
+          </Space>
+        </Form>
+      </TabPane>
+    </Tabs>
   </BasicModal>
 </template>

From e0a64edc141ec3a01ac098a3e4d4d7139648001e Mon Sep 17 00:00:00 2001
From: zcxlsm <patrickstarlsm@163.com>
Date: Tue, 5 Aug 2025 16:39:25 +0800
Subject: [PATCH 8/9] =?UTF-8?q?feat(sis):=20=E8=AE=BE=E5=A4=87=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=A2=9E=E5=8A=A0=E6=A5=BC=E5=B1=82=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web-antd/src/api/sis/authGroup/model.d.ts |  10 ++
 .../src/api/sis/deviceManage/model.d.ts       |  75 +++++------
 .../src/api/sis/elevatorInfo/index.ts         |  19 ---
 .../device/accessControlModal.vue             |  86 ++++++-------
 .../views/sis/accessControl/device/data.ts    |   3 +-
 .../views/sis/accessControl/device/index.vue  |  96 ++++++--------
 .../views/sis/authGroup/authGroup-modal.vue   |  10 +-
 .../src/views/sis/deviceManage/data.ts        |   5 +
 .../sis/deviceManage/deviceManage-modal.vue   | 118 ++++++++++++------
 9 files changed, 222 insertions(+), 200 deletions(-)

diff --git a/apps/web-antd/src/api/sis/authGroup/model.d.ts b/apps/web-antd/src/api/sis/authGroup/model.d.ts
index d9c1eacf..b60f3273 100644
--- a/apps/web-antd/src/api/sis/authGroup/model.d.ts
+++ b/apps/web-antd/src/api/sis/authGroup/model.d.ts
@@ -21,6 +21,16 @@ export interface AuthGroupVO {
    */
   isEnable: boolean;
 
+  /**
+   * 设备id
+   */
+  acIds?: string[] | number[];
+
+  /**
+   * 楼层id
+   */
+  floorIds?: string[] | number[];
+
 }
 
 export interface AuthGroupForm extends BaseEntity {
diff --git a/apps/web-antd/src/api/sis/deviceManage/model.d.ts b/apps/web-antd/src/api/sis/deviceManage/model.d.ts
index 7f5e0160..10b2f34b 100644
--- a/apps/web-antd/src/api/sis/deviceManage/model.d.ts
+++ b/apps/web-antd/src/api/sis/deviceManage/model.d.ts
@@ -1,177 +1,182 @@
-import type { BaseEntity, PageQuery } from '#/api/common';
+import type { BaseEntity, PageQuery } from '#/api/common'
 
 export interface DeviceManageVO {
   /**
    * 主键id
    */
-  id: string | number;
+  id: string | number
 
   /**
    * 设备编码
    */
-  deviceNo: string;
+  deviceNo: string
 
   /**
    * 设备名称
    */
-  deviceName: string;
+  deviceName: string
 
   /**
    * 设备ip
    */
-  deviceIp: string;
+  deviceIp: string
 
   /**
    * 设备端口
    */
-  devicePort: number;
+  devicePort: number
 
   /**
    * 设备账号
    */
-  deviceAccount: string;
+  deviceAccount: string
 
   /**
    * 设备密码
    */
-  devicePwd: string;
+  devicePwd: string
 
   /**
    * 设备
    */
-  deviceMac: string;
+  deviceMac: string
 
   /**
    * 设备在线状态 0:离线 1:在线 2:未知
    */
-  deviceStatus: number;
+  deviceStatus: number
 
   /**
    * 父级设备id
    */
-  parentId: string | number;
+  parentId: string | number
 
   /**
    * 设备通道编号
    */
-  channelNo: string;
+  channelNo: string
 
   /**
    * 录像机ip
    */
-  vcrIp: string;
+  vcrIp: string
 
   /**
    * 录像机端口
    */
-  vcrPort: number;
+  vcrPort: number
 
   /**
    * 录像机账号
    */
-  vcrAccount: string;
+  vcrAccount: string
 
   /**
    * 录像机密码
    */
-  vcrPwd: string;
+  vcrPwd: string
 
   /**
    * 门禁id
    */
-  accessControlId: string | number;
+  accessControlId: string | number
+
+  /**
+   * 楼层id
+   */
+  floorId: string | number
 }
 
 export interface DeviceManageForm extends BaseEntity {
   /**
    * 主键id
    */
-  id?: string | number;
+  id?: string | number
 
   /**
    * 设备编码
    */
-  deviceNo?: string;
+  deviceNo?: string
 
   /**
    * 设备名称
    */
-  deviceName?: string;
+  deviceName?: string
 
   /**
    * 设备ip
    */
-  deviceIp?: string;
+  deviceIp?: string
 
   /**
    * 设备端口
    */
-  devicePort?: number;
+  devicePort?: number
 
   /**
    * 设备账号
    */
-  deviceAccount?: string;
+  deviceAccount?: string
 
   /**
    * 设备密码
    */
-  devicePwd?: string;
+  devicePwd?: string
 
   /**
    * 设备
    */
-  deviceMac?: string;
+  deviceMac?: string
 
   /**
    * 设备在线状态 0:离线 1:在线 2:未知
    */
-  deviceStatus?: number;
+  deviceStatus?: number
 }
 
 export interface DeviceManageQuery extends PageQuery {
   /**
    * 设备编码
    */
-  deviceNo?: string;
+  deviceNo?: string
 
   /**
    * 设备名称
    */
-  deviceName?: string;
+  deviceName?: string
 
   /**
    * 设备ip
    */
-  deviceIp?: string;
+  deviceIp?: string
 
   /**
    * 设备端口
    */
-  devicePort?: number;
+  devicePort?: number
 
   /**
    * 设备账号
    */
-  deviceAccount?: string;
+  deviceAccount?: string
 
   /**
    * 设备密码
    */
-  devicePwd?: string;
+  devicePwd?: string
 
   /**
    * 设备
    */
-  deviceMac?: string;
+  deviceMac?: string
 
   /**
    * 设备在线状态 0:离线 1:在线 2:未知
    */
-  deviceStatus?: number;
+  deviceStatus?: number
 
   /**
    * 日期范围参数
    */
-  params?: any;
+  params?: any
 }
diff --git a/apps/web-antd/src/api/sis/elevatorInfo/index.ts b/apps/web-antd/src/api/sis/elevatorInfo/index.ts
index 490a32f1..9c846668 100644
--- a/apps/web-antd/src/api/sis/elevatorInfo/index.ts
+++ b/apps/web-antd/src/api/sis/elevatorInfo/index.ts
@@ -59,22 +59,3 @@ export function elevatorInfoUpdate(data: ElevatorInfoForm) {
 export function elevatorInfoRemove(elevatorId: ID | IDS) {
   return requestClient.deleteWithMsg<void>(`/sis/elevatorInfo/${elevatorId}`);
 }
-
-/**
- * 新增电梯⇄楼层关联
- * @param params
- * @returns void
- */
-export function refAdd(data: ElevatorFloorRefForm) {
-  return requestClient.postWithMsg<void>('/sis/elevatorInfo/ref/add', data);
-}
-
-/**
- * 查询电梯⇄楼层关联
- * @param id
- * @returns void
- */
-export function refQuery(id: ID) {
-  return requestClient.get<ElevatorFloorRefVo[]>(`/sis/elevatorInfo/ref/${id}`);
-}
-
diff --git a/apps/web-antd/src/views/sis/accessControl/device/accessControlModal.vue b/apps/web-antd/src/views/sis/accessControl/device/accessControlModal.vue
index b65cafe5..90976c79 100644
--- a/apps/web-antd/src/views/sis/accessControl/device/accessControlModal.vue
+++ b/apps/web-antd/src/views/sis/accessControl/device/accessControlModal.vue
@@ -1,26 +1,26 @@
 <script setup lang="ts">
-import { computed, ref } from 'vue';
+import { computed, ref } from 'vue'
 
-import { useVbenModal } from '@vben/common-ui';
-import { $t } from '@vben/locales';
-import { cloneDeep, getPopupContainer, handleNode } from '@vben/utils';
+import { useVbenModal } from '@vben/common-ui'
+import { $t } from '@vben/locales'
+import { cloneDeep, getPopupContainer, handleNode } from '@vben/utils'
 
-import { useVbenForm } from '#/adapter/form';
+import { useVbenForm } from '#/adapter/form'
 import {
   accessControlAdd,
   accessControlInfo,
   accessControlUpdate,
-} from '#/api/sis/accessControl';
-import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
-import { communityTree } from '#/api/property/community';
-import { modalSchema } from './data';
+} from '#/api/sis/accessControl'
+import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup'
+import { communityTree } from '#/api/property/community'
+import { modalSchema } from './data'
 
-const emit = defineEmits<{ reload: [] }>();
+const emit = defineEmits<{ reload: [] }>()
 
-const isUpdate = ref(false);
+const isUpdate = ref(false)
 const title = computed(() => {
-  return isUpdate.value ? $t('pages.common.edit') : $t('pages.common.add');
-});
+  return isUpdate.value ? $t('pages.common.edit') : $t('pages.common.add')
+})
 
 const [BasicForm, formApi] = useVbenForm({
   commonConfig: {
@@ -36,14 +36,14 @@ const [BasicForm, formApi] = useVbenForm({
   schema: modalSchema(),
   showDefaultActions: false,
   wrapperClass: 'grid-cols-1',
-});
+})
 
 const { onBeforeClose, markInitialized, resetInitialized } = useBeforeCloseDiff(
   {
     initializedGetter: defaultFormValueGetter(formApi),
     currentGetter: defaultFormValueGetter(formApi),
   },
-);
+)
 
 const [BasicModal, modalApi] = useVbenModal({
   // 在这里更改宽度
@@ -54,53 +54,53 @@ const [BasicModal, modalApi] = useVbenModal({
   onConfirm: handleConfirm,
   onOpenChange: async (isOpen) => {
     if (!isOpen) {
-      return null;
+      return null
     }
-    modalApi.modalLoading(true);
-    setupCommunitySelect();
-    const { id } = modalApi.getData() as { id?: number | string };
-    isUpdate.value = !!id;
+    modalApi.modalLoading(true)
+    setupCommunitySelect()
+    const { id } = modalApi.getData() as { id?: number | string }
+    isUpdate.value = !!id
 
     if (isUpdate.value && id) {
-      const record = await accessControlInfo(id);
-      await formApi.setValues(record);
+      const record = await accessControlInfo(id)
+      await formApi.setValues(record)
     }
-    await markInitialized();
+    await markInitialized()
 
-    modalApi.modalLoading(false);
+    modalApi.modalLoading(false)
   },
-});
+})
 
 async function handleConfirm() {
   try {
-    modalApi.lock(true);
-    const { valid } = await formApi.validate();
+    modalApi.lock(true)
+    const { valid } = await formApi.validate()
     if (!valid) {
-      return;
+      return
     }
     // getValues获取为一个readonly的对象 需要修改必须先深拷贝一次
-    const data = cloneDeep(await formApi.getValues());
-    await (isUpdate.value ? accessControlUpdate(data) : accessControlAdd(data));
-    resetInitialized();
-    emit('reload');
-    modalApi.close();
+    const data = cloneDeep(await formApi.getValues())
+    await (isUpdate.value ? accessControlUpdate(data) : accessControlAdd(data))
+    resetInitialized()
+    emit('reload')
+    modalApi.close()
   } catch (error) {
-    console.error(error);
+    console.error(error)
   } finally {
-    modalApi.lock(false);
+    modalApi.lock(false)
   }
 }
 
 async function setupCommunitySelect() {
-  const areaList = await communityTree(4);
+  const areaList = await communityTree(3)
   // 选中后显示在输入框的值 即父节点 / 子节点
   // addFullName(areaList, 'areaName', ' / ');
-  const splitStr = '/';
+  const splitStr = '/'
   handleNode(areaList, 'label', splitStr, function (node: any) {
-    if (node.level != 4) {
-      node.disabled = true;
+    if (node.level != 3) {
+      node.disabled = true
     }
-  });
+  })
   formApi.updateSchema([
     {
       componentProps: () => ({
@@ -124,12 +124,12 @@ async function setupCommunitySelect() {
       }),
       fieldName: 'floorId',
     },
-  ]);
+  ])
 }
 
 async function handleClosed() {
-  await formApi.resetForm();
-  resetInitialized();
+  await formApi.resetForm()
+  resetInitialized()
 }
 </script>
 
diff --git a/apps/web-antd/src/views/sis/accessControl/device/data.ts b/apps/web-antd/src/views/sis/accessControl/device/data.ts
index 038e3921..6704011c 100644
--- a/apps/web-antd/src/views/sis/accessControl/device/data.ts
+++ b/apps/web-antd/src/views/sis/accessControl/device/data.ts
@@ -25,9 +25,8 @@ export const querySchema: FormSchemaGetter = () => [
         children: 'children',
       },
       api: async () => {
-        const areaList = await communityTree(4);
+        const areaList = await communityTree(3);
         addFullName(areaList, 'label', '/');
-        console.log(areaList);
         return areaList;
       },
     },
diff --git a/apps/web-antd/src/views/sis/accessControl/device/index.vue b/apps/web-antd/src/views/sis/accessControl/device/index.vue
index b59796bb..b9e199b0 100644
--- a/apps/web-antd/src/views/sis/accessControl/device/index.vue
+++ b/apps/web-antd/src/views/sis/accessControl/device/index.vue
@@ -1,26 +1,26 @@
 <script setup lang="ts">
-import { Page, useVbenModal, type VbenFormProps } from '@vben/common-ui';
-import { getVxePopupContainer } from '@vben/utils';
+import { Page, useVbenModal, type VbenFormProps } from '@vben/common-ui'
+import { getVxePopupContainer } from '@vben/utils'
 
-import { Modal, Popconfirm, Space } from 'ant-design-vue';
+import { Modal, Popconfirm, Space } from 'ant-design-vue'
 
 import {
   useVbenVxeGrid,
   vxeCheckboxChecked,
   type VxeGridProps,
-} from '#/adapter/vxe-table';
+} from '#/adapter/vxe-table'
 
 import {
   accessControlExport,
   accessControlList,
   accessControlRemove,
   accessControlSync
-} from '#/api/sis/accessControl';
-import type { AccessControlForm } from '#/api/sis/accessControl/model';
-import { commonDownloadExcel } from '#/utils/file/download';
+} from '#/api/sis/accessControl'
+import type { AccessControlForm } from '#/api/sis/accessControl/model'
+import { commonDownloadExcel } from '#/utils/file/download'
 
-import accessControlModal from './accessControlModal.vue';
-import { columns, querySchema } from './data';
+import accessControlModal from './accessControlModal.vue'
+import { columns, querySchema } from './data'
 
 const formOptions: VbenFormProps = {
   commonConfig: {
@@ -40,7 +40,7 @@ const formOptions: VbenFormProps = {
   //    ['YYYY-MM-DD 00:00:00', 'YYYY-MM-DD 23:59:59'],
   //  ],
   // ],
-};
+}
 
 const gridOptions: VxeGridProps = {
   checkboxConfig: {
@@ -64,7 +64,7 @@ const gridOptions: VxeGridProps = {
           pageNum: page.currentPage,
           pageSize: page.pageSize,
           ...formValues,
-        });
+        })
       },
     },
   },
@@ -73,49 +73,49 @@ const gridOptions: VxeGridProps = {
   },
   // 表格全局唯一表示 保存列配置需要用到
   id: 'property-accessControl-index',
-};
+}
 
 const [BasicTable, tableApi] = useVbenVxeGrid({
   formOptions,
   gridOptions,
-});
+})
 
 const [AccessControlModal, modalApi] = useVbenModal({
   connectedComponent: accessControlModal,
-});
+})
 
 function handleAdd() {
-  modalApi.setData({});
-  modalApi.open();
+  modalApi.setData({})
+  modalApi.open()
 }
 
 async function handleEdit(row: Required<AccessControlForm>) {
-  modalApi.setData({ id: row.id });
-  modalApi.open();
+  modalApi.setData({ id: row.id })
+  modalApi.open()
 }
 
 async function handleDelete(row: Required<AccessControlForm>) {
-  await accessControlRemove(row.id);
-  await tableApi.query();
+  await accessControlRemove(row.id)
+  await tableApi.query()
 }
 
 async function handleSyncE8() {
-  await accessControlSync();
-  await tableApi.query();
+  await accessControlSync()
+  await tableApi.query()
 }
 
 function handleMultiDelete() {
-  const rows = tableApi.grid.getCheckboxRecords();
-  const ids = rows.map((row: Required<AccessControlForm>) => row.id);
+  const rows = tableApi.grid.getCheckboxRecords()
+  const ids = rows.map((row: Required<AccessControlForm>) => row.id)
   Modal.confirm({
     title: '提示',
     okType: 'danger',
     content: `确认删除选中的${ids.length}条记录吗？`,
     onOk: async () => {
-      await accessControlRemove(ids);
-      await tableApi.query();
+      await accessControlRemove(ids)
+      await tableApi.query()
     },
-  });
+  })
 }
 
 function handleDownloadExcel() {
@@ -126,7 +126,7 @@ function handleDownloadExcel() {
     {
       fieldMappingTime: formOptions.fieldMappingTime,
     },
-  );
+  )
 }
 </script>
 
@@ -136,49 +136,23 @@ function handleDownloadExcel() {
       <template #toolbar-tools>
         <Space>
           <a-button @click="handleSyncE8">同步</a-button>
-          <a-button
-            v-access:code="['property:accessControl:export']"
-            @click="handleDownloadExcel"
-          >
+          <a-button v-access:code="['property:accessControl:export']" @click="handleDownloadExcel">
             {{ $t('pages.common.export') }}
           </a-button>
-          <a-button
-            :disabled="!vxeCheckboxChecked(tableApi)"
-            danger
-            type="primary"
-            v-access:code="['property:accessControl:remove']"
-            @click="handleMultiDelete"
-          >
+          <a-button :disabled="!vxeCheckboxChecked(tableApi)" danger type="primary"
+            v-access:code="['property:accessControl:remove']" @click="handleMultiDelete">
             {{ $t('pages.common.delete') }}
           </a-button>
-          <a-button
-            type="primary"
-            v-access:code="['property:accessControl:add']"
-            @click="handleAdd"
-          >
-            {{ $t('pages.common.add') }}
-          </a-button>
         </Space>
       </template>
       <template #action="{ row }">
         <Space>
-          <ghost-button
-            v-access:code="['property:accessControl:edit']"
-            @click.stop="handleEdit(row)"
-          >
+          <ghost-button v-access:code="['property:accessControl:edit']" @click.stop="handleEdit(row)">
             {{ $t('pages.common.edit') }}
           </ghost-button>
-          <Popconfirm
-            :get-popup-container="getVxePopupContainer"
-            placement="left"
-            title="确认删除？"
-            @confirm="handleDelete(row)"
-          >
-            <ghost-button
-              danger
-              v-access:code="['property:accessControl:remove']"
-              @click.stop=""
-            >
+          <Popconfirm :get-popup-container="getVxePopupContainer" placement="left" title="确认删除？"
+            @confirm="handleDelete(row)">
+            <ghost-button danger v-access:code="['property:accessControl:remove']" @click.stop="">
               {{ $t('pages.common.delete') }}
             </ghost-button>
           </Popconfirm>
diff --git a/apps/web-antd/src/views/sis/authGroup/authGroup-modal.vue b/apps/web-antd/src/views/sis/authGroup/authGroup-modal.vue
index 3576780c..7221e641 100644
--- a/apps/web-antd/src/views/sis/authGroup/authGroup-modal.vue
+++ b/apps/web-antd/src/views/sis/authGroup/authGroup-modal.vue
@@ -60,6 +60,9 @@ const [BasicModal, modalApi] = useVbenModal({
     isUpdate.value = !!id
     if (isUpdate.value && id) {
       const record = await authGroupInfo(id)
+
+      checkedKeys.value = (record.acIds || []).concat(record.floorIds || [])
+
       await formApi.setValues(record)
     }
     await markInitialized()
@@ -82,9 +85,9 @@ async function handleConfirm() {
     }
 
     const data = cloneDeep(await formApi.getValues())
-    data.acIds = acIds.value;
-    data.eleIds = eleIds.value;
-    data.floorIds = floorIds.value;
+    data.acIds = acIds.value
+    data.eleIds = eleIds.value
+    data.floorIds = floorIds.value
     await (isUpdate.value ? authGroupUpdate(data) : authGroupAdd(data))
     resetInitialized()
     emit('reload')
@@ -98,6 +101,7 @@ async function handleConfirm() {
 
 async function handleClosed() {
   await formApi.resetForm()
+  checkedKeys.value = []
   resetInitialized()
 }
 
diff --git a/apps/web-antd/src/views/sis/deviceManage/data.ts b/apps/web-antd/src/views/sis/deviceManage/data.ts
index 2e1928de..4a356ae5 100644
--- a/apps/web-antd/src/views/sis/deviceManage/data.ts
+++ b/apps/web-antd/src/views/sis/deviceManage/data.ts
@@ -100,6 +100,11 @@ export const modalSchema: FormSchemaGetter = () => [
     component: 'Input',
     rules: 'required',
   },
+  {
+    label: '设备位置',
+    fieldName: 'floorId',
+    component: 'TreeSelect',
+  },
   {
     label: '设备厂商',
     fieldName: 'factoryNo',
diff --git a/apps/web-antd/src/views/sis/deviceManage/deviceManage-modal.vue b/apps/web-antd/src/views/sis/deviceManage/deviceManage-modal.vue
index 526bcf29..b06675c5 100644
--- a/apps/web-antd/src/views/sis/deviceManage/deviceManage-modal.vue
+++ b/apps/web-antd/src/views/sis/deviceManage/deviceManage-modal.vue
@@ -1,28 +1,29 @@
 <script setup lang="ts">
-import { computed, ref } from 'vue';
+import { computed, ref } from 'vue'
 
-import { useVbenModal } from '@vben/common-ui';
-import { $t } from '@vben/locales';
-import { cloneDeep } from '@vben/utils';
+import { useVbenModal } from '@vben/common-ui'
+import { $t } from '@vben/locales'
+import { cloneDeep, getPopupContainer, handleNode } from '@vben/utils'
 
-import { useVbenForm } from '#/adapter/form';
+import { useVbenForm } from '#/adapter/form'
 import {
   deviceManageAdd,
   deviceManageInfo,
   deviceManageUpdate,
-} from '#/api/sis/deviceManage';
-import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
+} from '#/api/sis/deviceManage'
+import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup'
 
-import { modalSchema } from './data';
-import { getDictOptions } from '#/utils/dict';
-import { DictEnum } from '@vben/constants';
+import { modalSchema } from './data'
+import { communityTree } from '#/api/property/community'
+import { getDictOptions } from '#/utils/dict'
+import { DictEnum } from '@vben/constants'
 
-const emit = defineEmits<{ reload: [] }>();
+const emit = defineEmits<{ reload: [] }>()
 
-const isUpdate = ref(false);
+const isUpdate = ref(false)
 const title = computed(() => {
-  return isUpdate.value ? $t('pages.common.edit') : $t('pages.common.add');
-});
+  return isUpdate.value ? $t('pages.common.edit') : $t('pages.common.add')
+})
 
 const [BasicForm, formApi] = useVbenForm({
   commonConfig: {
@@ -38,14 +39,14 @@ const [BasicForm, formApi] = useVbenForm({
   schema: modalSchema(),
   showDefaultActions: false,
   wrapperClass: 'grid-cols-2',
-});
+})
 
 const { onBeforeClose, markInitialized, resetInitialized } = useBeforeCloseDiff(
   {
     initializedGetter: defaultFormValueGetter(formApi),
     currentGetter: defaultFormValueGetter(formApi),
   },
-);
+)
 
 const [BasicModal, modalApi] = useVbenModal({
   // 在这里更改宽度
@@ -56,45 +57,88 @@ const [BasicModal, modalApi] = useVbenModal({
   onConfirm: handleConfirm,
   onOpenChange: async (isOpen) => {
     if (!isOpen) {
-      return null;
+      return null
     }
-    modalApi.modalLoading(true);
-    const { id } = modalApi.getData() as { id?: number | string };
-    isUpdate.value = !!id;
+
+    // 加载社区树
+    setupCommunitySelect()
+
+    modalApi.modalLoading(true)
+    const { id } = modalApi.getData() as { id?: number | string }
+    isUpdate.value = !!id
 
     if (isUpdate.value && id) {
-      const record = await deviceManageInfo(id);
-      await formApi.setValues(record);
+      const record = await deviceManageInfo(id)
+      await formApi.setValues(record)
     }
-    await markInitialized();
+    await markInitialized()
 
-    modalApi.modalLoading(false);
+    modalApi.modalLoading(false)
   },
-});
+})
 
 async function handleConfirm() {
   try {
-    modalApi.lock(true);
-    const { valid } = await formApi.validate();
+    modalApi.lock(true)
+    const { valid } = await formApi.validate()
     if (!valid) {
-      return;
+      return
     }
     // getValues获取为一个readonly的对象 需要修改必须先深拷贝一次
-    const data = cloneDeep(await formApi.getValues());
-    await (isUpdate.value ? deviceManageUpdate(data) : deviceManageAdd(data));
-    resetInitialized();
-    emit('reload');
-    modalApi.close();
+    const data = cloneDeep(await formApi.getValues())
+    await (isUpdate.value ? deviceManageUpdate(data) : deviceManageAdd(data))
+    resetInitialized()
+    emit('reload')
+    modalApi.close()
   } catch (error) {
-    console.error(error);
+    console.error(error)
   } finally {
-    modalApi.lock(false);
+    modalApi.lock(false)
   }
 }
 
+/**
+ * 初始化城市
+ */
+async function setupCommunitySelect() {
+  const areaList = await communityTree(3)
+  // 选中后显示在输入框的值 即父节点 / 子节点
+  // addFullName(areaList, 'areaName', ' / ');
+  const splitStr = '/'
+  handleNode(areaList, 'label', splitStr, function (node: any) {
+    if (node.level != 3) {
+      node.disabled = true
+    }
+  })
+  formApi.updateSchema([
+    {
+      componentProps: () => ({
+        class: 'w-full',
+        fieldNames: {
+          key: 'id',
+          label: 'label',
+          value: 'code',
+          children: 'children',
+        },
+        getPopupContainer,
+        placeholder: '请选择楼层',
+        showSearch: true,
+        treeData: areaList,
+        treeDefaultExpandAll: true,
+        treeLine: { showLeafIcon: false },
+        // 筛选的字段
+        treeNodeFilterProp: 'label',
+        // 选中后显示在输入框的值
+        treeNodeLabelProp: 'fullName',
+      }),
+      fieldName: 'floorId',
+    },
+  ])
+}
+
 async function handleClosed() {
-  await formApi.resetForm();
-  resetInitialized();
+  await formApi.resetForm()
+  resetInitialized()
 }
 </script>
 

From 0c9576039beea4e347d539d88ab112de03709322 Mon Sep 17 00:00:00 2001
From: lxj <15683799673@163.com>
Date: Tue, 5 Aug 2025 16:44:53 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/accessControlModal.vue             | 36 +++++++++++++++++--
 .../views/sis/accessControl/device/data.ts    | 35 +++++++-----------
 apps/web-antd/src/views/sis/video/index.vue   | 24 ++++++-------
 3 files changed, 59 insertions(+), 36 deletions(-)

diff --git a/apps/web-antd/src/views/sis/accessControl/device/accessControlModal.vue b/apps/web-antd/src/views/sis/accessControl/device/accessControlModal.vue
index b65cafe5..1a4ab325 100644
--- a/apps/web-antd/src/views/sis/accessControl/device/accessControlModal.vue
+++ b/apps/web-antd/src/views/sis/accessControl/device/accessControlModal.vue
@@ -14,6 +14,8 @@ import {
 import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
 import { communityTree } from '#/api/property/community';
 import { modalSchema } from './data';
+import type {DeviceManageQuery} from "#/api/sis/deviceManage/model";
+import {deviceManageList} from "#/api/sis/deviceManage";
 
 const emit = defineEmits<{ reload: [] }>();
 
@@ -92,15 +94,32 @@ async function handleConfirm() {
 }
 
 async function setupCommunitySelect() {
-  const areaList = await communityTree(4);
+  const areaList = await communityTree(3);
   // 选中后显示在输入框的值 即父节点 / 子节点
   // addFullName(areaList, 'areaName', ' / ');
   const splitStr = '/';
   handleNode(areaList, 'label', splitStr, function (node: any) {
-    if (node.level != 4) {
+    if (node.level != 3) {
       node.disabled = true;
     }
   });
+
+  // 加载监控
+  const params: DeviceManageQuery = {
+    pageNum: 1,
+    pageSize: 500,
+    deviceType: 1
+  };
+  const res = await deviceManageList(params);
+  const arr = res.rows.map((item) => {
+    return {
+      label: item.deviceName,
+      value: item.id,
+      deviceIp: item.deviceIp,
+      deviceId: item.id,
+    }
+  })
+
   formApi.updateSchema([
     {
       componentProps: () => ({
@@ -124,6 +143,19 @@ async function setupCommunitySelect() {
       }),
       fieldName: 'floorId',
     },
+    {
+      componentProps: () => ({
+        options: arr,
+      }),
+      fieldName: 'bindDeviceId',
+    },
+    {
+      componentProps: () => ({
+        options: arr,
+        mode: 'multiple', // 关键属性，启用多选模式
+      }),
+      fieldName: 'devicePoint',
+    },
   ]);
 }
 
diff --git a/apps/web-antd/src/views/sis/accessControl/device/data.ts b/apps/web-antd/src/views/sis/accessControl/device/data.ts
index 038e3921..235f910a 100644
--- a/apps/web-antd/src/views/sis/accessControl/device/data.ts
+++ b/apps/web-antd/src/views/sis/accessControl/device/data.ts
@@ -5,8 +5,6 @@ import { getDictOptions } from '#/utils/dict';
 import { renderDict } from '#/utils/render';
 import { communityTree } from '#/api/property/community';
 import { addFullName } from '@vben/utils';
-import { deviceManageList } from '#/api/sis/deviceManage';
-import type { DeviceManageQuery } from '#/api/sis/deviceManage/model';
 
 export const querySchema: FormSchemaGetter = () => [
   {
@@ -25,7 +23,7 @@ export const querySchema: FormSchemaGetter = () => [
         children: 'children',
       },
       api: async () => {
-        const areaList = await communityTree(4);
+        const areaList = await communityTree(3);
         addFullName(areaList, 'label', '/');
         console.log(areaList);
         return areaList;
@@ -43,7 +41,7 @@ export const querySchema: FormSchemaGetter = () => [
     componentProps: {
       options: getDictOptions('wy_kzklx'),
     },
-    label: '控制卡类型',
+    label: '接入点',
   },
 ];
 
@@ -72,7 +70,7 @@ export const columns: VxeGridProps['columns'] = [
     field: 'factoryCode',
   },
   {
-    title: '控制卡类型',
+    title: '接入点',
     field: 'controlType',
     slots: {
       default: ({ row }) => {
@@ -132,7 +130,7 @@ export const modalSchema: FormSchemaGetter = () => [
     component: 'Input',
   },
   {
-    label: '控制卡类型',
+    label: '接入点',
     fieldName: 'controlType',
     component: 'Select',
     componentProps: {
@@ -142,22 +140,15 @@ export const modalSchema: FormSchemaGetter = () => [
     rules: 'selectRequired',
   },
   {
-    label: '绑定设备',
+    label: '人脸设备',
     fieldName: 'bindDeviceId',
-    component: 'ApiSelect',
-    componentProps: {
-      allowClear: true,
-      resultField: 'list', // 根据API返回结构调整
-      labelField: 'deviceName',
-      valueField: 'id',
-      api: async () => {
-        const params: DeviceManageQuery = {
-          pageNum: 1,
-          pageSize: 500,
-        };
-        const res = await deviceManageList(params);
-        return res.rows;
-      },
-    },
+    component: 'Select',
+    defaultValue: undefined,
+  },
+  {
+    label: '监控点',
+    fieldName: 'devicePoint',
+    defaultValue: undefined,
+    component: 'Select',
   },
 ];
diff --git a/apps/web-antd/src/views/sis/video/index.vue b/apps/web-antd/src/views/sis/video/index.vue
index 4261a4cb..30dc9f04 100644
--- a/apps/web-antd/src/views/sis/video/index.vue
+++ b/apps/web-antd/src/views/sis/video/index.vue
@@ -2,7 +2,7 @@
   <Page class="h-full w-full">
     <!--  设备分组区域  -->
     <div class="flex h-full gap-[8px]">
-      <ChannelTree class="h-[83vh] w-[260px]" @check="onNodeChecked" />
+      <ChannelTree class="h-[83vh] w-[300px]" @check="onNodeChecked" />
 
       <!--  设备分组区域  -->
       <div class="bg-background flex-1">
@@ -274,16 +274,16 @@ 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 {
+    // if (nodeData.nvrIp) {
+    //   params = {
+    //     videoIp: nodeData.nvrIp,
+    //     videoPort: nodeData.nvrPort,
+    //     factoryNo: nodeData.nvrFactoryNo,
+    //     account: nodeData.nvrAccount,
+    //     pwd: nodeData.nvrPwd,
+    //     channelId: nodeData.nvrChannelNo,
+    //   };
+    // } else {
       params = {
         videoIp: nodeData.deviceIp,
         videoPort: nodeData.devicePort,
@@ -292,7 +292,7 @@ function doPlayer(nodeData: any, index: number = 0) {
         pwd: nodeData.devicePwd,
         channelId: nodeData.channelNo,
       };
-    }
+    // }
     addStreamProxy(params).then((res) => {
       const url = res.wsFlv;
       // 将url 绑定到 nodeData