From dd3337ca3e0082ce8f996866d8d0ce76bbcbcd9e Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Tue, 20 May 2025 15:19:07 +0800
Subject: [PATCH] dev

---
 src/views/social/inventoryUp.vue | 41 ++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/src/views/social/inventoryUp.vue b/src/views/social/inventoryUp.vue
index 50895f1..8b3e4f8 100644
--- a/src/views/social/inventoryUp.vue
+++ b/src/views/social/inventoryUp.vue
@@ -30,16 +30,16 @@
     </div>
   </div>
   <Mask :is-show="loading" :width="300" height="150" title="上传数据" :close="false">
-    {{uploadMsg}}
+    {{ uploadMsg }}
     <div class="demo-progress" style="margin-top: 20px">
-      <el-progress :percentage="uploadNumber" />
+      <el-progress :percentage="uploadNumber"/>
     </div>
   </Mask>
 </template>
 
 <script setup lang="ts">
 import {ref, onMounted} from 'vue';
-import {type TabsPaneContext} from 'element-plus'
+import {ElMessage, type TabsPaneContext} from 'element-plus'
 import List_3501 from "@/components/social/inventoryUp/List_3501.vue";
 import List_3502 from "@/components/social/inventoryUp/List_3502.vue";
 import List_3503 from "@/components/social/inventoryUp/List_3503.vue";
@@ -57,15 +57,16 @@ const tabs = ref([
 let tableData: any = ref([])
 let content: any = ref(null);
 const loading = ref(false)
-let uploadMsg= ref('')
-const uploadNumber=ref()
+let uploadMsg = ref('')
+const uploadNumber = ref()
 onMounted(() => {
   init()
 });
+
 function init() {
   post("social/upload/getNotDoNumber",).then((res: any) => {
     tabs.value.forEach((tab: any) => {
-      tab.notDoNumber = res['number'+tab.name]
+      tab.notDoNumber = res['number' + tab.name]
     })
   })
 }
@@ -73,33 +74,36 @@ function init() {
 let change_tab = (tab: TabsPaneContext, event: Event) => {
   console.log(current_tab.value)
 }
-let totalNumber=0;
+let totalNumber = 0;
 // 一键上传
 let startUpload = () => {
   loading.value = true
-  uploadMsg.value="正在初始化上传";
-  post("social/upload/getNotDoNumber",).then((res: any) => {
+  uploadMsg.value = "正在初始化上传";
+  post("social/upload/getNotDoNumber", {catch_error: true}).then((res: any) => {
     totalNumber = res.totalNumber;
-    uploadMsg.value="正在初始化上传，总条数"+totalNumber;
-    console.log(uploadMsg)
+    uploadMsg.value = "正在初始化上传，总条数" + totalNumber;
     upload_data()
+  }).catch((e: any) => {
+    loading.value = false
+    ElMessage.error(e)
   })
 
 }
 let upload_data = () => {
-  post("social/upload/quickUpload",{},{catch_error: true}).then((res: any) => {
-    if (res.totalNumber >0) {
+  post("social/upload/quickUpload", {}, {catch_error: true}).then((res: any) => {
+    if (res.totalNumber > 0) {
       upload_data()
-      uploadMsg.value="正在上传,进度:"+(totalNumber-res.totalNumber)+"/"+totalNumber;
-      uploadNumber.value=Math.round((totalNumber-res.totalNumber)/totalNumber*100)
-    }else{
-      uploadMsg.value=""
+      uploadMsg.value = "正在上传,进度:" + (totalNumber - res.totalNumber) + "/" + totalNumber;
+      uploadNumber.value = Math.round((totalNumber - res.totalNumber) / totalNumber * 100)
+    } else {
+      uploadMsg.value = ""
       loading.value = false
       init()
     }
   }).catch(
       (err: any) => {
-          loading.value = false
+        loading.value = false
+        ElMessage.error(err)
       }
   )
 }
@@ -118,6 +122,7 @@ let upload_data = () => {
     width: 100%;
     height: 50px;
   }
+
   .content {
     flex: 1;
     min-height: 0;