更新依赖和修复项目名称

package.json

@@ -18,7 +18,7 @@
         "dayjs": "^1.11.10",
         "echarts": "^5.5.0",
         "element-plus": "^2.5.6",
-        "hc-vue3-ui": "^3.1.7",
+        "hc-vue3-ui": "^3.1.8",
         "js-base64": "^3.7.7",
         "js-fast-way": "0.4.6",
         "js-md5": "^0.8.3",
@@ -33,7 +33,7 @@
     "devDependencies": {
         "@vitejs/plugin-vue": "^4.5.2",
         "@vue/compiler-sfc": "^3.4.20",
-        "archiver": "^6.0.1",
+        "archiver": "^6.0.2",
         "autoprefixer": "^10.4.17",
         "cssnano": "^6.0.5",
         "eslint": "^8.57.0",

src/layout/modules/Cascader.vue

@@ -69,6 +69,7 @@ const setSend = (pid, cid) => {
         projectId: pid,
         contractId: cid,
     })
+    emit('change')
 }
 
 //项目被选择
@@ -87,11 +88,7 @@ const projectContractChange = (val) => {
         projectInfo.value = UserProjectInfo
         contractInfo.value = UserContractInfo
         window.$message?.info('切换了项目，数据更新中')
-        emit('send', {
-            projectId: val[0],
-            contractId: val[1],
-        })
-        emit('change')
+        setSend(val[0], val[1])
     }
 }
 </script>

src/store/modules/app.js

@@ -101,6 +101,7 @@ const getProjectArr = async (error, data) => {
     }
     //处理合同段的别名
     projectList.forEach(item => {
+        item['name'] = item['projectName']
         let contractArr = item['contractInfoList'] || []
         contractArr.forEach(items => {
             items['projectAlias'] = items['name']

src/views/data-fill/division.vue

@@ -6,7 +6,7 @@
                     <HcIcon name="stack" />
                 </div>
                 <div class="ml-2 project-name-box">
-                    <div class="project-name">{{ projectInfo.name }}</div>
+                    <div class="project-name">{{ projectInfo.projectName }}</div>
                 </div>
             </div>
             <div v-loading="treeLoading" class="hc-tree-box" element-loading-text="加载中...">
@@ -574,7 +574,7 @@ const wbsElTreeClick = ({ node, data, keys }) => {
         } else {
             tableProjectData.value = []
         }
-       
+
     }
 }
 
@@ -645,14 +645,14 @@ const ElTreeMenuClick = async ({ key, node, data, keys }) => {
     setStoreValue('wbsTreeExpandKeys', keys)
     TreeAutoExpandKeys.value = keys || []
     if (key === 'add') {
-        isCustom.value = data?.isCustom 
+        isCustom.value = data?.isCustom
         addTreeNodeId.value = data?.primaryKeyId
         addTreeNodeOldId.value = data?.oldId
         addNodeLoading.value = false
         addNodeModal.value = true
 
     } else if (key === 'add1') {
-  
+
     addTreeNodeId.value = data?.primaryKeyId
     addTreeNodeOldId.value = data?.oldId
     addNodeLoadingCus.value = false
@@ -850,7 +850,7 @@ const copyNodeElTreeClick = ({ data, node }) => {
 
                 }
         }
-      
+
 
 
     } else if (TabKey === '3') {

src/views/data-fill/query.vue

@@ -9,7 +9,7 @@
                     <HcIcon name="stack" />
                 </div>
                 <div class="ml-2 project-name-box">
-                    <div class="project-alias">{{ projectInfo.name }}</div>
+                    <div class="project-alias">{{ projectInfo.projectName }}</div>
                 </div>
             </div>
             <div class="hc-tree-box">

src/views/data-fill/wbs.vue

@@ -11,7 +11,7 @@
                         <HcIcon name="stack" />
                     </div>
                     <div class="ml-2 project-name-box">
-                        <div class="project-alias">{{ projectInfo.name }}</div>
+                        <div class="project-alias">{{ projectInfo.projectName }}</div>
                     </div>
                 </div>
                 <div class="hc-tree-box">
@@ -547,10 +547,10 @@ const useRoutes = useRoute()
 const useAppState = useAppStore()
 
 //全局变量
-const projectId = ref(useAppState.getProjectId)
-const contractId = ref(useAppState.getContractId)
-const projectInfo = ref(useAppState.getProjectInfo)
-const contractInfo = ref(useAppState.getContractInfo)
+const projectId = ref(useAppState.projectId)
+const contractId = ref(useAppState.contractId)
+const projectInfo = ref(useAppState.projectInfo)
+const contractInfo = ref(useAppState.contractInfo)
 const isCollapse = ref(useAppState.getCollapse)
 const userInfo = ref(useAppState.getUserInfo)
 //路由参数
@@ -615,6 +615,7 @@ watch(() => [
 })
 //渲染完成
 onMounted(() => {
+    console.log(projectInfo.value)
     treeLoading.value = typeName === 'tree'
     setContractType(contractInfo.value?.contractType)
     getDictionaryApi()

src/views/ledger/write.vue

@@ -7,7 +7,7 @@
                 </div>
                 <div class="ml-2 project-name-box">
                     <span class="text-xl text-cut project-alias">{{ projectInfo.projectAlias }}</span>
-                    <div class="text-xs text-cut project-name">{{ projectInfo.name }}</div>
+                    <div class="text-xs text-cut project-name">{{ projectInfo.projectName }}</div>
                 </div>
             </div>
             <div class="hc-tree-box">
@@ -18,7 +18,7 @@
                     /> -->
                     <HcLazyTree
                         is-counts is-type
-                        :auto-expand-keys="treeAutoExpandKeys" 
+                        :auto-expand-keys="treeAutoExpandKeys"
                         @load="treeLoadNode"
                         @nodeLoading="treeNodeLoading" @nodeTap="nodeWbsElTreeClick"
                     />

src/views/other-file/image-form.vue

@@ -6,7 +6,7 @@
                     <HcIcon name="stack" />
                 </div>
                 <div class="ml-2 project-name-box">
-                    <span class="project-alias">{{ projectInfo.name }}</span>
+                    <span class="project-alias">{{ projectInfo.projectName }}</span>
                 </div>
             </div>
             <div v-if="isshowTree" class="hc-tree-box">

src/views/other-file/image-view.vue

@@ -7,7 +7,7 @@
                         <HcIcon name="stack" />
                     </div>
                     <div class="ml-2 project-name-box">
-                        <span class="project-alias">{{ projectInfo.name }}</span>
+                        <span class="project-alias">{{ projectInfo.projectName }}</span>
                     </div>
                 </div>
                 <div v-if="dataType === 1" class="hc-tree-box">

src/views/other-file/project-scanning.vue

@@ -6,7 +6,7 @@
                     <HcIcon name="stack" />
                 </div>
                 <div class="ml-2 project-name-box">
-                    <span class="project-alias">{{ projectInfo.name }}</span>
+                    <span class="project-alias">{{ projectInfo.projectName }}</span>
                 </div>
             </div>
             <div class="hc-tree-box">

src/views/other/first-item.vue

@@ -6,7 +6,7 @@
                     <HcIcon name="stack" />
                 </div>
                 <div class="ml-2 project-name-box">
-                    <span class="project-alias">{{ projectInfo.name }}</span>
+                    <span class="project-alias">{{ projectInfo.projectName }}</span>
                 </div>
             </div>
             <div class="hc-tree-box">

src/views/other/first-itemcopy.vue

@@ -6,7 +6,7 @@
                     <HcIcon name="stack" />
                 </div>
                 <div class="ml-2 project-name-box">
-                    <span class="project-alias">{{ projectInfo.name }}</span>
+                    <span class="project-alias">{{ projectInfo.projectName }}</span>
                 </div>
             </div>
             <div class="hc-tree-box">

src/views/schedule/write.vue

@@ -6,7 +6,7 @@
                     <HcIcon name="stack" />
                 </div>
                 <div class="ml-2 project-name-box">
-                    <span class="project-alias">{{ projectInfo.name }}</span>
+                    <span class="project-alias">{{ projectInfo.projectName }}</span>
                 </div>
             </div>
             <div class="hc-tree-box">

src/views/tentative/collect/monthly.vue

@@ -6,7 +6,7 @@
                     <HcIcon name="stack" />
                 </div>
                 <div class="ml-2 project-name-box">
-                    <span class="project-alias">{{ projectInfo.name }}</span>
+                    <span class="project-alias">{{ projectInfo.projectName }}</span>
                 </div>
             </div>
             <div class="hc-tree-search-box">

src/views/tentative/collect/test.vue

@@ -6,7 +6,7 @@
                     <HcIcon name="stack" />
                 </div>
                 <div class="ml-2 project-name-box">
-                    <span class="project-alias">{{ projectInfo.name }}</span>
+                    <span class="project-alias">{{ projectInfo.projectName }}</span>
                 </div>
             </div>
             <div class="hc-tree-box">

src/views/tentative/detect/outside.vue

@@ -6,7 +6,7 @@
                     <HcIcon name="stack" />
                 </div>
                 <div class="ml-2 project-name-box">
-                    <span class="project-alias">{{ projectInfo.name }}</span>
+                    <span class="project-alias">{{ projectInfo.projectName }}</span>
                 </div>
             </div>
             <div class="hc-tree-box">

src/views/tentative/detect/test.vue

@@ -9,7 +9,7 @@
                     <HcIcon name="stack" />
                 </div>
                 <div class="ml-2 project-name-box">
-                    <div class="project-alias">{{ projectInfo.name }}</div>
+                    <div class="project-alias">{{ projectInfo.projectName }}</div>
                 </div>
             </div>
             <div class="hc-tree-box">

src/views/tentative/detect/third.vue

@@ -6,7 +6,7 @@
                     <HcIcon name="stack" />
                 </div>
                 <div class="ml-2 project-name-box">
-                    <span class="project-alias">{{ projectInfo.name }}</span>
+                    <span class="project-alias">{{ projectInfo.projectName }}</span>
                 </div>
             </div>
             <div class="hc-tree-box">

src/views/tentative/laboratory/print.vue

@@ -6,7 +6,7 @@
                     <HcIcon name="stack" />
                 </div>
                 <div class="ml-2 project-name-box">
-                    <span class="project-alias">{{ projectInfo.name }}</span>
+                    <span class="project-alias">{{ projectInfo.projectName }}</span>
                 </div>
             </div>
             <div class="hc-tree-box">

src/views/tentative/material/sampling.vue

@@ -6,7 +6,7 @@
                     <HcIcon name="stack" />
                 </div>
                 <div class="ml-2 project-name-box">
-                    <span class="project-alias">{{ projectInfo.name }}</span>
+                    <span class="project-alias">{{ projectInfo.projectName }}</span>
                 </div>
             </div>
             <div class="hc-tree-box">

yarn.lock

@@ -493,10 +493,10 @@ archiver-utils@^4.0.1:
     normalize-path "^3.0.0"
     readable-stream "^3.6.0"
 
-archiver@^6.0.1:
-  version "6.0.1"
-  resolved "http://39.108.216.210:9000/archiver/-/archiver-6.0.1.tgz"
-  integrity sha512-CXGy4poOLBKptiZH//VlWdFuUC1RESbdZjGjILwBuZ73P7WkAUN0htfSfBq/7k6FRFlpu7bg4JOkj1vU9G6jcQ==
+archiver@^6.0.2:
+  version "6.0.2"
+  resolved "http://39.108.216.210:9000/archiver/-/archiver-6.0.2.tgz#f45e7598dfe48e834ac8c7a0c37033f826f5a639"
+  integrity sha512-UQ/2nW7NMl1G+1UnrLypQw1VdT9XZg/ECcKPq7l+STzStrSivFIXIp34D8M5zeNGW5NoOupdYCHv6VySCPNNlw==
   dependencies:
     archiver-utils "^4.0.1"
     async "^3.2.4"
@@ -1344,10 +1344,10 @@ hasown@^2.0.0:
   dependencies:
     function-bind "^1.1.2"
 
-hc-vue3-ui@^3.1.7:
-  version "3.1.7"
-  resolved "http://39.108.216.210:9000/hc-vue3-ui/-/hc-vue3-ui-3.1.7.tgz#cf77e449c73f89d2f55b803dc7cb015b681877e1"
-  integrity sha512-UiatJ7sXNcAXofMrlwEOTVlThXd7Jhesk2zIUoZqC/tjPTwuAOzokc7C2/2IivXLtAzwR+faiDJ8m7JEY3zcmQ==
+hc-vue3-ui@^3.1.8:
+  version "3.1.8"
+  resolved "http://39.108.216.210:9000/hc-vue3-ui/-/hc-vue3-ui-3.1.8.tgz#07cd8c4656887ee94e3db07af6e895299fcce300"
+  integrity sha512-JUIMn4jlkaxcg2xEFp6Kq//Pe1IgUyebIAWHYMH+R6xLbUmCm1vWTtcmVy7/HzKVd0QLGWjpxHwNBcvW95VVGA==
 
 html2canvas@1.4.1:
   version "1.4.1"