Merge remote-tracking branch 'origin/master'

package.json

@@ -18,7 +18,7 @@
         "dayjs": "^1.11.10",
         "echarts": "^5.5.0",
         "element-plus": "^2.6.1",
-        "hc-vue3-ui": "^3.5.1",
+        "hc-vue3-ui": "^3.5.2",
         "js-base64": "^3.7.7",
         "js-fast-way": "0.4.6",
         "js-md5": "^0.8.3",

src/views/data-fill/wbs.vue

@@ -127,7 +127,7 @@
                             @get-list="searchNodeAllTable1"
                         />
                     </el-scrollbar>
-                    <HcStatus v-else text="暂无表单" />
+                    <hc-empty v-else title="暂无表单" />
                 </hc-tab-card>
             </div>
         </div>

src/views/ledger/query.vue

@@ -1,7 +1,7 @@
 <template>
     <div v-loading="boxLoading" class="hc-layout-box">
         <HcNewCard v-if="menuDatas.length <= 0" ui="flex-1">
-            <HcStatus />
+            <hc-empty />
         </HcNewCard>
         <template v-if="menuDatas.length > 0">
             <div class="hc-layout-left">

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

@@ -455,12 +455,10 @@ const delClick = () => {
     const rows = tableCheckedKeys.value
     if (rows.length > 0) {
         const ids = arrToId(rows)
-        HcDelMsg({}, async (instance, resolve) => {
-            instance.confirmButtonLoading = true
-            instance.confirmButtonText = '删除中...'
+        HcDelMsg( async ( resolve) => {
             await removeImageclassifyFile(ids)
             resolve() //关闭弹窗的回调
-            instance.confirmButtonLoading = false
+         
         })
     } else {
         window.$message?.warning('请先勾选需要删除的资料文件')

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

@@ -910,12 +910,9 @@ const batchDel = () => {
     })
     if (result) {
         const ids = arrToId(rows)
-        HcDelMsg({}, async (instance, resolve) => {
-            instance.confirmButtonLoading = true
-            instance.confirmButtonText = '删除中...'
+        HcDelMsg( async (resolve) => {
             await removeArchiveFile(ids)
             resolve() //关闭弹窗的回调
-            instance.confirmButtonLoading = false
         })
     } else {
         window.$message?.warning('已上报的文件需要先废除，才能执行删除')

src/views/other/first-item.vue

@@ -145,7 +145,7 @@
                     <el-scrollbar v-if="contractId && isTableForm">
                         <div :id="`table-form-${contractId}`" class="hc-excel-table-form-view" />
                     </el-scrollbar>
-                    <HcStatus v-else :desc="statusDesc" />
+                    <hc-empty v-else :title="statusDesc" />
                 </div>
                 <div class="node-file">
                     <div class="title">上传总结报告</div>
@@ -633,12 +633,9 @@ const tableFileData = ref([])
 const tableDelButton = (index) => {
     const arr = tableFileData.value
     if (arr.length > 1) {
-        HcDelMsg({}, async (instance, resolve) => {
-            instance.confirmButtonLoading = true
-            instance.confirmButtonText = '删除中...'
+        HcDelMsg( async ( resolve) => {
             tableFileData.value.splice(index, 1)
             resolve() //关闭弹窗的回调
-            instance.confirmButtonLoading = false
         })
     } else {
         window?.$message?.warning('至少保留一个文件')

src/views/other/first-itemcopy.vue

@@ -159,7 +159,7 @@
                             @renew="renewtable"
                         />
                     </el-scrollbar>
-                    <HcStatus v-else :desc="statusDesc" />
+                    <hc-empty v-else :title="statusDesc" />
                 </div>
                 <div class="node-file">
                     <div class="title">上传总结报告1111</div>
@@ -630,12 +630,9 @@ const tableFileData = ref([])
 const tableDelButton = (index) => {
     const arr = tableFileData.value
     if (arr.length > 1) {
-        HcDelMsg({}, async (instance, resolve) => {
-            instance.confirmButtonLoading = true
-            instance.confirmButtonText = '删除中...'
+        HcDelMsg(async (resolve) => {
             tableFileData.value.splice(index, 1)
             resolve() //关闭弹窗的回调
-            instance.confirmButtonLoading = false
         })
     } else {
         window?.$message?.warning('至少保留一个文件')

src/views/tentative/collect/test.vue

@@ -345,12 +345,9 @@ const delModalClick = () => {
         window.$message.warning('请先选择数据')
         return
     }
-    HcDelMsg({}, async (instance, resolve) => {
-        instance.confirmButtonLoading = true
-        instance.confirmButtonText = '删除中...'
+    HcDelMsg(async (resolve) => {
         await removeContractTreeNode()
         resolve() //关闭弹窗的回调
-        instance.confirmButtonLoading = false
     })
 }
 const removeContractTreeNode = async () => {

src/views/tentative/detect/components/HcTreeData.vue

@@ -177,12 +177,9 @@ const handleMenuSelect = ({ key }) => {
         nodeFormModel.value = data
         nodeFormModal.value = true
     } else if (key === 'del') {
-        HcDelMsg({}, async (instance, resolve) => {
-            instance.confirmButtonLoading = true
-            instance.confirmButtonText = '删除中...'
+        HcDelMsg(async (resolve) => {
             await treeRemoveData(data.id)
             resolve() //关闭弹窗的回调
-            instance.confirmButtonLoading = false
         })
     }
 }

src/views/tentative/detect/test-form.vue

@@ -82,7 +82,7 @@
                     @get-list="searchNodeAllTable1"
                 />
             </el-scrollbar>
-            <HcStatus v-else v-loading="isLoadList" text="暂无表单" />
+            <hc-empty v-else v-loading="isLoadList" title="暂无表单" />
         </HcTabCard>
 
         <!-- 关联工程用途及部位 -->

src/views/tentative/detect/test.vue

@@ -201,7 +201,7 @@
                         </template>
                     </div>
                     <div v-else class="pdf-file-list-box">
-                        <HcNoData />
+                        <hc-empty />
                     </div>
                     <iframe v-if="attachmentPdfUrl" :src="attachmentPdfUrl" frameborder="1" height="100%" width="80%" />
                     <div class="hc-no-table-form">
@@ -547,12 +547,9 @@ const delModalClick = () => {
     const rows = tableCheckedKeys.value
     if (rows.length > 0) {
         const ids = arrToId(rows)
-        HcDelMsg({}, async (instance, resolve) => {
-            instance.confirmButtonLoading = true
-            instance.confirmButtonText = '删除中...'
+        HcDelMsg(async ( resolve) => {
             await removeDataApi(ids)
             resolve() //关闭弹窗的回调
-            instance.confirmButtonLoading = false
         })
     } else {
         window.$message?.warning('请先勾选需要删除的记录')

src/views/tentative/device/approach.vue

@@ -502,12 +502,9 @@ const addEditNodeFormModalClose = () => {
 
 //删除分类
 const delNodeModalClick = (id) => {
-    HcDelMsg({}, async (instance, resolve) => {
-        instance.confirmButtonLoading = true
-        instance.confirmButtonText = '删除中...'
+    HcDelMsg(async ( resolve) => {
         await setClassRemove(id)
         resolve() //关闭弹窗的回调
-        instance.confirmButtonLoading = false
     })
 }
 

src/views/tentative/parameter/container.vue

@@ -438,12 +438,9 @@ const addEditNodeFormModalClose = () => {
 
 //删除分类
 const delNodeModalClick = (id) => {
-    HcDelMsg({}, async (instance, resolve) => {
-        instance.confirmButtonLoading = true
-        instance.confirmButtonText = '删除中...'
+    HcDelMsg( async ( resolve) => {
         await removeClassification(id)
         resolve() //关闭弹窗的回调
-        instance.confirmButtonLoading = false
     })
 }
 

src/views/tentative/parameter/sieve.vue

@@ -202,12 +202,9 @@ const contextMenuClick = ({ key, item }) => {
         addEditNodeFormModel.value = { ...item }
         addEditNodeFormModal.value = true
     } else if (key === 'del') {
-        HcDelMsg({}, async (instance, resolve) => {
-            instance.confirmButtonLoading = true
-            instance.confirmButtonText = '删除中...'
+        HcDelMsg( async ( resolve) => {
             await delClassification(item)
             resolve() //关闭弹窗的回调
-            instance.confirmButtonLoading = false
         })
     }
 }

yarn.lock

@@ -1366,10 +1366,10 @@ hasown@^2.0.0:
   dependencies:
     function-bind "^1.1.2"
 
-hc-vue3-ui@^3.5.1:
-  version "3.5.1"
-  resolved "http://39.108.216.210:9000/hc-vue3-ui/-/hc-vue3-ui-3.5.1.tgz#f037fa8208a1c0a09fda2c9ceceadd2e6bee6186"
-  integrity sha512-h2Lwz2pPX8fFowc71CYIa39xuD9TKa/8HqKgXZEFTdLD8VPMqvv5jn7hDAm7s8mX01NIK+4TjHSm6G8CdhTNnw==
+hc-vue3-ui@^3.5.2:
+  version "3.5.2"
+  resolved "http://39.108.216.210:9000/hc-vue3-ui/-/hc-vue3-ui-3.5.2.tgz#22da583fa64e709cf03c8d846fe50f04e6d2f542"
+  integrity sha512-GL/nj+DfDgTtVkFGpcAC+k/s8JnLxUikMPsOW6xHUigQLYq/q5Yx7G8xQanR/2ftqvTc3r23RLgnj9ZsxyRTkA==
   dependencies:
     axios "^1.6.7"
     dayjs "^1.11.10"