Selaa lähdekoodia

Merge branch 'master' into test-dev

duy 2 kuukautta sitten
vanhempi
commit
df5bb1d554
4 muutettua tiedostoa jossa 15 lisäystä ja 15 poistoa
  1. 1 1
      package.json
  2. 8 8
      src/views/data-fill/collapse-form/index.vue
  3. 2 2
      src/views/data-fill/wbs.vue
  4. 4 4
      yarn.lock

+ 1 - 1
package.json

@@ -25,7 +25,7 @@
         "dayjs": "^1.11.13",
         "echarts": "^5.5.1",
         "element-plus": "^2.8.7",
-        "hc-vue3-ui": "^4.8.9",
+        "hc-vue3-ui": "^4.9.0",
         "js-base64": "^3.7.7",
         "js-fast-way": "^0.5.7",
         "js-md5": "^0.8.3",

+ 8 - 8
src/views/data-fill/collapse-form/index.vue

@@ -17,7 +17,7 @@
                             >
                                 已填{{ item.realFillRate ?? 0 }}%
                             </div> -->
-                            <el-tooltip
+                            <!-- <el-tooltip
                                 v-if="item.isSync === 1 && item.isBussShow !== 2"
                                 class="box-item"
                                 effect="light"
@@ -28,7 +28,7 @@
                                     style="border:1px solid orange"
                                     class="h-5 w-5 inline-flex items-center justify-center border border-orange rounded-full bg-white text-xs text-orange"
                                 >同</span>
-                            </el-tooltip>
+                            </el-tooltip> -->
                             <el-tooltip
                                 v-if="item.dateIsComplete === 2 && item.isBussShow !== 2"
                                 class="box-item"
@@ -1059,7 +1059,7 @@ const isOpen = infos['isOpenRandomNumber'] ?? 0
         newArr.push({ label: '插入设计值/频率', key: 'design' })
     }
     newArr.push({ label: '插入编号', key: 'pushCode' })
-    newArr.push({ label: '测量偏差范围', key: 'deviation' })
+     newArr.push({ label: '测量偏差范围', key: 'deviation' })
     newArr.push({ label: '插入特殊字符', key: 'special' })
     newArr.push({ label: '关联试验数据', key: 'test' })
     newArr.push({ label: '关联试验文件', key: 'file' })
@@ -1100,12 +1100,12 @@ const handleMenuSelect = async ({ key }) => {
     } else if (key === 'file') {
         fileModalLoading.value = false
         console.log('关联试验文件')
-        fileTypeModal.value = []
-        fileTypeDialog.value = true
+        // fileTypeModal.value = []
+        // fileTypeDialog.value = true
 
-        getFileType()
-        // fileModal.value = true
-        //    getIsUseTestTreeCy()
+        // getFileType()
+        fileModal.value = true
+           getIsUseTestTreeCy()
     } else if (key === 'formula') {
         formulaModalLoading.value = false
         formulaModal.value = true

+ 2 - 2
src/views/data-fill/wbs.vue

@@ -70,7 +70,7 @@
                                     :datas="searchTreeData"
                                     :is-mark="TreeMark"
                                     :menus="ElTreeMenu"
-                                    is-show-sync
+                                   
                                     is-counts
                                     is-type
                                     :auto-expand-keys="TreeAutoExpandKeys"
@@ -87,7 +87,7 @@
                             >
                                 <HcLazyTree
                                     ref="wbstree"
-                                    is-show-sync
+                                  
                                     is-form-date
                                     is-load-menu
                                     :auto-expand-keys="TreeAutoExpandKeys"

+ 4 - 4
yarn.lock

@@ -2109,10 +2109,10 @@ has-flag@^4.0.0:
   resolved "http://219.151.181.73:9000/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-hc-vue3-ui@^4.8.9:
-  version "4.8.9"
-  resolved "http://219.151.181.73:9000/hc-vue3-ui/-/hc-vue3-ui-4.8.9.tgz#3cb619886d5046c80dbeb8f542e4aeaa74381ee3"
-  integrity sha512-8lTqz0K0nq+OiuXiCb2eQLgtE+Hwccz+8koYAqzpqN6eCoh2gsU04H6vasPVoNTZ/aR7V/1LKyWS5YfwPpJORw==
+hc-vue3-ui@^4.9.0:
+  version "4.9.0"
+  resolved "http://219.151.181.73:9000/hc-vue3-ui/-/hc-vue3-ui-4.9.0.tgz#4c5fc4236e52e6a88a0cf8803dbe868c16aa0e5b"
+  integrity sha512-XbUQd8RusvzGB+EztQF51qn3Em3LglbFtX0vBVJWcaRwnZ72iBxIwLYKNwcXVEWs4ck47v79R0OUgRH1rwrZhg==
   dependencies:
     axios "^1.7.7"
     dayjs "^1.11.13"