刷新饼图

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

@@ -91,9 +91,9 @@
               >报告下载</el-button
             >
             <!-- :disabled='!scope.isSelected' -->
-            <el-button type="primary" :icon="Postcard"   @click="handleTest('批量生成')" v-if="form.activeTabs === 3"
+            <!-- <el-button type="primary" :icon="Postcard"   @click="handleTest('批量生成')" v-if="form.activeTabs === 3"
               >报告生成</el-button
-            >
+            > -->
 
             <!-- :disabled="!scope.isSelected || scope.selectedList.filter((item) => item.check_State === '检测完成').length === 0" -->
             <el-button type="primary" :icon="Notebook"  @click="handleTest('批量归档')" v-if="form.activeTabs === 4"
@@ -210,7 +210,7 @@
        :dialogTitle="dialogTitle"
       @update:visible="dialogFormVisible = $event"
     /> -->
-    <TestPopup ref="testPopup"></TestPopup>
+    <TestPopup ref="testPopup" @quitClicked="handleQuitClicked" ></TestPopup>
 
     <reportPopup
       :visible="reportDialogVisible"
@@ -251,7 +251,7 @@ import reportPopup from "./reportPopup.vue";
 import dataCheckPopup from "./dataCheckSingleChannelSingleTestPopup.vue";
 import dataCheckChangeErrSysPopup from "./dataCheckChangeErrSysPopup.vue";
 import { getBoundPqDevList } from '@/api/plan/plan.ts'
-import { onMounted, reactive, ref, watch } from "vue";
+import { onBeforeMount, onMounted, reactive, ref, watch } from "vue";
 import { useDictStore } from '@/stores/modules/dict'
 import ChannelsTest from './channelsTest.vue'
 import { useModeStore } from '@/stores/modules/mode'; // 引入模式 store
@@ -331,6 +331,9 @@ isTimeCheck: {
   }
 })
 
+const emit = defineEmits<{
+  (e: 'batchGenerateClicked'): void;
+}>();
 
 // 存储设备类型选项
 const devTypeOptions = ref<{ 
@@ -437,19 +440,18 @@ const getTableList = async (params: any) => {
     }
   if(props.id){
     const checkStateList = ref<any>()
-  if(form.value.checkStatus != null){
-    checkStateList.value = [form.value.checkStatus]
-  }else{
-    checkStateList.value = checkStateTable.value
-  }
-  return  getBoundPqDevList({'planId': props.id,
-                             'checkStateList': checkStateList.value,
-                             'checkResult': form.value.checkResult,
-                             'reportState': form.value.checkReportStatus,
-                             'name':form.value.search
-                            });
-  }
-
+    if(form.value.checkStatus != null){
+      checkStateList.value = [form.value.checkStatus]
+    }else{
+      checkStateList.value = checkStateTable.value
+    }
+    return  getBoundPqDevList({'planId': props.id,
+                              'checkStateList': checkStateList.value,
+                              'checkResult': form.value.checkResult,
+                              'reportState': form.value.checkReportStatus,
+                              'name':form.value.search
+                              });
+    }
 };
 
 // 表格配置项
@@ -985,9 +987,10 @@ const handleTest = async (val:string) => {
     )
     return
   }
-  if(val==='批量生成')
+  if(val==='批量下载')
   {
      reportDialogVisible.value = true;
+    
      return
   }
 
@@ -1025,6 +1028,7 @@ const openDrawer = (title: string, row: any) => {
     if(title === '生成')
     {
       //reportDialogVisible.value = true;
+      emit('batchGenerateClicked'); // 触发事件
       useDownload(downloadDevData,'调试报告'+formatDate(new Date()), {planId:checkStore.planId,devId:row.id}, false,'.docx')
     }
       
@@ -1040,6 +1044,7 @@ const openDrawer = (title: string, row: any) => {
 
     if (title === '归档')
     {
+      emit('batchGenerateClicked'); // 触发事件
       documentedPqDev([row.id])
     //   const loading = ElLoading.service({
     //   lock: true,
@@ -1087,6 +1092,14 @@ onBeforeMount(async () => {
       devChns: item.devChns
     }))
 })
+
+
+
+
+const handleQuitClicked = () => {
+  emit('batchGenerateClicked'); // 触发事件
+};
+
 defineExpose({ changeActiveTabs });
 </script>
 <style lang="scss" scoped>

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

@@ -615,6 +615,7 @@ watch(webMsgSend, function (newValue, oldValue) {
 
 }, {deep: true})
 
+
 // 更新进度条
 const updatePercentage = () => {
   if (activeIndex < checkTotal) {
@@ -622,7 +623,6 @@ const updatePercentage = () => {
   } else {
     percentage.value = 100;
     emit('update:testStatus', 'success')
-
     ElMessageBox.alert('检测全部结束,你可以停留在此页面查看检测结果，或返回首页进行复检、报告生成和归档等操作', '检测完成', {
       confirmButtonText: '确定',
     })

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

@@ -302,6 +302,8 @@ const handleSubmit = () => {
         sendReCheck()
 
 
+      }else if (TestStatus.value == 'success') {
+        emit('quitClicked'); // 触发事件
       }
       break;
     default:
@@ -312,6 +314,10 @@ const handleSubmit = () => {
 };
 
 
+const emit = defineEmits<{
+  (e: 'quitClicked'): void;
+}>();
+
 watch(preTestStatus, function (newValue, oldValue) {
   console.log(newValue, oldValue);
 
@@ -481,6 +487,7 @@ const beforeClose = (done: () => void) => {
   //   })
 }
 const handleCancel = () => {
+  emit('quitClicked'); // 触发事件
   // clearData()
   // emit('update:visible', false); // 关闭对话框
   testRef.value?.clear()