微调

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

@@ -50,9 +50,9 @@ const outerUnit = computed(() => {
 
 const setB = computed(() => {
   return prop.currentCheckItem == '三相电流不平衡度'
-      ? '三相电流不平衡度'
+      ? '负序不平衡度'
       : prop.currentCheckItem == '三相电压不平衡度'
-          ? '三相电压不平衡度'
+          ? '负序不平衡度'
           : 'B相'
 })
 const setT = computed(() => {

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

@@ -6,7 +6,7 @@
         :header-cell-style="{ textAlign: 'center' }"
         :cell-style="{ textAlign: 'center' }"
     >
-      <el-table-column type="index" label="序号" width="70" fixed="left" />
+<!--      <el-table-column type="index" label="序号" width="70" fixed="left" />-->
       <el-table-column label="A相" v-if="prop.tableData.length==0|| prop.tableData[0]?.dataA">
         <el-table-column prop="stdA" :label="'被检值'+(outerUnit==''?'':'（'+outerUnit+'）')">
           <template #default="{ row }">

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

@@ -857,7 +857,7 @@ const handleTest = async (val: string) => {
                         ElMessage.success('不合格项复检')
                         checkStore.setReCheckType(0)
                         // 控制是否显示温度湿度输入框
-                        if (appSceneStore.currentScene === '0') {
+                        if (appSceneStore.currentScene === '0' && modeStore.currentMode != '比对式') {
                             writeTHPopupRef.value?.open()
                         } else {
                             selectTestItemPopupRef.value?.open()
@@ -867,7 +867,7 @@ const handleTest = async (val: string) => {
                         if (action === 'cancel') {
                             ElMessage.success('全部复检')
                             checkStore.setReCheckType(1)
-                            if (appSceneStore.currentScene === '0') {
+                            if (appSceneStore.currentScene === '0'&& modeStore.currentMode != '比对式') {
                                 writeTHPopupRef.value?.open()
                             } else {
                                 selectTestItemPopupRef.value?.open()
@@ -895,7 +895,7 @@ const handleTest = async (val: string) => {
                     .then(() => {
                         ElMessage.success('不合格项复检')
                         checkStore.setReCheckType(0)
-                        if (appSceneStore.currentScene === '0') {
+                        if (appSceneStore.currentScene === '0'&& modeStore.currentMode != '比对式') {
                             writeTHPopupRef.value?.open()
                         } else {
                             openTestDialog(true)
@@ -905,7 +905,7 @@ const handleTest = async (val: string) => {
                         if (action === 'cancel') {
                             ElMessage.success('全部复检')
                             checkStore.setReCheckType(1)
-                            if (appSceneStore.currentScene === '0') {
+                            if (appSceneStore.currentScene === '0'&& modeStore.currentMode != '比对式') {
                                 writeTHPopupRef.value?.open()
                             } else {
                                 openTestDialog(true)
@@ -950,7 +950,7 @@ const handleTest = async (val: string) => {
 }
 
 const openTestDialog = (testData: any) => {
-    if (appSceneStore.currentScene === '0') {
+    if (appSceneStore.currentScene === '0'&& modeStore.currentMode != '比对式') {
         if (testData) {
             writeTHPopupRef.value?.open()
         } else {

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

@@ -569,6 +569,12 @@ watch(webMsgSend, function(newValue, oldValue) {
           case 'V_End':
             handleEndItem('V', newValue.desc, newValue.data)
             break
+          case 'P_Start':
+            handleStartItem('P', newValue.desc)
+            break
+          case 'P_End':
+            handleEndItem('P', newValue.desc, newValue.data)
+            break
           case 'HV_Start':
             handleStartItem('HV', newValue.desc)
             break

frontend/src/views/machine/testScript/components/setValueTable.vue

@@ -226,6 +226,10 @@ const unit = [
         label: '相电压有效值',
         unit: 'V'
     },
+  {
+    label: '功率',
+    unit: 'W'
+  },
     {
         label: '电压偏差',
         unit: '%'
@@ -264,7 +268,7 @@ const unit = [
     },
     {
         label: '谐波有功功率',
-        unit: 'W'
+        unit: '%Ph'
     },
     {
         label: '间谐波电压',