修改测试bug
This commit is contained in:
@@ -37,14 +37,16 @@
|
||||
</div>
|
||||
</div>
|
||||
</el-collapse-item>
|
||||
|
||||
|
||||
|
||||
</el-collapse>
|
||||
|
||||
<div class="view_bot">
|
||||
<vxe-table border height="" :data="realList" :column-config="{ resizable: true, tooltip: true }"
|
||||
:tooltip-config="{ enterable: true }">
|
||||
<vxe-table
|
||||
border
|
||||
height=""
|
||||
:data="realList"
|
||||
:column-config="{ resizable: true, tooltip: true }"
|
||||
:tooltip-config="{ enterable: true }"
|
||||
>
|
||||
<vxe-colgroup align="center" :title="`电压有效值(${voltageUnit})`">
|
||||
<vxe-column align="center" field="vRmsA" title="A相"></vxe-column>
|
||||
<vxe-column align="center" field="vRmsB" title="B相"></vxe-column>
|
||||
@@ -67,8 +69,13 @@
|
||||
</vxe-colgroup>
|
||||
</vxe-table>
|
||||
<br />
|
||||
<vxe-table border height="" :data="realList" :column-config="{ resizable: true, tooltip: true }"
|
||||
:tooltip-config="{ enterable: true }">
|
||||
<vxe-table
|
||||
border
|
||||
height=""
|
||||
:data="realList"
|
||||
:column-config="{ resizable: true, tooltip: true }"
|
||||
:tooltip-config="{ enterable: true }"
|
||||
>
|
||||
<vxe-column align="center" field="freq" width="140" title="频率(Hz)"></vxe-column>
|
||||
<vxe-column align="center" field="freqDev" width="120" title="频率偏差(Hz)"></vxe-column>
|
||||
<vxe-column align="center" width="180" field="vUnbalance" title="电压不平衡度(%)"></vxe-column>
|
||||
@@ -85,8 +92,13 @@
|
||||
</vxe-colgroup>
|
||||
</vxe-table>
|
||||
<br />
|
||||
<vxe-table border height="" :data="realList" :column-config="{ resizable: true, tooltip: true }"
|
||||
:tooltip-config="{ enterable: true }">
|
||||
<vxe-table
|
||||
border
|
||||
height=""
|
||||
:data="realList"
|
||||
:column-config="{ resizable: true, tooltip: true }"
|
||||
:tooltip-config="{ enterable: true }"
|
||||
>
|
||||
<vxe-colgroup align="center" title="电压偏差(%)">
|
||||
<vxe-column align="center" field="vDevA" title="A相"></vxe-column>
|
||||
<vxe-column align="center" field="vDevB" title="B相"></vxe-column>
|
||||
@@ -110,8 +122,13 @@
|
||||
</vxe-colgroup>
|
||||
</vxe-table>
|
||||
<br />
|
||||
<vxe-table border height="" :data="realList" :column-config="{ resizable: true, tooltip: true }"
|
||||
:tooltip-config="{ enterable: true }">
|
||||
<vxe-table
|
||||
border
|
||||
height=""
|
||||
:data="realList"
|
||||
:column-config="{ resizable: true, tooltip: true }"
|
||||
:tooltip-config="{ enterable: true }"
|
||||
>
|
||||
<vxe-colgroup align="center" :title="`无功功率(${reactivePowerUnit})`">
|
||||
<vxe-column align="center" field="qA" title="A相"></vxe-column>
|
||||
<vxe-column align="center" field="qB" title="B相"></vxe-column>
|
||||
@@ -142,10 +159,6 @@
|
||||
</vxe-colgroup>
|
||||
</vxe-table>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
</template>
|
||||
<script lang="ts" setup>
|
||||
@@ -171,7 +184,7 @@ const echartsDataA1: any = ref({})
|
||||
const echartsDataA2: any = ref({})
|
||||
const echartsDataA3: any = ref({})
|
||||
|
||||
const currentDataLevel = ref('Primary')
|
||||
const currentDataLevel = ref('Primary')
|
||||
const previousDataLevel = ref('')
|
||||
|
||||
//渲染中间相角图
|
||||
@@ -264,10 +277,17 @@ const initRadioCharts = () => {
|
||||
}
|
||||
},
|
||||
|
||||
// // 指针设置
|
||||
// pointer: {
|
||||
// length: '80%',
|
||||
// width: 3
|
||||
// },
|
||||
// 指针设置
|
||||
pointer: {
|
||||
length: '80%',
|
||||
width: 3
|
||||
icon: 'path://m368.01136,209.80637l173.00807,-193.72679c19.14653,-21.43943 50.16392,-21.43943 69.31045,0l172.93149,193.72679c1.22537,1.37213 1.22537,3.51607 0,4.8882l-47.63657,53.34133c-1.22538,1.37213 -3.14003,1.37213 -4.36541,0l-113.65381,-127.26452c-1.91465,-2.14395 -5.20785,-0.60031 -5.20785,2.40122l0,731.94254c0,1.88667 -1.37855,3.43031 -3.06345,3.43031l-67.39579,0c-1.6849,0 -3.06345,-1.54364 -3.06345,-3.43031l0,-731.94254c0,-3.08728 -3.2932,-4.54517 -5.20785,-2.40122l-113.65381,127.26452c-1.22538,1.37213 -3.14003,1.37213 -4.36541,0l-47.63657,-53.34133c-1.22537,-1.37213 -1.22537,-3.51607 0,-4.88819l0,-0.00001M539,861.23064h73v800h-73z',
|
||||
length: '90%',
|
||||
width: 15,
|
||||
opacity: 1
|
||||
},
|
||||
detail: {
|
||||
show: false
|
||||
@@ -364,10 +384,17 @@ const initRadioCharts = () => {
|
||||
}
|
||||
},
|
||||
|
||||
// // 指针设置
|
||||
// pointer: {
|
||||
// length: '90%',
|
||||
// width: 6
|
||||
// },
|
||||
// 指针设置
|
||||
pointer: {
|
||||
icon: 'path://m368.01136,209.80637l173.00807,-193.72679c19.14653,-21.43943 50.16392,-21.43943 69.31045,0l172.93149,193.72679c1.22537,1.37213 1.22537,3.51607 0,4.8882l-47.63657,53.34133c-1.22538,1.37213 -3.14003,1.37213 -4.36541,0l-113.65381,-127.26452c-1.91465,-2.14395 -5.20785,-0.60031 -5.20785,2.40122l0,731.94254c0,1.88667 -1.37855,3.43031 -3.06345,3.43031l-67.39579,0c-1.6849,0 -3.06345,-1.54364 -3.06345,-3.43031l0,-731.94254c0,-3.08728 -3.2932,-4.54517 -5.20785,-2.40122l-113.65381,127.26452c-1.22538,1.37213 -3.14003,1.37213 -4.36541,0l-47.63657,-53.34133c-1.22537,-1.37213 -1.22537,-3.51607 0,-4.88819l0,-0.00001M539,861.23064h73v800h-73z',
|
||||
length: '90%',
|
||||
width: 6
|
||||
width: 15,
|
||||
opacity: 1
|
||||
},
|
||||
detail: {
|
||||
show: false
|
||||
@@ -549,25 +576,25 @@ const realList = ref<any>([])
|
||||
|
||||
// 计算电压单位
|
||||
const voltageUnit = computed(() => {
|
||||
return currentDataLevel.value === 'Primary' ? 'kV' : 'V'
|
||||
return currentDataLevel.value === 'Primary' ? 'kV' : 'V'
|
||||
})
|
||||
|
||||
// 计算功率单位
|
||||
const powerUnit = computed(() => {
|
||||
return currentDataLevel.value === 'Primary' ? 'kW' : 'W'
|
||||
return currentDataLevel.value === 'Primary' ? 'kW' : 'W'
|
||||
})
|
||||
|
||||
// 计算无功功率单位
|
||||
const reactivePowerUnit = computed(() => {
|
||||
return currentDataLevel.value === 'Primary' ? 'kVar' : 'Var'
|
||||
return currentDataLevel.value === 'Primary' ? 'kVar' : 'Var'
|
||||
})
|
||||
|
||||
// 计算视在功率单位
|
||||
const apparentPowerUnit = computed(() => {
|
||||
return currentDataLevel.value === 'Primary' ? 'kVA' : 'VA'
|
||||
return currentDataLevel.value === 'Primary' ? 'kVA' : 'VA'
|
||||
})
|
||||
|
||||
const setRealData = (val: any,dataLevel:string) => {
|
||||
const setRealData = (val: any, dataLevel: string) => {
|
||||
// 只有当 dataLevel 真正改变时才更新
|
||||
if (dataLevel !== previousDataLevel.value) {
|
||||
currentDataLevel.value = dataLevel
|
||||
@@ -808,7 +835,6 @@ onMounted(() => {
|
||||
}
|
||||
|
||||
:deep(.view_bot) {
|
||||
|
||||
.vxe-table--render-default .vxe-body--column:not(.col--ellipsis),
|
||||
.vxe-table--render-default .vxe-footer--column:not(.col--ellipsis),
|
||||
.vxe-table--render-default .vxe-header--column:not(.col--ellipsis) {
|
||||
|
||||
Reference in New Issue
Block a user