Merge branch 'main' of http://123.132.248.154:10000/HC_YFZX/CaiYuanYiTiHua

src/views/demo/tiankongdi/keepSupervision/index.vue

@@ -95,7 +95,7 @@
       :footer="null"
       @cancel="uploadOpen = false"
     >
-      <UploadModal />
+      <UploadModal :allTableData="allTableData" />
     </a-modal>
   </PageWrapper>
 </template>
@@ -145,6 +145,7 @@
     nowStatus: undefined,
   });
   const tableData = ref([]);
+  const allTableData = ref([]);
   const tablePaginationRight = ref({
     current: 1,
     pageSize: 10,
@@ -293,8 +294,16 @@
     tablePaginationRight.value.current = 1;
     getTableData(searchParams.value);
   }
+
+  async function getAllTableData() {
+    await LoadCaseInfoCxjgTuBanList({}).then((res) => {
+      allTableData.value = res.items;
+    });
+  }
+
   onMounted(() => {
     getTableData(searchParams.value);
+    getAllTableData();
   });
   watch(
     () => showInfoId.value,

src/views/demo/tiankongdi/keepSupervision/keepSupervision.data.ts

@@ -310,7 +310,7 @@ export const uploadColumns: BasicColumn[] = [
     align: 'center',
   },
   {
-    title: '路径/失败原因',
+    title: '路径/上传图片失败原因',
     dataIndex: 'url',
     width: 280,
   },

src/views/demo/tiankongdi/keepSupervision/uploadModal.vue

@@ -97,6 +97,7 @@
   import { message } from 'ant-design-vue';
 
   const { VITE_GLOB_INFO_IMAGE_URL } = getAppEnvConfig();
+  const props = defineProps(['allTableData']);
 
   // 上传列表
   const fileList: any = ref();
@@ -214,7 +215,11 @@
               status: 'updateError',
             };
           });
-          message.error(`当前图斑【${value.caseid}】有未审核的图片，不允许继续上传，请先审核！`);
+          if (props.allTableData.findIndex((item) => item.caseno == value.caseid)) {
+            message.error(`图斑【${value.caseid}】不存在！`);
+          } else {
+            message.error(`图斑【${value.caseid}】有未审核的图片，不允许继续上传，请先审核！`);
+          }
         }
       });
     } catch (error) {