feat:新增设备配置，已调通新增和详情和分页，待调通删除

@@ -86,3 +86,10 @@ export const getDeviceToken = () => {
     url: '/common',
   });
 };
+
+// 查询设备详情
+export const getDeviceDetail = (id: string) => {
+  return defHttp.get({
+    url: DeviceManagerApi.DEVICE_URL + `/${id}`,
+  });
+};

@@ -81,9 +81,9 @@ export const setMessageTemplateStatus = (
   defHttp.put<MessageConfigResultModel>({
     url: MessageTemplateApi.TEMPLATE_URL,
     data: {
-      id: id,
-      status: status,
-      templatePurpose: templatePurpose,
-      messageType: messageType,
+      id,
+      status,
+      templatePurpose,
+      messageType,
     },
   });

@@ -10,5 +10,5 @@ enum GroupApi {
  */
 export const findCurrentUserGroups = () =>
   defHttp.get<GroupListResultModel>({
-    url: GroupApi.BASE_URL + '/me/organizations',
+    url: GroupApi.BASE_URL + '/me/list',
   });

+// 全局按需注册组件
 import type { App } from 'vue';
-// import { Icon } from './Icon';
 import { Button } from './Button';
 import {
   // Need

+// 将后端返回的字段转换成树组件的ApiSelectTree的对应字段
 export const copyTransFun = (arr: any[]) => {
   arr.forEach((item) => {
     if (item.name) {
@@ -15,3 +16,22 @@ export const copyTransFun = (arr: any[]) => {
     }
   });
 };
+
+// 将后端返回的字段转换成树组件的Tree的对应字段
+export const copyTransTreeFun = (arr: any[]) => {
+  arr.forEach((item) => {
+    if (item.name) {
+      item.title = item.name;
+      delete item.name;
+    }
+    if (item.id) {
+      item.key = item.id;
+      delete item.id;
+    }
+    if (item.children) {
+      if (item.children.length) {
+        copyTransTreeFun(item.children);
+      }
+    }
+  });
+};

@@ -46,8 +46,8 @@
 
       async function handleSubmit() {
         try {
-          const values = await validate();
           const { createMessage } = useMessage();
+          const values = await validate();
           setDrawerProps({ confirmLoading: true });
           let saveMessage = '添加成功';
           let updateMessage = '修改成功';

@@ -34,11 +34,7 @@ export const columns: BasicColumn[] = [
     dataIndex: 'remark',
     width: 120,
   },
-  {
-    title: '添加人',
-    dataIndex: 'addPeople',
-    width: 180,
-  },
+
   {
     title: '添加时间',
     dataIndex: 'createTime',
@@ -90,19 +86,47 @@ export const formSchema: FormSchema[] = [
   {
     field: 'phone',
     label: '手机号码',
-    required: true,
     component: 'Input',
     componentProps: {
       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',
+      },
+    ],
   },
   {
     field: 'email',
-    label: '邮箱',
+    label: '电子邮箱',
     component: 'Input',
     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',
+      },
+    ],
   },
   {
     field: 'wechat',
@@ -113,14 +137,6 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
-    field: 'addPeople',
-    label: '添加人',
-    component: 'Input',
-    componentProps: {
-      placeholder: '请输入添加人',
-    },
-  },
-  {
     field: 'remark',
     label: '备注',
     component: 'InputTextArea',

 <template>
-  <PageWrapper dense contentFullHeight fixedHeight contentClass="flex">
-    <OrganizationIdTree class="w-1/4 xl:w-1/5" @select="handleSelect" />
-    <BasicTable @register="registerTable" :searchInfo="searchInfo" class="w-3/4 xl:w-4/5">
-      <template #toolbar>
-        <a-button type="primary" @click="handleCreateOrEdit(null)"> 新增联系人 </a-button>
-        <a-button
-          type="primary"
-          color="error"
-          @click="handleDeleteOrBatchDelete(null)"
-          :disabled="hasBatchDelete"
-        >
-          批量删除
-        </a-button>
-      </template>
-      <template #action="{ record }">
-        <TableAction
-          :actions="[
-            {
-              label: '编辑',
-              icon: 'clarity:note-edit-line',
-              onClick: handleCreateOrEdit.bind(null, record),
-            },
-            {
-              label: '删除',
-              icon: 'ant-design:delete-outlined',
-              color: 'error',
-              popConfirm: {
-                title: '是否确认删除',
-                confirm: handleDeleteOrBatchDelete.bind(null, record),
+  <div>
+    <PageWrapper dense contentFullHeight fixedHeight contentClass="flex">
+      <OrganizationIdTree class="w-1/4 xl:w-1/5" @select="handleSelect" />
+      <BasicTable @register="registerTable" :searchInfo="searchInfo" class="w-3/4 xl:w-4/5">
+        <template #toolbar>
+          <a-button type="primary" @click="handleCreateOrEdit(null)"> 新增联系人 </a-button>
+          <a-button
+            type="primary"
+            color="error"
+            @click="handleDeleteOrBatchDelete(null)"
+            :disabled="hasBatchDelete"
+          >
+            批量删除
+          </a-button>
+        </template>
+        <template #action="{ record }">
+          <TableAction
+            :actions="[
+              {
+                label: '编辑',
+                icon: 'clarity:note-edit-line',
+                onClick: handleCreateOrEdit.bind(null, record),
               },
-            },
-          ]"
-        />
-      </template>
-    </BasicTable>
-  </PageWrapper>
-  <ContactDrawer @register="registerDrawer" @success="handleSuccess" />
+              {
+                label: '删除',
+                icon: 'ant-design:delete-outlined',
+                color: 'error',
+                popConfirm: {
+                  title: '是否确认删除',
+                  confirm: handleDeleteOrBatchDelete.bind(null, record),
+                },
+              },
+            ]"
+          />
+        </template>
+      </BasicTable>
+    </PageWrapper>
+    <ContactDrawer @register="registerDrawer" @success="handleSuccess" />
+  </div>
 </template>
 
 <script lang="ts">
@@ -97,7 +99,7 @@
         reload();
       };
       // 新增或编辑
-      const handleCreateOrEdit = (record: Recordable) => {
+      const handleCreateOrEdit = (record: Recordable | null) => {
         if (record) {
           openDrawer(true, {
             isUpdate: true,

@@ -95,4 +95,10 @@ export const step1Schemas: FormSchema[] = [
     component: 'Input',
     show: false,
   },
+  {
+    field: 'tbDeviceId',
+    label: 'tbDeviceId',
+    component: 'Input',
+    show: false,
+  },
 ];

 <template>
-  <!-- <BasicModal v-bind="$attrs" width="55rem" @register="register" centered /> -->
   <BasicDrawer
     v-bind="$attrs"
     isDetail
-    :title="deviceInfo?.name"
     @register="register"
     :destroyOnClose="true"
     @close="closeDrawer"
   >
     <Tabs v-model:activeKey="activeKey" :size="size" type="card">
       <TabPane key="1" tab="详情"
-        ><Detail :deviceDetail="deviceInfo" ref="deviceDetailRef"
+        ><Detail ref="deviceDetailRef" :deviceDetail="deviceDetail"
+      /></TabPane>
+      <TabPane key="2" tab="实时数据" v-if="deviceDetail?.deviceType !== 'GATEWAY'"
+        ><RealTimeData
       /></TabPane>
-      <TabPane key="2" tab="实时数据"><RealTimeData /></TabPane>
       <TabPane key="3" tab="告警"><Alarm /></TabPane>
-      <TabPane key="4" tab="子设备"><ChildDevice /></TabPane>
+      <TabPane key="4" tab="子设备" v-if="deviceDetail?.deviceType === 'SENSOR'"
+        ><ChildDevice
+      /></TabPane>
     </Tabs>
   </BasicDrawer>
 </template>
@@ -27,6 +29,7 @@
   import RealTimeData from '../tabs/RealTimeData.vue';
   import Alarm from '../tabs/Alarm.vue';
   import ChildDevice from '../tabs/ChildDevice.vue';
+  import { getDeviceDetail } from '/@/api/device/deviceManager';
   export default defineComponent({
     name: 'DeviceModal',
     components: {
@@ -42,13 +45,15 @@
     setup() {
       const activeKey = ref('1');
       const size = ref('small');
-      const deviceInfo = ref({});
       const deviceDetailRef = ref();
+      const deviceDetail = ref({});
       // 详情回显
-      const [register] = useDrawerInner((data) => {
-        deviceInfo.value = data.record;
-        const { latitude, longitude, address } = data.record.deviceInfo;
-        deviceDetailRef.value.initMap(longitude, latitude, address);
+      const [register] = useDrawerInner(async (data) => {
+        const { id } = data;
+        const res = await getDeviceDetail(id);
+        deviceDetail.value = res;
+        // const { latitude, longitude, address } = data.record.deviceInfo;
+        // deviceDetailRef.value.initMap(longitude, latitude, address);
       });
 
       const closeDrawer = () => {
@@ -58,9 +63,9 @@
       return {
         size,
         activeKey,
-        deviceInfo,
         register,
         closeDrawer,
+        deviceDetail,
         deviceDetailRef,
       };
     },

@@ -9,10 +9,10 @@
     centered
   >
     <div class="step-form-form">
-      <a-steps :current="current">
-        <a-step title="填写设备信息" />
-        <a-step title="添加设备凭证" />
-      </a-steps>
+      <Steps :current="current">
+        <Step title="填写设备信息" />
+        <Step title="添加设备凭证" />
+      </Steps>
     </div>
     <div class="mt-5">
       <DeviceStep1
@@ -36,7 +36,7 @@
   import { createOrEditDevice, getDeviceToken } from '/@/api/device/deviceManager';
   import DeviceStep1 from '../step/DeviceStep1.vue';
   import DeviceStep2 from '../step/DeviceStep2.vue';
-  import { Steps } from 'ant-design-vue';
+  import { Steps, Step } from 'ant-design-vue';
   import { useMessage } from '/@/hooks/web/useMessage';
 
   export default defineComponent({
@@ -45,8 +45,8 @@
       BasicModal,
       DeviceStep1,
       DeviceStep2,
-      [Steps.name]: Steps,
-      [Steps.Step.name]: Steps.Step,
+      Steps,
+      Step,
     },
     props: {
       userData: { type: Object },
@@ -96,6 +96,7 @@
       function handleCancel() {
         current.value = 0;
         DeviceStep1Ref?.value?.resetFields();
+        DeviceStep1Ref.value?.parentResetDevicePic();
         DeviceStep2Ref?.value?.resetFields();
       }
       // 提交
@@ -104,23 +105,17 @@
           // 验证
           const valid = await DeviceStep1Ref.value?.parentValidate();
           if (!valid) return;
-
           stepState.value = DeviceStep1Ref?.value?.parentGetFieldsValue();
-          handleCancel();
-          closeModal();
         } else {
           if (!DeviceStep2Ref?.value?.creaentialsPassword.isCreaentials) {
             const valid = await DeviceStep2Ref?.value?.validate();
             // 第二页验证通过情况
             if (!valid) return;
-            handleCancel();
-            closeModal();
           }
         }
-        // 验证成功 --掉新增或者编辑接口
-        const msg = computed(() => (stepState.value.id ? '更新设备成功' : '新增设备成功'));
-        console.log(stepState);
-        if (stepState.value.id) {
+        // 验证成功 --调-- 新增或者编辑接口
+        const msg = computed(() => (unref(stepState).id ? '更新设备成功' : '新增设备成功'));
+        if (unref(stepState).id) {
           const editData = {
             ...stepState.value,
             deviceInfo: {
@@ -131,7 +126,7 @@
           await createOrEditDevice(editData);
         } else {
           let deviceToken = await getDeviceToken();
-          // 需要携带唯一的设备token
+          // 创建需要携带唯一的设备token
           const createData = {
             ...stepState.value,
             deviceToken,
@@ -140,10 +135,11 @@
               ...DeviceStep1Ref.value?.positionState,
             },
           };
-
           await createOrEditDevice(createData);
         }
         createMessage.success(msg.value);
+        handleCancel();
+        closeModal();
         emit('reload');
       }
       return {

@@ -2,24 +2,19 @@
   <div class="tabs-detail">
     <div v-if="deviceDetail?.deviceInfo?.avatar">
       <p>设备图片</p>
-      <Image :src="deviceDetail.deviceInfo.avatar" :width="100" />
+      <Image :src="deviceDetail?.deviceInfo?.avatar" />
     </div>
     <div>
       <p>设备信息</p>
-      <Table
-        bordered
-        :columns="columns"
-        :data-source="[{ ...deviceDetail, key: 'name' }]"
-        :pagination="false"
-      />
+      <Table bordered :columns="columns" :data-source="[deviceDetail]" :pagination="false" />
     </div>
     <div v-if="deviceDetail?.deviceInfo?.address">
       <p>设备位置</p>
       <div ref="wrapRef" style="height: 400px; width: 90%" class="ml-6"></div>
     </div>
     <div class="mt-4">
-      <a-button type="primary" class="mr-4" @click="copyDeviceId">复制设备ID</a-button>
-      <a-button type="primary" @click="copyToken">复制访问令牌</a-button>
+      <a-button type="primary" class="mr-4" @click="copyTbDeviceId">复制设备ID</a-button>
+      <a-button type="primary" @click="copyDeviceToken">复制访问令牌</a-button>
     </div>
   </div>
 </template>
@@ -42,6 +37,7 @@
       },
     },
     setup(props) {
+      // 地图
       const BAI_DU_MAP_URL =
         'https://api.map.baidu.com/getscript?v=3.0&ak=7uOPPyAHn2Y2ZryeQqHtcRqtIY374vKa';
       const wrapRef = ref<HTMLDivElement | null>(null);
@@ -83,13 +79,13 @@
       }
       const { createMessage } = useMessage();
       const { clipboardRef } = useCopyToClipboard();
-      const copyDeviceId = () => {
-        clipboardRef.value = props.deviceDetail.id;
+      const copyTbDeviceId = () => {
+        clipboardRef.value = props.deviceDetail.tbDeviceId;
         if (unref(clipboardRef)) {
           createMessage.success('复制成功~');
         }
       };
-      const copyToken = () => {
+      const copyDeviceToken = () => {
         clipboardRef.value = props.deviceDetail.deviceToken;
         if (unref(clipboardRef)) {
           createMessage.success('复制成功~');
@@ -99,8 +95,8 @@
       return {
         columns,
         wrapRef,
-        copyDeviceId,
-        copyToken,
+        copyTbDeviceId,
+        copyDeviceToken,
         initMap,
       };
     },

 <template>
-  <PageWrapper dense contentFullHeight fixedHeight contentClass="flex">
-    <OrganizationIdTree class="w-1/6 xl:w-1/5" @select="handleSelect" />
-    <BasicTable @register="registerTable" class="w-5/6 xl:w-4/5">
-      <template #toolbar>
-        <a-button type="primary" @click="handleCreate"> 新增设备 </a-button>
-      </template>
-      <template #deviceProfile="{ record }">
-        <!-- <a-button type="link" class="ml-2" @click="goDeviceProfile">
-          {{ record.deviceProfile.name }}
-        </a-button> -->
-      </template>
-      <template #organizationId="{ record }">
-        {{ record.organizationDTO.name }}
-      </template>
-      <template #deviceType="{ record }">
-        <Tag color="success" class="ml-2">
-          {{
-            record.deviceType === DeviceTypeEnum.GATEWAY
-              ? '网关设备'
-              : record.deviceType === DeviceTypeEnum.DIRECT_CONNECTION
-              ? '直连设备'
-              : '网关子设备'
-          }}
-        </Tag>
-      </template>
-      <template #deviceState="{ record }">
-        <Tag
-          :color="
-            record.deviceState == DeviceState.INACTIVE
-              ? 'warning'
-              : record.deviceState == DeviceState.ONLINE
-              ? 'success'
-              : 'error'
-          "
-          class="ml-2"
-        >
-          {{
-            record.deviceState == DeviceState.INACTIVE
-              ? '待激活'
-              : record.deviceState == DeviceState.ONLINE
-              ? '在线'
-              : '离线'
-          }}
-        </Tag>
-      </template>
-      <template #action="{ record }">
-        <TableAction
-          :actions="[
-            {
-              label: '详情',
-              icon: 'ant-design:eye-outlined',
-              onClick: handleDetail.bind(null, record),
-            },
-            {
-              label: '编辑',
-              icon: 'clarity:note-edit-line',
-              onClick: handleEdit.bind(null, record),
-            },
-            {
-              label: '删除',
-              icon: 'ant-design:delete-outlined',
-              color: 'error',
-              popConfirm: {
-                title: '是否确认删除',
-                confirm: handleDelete.bind(null, record),
+  <div>
+    <PageWrapper dense contentFullHeight fixedHeight contentClass="flex">
+      <OrganizationIdTree class="w-1/6 xl:w-1/5" @select="handleSelect" />
+      <BasicTable @register="registerTable" class="w-5/6 xl:w-4/5">
+        <template #toolbar>
+          <a-button type="primary" @click="handleCreate"> 新增设备 </a-button>
+        </template>
+        <template #deviceProfile="{ record }">
+          <a-button type="link" class="ml-2" @click="goDeviceProfile">
+            {{ record.deviceProfile.name }}
+          </a-button>
+        </template>
+        <template #organizationId="{ record }">
+          {{ record.organizationDTO.name }}
+        </template>
+        <template #deviceType="{ record }">
+          <Tag color="success" class="ml-2">
+            {{
+              record.deviceType === DeviceTypeEnum.GATEWAY
+                ? '网关设备'
+                : record.deviceType === DeviceTypeEnum.DIRECT_CONNECTION
+                ? '直连设备'
+                : '网关子设备'
+            }}
+          </Tag>
+        </template>
+        <template #deviceState="{ record }">
+          <Tag
+            :color="
+              record.deviceState == DeviceState.INACTIVE
+                ? 'warning'
+                : record.deviceState == DeviceState.ONLINE
+                ? 'success'
+                : 'error'
+            "
+            class="ml-2"
+          >
+            {{
+              record.deviceState == DeviceState.INACTIVE
+                ? '待激活'
+                : record.deviceState == DeviceState.ONLINE
+                ? '在线'
+                : '离线'
+            }}
+          </Tag>
+        </template>
+        <template #action="{ record }">
+          <TableAction
+            :actions="[
+              {
+                label: '详情',
+                icon: 'ant-design:eye-outlined',
+                onClick: handleDetail.bind(null, record),
               },
-            },
-          ]"
-        />
-      </template>
-    </BasicTable>
-    <DeviceDetailDrawer @register="registerDetailDrawer" />
-    <DeviceModal @register="registerModal" @success="handleSuccess" @reload="handleReload" />
-  </PageWrapper>
+              {
+                label: '编辑',
+                icon: 'clarity:note-edit-line',
+                onClick: handleEdit.bind(null, record),
+              },
+              {
+                label: '删除',
+                icon: 'ant-design:delete-outlined',
+                color: 'error',
+                popConfirm: {
+                  title: '是否确认删除',
+                  confirm: handleDelete.bind(null, record),
+                },
+              },
+            ]"
+          />
+        </template>
+      </BasicTable>
+      <DeviceDetailDrawer @register="registerDetailDrawer" />
+      <DeviceModal @register="registerModal" @success="handleSuccess" @reload="handleReload" />
+    </PageWrapper>
+  </div>
 </template>
 <script lang="ts">
   import { defineComponent, reactive } from 'vue';
@@ -141,8 +143,9 @@
       }
 
       function handleDetail(record: Recordable) {
+        const { id } = record;
         openDrawer(true, {
-          record,
+          id,
         });
       }
 

@@ -14,12 +14,22 @@ export const columns: BasicColumn[] = [
   },
   {
     title: '消息类型',
-    dataIndex: 'messageTypeDictText',
+    dataIndex: 'messageType',
+    format: (_, record: Recordable) => {
+      return record.messageType === 'PHONE_MESSAGE'
+        ? '短信'
+        : record.type === 'DING_TALK_MESSAGE'
+        ? '钉钉'
+        : '邮件';
+    },
     width: 200,
   },
   {
     title: '平台类型',
-    dataIndex: 'platformTypeDictText',
+    dataIndex: 'platformType',
+    format: (_, record: Recordable) => {
+      return record.platformType === 'ALI_CLOUD' ? '阿里云平台' : '腾讯云平台';
+    },
     width: 180,
   },
   {
@@ -75,6 +85,9 @@ export const searchFormSchema: FormSchema[] = [
     label: '消息类型',
     required: true,
     component: 'ApiSelect',
+    colProps: {
+      span: 6,
+    },
     componentProps: {
       api: findDictItemByCode,
       params: {
@@ -94,7 +107,7 @@ export const searchFormSchema: FormSchema[] = [
         { label: '已禁用', value: 0 },
       ],
     },
-    colProps: { span: 8 },
+    colProps: { span: 6 },
   },
 ];
 
@@ -214,4 +227,10 @@ export const formSchema: FormSchema[] = [
     field: 'remark',
     component: 'InputTextArea',
   },
+  {
+    label: '租户id',
+    field: 'tenantId',
+    component: 'Input',
+    show: false,
+  },
 ];

@@ -41,11 +41,11 @@
   import ConfigDrawer from './ConfigDrawer.vue';
   import { columns, searchFormSchema } from './config.data';
   import { Modal } from 'ant-design-vue';
-  import { CodeEditor, JsonPreview } from '/@/components/CodeEditor';
+  import { JsonPreview } from '/@/components/CodeEditor';
   import { useMessage } from '/@/hooks/web/useMessage';
   export default defineComponent({
     name: 'MessageConfigManagement',
-    components: { BasicTable, ConfigDrawer, TableAction, CodeEditor },
+    components: { BasicTable, ConfigDrawer, TableAction },
     setup() {
       const [registerDrawer, { openDrawer }] = useDrawer();
       const { createMessage } = useMessage();

 <template>
-  <div :class="prefixCls">
-    <div :class="`${prefixCls}-bottom`">
-      <Tabs>
-        <template v-for="item in achieveList" :key="item.key">
-          <TabPane :tab="item.name">
-            <component :is="item.component" />
-          </TabPane>
-        </template>
-      </Tabs>
-    </div>
+  <div :class="`${prefixCls}-bottom`">
+    <Tabs>
+      <template v-for="item in achieveList" :key="item.key">
+        <TabPane :tab="item.name">
+          <component :is="item.component" />
+        </TabPane>
+      </template>
+    </Tabs>
   </div>
 </template>
 
 <script lang="ts">
-  import { Tabs } from 'ant-design-vue';
+  import { Tabs, TabPane } from 'ant-design-vue';
   import { defineComponent } from 'vue';
   import SmsLog from './item/SmsLog.vue';
   import EmailLog from './item/EmailLog.vue';
@@ -22,7 +20,7 @@
   export default defineComponent({
     components: {
       Tabs,
-      TabPane: Tabs.TabPane,
+      TabPane,
       SmsLog,
       EmailLog,
     },
@@ -38,7 +36,7 @@
   .account-center {
     &-bottom {
       padding: 10px;
-      margin: 0 16px 16px 16px;
+      margin: 16px;
       background-color: @component-background;
       border-radius: 3px;
     }

@@ -7,7 +7,7 @@
     width="500px"
     @ok="handleSubmit"
   >
-    <BasicForm @register="registerForm"/>
+    <BasicForm @register="registerForm" />
   </BasicDrawer>
 </template>
 <script lang="ts">
@@ -15,8 +15,8 @@
   import { BasicForm, useForm } from '/@/components/Form';
   import { formSchema } from './config.data';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
-  import {saveOrEditMessageConfig} from "/@/api/message/config";
-  import {useMessage} from "/@/hooks/web/useMessage";
+  import { saveOrEditMessageConfig } from '/@/api/message/config';
+  import { useMessage } from '/@/hooks/web/useMessage';
 
   export default defineComponent({
     name: 'ConfigDrawer',
@@ -25,7 +25,7 @@
     setup(_, { emit }) {
       const isUpdate = ref(true);
 
-      const [registerForm, {  validate,setFieldsValue,resetFields }] = useForm({
+      const [registerForm, { validate, setFieldsValue, resetFields }] = useForm({
         labelWidth: 120,
         schemas: formSchema,
         showActionButtonGroup: false,
@@ -37,8 +37,8 @@
         isUpdate.value = !!data?.isUpdate;
         if (unref(isUpdate)) {
           const config = data.record.config;
-          for (const key in config){
-            Reflect.set(data.record, key+'', config[key]);
+          for (const key in config) {
+            Reflect.set(data.record, key + '', config[key]);
           }
           await setFieldsValue({
             ...data.record,
@@ -53,27 +53,27 @@
           const values = await validate();
           const { createMessage } = useMessage();
           setDrawerProps({ confirmLoading: true });
-          let config={};
-          if(values.messageType === 'PHONE_MESSAGE'){
-            config ={
-              "accessKeyId":values.accessKeyId,
-              "accessKeySecret":values.accessKeySecret,
-            }
-          }else if(values.messageType === 'EMAIL_MESSAGE'){
-            config ={
-              "host":values.host,
-              "port":values.port,
-              "username":values.username,
-              "password":values.password,
-            }
+          let config = {};
+          if (values.messageType === 'PHONE_MESSAGE') {
+            config = {
+              accessKeyId: values.accessKeyId,
+              accessKeySecret: values.accessKeySecret,
+            };
+          } else if (values.messageType === 'EMAIL_MESSAGE') {
+            config = {
+              host: values.host,
+              port: values.port,
+              username: values.username,
+              password: values.password,
+            };
           }
           Reflect.set(values, 'config', config);
-          let saveMessage = "添加成功";
-          let updateMessage = "修改成功";
+          let saveMessage = '添加成功';
+          let updateMessage = '修改成功';
           await saveOrEditMessageConfig(values, unref(isUpdate));
           closeDrawer();
           emit('success');
-          createMessage.success(unref(isUpdate)?updateMessage:saveMessage);
+          createMessage.success(unref(isUpdate) ? updateMessage : saveMessage);
         } finally {
           setDrawerProps({ confirmLoading: false });
         }

 <template>
-  <div>
+  <div class="p-4">
     <BasicTable @register="registerTable">
       <template #toolbar>
         <a-button type="primary" @click="handleCreate"> 新增设备 </a-button>
@@ -91,11 +91,7 @@
         title: '设备列表',
         api: devicePage,
         columns,
-        formConfig: {
-          labelWidth: 120,
-          schemas: searchFormSchema,
-        },
-        useSearchForm: true,
+        useSearchForm: false,
         showTableSetting: true,
         bordered: true,
         showIndexColumn: false,

 <template>
-  <PageWrapper title="我的通知详情">
-    <Description @register="register1" class="mt-4" />
-  </PageWrapper>
+  <div>
+    <PageWrapper title="我的通知详情">
+      <Description @register="register1" class="mt-4" />
+    </PageWrapper>
+  </div>
 </template>
 <script lang="ts">
   import { defineComponent, watch, ref } from 'vue';

 <template>
-  <BasicDrawer
-    v-bind="$attrs"
-    @register="registerDrawer"
-    :showFooter="false"
-    :title="getTitle"
-    width="1000px"
-  >
-    <DetailChild :emitChildData="childData" />
-    <BasicTable :columns="columns" :dataSource="tableData">
-      <span></span>
-    </BasicTable>
-  </BasicDrawer>
+  <div>
+    <BasicDrawer
+      v-bind="$attrs"
+      @register="registerDrawer"
+      :showFooter="false"
+      :title="getTitle"
+      width="1000px"
+    >
+      <DetailChild :emitChildData="childData" />
+      <BasicTable :columns="columns" :dataSource="tableData">
+        <span></span>
+      </BasicTable>
+    </BasicDrawer>
+  </div>
 </template>
 <script lang="ts">
   import { defineComponent, ref, computed, unref } from 'vue';

@@ -61,7 +61,7 @@
   import { notifyGetTableApi, notifyDeleteApi } from '/@/api/stationnotification/stationnotifyApi';
 
   export default defineComponent({
-    name: 'index',
+    name: 'Index',
     components: { BasicTable, NotifyManagerDrawer, TableAction, tableViewChild },
     setup() {
       let isJudgeStatus = ref(true);

 <template>
-  <BasicDrawer
-    v-bind="$attrs"
-    @register="registerDrawer"
-    :showFooter="false"
-    :title="getTitle"
-    width="800px"
-  >
-    <BasicForm :showResetButton="false" :showSubmitButton="false" @register="registerForm">
-      <template #add>
-        <Button style="margin-left: 30px; margin-top: 80px" type="primary" @click="handleCancel"
-          >取消</Button
-        >
-        <Button style="margin-left: 30px" type="primary" @click="handleSaveDraft">保存草稿</Button>
-        <Button style="margin-left: 30px" type="primary" @click="handleSend">发布通知</Button>
-      </template>
-    </BasicForm>
-  </BasicDrawer>
+  <div>
+    <BasicDrawer
+      v-bind="$attrs"
+      @register="registerDrawer"
+      :showFooter="false"
+      :title="getTitle"
+      width="800px"
+    >
+      <BasicForm :showResetButton="false" :showSubmitButton="false" @register="registerForm">
+        <template #add>
+          <Button style="margin-left: 30px; margin-top: 80px" type="primary" @click="handleCancel"
+            >取消</Button
+          >
+          <Button style="margin-left: 30px" type="primary" @click="handleSaveDraft"
+            >保存草稿</Button
+          >
+          <Button style="margin-left: 30px" type="primary" @click="handleSend">发布通知</Button>
+        </template>
+      </BasicForm>
+    </BasicDrawer>
+  </div>
 </template>
 <script lang="ts">
   import { defineComponent, ref, computed, unref, reactive, watch } from 'vue';

 <template>
-  <BasicDrawer
-    v-bind="$attrs"
-    @register="registerDrawer"
-    :showFooter="false"
-    :title="getTitle"
-    width="800px"
-  >
-    <PageWrapper title="站内通知详情">
-      <Description @register="register1" class="mt-4" />
-    </PageWrapper>
-  </BasicDrawer>
+  <div>
+    <BasicDrawer
+      v-bind="$attrs"
+      @register="registerDrawer"
+      :showFooter="false"
+      :title="getTitle"
+      width="800px"
+    >
+      <PageWrapper title="站内通知详情">
+        <Description @register="register1" class="mt-4" />
+      </PageWrapper>
+    </BasicDrawer>
+  </div>
 </template>
 <script lang="ts">
   import { defineComponent, ref, computed, unref } from 'vue';

-<template>
-  <PageWrapper title="关于">
-    <template #headerContent>
-      <div class="flex justify-between items-center">
-        <span class="flex-1">
-          <a :href="GITHUB_URL" target="_blank">{{ name }}</a>
-          是一个基于Vue3.0、Vite、 Ant-Design-Vue 、TypeScript
-          的后台解决方案，目标是为中大型项目开发,提供现成的开箱解决方案及丰富的示例,原则上不会限制任何代码用于商用。
-        </span>
-      </div>
-    </template>
-    <Description @register="infoRegister" class="enter-y" />
-    <Description @register="register" class="my-4 enter-y" />
-    <Description @register="registerDev" class="enter-y" />
-  </PageWrapper>
-</template>
-<script lang="ts" setup>
-  import { h } from 'vue';
-  import { Tag } from 'ant-design-vue';
-  import { PageWrapper } from '/@/components/Page';
-  import { Description, DescItem, useDescription } from '/@/components/Description/index';
-  import { GITHUB_URL, SITE_URL, DOC_URL } from '/@/settings/siteSetting';
-
-  const { pkg, lastBuildTime } = __APP_INFO__;
-
-  const { dependencies, devDependencies, name, version } = pkg;
-
-  const schema: DescItem[] = [];
-  const devSchema: DescItem[] = [];
-
-  const commonTagRender = (color: string) => (curVal) => h(Tag, { color }, () => curVal);
-  const commonLinkRender = (text: string) => (href) => h('a', { href, target: '_blank' }, text);
-
-  const infoSchema: DescItem[] = [
-    {
-      label: '版本',
-      field: 'version',
-      render: commonTagRender('blue'),
-    },
-    {
-      label: '最后编译时间',
-      field: 'lastBuildTime',
-      render: commonTagRender('blue'),
-    },
-    {
-      label: '文档地址',
-      field: 'doc',
-      render: commonLinkRender('文档地址'),
-    },
-    {
-      label: '预览地址',
-      field: 'preview',
-      render: commonLinkRender('预览地址'),
-    },
-    {
-      label: 'Github',
-      field: 'github',
-      render: commonLinkRender('Github'),
-    },
-  ];
-
-  const infoData = {
-    version,
-    lastBuildTime,
-    doc: DOC_URL,
-    preview: SITE_URL,
-    github: GITHUB_URL,
-  };
-
-  Object.keys(dependencies).forEach((key) => {
-    schema.push({ field: key, label: key });
-  });
-
-  Object.keys(devDependencies).forEach((key) => {
-    devSchema.push({ field: key, label: key });
-  });
-
-  const [register] = useDescription({
-    title: '生产环境依赖',
-    data: dependencies,
-    schema: schema,
-    column: 3,
-  });
-
-  const [registerDev] = useDescription({
-    title: '开发环境依赖',
-    data: devDependencies,
-    schema: devSchema,
-    column: 3,
-  });
-
-  const [infoRegister] = useDescription({
-    title: '项目信息',
-    data: infoData,
-    schema: infoSchema,
-    column: 2,
-  });
-</script>

@@ -10,7 +10,6 @@
   import { Description, useDescription } from '/@/components/Description/index';
   import { useI18n } from '/@/hooks/web/useI18n';
   import { getDescSchema } from './data';
-
   defineProps({
     info: {
       type: Object as PropType<ErrorLogInfo>,

@@ -3,7 +3,6 @@
     <template v-for="src in imgList" :key="src">
       <img :src="src" v-show="false" />
     </template>
-    <DetailModal :info="rowInfo" @register="registerModal" />
     <BasicTable @register="register" class="error-handle-table">
       <template #toolbar>
         <a-button @click="fireVueError" type="primary">
@@ -24,6 +23,7 @@
         />
       </template>
     </BasicTable>
+    <DetailModal :info="rowInfo" @register="registerModal" />
   </div>
 </template>
 

 <template>
-  <transition name="fade-bottom" mode="out-in">
-    <LockPage v-if="getIsLock" />
-  </transition>
+  <div>
+    <transition name="fade-bottom" mode="out-in">
+      <LockPage v-if="getIsLock" />
+    </transition>
+  </div>
 </template>
 <script lang="ts" setup>
   import { computed } from 'vue';

 <template>
-  <LoginFormTitle v-show="getShow" class="enter-x" />
-  <Form
-    class="p-4 enter-x"
-    :model="formData"
-    :rules="getFormRules"
-    ref="formRef"
-    v-show="getShow"
-    @keypress.enter="handleLogin"
-  >
-    <FormItem name="account" class="enter-x">
-      <Input
-        size="large"
-        v-model:value="formData.account"
-        :placeholder="t('sys.login.userName')"
-        class="fix-auto-fill"
-      />
-    </FormItem>
-    <FormItem name="password" class="enter-x">
-      <InputPassword
-        size="large"
-        visibilityToggle
-        v-model:value="formData.password"
-        :placeholder="t('sys.login.password')"
-      />
-    </FormItem>
+  <div>
+    <LoginFormTitle v-show="getShow" class="enter-x" />
+    <Form
+      class="p-4 enter-x"
+      :model="formData"
+      :rules="getFormRules"
+      ref="formRef"
+      v-show="getShow"
+      @keypress.enter="handleLogin"
+    >
+      <FormItem name="account" class="enter-x">
+        <Input
+          size="large"
+          v-model:value="formData.account"
+          :placeholder="t('sys.login.userName')"
+          class="fix-auto-fill"
+        />
+      </FormItem>
+      <FormItem name="password" class="enter-x">
+        <InputPassword
+          size="large"
+          visibilityToggle
+          v-model:value="formData.password"
+          :placeholder="t('sys.login.password')"
+        />
+      </FormItem>
 
-    <FormItem class="enter-x">
-      <Button type="primary" size="large" block @click="handleLogin" :loading="loading">
-        {{ t('sys.login.loginButton') }}
-      </Button>
-    </FormItem>
-    <ARow type="flex" justify="space-between">
-      <ACol :md="11" :xs="24">
-        <Button block @click="setLoginState(LoginStateEnum.MOBILE)">
-          {{ t('sys.login.mobileSignInFormTitle') }}
+      <FormItem class="enter-x">
+        <Button type="primary" size="large" block @click="handleLogin" :loading="loading">
+          {{ t('sys.login.loginButton') }}
         </Button>
-      </ACol>
-      <ACol :md="11" :xs="24">
-        <Button block @click="setLoginState(LoginStateEnum.QR_CODE)">
-          {{ t('sys.login.qrSignInFormTitle') }}
-        </Button>
-      </ACol>
-    </ARow>
-    <ARow class="enter-x">
-      <ACol :span="12">
-        <FormItem />
-      </ACol>
-      <ACol :span="12">
-        <FormItem :style="{ 'text-align': 'right' }">
-          <!-- No logic, you need to deal with it yourself -->
-          <Button type="link" size="small" @click="setLoginState(LoginStateEnum.RESET_PASSWORD)">
-            {{ t('sys.login.forgetPassword') }}
+      </FormItem>
+      <ARow type="flex" justify="space-between">
+        <ACol :md="11" :xs="24">
+          <Button block @click="setLoginState(LoginStateEnum.MOBILE)">
+            {{ t('sys.login.mobileSignInFormTitle') }}
+          </Button>
+        </ACol>
+        <ACol :md="11" :xs="24">
+          <Button block @click="setLoginState(LoginStateEnum.QR_CODE)">
+            {{ t('sys.login.qrSignInFormTitle') }}
           </Button>
-        </FormItem>
-      </ACol>
-    </ARow>
-  </Form>
+        </ACol>
+      </ARow>
+      <ARow class="enter-x">
+        <ACol :span="12">
+          <FormItem />
+        </ACol>
+        <ACol :span="12">
+          <FormItem :style="{ 'text-align': 'right' }">
+            <!-- No logic, you need to deal with it yourself -->
+            <Button type="link" size="small" @click="setLoginState(LoginStateEnum.RESET_PASSWORD)">
+              {{ t('sys.login.forgetPassword') }}
+            </Button>
+          </FormItem>
+        </ACol>
+      </ARow>
+    </Form>
+  </div>
 </template>
 <script lang="ts" setup>
   import { reactive, ref, toRaw, unref, computed } from 'vue';

 <template>
-  <PageWrapper :title="`用户资料`" contentBackground @back="goBack">
-    <Description size="middle" @register="register" />
-  </PageWrapper>
+  <div>
+    <PageWrapper :title="`用户资料`" contentBackground @back="goBack">
+      <Description size="middle" @register="register" />
+    </PageWrapper>
+  </div>
 </template>
 
 <script>

@@ -11,7 +11,6 @@
         <BasicTree
           v-model:value="model[field]"
           :treeData="organizationTreeData"
-          :replaceFields="{ title: 'name' }"
           :checked-keys="checkGroup"
           checkable
           toolbar
@@ -26,15 +25,12 @@
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { accountFormSchema } from './account.data';
-  import {
-    findCurrentUserRelation,
-    getOrganizationList,
-    SaveOrUpdateUserInfo,
-  } from '/@/api/system/system';
+  import { findCurrentUserRelation, SaveOrUpdateUserInfo } from '/@/api/system/system';
   import { BasicTree, TreeItem } from '/@/components/Tree';
   import { findCurrentUserGroups } from '/@/api/system/group';
   import { RoleOrOrganizationParam } from '/@/api/system/model/systemModel';
   import { useMessage } from '/@/hooks/web/useMessage';
+  import { copyTransTreeFun } from '/@/utils/fnUtils';
   export default defineComponent({
     name: 'AccountModal',
     components: { BasicModal, BasicForm, BasicTree },
@@ -58,24 +54,13 @@
         setModalProps({ confirmLoading: false });
         isUpdate.value = !!data?.isUpdate;
         const groupListModel = await findCurrentUserGroups();
-
         if (unref(organizationTreeData).length === 0) {
-          let treeValues = new Array<TreeItem>();
-          groupListModel.map((item) => {
-            const groupData = {
-              name: item.name,
-              key: item.id,
-              id: item.id,
-              children: item.children as any as TreeItem[],
-            };
-            treeValues.push(groupData);
-          });
-          organizationTreeData.value = treeValues;
+          copyTransTreeFun(groupListModel);
+          organizationTreeData.value = groupListModel;
         }
 
         if (unref(isUpdate)) {
           rowId.value = data.record.id;
-
           const roleParams = new RoleOrOrganizationParam(rowId.value, true, false);
           findCurrentUserRelation(roleParams).then((result) => {
             console.log(result);
@@ -88,21 +73,13 @@
           const organizationParams = new RoleOrOrganizationParam(rowId.value, false, true);
           checkGroup.value = await findCurrentUserRelation(organizationParams);
         }
-        const deptData = await getOrganizationList();
         await updateSchema([
           {
             field: 'username',
             dynamicDisabled: unref(isUpdate),
           },
-          {
-            field: 'organizationIds',
-            componentProps: {
-              treeData: deptData,
-            },
-          },
         ]);
       });
-
       const getTitle = computed(() => (!unref(isUpdate) ? '新增账号' : '编辑账号'));
 
       async function handleSubmit() {
@@ -126,8 +103,8 @@
       return {
         registerModal,
         registerForm,
-        getTitle,
         handleSubmit,
+        getTitle,
         organizationTreeData,
         checkGroup,
       };

@@ -133,14 +133,42 @@ export const accountFormSchema: FormSchema[] = [
     field: 'phoneNumber',
     component: 'Input',
     colProps: { span: 12 },
-    required: true,
+    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',
+      },
+    ],
   },
   {
     label: '邮箱',
     field: 'email',
     component: 'Input',
     colProps: { span: 12 },
-    required: true,
+    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',
+      },
+    ],
   },
   {
     field: 'accountExpireTime',

 <template>
-  <PageWrapper dense contentFullHeight fixedHeight contentClass="flex">
-    <OrganizationIdTree class="w-1/4 xl:w-1/5" @select="handleSelect" />
-    <BasicTable @register="registerTable" class="w-3/4 xl:w-4/5" :searchInfo="searchInfo">
-      <template #toolbar>
-        <a-button type="primary" @click="handleCreate">新增账号</a-button>
-      </template>
-      <template #status="{ record }">
-        <Tag
-          :color="
-            record.userStatusEnum === 'NORMAL'
-              ? 'green'
-              : record.userStatusEnum === 'DISABLED'
-              ? 'red'
-              : 'orange'
-          "
-        >
-          {{
-            record.userStatusEnum === 'NORMAL'
-              ? '正常'
-              : record.userStatusEnum === 'DISABLED'
-              ? '已禁用'
-              : '已过期'
-          }}
-        </Tag>
-      </template>
-      <template #action="{ record }">
-        <TableAction
-          :actions="[
-            {
-              label: '用户详情',
-              icon: 'clarity:info-standard-line',
-              tooltip: '用户详情',
-              onClick: handleView.bind(null, record),
-              ifShow: record.level != 0,
-            },
-            {
-              label: '编辑',
-              icon: 'clarity:note-edit-line',
-              tooltip: '编辑',
-              onClick: handleEdit.bind(null, record),
-              ifShow: record.level != 0,
-            },
-            {
-              label: '删除',
-              icon: 'ant-design:delete-outlined',
-              color: 'error',
-              tooltip: '删除',
-              ifShow: record.level != 0,
-              popConfirm: {
-                title: '是否确认删除',
-                confirm: handleDelete.bind(null, record),
+  <div>
+    <PageWrapper dense contentFullHeight fixedHeight contentClass="flex">
+      <OrganizationIdTree class="w-1/4 xl:w-1/5" @select="handleSelect" />
+      <BasicTable @register="registerTable" class="w-3/4 xl:w-4/5" :searchInfo="searchInfo">
+        <template #toolbar>
+          <a-button type="primary" @click="handleCreate">新增账号</a-button>
+        </template>
+        <template #status="{ record }">
+          <Tag
+            :color="
+              record.userStatusEnum === 'NORMAL'
+                ? 'green'
+                : record.userStatusEnum === 'DISABLED'
+                ? 'red'
+                : 'orange'
+            "
+          >
+            {{
+              record.userStatusEnum === 'NORMAL'
+                ? '正常'
+                : record.userStatusEnum === 'DISABLED'
+                ? '已禁用'
+                : '已过期'
+            }}
+          </Tag>
+        </template>
+        <template #action="{ record }">
+          <TableAction
+            :actions="[
+              {
+                label: '用户详情',
+                icon: 'clarity:info-standard-line',
+                tooltip: '用户详情',
+                onClick: handleView.bind(null, record),
+                ifShow: record.level != 0,
               },
-            },
-          ]"
-        />
-      </template>
-    </BasicTable>
-    <AccountModal @register="registerModal" @success="handleSuccess" />
-  </PageWrapper>
+              {
+                label: '编辑',
+                icon: 'clarity:note-edit-line',
+                tooltip: '编辑',
+                onClick: handleEdit.bind(null, record),
+                ifShow: record.level != 0,
+              },
+              {
+                label: '删除',
+                icon: 'ant-design:delete-outlined',
+                color: 'error',
+                tooltip: '删除',
+                ifShow: record.level != 0,
+                popConfirm: {
+                  title: '是否确认删除',
+                  confirm: handleDelete.bind(null, record),
+                },
+              },
+            ]"
+          />
+        </template>
+      </BasicTable>
+      <AccountModal @register="registerModal" @success="handleSuccess" />
+    </PageWrapper>
+  </div>
 </template>
 <script lang="ts">
   import { defineComponent, reactive } from 'vue';

 <template>
-  <BasicDrawer v-bind="$attrs" @register="register" width="60%" title="字典值配置">
-    <div style="background-color: #f0f2f5">
-      <BasicTable @register="registerTable">
-        <template #toolbar>
-          <a-button type="primary" @click="handleCreate"> 新增字典值 </a-button>
-        </template>
-        <template #action="{ record }">
-          <TableAction
-            :actions="[
-              {
-                label: '编辑',
-                icon: 'clarity:note-edit-line',
-                onClick: handleEdit.bind(null, record),
-              },
-              {
-                label: '删除',
-                icon: 'ant-design:delete-outlined',
-                color: 'error',
-                popConfirm: {
-                  title: '是否确认删除',
-                  confirm: handleDelete.bind(null, record),
+  <div>
+    <BasicDrawer v-bind="$attrs" @register="register" width="60%" title="字典值配置">
+      <div style="background-color: #f0f2f5">
+        <BasicTable @register="registerTable">
+          <template #toolbar>
+            <a-button type="primary" @click="handleCreate"> 新增字典值 </a-button>
+          </template>
+          <template #action="{ record }">
+            <TableAction
+              :actions="[
+                {
+                  label: '编辑',
+                  icon: 'clarity:note-edit-line',
+                  onClick: handleEdit.bind(null, record),
                 },
-                ifShow: record.status == 0,
-              },
-            ]"
-          />
-        </template>
-      </BasicTable>
-      <ItemDrawer @register="registerDrawer" @success="handleSuccess" />
-    </div>
-  </BasicDrawer>
+                {
+                  label: '删除',
+                  icon: 'ant-design:delete-outlined',
+                  color: 'error',
+                  popConfirm: {
+                    title: '是否确认删除',
+                    confirm: handleDelete.bind(null, record),
+                  },
+                  ifShow: record.status == 0,
+                },
+              ]"
+            />
+          </template>
+        </BasicTable>
+        <ItemDrawer @register="registerDrawer" @success="handleSuccess" />
+      </div>
+    </BasicDrawer>
+  </div>
 </template>
 <script lang="ts">
   import { defineComponent } from 'vue';

 <template>
-  <div>
-    <!-- register 用于注册 useTable，如果需要使用useTable提供的 api，必须将 register 传入组件的 onRegister-->
-    <!-- @fetch-success接口请求成功后触发 -->
+  <div class="p-4">
     <BasicTable @register="registerTable" @fetch-success="onFetchSuccess">
-      <!-- 通过模板，加载工具栏 -->
       <template #toolbar>
         <a-button type="primary" @click="handleCreate">
           {{ getI18nCreateMenu }}
         </a-button>
-        <!-- 新增菜单-->
       </template>
-
-      <!-- 表格单项，操作 -->
       <template #action="{ record }">
         <TableAction
           :actions="[
@@ -23,7 +17,7 @@
               icon: 'ant-design:delete-outlined',
               color: 'error',
               popConfirm: {
-                title: getDeleteTitle(), //是否确认删除//getDeleteTitle()
+                title: getDeleteTitle(),
                 confirm: handleDelete.bind(null, record),
               },
             },
@@ -112,7 +106,6 @@
        * @param record
        */
       function handleEdit(record: Recordable) {
-        console.log('----------------------------333-------------' + record.parentId);
         openDrawer(true, {
           record,
           isUpdate: true,

 <template>
-  <div>
+  <div class="p-4">
     <BasicTable @register="registerTable" @fetch-success="onFetchSuccess">
       <template #toolbar>
         <a-button type="primary" @click="handleCreate">

 <template>
-  <PageWrapper title="修改当前用户密码" content="修改成功后会自动退出当前登录！">
-    <div class="py-8 bg-white flex flex-col justify-center items-center">
-      <BasicForm @register="register" />
-      <div class="flex justify-center">
-        <a-button @click="resetFields"> 重置 </a-button>
-        <a-button class="!ml-4" type="primary" @click="handleSubmit"> 确认 </a-button>
+  <div>
+    <PageWrapper title="修改当前用户密码" content="修改成功后会自动退出当前登录！" class="p-4">
+      <div class="py-8 bg-white flex flex-col justify-center items-center">
+        <BasicForm @register="register" />
+        <div class="flex justify-center">
+          <a-button @click="resetFields"> 重置 </a-button>
+          <a-button class="!ml-4" type="primary" @click="handleSubmit"> 确认 </a-button>
+        </div>
       </div>
-    </div>
-  </PageWrapper>
+    </PageWrapper>
+  </div>
 </template>
 <script lang="ts">
   import { defineComponent, ref } from 'vue';

 <template>
-  <div class="p-4">
+  <div>
     <BasicTable @register="tenantTable">
       <template #toolbar>
         <a-button type="primary" @click="handleCreate"> 新增租户</a-button>
@@ -68,14 +68,14 @@
 <script lang="ts">
   import { defineComponent } from 'vue';
   import { BasicTable, TableImg, TableAction, useTable, FormSchema } from '/@/components/Table';
-  import { Avatar, Tag } from 'ant-design-vue';
+  import { Tag } from 'ant-design-vue';
   import { getBasicColumns } from './tenantBaseColumns';
   import { deleteTenant, getTenantPage } from '/@/api/tenant/tenantApi';
   import { useDrawer } from '/@/components/Drawer';
   import TenantDrawer from './TenantDrawer.vue';
   import TenantAdminDrawer from './TenantAdminDrawer.vue';
   export default defineComponent({
-    components: { BasicTable, Avatar, TableImg, Tag, TableAction, TenantDrawer, TenantAdminDrawer },
+    components: { BasicTable, TableImg, Tag, TableAction, TenantDrawer, TenantAdminDrawer },
     setup() {
       const [tenantDrawer, { openDrawer: openDrawer }] = useDrawer();
       const [tenantAdminDrawer, { openDrawer: openTenantAdminDrawer }] = useDrawer();

@@ -255,6 +255,20 @@ export const schemas: FormSchema[] = [
     componentProps: {
       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',
+      },
+    ],
   },
   {
     field: 'qrcode',

@@ -24,9 +24,9 @@
               >
             </div>
           </Upload>
-        </template></BasicForm
-      ></Card
-    >
+        </template>
+      </BasicForm>
+    </Card>
     <Loading v-bind="compState" />
     <a-button
       @click="handleUpdateInfo"
@@ -66,7 +66,7 @@
         loading: false,
         tip: '拼命加载中...',
       });
-      const [registerForm, { getFieldsValue, setFieldsValue, updateSchema }] = useForm({
+      const [registerForm, { getFieldsValue, setFieldsValue, updateSchema, validate }] = useForm({
         labelWidth: 80,
         schemas,
         showResetButton: false,
@@ -102,7 +102,6 @@
       // 更新
       const handleUpdateInfo = async () => {
         try {
-          compState.value.loading = true;
           const fieldsValue = getFieldsValue();
           const newFieldValue = {
             ...fieldsValue,
@@ -112,13 +111,14 @@
             codeTown: fieldsValue.nameTown,
             qrCode: qrcodePic.value,
           };
+          // 表单校验
+          await validate();
+          compState.value.loading = true;
           await updateEnterPriseDetail(newFieldValue);
           compState.value.loading = false;
           createMessage.success('更新信息成功');
           setEnterPriseInfo(newFieldValue);
-        } catch (e) {
-          createMessage.error('更新信息失败');
-        }
+        } catch (e) {}
       };
 
       const userStore = useUserStore();

@@ -20,9 +20,9 @@
 <script lang="ts" setup>
   import { Tabs, TabPane, Card } from 'ant-design-vue';
   import { ref } from 'vue';
-  import EnterpriseInfo from './components/EnterpriseInfo.vue';
-  import CVIDraw from './components/CVIDraw.vue';
-  import AppDraw from './components/AppDraw.vue';
+  import EnterpriseInfo from './cpns/EnterpriseInfo.vue';
+  import CVIDraw from './cpns/CVIDraw.vue';
+  import AppDraw from './cpns/AppDraw.vue';
   const activeKey = ref('企业信息');
 </script>