From 6391ab458bf4c24f6de9e0193d15ba20019db45a Mon Sep 17 00:00:00 2001 From: lilinyuan <1084668738@qq.com> Date: Sat, 1 Jun 2024 16:07:57 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E9=80=80=E5=87=BA=E6=97=B6?= =?UTF-8?q?=E5=A4=9A=E6=A0=87=E7=AD=BE=E9=A1=B5=E5=85=A8=E9=83=A8=E6=B8=85?= =?UTF-8?q?=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/navbar/index.vue | 3 +++ src/stores/tagsview.js | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/layout/navbar/index.vue b/src/layout/navbar/index.vue index 71bf04f..9dbef25 100644 --- a/src/layout/navbar/index.vue +++ b/src/layout/navbar/index.vue @@ -26,9 +26,11 @@ import Breadcrumb from './Breadcrumb.vue'; import Hamburger from './Hamburger.vue'; import {useAuthStore} from '@/stores/userstore.js' import {usePermisstionStroe} from '@/stores/permisstion' +import { useTagsView } from '@/stores/tagsview'; const authStore = useAuthStore() const permisstionStore = usePermisstionStroe() +const tagsViewStore = useTagsView() const userInfo = ref({}) const visitedP = ref(false) const router = useRouter() @@ -58,6 +60,7 @@ const handleLogout = () => { authStore.userLogout() permisstionStore.removeMenu() permisstionStore.setIsSuccessReq() + tagsViewStore.removeAllTagView() router.push('/login') } diff --git a/src/stores/tagsview.js b/src/stores/tagsview.js index b278540..268d088 100644 --- a/src/stores/tagsview.js +++ b/src/stores/tagsview.js @@ -56,11 +56,16 @@ export const useTagsView = defineStore('tagsView',()=>{ router.push(lastTagView.path) } + const removeAllTagView = () => { + visitedViews.value.length = 0 + } + return { visitedViews, addVisitedViews, delVisitedViews, delOtherVisitedViews, - delViewAndGoView + delViewAndGoView, + removeAllTagView } }) From d2f9bfcb331db4a1301fb06df83e4d0b7383ae30 Mon Sep 17 00:00:00 2001 From: lilinyuan <1084668738@qq.com> Date: Sat, 1 Jun 2024 16:24:40 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=9F=A5=E8=AF=A2=E4=B8=BA=E7=A9=BA=E7=9A=84?= =?UTF-8?q?=E6=97=B6=E5=80=99=E5=85=B3=E9=97=ADloading?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/project-management/implementation/detail.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/project-management/implementation/detail.vue b/src/views/project-management/implementation/detail.vue index 13281b2..29333c4 100644 --- a/src/views/project-management/implementation/detail.vue +++ b/src/views/project-management/implementation/detail.vue @@ -55,6 +55,7 @@ const getAllInfo = async (state) => { message: msg, type: 'error' }) + loading.close() } if(data===undefined)return; commonForm.value = data From b0199c8fd9a87c609241232c99deac1e5ce39476 Mon Sep 17 00:00:00 2001 From: lilinyuan <1084668738@qq.com> Date: Sat, 1 Jun 2024 17:03:43 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E9=83=A8=E5=88=86=E6=9D=83=E9=99=90?= =?UTF-8?q?=E6=A0=87=E8=AF=86,=20=E4=BF=AE=E5=A4=8D=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E7=BC=96=E8=BE=91bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/ToolToShowUserPicker.vue | 2 +- src/views/system/department/edit.vue | 2 +- src/views/system/department/index.vue | 2 +- src/views/system/role/index.vue | 16 ++++++++-------- src/views/system/user/index.vue | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/views/system/department/components/ToolToShowUserPicker.vue b/src/views/system/department/components/ToolToShowUserPicker.vue index 9f499ff..bd909ad 100644 --- a/src/views/system/department/components/ToolToShowUserPicker.vue +++ b/src/views/system/department/components/ToolToShowUserPicker.vue @@ -1,6 +1,6 @@ diff --git a/src/views/system/department/edit.vue b/src/views/system/department/edit.vue index d084b20..3d3bccd 100644 --- a/src/views/system/department/edit.vue +++ b/src/views/system/department/edit.vue @@ -82,7 +82,7 @@ const getInfo = async () => { const formatIdsToNames = (ids, infoList, key, viewKey) => { const resArr = [] - if(!ids.length) return '--' + if(!ids?.length) return ids.forEach(item=>{ infoList.forEach(v=>{ item == v[key] && resArr.push(v[viewKey]) diff --git a/src/views/system/department/index.vue b/src/views/system/department/index.vue index 10cdf82..b063ea9 100644 --- a/src/views/system/department/index.vue +++ b/src/views/system/department/index.vue @@ -35,7 +35,7 @@ diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index bdf3eee..843176f 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -135,14 +135,14 @@ const tableConfig = reactive({ showOverflowTooltip: false, currentRender: ({row, index}) => { let btn = [{label: '修改', auth: auths.edit, func: ()=>handleEdit(row) , type: 'primary'}] - btn.push( - { - label: '分配用户', - auth: auths.edit, - func: ()=>handleAssign(row), - type: 'primary' - } - ) + // btn.push( + // { + // label: '分配用户', + // auth: auths.edit, + // func: ()=>handleAssign(row), + // type: 'primary' + // } + // ) if(authStore.roles.includes('superAdmin')) { btn.push({label: '删除', auth: auths.edit, func: ()=>handleDel(row) , type: 'danger'}) } else if(!row.template) { diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 9ed57b2..45b2763 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -119,10 +119,10 @@ const tableConfig = reactive({ currentRender: ({row, index}) => { return (
- handleEdit(row)}>编辑 + handleEdit(row)} v-perm={['admin:user:edit']}>编辑 { row.userType != 0 ? - handleDel(row)}>删除 : + handleDel(row)} v-perm={['admin:user:del']}>删除 : null }