Merge branch 'sqy_dev' into 'main'

wip：联调设备，fix:修复eslint警告，表单加自定义验证，重写oem省市联动，fix:修改bug

See merge request huang/yun-teng-iot-front!32

 import { defHttp } from '/@/utils/http/axios';
 import { defHttp } from '/@/utils/http/axios';
 
 
+// 获取设备配置
 export const getDeviceProfile = () => {
 export const getDeviceProfile = () => {
   return defHttp.get({
   return defHttp.get({
-    url: '/deviceProfile/me',
+    url: '/deviceProfile/me/list',
   });
   });
 };
 };

@@ -3,14 +3,12 @@ import { FileUploadResponse } from './model/index';
 enum API {
 enum API {
   SELECT_DETAIL = '/enterprise/get',
   SELECT_DETAIL = '/enterprise/get',
   UPDATE_DETAIL = '/enterprise/update',
   UPDATE_DETAIL = '/enterprise/update',
-  TOWN_LIST = '/town/list',
-  TOWN_CHILDS = '/town/childs',
   BaseUploadUrl = '/oss/upload',
   BaseUploadUrl = '/oss/upload',
   SELECT_PLATFORM = '/platform/get',
   SELECT_PLATFORM = '/platform/get',
   UPDATE_PLATFORM = '/platform/update',
   UPDATE_PLATFORM = '/platform/update',
-
   SELECT_APP_DESIGN = '/appDesign/get',
   SELECT_APP_DESIGN = '/appDesign/get',
   UPDATE_APP_DESIGN = '/appDesign/update',
   UPDATE_APP_DESIGN = '/appDesign/update',
+  SELECT_AREALIST = '/area/areaList',
 }
 }
 
 
 // 查询企业信息
 // 查询企业信息
@@ -28,21 +26,12 @@ export const updateEnterPriseDetail = (data) => {
   });
   });
 };
 };
 
 
-// 获取所有省份
-export const getTownList = () => {
-  return defHttp.get({
-    url: API.TOWN_LIST,
-  });
-};
+// 获取地区
 
 
-// 获取省份下面的地址
-export const getTownChild = (key, value) => {
-  return defHttp.get({
-    url: API.TOWN_CHILDS + `/${key}/${value}`,
-    params: {
-      variable: key,
-      value,
-    },
+export const getAreaList = (data) => {
+  return defHttp.post({
+    url: API.SELECT_AREALIST,
+    data,
   });
   });
 };
 };
 
 

@@ -24,10 +24,10 @@ export const getMenuList = () => {
 };
 };
 
 
 export const delMenu = (menuIds: string[]) => {
 export const delMenu = (menuIds: string[]) => {
-  let url = Api.BaseMenuUrl;
+  const url = Api.BaseMenuUrl;
   return defHttp.delete({ url: url, data: menuIds });
   return defHttp.delete({ url: url, data: menuIds });
 };
 };
 export const getMenusIdsByRoleId = (roleId: string) => {
 export const getMenusIdsByRoleId = (roleId: string) => {
-  let url = Api.GetMenuIdsByRoleId + roleId;
+  const url = Api.GetMenuIdsByRoleId + roleId;
   return defHttp.get<Array<string>>({ url: url });
   return defHttp.get<Array<string>>({ url: url });
 };
 };

@@ -32,7 +32,6 @@ export function loginApi(params: LoginParams, mode: ErrorMessageMode = 'modal')
     },
     },
     {
     {
       errorMessageMode: mode,
       errorMessageMode: mode,
-      joinPrefix: false,
     }
     }
   );
   );
 }
 }

@@ -11,7 +11,7 @@ enum Api {
  */
  */
 export function saveMenuApi(
 export function saveMenuApi(
   params: MenuOperationParams,
   params: MenuOperationParams,
-  update: boolean = false,
+  update = false,
   mode: ErrorMessageMode = 'modal'
   mode: ErrorMessageMode = 'modal'
 ) {
 ) {
   console.log(params);
   console.log(params);

@@ -56,16 +56,11 @@
 </template>
 </template>
 <script lang="ts">
 <script lang="ts">
   import { defineComponent, unref, computed } from 'vue';
   import { defineComponent, unref, computed } from 'vue';
-
   import { propTypes } from '/@/utils/propTypes';
   import { propTypes } from '/@/utils/propTypes';
-
   import { Layout } from 'ant-design-vue';
   import { Layout } from 'ant-design-vue';
   import { AppLogo } from '/@/components/Application';
   import { AppLogo } from '/@/components/Application';
   import LayoutMenu from '../menu/index.vue';
   import LayoutMenu from '../menu/index.vue';
   import LayoutTrigger from '../trigger/index.vue';
   import LayoutTrigger from '../trigger/index.vue';
-
-  import { AppSearch } from '/@/components/Application';
-
   import { useHeaderSetting } from '/@/hooks/setting/useHeaderSetting';
   import { useHeaderSetting } from '/@/hooks/setting/useHeaderSetting';
   import { useMenuSetting } from '/@/hooks/setting/useMenuSetting';
   import { useMenuSetting } from '/@/hooks/setting/useMenuSetting';
   import { useRootSetting } from '/@/hooks/setting/useRootSetting';
   import { useRootSetting } from '/@/hooks/setting/useRootSetting';
@@ -93,7 +88,6 @@
       AppLocalePicker,
       AppLocalePicker,
       FullScreen,
       FullScreen,
       Notify,
       Notify,
-      AppSearch,
       ErrorAction,
       ErrorAction,
       SettingDrawer: createAsyncComponent(() => import('/@/layouts/default/setting/index.vue'), {
       SettingDrawer: createAsyncComponent(() => import('/@/layouts/default/setting/index.vue'), {
         loading: true,
         loading: true,

@@ -35,3 +35,10 @@ export const copyTransTreeFun = (arr: any[]) => {
     }
     }
   });
   });
 };
 };
+
+// 百度地图url
+export const register_BAI_DU_MAP_URL = (ak: string) => {
+  return `https://api.map.baidu.com/getscript?v=3.0&ak=${ak}`;
+};
+
+export const BAI_DU_MAP_URL = register_BAI_DU_MAP_URL('7uOPPyAHn2Y2ZryeQqHtcRqtIY374vKa');

@@ -16,7 +16,7 @@ import { useErrorLogStoreWithOut } from '/@/store/modules/errorLog';
 import { useI18n } from '/@/hooks/web/useI18n';
 import { useI18n } from '/@/hooks/web/useI18n';
 import { joinTimestamp, formatRequestDate } from './helper';
 import { joinTimestamp, formatRequestDate } from './helper';
 // import { PageEnum } from '/@/enums/pageEnum';
 // import { PageEnum } from '/@/enums/pageEnum';
-import { JWT_TOKEN_KEY, REFRESH_TOKEN_KEY, PROJ_CFG_KEY } from '/@/enums/cacheEnum';
+import { REFRESH_TOKEN_KEY } from '/@/enums/cacheEnum';
 import { router } from '/@/router';
 import { router } from '/@/router';
 // import { useUserStore } from '/@/store/modules/user';
 // import { useUserStore } from '/@/store/modules/user';
 // const userStore = useUserStore();
 // const userStore = useUserStore();

+import { Rule } from 'ant-design-vue/lib/form/interface';
+/**
+ * 常用表单自定义验证规则
+ *
+ */
+
+// 手机号验证
+export const phoneRule: Rule[] = [
+  {
+    required: true,
+    validator: (_, value: string) => {
+      const reg = /^[1][3,4,5,6,7,8,9][0-9]{9}$/;
+      if (value === '') {
+        return Promise.reject('请输入手机号码');
+      } else if (!reg.test(value)) {
+        return Promise.reject('手机号格式不正确');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+
+// 电子邮箱验证
+export const emailRule: Rule[] = [
+  {
+    validator: (_, value: string) => {
+      const reg = /^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.[a-zA-Z0-9]{2,6}$/;
+      if (value === '') {
+        return Promise.resolve();
+      } else if (!reg.test(value)) {
+        return Promise.reject('电子邮箱格式不正确');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];

@@ -42,20 +42,24 @@ export const formSchema: FormSchema[] = [
     componentProps: {
     componentProps: {
       size: 'small',
       size: 'small',
       options: [
       options: [
+        { label: '全部', value: 'ALL' },
         { label: '待激活', value: 'INACTIVE' },
         { label: '待激活', value: 'INACTIVE' },
         { label: '在线', value: 'ONLINE' },
         { label: '在线', value: 'ONLINE' },
         { label: '离线', value: 'OFFLINE' },
         { label: '离线', value: 'OFFLINE' },
-        { label: '报警', value: 'hhh' },
       ],
       ],
     },
     },
   },
   },
   {
   {
     field: 'alarmStatus',
     field: 'alarmStatus',
-    label: '',
+    label: '是否报警',
     component: 'RadioGroup',
     component: 'RadioGroup',
+    labelWidth: '85px',
     componentProps: {
     componentProps: {
       size: 'small',
       size: 'small',
-      options: [{ label: '是否报警', value: '' }],
+      options: [
+        { label: '是', value: '1' },
+        { label: '否', value: '2' },
+      ],
     },
     },
   },
   },
 ];
 ];

@@ -2,7 +2,7 @@
   <div class="wrapper">
   <div class="wrapper">
     <div ref="wrapRef" :style="{ height, width }"> </div>
     <div ref="wrapRef" :style="{ height, width }"> </div>
     <div class="right-wrap">
     <div class="right-wrap">
-      <BasicTable @register="registerTable">
+      <BasicTable @register="registerTable" @rowClick="deviceRowClick">
         <template #deviceState="{ record }">
         <template #deviceState="{ record }">
           <Tag
           <Tag
             :color="
             :color="
@@ -35,6 +35,7 @@
   import { devicePage } from '/@/api/alarm/contact/alarmContact';
   import { devicePage } from '/@/api/alarm/contact/alarmContact';
   import { Tag } from 'ant-design-vue';
   import { Tag } from 'ant-design-vue';
   import { DeviceState } from '/@/api/device/model/deviceModel';
   import { DeviceState } from '/@/api/device/model/deviceModel';
+  import { BAI_DU_MAP_URL } from '/@/utils/fnUtils';
   export default defineComponent({
   export default defineComponent({
     name: 'BaiduMap',
     name: 'BaiduMap',
     components: {
     components: {
@@ -52,8 +53,6 @@
       },
       },
     },
     },
     setup() {
     setup() {
-      const BAI_DU_MAP_URL =
-        'https://api.map.baidu.com/getscript?v=3.0&ak=7uOPPyAHn2Y2ZryeQqHtcRqtIY374vKa';
       const wrapRef = ref<HTMLDivElement | null>(null);
       const wrapRef = ref<HTMLDivElement | null>(null);
       const { toPromise } = useScript({ src: BAI_DU_MAP_URL });
       const { toPromise } = useScript({ src: BAI_DU_MAP_URL });
 
 
@@ -72,23 +71,25 @@
         initMap();
         initMap();
       });
       });
 
 
-      const [registerTable, { reload }] = useTable({
+      const [registerTable] = useTable({
         api: devicePage,
         api: devicePage,
         columns,
         columns,
         formConfig: {
         formConfig: {
-          labelWidth: 120,
           schemas: formSchema,
           schemas: formSchema,
+          labelAlign: 'left',
         },
         },
         showIndexColumn: false,
         showIndexColumn: false,
         useSearchForm: true,
         useSearchForm: true,
       });
       });
-      const handleSuccess = () => {
-        reload();
+      // 点击表格某一行触发
+      const deviceRowClick = (record) => {
+        console.log(record);
       };
       };
+
       return {
       return {
         wrapRef,
         wrapRef,
         registerTable,
         registerTable,
-        handleSuccess,
+        deviceRowClick,
         DeviceState,
         DeviceState,
       };
       };
     },
     },

 import { BasicColumn, FormSchema } from '/@/components/Table';
 import { BasicColumn, FormSchema } from '/@/components/Table';
 import { getOrganizationList } from '/@/api/system/system';
 import { getOrganizationList } from '/@/api/system/system';
 import { copyTransFun } from '/@/utils/fnUtils';
 import { copyTransFun } from '/@/utils/fnUtils';
+import { emailRule, phoneRule } from '/@/utils/rules';
 
 
 // 表格列数据
 // 表格列数据
 export const columns: BasicColumn[] = [
 export const columns: BasicColumn[] = [
@@ -90,21 +91,7 @@ export const formSchema: FormSchema[] = [
     componentProps: {
     componentProps: {
       placeholder: '请输入手机号码',
       placeholder: '请输入手机号码',
     },
     },
-    rules: [
-      {
-        required: true,
-        validator: (_, value: string) => {
-          const reg = /^[1][3,4,5,6,7,8,9][0-9]{9}$/;
-          if (value === '') {
-            return Promise.reject('请输入手机号码');
-          } else if (!reg.test(value)) {
-            return Promise.reject('请输入正确的手机号码');
-          }
-          return Promise.resolve();
-        },
-        trigger: 'blur',
-      },
-    ],
+    rules: phoneRule,
   },
   },
   {
   {
     field: 'email',
     field: 'email',
@@ -113,20 +100,7 @@ export const formSchema: FormSchema[] = [
     componentProps: {
     componentProps: {
       placeholder: '请输入电子邮箱',
       placeholder: '请输入电子邮箱',
     },
     },
-    rules: [
-      {
-        validator: (_, value: string) => {
-          const reg = /^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.[a-zA-Z0-9]{2,6}$/;
-          if (value === '') {
-            return Promise.resolve();
-          } else if (!reg.test(value)) {
-            return Promise.reject('请输入正确的电子邮箱');
-          }
-          return Promise.resolve();
-        },
-        trigger: 'blur',
-      },
-    ],
+    rules: emailRule,
   },
   },
   {
   {
     field: 'wechat',
     field: 'wechat',

@@ -125,6 +125,7 @@
           try {
           try {
             await deleteAlarmContact(selectedRowIds.value);
             await deleteAlarmContact(selectedRowIds.value);
             createMessage.success('批量删除联系人成功');
             createMessage.success('批量删除联系人成功');
+            selectedRowIds.value = [];
             handleSuccess();
             handleSuccess();
           } catch (e) {
           } catch (e) {
             createMessage.info('删除失败');
             createMessage.info('删除失败');

@@ -58,7 +58,7 @@ export const searchFormSchema: FormSchema[] = [
         { label: '网关子设备', value: DeviceTypeEnum.SENSOR },
         { label: '网关子设备', value: DeviceTypeEnum.SENSOR },
       ],
       ],
     },
     },
-    colProps: { span: 4 },
+    colProps: { span: 6 },
   },
   },
   {
   {
     field: 'deviceState',
     field: 'deviceState',
@@ -71,12 +71,12 @@ export const searchFormSchema: FormSchema[] = [
         { label: '离线', value: DeviceState.OFFLINE },
         { label: '离线', value: DeviceState.OFFLINE },
       ],
       ],
     },
     },
-    colProps: { span: 4 },
+    colProps: { span: 6 },
   },
   },
   {
   {
     field: 'name',
     field: 'name',
     label: '设备名称',
     label: '设备名称',
     component: 'Input',
     component: 'Input',
-    colProps: { span: 8 },
+    colProps: { span: 6 },
   },
   },
 ];
 ];

@@ -5,6 +5,7 @@
     @register="register"
     @register="register"
     :destroyOnClose="true"
     :destroyOnClose="true"
     @close="closeDrawer"
     @close="closeDrawer"
+    :title="deviceDetail.name"
   >
   >
     <Tabs v-model:activeKey="activeKey" :size="size" type="card">
     <Tabs v-model:activeKey="activeKey" :size="size" type="card">
       <TabPane key="1" tab="详情"
       <TabPane key="1" tab="详情"
@@ -41,6 +42,7 @@
       Alarm,
       Alarm,
       ChildDevice,
       ChildDevice,
     },
     },
+
     emits: ['reload', 'register'],
     emits: ['reload', 'register'],
     setup() {
     setup() {
       const activeKey = ref('1');
       const activeKey = ref('1');
@@ -52,10 +54,11 @@
         const { id } = data;
         const { id } = data;
         const res = await getDeviceDetail(id);
         const res = await getDeviceDetail(id);
         deviceDetail.value = res;
         deviceDetail.value = res;
-        // const { latitude, longitude, address } = data.record.deviceInfo;
-        // deviceDetailRef.value.initMap(longitude, latitude, address);
+        const { latitude, longitude, address } = res.deviceInfo;
+        if (latitude) {
+          deviceDetailRef.value.initMap(longitude, latitude, address);
+        }
       });
       });
-
       const closeDrawer = () => {
       const closeDrawer = () => {
         activeKey.value = '1';
         activeKey.value = '1';
       };
       };

@@ -70,6 +70,7 @@
             profile: data.record.deviceProfile.name,
             profile: data.record.deviceProfile.name,
             remark: data.record.deviceInfo.description,
             remark: data.record.deviceInfo.description,
             profileId: data.record.profileId,
             profileId: data.record.profileId,
+            deviceType: data.record.deviceType,
           });
           });
           deviceInfo.value = data.record.deviceInfo;
           deviceInfo.value = data.record.deviceInfo;
         } else {
         } else {

@@ -64,6 +64,7 @@
   import { EnvironmentTwoTone, PlusOutlined } from '@ant-design/icons-vue';
   import { EnvironmentTwoTone, PlusOutlined } from '@ant-design/icons-vue';
   import { upload } from '/@/api/oss/ossFileUploader';
   import { upload } from '/@/api/oss/ossFileUploader';
   import { FileItem } from '/@/components/Upload/src/typing';
   import { FileItem } from '/@/components/Upload/src/typing';
+  import { BAI_DU_MAP_URL } from '/@/utils/fnUtils';
   export default defineComponent({
   export default defineComponent({
     components: {
     components: {
       BasicForm,
       BasicForm,
@@ -160,8 +161,6 @@
       };
       };
 
 
       // 地图
       // 地图
-      const BAI_DU_MAP_URL =
-        'https://api.map.baidu.com/getscript?v=3.0&ak=7uOPPyAHn2Y2ZryeQqHtcRqtIY374vKa';
       const wrapRef = ref<HTMLDivElement | null>(null);
       const wrapRef = ref<HTMLDivElement | null>(null);
       const { toPromise } = useScript({ src: BAI_DU_MAP_URL });
       const { toPromise } = useScript({ src: BAI_DU_MAP_URL });
 
 

@@ -2,15 +2,22 @@
   <div class="tabs-detail">
   <div class="tabs-detail">
     <div v-if="deviceDetail?.deviceInfo?.avatar">
     <div v-if="deviceDetail?.deviceInfo?.avatar">
       <p>设备图片</p>
       <p>设备图片</p>
-      <Image :src="deviceDetail?.deviceInfo?.avatar" />
+      <Image :src="deviceDetail.deviceInfo.avatar" :width="100" />
     </div>
     </div>
     <div>
     <div>
       <p>设备信息</p>
       <p>设备信息</p>
-      <Table bordered :columns="columns" :data-source="[deviceDetail]" :pagination="false" />
+      <Table
+        bordered
+        :columns="columns"
+        :data-source="[deviceDetail]"
+        :pagination="false"
+        rowKey="tbDeviceId"
+        style="width: 800px"
+      />
     </div>
     </div>
-    <div v-if="deviceDetail?.deviceInfo?.address">
+    <div v-if="deviceDetail?.deviceInfo?.address" class="mt-4">
       <p>设备位置</p>
       <p>设备位置</p>
-      <div ref="wrapRef" style="height: 400px; width: 90%" class="ml-6"></div>
+      <div ref="wrapRef" style="height: 400px; width: 90%"></div>
     </div>
     </div>
     <div class="mt-4">
     <div class="mt-4">
       <a-button type="primary" class="mr-4" @click="copyTbDeviceId">复制设备ID</a-button>
       <a-button type="primary" class="mr-4" @click="copyTbDeviceId">复制设备ID</a-button>
@@ -25,6 +32,7 @@
   import { useScript } from '/@/hooks/web/useScript';
   import { useScript } from '/@/hooks/web/useScript';
   import { useCopyToClipboard } from '/@/hooks/web/useCopyToClipboard';
   import { useCopyToClipboard } from '/@/hooks/web/useCopyToClipboard';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
+  import { BAI_DU_MAP_URL } from '/@/utils/fnUtils';
   export default defineComponent({
   export default defineComponent({
     components: {
     components: {
       Image,
       Image,
@@ -38,8 +46,6 @@
     },
     },
     setup(props) {
     setup(props) {
       // 地图
       // 地图
-      const BAI_DU_MAP_URL =
-        'https://api.map.baidu.com/getscript?v=3.0&ak=7uOPPyAHn2Y2ZryeQqHtcRqtIY374vKa';
       const wrapRef = ref<HTMLDivElement | null>(null);
       const wrapRef = ref<HTMLDivElement | null>(null);
       const { toPromise } = useScript({ src: BAI_DU_MAP_URL });
       const { toPromise } = useScript({ src: BAI_DU_MAP_URL });
 
 

@@ -64,7 +64,7 @@
     props: {
     props: {
       userData: { type: Object },
       userData: { type: Object },
     },
     },
-    emits: ['success'],
+    emits: ['success', 'register'],
     setup(_, { emit }) {
     setup(_, { emit }) {
       const { createMessage } = useMessage();
       const { createMessage } = useMessage();
       const getStepData = ref(null);
       const getStepData = ref(null);

@@ -8,9 +8,9 @@
       <template #toolbar>
       <template #toolbar>
         <a-button type="primary" @click="handleCreate"> 新增设备配置 </a-button>
         <a-button type="primary" @click="handleCreate"> 新增设备配置 </a-button>
         <ImpExcel @success="loadDataSuccess" dateFormat="YYYY-MM-DD">
         <ImpExcel @success="loadDataSuccess" dateFormat="YYYY-MM-DD">
-          <a-button type="info" @click="handleImport"> 导入设备配置 </a-button>
+          <a-button @click="handleImport"> 导入设备配置 </a-button>
         </ImpExcel>
         </ImpExcel>
-        <a-button type="danger" @click="handleTableDel"> 删除 </a-button>
+        <a-button danger color="error" @click="handleTableDel"> 删除 </a-button>
       </template>
       </template>
       <template #action="{ record }">
       <template #action="{ record }">
         <TableAction
         <TableAction
@@ -58,18 +58,11 @@
   import DeviceProfileModal from '/@/views/device/profile/DeviceProfileModal.vue';
   import DeviceProfileModal from '/@/views/device/profile/DeviceProfileModal.vue';
   import DeviceConfigDetail from '/@/views/device/profile/deviceConfigDetail.vue';
   import DeviceConfigDetail from '/@/views/device/profile/deviceConfigDetail.vue';
   import { ImpExcel, ExcelData } from '/@/components/Excel';
   import { ImpExcel, ExcelData } from '/@/components/Excel';
-  import { jsonToSheetXlsx, ExpExcelModal, ExportModalResult } from '/@/components/Excel';
+  import { jsonToSheetXlsx, ExportModalResult } from '/@/components/Excel';
 
 
   export default defineComponent({
   export default defineComponent({
     name: 'DeviceProfileManagement',
     name: 'DeviceProfileManagement',
-    components: {
-      BasicTable,
-      DeviceProfileModal,
-      TableAction,
-      ImpExcel,
-      DeviceConfigDetail,
-      ExpExcelModal,
-    },
+    components: { BasicTable, DeviceProfileModal, TableAction, ImpExcel, DeviceConfigDetail },
     setup() {
     setup() {
       let selectedRowKeys: string[] = reactive([]);
       let selectedRowKeys: string[] = reactive([]);
       let isJudgeStatus = ref(true);
       let isJudgeStatus = ref(true);

@@ -30,18 +30,16 @@
 </template>
 </template>
 <script lang="ts">
 <script lang="ts">
   import { defineComponent } from 'vue';
   import { defineComponent } from 'vue';
-
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
-  import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
+  import { useDrawerInner } from '/@/components/Drawer';
   import { columns, searchFormSchema } from './email.data';
   import { columns, searchFormSchema } from './email.data';
-  import { Tag } from 'ant-design-vue';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { deleteSmsLog, mailLogPage } from '/@/api/message/records';
   import { deleteSmsLog, mailLogPage } from '/@/api/message/records';
   import { useModal } from '/@/components/Modal';
   import { useModal } from '/@/components/Modal';
   import EmailDetail from '/@/views/message/records/item/EmailDetail.vue';
   import EmailDetail from '/@/views/message/records/item/EmailDetail.vue';
   export default defineComponent({
   export default defineComponent({
     name: 'EmailLog',
     name: 'EmailLog',
-    components: { EmailDetail, BasicDrawer, BasicTable, TableAction, Tag },
+    components: { EmailDetail, BasicTable, TableAction },
     setup() {
     setup() {
       const [registerModal, { openModal }] = useModal();
       const [registerModal, { openModal }] = useModal();
       const { createMessage } = useMessage();
       const { createMessage } = useMessage();

@@ -31,16 +31,16 @@
   import { defineComponent, h } from 'vue';
   import { defineComponent, h } from 'vue';
 
 
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
-  import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
+  import { useDrawerInner } from '/@/components/Drawer';
   import { columns, searchFormSchema } from './sms.data';
   import { columns, searchFormSchema } from './sms.data';
-  import { Modal, Tag } from 'ant-design-vue';
+  import { Modal } from 'ant-design-vue';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { smsLogPage, deleteSmsLog } from '/@/api/message/records';
   import { smsLogPage, deleteSmsLog } from '/@/api/message/records';
   import { JsonPreview } from '/@/components/CodeEditor';
   import { JsonPreview } from '/@/components/CodeEditor';
 
 
   export default defineComponent({
   export default defineComponent({
     name: 'SmsLog',
     name: 'SmsLog',
-    components: { BasicDrawer, BasicTable, TableAction, Tag },
+    components: { BasicTable, TableAction },
     setup() {
     setup() {
       const { createMessage } = useMessage();
       const { createMessage } = useMessage();
       const [register] = useDrawerInner(() => {});
       const [register] = useDrawerInner(() => {});

@@ -23,8 +23,8 @@ export const columns: BasicColumn[] = [
       const status = record.status;
       const status = record.status;
       const success = status === 'SUCCESS';
       const success = status === 'SUCCESS';
       const color = success ? 'green' : 'red';
       const color = success ? 'green' : 'red';
-      let successText: string = t('routes.common.system.tableSuccessStatus');
-      let failedText: string = t('routes.common.system.tableFailedStatus');
+      const successText: string = t('routes.common.system.tableSuccessStatus');
+      const failedText: string = t('routes.common.system.tableFailedStatus');
       const text = success ? successText : failedText;
       const text = success ? successText : failedText;
       return h(Tag, { color: color }, () => text);
       return h(Tag, { color: color }, () => text);
     },
     },

@@ -28,8 +28,8 @@ export const columns: BasicColumn[] = [
       const status = record.status;
       const status = record.status;
       const success = status === 'SUCCESS';
       const success = status === 'SUCCESS';
       const color = success ? 'green' : 'red';
       const color = success ? 'green' : 'red';
-      let successText: string = t('routes.common.system.tableSuccessStatus');
-      let failedText: string = t('routes.common.system.tableFailedStatus');
+      const successText: string = t('routes.common.system.tableSuccessStatus');
+      const failedText: string = t('routes.common.system.tableFailedStatus');
       const text = success ? successText : failedText;
       const text = success ? successText : failedText;
       return h(Tag, { color: color }, () => text);
       return h(Tag, { color: color }, () => text);
     },
     },

@@ -11,6 +11,7 @@
   import { BasicForm, FormSchema, useForm } from '/@/components/Form/index';
   import { BasicForm, FormSchema, useForm } from '/@/components/Form/index';
   import { sendSms } from '/@/api/message/template';
   import { sendSms } from '/@/api/message/template';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
+  import { phoneRule } from '/@/utils/rules';
   const schemas: FormSchema[] = [
   const schemas: FormSchema[] = [
     {
     {
       field: 'id',
       field: 'id',
@@ -34,7 +35,7 @@
       field: 'phoneNumbers',
       field: 'phoneNumbers',
       component: 'Input',
       component: 'Input',
       label: '手机号码',
       label: '手机号码',
-      required: true,
+      rules: phoneRule,
     },
     },
     {
     {
       field: 'params',
       field: 'params',

@@ -47,10 +47,8 @@
   import { useDrawer } from '/@/components/Drawer';
   import { useDrawer } from '/@/components/Drawer';
   import TemplateDrawer from './TemplateDrawer.vue';
   import TemplateDrawer from './TemplateDrawer.vue';
   import { columns, searchFormSchema } from './template.data';
   import { columns, searchFormSchema } from './template.data';
-  import { CodeEditor } from '/@/components/CodeEditor';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { deleteMessageTemplate, messageTemplatePage } from '/@/api/message/template';
   import { deleteMessageTemplate, messageTemplatePage } from '/@/api/message/template';
-  import { Tag } from 'ant-design-vue';
   import { useGo } from '/@/hooks/web/usePage';
   import { useGo } from '/@/hooks/web/usePage';
   import { PageEnum } from '/@/enums/pageEnum';
   import { PageEnum } from '/@/enums/pageEnum';
   import { useModal } from '/@/components/Modal';
   import { useModal } from '/@/components/Modal';
@@ -60,7 +58,7 @@
 
 
   export default defineComponent({
   export default defineComponent({
     name: 'MessageTemplateManagement',
     name: 'MessageTemplateManagement',
-    components: { SendSms, SendEmail, BasicTable, TemplateDrawer, TableAction, CodeEditor, Tag },
+    components: { SendSms, SendEmail, BasicTable, TemplateDrawer, TableAction },
     setup() {
     setup() {
       const [registerModal, { openModal: openModal }] = useModal();
       const [registerModal, { openModal: openModal }] = useModal();
       const [registerMailModal, { openModal: openMailModal }] = useModal();
       const [registerMailModal, { openModal: openMailModal }] = useModal();

@@ -47,7 +47,7 @@
   import { screenLinkPageGetApi, screenLinkPageDeleteApi } from '/@/api/ruleengine/ruleengineApi';
   import { screenLinkPageGetApi, screenLinkPageDeleteApi } from '/@/api/ruleengine/ruleengineApi';
 
 
   export default defineComponent({
   export default defineComponent({
-    name: 'index',
+    name: 'Index',
     components: { BasicTable, SceneLinkAgeDrawer, TableAction },
     components: { BasicTable, SceneLinkAgeDrawer, TableAction },
     setup() {
     setup() {
       let selectedRowKeys: Array<string> = [];
       let selectedRowKeys: Array<string> = [];

@@ -31,7 +31,7 @@
   import { notifyMyGetrPageApi } from '/@/api/stationnotification/stationnotifyApi';
   import { notifyMyGetrPageApi } from '/@/api/stationnotification/stationnotifyApi';
 
 
   export default defineComponent({
   export default defineComponent({
-    name: 'index',
+    name: 'Index',
     components: { BasicTable, NotifyDetailDrawer, TableAction },
     components: { BasicTable, NotifyDetailDrawer, TableAction },
     setup() {
     setup() {
       let selectedRowKeys: Array<string> = [];
       let selectedRowKeys: Array<string> = [];

@@ -63,8 +63,6 @@
   import RegisterForm from './RegisterForm.vue';
   import RegisterForm from './RegisterForm.vue';
   import MobileForm from './MobileForm.vue';
   import MobileForm from './MobileForm.vue';
   import QrCodeForm from './QrCodeForm.vue';
   import QrCodeForm from './QrCodeForm.vue';
-  import { useGlobSetting } from '/@/hooks/setting';
-  import { useI18n } from '/@/hooks/web/useI18n';
   import { useDesign } from '/@/hooks/web/useDesign';
   import { useDesign } from '/@/hooks/web/useDesign';
   import { useLocaleStore } from '/@/store/modules/locale';
   import { useLocaleStore } from '/@/store/modules/locale';
   import { useUserStore } from '/@/store/modules/user';
   import { useUserStore } from '/@/store/modules/user';
@@ -75,12 +73,9 @@
     },
     },
   });
   });
 
 
-  const globSetting = useGlobSetting();
   const { prefixCls } = useDesign('login');
   const { prefixCls } = useDesign('login');
-  const { t } = useI18n();
   const localeStore = useLocaleStore();
   const localeStore = useLocaleStore();
   const showLocale = localeStore.getShowPicker;
   const showLocale = localeStore.getShowPicker;
-  const title = computed(() => globSetting?.title ?? '');
   const isDark = ref(true);
   const isDark = ref(true);
   const toggleDark = () => {
   const toggleDark = () => {
     isDark.value = !isDark.value;
     isDark.value = !isDark.value;

@@ -38,10 +38,10 @@
   import LoginFormTitle from './LoginFormTitle.vue';
   import LoginFormTitle from './LoginFormTitle.vue';
   import { useI18n } from '/@/hooks/web/useI18n';
   import { useI18n } from '/@/hooks/web/useI18n';
   import { useLoginState, useFormRules, useFormValid, LoginStateEnum } from './useLogin';
   import { useLoginState, useFormRules, useFormValid, LoginStateEnum } from './useLogin';
-  import { SendLoginSmsCode, smsCodeLoginApi } from '/@/api/sys/user';
+  import { SendLoginSmsCode } from '/@/api/sys/user';
   import { useUserStore } from '/@/store/modules/user';
   import { useUserStore } from '/@/store/modules/user';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
-  const { notification, createErrorModal } = useMessage();
+  const { notification } = useMessage();
 
 
   const FormItem = Form.Item;
   const FormItem = Form.Item;
   const { t } = useI18n();
   const { t } = useI18n();

 import { getAllRoleList, isAccountExist } from '/@/api/system/system';
 import { getAllRoleList, isAccountExist } from '/@/api/system/system';
 import { BasicColumn } from '/@/components/Table';
 import { BasicColumn } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
+import { emailRule, phoneRule } from '/@/utils/rules';
 
 
 export const columns: BasicColumn[] = [
 export const columns: BasicColumn[] = [
   {
   {
@@ -133,42 +134,14 @@ export const accountFormSchema: FormSchema[] = [
     field: 'phoneNumber',
     field: 'phoneNumber',
     component: 'Input',
     component: 'Input',
     colProps: { span: 12 },
     colProps: { span: 12 },
-    rules: [
-      {
-        required: true,
-        validator: (_, value: string) => {
-          const reg = /^[1][3,4,5,6,7,8,9][0-9]{9}$/;
-          if (value === '') {
-            return Promise.reject('请输入手机号码');
-          } else if (!reg.test(value)) {
-            return Promise.reject('手机号码不正确');
-          }
-          return Promise.resolve();
-        },
-        trigger: 'blur',
-      },
-    ],
+    rules: phoneRule,
   },
   },
   {
   {
     label: '邮箱',
     label: '邮箱',
     field: 'email',
     field: 'email',
     component: 'Input',
     component: 'Input',
     colProps: { span: 12 },
     colProps: { span: 12 },
-    rules: [
-      {
-        required: true,
-        validator: (_, value: string) => {
-          const reg = /^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.[a-zA-Z0-9]{2,6}$/;
-          if (value === '') {
-            return Promise.resolve();
-          } else if (!reg.test(value)) {
-            return Promise.reject('电子邮箱格式不正确');
-          }
-          return Promise.resolve();
-        },
-        trigger: 'blur',
-      },
-    ],
+    rules: emailRule,
   },
   },
   {
   {
     field: 'accountExpireTime',
     field: 'accountExpireTime',

@@ -12,7 +12,7 @@
   </div>
   </div>
 </template>
 </template>
 <script lang="ts">
 <script lang="ts">
-  import { defineComponent, ref } from 'vue';
+  import { defineComponent } from 'vue';
   import { PageWrapper } from '/@/components/Page';
   import { PageWrapper } from '/@/components/Page';
   import { BasicForm, useForm } from '/@/components/Form';
   import { BasicForm, useForm } from '/@/components/Form';
   import { USER_INFO_KEY } from '/@/enums/cacheEnum';
   import { USER_INFO_KEY } from '/@/enums/cacheEnum';

@@ -23,6 +23,7 @@
       BasicDrawer,
       BasicDrawer,
       BasicForm,
       BasicForm,
     },
     },
+    emits: ['success'],
     setup(_, { emit }) {
     setup(_, { emit }) {
       const isUpdate = ref(true);
       const isUpdate = ref(true);
       const tenantId = ref('');
       const tenantId = ref('');

@@ -19,8 +19,7 @@
         >
         >
           <img v-if="tenantLogo" :src="tenantLogo" alt="avatar" />
           <img v-if="tenantLogo" :src="tenantLogo" alt="avatar" />
           <div v-else>
           <div v-else>
-            <loading-outlined v-if="loading"></loading-outlined>
-            <plus-outlined v-else></plus-outlined>
+            <plus-outlined />
             <div class="ant-upload-text">上传</div>
             <div class="ant-upload-text">上传</div>
           </div>
           </div>
         </Upload>
         </Upload>
@@ -32,9 +31,7 @@
   import { defineComponent, ref, computed, unref } from 'vue';
   import { defineComponent, ref, computed, unref } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
-  import { CollapseContainer } from '/@/components/Container';
-  import { CropperImage, CropperAvatar } from '/@/components/Cropper';
-  import { PlusOutlined, LoadingOutlined } from '@ant-design/icons-vue';
+  import { PlusOutlined } from '@ant-design/icons-vue';
   import { message, Upload } from 'ant-design-vue';
   import { message, Upload } from 'ant-design-vue';
 
 
   import { useI18n } from '/@/hooks/web/useI18n';
   import { useI18n } from '/@/hooks/web/useI18n';
@@ -48,12 +45,8 @@
     components: {
     components: {
       BasicDrawer,
       BasicDrawer,
       BasicForm,
       BasicForm,
-      CropperImage,
-      CollapseContainer,
-      CropperAvatar,
       Upload,
       Upload,
       PlusOutlined,
       PlusOutlined,
-      LoadingOutlined,
     },
     },
     emits: ['success', 'register'],
     emits: ['success', 'register'],
     setup(_, { emit }) {
     setup(_, { emit }) {

 import type { FormSchema } from '/@/components/Form/index';
 import type { FormSchema } from '/@/components/Form/index';
-import { getTownList, getTownChild } from '/@/api/oem/index';
+import { getAreaList } from '/@/api/oem/index';
+import { emailRule, phoneRule } from '/@/utils/rules';
 
 
 export const schemas: FormSchema[] = [
 export const schemas: FormSchema[] = [
   {
   {
@@ -42,10 +43,10 @@ export const schemas: FormSchema[] = [
     colProps: {
     colProps: {
       span: 24,
       span: 24,
     },
     },
-
     componentProps: {
     componentProps: {
       placeholder: '请输入公司邮箱',
       placeholder: '请输入公司邮箱',
     },
     },
+    rules: emailRule,
   },
   },
   {
   {
     field: 'synopsis',
     field: 'synopsis',
@@ -63,20 +64,17 @@ export const schemas: FormSchema[] = [
   },
   },
   {
   {
     field: 'country',
     field: 'country',
-    component: 'Select',
+    component: 'ApiSelect',
     label: '国家/地区',
     label: '国家/地区',
     colProps: {
     colProps: {
       span: 24,
       span: 24,
     },
     },
-    defaultValue: '1',
     componentProps: {
     componentProps: {
+      api: getAreaList,
+      params: { parentId: 0 },
+      labelField: 'name',
+      valueField: 'parentId',
       placeholder: '请选择国家/地区',
       placeholder: '请选择国家/地区',
-      options: [
-        {
-          label: '中国',
-          value: '1',
-        },
-      ],
     },
     },
   },
   },
   {
   {
@@ -86,99 +84,115 @@ export const schemas: FormSchema[] = [
     colProps: {
     colProps: {
       span: 5,
       span: 5,
     },
     },
-    componentProps: ({ formModel, formActionType }) => {
+    componentProps({ formModel, formActionType }) {
+      const { updateSchema } = formActionType;
       return {
       return {
-        api: getTownList,
-        labelField: 'nameProv',
-        valueField: 'codeProv',
+        api: getAreaList,
+        labelField: 'name',
+        valueField: 'code',
         placeholder: '请选择省份',
         placeholder: '请选择省份',
+        params: { parentId: 1 },
         async onChange(value) {
         async onChange(value) {
-          let nameCity = await getTownChild('codeProv', value);
-          nameCity.forEach((item) => {
-            item.label = item.nameCity;
-            item.value = item.codeCity;
-          });
-          const { updateSchema } = formActionType;
           if (value === undefined) {
           if (value === undefined) {
             formModel.nameCity = undefined; //  reset city value
             formModel.nameCity = undefined; //  reset city value
             formModel.nameCoun = undefined;
             formModel.nameCoun = undefined;
             formModel.nameTown = undefined;
             formModel.nameTown = undefined;
-            nameCity = [];
-            updateSchema({
-              field: 'nameCoun',
-              componentProps: {
-                options: [],
+            updateSchema([
+              {
+                field: 'nameCity',
+                componentProps: {
+                  options: [],
+                },
               },
               },
+              {
+                field: 'nameCoun',
+                componentProps: {
+                  options: [],
+                },
+              },
+              {
+                field: 'nameTown',
+                componentProps: {
+                  options: [],
+                },
+              },
+            ]);
+          } else {
+            const nameCity = await getAreaList({ parentId: value });
+            nameCity.forEach((item) => {
+              item.label = item.name;
+              item.value = item.code;
             });
             });
+            formModel.nameCity = undefined; //  reset city value
+            formModel.nameCoun = undefined;
+            formModel.nameTown = undefined;
             updateSchema({
             updateSchema({
-              field: 'nameTown',
+              field: 'nameCity',
               componentProps: {
               componentProps: {
-                options: [],
-              },
-            });
-          }
-          formModel.nameCity = undefined; //  reset city value
-          formModel.nameCoun = undefined;
-          formModel.nameTown = undefined;
-          updateSchema({
-            field: 'nameCity',
-            componentProps: () => {
-              return {
                 options: nameCity,
                 options: nameCity,
                 placeholder: '请选择城市',
                 placeholder: '请选择城市',
                 async onChange(value) {
                 async onChange(value) {
-                  // 获取区数据
-                  let nameCoun = await getTownChild('codeCity', value);
-                  nameCoun.forEach((item) => {
-                    item.label = item.nameCoun;
-                    item.value = item.codeCoun;
-                  });
                   if (value === undefined) {
                   if (value === undefined) {
                     formModel.nameCoun = undefined; //  reset city value
                     formModel.nameCoun = undefined; //  reset city value
                     formModel.nameTown = undefined;
                     formModel.nameTown = undefined;
-                    nameCoun = [];
+                    updateSchema([
+                      {
+                        field: 'nameCoun',
+                        componentProps: {
+                          options: [],
+                        },
+                      },
+                      {
+                        field: 'nameTown',
+                        componentProps: {
+                          options: [],
+                        },
+                      },
+                    ]);
+                  } else {
+                    // 获取区数据
+                    const nameCoun = await getAreaList({ parentId: value });
+                    nameCoun.forEach((item) => {
+                      item.label = item.name;
+                      item.value = item.code;
+                    });
                     updateSchema({
                     updateSchema({
-                      field: 'nameTown',
+                      field: 'nameCoun',
                       componentProps: {
                       componentProps: {
-                        options: [],
+                        // 请选择区
+                        options: nameCoun,
+                        async onChange(value) {
+                          if (value === undefined) {
+                            formModel.nameTown = undefined;
+                            updateSchema({
+                              field: 'nameTown',
+                              componentProps: {
+                                placeholder: '请选择街道/城镇',
+                                options: [],
+                              },
+                            });
+                          } else {
+                            const nameTown = await getAreaList({ parentId: value });
+                            nameTown.forEach((item) => {
+                              item.label = item.name;
+                              item.value = item.code;
+                            });
+                            updateSchema({
+                              field: 'nameTown',
+                              componentProps: {
+                                placeholder: '请选择街道/城镇',
+                                options: nameTown,
+                              },
+                            });
+                          }
+                        },
                       },
                       },
                     });
                     });
                   }
                   }
-                  updateSchema({
-                    field: 'nameCoun',
-                    componentProps: {
-                      // 请选择区
-                      options: nameCoun,
-                      async onChange(value) {
-                        const nameTown = await getTownChild('codeCoun', value);
-                        nameTown.forEach((item) => {
-                          item.label = item.nameTown;
-                          item.value = item.codeTown;
-                        });
-                        if (value === undefined) {
-                          formModel.nameTown = undefined;
-                          updateSchema({
-                            field: 'nameTown',
-                            componentProps: {
-                              placeholder: '请选择街道/城镇',
-                              options: [],
-                            },
-                          });
-                        }
-                        updateSchema({
-                          field: 'nameTown',
-                          componentProps: {
-                            placeholder: '请选择街道/城镇',
-                            options: nameTown,
-                          },
-                        });
-                      },
-                    },
-                  });
                 },
                 },
-              };
-            },
-          });
+              },
+            });
+          }
         },
         },
       };
       };
     },
     },
@@ -255,20 +269,7 @@ export const schemas: FormSchema[] = [
     componentProps: {
     componentProps: {
       placeholder: '请输入联系电话',
       placeholder: '请输入联系电话',
     },
     },
-    rules: [
-      {
-        validator: (_, value: string) => {
-          const reg = /^[1][3,4,5,6,7,8,9][0-9]{9}$/;
-          if (value === '') {
-            return Promise.resolve();
-          } else if (!reg.test(value)) {
-            return Promise.reject('请输入正确的手机号码');
-          }
-          return Promise.resolve();
-        },
-        trigger: 'blur',
-      },
-    ],
+    rules: phoneRule,
   },
   },
   {
   {
     field: 'qrcode',
     field: 'qrcode',

@@ -46,7 +46,6 @@
   import { getEnterPriseDetail, updateEnterPriseDetail } from '/@/api/oem/index';
   import { getEnterPriseDetail, updateEnterPriseDetail } from '/@/api/oem/index';
   import { Loading } from '/@/components/Loading';
   import { Loading } from '/@/components/Loading';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
-  import { getTownChild } from '/@/api/oem/index';
   import { useUserStore } from '/@/store/modules/user';
   import { useUserStore } from '/@/store/modules/user';
   import { createLocalStorage } from '/@/utils/cache';
   import { createLocalStorage } from '/@/utils/cache';
   import { PlusOutlined } from '@ant-design/icons-vue';
   import { PlusOutlined } from '@ant-design/icons-vue';
@@ -132,135 +131,135 @@
         storage.set('enterpriseInfo', newFieldValue);
         storage.set('enterpriseInfo', newFieldValue);
       }
       }
 
 
-      // 地区显示回显和数据联动
-      async function updateCityData(
-        codeProv: string,
-        codeCity: string,
-        codeCoun: string,
-        codeTown: string
-      ) {
-        const nameCity = await getTownChild('codeProv', codeProv);
-        const nameCoun = await getTownChild('codeCity', codeCity);
-        const nameTown = await getTownChild('codeCoun', codeCoun);
-        nameCity.forEach((item) => {
-          item.label = item.nameCity;
-          item.value = item.codeCity;
-        });
-        nameCoun.forEach((item) => {
-          item.label = item.nameCoun;
-          item.value = item.codeCoun;
-        });
-        nameTown.forEach((item) => {
-          item.label = item.nameTown;
-          item.value = item.codeTown;
-        });
-        setFieldsValue({
-          nameProv: codeProv,
-          nameCity: codeCity,
-          nameCoun: codeCoun,
-          nameTown: codeTown,
-        });
-        updateSchema({
-          field: 'nameTown',
-          componentProps: {
-            options: nameTown,
-          },
-        });
-        updateSchema({
-          field: 'nameCoun',
-          componentProps: {
-            options: nameCoun,
-            async onChange(value) {
-              if (value === undefined) {
-                setFieldsValue({
-                  nameTown: undefined,
-                });
-                updateSchema({
-                  field: 'nameTown',
-                  componentProps: {
-                    options: [],
-                  },
-                });
-              }
-              let nameTown = await getTownChild('codeCoun', value);
-              nameTown.forEach((item) => {
-                item.label = item.nameTown;
-                item.value = item.codeTown;
-              });
-              setFieldsValue({
-                nameTown: undefined,
-              });
-              updateSchema({
-                field: 'nameTown',
-                componentProps: {
-                  placeholder: '请选择街道/城镇',
-                  options: nameTown,
-                },
-              });
-            },
-          },
-        });
-        updateSchema({
-          field: 'nameCity',
-          componentProps: ({ formModel }) => {
-            return {
-              options: nameCity,
-              onChange: async (value) => {
-                let nameCoun = await getTownChild('codeCity', value);
-                if (value === undefined) {
-                  formModel.nameCoun = undefined; //  reset city value
-                  formModel.nameTown = undefined;
-                  nameCoun = [];
-                  updateSchema({
-                    field: 'nameTown',
-                    componentProps: {
-                      options: [],
-                    },
-                  });
-                }
-                nameCoun.forEach((item) => {
-                  item.label = item.nameCoun;
-                  item.value = item.codeCoun;
-                });
-                formModel.nameCoun = undefined; //  reset city value
-                formModel.nameTown = undefined;
-                updateSchema({
-                  field: 'nameCoun',
-                  componentProps: {
-                    // 请选择区
-                    options: nameCoun,
-                    async onChange(value) {
-                      let nameTown = await getTownChild('codeCoun', value);
-                      if (value === undefined) {
-                        formModel.nameTown = undefined;
-                        nameTown = [];
-                      }
-                      nameTown.forEach((item) => {
-                        item.label = item.nameTown;
-                        item.value = item.codeTown;
-                      });
+      // // 地区显示回显和数据联动
+      // async function updateCityData(
+      //   codeProv: string,
+      //   codeCity: string,
+      //   codeCoun: string,
+      //   codeTown: string
+      // ) {
+      //   const nameCity = await getTownChild('codeProv', codeProv);
+      //   const nameCoun = await getTownChild('codeCity', codeCity);
+      //   const nameTown = await getTownChild('codeCoun', codeCoun);
+      //   nameCity.forEach((item) => {
+      //     item.label = item.nameCity;
+      //     item.value = item.codeCity;
+      //   });
+      //   nameCoun.forEach((item) => {
+      //     item.label = item.nameCoun;
+      //     item.value = item.codeCoun;
+      //   });
+      //   nameTown.forEach((item) => {
+      //     item.label = item.nameTown;
+      //     item.value = item.codeTown;
+      //   });
+      //   setFieldsValue({
+      //     nameProv: codeProv,
+      //     nameCity: codeCity,
+      //     nameCoun: codeCoun,
+      //     nameTown: codeTown,
+      //   });
+      //   updateSchema({
+      //     field: 'nameTown',
+      //     componentProps: {
+      //       options: nameTown,
+      //     },
+      //   });
+      //   updateSchema({
+      //     field: 'nameCoun',
+      //     componentProps: {
+      //       options: nameCoun,
+      //       async onChange(value) {
+      //         if (value === undefined) {
+      //           setFieldsValue({
+      //             nameTown: undefined,
+      //           });
+      //           updateSchema({
+      //             field: 'nameTown',
+      //             componentProps: {
+      //               options: [],
+      //             },
+      //           });
+      //         }
+      //         let nameTown = await getTownChild('codeCoun', value);
+      //         nameTown.forEach((item) => {
+      //           item.label = item.nameTown;
+      //           item.value = item.codeTown;
+      //         });
+      //         setFieldsValue({
+      //           nameTown: undefined,
+      //         });
+      //         updateSchema({
+      //           field: 'nameTown',
+      //           componentProps: {
+      //             placeholder: '请选择街道/城镇',
+      //             options: nameTown,
+      //           },
+      //         });
+      //       },
+      //     },
+      //   });
+      //   updateSchema({
+      //     field: 'nameCity',
+      //     componentProps: ({ formModel }) => {
+      //       return {
+      //         options: nameCity,
+      //         onChange: async (value) => {
+      //           let nameCoun = await getTownChild('codeCity', value);
+      //           if (value === undefined) {
+      //             formModel.nameCoun = undefined; //  reset city value
+      //             formModel.nameTown = undefined;
+      //             nameCoun = [];
+      //             updateSchema({
+      //               field: 'nameTown',
+      //               componentProps: {
+      //                 options: [],
+      //               },
+      //             });
+      //           }
+      //           nameCoun.forEach((item) => {
+      //             item.label = item.nameCoun;
+      //             item.value = item.codeCoun;
+      //           });
+      //           formModel.nameCoun = undefined; //  reset city value
+      //           formModel.nameTown = undefined;
+      //           updateSchema({
+      //             field: 'nameCoun',
+      //             componentProps: {
+      //               // 请选择区
+      //               options: nameCoun,
+      //               async onChange(value) {
+      //                 let nameTown = await getTownChild('codeCoun', value);
+      //                 if (value === undefined) {
+      //                   formModel.nameTown = undefined;
+      //                   nameTown = [];
+      //                 }
+      //                 nameTown.forEach((item) => {
+      //                   item.label = item.nameTown;
+      //                   item.value = item.codeTown;
+      //                 });
 
 
-                      formModel.nameTown = undefined;
-                      updateSchema({
-                        field: 'nameTown',
-                        componentProps: {
-                          placeholder: '请选择街道/城镇',
-                          options: nameTown,
-                        },
-                      });
-                    },
-                  },
-                });
-              },
-            };
-          },
-        });
-      }
+      //                 formModel.nameTown = undefined;
+      //                 updateSchema({
+      //                   field: 'nameTown',
+      //                   componentProps: {
+      //                     placeholder: '请选择街道/城镇',
+      //                     options: nameTown,
+      //                   },
+      //                 });
+      //               },
+      //             },
+      //           });
+      //         },
+      //       };
+      //     },
+      //   });
+      // }
 
 
       onMounted(async () => {
       onMounted(async () => {
         const res = await getEnterPriseDetail();
         const res = await getEnterPriseDetail();
-        const { codeProv, codeCity, codeCoun, codeTown } = res.sysTown;
-        updateCityData(codeProv, codeCity, codeCoun, codeTown);
+        // const { codeProv, codeCity, codeCoun, codeTown } = res;
+        // updateCityData(codeProv, codeCity, codeCoun, codeTown);
         setFieldsValue(res);
         setFieldsValue(res);
         qrcodePic.value = res.qrCode;
         qrcodePic.value = res.qrCode;
       });
       });

@@ -10,7 +10,7 @@
   import { CollapseContainer } from '/@/components/Container/index';
   import { CollapseContainer } from '/@/components/Container/index';
 
 
   export default defineComponent({
   export default defineComponent({
-    name: 'index',
+    name: 'Index',
     components: { BasicForm, CollapseContainer },
     components: { BasicForm, CollapseContainer },
     emits: ['success', 'register', 'funcResetFields'],
     emits: ['success', 'register', 'funcResetFields'],
     setup() {
     setup() {

@@ -47,7 +47,7 @@
   import { getTableTenantProfileApi } from '/@/api/tenant/tenantApi';
   import { getTableTenantProfileApi } from '/@/api/tenant/tenantApi';
 
 
   export default defineComponent({
   export default defineComponent({
-    name: 'index',
+    name: 'Index',
     components: { BasicTable, TenantSettingDrawer, TableAction },
     components: { BasicTable, TenantSettingDrawer, TableAction },
     setup() {
     setup() {
       // let selectedRowKeys: Array<string> = [];
       // let selectedRowKeys: Array<string> = [];