Merge branch 'master' of http://192.168.1.22:3000/ClientApps/pqs-9100_client

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

@@ -625,10 +625,10 @@ watch(
                   updatePercentage()
                 }
                 if(newValue.code ==  25005){
-                  setLogList("error", '实时数据校验失败！开始录波校验...')
+                  setLogList("error", '实时数据不符合！开始录波校验...')
                 }
                 if(newValue.code ==  25006){
-                  setLogList("error", '统计数据校验失败！开始录波校验...')
+                  setLogList("error", '统计数据不符合！开始录波校验...')
                 }
                 break
             }

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

@@ -841,9 +841,11 @@ const handleTest2 = async (val: string) => {
     // 只传递有监测点的设备
 
     const targetPlan = props.planTable.data.find((item: any) => item.id === props.plan.id)
+  
+ 
     // 检查数组长度是否为1且唯一元素是'wave_data'
     const isOnlyWave = targetPlan.datasourceIds.length === 1 && targetPlan.datasourceIds[0] === 'wave_data'
-
+  
     deviceConnectionPopupRef.value?.open(
         filteredChannelsSelection,
         pqStandardDevList.value,

frontend/src/views/machine/device/index.vue

@@ -236,9 +236,9 @@ const downloadFile = async () => {
 
 
   ElMessageBox.confirm('确认导出被检设备?', '温馨提示', {
-  type: 'warning',
-  confirmButtonText: '确定',
-  cancelButtonText: '取消'
+    type: 'warning',
+    confirmButtonText: '确定',
+    cancelButtonText: '取消'
   }).then(() => {
     const patternId = dictStore.getDictData('Pattern').find(item => item.name === modeStore.currentMode)?.id
     useDownload(exportPqDev, '被检设备导出数据', {...proTable.value?.searchParam, pattern: patternId}, false, '.xlsx')

frontend/src/views/plan/planList/components/childrenPlan.vue

@@ -690,6 +690,10 @@ const exportPlan = async () => {
     ElMessageBox.confirm(`确认导出${subPlanFormContent.name}子计划元信息？`, '温馨提示', { type: 'warning' }).then(() =>
         useDownload(exportSubPlan, `${subPlanFormContent.name}_子计划元信息`, params, false, '.zip')
     )
+
+    
+
+    
 }
 
 const exportPlanCheckResultData = async (selectedListIds: string[]) => {