Merge branch 'sqy_dev' into 'main'

'feat:统一为table组件添加批量删除,fix:找回之前覆盖代码,style:修改一些样式待完成'

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

@@ -34,7 +34,7 @@ export const useBatchDelete = (
     if (record) {
       try {
         await deleteFn([record.id]);
-        createMessage.success('删除联系人成功');
+        createMessage.success('删除成功');
         handleSuccess();
       } catch (e) {
         createMessage.error('删除失败');
@@ -42,11 +42,12 @@ export const useBatchDelete = (
     } else {
       try {
         await deleteFn(selectedRowIds.value);
-        createMessage.success('批量删除联系人成功');
+        createMessage.success('批量删除成功');
         selectedRowIds.value = [];
         handleSuccess();
       } catch (e) {
-        createMessage.info('删除失败');
+        createMessage.error('删除失败');
+        selectedRowIds.value = [];
       }
     }
   };

@@ -23,6 +23,7 @@
   import { getDeviceAlarm } from '/@/api/device/deviceManager';
   import { useDrawer } from '/@/components/Drawer';
   import AlarmDetailDrawer from './cpns/AlarmDetailDrawer.vue';
+
   export default defineComponent({
     name: 'AlarmCenter',
     components: {

@@ -3,27 +3,30 @@ import { FormSchema } from '/@/components/Form';
 import { BasicColumn } from '/@/components/Table';
 import { DeviceTypeEnum } from '/@/api/device/model/deviceModel';
 import { getCustomerList } from '/@/api/device/deviceManager';
-import dayjs from 'moment';
-export const columns: BasicColumn[] = [
+import { DescItem } from '/@/components/Description/index';
+import moment from 'moment';
+// 设备详情的描述
+export const descSchema: DescItem[] = [
   {
-    title: '设备名称',
-    dataIndex: 'name',
-    width: 120,
+    field: 'createTime',
+    label: '创建时间',
   },
   {
-    title: '设备标签',
-    dataIndex: 'label',
-    width: 100,
+    field: 'name',
+    label: '设备名称',
   },
   {
-    title: '设备配置',
-    dataIndex: 'deviceProfile.name',
-    width: 160,
+    field: 'label',
+    label: '设备标签',
+  },
+  {
+    field: 'deviceProfile.name',
+    label: '设备配置',
   },
   {
-    title: '设备类型',
-    dataIndex: 'deviceType',
-    customRender({ text }) {
+    field: 'deviceType',
+    label: '设备类型',
+    render: (text) => {
       return text === DeviceTypeEnum.GATEWAY
         ? '网关设备'
         : text == DeviceTypeEnum.DIRECT_CONNECTION
@@ -32,11 +35,11 @@ export const columns: BasicColumn[] = [
     },
   },
   {
-    title: '描述',
-    dataIndex: 'description',
-    width: 180,
+    field: 'description',
+    label: '描述',
   },
 ];
+
 // 实时数据表格
 export const realTimeDataColumns: BasicColumn[] = [
   {
@@ -100,7 +103,7 @@ export const alarmSearchSchemas: FormSchema[] = [
     component: 'DatePicker',
     componentProps: {
       valueFormat: 'x',
-      showTime: { defaultValue: dayjs('23:59:59', 'HH:mm:ss') },
+      showTime: { defaultValue: moment('23:59:59', 'HH:mm:ss') },
     },
     colProps: { span: 6 },
   },
@@ -212,20 +215,25 @@ export const alarmSchemasForm: FormSchema[] = [
     },
   },
 ];
-
 // 子设备
 export const childDeviceSchemas: FormSchema[] = [
   {
-    field: 'icon',
-    label: '设备配置',
-    component: 'Select',
+    field: 'deviceState',
+    label: '设备状态',
     colProps: { span: 6 },
+    component: 'Select',
     componentProps: {
+      size: 'small',
       maxLength: 255,
+      options: [
+        { label: '待激活', value: 'INACTIVE' },
+        { label: '在线', value: 'ONLINE' },
+        { label: '离线', value: 'OFFLINE' },
+      ],
     },
   },
   {
-    field: 'icon',
+    field: 'name',
     label: '设备名称',
     component: 'Input',
     colProps: { span: 6 },
@@ -238,32 +246,30 @@ export const childDeviceSchemas: FormSchema[] = [
 export const childDeviceColumns: BasicColumn[] = [
   {
     title: '名称',
-    dataIndex: 'name',
+    dataIndex: 'tbDeviceName',
     width: 120,
   },
   {
-    title: '设备配置',
-    dataIndex: 'label',
-    width: 100,
-  },
-  {
     title: '标签',
-    dataIndex: 'aaa',
+    dataIndex: 'label',
     width: 160,
   },
   {
     title: '状态',
-    dataIndex: 'bbb',
+    dataIndex: 'deviceState',
+    slots: { customRender: 'deviceState' },
     width: 160,
   },
   {
     title: '最后连接时间',
-    dataIndex: 'ccc',
+    dataIndex: 'lastOnlineTime',
+    format: (text) => formatToDateTime(text, 'YYYY-MM-DD HH:mm:ss'),
     width: 160,
   },
   {
-    title: '创建时间',
-    dataIndex: 'ddd',
+    title: '更新时间',
+    dataIndex: 'createdTime',
+    format: (text) => formatToDateTime(text, 'YYYY-MM-DD HH:mm:ss'),
     width: 160,
   },
 ];

@@ -7,7 +7,7 @@
     centered
     @ok="dispatchCustomer"
     @cancel="resetFields"
-    :minHeight="150"
+    :minHeight="100"
     okText="分配"
   >
     <BasicForm @register="registerForm" />

@@ -3,22 +3,22 @@
     v-bind="$attrs"
     isDetail
     @register="register"
-    :destroyOnClose="true"
+    destroyOnClose
     @close="closeDrawer"
     :title="deviceDetail.name"
-    width="70%"
+    width="80%"
   >
-    <Tabs v-model:activeKey="activeKey" :size="size" type="card">
-      <TabPane key="1" tab="详情"
-        ><Detail ref="deviceDetailRef" :deviceDetail="deviceDetail"
-      /></TabPane>
-      <TabPane key="2" tab="实时数据" v-if="deviceDetail?.deviceType !== 'GATEWAY'"
-        ><RealTimeData :deviceDetail="deviceDetail"
-      /></TabPane>
+    <Tabs v-model:activeKey="activeKey" :size="size">
+      <TabPane key="1" tab="详情">
+        <Detail ref="deviceDetailRef" :deviceDetail="deviceDetail" />
+      </TabPane>
+      <TabPane key="2" tab="实时数据" v-if="deviceDetail?.deviceType !== 'GATEWAY'">
+        <RealTimeData :deviceDetail="deviceDetail" />
+      </TabPane>
       <TabPane key="3" tab="告警"><Alarm :id="deviceDetail.id" /></TabPane>
-      <TabPane key="4" tab="子设备" v-if="deviceDetail?.deviceType === 'GATEWAY'"
-        ><ChildDevice
-      /></TabPane>
+      <TabPane key="4" tab="子设备" v-if="deviceDetail?.deviceType === 'GATEWAY'">
+        <ChildDevice :fromId="deviceDetail?.tbDeviceId" />
+      </TabPane>
     </Tabs>
   </BasicDrawer>
 </template>

@@ -10,9 +10,9 @@
     centered
   >
     <div class="step-form-form">
-      <Steps :current="current">
-        <Step title="填写设备信息" v-if="!isUpdate" />
-        <Step title="添加设备凭证" v-if="!isUpdate" />
+      <Steps :current="current" v-if="!isUpdate">
+        <Step title="填写设备信息" />
+        <Step title="添加设备凭证" />
       </Steps>
     </div>
     <div class="mt-5">

@@ -6,6 +6,7 @@
     @cancel="handleCancel"
     @ok="handleOk"
     centered
+    :canFullscreen="false"
   >
     <BasicForm @register="registerForm" />
   </BasicModal>

 <template>
-  <div>
+  <div style="background-color: #f0f2f5">
     <BasicTable @register="registerTable">
       <template #action="{ record }">
         <TableAction
@@ -40,13 +40,12 @@
       const [registerTable, { reload }] = useTable({
         api: getDeviceAlarm,
         columns: alarmColumns,
+        useSearchForm: true,
         formConfig: {
           labelWidth: 120,
           schemas: alarmSearchSchemas,
         },
         showTableSetting: true,
-
-        useSearchForm: true,
         bordered: true,
         showIndexColumn: false,
         beforeFetch: (data) => {

 <template>
-  <BasicTable @register="registerTable" />
+  <div style="background-color: #f0f2f5">
+    <BasicTable @register="registerTable">
+      <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>
+    </BasicTable>
+  </div>
 </template>
 <script lang="ts">
-  import { defineComponent } from 'vue';
+  import { defineComponent, onMounted } from 'vue';
+  import { Tag } from 'ant-design-vue';
+  import { DeviceState } from '/@/api/device/model/deviceModel';
   import { BasicTable, useTable } from '/@/components/Table';
   import { childDeviceColumns, childDeviceSchemas } from '../../config/detail.config';
-
+  import { getChildDevicePage } from '/@/api/device/deviceManager.ts';
   export default defineComponent({
     name: 'DeviceManagement',
     components: {
       BasicTable,
+      Tag,
+    },
+    props: {
+      fromId: {
+        type: String,
+        required: true,
+      },
     },
-    setup(_) {
+    setup(props) {
+      console.log(123);
+      onMounted(() => {
+        console.log(props.fromId);
+      });
       const [registerTable] = useTable({
+        api: getChildDevicePage,
         columns: childDeviceColumns,
         formConfig: {
           labelWidth: 120,
           schemas: childDeviceSchemas,
         },
+        beforeFetch: (data) => {
+          console.log(props.fromId);
+          Reflect.set(data, 'fromId', props.fromId);
+        },
         useSearchForm: true,
         showTableSetting: true,
         bordered: true,
@@ -26,6 +67,7 @@
 
       return {
         registerTable,
+        DeviceState,
       };
     },
   });

@@ -6,14 +6,7 @@
     </div>
     <div>
       <p>设备信息</p>
-      <Table
-        bordered
-        :columns="columns"
-        :data-source="[deviceDetail]"
-        :rowKey="(_, index) => index"
-        :pagination="false"
-        style="width: 800px"
-      />
+      <Description @register="register" class="mt-4" :data="deviceDetail" />
     </div>
     <div class="mt-4">
       <a-button type="primary" class="mr-4" @click="copyTbDeviceId">复制设备ID</a-button>
@@ -23,14 +16,14 @@
     </div>
     <div v-if="deviceDetail?.deviceInfo?.address" class="mt-4">
       <p>设备位置</p>
-      <div ref="wrapRef" style="height: 400px; width: 100%"></div>
+      <div ref="wrapRef" style="height: 550px; width: 100%"></div>
     </div>
   </div>
 </template>
 <script lang="ts">
   import { defineComponent, ref, unref, nextTick } from 'vue';
-  import { Image, Table } from 'ant-design-vue';
-  import { columns } from '../../config/detail.config';
+  import { Image } from 'ant-design-vue';
+  import { descSchema } from '../../config/detail.config';
   import { useScript } from '/@/hooks/web/useScript';
   import { useCopyToClipboard } from '/@/hooks/web/useCopyToClipboard';
   import { useMessage } from '/@/hooks/web/useMessage';
@@ -38,10 +31,13 @@
   import { useModal } from '/@/components/Modal';
   import ManageDeviceTokenModal from '../modal/ManageDeviceTokenModal.vue';
   import { getDeviceToken } from '/@/api/device/deviceManager';
+  import { Description, useDescription } from '/@/components/Description';
+  import wz from '/@/assets/images/wz.png';
+
   export default defineComponent({
     components: {
       Image,
-      Table,
+      Description,
       ManageDeviceTokenModal,
     },
     props: {
@@ -51,6 +47,13 @@
       },
     },
     setup(props) {
+      console.log(props.deviceDetail);
+      const [register] = useDescription({
+        layout: 'vertical',
+        schema: descSchema,
+        column: 2,
+      });
+
       // 地图
       const wrapRef = ref<HTMLDivElement | null>(null);
       const { toPromise } = useScript({ src: BAI_DU_MAP_URL });
@@ -62,7 +65,7 @@
         const BMap = (window as any).BMap;
         if (!wrapEl) return;
         const map = new BMap.Map(wrapEl);
-        let myIcon = new BMap.Icon('/src/assets/images/wz.png', new BMap.Size(20, 30));
+        let myIcon = new BMap.Icon(wz, new BMap.Size(20, 30));
 
         const point = new BMap.Point(Number(longitude), Number(latitude));
         var content = `我在 ${address}`;
@@ -107,13 +110,13 @@
       };
 
       return {
-        columns,
         wrapRef,
         copyTbDeviceId,
         copyDeviceToken,
         initMap,
         manageDeviceToken,
         registerModal,
+        register,
       };
     },
   });

 <template>
-  <BasicTable @register="registerTable" />
+  <div style="background-color: #f0f2f5">
+    <BasicTable @register="registerTable" />
+  </div>
 </template>
 <script lang="ts">
   import { defineComponent, reactive } from 'vue';
@@ -52,6 +54,21 @@
         bordered: true,
         showIndexColumn: false,
         dataSource: state.recordList,
+        useSearchForm: true,
+        formConfig: {
+          labelWidth: 120,
+          schemas: [
+            {
+              field: 'icon',
+              label: '设备配置',
+              component: 'Select',
+              colProps: { span: 6 },
+              componentProps: {
+                maxLength: 255,
+              },
+            },
+          ],
+        },
       });
 
       const { send, close } = useWebSocket(state.server, {

@@ -9,6 +9,14 @@
       <BasicTable @register="registerTable" class="w-5/6 xl:w-4/5">
         <template #toolbar>
           <a-button type="primary" @click="handleCreate" v-if="authBtn(role)"> 新增设备 </a-button>
+          <a-button
+            color="error"
+            v-if="authBtn(role)"
+            @click="handleDeleteOrBatchDelete(null)"
+            :disabled="hasBatchDelete"
+          >
+            批量删除
+          </a-button>
         </template>
         <template #deviceProfile="{ record }">
           <a-button type="link" class="ml-2" @click="goDeviceProfile(record.deviceProfile.name)">
@@ -85,7 +93,7 @@
                 color: 'error',
                 popConfirm: {
                   title: '是否确认删除',
-                  confirm: handleDelete.bind(null, record),
+                  confirm: handleDeleteOrBatchDelete.bind(null, record),
                 },
               },
             ]"
@@ -104,7 +112,6 @@
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { columns, searchFormSchema } from './config/device.data';
   import { Tag } from 'ant-design-vue';
-  import { useMessage } from '/@/hooks/web/useMessage';
   import {
     deleteDevice,
     devicePage,
@@ -125,6 +132,8 @@
   import { USER_INFO_KEY } from '/@/enums/cacheEnum';
   import { getAuthCache } from '/@/utils/auth';
   import { authBtn } from '/@/enums/roleEnum';
+  import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
+
   export default defineComponent({
     name: 'DeviceManagement',
     components: {
@@ -138,9 +147,11 @@
       CustomerModal,
     },
     setup(_) {
-      const { createMessage } = useMessage();
       const go = useGo();
-
+      const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions } = useBatchDelete(
+        deleteDevice,
+        handleSuccess
+      );
       const searchInfo = reactive<Recordable>({});
       const { organizationIdTreeRef, resetFn } = useResetOrganizationTree(searchInfo);
       const [registerModal, { openModal }] = useModal();
@@ -166,6 +177,7 @@
           slots: { customRender: 'action' },
           fixed: 'right',
         },
+        ...selectionOptions,
       });
 
       const userInfo: any = getAuthCache(USER_INFO_KEY);
@@ -206,14 +218,6 @@
         });
       }
 
-      function handleDelete(record: Recordable) {
-        let ids = [record.id];
-        deleteDevice(ids).then(() => {
-          createMessage.success('删除设备成功');
-          handleSuccess();
-        });
-      }
-
       function handleSuccess() {
         reload();
       }
@@ -230,7 +234,6 @@
         handleCreate,
         handleDetail,
         handleEdit,
-        handleDelete,
         handleSuccess,
         goDeviceProfile,
         handleSelect,
@@ -245,6 +248,8 @@
         registerCustomerModal,
         authBtn,
         role,
+        handleDeleteOrBatchDelete,
+        hasBatchDelete,
       };
     },
   });

@@ -3,6 +3,9 @@
     <BasicTable @register="registerTable">
       <template #toolbar>
         <a-button type="primary" @click="handleCreate"> 新增消息配置 </a-button>
+        <a-button color="error" @click="handleDeleteOrBatchDelete(null)" :disabled="hasBatchDelete">
+          批量删除
+        </a-button>
       </template>
       <template #config="{ record }">
         <a-button type="link" class="ml-2" @click="showData(record)"> 查看配置 </a-button>
@@ -21,7 +24,7 @@
               color: 'error',
               popConfirm: {
                 title: '是否确认删除',
-                confirm: handleDelete.bind(null, record),
+                confirm: handleDeleteOrBatchDelete.bind(null, record),
               },
               ifShow: record.status == 0,
             },
@@ -42,13 +45,16 @@
   import { columns, searchFormSchema } from './config.data';
   import { Modal } from 'ant-design-vue';
   import { JsonPreview } from '/@/components/CodeEditor';
-  import { useMessage } from '/@/hooks/web/useMessage';
+  import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
   export default defineComponent({
     name: 'MessageConfigManagement',
     components: { BasicTable, ConfigDrawer, TableAction },
     setup() {
       const [registerDrawer, { openDrawer }] = useDrawer();
-      const { createMessage } = useMessage();
+      const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions } = useBatchDelete(
+        deleteMessageConfig,
+        handleSuccess
+      );
       const [registerTable, { reload }] = useTable({
         title: '消息配置列表',
         api: messageConfigPage,
@@ -68,6 +74,7 @@
           slots: { customRender: 'action' },
           fixed: 'right',
         },
+        ...selectionOptions,
       });
 
       function handleCreate() {
@@ -83,14 +90,6 @@
         });
       }
 
-      function handleDelete(record: Recordable) {
-        let ids = [record.id];
-        deleteMessageConfig(ids).then((result) => {
-          createMessage.success(result.message);
-          handleSuccess();
-        });
-      }
-
       function handleSuccess() {
         reload();
       }
@@ -107,8 +106,9 @@
         showData,
         handleCreate,
         handleEdit,
-        handleDelete,
         handleSuccess,
+        hasBatchDelete,
+        handleDeleteOrBatchDelete,
       };
     },
   });

@@ -3,6 +3,9 @@
     <BasicTable @register="registerTable">
       <template #toolbar>
         <a-button type="primary" @click="handleCreate"> 新增消息模板 </a-button>
+        <a-button color="error" @click="handleDeleteOrBatchDelete(null)" :disabled="hasBatchDelete">
+          批量删除
+        </a-button>
       </template>
       <template #config="{ record }">
         <a-button type="link" class="ml-2" @click="goConfig">
@@ -28,7 +31,7 @@
               color: 'error',
               popConfirm: {
                 title: '是否确认删除',
-                confirm: handleDelete.bind(null, record),
+                confirm: handleDeleteOrBatchDelete.bind(null, record),
               },
             },
           ]"
@@ -47,7 +50,6 @@
   import { useDrawer } from '/@/components/Drawer';
   import TemplateDrawer from './TemplateDrawer.vue';
   import { columns, searchFormSchema } from './template.data';
-  import { useMessage } from '/@/hooks/web/useMessage';
   import { deleteMessageTemplate, messageTemplatePage } from '/@/api/message/template';
   import { useGo } from '/@/hooks/web/usePage';
   import { PageEnum } from '/@/enums/pageEnum';
@@ -55,6 +57,7 @@
   import SendSms from '/@/views/message/template/SendSms.vue';
   import { MessageEnum } from '/@/enums/messageEnum';
   import SendEmail from '/@/views/message/template/SendEmail.vue';
+  import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
 
   export default defineComponent({
     name: 'MessageTemplateManagement',
@@ -64,7 +67,10 @@
       const [registerMailModal, { openModal: openMailModal }] = useModal();
       const go = useGo();
       const [registerDrawer, { openDrawer }] = useDrawer();
-      const { createMessage } = useMessage();
+      const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions } = useBatchDelete(
+        deleteMessageTemplate,
+        handleSuccess
+      );
       const [registerTable, { reload }] = useTable({
         title: '消息模板列表',
         api: messageTemplatePage,
@@ -84,6 +90,7 @@
           slots: { customRender: 'action' },
           fixed: 'right',
         },
+        ...selectionOptions,
       });
 
       function handleCreate() {
@@ -119,15 +126,6 @@
           });
         }
       }
-
-      function handleDelete(record: Recordable) {
-        let ids = [record.id];
-        deleteMessageTemplate(ids).then((result) => {
-          createMessage.success(result.message);
-          handleSuccess();
-        });
-      }
-
       function handleSuccess() {
         reload();
       }
@@ -141,10 +139,11 @@
         registerMailModal,
         handleCreate,
         handleEdit,
-        handleDelete,
         handleSuccess,
         handleModal,
         goConfig,
+        hasBatchDelete,
+        handleDeleteOrBatchDelete,
       };
     },
   });

@@ -7,12 +7,8 @@
     >
       <template #toolbar>
         <a-button type="primary" @click="handleAdd"> 新增场景联动 </a-button>
-        <a-button
-          style="background-color: rgba(237, 111, 111, 1)"
-          type="default"
-          @click="handleToolbarDel"
-        >
-          <span style="color: white">删除</span>
+        <a-button color="error" @click="handleDeleteOrBatchDelete(null)" :disabled="hasBatchDelete">
+          批量删除
         </a-button>
       </template>
       <template #action="{ record }">
@@ -29,7 +25,7 @@
               color: 'error',
               popConfirm: {
                 title: '是否确认删除',
-                confirm: handleDelete.bind(null, record),
+                confirm: handleDeleteOrBatchDelete.bind(null, record),
               },
             },
           ]"
@@ -52,6 +48,7 @@
   import { columns, searchFormSchema } from './config';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { screenLinkPageGetApi, screenLinkPageDeleteApi } from '/@/api/ruleengine/ruleengineApi';
+  import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
 
   export default defineComponent({
     name: 'Index',
@@ -60,20 +57,22 @@
     setup() {
       const { proxy } = getCurrentInstance();
       const sceneLinkAgeDrawerRef: any = ref(null);
+      const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions } = useBatchDelete(
+        screenLinkPageDeleteApi,
+        handleSuccess
+      );
       let selectedRowKeys: Array<string> = [];
       let echoEditData = reactive({});
       const [registerDrawer, { openDrawer }] = useDrawer();
       const { createMessage } = useMessage();
       const [registerTable, { reload, getSelectRowKeys }] = useTable({
         title: '场景联动列表',
-        clickToRowSelect: false,
         api: screenLinkPageGetApi,
         columns,
         formConfig: {
           labelWidth: 120,
           schemas: searchFormSchema,
         },
-        rowKey: 'id',
         useSearchForm: true,
         showTableSetting: true,
         bordered: true,
@@ -85,6 +84,7 @@
           slots: { customRender: 'action' },
           fixed: 'right',
         },
+        ...selectionOptions,
       });
 
       function handleAdd() {
@@ -146,6 +146,8 @@
         handleEdit,
         handleDelete,
         handleSuccess,
+        hasBatchDelete,
+        handleDeleteOrBatchDelete,
       };
     },
   });

@@ -3,7 +3,7 @@
     <BasicTable @register="registerTable">
       <template #toolbar>
         <a-button type="primary" @click="handleAdd">新增通知</a-button>
-        <a-button color="error" @click="handleToolbarDel" :disabled="hasBatchDelete">
+        <a-button color="error" @click="handleDeleteOrBatchDelete(null)" :disabled="hasBatchDelete">
           批量删除
         </a-button>
       </template>
@@ -32,7 +32,7 @@
               color: 'error',
               popConfirm: {
                 title: '是否确认删除',
-                confirm: handleDelete.bind(null, record),
+                confirm: handleDeleteOrBatchDelete.bind(null, record),
               },
             },
           ]"
@@ -44,14 +44,14 @@
   </div>
 </template>
 <script lang="ts">
-  import { defineComponent, computed, unref, ref } from 'vue';
+  import { defineComponent } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { useDrawer } from '/@/components/Drawer';
   import NotifyManagerDrawer from './useDrawer.vue';
   import tableViewChild from './viewDetailDrawer.vue';
   import { columns, searchFormSchema } from './config.d';
-  import { useMessage } from '/@/hooks/web/useMessage';
   import { notifyGetTableApi, notifyDeleteApi } from '/@/api/stationnotification/stationnotifyApi';
+  import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
 
   export default defineComponent({
     name: 'Notificationmannager',
@@ -59,34 +59,19 @@
     setup() {
       const [registerDrawer, { openDrawer }] = useDrawer();
       const [registerAdd, { openDrawer: openDrawerAdd }] = useDrawer();
-      const { createMessage } = useMessage();
-      // 批量删除
-      const selectedRowIds = ref<string[]>([]);
-      const hasBatchDelete = computed(() => unref(selectedRowIds).length <= 0);
-      const onSelectRowChange = (selectedRowKeys: string[]) => {
-        selectedRowIds.value = selectedRowKeys;
-        console.log(selectedRowKeys);
-      };
-      async function handleToolbarDel() {
-        await notifyDeleteApi(selectedRowIds.value);
-        createMessage.success('批量删除成功');
-        selectedRowIds.value = [];
-        reload();
-      }
 
+      // 批量删除
+      const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions } = useBatchDelete(
+        notifyDeleteApi,
+        handleSuccess
+      );
       const [registerTable, { reload }] = useTable({
-        clickToRowSelect: false,
         api: notifyGetTableApi,
         columns,
         formConfig: {
           labelWidth: 120,
           schemas: searchFormSchema,
         },
-        rowSelection: {
-          onChange: onSelectRowChange,
-          type: 'checkbox',
-        },
-        rowKey: 'id',
         useSearchForm: true,
         showTableSetting: true,
         bordered: true,
@@ -98,6 +83,7 @@
           slots: { customRender: 'action' },
           fixed: 'right',
         },
+        ...selectionOptions,
       });
 
       function handleAdd() {
@@ -117,12 +103,6 @@
           isUpdate: true,
         });
       }
-      async function handleDelete(record: Recordable) {
-        let ids = [record.id];
-        await notifyDeleteApi(ids);
-        createMessage.success('删除成功');
-        reload();
-      }
       function handleSuccess() {
         reload();
       }
@@ -133,11 +113,9 @@
         registerTable,
         registerDrawer,
         handleAdd,
-        handleToolbarDel,
         handleEdit,
-        handleDelete,
         handleSuccess,
-        onSelectRowChange,
+        handleDeleteOrBatchDelete,
       };
     },
   });

@@ -3,27 +3,21 @@
     <BasicDrawer
       v-bind="$attrs"
       @register="registerDrawer"
-      :showFooter="false"
       :title="getTitle"
       width="800px"
+      showFooter
     >
-      <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>
+      <BasicForm @register="registerForm" />
+      <template #footer>
+        <a-button @click="handleCancel">取消</a-button>
+        <a-button @click="handleSaveDraft">保存草稿</a-button>
+        <a-button type="primary" @click="handleSend">发布通知</a-button>
+      </template>
     </BasicDrawer>
   </div>
 </template>
 <script lang="ts">
   import { defineComponent, computed, unref, ref } from 'vue';
-  import { Button } from '/@/components/Button';
   import { BasicForm, useForm } from '/@/components/Form';
   import { formSchema } from './config.d';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
@@ -34,7 +28,7 @@
   import { useMessage } from '/@/hooks/web/useMessage';
   export default defineComponent({
     name: 'ConfigDrawer',
-    components: { BasicDrawer, BasicForm, Button },
+    components: { BasicDrawer, BasicForm },
     emits: ['success', 'register'],
     setup(_, { emit }) {
       const { createMessage } = useMessage();
@@ -54,6 +48,7 @@
           noticeId.value = data.record.id;
           Reflect.set(data.record, 'receiverType', data.record.receiverType === '全部' ? '0' : '1');
           if (data.record.receiverType === '1') {
+            if (!data.record.pointId.length) return;
             const organizationId = data.record.pointId.split(',');
             Reflect.set(data.record, 'organizationId', organizationId);
           }
@@ -108,7 +103,7 @@
         createMessage.success('保存草稿成功');
       };
       const handleCancel = () => {
-        resetFields();
+        // resetFields();
         closeDrawer();
       };
       return {

@@ -9,6 +9,13 @@
       <BasicTable @register="registerTable" class="w-3/4 xl:w-4/5">
         <template #toolbar>
           <a-button type="primary" @click="handleCreate">新增账号</a-button>
+          <a-button
+            color="error"
+            @click="handleDeleteOrBatchDelete(null)"
+            :disabled="hasBatchDelete"
+          >
+            批量删除
+          </a-button>
         </template>
         <template #status="{ record }">
           <Tag
@@ -54,7 +61,7 @@
                 ifShow: record.level != 0,
                 popConfirm: {
                   title: '是否确认删除',
-                  confirm: handleDelete.bind(null, record),
+                  confirm: handleDeleteOrBatchDelete.bind(null, record),
                 },
               },
             ]"
@@ -74,18 +81,19 @@
   import { Tag } from 'ant-design-vue';
   import { useModal } from '/@/components/Modal';
   import AccountModal from './AccountModal.vue';
-
   import { columns, searchFormSchema } from './account.data';
   import { useGo } from '/@/hooks/web/usePage';
-  import { useMessage } from '/@/hooks/web/useMessage';
-
+  import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
   export default defineComponent({
     name: 'AccountManagement',
     components: { BasicTable, PageWrapper, OrganizationIdTree, AccountModal, TableAction, Tag },
     setup() {
       const go = useGo();
+      const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions } = useBatchDelete(
+        deleteUser,
+        handleSuccess
+      );
       const [registerModal, { openModal }] = useModal();
-      const { createMessage } = useMessage();
       let searchInfo = reactive<Recordable>({});
       const { organizationIdTreeRef, resetFn } = useResetOrganizationTree(searchInfo);
       const [registerTable, { reload }] = useTable({
@@ -109,6 +117,7 @@
           dataIndex: 'action',
           slots: { customRender: 'action' },
         },
+        ...selectionOptions,
       });
 
       function handleCreate() {
@@ -122,15 +131,6 @@
           isUpdate: true,
         });
       }
-
-      function handleDelete(record: Recordable) {
-        let ids = [record.id];
-        deleteUser(ids).then(() => {
-          createMessage.success('删除成功');
-          reload();
-        });
-      }
-
       function handleSuccess() {
         reload();
       }
@@ -149,11 +149,12 @@
         registerModal,
         handleCreate,
         handleEdit,
-        handleDelete,
         handleSuccess,
         handleSelect,
         handleView,
         organizationIdTreeRef,
+        hasBatchDelete,
+        handleDeleteOrBatchDelete,
       };
     },
   });

@@ -3,6 +3,9 @@
     <BasicTable @register="registerTable">
       <template #toolbar>
         <a-button type="primary" @click="handleCreate"> 新增字典 </a-button>
+        <a-button color="error" @click="handleDeleteOrBatchDelete(null)" :disabled="hasBatchDelete">
+          批量删除
+        </a-button>
       </template>
       <template #action="{ record }">
         <TableAction
@@ -23,7 +26,7 @@
               color: 'error',
               popConfirm: {
                 title: '是否确认删除',
-                confirm: handleDelete.bind(null, record),
+                confirm: handleDeleteOrBatchDelete.bind(null, record),
               },
             },
           ]"
@@ -51,15 +54,19 @@
 
   import { columns, searchFormSchema } from './dict.data';
   import { Tag } from 'ant-design-vue';
-  import { useMessage } from '/@/hooks/web/useMessage';
+
+  import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
 
   export default defineComponent({
     name: 'DictManagement',
     components: { BasicTable, DictDrawer, ItemIndex, TableAction, Tag },
     setup() {
-      const { createMessage } = useMessage();
       const [registerDrawer, { openDrawer: openDrawer }] = useDrawer();
       const [registerItemDrawer, { openDrawer: openItemDrawer }] = useDrawer();
+      const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions } = useBatchDelete(
+        deleteDict,
+        handleSuccess
+      );
       const [registerTable, { reload }] = useTable({
         title: '字典配置列表',
         api: sysDictPage,
@@ -79,6 +86,7 @@
           slots: { customRender: 'action' },
           fixed: 'right',
         },
+        ...selectionOptions,
       });
 
       function handleCreate() {
@@ -100,14 +108,6 @@
         });
       }
 
-      function handleDelete(record: Recordable) {
-        let ids = [record.id];
-        deleteDict(ids).then((result) => {
-          createMessage.success(result.message);
-          handleSuccess();
-        });
-      }
-
       function handleSuccess() {
         reload();
       }
@@ -119,8 +119,10 @@
         handleCreate,
         handleEdit,
         handleItem,
-        handleDelete,
+
         handleSuccess,
+        hasBatchDelete,
+        handleDeleteOrBatchDelete,
       };
     },
   });

@@ -5,6 +5,9 @@
         <a-button type="primary" @click="handleCreate">
           {{ getI18nCreateMenu }}
         </a-button>
+        <a-button color="error" @click="handleDeleteOrBatchDelete(null)" :disabled="hasBatchDelete">
+          批量删除
+        </a-button>
       </template>
       <template #action="{ record }">
         <TableAction
@@ -53,6 +56,7 @@
   import { columns } from './menu.data';
   import { useI18n } from '/@/hooks/web/useI18n';
   import { notification } from 'ant-design-vue';
+  import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
 
   // 自定义表格组件和属性
   export default defineComponent({
@@ -63,18 +67,17 @@
       const { t } = useI18n(); //加载国际化
       // 新增菜单
       const getI18nCreateMenu = computed(() => t('routes.common.system.pageSystemTitleCreateMenu'));
+      const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions } = useBatchDelete(
+        delMenu,
+        handleSuccess
+      );
       const [registerTable, { reload, expandAll }] = useTable({
         title: t('routes.common.system.pageSystemTitleMenuList'), //'菜单列表'
         api: getMenuList, //加载数据
         columns, //加载列
-        // formConfig: {
-        //   labelWidth: 120,
-        //   schemas: searchFormSchema,
-        // },
         isTreeTable: true,
         pagination: false,
         striped: false,
-        // useSearchForm: true,
         showTableSetting: true,
         bordered: true,
         showIndexColumn: false,
@@ -86,6 +89,7 @@
           slots: { customRender: 'action' },
           fixed: 'right',
         },
+        ...selectionOptions,
       });
 
       /**
@@ -157,6 +161,8 @@
         handleDelete,
         handleSuccess,
         onFetchSuccess,
+        hasBatchDelete,
+        handleDeleteOrBatchDelete,
       };
     },
   });

@@ -5,6 +5,9 @@
         <a-button type="primary" @click="handleCreate">
           {{ getI18n }}
         </a-button>
+        <a-button color="error" @click="handleDeleteOrBatchDelete(null)" :disabled="hasBatchDelete">
+          批量删除
+        </a-button>
       </template>
       <template #action="{ record }">
         <TableAction
@@ -20,7 +23,7 @@
               color: 'error',
               popConfirm: {
                 title: getDeleteTitle(), //是否确认删除//getDeleteTitle()
-                confirm: handleDelete.bind(null, record),
+                confirm: handleDeleteOrBatchDelete.bind(null, record),
               },
             },
           ]"
@@ -32,18 +35,14 @@
 </template>
 <script lang="ts">
   import { computed, defineComponent, nextTick } from 'vue';
-
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
-
   // 加载自定义侧边弹出框 组件
-
   import { useDrawer } from '/@/components/Drawer';
   import DeptDrawer from './OrganizationDrawer.vue';
   import { columns } from './organization.data';
   import { useI18n } from '/@/hooks/web/useI18n';
   import { delOrganization, getOrganizationList } from '/@/api/system/system';
-  import { useMessage } from '/@/hooks/web/useMessage';
-
+  import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
   export default defineComponent({
     name: 'DeptManagement',
     components: { BasicTable, DeptDrawer, TableAction },
@@ -51,7 +50,10 @@
       const [registerModal, { openDrawer }] = useDrawer();
       const { t } = useI18n(); //加载国际化
       const getI18n = computed(() => t('routes.common.organization.toolCreateOrganization'));
-      const { createMessage } = useMessage();
+      const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions } = useBatchDelete(
+        delOrganization,
+        handleSuccess
+      );
       const [registerTable, { reload, expandAll }] = useTable({
         title: t('routes.common.organization.toolOrganizationList'),
         api: getOrganizationList,
@@ -71,6 +73,7 @@
           slots: { customRender: 'action' },
           fixed: 'right',
         },
+        ...selectionOptions,
       });
       /**
        * 获得删除提示框的文字
@@ -93,17 +96,6 @@
         });
       }
 
-      async function handleDelete(record: Recordable) {
-        try {
-          let ids = [record.id];
-          await delOrganization(ids);
-          createMessage.success('删除组织成功');
-          handleSuccess();
-        } catch (e) {
-          return e;
-        }
-      }
-
       function handleSuccess() {
         reload();
       }
@@ -120,9 +112,10 @@
         getDeleteTitle,
         handleCreate,
         handleEdit,
-        handleDelete,
         handleSuccess,
         onFetchSuccess,
+        hasBatchDelete,
+        handleDeleteOrBatchDelete,
       };
     },
   });

@@ -3,6 +3,9 @@
     <BasicTable @register="registerTable">
       <template #toolbar>
         <a-button type="primary" @click="handleCreate">新增角色</a-button>
+        <a-button color="error" @click="handleDeleteOrBatchDelete(null)" :disabled="hasBatchDelete">
+          批量删除
+        </a-button>
       </template>
       <template #action="{ record }">
         <TableAction
@@ -19,7 +22,7 @@
               ifShow: record.roleType != RoleEnum.SYS_ADMIN,
               popConfirm: {
                 title: '是否确认删除',
-                confirm: handleDelete.bind(null, record),
+                confirm: handleDeleteOrBatchDelete.bind(null, record),
               },
             },
           ]"
@@ -39,12 +42,16 @@
   import RoleDrawer from './RoleDrawer.vue';
   import { columns, searchFormSchema } from './role.data';
   import { RoleEnum } from '/@/enums/roleEnum';
-
+  import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
   export default defineComponent({
     name: 'RoleManagement',
     components: { BasicTable, RoleDrawer, TableAction },
     setup() {
       const [registerDrawer, { openDrawer }] = useDrawer();
+      const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions } = useBatchDelete(
+        delRole,
+        handleSuccess
+      );
       const [registerTable, { reload }] = useTable({
         title: '角色列表',
         api: getRoleListByPage,
@@ -64,6 +71,7 @@
           slots: { customRender: 'action' },
           fixed: 'right',
         },
+        ...selectionOptions,
       });
 
       function handleCreate() {
@@ -78,13 +86,6 @@
           isUpdate: true,
         });
       }
-
-      async function handleDelete(record: Recordable) {
-        const roleIds = [record.id];
-        delRole(roleIds).then(() => {
-          reload();
-        });
-      }
       function handleSuccess() {
         reload();
       }
@@ -94,9 +95,10 @@
         registerDrawer,
         handleCreate,
         handleEdit,
-        handleDelete,
         handleSuccess,
         RoleEnum,
+        hasBatchDelete,
+        handleDeleteOrBatchDelete,
       };
     },
   });

@@ -14,6 +14,19 @@ export const schemas: FormSchema[] = [
       maxLength: 100,
       placeholder: '请输入公司名称',
     },
+    dynamicRules: () => {
+      return [
+        {
+          required: false,
+          validator: (_, value) => {
+            if (String(value).length > 100) {
+              return Promise.reject('字数不超过100个字');
+            }
+            return Promise.resolve();
+          },
+        },
+      ];
+    },
   },
   {
     field: 'abbreviation',
@@ -26,6 +39,19 @@ export const schemas: FormSchema[] = [
       maxLength: 100,
       placeholder: '请输入公司简称',
     },
+    dynamicRules: () => {
+      return [
+        {
+          required: false,
+          validator: (_, value) => {
+            if (String(value).length > 100) {
+              return Promise.reject('字数不超过100个字');
+            }
+            return Promise.resolve();
+          },
+        },
+      ];
+    },
   },
   {
     field: 'officialWebsite',
@@ -38,6 +64,19 @@ export const schemas: FormSchema[] = [
       maxLength: 255,
       placeholder: '请输入公司官网',
     },
+    dynamicRules: () => {
+      return [
+        {
+          required: false,
+          validator: (_, value) => {
+            if (String(value).length > 255) {
+              return Promise.reject('字数不超过255个字');
+            }
+            return Promise.resolve();
+          },
+        },
+      ];
+    },
   },
   {
     field: 'email',
@@ -63,6 +102,20 @@ export const schemas: FormSchema[] = [
       maxLength: 500,
       placeholder: '请输入公司简介',
       autoSize: { minRows: 8, maxRows: 12 },
+      showCount: true,
+    },
+    dynamicRules: () => {
+      return [
+        {
+          required: false,
+          validator: (_, value) => {
+            if (String(value).length > 500) {
+              return Promise.reject('字数不超过500个字');
+            }
+            return Promise.resolve();
+          },
+        },
+      ];
     },
   },
   {
@@ -77,7 +130,7 @@ export const schemas: FormSchema[] = [
       params: { parentId: 0 },
       labelField: 'name',
       valueField: 'code',
-      placeholder: '请选择国家/地区',
+      placeholder: '国家/地区',
     },
   },
   {
@@ -105,18 +158,21 @@ export const schemas: FormSchema[] = [
                 field: 'nameCity',
                 componentProps: {
                   options: [],
+                  placeholder: '城市',
                 },
               },
               {
                 field: 'nameCoun',
                 componentProps: {
                   options: [],
+                  placeholder: '区/县',
                 },
               },
               {
                 field: 'nameTown',
                 componentProps: {
                   options: [],
+                  placeholder: '城镇/街道',
                 },
               },
             ]);
@@ -204,11 +260,12 @@ export const schemas: FormSchema[] = [
     field: 'nameCity',
     component: 'Select',
     label: '',
-    componentProps: {
-      placeholder: '城市',
-    },
+    labelWidth: 0,
     colProps: {
       span: 5,
+      style: {
+        marginLeft: '-5rem',
+      },
     },
   },
   {
@@ -216,7 +273,10 @@ export const schemas: FormSchema[] = [
     component: 'Select',
     label: '',
     colProps: {
-      span: 3,
+      span: 5,
+      style: {
+        marginLeft: '-10rem',
+      },
     },
     componentProps: {
       placeholder: '区/县',
@@ -228,6 +288,9 @@ export const schemas: FormSchema[] = [
     label: '',
     colProps: {
       span: 6,
+      style: {
+        marginLeft: '-10rem',
+      },
     },
     componentProps: {
       placeholder: '城镇/街道',

@@ -137,21 +137,18 @@
 
       // 地区显示回显和数据联动
       async function updateCityData(
-        provs: CityItem[],
         cities: CityItem[],
         couns: CityItem[],
         towns: CityItem[],
         code: Code
       ) {
         // 加工后端返回字段
-        provs.forEach((item) => {
-          item.label = item.name;
-          item.value = item.code;
-        });
+
         cities.forEach((item) => {
           item.label = item.name;
           item.value = item.code;
         });
+
         couns.forEach((item) => {
           item.label = item.name;
           item.value = item.code;
@@ -161,13 +158,6 @@
           item.value = item.code;
         });
         const { codeCountry, codeProv, codeCity, codeCoun, codeTown } = code;
-        setFieldsValue({
-          nameCountry: codeCountry,
-          nameProv: codeProv,
-          nameCity: codeCity,
-          nameCoun: codeCoun,
-          nameTown: codeTown,
-        });
         updateSchema([
           {
             field: 'nameCity',
@@ -175,17 +165,25 @@
               return {
                 options: cities,
                 async onChange(value) {
-                  let couns: CityItem[] = await getAreaList({ parentId: value });
                   if (value === undefined) {
                     formModel.nameCoun = undefined; //  reset city value
                     formModel.nameTown = undefined;
-                    updateSchema({
-                      field: 'nameTown',
-                      componentProps: {
-                        options: [],
+                    updateSchema([
+                      {
+                        field: 'nameCoun',
+                        componentProps: {
+                          options: [],
+                        },
                       },
-                    });
+                      {
+                        field: 'nameTown',
+                        componentProps: {
+                          options: [],
+                        },
+                      },
+                    ]);
                   } else {
+                    let couns: CityItem[] = await getAreaList({ parentId: value });
                     couns.forEach((item) => {
                       item.label = item.name;
                       item.value = item.code;
@@ -198,23 +196,23 @@
                         // 请选择区
                         options: couns,
                         async onChange(value) {
-                          let towns: CityItem[] = await getAreaList({ parentId: value });
                           if (value === undefined) {
                             formModel.nameTown = undefined;
+                          } else {
+                            let towns: CityItem[] = await getAreaList({ parentId: value });
+                            towns.forEach((item) => {
+                              item.label = item.name;
+                              item.value = item.code;
+                            });
+                            formModel.nameTown = undefined;
+                            updateSchema({
+                              field: 'nameTown',
+                              componentProps: {
+                                placeholder: '城镇/街道',
+                                options: towns,
+                              },
+                            });
                           }
-                          towns.forEach((item) => {
-                            item.label = item.name;
-                            item.value = item.code;
-                          });
-
-                          formModel.nameTown = undefined;
-                          updateSchema({
-                            field: 'nameTown',
-                            componentProps: {
-                              placeholder: '请选择街道/城镇',
-                              options: towns,
-                            },
-                          });
                         },
                       },
                     });
@@ -235,6 +233,7 @@
                   updateSchema({
                     field: 'nameTown',
                     componentProps: {
+                      placeholder: '城镇/街道',
                       options: [],
                     },
                   });
@@ -250,7 +249,7 @@
                   updateSchema({
                     field: 'nameTown',
                     componentProps: {
-                      placeholder: '请选择街道/城镇',
+                      placeholder: '城镇/街道',
                       options: towns,
                     },
                   });
@@ -265,22 +264,20 @@
             },
           },
         ]);
+        setFieldsValue({
+          nameCountry: codeCountry,
+          nameProv: codeProv,
+          nameCity: codeCity,
+          nameCoun: codeCoun,
+          nameTown: codeTown,
+        });
       }
 
       onMounted(async () => {
         const res = await getEnterPriseDetail();
         if (res.sysTown) {
-          const {
-            provs,
-            cities,
-            couns,
-            towns,
-            codeCountry,
-            codeProv,
-            codeCity,
-            codeCoun,
-            codeTown,
-          } = res.sysTown;
+          const { cities, couns, towns, codeCountry, codeProv, codeCity, codeCoun, codeTown } =
+            res.sysTown;
           const code = {
             codeCountry,
             codeProv,
@@ -288,7 +285,7 @@
             codeCoun,
             codeTown,
           };
-          updateCityData(provs, cities, couns, towns, code);
+          updateCityData(cities, couns, towns, code);
           setFieldsValue(res);
           qrcodePic.value = res.qrCode;
         } else {
@@ -308,5 +305,3 @@
     },
   });
 </script>
-
-<style lang="less" scoped></style>