UPDATE: 优化bug

frontend/src/components/ImportZip/index.vue

@@ -5,7 +5,6 @@
         :destroy-on-close="true"
         width="450px"
         :close-on-click-modal="!parameter.progressBar"
-        :show-close="!disable"
         draggable
     >
         <el-upload
@@ -84,6 +83,8 @@ const emit = defineEmits<{
 // 接收父组件参数
 const acceptParams = (params: ZipParameterProps) => {
     parameter.value = { ...parameter.value, ...params }
+    disable.value = true
+    fileDisabled.value = false
     dialogVisible.value = true
 }
 
@@ -181,7 +182,7 @@ const initSSE = () => {
     eventSource.value = http.sse('/sse/createSse')
 
     eventSource.value.onmessage = event => {
-       // console.log('收到消息内容是:', event.data)
+        // console.log('收到消息内容是:', event.data)
         const res = JSON.parse(event.data)
         progressData.value.percentage = res.data
         progressData.value.message = res.message
@@ -210,7 +211,7 @@ const closeEventSource = () => {
     if (eventSource.value) {
         eventSource.value.close()
         eventSource.value = null
-       // console.log('SSE连接已关闭')
+        // console.log('SSE连接已关闭')
     }
 }
 // 监听 dialogVisible 的变化，确保在对话框关闭时清理资源

frontend/src/views/home/components/reportResultPopup.vue

@@ -104,12 +104,33 @@
             <el-form ref="formRef" :rules="rules" :model="submitSourceData" label-width="120px" label-position="top">
                 <el-form-item label="选择次数:" prop="whichTime">
                     <el-select v-model="submitSourceData.whichTime" placeholder="请选择次数" @change="handleTimeChange">
+                        <template #label="{ label }">
+                            <div style="display: flex; align-items: center; justify-content: space-between">
+                                <el-text>{{ label }}</el-text>
+                                <el-tag
+                                    disable-transitions
+                                    v-if="currentWhichTimeData.checkResult === 1"
+                                    type="success"
+                                >
+                                    符合
+                                </el-tag>
+                                <el-tag disable-transitions v-if="currentWhichTimeData.checkResult === 2" type="danger">
+                                    不符合
+                                </el-tag>
+                            </div>
+                        </template>
                         <el-option
-                            v-for="time in whichTimeData"
+                            v-for="item in whichTimeData"
-                            :key="time"
+                            :key="item.time"
-                            :label="`第${time}次`"
+                            :label="`第${item.time}次`"
-                            :value="time"
+                            :value="item.time"
-                        ></el-option>
+                        >
+                            <div style="display: flex; align-items: center; justify-content: space-between">
+                                <el-text>{{ '第' + item.time + '次' }}</el-text>
+                                <el-tag v-if="item.checkResult === 1" type="success">符合</el-tag>
+                                <el-tag v-if="item.checkResult === 2" type="danger">不符合</el-tag>
+                            </div>
+                        </el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="数据源和检测结论:" prop="resultType">
@@ -167,7 +188,7 @@ const dialogSourceVisible = ref(false)
 const devData = ref<any>()
 const activeName = ref<number>(0)
 const checkStore = useCheckStore()
-
+const currentWhichTimeData = ref<any>({})
 // 定义 emit 事件
 const emit = defineEmits<{
     (e: 'reportGenerated'): void
@@ -217,7 +238,12 @@ const handleChooseClick = async () => {
         if (res.data) {
             resultSourceData.value = res.data
             // 选择第几次
-            whichTimeData.value = Object.keys(resultSourceData.value)
+            whichTimeData.value = Object.keys(resultSourceData.value).map(time => {
+                // 检测结果只要有一个合格就算合格
+                const checkResult = resultSourceData.value[time].find((item: any) => item.checkResult === 1)
+                return { time, checkResult: checkResult ? 1 : 2 }
+            })
+            currentWhichTimeData.value = whichTimeData.value[currentResult.whichTime]
             sourceData.value = resultSourceData.value[currentResult.whichTime]
         }
     }
@@ -225,6 +251,7 @@ const handleChooseClick = async () => {
 }
 const handleTimeChange = (value: any) => {
     sourceData.value = resultSourceData.value[value]
+    currentWhichTimeData.value = whichTimeData.value[value]
     submitSourceData.resultType = ''
     submitSourceData.checkResult = -1
 }