Merge branch 'main_dev' into local_branch_devbyft

@@ -25,7 +25,7 @@ module.exports = defineConfig({
     'plugin:jest/recommended',
     'plugin:jest/recommended',
   ],
   ],
   rules: {
   rules: {
-    'no-console': 'error',
+    'no-console': ['error', { allow: ['warn', 'error'] }],
     'vue/script-setup-uses-vars': 'error',
     'vue/script-setup-uses-vars': 'error',
     '@typescript-eslint/ban-ts-ignore': 'off',
     '@typescript-eslint/ban-ts-ignore': 'off',
     '@typescript-eslint/explicit-function-return-type': 'off',
     '@typescript-eslint/explicit-function-return-type': 'off',

@@ -65,3 +65,19 @@ export interface ImportModelOfMatterType {
   tkDeviceProfileId?: string;
   tkDeviceProfileId?: string;
   categoryId?: string;
   categoryId?: string;
 }
 }
+
+export interface ModelOfMatterItemRecordType {
+  id: string;
+  creator: string;
+  createTime: string;
+  enabled: boolean;
+  tenantId: string;
+  functionType: string;
+  functionName: string;
+  identifier: string;
+  extensionDesc: any;
+  accessMode: string;
+  functionJson: FunctionJson;
+  status: number;
+  deviceProfileId: string;
+}

@@ -2,6 +2,7 @@ import { BasicPageParams } from '../model/baseModel';
 import {
 import {
   GetModelTslParams,
   GetModelTslParams,
   ImportModelOfMatterType,
   ImportModelOfMatterType,
+  ModelOfMatterItemRecordType,
   ModelOfMatterParams,
   ModelOfMatterParams,
 } from './model/modelOfMatterModel';
 } from './model/modelOfMatterModel';
 import { defHttp } from '/@/utils/http/axios';
 import { defHttp } from '/@/utils/http/axios';
@@ -36,7 +37,7 @@ export const getModelList = (
     id?: string;
     id?: string;
   }
   }
 ) => {
 ) => {
-  return defHttp.get({
+  return defHttp.get<ModelOfMatterItemRecordType[]>({
     url: `${ModelOfMatter.LIST}`,
     url: `${ModelOfMatter.LIST}`,
     params,
     params,
   });
   });

@@ -14,7 +14,6 @@ export function saveMenuApi(
   update = false,
   update = false,
   mode: ErrorMessageMode = 'modal'
   mode: ErrorMessageMode = 'modal'
 ) {
 ) {
-  console.log(params);
   if (!update) {
   if (!update) {
     return defHttp.post<MenuOperationApiResult>(
     return defHttp.post<MenuOperationApiResult>(
       {
       {

@@ -48,13 +48,21 @@
     <template #content>
     <template #content>
       <section class="flex flex-wrap w-36">
       <section class="flex flex-wrap w-36">
         <table class="border-collapse" @click="handleSelectConfirm">
         <table class="border-collapse" @click="handleSelectConfirm">
-          <tr v-for="row in MAX_ROW" :key="row" class="border border-gray-300 border-solid">
+          <tr
+            v-for="rowNumber in MAX_ROW"
+            :key="rowNumber"
+            class="border border-gray-300 border-solid"
+          >
             <td
             <td
-              v-for="col in MAX_COL"
-              :class="selectedLayout.col >= col && selectedLayout.row >= row ? 'bg-blue-500' : ''"
-              :key="col"
+              v-for="colNumber in MAX_COL"
+              :class="
+                selectedLayout.col >= colNumber && selectedLayout.row >= rowNumber
+                  ? 'bg-blue-500'
+                  : ''
+              "
+              :key="colNumber"
               class="w-4 h-4 border border-gray-300 border-solid cursor-pointer"
               class="w-4 h-4 border border-gray-300 border-solid cursor-pointer"
-              @mouseover="handleOver(row, col)"
+              @mouseover="handleOver(rowNumber, colNumber)"
             >
             >
             </td>
             </td>
           </tr>
           </tr>

@@ -77,7 +77,6 @@
             try {
             try {
               const data = e.target && e.target.result;
               const data = e.target && e.target.result;
               const workbook = XLSX.read(data, { type: 'array' });
               const workbook = XLSX.read(data, { type: 'array' });
-              // console.log(workbook);
               /* DO SOMETHING WITH workbook HERE */
               /* DO SOMETHING WITH workbook HERE */
               const excelData = getExcelData(workbook);
               const excelData = getExcelData(workbook);
               emit('success', excelData);
               emit('success', excelData);

@@ -90,7 +90,7 @@
         () => {
         () => {
           !unref(isFirstLoad) && fetch();
           !unref(isFirstLoad) && fetch();
         },
         },
-        { deep: true },
+        { deep: true }
       );
       );
 
 
       async function fetch() {
       async function fetch() {
@@ -110,6 +110,7 @@
           }
           }
           emitChange();
           emitChange();
         } catch (error) {
         } catch (error) {
+          // eslint-disable-next-line no-console
           console.warn(error);
           console.warn(error);
         } finally {
         } finally {
           loading.value = false;
           loading.value = false;

@@ -156,6 +156,7 @@
       }
       }
       emitChange();
       emitChange();
     } catch (error) {
     } catch (error) {
+      // eslint-disable-next-line no-console
       console.warn(error);
       console.warn(error);
     } finally {
     } finally {
       loading.value = false;
       loading.value = false;

@@ -113,7 +113,7 @@
   const { TabPane } = Tabs;
   const { TabPane } = Tabs;
   const { prefixCls } = useDesign('easy-cron-inner');
   const { prefixCls } = useDesign('easy-cron-inner');
   provide('prefixCls', prefixCls);
   provide('prefixCls', prefixCls);
-  const emit = defineEmits([...cronEmits]);
+  const emit = defineEmits(cronEmits);
   const props = defineProps({ ...cronProps });
   const props = defineProps({ ...cronProps });
   const activeKey = ref(props.hideSecond ? 'minute' : 'second');
   const activeKey = ref(props.hideSecond ? 'minute' : 'second');
   const second = ref('*');
   const second = ref('*');
@@ -236,7 +236,7 @@
     if (/^[0-7]$/.test(week)) {
     if (/^[0-7]$/.test(week)) {
       return convert(week);
       return convert(week);
     } else if (patten1.test(week)) {
     } else if (patten1.test(week)) {
-      return week.replace(patten1, ($0, before, separator, after) => {
+      return week.replace(patten1, (_$0, before, separator, after) => {
         if (separator === '/') {
         if (separator === '/') {
           return convert(before) + separator + after;
           return convert(before) + separator + after;
         } else {
         } else {

@@ -23,8 +23,8 @@
 
 
   export default defineComponent({
   export default defineComponent({
     name: 'EasyCronModal',
     name: 'EasyCronModal',
-    inheritAttrs: false,
     components: { BasicModal, EasyCron, Button },
     components: { BasicModal, EasyCron, Button },
+    inheritAttrs: false,
     setup() {
     setup() {
       const attrs = useAttrs();
       const attrs = useAttrs();
       const [registerModal, { closeModal }] = useModalInner();
       const [registerModal, { closeModal }] = useModalInner();

@@ -45,7 +45,7 @@ export function useTabSetup(props, context, options) {
 
 
   // 根据不同的类型计算出的value
   // 根据不同的类型计算出的value
   const computeValue = computed(() => {
   const computeValue = computed(() => {
-    let valueArray: any[] = [];
+    const valueArray: any[] = [];
     switch (type.value) {
     switch (type.value) {
       case TypeEnum.unset:
       case TypeEnum.unset:
         valueArray.push('?');
         valueArray.push('?');
@@ -79,7 +79,7 @@ export function useTabSetup(props, context, options) {
   });
   });
   // 指定值范围区间，介于最小值和最大值之间
   // 指定值范围区间，介于最小值和最大值之间
   const specifyRange = computed(() => {
   const specifyRange = computed(() => {
-    let range: number[] = [];
+    const range: number[] = [];
     if (maxValue.value != null) {
     if (maxValue.value != null) {
       for (let i = minValue.value; i <= maxValue.value; i++) {
       for (let i = minValue.value; i <= maxValue.value; i++) {
         range.push(i);
         range.push(i);

@@ -159,7 +159,7 @@
           }
           }
           emit('height-change', unref(realHeightRef));
           emit('height-change', unref(realHeightRef));
         } catch (error) {
         } catch (error) {
-          console.log(error);
+          console.error(error);
         }
         }
       }
       }
 
 

@@ -207,7 +207,6 @@
       });
       });
 
 
       function handleSearch(searchValue: string) {
       function handleSearch(searchValue: string) {
-        console.log('searchValue', searchValue);
         if (searchValue !== searchText.value) searchText.value = searchValue;
         if (searchValue !== searchText.value) searchText.value = searchValue;
         emit('update:searchValue', searchValue);
         emit('update:searchValue', searchValue);
         if (!searchValue) {
         if (!searchValue) {

@@ -202,7 +202,6 @@
             error: null,
             error: null,
           };
           };
         } catch (e) {
         } catch (e) {
-          console.log(e);
           item.status = UploadResultStatus.ERROR;
           item.status = UploadResultStatus.ERROR;
           return {
           return {
             success: false,
             success: false,

@@ -16,8 +16,6 @@
   import { computed, defineComponent, unref, ref } from 'vue';
   import { computed, defineComponent, unref, ref } from 'vue';
   import { Layout } from 'ant-design-vue';
   import { Layout } from 'ant-design-vue';
 
 
-  import { GithubFilled } from '@ant-design/icons-vue';
-
   import { DOC_URL, GITHUB_URL, SITE_URL } from '/@/settings/siteSetting';
   import { DOC_URL, GITHUB_URL, SITE_URL } from '/@/settings/siteSetting';
   import { openWindow } from '/@/utils';
   import { openWindow } from '/@/utils';
 
 
@@ -29,7 +27,7 @@
 
 
   export default defineComponent({
   export default defineComponent({
     name: 'LayoutFooter',
     name: 'LayoutFooter',
-    components: { Footer: Layout.Footer, GithubFilled },
+    components: { Footer: Layout.Footer },
     setup() {
     setup() {
       const { t } = useI18n();
       const { t } = useI18n();
       const { getShowFooter } = useRootSetting();
       const { getShowFooter } = useRootSetting();

@@ -148,7 +148,6 @@
 
 
       function renderMenu() {
       function renderMenu() {
         const { menus, ...menuProps } = unref(getCommonProps);
         const { menus, ...menuProps } = unref(getCommonProps);
-        // console.log(menus);
         if (!menus || !menus.length) return null;
         if (!menus || !menus.length) return null;
         return !props.isHorizontal ? (
         return !props.isHorizontal ? (
           <SimpleMenu {...menuProps} isSplitMenu={unref(getSplit)} items={menus} />
           <SimpleMenu {...menuProps} isSplitMenu={unref(getSplit)} items={menus} />

@@ -100,7 +100,7 @@ export default defineComponent({
         <>
         <>
           <TypePicker
           <TypePicker
             menuTypeList={menuTypeList}
             menuTypeList={menuTypeList}
-            handler={(item: typeof menuTypeList[0]) => {
+            handler={(item: (typeof menuTypeList)[0]) => {
               baseHandler(HandlerEnum.CHANGE_LAYOUT, {
               baseHandler(HandlerEnum.CHANGE_LAYOUT, {
                 mode: item.mode,
                 mode: item.mode,
                 type: item.type,
                 type: item.type,

@@ -47,7 +47,7 @@ export function initAppConfigStore() {
     grayMode && updateGrayMode(grayMode);
     grayMode && updateGrayMode(grayMode);
     colorWeak && updateColorWeak(colorWeak);
     colorWeak && updateColorWeak(colorWeak);
   } catch (error) {
   } catch (error) {
-    console.log(error);
+    console.error(error);
   }
   }
   appStore.setProjectConfig(projCfg);
   appStore.setProjectConfig(projCfg);
 
 

@@ -4,7 +4,6 @@ import { defineStore } from 'pinia';
 
 
 import { LOCK_INFO_KEY } from '/@/enums/cacheEnum';
 import { LOCK_INFO_KEY } from '/@/enums/cacheEnum';
 import { Persistent } from '/@/utils/cache/persistent';
 import { Persistent } from '/@/utils/cache/persistent';
-import { useUserStore } from './user';
 
 
 interface LockState {
 interface LockState {
   lockInfo: Nullable<LockInfo>;
   lockInfo: Nullable<LockInfo>;

@@ -111,7 +111,6 @@ export const usePermissionStore = defineStore({
        * 否则不是超级管理员-获取对应角色的权限列表
        * 否则不是超级管理员-获取对应角色的权限列表
        */
        */
       const codeList = await getPermCode();
       const codeList = await getPermCode();
-      // console.log('codeList', codeList);
       this.setPermCodeList(codeList);
       this.setPermCodeList(codeList);
       /**
       /**
        * 如果是超级管理员则获取对应权限列表
        * 如果是超级管理员则获取对应权限列表

@@ -234,7 +234,6 @@ export const useUserStore = defineStore({
       // try {
       // try {
       //   await doLogout();
       //   await doLogout();
       // } catch {
       // } catch {
-      //   console.log('注销Token失败');
       // }
       // }
       // this.resetState();
       // this.resetState();
       // setAuthCache(JWT_TOKEN_KEY, undefined);
       // setAuthCache(JWT_TOKEN_KEY, undefined);

@@ -85,9 +85,7 @@
       /^[1](([3][0-9])|([4][0,1,4-9])|([5][0-3,5-9])|([6][2,5,6,7])|([7][0-8])|([8][0-9])|([9][0-3,5-9]))[0-9]{8}$/;
       /^[1](([3][0-9])|([4][0,1,4-9])|([5][0-3,5-9])|([6][2,5,6,7])|([7][0-8])|([8][0-9])|([9][0-3,5-9]))[0-9]{8}$/;
     if (reg.test(formData.mobile)) {
     if (reg.test(formData.mobile)) {
       const sendRes = await passwordResetCode(formData.mobile);
       const sendRes = await passwordResetCode(formData.mobile);
-      console.log(sendRes);
       if (sendRes === '') {
       if (sendRes === '') {
-        console.log('发送成功了');
         return true;
         return true;
       }
       }
       return false;
       return false;

@@ -99,6 +99,5 @@
   async function handleRegister() {
   async function handleRegister() {
     const data = await validForm();
     const data = await validForm();
     if (!data) return;
     if (!data) return;
-    console.log(data);
   }
   }
 </script>
 </script>

@@ -27,7 +27,6 @@
   onMounted(() => {
   onMounted(() => {
     // 记录当前的UserId
     // 记录当前的UserId
     userId.value = userStore.getUserInfo?.userId;
     userId.value = userStore.getUserInfo?.userId;
-    console.log('Mounted', userStore.getUserInfo);
   });
   });
 
 
   onBeforeUnmount(() => {
   onBeforeUnmount(() => {

@@ -11,8 +11,7 @@
  */
  */
 export function simpleDebounce(fn, delay = 100) {
 export function simpleDebounce(fn, delay = 100) {
   let timer: any | null = null;
   let timer: any | null = null;
-  return function () {
-    let args = arguments;
+  return function (...args) {
     if (timer) {
     if (timer) {
       clearTimeout(timer);
       clearTimeout(timer);
     }
     }
@@ -61,4 +60,3 @@ export function dateFormat(date, block) {
   });
   });
   return format;
   return format;
 }
 }
-

@@ -36,7 +36,6 @@ export function checkStatus(
       }
       }
       break;
       break;
     case 403:
     case 403:
-      // console.log('403', errMessage);
       // errMessage = t('sys.api.errMsg403');
       // errMessage = t('sys.api.errMsg403');
       errMessage = errMessage;
       errMessage = errMessage;
       break;
       break;

@@ -8,7 +8,6 @@ export function listToTree(lists: getMenuListResultModel): getMenuListResultMode
   lists.forEach((goods) => {
   lists.forEach((goods) => {
     goods['menuName'] = t(goods.meta.title); // 为goods添加属性menuName
     goods['menuName'] = t(goods.meta.title); // 为goods添加属性menuName
 
 
-    // console.log(goods.children?.length);
     if (goods.children?.length) {
     if (goods.children?.length) {
       listToTree(goods.children);
       listToTree(goods.children);
       // goods.children.forEach((goodChildren) => {
       // goods.children.forEach((goodChildren) => {

@@ -102,8 +102,7 @@
               avatar: [{ uid: buildUUID(), name: 'name', url: data.record.avatar } as FileItem],
               avatar: [{ uid: buildUUID(), name: 'name', url: data.record.avatar } as FileItem],
             });
             });
           }
           }
-          const { avatar, ...params } = data.record;
-          console.log(avatar);
+          const { ...params } = data.record;
           await setFieldsValue({ ...params });
           await setFieldsValue({ ...params });
         } else {
         } else {
           editId.value = '';
           editId.value = '';

@@ -337,7 +337,6 @@
       }
       }
     },
     },
     onDisconnected() {
     onDisconnected() {
-      console.log('断开连接了');
       close();
       close();
     },
     },
   });
   });

@@ -354,7 +354,6 @@
       }
       }
     },
     },
     onDisconnected() {
     onDisconnected() {
-      console.log('断开连接了');
       close();
       close();
     },
     },
   });
   });

@@ -75,9 +75,7 @@ export const formSchema: FormSchema[] = [
           }
           }
         },
         },
         // showUploadList: true,
         // showUploadList: true,
-        onDownload(file) {
-          console.log(file);
-        },
+        onDownload() {},
         onPreview: (fileList: FileItem) => {
         onPreview: (fileList: FileItem) => {
           createImgPreview({ imageList: [fileList.url!] });
           createImgPreview({ imageList: [fileList.url!] });
         },
         },

@@ -153,7 +153,7 @@
       <template #renderItem="{ item }: BasicCardListRenderItem<BigScreenCenterItemsModel>">
       <template #renderItem="{ item }: BasicCardListRenderItem<BigScreenCenterItemsModel>">
         <Card
         <Card
           :style="{
           :style="{
-            '--viewType': item.viewType === ViewType.PUBLIC_VIEW ? '#1890ff' : '#faad14',
+            '--viewType': item.viewType === ViewType.PUBLIC_VIEW ? '#faad14' : '#1890ff',
           }"
           }"
           class="card-container"
           class="card-container"
         >
         >

@@ -192,7 +192,6 @@
         getRestData.value = resp;
         getRestData.value = resp;
         commonRest(resp, jsonEditorRef.value?.setJsonValue);
         commonRest(resp, jsonEditorRef.value?.setJsonValue);
       } catch (e) {
       } catch (e) {
-        console.log(e);
         if (Object.prototype.toString.call(e) === '[object Object]') {
         if (Object.prototype.toString.call(e) === '[object Object]') {
           jsonEditorRef.value?.setJsonValue(e);
           jsonEditorRef.value?.setJsonValue(e);
         } else {
         } else {

@@ -61,7 +61,7 @@ export const useUtils = () => {
         }
         }
       }
       }
     } catch (e) {
     } catch (e) {
-      console.log(`Post没有传递params${e}`);
+      console.error(`Post没有传递params${e}`);
     }
     }
     return _result.join('&');
     return _result.join('&');
   };
   };

@@ -10,6 +10,7 @@
     ...basicProps,
     ...basicProps,
     value: {
     value: {
       required: true,
       required: true,
+      type: Object,
     },
     },
   });
   });
 
 

@@ -48,8 +48,8 @@
     }
     }
   };
   };
 
 
-  const insertDeviceTypeName = (
-    deviceTypeName: string,
+  const insertProductionName = (
+    productionName: string,
     fileParseValue: UploadFileParseValue,
     fileParseValue: UploadFileParseValue,
     columns: Record<'type', string>[]
     columns: Record<'type', string>[]
   ): { file: string; columns: Record<'type', string>[] } => {
   ): { file: string; columns: Record<'type', string>[] } => {
@@ -58,11 +58,11 @@
 
 
     const csvArray = content.map((item) => header.map((key) => item[key]) as string[]);
     const csvArray = content.map((item) => header.map((key) => item[key]) as string[]);
     for (const item of csvArray) {
     for (const item of csvArray) {
-      item.splice(insertIndex, 0, deviceTypeName);
+      item.splice(insertIndex, 0, productionName);
     }
     }
 
 
     const _header = [...header];
     const _header = [...header];
-    _header.splice(insertIndex, 0, deviceTypeName);
+    _header.splice(insertIndex, 0, productionName);
     csvArray.unshift(_header);
     csvArray.unshift(_header);
     const file = csvArray.map((item) => item.join(DelimiterEnum.COMMA)).join('\n');
     const file = csvArray.map((item) => item.join(DelimiterEnum.COMMA)).join('\n');
 
 
@@ -80,14 +80,14 @@
       tkDeviceProfileId,
       tkDeviceProfileId,
       organizationId,
       organizationId,
       deviceTypeEnum,
       deviceTypeEnum,
-      deviceTypeName,
+      productionName,
       gateWayTbDeviceId,
       gateWayTbDeviceId,
       tbDeviceProfileId,
       tbDeviceProfileId,
       isTcpDeviceProfile,
       isTcpDeviceProfile,
     } = basicInfo;
     } = basicInfo;
 
 
-    const { file, columns } = insertDeviceTypeName(
-      deviceTypeName,
+    const { file, columns } = insertProductionName(
+      productionName,
       fileParseValue,
       fileParseValue,
       columnConfiguration
       columnConfiguration
     );
     );

@@ -22,6 +22,7 @@ export enum FieldsEnum {
   TB_DEVICE_PROFILE_ID = 'tbDeviceProfileId',
   TB_DEVICE_PROFILE_ID = 'tbDeviceProfileId',
   IS_TCP_DEVICE_PROFILE = 'isTcpDeviceProfile',
   IS_TCP_DEVICE_PROFILE = 'isTcpDeviceProfile',
   TRANSPORT_TYPE = 'transportType',
   TRANSPORT_TYPE = 'transportType',
+  PRODUCTION_NAME = 'productionName',
 }
 }
 
 
 export enum DelimiterEnum {
 export enum DelimiterEnum {
@@ -171,7 +172,7 @@ export const basicInfoForm: FormSchema[] = [
         placeholder: '请选择产品',
         placeholder: '请选择产品',
         params: { deviceType },
         params: { deviceType },
         getPopupContainer: () => document.body,
         getPopupContainer: () => document.body,
-        onChange(value: string, options: DeviceRecord) {
+        onChange(value: string, options: DeviceRecord & Record<'label', string>) {
           setFieldsValue({
           setFieldsValue({
             [FieldsEnum.IS_TCP_DEVICE_PROFILE]: value
             [FieldsEnum.IS_TCP_DEVICE_PROFILE]: value
               ? options.transportType === TransportTypeEnum.TCP
               ? options.transportType === TransportTypeEnum.TCP
@@ -179,6 +180,7 @@ export const basicInfoForm: FormSchema[] = [
             [FieldsEnum.TB_DEVICE_PROFILE_ID]: value ? options.tbProfileId : null,
             [FieldsEnum.TB_DEVICE_PROFILE_ID]: value ? options.tbProfileId : null,
             [FieldsEnum.GATEWAY_TB_DEVICE_ID]: null,
             [FieldsEnum.GATEWAY_TB_DEVICE_ID]: null,
             [FieldsEnum.TRANSPORT_TYPE]: options?.transportType,
             [FieldsEnum.TRANSPORT_TYPE]: options?.transportType,
+            [FieldsEnum.PRODUCTION_NAME]: options?.label,
           });
           });
         },
         },
         showSearch: true,
         showSearch: true,
@@ -195,6 +197,12 @@ export const basicInfoForm: FormSchema[] = [
     show: false,
     show: false,
   },
   },
   {
   {
+    field: FieldsEnum.PRODUCTION_NAME,
+    label: '',
+    component: 'Input',
+    show: false,
+  },
+  {
     field: FieldsEnum.GATEWAY_TB_DEVICE_ID,
     field: FieldsEnum.GATEWAY_TB_DEVICE_ID,
     component: 'ApiSelect',
     component: 'ApiSelect',
     label: '网关设备',
     label: '网关设备',

@@ -26,6 +26,7 @@ export type BasicInfoRecord = Record<
   | 'deviceTypeName'
   | 'deviceTypeName'
   | 'gateWayTbDeviceId'
   | 'gateWayTbDeviceId'
   | 'gateWayTkDeviceId'
   | 'gateWayTkDeviceId'
+  | 'productionName'
   | 'tbDeviceProfileId',
   | 'tbDeviceProfileId',
   string
   string
 > &
 > &

@@ -100,11 +100,9 @@
       const { send, close } = useWebSocket(state.server, {
       const { send, close } = useWebSocket(state.server, {
         onConnected() {
         onConnected() {
           send(state.sendValue);
           send(state.sendValue);
-          console.log('建立连接了');
         },
         },
         onMessage(_, e) {
         onMessage(_, e) {
           const { data } = JSON.parse(e.data);
           const { data } = JSON.parse(e.data);
-          console.log('来新消息了', '---data---', data);
           const newArray: socketDataType[] = [];
           const newArray: socketDataType[] = [];
           for (const key in data) {
           for (const key in data) {
             const [time, value] = data[key].flat(1);
             const [time, value] = data[key].flat(1);
@@ -134,7 +132,6 @@
           });
           });
         },
         },
         onDisconnected() {
         onDisconnected() {
-          console.log('断开连接了');
           close();
           close();
         },
         },
         onError() {
         onError() {

@@ -32,13 +32,12 @@
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { Switch } from 'ant-design-vue';
   import { Switch } from 'ant-design-vue';
   import { DeviceRecord } from '/@/api/device/model/deviceModel';
   import { DeviceRecord } from '/@/api/device/model/deviceModel';
-  import { watch } from 'vue';
   import VideoModal from './videoModal.vue';
   import VideoModal from './videoModal.vue';
   import { useModal } from '/@/components/Modal';
   import { useModal } from '/@/components/Modal';
   import { onMounted } from 'vue';
   import { onMounted } from 'vue';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
 
 
-  const props = defineProps({
+  defineProps({
     fromId: {
     fromId: {
       type: String,
       type: String,
       default: '',
       default: '',
@@ -49,13 +48,6 @@
     },
     },
   });
   });
 
 
-  watch(
-    () => props,
-    () => {
-      console.log(props, 'props');
-    }
-  );
-
   const [registerModal, { openModal }] = useModal();
   const [registerModal, { openModal }] = useModal();
 
 
   const [registerTable, { setTableData, setProps, setSelectedRowKeys, reload }] = useTable({
   const [registerTable, { setTableData, setProps, setSelectedRowKeys, reload }] = useTable({
@@ -68,14 +60,10 @@
       labelWidth: 120,
       labelWidth: 120,
       schemas: searchFormSchema,
       schemas: searchFormSchema,
     },
     },
-    beforeFetch: (params) => {
-      console.log(params);
-    },
     useSearchForm: true,
     useSearchForm: true,
   });
   });
 
 
-  const handleTurnVideo = async (checked: Boolean, record: Recordable) => {
-    console.log(checked, record, 'record');
+  const handleTurnVideo = async (checked: Boolean, _record: Recordable) => {
     setProps({
     setProps({
       loading: true,
       loading: true,
     });
     });
@@ -281,7 +269,6 @@
   });
   });
 
 
   const handlePlay = (record: Recordable) => {
   const handlePlay = (record: Recordable) => {
-    console.log(record);
     openModal(true, {
     openModal(true, {
       record,
       record,
     });
     });

@@ -346,7 +346,6 @@ export const schemas: FormSchema[] = [
       return {
       return {
         onChange(value) {
         onChange(value) {
           const { updateSchema } = formActionType;
           const { updateSchema } = formActionType;
-          console.log(value);
           formModel.interval = '';
           formModel.interval = '';
           updateSchema({
           updateSchema({
             field: 'interval',
             field: 'interval',

@@ -235,7 +235,6 @@
 
 
   function loadDataSuccess(excelDataList: ExcelData[]) {
   function loadDataSuccess(excelDataList: ExcelData[]) {
     tableListRef.value = [];
     tableListRef.value = [];
-    console.log(excelDataList);
     for (const excelData of excelDataList) {
     for (const excelData of excelDataList) {
       const {
       const {
         header,
         header,
@@ -294,9 +293,7 @@
     });
     });
   };
   };
   //导入
   //导入
-  function handleImport() {
-    console.log('record');
-  }
+  function handleImport() {}
   function handleSuccess() {
   function handleSuccess() {
     reload();
     reload();
   }
   }

@@ -204,8 +204,7 @@
           });
           });
       flag && createMessage.info(flag?.message);
       flag && createMessage.info(flag?.message);
     } catch (msg) {
     } catch (msg) {
-      // eslint-disable-next-line no-console
-      console.log(msg, 'msg');
+      console.error(msg, 'msg');
     } finally {
     } finally {
       closeLoading();
       closeLoading();
       closeModal();
       closeModal();

@@ -96,7 +96,6 @@
       render: (_, data: Bootstrap) => (data.notifIfDisabled ? '启用' : '禁用'),
       render: (_, data: Bootstrap) => (data.notifIfDisabled ? '启用' : '禁用'),
     },
     },
   ];
   ];
-  console.log(unref(getOtherSetting));
   const [registerOtherSettings] = useDescription({
   const [registerOtherSettings] = useDescription({
     layout: 'vertical',
     layout: 'vertical',
     column: 2,
     column: 2,

@@ -68,21 +68,18 @@
               <Button v-if="isShowBtn" class="!bg-gray-200" type="text" @click="handleReturn">
               <Button v-if="isShowBtn" class="!bg-gray-200" type="text" @click="handleReturn">
                 返回
                 返回
               </Button>
               </Button>
-              <Authority :value="[ModelOfMatterPermission.DELETE, ModelCategoryPermission.DELETE]">
+              <Authority
+                v-if="isShowBtn"
+                :value="[ModelOfMatterPermission.DELETE, ModelCategoryPermission.DELETE]"
+              >
                 <Popconfirm
                 <Popconfirm
                   title="您确定要批量删除数据"
                   title="您确定要批量删除数据"
                   ok-text="确定"
                   ok-text="确定"
                   cancel-text="取消"
                   cancel-text="取消"
-                  @confirm="handleDeleteOrBatchDelete(null)"
+                  @confirm="handleDeleteOrBatchDelete()"
+                  :disabled="getHasBatchDelete"
                 >
                 >
-                  <Button
-                    style="display: none"
-                    type="primary"
-                    color="error"
-                    :disabled="hasBatchDelete"
-                  >
-                    批量删除
-                  </Button>
+                  <Button type="primary" danger :disabled="getHasBatchDelete"> 批量删除 </Button>
                 </Popconfirm>
                 </Popconfirm>
               </Authority>
               </Authority>
             </div>
             </div>
@@ -120,11 +117,7 @@
         />
         />
       </template>
       </template>
     </BasicTable>
     </BasicTable>
-    <PhysicalModelModal
-      :record="$props.record"
-      @register="registerModal"
-      @success="handleSuccess"
-    />
+    <PhysicalModelModal :record="$props.record" @register="registerModal" @success="reload" />
     <PhysicalModelTsl :record="$props.record" @register="registerModalTsl" />
     <PhysicalModelTsl :record="$props.record" @register="registerModalTsl" />
     <SelectImport
     <SelectImport
       :record="$props.record"
       :record="$props.record"
@@ -142,7 +135,6 @@
     ModelCategoryPermission,
     ModelCategoryPermission,
     physicalColumn,
     physicalColumn,
   } from '../device.profile.data';
   } from '../device.profile.data';
-  import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
   import { Authority } from '/@/components/Authority';
   import { Authority } from '/@/components/Authority';
   import PhysicalModelModal from './cpns/physical/PhysicalModelModal.vue';
   import PhysicalModelModal from './cpns/physical/PhysicalModelModal.vue';
   import PhysicalModelTsl from './cpns/physical/PhysicalModelTsl.vue';
   import PhysicalModelTsl from './cpns/physical/PhysicalModelTsl.vue';
@@ -156,8 +148,11 @@
     releaseModel,
     releaseModel,
   } from '/@/api/device/modelOfMatter';
   } from '/@/api/device/modelOfMatter';
   import { OpenModelOfMatterModelParams, OpenModelMode } from './cpns/physical/types';
   import { OpenModelOfMatterModelParams, OpenModelMode } from './cpns/physical/types';
-  import { ModelOfMatterParams } from '/@/api/device/model/modelOfMatterModel';
-  import { ref, unref } from 'vue';
+  import {
+    ModelOfMatterItemRecordType,
+    ModelOfMatterParams,
+  } from '/@/api/device/model/modelOfMatterModel';
+  import { computed, ref, unref } from 'vue';
   import { isObject } from '/@/utils/is';
   import { isObject } from '/@/utils/is';
   import { useRole } from '/@/hooks/business/useRole';
   import { useRole } from '/@/hooks/business/useRole';
   import { ExportModelCategory } from '/@/api/device/modelOfMatter';
   import { ExportModelCategory } from '/@/api/device/modelOfMatter';
@@ -177,50 +172,45 @@
   const [registerModalTsl, { openModal: openModalTsl }] = useModal();
   const [registerModalTsl, { openModal: openModalTsl }] = useModal();
   const [registerModalSelect, { openModal: openModalSelect }] = useModal();
   const [registerModalSelect, { openModal: openModalSelect }] = useModal();
 
 
-  const [registerTable, { reload, setProps }] = useTable({
-    api: async (params: Record<'page' | 'pageSize', number>) => {
-      return await getModelList({
-        ...params,
-        id: props.record.id,
-        selectType: props.record.ifShowClass ? 'category' : undefined,
-      });
-    },
-    columns: props.record.ifShowClass
-      ? physicalColumn.filter((item) => item.dataIndex !== 'status')
-      : physicalColumn,
-    showIndexColumn: false,
-    clickToRowSelect: false,
-    showTableSetting: true,
-    bordered: true,
-    useSearchForm: true,
-    formConfig: {
-      schemas: modelOfMatterForm,
-      labelWidth: 120,
-    },
-    actionColumn: {
-      width: 200,
-      title: '操作',
-      dataIndex: 'action',
-      slots: { customRender: 'action' },
-      fixed: 'right',
-    },
-  });
-
-  // 刷新
-  const handleSuccess = () => {
-    reload();
-  };
-  const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions } = useBatchDelete(
-    props.record.ifShowClass && (unref(isPlatformAdmin) || unref(isSysadmin))
-      ? deleteModelCategory
-      : deleteModel,
-    handleSuccess,
-    setProps
-  );
+  const [registerTable, { reload, getSelectRowKeys, getRowSelection, clearSelectedRowKeys }] =
+    useTable({
+      api: async (params: Record<'page' | 'pageSize', number>) => {
+        return await getModelList({
+          ...params,
+          id: props.record.id,
+          selectType: props.record.ifShowClass ? 'category' : undefined,
+        });
+      },
+      columns: props.record.ifShowClass
+        ? physicalColumn.filter((item) => item.dataIndex !== 'status')
+        : physicalColumn,
+      showIndexColumn: false,
+      clickToRowSelect: false,
+      showTableSetting: true,
+      bordered: true,
+      useSearchForm: true,
+      rowKey: 'id',
+      formConfig: {
+        schemas: modelOfMatterForm,
+        labelWidth: 120,
+      },
+      actionColumn: {
+        width: 200,
+        title: '操作',
+        dataIndex: 'action',
+        slots: { customRender: 'action' },
+        fixed: 'right',
+      },
+      rowSelection: {
+        getCheckboxProps: (record: ModelOfMatterItemRecordType) => {
+          return {
+            disabled: record.status === 1,
+          };
+        },
+      },
+    });
 
 
-  selectionOptions.rowSelection.getCheckboxProps = (record: Recordable) => {
-    return { disabled: record.status === 1 };
-  };
+  const getHasBatchDelete = computed(() => !getRowSelection().selectedRowKeys?.length);
 
 
   const handleViewDetail = (record: ModelOfMatterParams) => {
   const handleViewDetail = (record: ModelOfMatterParams) => {
     if (record) {
     if (record) {
@@ -245,6 +235,19 @@
     }
     }
   };
   };
 
 
+  const handleDeleteOrBatchDelete = async (record?: ModelOfMatterItemRecordType) => {
+    const deleteFn =
+      props.record.ifShowClass && (unref(isPlatformAdmin) || unref(isSysadmin))
+        ? deleteModelCategory
+        : deleteModel;
+
+    const ids = record ? [record.id] : getSelectRowKeys();
+    await deleteFn(ids);
+    createMessage.success('删除成功');
+    clearSelectedRowKeys();
+    reload();
+  };
+
   const handleOpenTsl = () => {
   const handleOpenTsl = () => {
     openModalTsl(true, {
     openModalTsl(true, {
       isUpdate: true,
       isUpdate: true,

@@ -30,9 +30,7 @@
   import { SelectTypes } from 'ant-design-vue/es/select';
   import { SelectTypes } from 'ant-design-vue/es/select';
 
 
   const emit = defineEmits(['register', 'emitSelect']);
   const emit = defineEmits(['register', 'emitSelect']);
-  const [register] = useModalInner((data) => {
-    console.log(data);
-  });
+  const [register] = useModalInner(() => {});
   const heightNum = ref(80);
   const heightNum = ref(80);
   const visible = ref(false);
   const visible = ref(false);
   const selectValue = ref('LwM2M');
   const selectValue = ref('LwM2M');

@@ -130,14 +130,13 @@
     telemetry: [],
     telemetry: [],
   });
   });
 
 
-  const [registerModel, { resetFields: resetObjectListValue, getFieldsValue: getObjectListValue }] =
-    useForm({
-      labelWidth: 100,
-      schemas: modelSchemas,
-      actionColOptions: {
-        span: 14,
-      },
-    });
+  const [registerModel, { resetFields: resetObjectListValue }] = useForm({
+    labelWidth: 100,
+    schemas: modelSchemas,
+    actionColOptions: {
+      span: 14,
+    },
+  });
   const [
   const [
     registerSettings,
     registerSettings,
     {
     {
@@ -152,14 +151,13 @@
       span: 14,
       span: 14,
     },
     },
   });
   });
-  const [registerDevice, { resetFields: resetDeviceValue, getFieldsValue: getDeviceValue }] =
-    useForm({
-      labelWidth: 100,
-      schemas: deviceSchemas,
-      actionColOptions: {
-        span: 14,
-      },
-    });
+  const [registerDevice, { resetFields: resetDeviceValue }] = useForm({
+    labelWidth: 100,
+    schemas: deviceSchemas,
+    actionColOptions: {
+      span: 14,
+    },
+  });
   const [registerModal, { openModal }] = useModal();
   const [registerModal, { openModal }] = useModal();
 
 
   const handleAdd = () => {
   const handleAdd = () => {
@@ -205,10 +203,6 @@
   };
   };
 
 
   const getFormData = async () => {
   const getFormData = async () => {
-    const objectListVal = getObjectListValue();
-    const deviceVal = getDeviceValue();
-    console.log('第一个tab', objectListVal);
-    console.log('第四个tab', deviceVal);
     getBootStrapFormValue();
     getBootStrapFormValue();
     const settingsVal = await settingsValidate();
     const settingsVal = await settingsValidate();
     if (!settingsVal) return;
     if (!settingsVal) return;

@@ -69,7 +69,7 @@
       if (unref(copied)) createMessage.success('复制成功！');
       if (unref(copied)) createMessage.success('复制成功！');
       else createMessage.error('复制失败！');
       else createMessage.error('复制失败！');
     } catch (e) {
     } catch (e) {
-      console.log(e);
+      console.error(e);
     }
     }
   };
   };
 
 

@@ -172,8 +172,7 @@ export const formSchema: FormSchema[] = [
             const record = await findMessageConfig(params);
             const record = await findMessageConfig(params);
             return record.filter((item) => item.status === 1);
             return record.filter((item) => item.status === 1);
           } catch (error) {
           } catch (error) {
-            // eslint-disable-next-line no-console
-            console.log(error);
+            console.error(error);
             return [];
             return [];
           }
           }
         },
         },

@@ -41,7 +41,7 @@
         checksumAlgorithm: value.checksumAlgorithm,
         checksumAlgorithm: value.checksumAlgorithm,
       });
       });
     } catch (error) {
     } catch (error) {
-      console.log(error);
+      console.error(error);
       if ((error as { status: number }).status) {
       if ((error as { status: number }).status) {
         await deleteOtaPackage(id);
         await deleteOtaPackage(id);
       }
       }

@@ -6,7 +6,7 @@
   border-color: #6b7280;
   border-color: #6b7280;
 }
 }
 
 
-.vue-flow__handle:hover{
+.vue-flow__handle:hover {
   background-color: #000;
   background-color: #000;
 }
 }
 
 
@@ -15,7 +15,7 @@
 }
 }
 
 
 .vue-flow__handle-left {
 .vue-flow__handle-left {
-  left: -12px; 
+  left: -12px;
 }
 }
 
 
 .vue-flow__background.vue-flow__container {
 .vue-flow__background.vue-flow__container {
@@ -32,7 +32,7 @@
   stroke-width: 4;
   stroke-width: 4;
   stroke: gray;
   stroke: gray;
   transition: stroke-width 0.3s;
   transition: stroke-width 0.3s;
-} 
+}
 
 
 .connection-focus {
 .connection-focus {
   stroke-width: 6;
   stroke-width: 6;
@@ -44,7 +44,7 @@
 }
 }
 
 
 /* 连接线移入放大效果 */
 /* 连接线移入放大效果 */
-.vue-flow__edge:hover >  .vue-flow__edge-path {
+.vue-flow__edge:hover > .vue-flow__edge-path {
   stroke-width: 6 !important;
   stroke-width: 6 !important;
 }
 }
 
 
@@ -54,18 +54,19 @@
 }
 }
 
 
 .vue-flow__edge:hover .vue-flow__edge-textbg {
 .vue-flow__edge:hover .vue-flow__edge-textbg {
-  transform: scale(1.1)
+  transform: scale(1.1);
 }
 }
 
 
-.vue-flow__edge:hover .vue-flow__edge-text{
-  transform: scale(1.1)
+.vue-flow__edge:hover .vue-flow__edge-text {
+  transform: scale(1.1);
 }
 }
 
 
 /* selection 选择框 */
 /* selection 选择框 */
-.vue-flow__nodesselection-rect, .vue-flow__selection{
+.vue-flow__nodesselection-rect,
+.vue-flow__selection {
   border-width: 3px;
   border-width: 3px;
 }
 }
 
 
-.vue-flow__nodesselection-rect { 
+.vue-flow__nodesselection-rect {
   pointer-events: none;
   pointer-events: none;
 }
 }

@@ -64,7 +64,10 @@
   }
   }
 
 
   function handleOnOrganizationOptionsChange(options: OrganizationListItem[]) {
   function handleOnOrganizationOptionsChange(options: OrganizationListItem[]) {
-    if (unref(drawerMode) === DataActionModeEnum.CREATE) {
+    if (
+      unref(drawerMode) === DataActionModeEnum.CREATE &&
+      !basicFormActionType.getFieldsValue()?.[FormFieldsEnum.ORGANIZATION_ID]
+    ) {
       const [firsetItem] = options;
       const [firsetItem] = options;
       organizationId.value = firsetItem?.id;
       organizationId.value = firsetItem?.id;
       basicFormActionType.setFieldsValue({ [FormFieldsEnum.ORGANIZATION_ID]: firsetItem?.id });
       basicFormActionType.setFieldsValue({ [FormFieldsEnum.ORGANIZATION_ID]: firsetItem?.id });

@@ -236,7 +236,7 @@
       // 设置输出值
       // 设置输出值
       outputEditor.value.set(result);
       outputEditor.value.set(result);
     } catch (e) {
     } catch (e) {
-      console.log(e);
+      console.error(e);
       const { createMessage } = useMessage();
       const { createMessage } = useMessage();
       createMessage.error(e.toString());
       createMessage.error(e.toString());
     }
     }

@@ -85,9 +85,7 @@
       /^[1](([3][0-9])|([4][0,1,4-9])|([5][0-3,5-9])|([6][2,5,6,7])|([7][0-8])|([8][0-9])|([9][0-3,5-9]))[0-9]{8}$/;
       /^[1](([3][0-9])|([4][0,1,4-9])|([5][0-3,5-9])|([6][2,5,6,7])|([7][0-8])|([8][0-9])|([9][0-3,5-9]))[0-9]{8}$/;
     if (reg.test(formData.mobile)) {
     if (reg.test(formData.mobile)) {
       const sendRes = await passwordResetCode(formData.mobile);
       const sendRes = await passwordResetCode(formData.mobile);
-      console.log(sendRes);
       if (sendRes === '') {
       if (sendRes === '') {
-        console.log('发送成功了');
         return true;
         return true;
       }
       }
       return false;
       return false;

@@ -99,6 +99,5 @@
   async function handleRegister() {
   async function handleRegister() {
     const data = await validForm();
     const data = await validForm();
     if (!data) return;
     if (!data) return;
-    console.log(data);
   }
   }
 </script>
 </script>

@@ -27,7 +27,6 @@
   onMounted(() => {
   onMounted(() => {
     // 记录当前的UserId
     // 记录当前的UserId
     userId.value = userStore.getUserInfo?.userId;
     userId.value = userStore.getUserInfo?.userId;
-    console.log('Mounted', userStore.getUserInfo);
   });
   });
 
 
   onBeforeUnmount(() => {
   onBeforeUnmount(() => {

@@ -14,7 +14,6 @@
   Reflect.deleteProperty(params, 'path');
   Reflect.deleteProperty(params, 'path');
 
 
   const _path = Array.isArray(path) ? path.join('/') : path;
   const _path = Array.isArray(path) ? path.join('/') : path;
-  console.log(unref(currentRoute));
   if (_redirect_type === 'name') {
   if (_redirect_type === 'name') {
     replace({
     replace({
       name: _path,
       name: _path,

@@ -138,7 +138,6 @@
           }
           }
           if (newFieldValue.codeTown == undefined) {
           if (newFieldValue.codeTown == undefined) {
             validateArray.push('prov');
             validateArray.push('prov');
-            console.log(validateArray);
           } else {
           } else {
             const findExistIndex1 = validateArray.findIndex((o) => o == 'prov');
             const findExistIndex1 = validateArray.findIndex((o) => o == 'prov');
             if (findExistIndex1 !== -1) {
             if (findExistIndex1 !== -1) {

@@ -5,7 +5,8 @@
         <Tabs.TabPane
         <Tabs.TabPane
           v-if="
           v-if="
             isWhereAdmin == 'TENANT_ADMIN' ||
             isWhereAdmin == 'TENANT_ADMIN' ||
-            (isWhereAdmin == 'SYS_ADMIN' || isWhereAdmin == 'CUSTOMER_USER')
+            isWhereAdmin == 'SYS_ADMIN' ||
+            isWhereAdmin == 'CUSTOMER_USER'
           "
           "
           key="企业信息"
           key="企业信息"
           tab="企业信息"
           tab="企业信息"

@@ -264,7 +264,6 @@
     setProps({
     setProps({
       loading: true,
       loading: true,
     });
     });
-    console.log(sendTime.value);
     let startTime = null;
     let startTime = null;
     let endTime = null;
     let endTime = null;
     if (sendTime.value.length > 0) {
     if (sendTime.value.length > 0) {

@@ -49,6 +49,7 @@
     font-size: 16px;
     font-size: 16px;
     font-weight: 500;
     font-weight: 500;
   }
   }
+
   :deep(.vben-collapse-container__header) {
   :deep(.vben-collapse-container__header) {
     border-bottom: none;
     border-bottom: none;
   }
   }

@@ -134,7 +134,7 @@
                 copyTransFun(data as any);
                 copyTransFun(data as any);
                 return data;
                 return data;
               } catch (error) {
               } catch (error) {
-                console.log(error);
+                console.error(error);
                 return [];
                 return [];
               }
               }
             },
             },

@@ -77,7 +77,7 @@
                 copyTransFun(data as any);
                 copyTransFun(data as any);
                 return data;
                 return data;
               } catch (error) {
               } catch (error) {
-                console.log(error);
+                console.error(error);
                 return [];
                 return [];
               }
               }
             },
             },

@@ -10,7 +10,8 @@
 
 
   const alert = {
   const alert = {
     [PackagesCategoryEnum.MAP]: [
     [PackagesCategoryEnum.MAP]: [
-      '地图组件，需绑定两个数据源，且数据源为同一设备。第一数据源为经度，第二数据源为纬度，否则地图组件不能正常显示。',
+      '1、绑定数据源为结构体时，可以自行选择结构体里的属性作为经纬度',
+      '2、绑定数据源为非结构体时，第一数据源为经度，第二数据源为纬度，且数据源为同一设备，并同时上报。否则地图组件不能正常显示。',
     ],
     ],
   };
   };
 
 

@@ -34,14 +34,6 @@
         const { unit, fontColor, showDeviceName } = item.componentInfo || {};
         const { unit, fontColor, showDeviceName } = item.componentInfo || {};
         const { deviceName, deviceRename, attribute, attributeRename, deviceId, attributeName } =
         const { deviceName, deviceRename, attribute, attributeRename, deviceId, attributeName } =
           item;
           item;
-        // return {
-        //   unit: unit ?? persetUnit,
-        //   fontColor: fontColor ?? persetFontColor,
-        //   showDeviceName: showDeviceName ?? persetShowDeviceName,
-        //   attribute,
-        //   deviceName,
-        //   deviceRename,
-        // };
         return {
         return {
           unit: unit ?? presetUnit,
           unit: unit ?? presetUnit,
           fontColor: fontColor ?? presetFontColor,
           fontColor: fontColor ?? presetFontColor,
@@ -58,7 +50,6 @@
   });
   });
 
 
   const getOffset = (length: number, index: number) => {
   const getOffset = (length: number, index: number) => {
-    // try {
     const offsetList = ref<any>([]);
     const offsetList = ref<any>([]);
     switch (length) {
     switch (length) {
       case 1:
       case 1:
@@ -147,7 +138,6 @@
         break;
         break;
     }
     }
     return unref(offsetList);
     return unref(offsetList);
-    // } catch {}
   };
   };
 
 
   const series = ref(
   const series = ref(
@@ -263,7 +253,6 @@
       series.value.forEach((item) => {
       series.value.forEach((item) => {
         if (item.id === deviceId && item.attribute === attribute && value) {
         if (item.id === deviceId && item.attribute === attribute && value) {
           item.value = getNumberValue(value);
           item.value = getNumberValue(value);
-          // time.value = timespan;
         }
         }
       });
       });
     });
     });

@@ -62,7 +62,6 @@
   const options = (): EChartsOption => {
   const options = (): EChartsOption => {
     const { unit, fontColor, pointerColor, maxNumber, valueSize } = unref(getDesign);
     const { unit, fontColor, pointerColor, maxNumber, valueSize } = unref(getDesign);
 
 
-    // getStageColor(gradientInfo);
     return {
     return {
       series: [
       series: [
         {
         {
@@ -103,14 +102,6 @@
               color: pointerColor,
               color: pointerColor,
             },
             },
           },
           },
-          // anchor: {
-          //   show: true,
-          //   showAbove: true,
-          //   size: 10,
-          //   itemStyle: {
-          //     borderWidth: 4,
-          //   },
-          // },
           title: {
           title: {
             show: false,
             show: false,
           },
           },

@@ -3,7 +3,7 @@
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { formSchema, getHistorySearchParams, SchemaFiled } from './history.config';
   import { formSchema, getHistorySearchParams, SchemaFiled } from './history.config';
   import { HistoryModalOkEmitParams } from './type';
   import { HistoryModalOkEmitParams } from './type';
-  import { ref } from 'vue';
+  import { ref, unref } from 'vue';
   import { getAllDeviceByOrg } from '/@/api/dataBoard';
   import { getAllDeviceByOrg } from '/@/api/dataBoard';
   import { getDeviceHistoryInfo } from '/@/api/alarm/position';
   import { getDeviceHistoryInfo } from '/@/api/alarm/position';
   import { DataSource } from '/@/views/visual/palette/types';
   import { DataSource } from '/@/views/visual/palette/types';
@@ -19,58 +19,154 @@
     ],
     ],
   });
   });
 
 
-  const [registerModal, { closeModal }] = useModalInner(async (dataSource: DataSource[]) => {
-    try {
-      dataSource = cloneDeep(dataSource);
-      if (dataSource.length < 2) return;
-      dataSource = dataSource.splice(0, 2);
-      const deviceRecord = dataSource?.at(0) || ({} as DataSource);
-      if (!deviceRecord.organizationId) return;
-      const deviceList = await getAllDeviceByOrg(
-        deviceRecord.organizationId,
-        deviceRecord.deviceProfileId
-      );
-      const options = deviceList
-        .filter((item) => item.tbDeviceId === deviceRecord.deviceId)
-        .map((item) => ({ ...item, label: item.alias || item.name, value: item.tbDeviceId }));
-
-      const attKey = dataSource.map((item) => ({
-        ...item,
-        label: item.attribute,
-        value: item.attribute,
-      }));
-      updateSchema([
-        {
-          field: SchemaFiled.DEVICE_ID,
-          componentProps: {
-            options,
-          },
+  const loading = ref(false);
+  const getDesign = ref();
+
+  const getTwoMap = async (dataSource) => {
+    if (dataSource.length < 2) return;
+    dataSource = dataSource.splice(0, 2);
+    const deviceRecord = dataSource?.at(0) || ({} as DataSource);
+
+    if (!deviceRecord.organizationId) return;
+    const deviceList = await getAllDeviceByOrg(
+      deviceRecord.organizationId,
+      deviceRecord.deviceProfileId
+    );
+    const options = deviceList
+      .filter((item) => item.tbDeviceId === deviceRecord.deviceId)
+      .map((item) => ({ ...item, label: item.alias || item.name, value: item.tbDeviceId }));
+
+    const attKey = dataSource.map((item) => ({
+      ...item,
+      label: item.attribute,
+      value: item.attribute,
+    }));
+
+    updateSchemaMap(options, attKey, deviceRecord);
+  };
+
+  const getOneMap = async (dataSource) => {
+    const deviceRecord = dataSource?.[0];
+    if (!deviceRecord.organizationId) return;
+    const deviceList = await getAllDeviceByOrg(
+      deviceRecord.organizationId,
+      deviceRecord.deviceProfileId
+    );
+    const options = deviceList
+      .filter((item) => item.tbDeviceId === deviceRecord.deviceId)
+      .map((item) => ({ ...item, label: item.alias || item.name, value: item.tbDeviceId }));
+
+    const attKey = dataSource?.map((item) => ({
+      ...item,
+      label: item.attributeName,
+      value: item.attribute,
+    }));
+    updateSchemaMap(options, attKey, deviceRecord);
+  };
+
+  const updateSchemaMap = (options, attKey, deviceRecord) => {
+    updateSchema([
+      {
+        field: SchemaFiled.DEVICE_ID,
+        componentProps: {
+          options,
         },
         },
-        {
-          field: SchemaFiled.KEYS,
-          component: 'Select',
-          defaultValue: attKey.map((item) => item.value),
-          componentProps: {
-            options: attKey,
-            mode: 'multiple',
-            disabled: true,
-          },
+      },
+      {
+        field: SchemaFiled.KEYS,
+        component: 'Select',
+        defaultValue: attKey.map((item) => item.value),
+        componentProps: {
+          options: attKey,
+          mode: 'multiple',
+          disabled: true,
         },
         },
-      ]);
+      },
+    ]);
 
 
-      setFieldsValue({
-        [SchemaFiled.DEVICE_ID]: deviceRecord.deviceId,
-        [SchemaFiled.KEYS]: attKey.map((item) => item.value),
-      });
+    setFieldsValue({
+      [SchemaFiled.DEVICE_ID]: deviceRecord.deviceId,
+      [SchemaFiled.KEYS]: attKey.map((item) => item.value),
+    });
+  };
+
+  const [registerModal, { closeModal }] = useModalInner(async (dataSource: DataSource[]) => {
+    try {
+      getDesign.value = dataSource;
+      dataSource = cloneDeep(dataSource);
+      //判断选择是不是结构体
+      if (dataSource.length == 1 && dataSource?.[0]?.lal) {
+        getOneMap(dataSource);
+        return;
+      }
+      getTwoMap(dataSource);
     } catch (error) {
     } catch (error) {
       throw error;
       throw error;
     }
     }
   });
   });
 
 
+  const getMultipleDataSource = async (res) => {
+    let timespanList = Object.keys(res).reduce((prev, next) => {
+      const ts = res[next].map((item) => item.ts);
+      return [...prev, ...ts];
+    }, [] as number[]);
+    timespanList = [...new Set(timespanList)];
+
+    const track: Record<'lng' | 'lat', number>[] = [];
+    const keys = Object.keys(res);
+
+    for (const ts of timespanList) {
+      const list: { ts: number; value: number }[] = [];
+      for (const key of keys) {
+        const record = res[key].find((item) => ts === item.ts);
+        if (!validEffective(record?.value)) {
+          continue;
+        }
+        list.push(record as any);
+      }
+
+      if (list.length === 2 && list.every(Boolean)) {
+        const lng = list.at(0)?.value;
+        const lat = list.at(1)?.value;
+        if (lng && lat) track.push({ lng, lat });
+      }
+    }
+    return track;
+  };
+
+  // 单数据源选择结构体
+  const getSingleDataSource = async (res) => {
+    const [keys] = Object.keys(res);
+    const track: Record<'lng' | 'lat', number>[] = [];
+    const dataSource = res[keys]?.map((item) => {
+      return {
+        value: item.value ? JSON.parse(item.value) : {},
+      };
+    });
+    const list: { value: number }[] = [];
+    dataSource?.forEach((item) => {
+      if (
+        //判断结构体得值是不是数字
+        Object.values(item.value).every((item1) => {
+          return validEffective(item1 as any);
+        })
+      ) {
+        list.push(item.value);
+      }
+    });
+    const { latitude, longitude } = unref(getDesign)?.[0]; //获取选择的经纬度选项
+
+    list.forEach((item) => {
+      const lng = item[longitude];
+      const lat = item[latitude];
+      if (lng && lat) track.push({ lng, lat });
+    });
+    return track;
+  };
+
   const validEffective = (value = '') => {
   const validEffective = (value = '') => {
     return !!(value && !isNaN(value as unknown as number));
     return !!(value && !isNaN(value as unknown as number));
   };
   };
-  const loading = ref(false);
   const handleOk = async () => {
   const handleOk = async () => {
     try {
     try {
       await validate();
       await validate();
@@ -84,33 +180,9 @@
         ...value,
         ...value,
         [SchemaFiled.KEYS]: value[SchemaFiled.KEYS].join(','),
         [SchemaFiled.KEYS]: value[SchemaFiled.KEYS].join(','),
       });
       });
+      const ifSingle = unref(getDesign)?.length === 1 && unref(getDesign)?.[0]?.lal;
 
 
-      let timespanList = Object.keys(res).reduce((prev, next) => {
-        const ts = res[next].map((item) => item.ts);
-        return [...prev, ...ts];
-      }, [] as number[]);
-      timespanList = [...new Set(timespanList)];
-
-      const track: Record<'lng' | 'lat', number>[] = [];
-      const keys = Object.keys(res);
-
-      for (const ts of timespanList) {
-        const list: { ts: number; value: number }[] = [];
-        for (const key of keys) {
-          const record = res[key].find((item) => ts === item.ts);
-          if (!validEffective(record?.value)) {
-            continue;
-          }
-          list.push(record as any);
-        }
-
-        if (list.length === 2 && list.every(Boolean)) {
-          const lng = list.at(0)?.value;
-          const lat = list.at(1)?.value;
-          if (lng && lat) track.push({ lng, lat });
-        }
-      }
-
+      const track = ifSingle ? await getSingleDataSource(res) : await getMultipleDataSource(res);
       emit('ok', { track, value } as HistoryModalOkEmitParams);
       emit('ok', { track, value } as HistoryModalOkEmitParams);
       closeModal();
       closeModal();
     } catch (error) {
     } catch (error) {

@@ -24,6 +24,14 @@
     return props.config.option.dataSource?.at(0)?.deviceId;
     return props.config.option.dataSource?.at(0)?.deviceId;
   });
   });
 
 
+  const getDesign = computed(() => {
+    const { option } = props.config;
+    const { dataSource } = option || {};
+    return {
+      dataSource: dataSource,
+    };
+  });
+
   /**
   /**
    * @description 经度key
    * @description 经度key
    */
    */
@@ -42,7 +50,7 @@
     return !!(value && !isNaN(value as unknown as number));
     return !!(value && !isNaN(value as unknown as number));
   };
   };
 
 
-  const updateFn: MultipleDataFetchUpdateFn = (message, deviceId) => {
+  const getTwoMap = (message, deviceId) => {
     if (unref(getDeviceId) !== deviceId) return;
     if (unref(getDeviceId) !== deviceId) return;
 
 
     const { data = {} } = message;
     const { data = {} } = message;
@@ -51,7 +59,7 @@
 
 
     const lngData = bindMessage[unref(getLngKey)] || [];
     const lngData = bindMessage[unref(getLngKey)] || [];
     const [lngLatest] = lngData;
     const [lngLatest] = lngData;
-    const [, lng] = lngLatest;
+    const [, lng] = lngLatest || [];
 
 
     const latData = bindMessage[unref(getLatKey)] || [];
     const latData = bindMessage[unref(getLatKey)] || [];
     const [latLatest] = latData;
     const [latLatest] = latData;
@@ -62,6 +70,34 @@
     }
     }
   };
   };
 
 
+  const getOneMap = (message, deviceId) => {
+    if (unref(getDeviceId) !== deviceId) return;
+
+    const { longitude, latitude, attribute } = unref(getDesign)?.dataSource?.[0] || {};
+    const { data } = message || {};
+    const bindMessage = data[deviceId];
+    const [, values] = attribute && bindMessage?.[attribute][0];
+
+    const mapValues = values ? JSON.parse(values) : {};
+    const lng = longitude && mapValues[longitude];
+    const lat = latitude && mapValues[latitude];
+
+    if (validEffective(lng) && validEffective(lat)) {
+      drawLine({ lng: Number(lng), lat: Number(lat) });
+    }
+  };
+
+  const updateFn: MultipleDataFetchUpdateFn = (message, deviceId) => {
+    const { lal } = unref(getDesign)?.dataSource?.[0] || {};
+    // 属性选择结构体类型时
+    if (lal && unref(getDesign)?.dataSource?.length == 1) {
+      getOneMap(message, deviceId);
+      return;
+    }
+    // 选择两个属性时
+    getTwoMap(message, deviceId);
+  };
+
   useMultipleDataFetch(props, updateFn);
   useMultipleDataFetch(props, updateFn);
 
 
   const { drawLine } = useMapTrackPlayBack(mapInstance);
   const { drawLine } = useMapTrackPlayBack(mapInstance);
@@ -100,11 +136,3 @@
     <div v-show="!loading" ref="wrapRef" :id="wrapId" class="w-full h-full no-drag"> </div>
     <div v-show="!loading" ref="wrapRef" :id="wrapId" class="w-full h-full no-drag"> </div>
   </main>
   </main>
 </template>
 </template>
-
-<style lang="less" scoped>
-  // .map-spin-wrapper {
-  //   :deep(.ant-spin-container) {
-  //     @apply justify-center items-center p-2 w-full h-full;
-  //   }
-  // }
-</style>

@@ -247,7 +247,6 @@ export const commonDataSourceSchemas = (): FormSchema[] => {
             });
             });
           },
           },
           placeholder: '请选择设备',
           placeholder: '请选择设备',
-          getPopupContainer: () => document.body,
           ...createPickerSearch(),
           ...createPickerSearch(),
         };
         };
       },
       },
@@ -382,11 +381,18 @@ export const commonDataSourceSchemas = (): FormSchema[] => {
             return [];
             return [];
           },
           },
           placeholder: '请选择属性',
           placeholder: '请选择属性',
-          getPopupContainer: () => document.body,
           onChange(value: string, option: Record<'label' | 'value' | any, string>) {
           onChange(value: string, option: Record<'label' | 'value' | any, string>) {
+            const { detail }: any = option || {};
             setFieldsValue({
             setFieldsValue({
               [DataSourceField.ATTRIBUTE_NAME]: value ? option.label : null,
               [DataSourceField.ATTRIBUTE_NAME]: value ? option.label : null,
               [DataSourceField.EXTENSION_DESC]: value ? JSON.stringify(option.extensionDesc) : '',
               [DataSourceField.EXTENSION_DESC]: value ? JSON.stringify(option.extensionDesc) : '',
+              // 地图组件结构体
+              lal:
+                category === 'MAP' && value && detail?.dataType.type === 'STRUCT'
+                  ? JSON.stringify(detail?.dataType.specs)
+                  : null,
+              latitude: null,
+              longitude: null,
             });
             });
           },
           },
           ...createPickerSearch(),
           ...createPickerSearch(),
@@ -394,6 +400,46 @@ export const commonDataSourceSchemas = (): FormSchema[] => {
       },
       },
     },
     },
     {
     {
+      field: 'lal',
+      label: '经纬度存储的值',
+      component: 'Input',
+      show: false,
+    },
+    {
+      field: 'longitude',
+      label: '经度',
+      colProps: { span: 8 },
+      component: 'Select',
+      required: true,
+      ifShow: ({ model }) => category === 'MAP' && model.lal,
+      componentProps({ formModel }) {
+        const { lal } = formModel || {};
+        return {
+          placeholder: '请选择经度',
+          options: lal
+            ? JSON.parse(lal)?.map((item) => ({ label: item.functionName, value: item.identifier }))
+            : [],
+        };
+      },
+    },
+    {
+      field: 'latitude',
+      label: '纬度',
+      colProps: { span: 8 },
+      required: true,
+      component: 'Select',
+      ifShow: ({ model }) => category === 'MAP' && model.lal,
+      componentProps({ formModel }) {
+        const { lal } = formModel || {};
+        return {
+          placeholder: '请选择纬度',
+          options: lal
+            ? JSON.parse(lal)?.map((item) => ({ label: item.functionName, value: item.identifier }))
+            : [],
+        };
+      },
+    },
+    {
       field: DataSourceField.EXTENSION_DESC,
       field: DataSourceField.EXTENSION_DESC,
       component: 'Input',
       component: 'Input',
       show: false,
       show: false,

-import { ReceiveTsSubCmdsGroupMessageType } from '../index.type';
+import { ReceiveTsSubCmdsGroupMessageType } from './socket/useSocket.type';
 
 
 export const useReceiveMessage = () => {
 export const useReceiveMessage = () => {
   const forEachGroupMessage = (
   const forEachGroupMessage = (

-import cloneDeep from 'lodash-es/cloneDeep';
-import { ComponentConfig } from '.';
-import {
-  ConfigType,
-  CreateComponentType,
-  PublicComponentOptions,
-  PublicPresetOptions,
-} from '/@/views/visual/packages/index.type';
-import { PublicConfigClass, componentInitConfig } from '/@/views/visual/packages/publicConfig';
-import { ComponentConfigFieldEnum } from '/@/views/visual/packages/enum';
-
-export const option: PublicPresetOptions = {
-  [ComponentConfigFieldEnum.FONT_COLOR]: '#',
-  [ComponentConfigFieldEnum.SHOW_DEVICE_NAME]: false,
-};
-
-export default class Config extends PublicConfigClass implements CreateComponentType {
-  public key: string = ComponentConfig.key;
-
-  public attr = { ...componentInitConfig };
-
-  public componentConfig: ConfigType = cloneDeep(ComponentConfig);
-
-  public persetOption = cloneDeep(option);
-
-  public option: PublicComponentOptions;
-
-  constructor(option: PublicComponentOptions) {
-    super();
-    this.option = { ...option };
-  }
-}

-<script lang="ts" setup>
-  import { ComponentConfigFieldEnum } from '/@/views/visual/packages/enum';
-  import { useForm, BasicForm } from '/@/components/Form';
-  import { PublicFormInstaceType } from '/@/views/visual/dataSourceBindPanel/index.type';
-
-  const [register, { getFieldsValue, setFieldsValue, resetFields }] = useForm({
-    schemas: [
-      {
-        field: ComponentConfigFieldEnum.FONT_COLOR,
-        label: '数值字体颜色',
-        component: 'ColorPicker',
-        changeEvent: 'update:value',
-        componentProps: {
-          defaultValue: '#FD7347',
-        },
-      },
-      {
-        field: ComponentConfigFieldEnum.SHOW_DEVICE_NAME,
-        label: '显示设备名称',
-        component: 'Checkbox',
-      },
-    ],
-    showActionButtonGroup: false,
-    labelWidth: 120,
-    baseColProps: {
-      span: 12,
-    },
-  });
-
-  const getFormValues = () => {
-    return getFieldsValue();
-  };
-
-  const setFormValues = (data: Recordable) => {
-    return setFieldsValue(data);
-  };
-
-  defineExpose({
-    getFormValues,
-    setFormValues,
-    resetFormValues: resetFields,
-  } as PublicFormInstaceType);
-</script>
-
-<template>
-  <BasicForm @register="register" />
-</template>

-<script lang="ts" setup>
-  import { CreateComponentType } from '/@/views/visual/packages/index.type';
-  import { BasicForm, useForm } from '/@/components/Form';
-  import {
-    PublicComponentValueType,
-    PublicFormInstaceType,
-  } from '/@/views/visual/dataSourceBindPanel/index.type';
-  import { commonDataSourceSchemas } from '../config/common.config';
-
-  defineProps<{
-    values: PublicComponentValueType;
-    componentConfig: CreateComponentType;
-  }>();
-
-  const [register, { getFieldsValue, setFieldsValue, validate, resetFields }] = useForm({
-    labelWidth: 0,
-    showActionButtonGroup: false,
-    layout: 'horizontal',
-    labelCol: { span: 0 },
-    schemas: commonDataSourceSchemas(),
-  });
-
-  const getFormValues = () => {
-    return getFieldsValue();
-  };
-
-  const setFormValues = (record: Recordable) => {
-    return setFieldsValue(record);
-  };
-
-  defineExpose({
-    getFormValues,
-    setFormValues,
-    validate,
-    resetFormValues: resetFields,
-  } as PublicFormInstaceType);
-</script>
-
-<template>
-  <BasicForm @register="register" />
-</template>

-import { useComponentKeys } from '/@/views/visual/packages/hook/useComponentKeys';
-import { ConfigType, PackagesCategoryEnum } from '/@/views/visual/packages/index.type';
-
-const componentKeys = useComponentKeys('componentKeys');
-
-export const ComponentConfig: ConfigType = {
-  ...componentKeys,
-  title: '组件名',
-  package: PackagesCategoryEnum.TEXT,
-};

-<script lang="ts" setup>
-  import { ComponentPropsConfigType } from '/@/views/visual/packages/index.type';
-  import { option } from './config';
-  import { useDataFetch } from '../hook/socket/useSocket';
-  import { DataFetchUpdateFn } from '../hook/socket/useSocket.type';
-
-  const props = defineProps<{
-    config: ComponentPropsConfigType<typeof option>;
-  }>();
-
-  const updateFn: DataFetchUpdateFn = (_message) => {};
-
-  useDataFetch(props, updateFn);
-</script>
-
-<template>
-  <main class="w-full h-full flex flex-col justify-center items-center"> </main>
-</template>

@@ -150,7 +150,6 @@
     getIsSharePage,
     getIsSharePage,
     (value) => {
     (value) => {
       if (value) {
       if (value) {
-        console.log(unref(getDarkMode));
         const root = document.querySelector('#app');
         const root = document.querySelector('#app');
         (root as HTMLDivElement).style.backgroundColor =
         (root as HTMLDivElement).style.backgroundColor =
           unref(getDarkMode) === ThemeEnum.LIGHT ? '#F5F5F5' : '#1b1b1b';
           unref(getDarkMode) === ThemeEnum.LIGHT ? '#F5F5F5' : '#1b1b1b';

@@ -29,6 +29,9 @@ export interface DataSource {
   customCommand: CustomCommand;
   customCommand: CustomCommand;
   videoConfig?: VideoConfigType;
   videoConfig?: VideoConfigType;
   [key: string]: any;
   [key: string]: any;
+  lal?: string;
+  latitude?: string | number;
+  longitude?: string | number;
 }
 }
 
 
 export interface ExtraDataSource extends DataSource, PublicComponentOptions {
 export interface ExtraDataSource extends DataSource, PublicComponentOptions {

@@ -32,7 +32,6 @@ app.ws.use(
         });
         });
         ctx.websocket.send(data);
         ctx.websocket.send(data);
       }
       }
-      console.log(message);
     });
     });
   })
   })
 );
 );
@@ -59,5 +58,6 @@ app.use(router.allowedMethods());
 app.use(koaStatic(path.join(__dirname)));
 app.use(koaStatic(path.join(__dirname)));
 
 
 app.listen(PORT, () => {
 app.listen(PORT, () => {
+  // eslint-disable-next-line no-console
   console.log(`Application started successfully: http://localhost:${PORT}`);
   console.log(`Application started successfully: http://localhost:${PORT}`);
 });
 });