Merge remote-tracking branch 'origin/master'

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

@@ -649,6 +649,7 @@ const updateErrorState = (index: number, hasError: boolean) => {
 
   const emit = defineEmits<{
       (e: 'quitClicked'): void;
+      (e: 'submitClicked'): void;
   }>();
 
   const handleCancel=() => {
@@ -703,7 +704,7 @@ const handleSubmit = async () => {
           operateType:'0' // '0'为预检测、‘1‘为正式检测
         })
   active.value++;
-  console.log("handleSubmitactive",active.value);
+  emit('submitClicked'); // 触发事件
   // 初始化 loadingStates 为 true
   // loadingStates.value = new Array(name.value.length).fill(true);
  

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

@@ -142,14 +142,14 @@
           </el-dropdown>
         </div> -->
 
-        <!-- <el-button
+         <el-button
           type='primary'
           link
           :icon='Download'
           @click="openDrawer('报告下载', scope.row)"
           v-if='form.activeTabs === 3 && form.activeChildTabs === 0 && scope.row.reportState === 1'
         >报告下载
-        </el-button> -->
+        </el-button> 
 
         <el-button
           type='primary'
@@ -225,7 +225,7 @@
        :dialogTitle="dialogTitle"
       @update:visible="dialogFormVisible = $event"
     /> -->
-    <TestPopup ref='testPopup' @quitClicked='handleQuitClicked'></TestPopup>
+    <TestPopup ref='testPopup' @quitClicked='handleQuitClicked' ></TestPopup>
 
     <reportPopup
       :visible='reportDialogVisible'
@@ -245,7 +245,7 @@
     ></matchPopup>
 
     <!--系数校准-->
-    <ChannelsTest ref='channelsTest' :webMsgSend='webMsgSend' @quitClicked='handleQuitClicked'></ChannelsTest>
+    <ChannelsTest ref='channelsTest' :webMsgSend='webMsgSend' @quitClicked='handleQuitClicked' @submitClicked = 'handleSubmitClicked'></ChannelsTest>
   </div>
 </template>
 
@@ -1138,11 +1138,20 @@ onBeforeMount(async () => {
 })
 
 const handleQuitClicked = () => {
-  console.log('handleQuitClicked')
+  //console.log('handleQuitClicked')
   dataSocket.socketServe.closeWs()
   emit('batchGenerateClicked') // 触发事件
 }
 
+
+const handleSubmitClicked =() =>{
+  //console.log('handleSubmitClicked')
+  if(!dataSocket.socketServe.connected){
+    ElMessage.error('webSocket连接中断！请退出重新进行系数校准')
+    return
+  }
+}
+
 defineExpose({ changeActiveTabs })
 </script>
 <style lang='scss' scoped>