Merge remote-tracking branch 'origin/master'

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')
 }
 </script>

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
   }
 })

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

src/views/system/department/components/ToolToShowUserPicker.vue

@@ -1,6 +1,6 @@
 <template>
   <el-button type="primary" link >
-    {{ modelValue }}
+    {{ modelValue || '请选择' }}
   </el-button>
 </template>
 

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])

src/views/system/department/index.vue

@@ -35,7 +35,7 @@
     <el-table-column prop="createTime" label="创建时间"/>
     <el-table-column prop="oper" label="操作">
       <template #default="{ row }">
-        <el-button type="primary" link @click="goEdit(row.departmentId)">编辑</el-button>
+        <el-button type="primary" v-perm="['admin:department:update']" link @click="goEdit(row.departmentId)">编辑</el-button>
       </template>
     </el-table-column>
   </el-table>

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) {

src/views/system/user/index.vue

@@ -119,10 +119,10 @@ const tableConfig = reactive({
       currentRender: ({row, index}) => {
         return (
           <div>
-            <el-button type="primary" link onClick={()=>handleEdit(row)}>编辑</el-button>
+            <el-button type="primary" link onClick={()=>handleEdit(row)} v-perm={['admin:user:edit']}>编辑</el-button>
             {
               row.userType != 0 ?
-              <el-button type="danger" link onClick={()=>handleDel(row)}>删除</el-button> :
+              <el-button type="danger" link onClick={()=>handleDel(row)} v-perm={['admin:user:del']}>删除</el-button> :
               null
             }