Merge remote-tracking branch 'origin/master'

src/App.vue

@@ -8,5 +8,6 @@ window.addEventListener('beforeunload', e=>beforeunload(e))
 const beforeunload = (()=>{
   const permisstionStore = usePermisstionStroe()
   permisstionStore.setIsLoadRoutes(true)
+  permisstionStore.setIsSuccessReq()
 })
 </script>

src/router/index.js

@@ -203,7 +203,7 @@ router.beforeEach(async (to, form, next) => {
             NProgress.done()
         } else {
             permisstionStore.setIsLoadRoutes(true)
-            if (permisstionStore.isLoadRoutes && permisstionStore.asyncRouters.length == 0) {
+            if (permisstionStore.isLoadRoutes && !permisstionStore.isSussessReq) {
                 await permisstionStore.setAsyncRouters()
                 await authStore.setUserInfo()
                 next({...to, replace: true})

src/stores/permisstion.js

@@ -10,6 +10,7 @@ export const usePermisstionStroe = defineStore('permisstion', () => {
   const asyncRouters = ref([])
   //定义是否加载路由变量
   const isLoadRoutes = ref(false)
+  const isSussessReq = ref(false)
   const menuList = ref([
     {
       name: 'home',
@@ -27,6 +28,10 @@ export const usePermisstionStroe = defineStore('permisstion', () => {
   const setIsLoadRoutes = (status) => {
     return isLoadRoutes.value = status
   }
+
+  const setIsSuccessReq = () => {
+    return isSussessReq.value = false
+  }
   const setAsyncRouters = async () => {
     await getRouters().then(res => {
       if (res.code === 1000) {
@@ -38,6 +43,7 @@ export const usePermisstionStroe = defineStore('permisstion', () => {
         menuList.value = [...menuList.value, ...generateMenu(mData)]
         addAsyncRouters(asyncRouters.value)
         isLoadRoutes.value = false
+        isSussessReq.value = true
       } else {
         isLoadRoutes.value = true
         setTimeout(() => setAsyncRouters(), 3000)
@@ -146,8 +152,10 @@ export const usePermisstionStroe = defineStore('permisstion', () => {
     asyncRouters,
     menuList,
     isLoadRoutes,
+    isSussessReq,
     setAsyncRouters,
     setIsLoadRoutes,
-    removeMenu
+    removeMenu,
+    setIsSuccessReq
   }
 })

src/views/home/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="home-bg">
+  <div class="home-bg" v-if="AuthStore.roles.length">
     <el-row gutter="20">
       <el-col :xs="24" :sm="24" :md="18" :lg="18" :xl="18">
         <div class="left">
@@ -46,11 +46,16 @@
       </el-col>
     </el-row>
   </div>
+  <div v-else style="display: flex; justify-content: center; align-items: center; height: 100%;" >
+    您没有任何角色， 请联系管理员！
+  </div>
 </template>
 
 <script setup lang="jsx">
 import 'element-plus/theme-chalk/display.css'
+import { useAuthStore } from '@/stores/userstore.js'
 
+const AuthStore = useAuthStore()
 const router = useRouter()
 const list = ref([
   {

src/views/project-management/filing/index.vue

@@ -200,11 +200,12 @@ const search = (val) => {
 
 const handleDetail = (row) => {
   router.push({
-    name:'Filing/detail',
+    name:'Implementation/detail',
     query: {
       id: row.requirementId,
       projectId: row.projectId,
-      state: row.state
+      state: row.state,
+      step: '50'
     }
   })
 }

src/views/project-management/implementation/detail.vue

@@ -1,5 +1,5 @@
 <template>
-  <steps :active="3" @setDetail="setDetail" @stepChange="stepChange">
+  <steps :active="cuurentStep" @setDetail="setDetail" @stepChange="stepChange">
     <template #content>
       <collection-detail
         :formData="commonForm.formData"
@@ -49,6 +49,10 @@ const collectionProcessViewer = ref(true)
 const summaryProcessViewer = ref(true)
 const processStore = useProcessStore()
 const companyOption = ref([])
+const cuurentStep = ref()
+route.query.step == '20' && (cuurentStep.value = 2)
+route.query.step == '40' && (cuurentStep.value = 3)
+route.query.step == '50' && (cuurentStep.value = 4)
 const rules = reactive({
   auditOpinion: [{required: true, message: '请输入审核意见', trigger: 'blur'}],
 })

src/views/project-management/implementation/index.vue

@@ -220,7 +220,8 @@ const handleDetail = (row) => {
     query: {
       id: row.requirementId,
       projectId: row.projectId,
-      state: row.state
+      state: row.state,
+      step: '40'
     }
   })
 }

src/views/project-management/initiation/index.vue

@@ -200,11 +200,12 @@ const search = (val) => {
 
 const handleDetail = (row) => {
   router.push({
-    name:'Initiation/detail',
+    name:'Implementation/detail',
     query: {
       id: row.requirementId,
       projectId: row.projectId,
-      state: row.state
+      state: row.state,
+      step: '20'
     }
   })
 }