ZaiZai hai 1 ano
pai
achega
b0a62159c9
Modificáronse 1 ficheiros con 17 adicións e 6 borrados
  1. 17 6
      src/layout/index.vue

+ 17 - 6
src/layout/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-container v-loading="!isAppLoading" class="hc-layout-box" :class="[!isNullES(isLayout) && isLayout === 'no' ? 'is-no-layout' : '']">
+    <el-container v-loading="isAppLoadings" class="hc-layout-box" :class="[!isNullES(isLayout) && isLayout === 'no' ? 'is-no-layout' : '']">
         <el-header class="hc-layout-header">
             <div class="hc-layout-header-logo" :style="`width: ${isCollapse ? '0px' : '200px'};`" @click="logoClick">
                 <!-- <img id="logo-icon" :src="appLogoIcon" alt=""> -->
@@ -99,8 +99,20 @@ watch(() => [
 }, { deep: true })
 
 //监听项目信息变化
+const isAppLoadings = ref(true)
 watch(() => isAppLoading.value, (res) => {
-    reloadRouter.value = res
+    if (!website.localModel) {
+        reloadRouter.value = res
+        isAppLoadings.value = !res
+    } else {
+        if (res) {
+            setTimeout(() => {
+                isAppLoadings.value = false
+            }, 1000)
+        } else {
+            isAppLoadings.value = true
+        }
+    }
 }, { immediate:true })
 
 //路由信息
@@ -177,7 +189,9 @@ const cascaderSend = async ({ projectId, contractId }) => {
     if (website.localModel) {
         setTimeout(() => {
             reloadRouter.value = true
-        }, 500)
+        }, 1000)
+    } else {
+        reloadRouter.value = true
     }
 }
 
@@ -207,9 +221,6 @@ const socketData = async (res) => {
 // 项目切换
 const cascaderChange = () => {
     reloadRouter.value = false
-    nextTick(() => {
-        reloadRouter.value = true
-    })
 }
 
 //首页