不是最新的名片解析数据(用户在解析完成前已重新上传)或用户已取消解析

src/views/menduner/system/talentMap/components/card.vue

@@ -53,7 +53,7 @@
       @pagination="getList"
     />
     <!-- 上传 -->
-    <Dialog title="名片解析" v-model="openUploadImg" width="500">
+    <Dialog title="名片解析" v-model="openUploadImg" width="500" @close="handleCancel">
       <UploadImg
         v-model="filePath"
         :limit="1"
@@ -65,7 +65,7 @@
       </UploadImg>
       <template #footer>
         <el-button @click="handleAnalysis" type="success" :disabled="analysisLoading" :loading="analysisLoading">解 析</el-button>
-        <el-button @click="openUploadImg = false">取 消</el-button>
+        <el-button @click="handleCancel">取 消</el-button>
       </template>
     </Dialog>
     <!-- 解析回显 -->
@@ -261,7 +261,6 @@ const getList = async () => {
   loading.value = true
   try {
     list.value = []
-    console.log('打印->log', queryParams, queryParams)
     const data = await talentLabelingApi.getCardList(queryParams)
     list.value = data || []
     // total.value = total || []
@@ -399,6 +398,13 @@ const handleSave = async () => {
   }
 }
 
+// 关闭解析弹窗
+const handleCancel = () => {
+  console.log('关闭解析弹窗')
+  openUploadImg.value = false
+  analysisLoading.value = false
+}
+
 // 解析中
 const analysisLoading = ref(false)
 const filePath = ref(null)
@@ -410,11 +416,14 @@ const handleAnalysis = async () => {
   }
   try {
     analysisLoading.value = true
+    // 开始解析
     const query = new FormData()
     query.append('image', file.value)
     message.warning('正在解析...')
+    const index = createAnalysisNum.value
     const res = await talentLabelingApi.businessCardParse(query)
-    if (!openUploadImg.value) return // 用户已取消解析
+    console.log('编号->', index, createAnalysisNum.value)
+    if (index !== createAnalysisNum.value || !openUploadImg.value) return // 不是最新的名片解析数据(用户在解析完成前已重新上传)或用户已取消解析
     dealData(res?.data || res)
     openUploadImg.value = false
     showAnalysisTable.value = true
@@ -428,9 +437,12 @@ const handleAnalysis = async () => {
 
 // 新增
 const openUploadImg = ref(false)
+const createAnalysisNum = ref(0)
 const handleAdd = () => {
   file.value = null
   filePath.value = null
+  analysisLoading.value = false
+  createAnalysisNum.value++
   careerTrajectory.value = [{ company_name: null,  position: null, current_date: null }]
   openUploadImg.value = true
 }