From c0f9b249e98e87c6188dae3c70394974c21aac70 Mon Sep 17 00:00:00 2001
From: easy <1358086367@qq.com>
Date: Wed, 15 Mar 2023 14:26:49 +0800
Subject: [PATCH] =?UTF-8?q?update:=20uhasPermission=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=E6=9B=B4=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/account/notificationRecord.ts                |  4 +++-
 src/components/Layout/components/Notice.vue          |  4 ++--
 src/views/system/Apply/Save/components/EditForm.vue  |  8 ++++----
 src/views/system/Apply/index.vue                     |  6 +++---
 src/views/system/DataSource/Management/index.vue     |  2 +-
 src/views/system/DataSource/index.vue                | 10 +++++-----
 src/views/system/Department/device/index.vue         | 12 ++++++------
 src/views/system/Department/product/index.vue        |  6 +++---
 src/views/system/Menu/Detail/BasicInfo.vue           |  2 +-
 src/views/system/Menu/Detail/ButtonMange.vue         |  2 +-
 src/views/system/Menu/index.vue                      |  6 +++---
 src/views/system/Permission/index.vue                |  2 +-
 .../system/Platforms/Api/components/ApiTest.vue      |  2 +-
 src/views/system/Role/index.vue                      |  6 +++---
 14 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/src/api/account/notificationRecord.ts b/src/api/account/notificationRecord.ts
index 58cb612f..2485069e 100644
--- a/src/api/account/notificationRecord.ts
+++ b/src/api/account/notificationRecord.ts
@@ -1,7 +1,9 @@
 import server from '@/utils/request'
 
 // 获取记录列表
-export const getList_api = (data:object): any =>server.post(`/notifications/_query`,data)
+export const getList_api = (data:object): any =>server.get(`/notifications/_query`,encodeParams(data))
+// 获取未读记录列表
+export const getListByUnRead_api = (data:object): any =>server.post(`/notifications/_query`,data)
 // 修改记录状态
 export const changeStatus_api = (type:'_read'|'_unread',data:string[]): any =>server.post(`/notifications/${type}`,data)
 
diff --git a/src/components/Layout/components/Notice.vue b/src/components/Layout/components/Notice.vue
index 42ada485..36e6bb38 100644
--- a/src/components/Layout/components/Notice.vue
+++ b/src/components/Layout/components/Notice.vue
@@ -19,7 +19,7 @@
 </template>
 
 <script setup lang="tsx">
-import { getList_api } from '@/api/account/notificationRecord';
+import { getListByUnRead_api } from '@/api/account/notificationRecord';
 import NoticeInfo from './NoticeInfo.vue';
 import { getWebSocket } from '@/utils/websocket';
 import { notification, Button } from 'ant-design-vue';
@@ -93,7 +93,7 @@ const getList = () => {
             },
         ],
     };
-    getList_api(params)
+    getListByUnRead_api(params)
         .then((resp: any) => {
             list.value = resp.result.data;
             total.value = resp.result.total;
diff --git a/src/views/system/Apply/Save/components/EditForm.vue b/src/views/system/Apply/Save/components/EditForm.vue
index f53f2366..bae48b9c 100644
--- a/src/views/system/Apply/Save/components/EditForm.vue
+++ b/src/views/system/Apply/Save/components/EditForm.vue
@@ -714,7 +714,7 @@
                             placeholder="请选中角色"
                         ></j-select>
                         <PermissionButton
-                            :uhasPermission="`${rolePermission}:update`"
+                            :hasPermission="`${rolePermission}:update`"
                             type="link"
                             @click="
                                 clickAddItem(
@@ -755,7 +755,7 @@
                             </template>
                         </j-tree-select>
                         <PermissionButton
-                            :uhasPermission="`${deptPermission}:update`"
+                            :hasPermission="`${deptPermission}:update`"
                             type="link"
                             @click="
                                 clickAddItem(
@@ -1297,7 +1297,7 @@
                                 placeholder="请选中角色"
                             ></j-select>
                             <PermissionButton
-                                :uhasPermission="`${rolePermission}:update`"
+                                :hasPermission="`${rolePermission}:update`"
                                 type="link"
                                 @click="
                                     clickAddItem(
@@ -1332,7 +1332,7 @@
                                 </template>
                             </j-tree-select>
                             <PermissionButton
-                                :uhasPermission="`${deptPermission}:update`"
+                                :hasPermission="`${deptPermission}:update`"
                                 type="link"
                                 @click="
                                     clickAddItem(
diff --git a/src/views/system/Apply/index.vue b/src/views/system/Apply/index.vue
index 214ecf00..382985a5 100644
--- a/src/views/system/Apply/index.vue
+++ b/src/views/system/Apply/index.vue
@@ -20,7 +20,7 @@
                 <template #headerTitle>
                     <div style="display: flex; align-items: center">
                         <PermissionButton
-                            :uhasPermission="`${permission}:add`"
+                            :hasPermission="`${permission}:add`"
                             type="primary"
                             @click="() => table.toSave()"
                         >
@@ -110,7 +110,7 @@
                                 </j-dropdown>
                                 <PermissionButton
                                     v-else
-                                    :uhasPermission="item.permission"
+                                    :hasPermission="item.permission"
                                     :tooltip="item.tooltip"
                                     :pop-confirm="item.popConfirm"
                                     @click="item.onClick"
@@ -151,7 +151,7 @@
                     <j-space :size="16">
                         <PermissionButton
                             v-for="i in table.getActions(slotProps, 'table')"
-                            :uhasPermission="i.permission"
+                            :hasPermission="i.permission"
                             type="link"
                             :tooltip="i.tooltip"
                             :pop-confirm="i.popConfirm"
diff --git a/src/views/system/DataSource/Management/index.vue b/src/views/system/DataSource/Management/index.vue
index 13178048..b2ce39fe 100644
--- a/src/views/system/DataSource/Management/index.vue
+++ b/src/views/system/DataSource/Management/index.vue
@@ -97,7 +97,7 @@
                 </template>
                 <template #action="slotProps">
                     <PermissionButton
-                        :uhasPermission="`{permission}:delete`"
+                        :hasPermission="`{permission}:delete`"
                         type="link"
                         :tooltip="{ title: '删除' }"
                         :popConfirm="{
diff --git a/src/views/system/DataSource/index.vue b/src/views/system/DataSource/index.vue
index 9d5541f0..6e3c567e 100644
--- a/src/views/system/DataSource/index.vue
+++ b/src/views/system/DataSource/index.vue
@@ -20,7 +20,7 @@
                 <template #headerTitle>
                     <PermissionButton
                         type="primary"
-                        :uhasPermission="`${permission}:add`"
+                        :hasPermission="`${permission}:add`"
                         @click="table.openDialog({})"
                     >
                         <AIcon type="PlusOutlined" />新增
@@ -47,7 +47,7 @@
                 <template #action="slotProps">
                     <j-space :size="16">
                         <PermissionButton
-                            :uhasPermission="`${permission}:update`"
+                            :hasPermission="`${permission}:update`"
                             type="link"
                             :tooltip="{
                                 title: '编辑',
@@ -57,7 +57,7 @@
                             <AIcon type="EditOutlined" />
                         </PermissionButton>
                         <PermissionButton
-                            :uhasPermission="`${permission}:manage`"
+                            :hasPermission="`${permission}:manage`"
                             type="link"
                             :tooltip="{
                                 title:
@@ -81,7 +81,7 @@
                             <AIcon type="icon-ziyuankuguanli" />
                         </PermissionButton>
                         <PermissionButton
-                            :uhasPermission="`${permission}:action`"
+                            :hasPermission="`${permission}:action`"
                             type="link"
                             :popConfirm="{
                                 title: `确定要${
@@ -109,7 +109,7 @@
                         </PermissionButton>
 
                         <PermissionButton
-                            :uhasPermission="`${permission}:delete`"
+                            :hasPermission="`${permission}:delete`"
                             type="link"
                             :tooltip="{
                                 title: table.getRowStatus(slotProps)
diff --git a/src/views/system/Department/device/index.vue b/src/views/system/Department/device/index.vue
index cc3ac299..061e90bc 100644
--- a/src/views/system/Department/device/index.vue
+++ b/src/views/system/Department/device/index.vue
@@ -20,7 +20,7 @@
             <template #headerTitle>
                 <j-space>
                     <PermissionButton
-                        :uhasPermission="`${permission}:assert`"
+                        :hasPermission="`${permission}:assert`"
                         type="primary"
                         @click="table.clickAdd"
                     >
@@ -32,7 +32,7 @@
                             <j-menu>
                                 <j-menu-item>
                                     <PermissionButton
-                                        :uhasPermission="`${permission}:bind`"
+                                        :hasPermission="`${permission}:bind`"
                                         :popConfirm="{
                                             title: `是否批量解除绑定`,
                                             onConfirm: () =>
@@ -46,7 +46,7 @@
                                 </j-menu-item>
                                 <j-menu-item>
                                     <PermissionButton
-                                        :uhasPermission="`${permission}:assert`"
+                                        :hasPermission="`${permission}:assert`"
                                         @click="table.clickEdit()"
                                     >
                                         <AIcon type="EditOutlined" />批量编辑
@@ -117,14 +117,14 @@
                     </template>
                     <template #actions>
                         <PermissionButton
-                            :uhasPermission="`${permission}:assert`"
+                            :hasPermission="`${permission}:assert`"
                             @click="table.clickEdit(slotProps)"
                         >
                             <AIcon type="EditOutlined" />
                         </PermissionButton>
 
                         <PermissionButton
-                            :uhasPermission="`${permission}:bind`"
+                            :hasPermission="`${permission}:bind`"
                             :popConfirm="{
                                 title: `是否解除绑定`,
                                 onConfirm: () => table.clickUnBind(slotProps),
@@ -157,7 +157,7 @@
                 <j-space :size="16">
                     <PermissionButton
                         v-for="i in table.getActions(slotProps, 'table')"
-                        :uhasPermission="i.permission"
+                        :hasPermission="i.permission"
                         type="link"
                         :tooltip="i?.tooltip"
                         :pop-confirm="i.popConfirm"
diff --git a/src/views/system/Department/product/index.vue b/src/views/system/Department/product/index.vue
index 3d744e41..ee92f835 100644
--- a/src/views/system/Department/product/index.vue
+++ b/src/views/system/Department/product/index.vue
@@ -20,7 +20,7 @@
             <template #headerTitle>
                 <j-space>
                     <PermissionButton
-                        :uhasPermission="`${permission}:assert`"
+                        :hasPermission="`${permission}:assert`"
                         type="primary"
                         @click="dialogs.addShow = true"
                     >
@@ -32,7 +32,7 @@
                             <j-menu>
                                 <j-menu-item>
                                     <PermissionButton
-                                        :uhasPermission="`${permission}:bind`"
+                                        :hasPermission="`${permission}:bind`"
                                         :popConfirm="{
                                             title: `是否批量解除绑定`,
                                             onConfirm: () =>
@@ -46,7 +46,7 @@
                                 </j-menu-item>
                                 <j-menu-item>
                                     <PermissionButton
-                                        :uhasPermission="`${permission}:assert`"
+                                        :hasPermission="`${permission}:assert`"
                                         @click="() => table.clickEdit()"
                                     >
                                         <AIcon type="EditOutlined" />批量编辑
diff --git a/src/views/system/Menu/Detail/BasicInfo.vue b/src/views/system/Menu/Detail/BasicInfo.vue
index 80bc3a00..1b2cc56d 100644
--- a/src/views/system/Menu/Detail/BasicInfo.vue
+++ b/src/views/system/Menu/Detail/BasicInfo.vue
@@ -203,7 +203,7 @@
 
             <PermissionButton
                 type="primary"
-                :uhasPermission="`${permission}:update`"
+                :hasPermission="`${permission}:update`"
                 @click="form.clickSave"
             >
                 保存
diff --git a/src/views/system/Menu/Detail/ButtonMange.vue b/src/views/system/Menu/Detail/ButtonMange.vue
index dc60930d..b7647e83 100644
--- a/src/views/system/Menu/Detail/ButtonMange.vue
+++ b/src/views/system/Menu/Detail/ButtonMange.vue
@@ -10,7 +10,7 @@
             <template #headerTitle>
                 <PermissionButton
                     type="primary"
-                    :uhasPermission="`${permission}:update`"
+                    :hasPermission="`${permission}:update`"
                     @click="openDialog('新增', {})"
                 >
                     <AIcon type="PlusOutlined" />新增
diff --git a/src/views/system/Menu/index.vue b/src/views/system/Menu/index.vue
index cbe3398f..1ce75f89 100644
--- a/src/views/system/Menu/index.vue
+++ b/src/views/system/Menu/index.vue
@@ -18,7 +18,7 @@
                 <template #headerTitle>
                     <PermissionButton
                         type="primary"
-                        :uhasPermission="`${permission}:add`"
+                        :hasPermission="`${permission}:add`"
                         @click="table.toDetails({})"
                     >
                         <AIcon type="PlusOutlined" />新增
@@ -51,7 +51,7 @@
 
                         <PermissionButton
                             type="link"
-                            :uhasPermission="`${permission}:add`"
+                            :hasPermission="`${permission}:add`"
                             :tooltip="{ title: '新增子菜单' }"
                             @click="table.addChildren(slotProps)"
                         >
@@ -59,7 +59,7 @@
                         </PermissionButton>
                         <PermissionButton
                             type="link"
-                            :uhasPermission="`${permission}:delete`"
+                            :hasPermission="`${permission}:delete`"
                             :tooltip="{ title: '删除' }"
                             :popConfirm="{
                                 title: `是否删除该菜单`,
diff --git a/src/views/system/Permission/index.vue b/src/views/system/Permission/index.vue
index 96de9348..a896627a 100644
--- a/src/views/system/Permission/index.vue
+++ b/src/views/system/Permission/index.vue
@@ -76,7 +76,7 @@
                 <template #action="slotProps">
                     <j-space :size="16">
                         <PermissionButton
-                            :uhasPermission="`${permission}:update`"
+                            :hasPermission="`${permission}:update`"
                             type="link"
                             :tooltip="{
                                 title: '编辑',
diff --git a/src/views/system/Platforms/Api/components/ApiTest.vue b/src/views/system/Platforms/Api/components/ApiTest.vue
index a0a38062..ee0f413e 100644
--- a/src/views/system/Platforms/Api/components/ApiTest.vue
+++ b/src/views/system/Platforms/Api/components/ApiTest.vue
@@ -66,7 +66,7 @@
                                 <template v-else-if="column.key === 'action'">
                                     <PermissionButton
                                         type="link"
-                                        :uhasPermission="`{permission}:delete`"
+                                        :hasPermission="`{permission}:delete`"
                                         :popConfirm="{
                                             title: `确定删除`,
                                             onConfirm: () =>
diff --git a/src/views/system/Role/index.vue b/src/views/system/Role/index.vue
index 8dc5c852..0003310d 100644
--- a/src/views/system/Role/index.vue
+++ b/src/views/system/Role/index.vue
@@ -23,7 +23,7 @@
                 <template #headerTitle>
                     <PermissionButton
                         type="primary"
-                        :uhasPermission="`${permission}:add`"
+                        :hasPermission="`${permission}:add`"
                         @click="dialogVisible = true"
                     >
                         <AIcon type="PlusOutlined" />新增
@@ -33,7 +33,7 @@
                 <template #action="slotProps">
                     <j-space :size="16">
                         <PermissionButton
-                            :uhasPermission="`${permission}:update`"
+                            :hasPermission="`${permission}:update`"
                             type="link"
                             :tooltip="{
                                 title: '编辑',
@@ -44,7 +44,7 @@
                         </PermissionButton>
                         <PermissionButton
                             type="link"
-                            :uhasPermission="`${permission}:delete`"
+                            :hasPermission="`${permission}:delete`"
                             :tooltip="{ title: '删除' }"
                             :popConfirm="{
                                 title: `确定要删除吗`,