Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5

2025-08-04 17:06:21 +08:00 · 2025-08-04 17:06:21 +08:00 · 28295b283e
commit 28295b283e
parent 7ad4613fc8 523810a1da
2 changed files with 87 additions and 63 deletions
--- 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

  /**
--- 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>