From 8b578d4d8bf5bf953331ce27fbb1d1a98cfaddfb Mon Sep 17 00:00:00 2001
From: caozehui <2427765068@qq.com>
Date: Thu, 28 Aug 2025 10:37:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../home/components/compareDataCheckRawDataTable.vue | 4 ++--
.../home/components/compareDataCheckResultTable.vue | 2 +-
frontend/src/views/home/components/table.vue | 10 +++++-----
frontend/src/views/home/components/test.vue | 6 ++++++
.../machine/testScript/components/setValueTable.vue | 6 +++++-
5 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/frontend/src/views/home/components/compareDataCheckRawDataTable.vue b/frontend/src/views/home/components/compareDataCheckRawDataTable.vue
index c79131f..8693046 100644
--- a/frontend/src/views/home/components/compareDataCheckRawDataTable.vue
+++ b/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(() => {
diff --git a/frontend/src/views/home/components/compareDataCheckResultTable.vue b/frontend/src/views/home/components/compareDataCheckResultTable.vue
index 01758dd..071c7a0 100644
--- a/frontend/src/views/home/components/compareDataCheckResultTable.vue
+++ b/frontend/src/views/home/components/compareDataCheckResultTable.vue
@@ -6,7 +6,7 @@
:header-cell-style="{ textAlign: 'center' }"
:cell-style="{ textAlign: 'center' }"
>
-
+
diff --git a/frontend/src/views/home/components/table.vue b/frontend/src/views/home/components/table.vue
index f14d685..6a14935 100644
--- a/frontend/src/views/home/components/table.vue
+++ b/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 {
diff --git a/frontend/src/views/home/components/test.vue b/frontend/src/views/home/components/test.vue
index 60f550c..a333d41 100644
--- a/frontend/src/views/home/components/test.vue
+++ b/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
diff --git a/frontend/src/views/machine/testScript/components/setValueTable.vue b/frontend/src/views/machine/testScript/components/setValueTable.vue
index c9cb846..44075cd 100644
--- a/frontend/src/views/machine/testScript/components/setValueTable.vue
+++ b/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: '间谐波电压',