111

package.json

@@ -18,7 +18,7 @@
         "dayjs": "^1.11.12",
         "echarts": "^5.5.1",
         "element-plus": "^2.8.0",
-        "hc-vue3-ui": "^4.2.0",
+        "hc-vue3-ui": "^4.2.3",
         "js-base64": "^3.7.7",
         "js-fast-way": "^0.5.6",
         "js-md5": "^0.8.3",

src/layout/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-container v-loading="isLoading" class="hc-layout-box" :class="[!isNullES(isLayout) && isLayout === 'no' ? 'is-no-layout' : '']">
+    <el-container v-loading="!isAppLoading" 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=""> -->
@@ -45,12 +45,13 @@
 </template>
 
 <script setup>
-import { computed, nextTick, onMounted, onUnmounted, ref, watch } from 'vue'
-import { useAppStore } from '~src/store'
+import { nextTick, onMounted, onUnmounted, ref, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
-import { initButtons } from '~sto/app'
 import { isNullES, useClick } from 'js-fast-way'
 import { HcSocket } from '~src/plugins/HcSocket'
+import { useAppStore } from '~src/store'
+import { initButtons } from '~sto/app'
+import { useProject } from '~sto/useProject'
 import website from '~src/config'
 
 //初始组合式
@@ -58,15 +59,10 @@ const router = useRouter()
 const useRoutes = useRoute()
 const store = useAppStore()
 
-const reloadRouter = ref(!website.localModel)
+const reloadRouter = ref(false)
 
-const isLoading = computed(() => {
-    if (website.localModel) {
-        return !reloadRouter.value
-    } else {
-        return false
-    }
-})
+//获取项目信息
+const { isAppLoading } = useProject()
 
 //子组件
 import HcTopMenuBar from './modules/HcTopMenu.vue'
@@ -100,6 +96,11 @@ watch(() => [
     isLayout.value = layout ?? layout2
 }, { deep: true })
 
+//监听项目信息变化
+watch(() => isAppLoading.value, (res) => {
+    reloadRouter.value = res
+}, { immediate:true })
+
 //路由信息
 const routerMenuLoad = ({ key }) => {
     menuBarKey.value = key

src/store/modules/useProject.js

@@ -0,0 +1,34 @@
+import { computed, ref, watch } from 'vue'
+import { useAppStore } from '~src/store'
+import { isNullES } from 'js-fast-way'
+
+export function useProject() {
+    const useAppState = useAppStore()
+
+    const projectId = ref(useAppState.getProjectId)
+    const contractId = ref(useAppState.getContractId)
+    const projectInfo = ref(useAppState.getProjectInfo)
+    const contractInfo = ref(useAppState.getContractInfo)
+
+    watch(() => [
+        useAppState.getProjectId, useAppState.getContractId,
+        useAppState.getProjectInfo, useAppState.getContractInfo,
+    ], ([pid, cid, pinfo, cinfo]) => {
+        projectId.value = pid
+        contractId.value = cid
+        projectInfo.value = pinfo
+        contractInfo.value = cinfo
+    }, { deep: true })
+
+    const isAppLoading = computed(() => {
+        return !isNullES(projectId.value) && !isNullES(contractId.value)
+    })
+
+    return {
+        projectId,
+        contractId,
+        projectInfo,
+        contractInfo,
+        isAppLoading,
+    }
+}

yarn.lock

@@ -1982,10 +1982,10 @@ has-flag@^4.0.0:
   resolved "http://39.108.216.210:9000/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-hc-vue3-ui@^4.2.0:
-  version "4.2.0"
-  resolved "http://39.108.216.210:9000/hc-vue3-ui/-/hc-vue3-ui-4.2.0.tgz#4935b2f60cd297cac39204f6f1c950c0465eff73"
-  integrity sha512-AnSA0Wmu+x502QaARBlFU0SleYJX9muVkBcu9DJolbb9hPbHT6Ious0foya07hR8BS3ySyWcjqv6YbV47N5Y0w==
+hc-vue3-ui@^4.2.3:
+  version "4.2.3"
+  resolved "http://39.108.216.210:9000/hc-vue3-ui/-/hc-vue3-ui-4.2.3.tgz#0d4b9d3aa87e73e95cea43aae681327b058dc66c"
+  integrity sha512-OFYgaw18NiohMLEehMhT0YNBY6EsML5C1WUTHlhzFaVddchkYQJImjbP8zVlgGNTLvtfnv9AJNlor97Pat5K8A==
   dependencies:
     axios "^1.7.4"
     dayjs "^1.11.12"