11

public/version.json

@@ -1,3 +1,3 @@
 {
-  "value": "20240902152555"
+  "value": "20240903143818"
 }

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' : '']" element-loading-text="获取数据中...">
+    <el-container v-loading="isAppLoadings" class="hc-layout-box" :class="[!isNullES(isLayout) && isLayout === 'no' ? 'is-no-layout' : '']" element-loading-text="获取数据中...">
         <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=""> -->
@@ -45,7 +45,7 @@
 </template>
 
 <script setup>
-import { nextTick, onMounted, onUnmounted, ref, watch } from 'vue'
+import { onMounted, onUnmounted, ref, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { getObjValue, isNullES, useClick } from 'js-fast-way'
 import { HcSocket } from '~src/plugins/HcSocket'
@@ -94,8 +94,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 })
 
 //路由信息
@@ -155,7 +167,9 @@ const cascaderSend = async ({ projectId, contractId }) => {
     if (website.localModel) {
         setTimeout(() => {
             reloadRouter.value = true
-        }, 500)
+        }, 1000)
+    } else {
+        reloadRouter.value = true
     }
 }
 
@@ -194,9 +208,6 @@ const userInfoLoad = ({ user_id }) => {
 // 项目切换
 const cascaderChange = () => {
     reloadRouter.value = false
-    nextTick(() => {
-        reloadRouter.value = true
-    })
 }
 
 //首页