From 131adc81a7ea604095062634aa294ce3e6e05e1b Mon Sep 17 00:00:00 2001
From: caozehui <2427765068@qq.com>
Date: Thu, 2 Jul 2026 15:00:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E9=A1=B9=E4=B8=8D=E5=B9=B3=E8=A1=A1?=
=?UTF-8?q?=E8=A1=A5=E5=85=85=E5=BA=8F=E5=88=86=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
frontend/.env.development | 2 +-
frontend/.env.production | 2 +-
.../home/components/dataCheckRawDataTable.vue | 42 +++++++++++++------
.../home/components/dataCheckResultTable.vue | 41 +++++++++++++-----
.../dataCheckSingleChannelSingleTestPopup.vue | 4 +-
frontend/src/views/home/components/test.vue | 2 +-
.../testScript/components/setValueTable.vue | 8 +++-
7 files changed, 72 insertions(+), 29 deletions(-)
diff --git a/frontend/.env.development b/frontend/.env.development
index 72f9a40..7db2343 100644
--- a/frontend/.env.development
+++ b/frontend/.env.development
@@ -20,7 +20,7 @@ VITE_COMPANY_WEBSITE=http://www.shining-electric.com/
# 开发环境跨域代理，支持配置多个
-VITE_PROXY=[["/api","http://127.0.0.1:18093/"]]
+VITE_PROXY=[["/api","http://127.0.0.1:18092/"]]
#VITE_PROXY=[["/api","http://192.168.1.124:18092/"]]
#VITE_PROXY=[["/api","http://192.168.2.125:18092/"]]
VITE_IS_SHOW_RAW_DATA=true
diff --git a/frontend/.env.production b/frontend/.env.production
index c0ed398..3d2f058 100644
--- a/frontend/.env.production
+++ b/frontend/.env.production
@@ -23,7 +23,7 @@ VITE_PWA=true
# 线上环境接口地址
#VITE_API_URL="/api" # 打包时用
-VITE_API_URL="http://127.0.0.1:18093/"
+VITE_API_URL="http://127.0.0.1:18092/"
VITE_COMPANY_WEBSITE=http://www.shining-electric.com/
VITE_IS_SHOW_RAW_DATA=true
# 开启激活验证
diff --git a/frontend/src/views/home/components/dataCheckRawDataTable.vue b/frontend/src/views/home/components/dataCheckRawDataTable.vue
index 25ef318..b29fb4c 100644
--- a/frontend/src/views/home/components/dataCheckRawDataTable.vue
+++ b/frontend/src/views/home/components/dataCheckRawDataTable.vue
@@ -6,9 +6,9 @@
style="width: 100%;">
-
-
-
+
+
+
@@ -20,13 +20,30 @@
import {CheckData} from "@/api/check/interface";
import {computed} from "vue";
-const {tableData, currentScriptTypeName} = defineProps<{
+const {tableData, currentCheckItem} = defineProps<{
tableData: CheckData.RawDataItem[]
- currentScriptTypeName: string
+ currentCheckItem: string
}>()
const emit = defineEmits(['exportRawDataHandler'])
-
+const labelA = computed(() => {
+ if(currentCheckItem.includes('电压序分量')){
+ return '正序分量'
+ }
+ return 'A相'
+})
+const labelB = computed(() => {
+ if(currentCheckItem.includes('电压序分量')){
+ return '负序分量'
+ }
+ return 'B相'
+})
+const labelC = computed(() => {
+ if(currentCheckItem.includes('电压序分量')){
+ return '零序分量'
+ }
+ return 'C相'
+})
const unit = computed(() => {
return tableData.length > 0 ? tableData[0].unit : '';
})
@@ -46,15 +63,16 @@ const phaseT = computed(() => {
})
const tableHeader = computed(() => {
- if (phaseT.value === 1) {
- let index = currentScriptTypeName.indexOf('=');
- return currentScriptTypeName.substring(0, index);
+ if(currentCheckItem.includes('三相电压负序不平衡度')){
+ return '三相电压不平衡度'
}
- return currentScriptTypeName
+ if(currentCheckItem.includes('三相电流负序不平衡度')){
+ return '三相电流不平衡度'
+ }
+ return currentCheckItem
})
-
const isThreePhase = computed(() => {
- return currentScriptTypeName.includes('三相电压不平衡度') || currentScriptTypeName.includes('三相电流不平衡度')
+ return currentCheckItem.includes('三相电压负序不平衡度') || currentCheckItem.includes('三相电流负序不平衡度')
})
const exportData = () => {
diff --git a/frontend/src/views/home/components/dataCheckResultTable.vue b/frontend/src/views/home/components/dataCheckResultTable.vue
index d80b87e..101658b 100644
--- a/frontend/src/views/home/components/dataCheckResultTable.vue
+++ b/frontend/src/views/home/components/dataCheckResultTable.vue
@@ -12,7 +12,7 @@
-
+
@@ -33,7 +33,7 @@
-
+
@@ -55,7 +55,7 @@
-
+
@@ -107,9 +107,9 @@
import { computed } from 'vue'
import { CheckData } from '@/api/check/interface'
-const { tableData, currentScriptTypeName } = defineProps<{
+const { tableData, currentCheckItem } = defineProps<{
tableData: CheckData.CheckResult[]
- currentScriptTypeName: string
+ currentCheckItem: string
}>()
const outerUnit = computed(() => {
@@ -129,6 +129,25 @@ const innerUnitT = computed(() => {
return tableData.length > 0 ? tableData[0].unitT : ''
})
+const labelA = computed(() => {
+ if(currentCheckItem.includes('电压序分量')){
+ return '正序分量'
+ }
+ return 'A相'
+})
+const labelB = computed(() => {
+ if(currentCheckItem.includes('电压序分量')){
+ return '负序分量'
+ }
+ return 'B相'
+})
+const labelC = computed(() => {
+ if(currentCheckItem.includes('电压序分量')){
+ return '零序分量'
+ }
+ return 'C相'
+})
+
const phaseA = computed(() => {
return tableData.length <= 0 || tableData[0].dataA == null || tableData[0].dataA == '/' ? 0 : 1
})
@@ -144,11 +163,13 @@ const phaseT = computed(() => {
})
const tableHeader = computed(() => {
- if (phaseT.value === 1) {
- let index = currentScriptTypeName.indexOf('=')
- return currentScriptTypeName.substring(0, index)
- }
- return currentScriptTypeName
+ if(currentCheckItem.includes('三相电压负序不平衡度')){
+ return '三相电压不平衡度'
+ }
+ if(currentCheckItem.includes('三相电流负序不平衡度')){
+ return '三相电流不平衡度'
+ }
+ return currentCheckItem
})
// const maxErrorStr = computed((data) => {
diff --git a/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue b/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue
index 0f078d4..9517877 100644
--- a/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue
+++ b/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue
@@ -136,13 +136,13 @@
diff --git a/frontend/src/views/home/components/test.vue b/frontend/src/views/home/components/test.vue
index a5def51..969dfac 100644
--- a/frontend/src/views/home/components/test.vue
+++ b/frontend/src/views/home/components/test.vue
@@ -47,7 +47,7 @@
:row.devices[index1].chnResult[index2].icon==='CircleCheckFilled'?'符合'
:row.devices[index1].chnResult[index2].icon==='Close'?'不符合'
:row.devices[index1].chnResult[index2].icon==='WarnTriangleFilled'?'数据异常'
- :row.devices[index1].chnResult[index2].icon==='Loading'?'检测中':'连接中断'"
+ :row.devices[index1].chnResult[index2].icon==='Loading'?'检测中':'不参与误差比较'"
placement='right'>
{
let o = props.valueCode == 'Absolute' ? 'A' : '%'
row.name == '电流有效值' ? (text = o) : ''
row.name == '电流相角' ? (text = '°') : ''
+ } else if (row.name == '电压序分量') {
+ text = '%Un V'
+ } else if (row.name == '电流序分量') {
+ text = '%In A'
} else {
- text = unit.filter(item => item.label == row.pname)[0]?.unit
+ text = unit.filter(item => item.label == row.pname)[0]?.unit
}
return text || ''