From 18f563ce42067b6ebc98c8f72387bb17449180e0 Mon Sep 17 00:00:00 2001
From: Kven <2955163637@qq.com>
Date: Thu, 16 Jan 2025 21:26:50 +0800
Subject: [PATCH] =?UTF-8?q?fix(menu=E6=A8=A1=E5=9D=97=E4=BB=A5=E5=8F=8A?=
 =?UTF-8?q?=E5=90=84=E6=A8=A1=E5=9D=97bug):=20=E4=BF=AE=E5=A4=8D=E5=90=84?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/menu.ts                               |  26 +-
 src/api/message-mgmt.ts                       |   5 -
 src/hooks/pagination.ts                       |   4 +-
 src/router/routes/modules/system.ts           |   2 +-
 .../iot/device/components/device-edit.vue     |   2 +-
 .../iot/product/components/product-edit.vue   | 228 ++++++------------
 .../notice/components/message-edit.vue        |   3 +-
 src/views/notification/notice/index.vue       |  45 ++--
 .../system/menu/components/menu-edit.vue      |  70 +++---
 src/views/system/menu/index.vue               |   1 +
 src/views/system/user/index.vue               |  43 +---
 src/views/user/bulletin-card/index.vue        |   4 +-
 src/views/user/messages/index.vue             |   2 +-
 13 files changed, 157 insertions(+), 278 deletions(-)

diff --git a/src/api/menu.ts b/src/api/menu.ts
index 3f67ef5..eba8a5e 100644
--- a/src/api/menu.ts
+++ b/src/api/menu.ts
@@ -14,7 +14,7 @@ export interface MenuRecord {
     order: number;
     permissions: string[];
     showInMenu?: boolean;
-    menuOrder?: string;
+    menuOrder?: number;
   };
   children?: MenuRecord[] ;
 };
@@ -22,6 +22,30 @@ export interface MenuRecord {
 export interface MenuCreateRecord extends MenuRecord{
   type: string;
 }
+export interface MenuUpdateRecord {
+  pid?: number;
+  name: string;
+  path: string;
+  locale?: string;
+  icon?: string;
+  createTime?: string;
+  createBy?: string;
+  type: string;
+  requiresAuth?: boolean;
+  hideInMenu?: boolean;
+  menuOrder?: number;
+  permissions: string;
+
+
+
+
+}
+
+// 获取详情
+export const queryMenuDetail = (id: string | number) => {
+  return axios.get(`/api/rest/menu/${id}`);
+};
+
 
 export const queryMenuList = (data: string) => {
   return axios({
diff --git a/src/api/message-mgmt.ts b/src/api/message-mgmt.ts
index 23ea754..090e468 100644
--- a/src/api/message-mgmt.ts
+++ b/src/api/message-mgmt.ts
@@ -3,10 +3,6 @@ import axios from 'axios';
 export interface MessageRecord {
   userId?: string;
   title?: string;
-  type?: string;
-  name?: string;
-  system?: boolean;
-  isRead?: boolean;
   createAtBegin?: string;
   createAtEnd?: string;
   current: number;
@@ -21,7 +17,6 @@ export interface MessageCreateRecord {
   html: string;
   title: string;
   content: string;
-  attachmentIds?: string[];
 }
 
 // 查看详情
diff --git a/src/hooks/pagination.ts b/src/hooks/pagination.ts
index 97ea2bb..026b82f 100644
--- a/src/hooks/pagination.ts
+++ b/src/hooks/pagination.ts
@@ -1,13 +1,13 @@
 
 export default function usePagination(initValue = false) {
   const pagination: any = {
-    pages: 1,
+    page: 1,
     size: 10,
     current: 1,
     total: 0,
   };
   const setPagination = (value: any) => {
-    pagination.pages = value.page;
+    pagination.page = value.page;
     pagination.size = value.size;
     pagination.current = value.current;
     pagination.total = value.total;
diff --git a/src/router/routes/modules/system.ts b/src/router/routes/modules/system.ts
index 7231e0a..f6e6138 100644
--- a/src/router/routes/modules/system.ts
+++ b/src/router/routes/modules/system.ts
@@ -64,7 +64,7 @@ const SYSTEM: AppRouteRecordRaw = {
         locale: '权限管理',
         title: '权限管理',
         requiresAuth: true,
-        permissions: ['system:authority'],
+        permissions: ['system:authorityHidden'],
       },
     },
     {
diff --git a/src/views/iot/device/components/device-edit.vue b/src/views/iot/device/components/device-edit.vue
index 3d21f0b..bf9055e 100644
--- a/src/views/iot/device/components/device-edit.vue
+++ b/src/views/iot/device/components/device-edit.vue
@@ -252,7 +252,7 @@
           };
         });
         loading.value = false;
-      }, 2000);
+      }, 1000);
     } else {
       options.value = [];
     }
diff --git a/src/views/iot/product/components/product-edit.vue b/src/views/iot/product/components/product-edit.vue
index 338b317..fd62c2d 100644
--- a/src/views/iot/product/components/product-edit.vue
+++ b/src/views/iot/product/components/product-edit.vue
@@ -92,53 +92,6 @@
         field="params"
         label="参数"
       >
-<!--        <a-table-->
-<!--          :columns="columns"-->
-<!--          :data="paramsData"-->
-<!--          :bordered="false"-->
-<!--          :pagination="false"-->
-<!--          :table-layout-fixed="true"-->
-<!--          :show-header="false"-->
-<!--          :hoverable="false"-->
-<!--          :column-resizable="true"-->
-<!--          :filter-icon-align-left="true"-->
-<!--          :body-cell-class="{ padding: '0px',marginLeft: '-10px' }"-->
-<!--        >-->
-<!--          <template #name="{ record }">-->
-<!--            <a-input-->
-<!--              v-model="record.name"-->
-<!--              placeholder="名称"-->
-<!--            />-->
-<!--          </template>-->
-<!--          <template #identifier="{ record }">-->
-<!--            <a-input-->
-<!--              v-model="record.identifier"-->
-<!--              placeholder="标识"-->
-<!--            />-->
-<!--          </template>-->
-<!--          <template #dataType="{ record }">-->
-<!--            <a-select-->
-<!--              v-model="record.dataType"-->
-<!--              :options="dataTypeOptions"-->
-<!--              allow-search-->
-<!--            />-->
-<!--          </template>-->
-<!--          <template #type="{ record }">-->
-<!--            <a-select-->
-<!--              v-model="record.type"-->
-<!--              :options="typeOptions"-->
-<!--              allow-search-->
-<!--            />-->
-<!--          </template>-->
-<!--          <template #operation="{ record }">-->
-<!--            <a-button type="text"  @click="handleDeleteParams(record)"><icon-minus-circle /></a-button>-->
-<!--          </template>-->
-<!--          <template #footer>-->
-<!--            <a-button  @click="handleAddParams" style="width: 100%" >-->
-<!--              <icon-plus />-->
-<!--            </a-button>-->
-<!--          </template>-->
-<!--        </a-table>-->
         <div style="width: 100%">
           <div style="width: 100%;margin-bottom: 5px; ">
             <a-space v-for="(param,index) in paramsData" :key="index" style="margin-bottom: 5px">
@@ -162,75 +115,75 @@
     </template>
   </a-modal>
 
-  <a-modal
-    width="900px"
-    :visible="paramsVisible"
-    @cancel="paramsCancel"
-  >
-    <template #title>添加参数</template>
-    <a-form
-      ref="CreateRef"
-      :model="paramsData"
-      :style="{ width: '650px' }"
-    >
-      <!-- 添加参数  -->
-      <a-form-item
-        field="name"
-        label="参数名称"
-        :rules="[{ required: true, message: '参数名称不能为空' }]"
-        :validate-trigger="['change']"
-      >
-        <a-input
-          v-model="paramsData.name"
-          placeholder='请选择参数名称'
-        />
-      </a-form-item>
-      <!-- 参数标识  -->
-      <a-form-item
-        field="identifier"
-        label="参数标识"
-        :rules="[{ required: true, message: '参数标识不能为空' }]"
-        :validate-trigger="['change']"
-      >
-        <a-input
-          v-model="paramsData.identifier"
-          placeholder='请选择参数标识'
-        />
-      </a-form-item>
+<!--  <a-modal-->
+<!--    width="900px"-->
+<!--    :visible="paramsVisible"-->
+<!--    @cancel="paramsCancel"-->
+<!--  >-->
+<!--    <template #title>添加参数</template>-->
+<!--    <a-form-->
+<!--      ref="CreateRef"-->
+<!--      :model="paramsData"-->
+<!--      :style="{ width: '650px' }"-->
+<!--    >-->
+<!--      &lt;!&ndash; 添加参数  &ndash;&gt;-->
+<!--      <a-form-item-->
+<!--        field="name"-->
+<!--        label="参数名称"-->
+<!--        :rules="[{ required: true, message: '参数名称不能为空' }]"-->
+<!--        :validate-trigger="['change']"-->
+<!--      >-->
+<!--        <a-input-->
+<!--          v-model="paramsData.name"-->
+<!--          placeholder='请选择参数名称'-->
+<!--        />-->
+<!--      </a-form-item>-->
+<!--      &lt;!&ndash; 参数标识  &ndash;&gt;-->
+<!--      <a-form-item-->
+<!--        field="identifier"-->
+<!--        label="参数标识"-->
+<!--        :rules="[{ required: true, message: '参数标识不能为空' }]"-->
+<!--        :validate-trigger="['change']"-->
+<!--      >-->
+<!--        <a-input-->
+<!--          v-model="paramsData.identifier"-->
+<!--          placeholder='请选择参数标识'-->
+<!--        />-->
+<!--      </a-form-item>-->
 
-      <a-form-item
-        field="dataType"
-        label="数据类型"
-        :rules="[{ required: true, message: '数据类型不能为空' }]"
-        :validate-trigger="['change']"
-      >
-        <a-select
-          v-model="paramsData.dataType"
-          placeholder='请输入数据类型'
-          :options="dataTypeOptions"
-          allow-search
-        />
-      </a-form-item>
-      <a-form-item
-        field="type"
-        label="参数类型"
-        :rules="[{ required: true, message: '参数类型不能为空' }]"
-        :validate-trigger="['change']"
-      >
-        <a-select
-          v-model="paramsData.type"
-          placeholder='请输入参数类型'
-          :options="typeOptions"
-          allow-search
-        />
-      </a-form-item>
-    </a-form>
+<!--      <a-form-item-->
+<!--        field="dataType"-->
+<!--        label="数据类型"-->
+<!--        :rules="[{ required: true, message: '数据类型不能为空' }]"-->
+<!--        :validate-trigger="['change']"-->
+<!--      >-->
+<!--        <a-select-->
+<!--          v-model="paramsData.dataType"-->
+<!--          placeholder='请输入数据类型'-->
+<!--          :options="dataTypeOptions"-->
+<!--          allow-search-->
+<!--        />-->
+<!--      </a-form-item>-->
+<!--      <a-form-item-->
+<!--        field="type"-->
+<!--        label="参数类型"-->
+<!--        :rules="[{ required: true, message: '参数类型不能为空' }]"-->
+<!--        :validate-trigger="['change']"-->
+<!--      >-->
+<!--        <a-select-->
+<!--          v-model="paramsData.type"-->
+<!--          placeholder='请输入参数类型'-->
+<!--          :options="typeOptions"-->
+<!--          allow-search-->
+<!--        />-->
+<!--      </a-form-item>-->
+<!--    </a-form>-->
 
-    <template #footer>
-      <a-button class="editor-button"  @click="paramsCancel">取消</a-button>
-      <a-button class="editor-button"  type="primary" @click="paramsSubmit">确定</a-button>
-    </template>
-  </a-modal>
+<!--    <template #footer>-->
+<!--      <a-button class="editor-button"  @click="paramsCancel">取消</a-button>-->
+<!--      <a-button class="editor-button"  type="primary" @click="paramsSubmit">确定</a-button>-->
+<!--    </template>-->
+<!--  </a-modal>-->
 
 </template>
 
@@ -256,45 +209,7 @@
   });
   const { visible, setVisible } = useVisible(false);
   const CreateRef = ref<FormInstance>();
-  const formData = ref<any>({
-    // params: [],
-    // ...props.prem,
-  });
-  const columns=[
-    {
-      title: '参数名称',
-      dataIndex: 'name',
-      slotName: 'name',
-      width: '120',
-    },
-    {
-      title: '参数标识',
-      dataIndex: 'identifier',
-      slotName: 'identifier',
-      width: '120',
-      align: 'left'
-    },
-    {
-      title: '数据类型',
-      dataIndex: 'dataType',
-      slotName: 'dataType',
-      width: '150',
-      align: 'left'
-    },
-    {
-      title: '参数类型',
-      dataIndex: 'type',
-      slotName: 'type',
-      width: '180',
-      align: 'left'
-    },
-    {
-      title: '操作',
-      dataIndex: 'operation',
-      slotName: 'operation',
-      align: 'left'
-    }
-  ];
+  const formData = ref<any>({});
   const paramsData = ref([
     {
       name: '',
@@ -362,7 +277,7 @@
     },
   ]);
   const paramsVisible = ref(false);
-  const paramsName = ref([]);
+  // const paramsName = ref([]);
   const fetchData = async (Id: number | undefined) => {
     const res = await queryProductDetail(Id);
     formData.value = res.data;
@@ -378,6 +293,7 @@
   // 提交
   const handleSubmit = async () => {
     const valid = await CreateRef.value?.validate();
+    console.log(valid);
     if (!valid) {
       // 新增
       if (props.isCreate) {
@@ -431,8 +347,8 @@
   // 参数模态框提交
   const paramsSubmit = () => {
     paramsVisible.value = false;
-    formData.value.params.push(paramsData.value);
-    paramsName.value.push(paramsData.value.name);
+    formData.value.params?.push(paramsData.value);
+    // paramsName.value.push(paramsData.value.name);
   }
   // 关闭
   const handleCancel = async () => {
diff --git a/src/views/notification/notice/components/message-edit.vue b/src/views/notification/notice/components/message-edit.vue
index 99854ef..57bbfa5 100644
--- a/src/views/notification/notice/components/message-edit.vue
+++ b/src/views/notification/notice/components/message-edit.vue
@@ -58,7 +58,7 @@
       >
         <!--        v-if="isCreate"-->
         <a-input
-          v-model="formData.attachment"
+          v-model="formData.remark"
           placeholder='请输入备注'
         />
       </a-form-item>
@@ -393,7 +393,6 @@
   const handleSubmit = async () => {
     const valid = await CreateRef.value?.validate();
     if (!valid) {
-      formData.value.permissionIds = checkKeys.value;
       // 新增
       if (props.isCreate) {
         // formData.value.username = formData.value.email;
diff --git a/src/views/notification/notice/index.vue b/src/views/notification/notice/index.vue
index 10ba89b..ab2a9ad 100644
--- a/src/views/notification/notice/index.vue
+++ b/src/views/notification/notice/index.vue
@@ -23,7 +23,7 @@
                   />
                 </a-form-item>
               </a-col>
-              <a-col :span="10">
+              <a-col :span="12">
                 <a-form-item field="Time" label='时间'>
                   <a-range-picker
                     show-time
@@ -32,27 +32,15 @@
                   />
                 </a-form-item>
               </a-col>
-              <a-col :span="9">
-                <a-form-item
-                  field="name"
-                  label='名称'
-                >
-                  <a-input
-                    v-model="formModel.name"
-                    style="width: 360px"
-                    placeholder='请输入名称'
-                  />
-                </a-form-item>
-              </a-col>
 
 
 
             </a-row>
           </a-form>
         </a-col>
-        <a-divider style="height: 84px" direction="vertical" />
+<!--        <a-divider style="height: 84px" direction="vertical" />-->
         <a-col :flex="'86px'" style="text-align: right">
-          <a-space direction="vertical" :size="18">
+          <a-space :size="18">
             <a-button type="primary" @click="search">
               <template #icon>
                 <icon-search />
@@ -193,12 +181,7 @@
 
   const generateFormModel = () => {
     return {
-      userId: '',
       title: '',
-      type: '',
-      name: '',
-      system: '',
-      isRead: '',
       createAtBegin: '',
       createAtEnd: '',
     };
@@ -243,12 +226,9 @@
     //   dataIndex: 'username',
     // },
     {
-      title: '状态',
-      dataIndex: 'isRead',
-      slotName: 'isRead',
-      sortable: {
-        sortDirections: ['ascend', 'descend'],
-      },
+      title: '备注',
+      dataIndex: 'remark',
+      slotName: 'remark',
     },
 
   ]);
@@ -258,7 +238,7 @@
   ) => {
     setLoading(true);
     try {
-      const res: any = await messageStore.queryMessageList(params);
+      const res = await messageStore.queryMessageList(params);
       renderData.value = res.data.records;
       setPagination(res.data);
     } catch (err) {
@@ -279,8 +259,9 @@
 
   // 分页发生改变
   const onPageChange = (current: number) => {
-    pagination.pages = current;
-    pagination.current = current;
+    setPagination({
+      current,
+    });
     search();
   };
   // 时间范围
@@ -292,8 +273,10 @@
   };
 
   // 数据条数改变
-  const onSizeChange = (Size: number) => {
-    pagination.size = Size;
+  const onSizeChange = (size: number) => {
+    setPagination({
+      size,
+    })
     search();
   };
 
diff --git a/src/views/system/menu/components/menu-edit.vue b/src/views/system/menu/components/menu-edit.vue
index bb47e4c..bc9360b 100644
--- a/src/views/system/menu/components/menu-edit.vue
+++ b/src/views/system/menu/components/menu-edit.vue
@@ -73,66 +73,66 @@
         />
       </a-form-item>
       <a-form-item
-        field="meta.icon"
+        field="icon"
         label="图标"
         :validate-trigger="['change', 'input']"
         :rules="[{ required: true, message: '请输入图标' }]"
       >
         <a-input
-          v-model="formData.meta.icon"
+          v-model="formData.icon"
           placeholder='请输入图标'
         />
       </a-form-item>
       <a-form-item
-        field="meta.locale"
+        field="locale"
         label="应用区域"
         :validate-trigger="['change', 'input']"
         :rules="[{ required: true, message: '应用区域' }]"
       >
         <a-input
-          v-model="formData.meta.locale"
+          v-model="formData.locale"
           placeholder='请输入应用区域'
         />
       </a-form-item>
       <a-form-item
-        field="meta.requiresAuth"
+        field="requiresAuth"
         label="认证"
       >
         <a-switch
-          v-model="formData.meta.requiresAuth"
+          v-model="formData.requiresAuth"
           :checked-value="true"
           :unchecked-value="false"
         />
       </a-form-item>
       <a-form-item
-        field="meta.hideInMenu"
+        field="hideInMenu"
         label="隐藏"
       >
         <a-switch
-          v-model="formData.meta.hideInMenu"
+          v-model="formData.hideInMenu"
           :checked-value="true"
           :unchecked-value="false"
         />
       </a-form-item>
       <a-form-item
-        field="meta.menuOrder"
+        field="menuOrder"
         label="菜单排序"
         :validate-trigger="['change', 'input']"
         :rules="[{ required: true, message: '请选择菜单排序' }]"
       >
         <a-input
-          v-model="formData.meta.menuOrder"
-          placeholder='请选择菜单排序'
+          v-model="formData.menuOrder"
+          placeholder='请输入菜单排序'
         />
       </a-form-item>
       <a-form-item
-        field="meta.permissions"
+        field="permissions"
         label="权限"
         :validate-trigger="['change', 'input']"
         :rules="[{ required: true, message: '请输入权限' }]"
       >
         <a-input
-          v-model="formData.meta.permissions[0]"
+          v-model="formData.permissions"
           placeholder='请输入权限'
         />
       </a-form-item>
@@ -145,16 +145,17 @@
   import { computed, PropType, ref } from 'vue';
   import { FormInstance } from '@arco-design/web-vue/es/form';
   import { Message } from '@arco-design/web-vue';
-  import { createMenu, MenuCreateRecord, MenuRecord, updateMenu } from '@/api/menu';
+  import { createMenu, MenuRecord, MenuUpdateRecord, queryMenuDetail, updateMenu } from '@/api/menu';
 
   const props = defineProps({
-    menu: {
-      type: Object as PropType<MenuRecord>,
-    },
     menuData: {
       type: Object as PropType<MenuRecord>,
     },
     isCreate: Boolean,
+    id: {
+      type: Number,
+      default: -1
+    }
   });
   const modalTitle = computed(() => {
     return props.isCreate ? '新建菜单' : '编辑菜单';
@@ -162,31 +163,25 @@
   const { visible, setVisible } = useVisible(false);
   const createEditRef = ref<FormInstance>();
 
-  const formData = ref<MenuCreateRecord>({
+  const formData = ref<MenuUpdateRecord>({
     type: '',
     name: '',
     path: '',
-    meta: {
-      icon: '',
-      locale: '',
-      requiresAuth: false,
-      hideInMenu: false,
-      menuOrder: '0',
-      permissions: [],
-      order: 0,
-      showInMenu: false
-    },
-      ...props.menu,
-    }
-  );
+    locale: '',
+    icon: '',
+    requiresAuth: true,
+    hideInMenu: false,
+    menuOrder: 0,
+    permissions:''
+  });
   const typeOptions = computed(() => [
     {
-      label: '菜单',
-      value: 1,
+      label: '页面',
+      value: 'PAGE',
     },
     {
-      label: '权限',
-      value: 2,
+      label: '操作',
+      value: "OPERATION",
     },
   ]);
 
@@ -195,6 +190,11 @@
   // 组件被点击
   const handleClick = () => {
     setVisible(true);
+    if(!props.isCreate){
+      queryMenuDetail(props.id).then(res => {
+        formData.value = res.data;
+      });
+    }
   };
 
   // 提交
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 36581c0..b6f4bd2 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -132,6 +132,7 @@
           <MenuEdit
             ref="editRef"
             :menu="record"
+            :id="record.id"
             :menuData="renderData"
             :is-create="false"
             @refresh="search"
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 48c1677..2d344e8 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -52,35 +52,12 @@
                       />
                     </a-form-item>
                   </a-col>
-                  <a-col :span="9">
-                    <a-form-item
-                      field="email"
-                      label="Email"
-                    >
-                      <a-input
-                        v-model="formModel.email"
-                        placeholder="请输入Email"
-                      />
-                    </a-form-item>
-                  </a-col>
-                  <a-col :span="9">
-                    <a-form-item
-                      field="enableState"
-                      label="请选择状态"
-                    >
-                      <a-select
-                        v-model="formModel.enableState"
-                        :options="statusOptions"
-                        placeholder="请选择状态"
-                      />
-                    </a-form-item>
-                  </a-col>
                 </a-row>
               </a-form>
             </a-col>
-            <a-divider style="height: 84px" direction="vertical" />
+<!--            <a-divider style="height: 84px" direction="vertical" />-->
             <a-col :flex="'86px'" style="text-align: right">
-              <a-space direction="vertical" :size="18">
+              <a-space :size="18">
                 <a-button type="primary" @click="search">
                   <template #icon>
                     <icon-search />
@@ -188,7 +165,6 @@
             :size="size"
             style="margin-bottom: 40px"
             :filter-icon-align-left="alignLeft"
-            @change="handleSortChange"
             @page-change="onPageChange"
           >
             <template #index="{ rowIndex }">
@@ -247,9 +223,7 @@
   import { computed, onMounted, ref, watch } from 'vue';
 import useLoading from '@/hooks/loading';
 import { UserRecord, UserParams } from '@/api/user';
-// import { getAllDeptTree } from '@/api/dept';
 import { Pagination } from '@/types/global';
-import type { SelectOptionData } from '@arco-design/web-vue/es/select/interface';
 import type { TableColumnData } from '@arco-design/web-vue/es/table/interface';
 import { useUserStore } from '@/store';
 import { Message } from '@arco-design/web-vue';
@@ -345,17 +319,7 @@ const columns = computed<TableColumnData[]>(() => [
     slotName: 'operations',
   },
 ]);
-const statusOptions = computed<SelectOptionData[]>(() => [
-  {
-    label: '启用',
-    value: 'true',
-  },
-  {
-    label: '停用',
-    value: 'false',
-  },
-]);
-// const deptTreeData = ref<any[]>([]);
+
 
 // 获取用户列表
 const fetchData = async (
@@ -435,7 +399,6 @@ const reset = () => {
 
 // 表格内部排序
 const alignLeft = ref(false);
-const handleSortChange = (data: any, extra: any, currentDataSource: any) => {};
 
 // 是否启用
 const enabledStatus = async (record: any) => {
diff --git a/src/views/user/bulletin-card/index.vue b/src/views/user/bulletin-card/index.vue
index a782c6f..89f8691 100644
--- a/src/views/user/bulletin-card/index.vue
+++ b/src/views/user/bulletin-card/index.vue
@@ -179,9 +179,7 @@
 
   // 数据条数改变
   const onSizeChange = (total: number) => {
-    setPagination({
-      total,
-    })
+    pagination.total = total;
     search();
   };
 
diff --git a/src/views/user/messages/index.vue b/src/views/user/messages/index.vue
index fa506a5..0ef8fba 100644
--- a/src/views/user/messages/index.vue
+++ b/src/views/user/messages/index.vue
@@ -242,7 +242,7 @@
 
   // 分页发生改变
   const onPageChange = (current: number) => {
-    pagination.pages = current;
+    pagination.page = current;
     pagination.current = current;
     search();
   };