修改 海南测试bug
This commit is contained in:
@@ -1,19 +1,10 @@
|
||||
<template>
|
||||
<DatePicker ref="datePickerRef" style="display: none" theCurrentTime/>
|
||||
<el-select
|
||||
class="conditions"
|
||||
v-model="formData.conditions"
|
||||
placeholder="请选择指标"
|
||||
style="width: 200px"
|
||||
@change="History"
|
||||
>
|
||||
<DatePicker ref="datePickerRef" style="display: none" theCurrentTime />
|
||||
<el-select class="conditions" v-model="formData.conditions" placeholder="请选择指标" style="width: 200px"
|
||||
@change="History">
|
||||
<el-option-group v-for="group in indexOptions" :key="group.label" :label="group.label">
|
||||
<el-option
|
||||
v-for="item in group.options"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
></el-option>
|
||||
<el-option v-for="item in group.options" :key="item.value" :label="item.label"
|
||||
:value="item.value"></el-option>
|
||||
</el-option-group>
|
||||
</el-select>
|
||||
<MyEChart v-loading="loading" :options="list[0]?.option" :style="`height: calc(${rowHeight} - 31px)`" />
|
||||
@@ -1077,7 +1068,7 @@ const rendering = () => {
|
||||
barWidth: 22,
|
||||
itemStyle: {
|
||||
normal: {
|
||||
color: '#FF3300'
|
||||
color: '#CC0000'
|
||||
}
|
||||
},
|
||||
data: item.cvalue
|
||||
@@ -1258,7 +1249,7 @@ const getEcharts = () => {
|
||||
opacity: 0.35,
|
||||
fontSize: 14
|
||||
},
|
||||
backgroundColor: 'rgba(0,0,0,0.35)',
|
||||
backgroundColor: 'rgba(0,0,0,0.55)',
|
||||
|
||||
formatter: function (params: any) {
|
||||
let tips = ''
|
||||
@@ -1273,29 +1264,29 @@ const getEcharts = () => {
|
||||
params[i].value[1] > 0
|
||||
? 'A相谐波电流方向:流入<br/>'
|
||||
: params[i].value[1] == 0
|
||||
? 'A相谐波电流方向:无<br/>'
|
||||
: 'A相谐波电流方向:流出<br/>'
|
||||
? 'A相谐波电流方向:无<br/>'
|
||||
: 'A相谐波电流方向:流出<br/>'
|
||||
} else if (params[i].seriesName == 'B相谐波电流方向') {
|
||||
tips +=
|
||||
params[i].value[1] > 0
|
||||
? 'B相谐波电流方向:流入<br/>'
|
||||
: params[i].value[1] == 0
|
||||
? 'B相谐波电流方向:无<br/>'
|
||||
: 'B相谐波电流方向:流出<br/>'
|
||||
? 'B相谐波电流方向:无<br/>'
|
||||
: 'B相谐波电流方向:流出<br/>'
|
||||
} else if (params[i].seriesName == 'C相谐波电流方向') {
|
||||
tips +=
|
||||
params[i].value[1] > 0
|
||||
? 'C相谐波电流方向:流入<br/>'
|
||||
: params[i].value[1] == 0
|
||||
? 'C相谐波电流方向:无<br/>'
|
||||
: 'C相谐波电流方向:流出<br/>'
|
||||
? 'C相谐波电流方向:无<br/>'
|
||||
: 'C相谐波电流方向:流出<br/>'
|
||||
} else if (params[i].seriesName == '总谐波电流方向') {
|
||||
tips +=
|
||||
params[i].value[1] > 0
|
||||
? '总谐波电流方向:流入<br/>'
|
||||
: params[i].value[1] == 0
|
||||
? '总谐波电流方向:无<br/>'
|
||||
: '总谐波电流方向:流出<br/>'
|
||||
? '总谐波电流方向:无<br/>'
|
||||
: '总谐波电流方向:流出<br/>'
|
||||
} else if (params[i].seriesName == '正序电压') {
|
||||
let str = (params[i].value[1] * 1).toString()
|
||||
let reg = str.indexOf('.') > -1 ? /(\d)(?=(\d{3})+\.)/g : /(\d)(?=(?:\d{3})+$)/g
|
||||
|
||||
@@ -516,16 +516,16 @@ const open = async (id: string) => {
|
||||
TargetData.value = res.data
|
||||
let num = 0
|
||||
let flag = 0
|
||||
let judgment=true
|
||||
let judgment = true
|
||||
for (let k in res.data) {
|
||||
if (k != 'lineId') {
|
||||
if(res.data[k] != '/'){
|
||||
judgment=false
|
||||
if (res.data[k] != '/') {
|
||||
judgment = false
|
||||
}
|
||||
flag += (res.data[k] == '/' ? 0 : res.data[k])
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (IntegrityNum.value == 0) {
|
||||
num = 2 //完整性告警
|
||||
} else {
|
||||
@@ -534,7 +534,7 @@ const open = async (id: string) => {
|
||||
} else {
|
||||
num = 0 //无告警
|
||||
}
|
||||
if(judgment){
|
||||
if (judgment) {
|
||||
num = 3
|
||||
}
|
||||
}
|
||||
@@ -581,7 +581,7 @@ const echart = (row: any) => {
|
||||
opacity: 0.35,
|
||||
fontSize: 14
|
||||
},
|
||||
backgroundColor: 'rgba(0,0,0,0.35)',
|
||||
backgroundColor: 'rgba(0,0,0,0.55)',
|
||||
borderWidth: 0
|
||||
},
|
||||
legend: {
|
||||
|
||||
Reference in New Issue
Block a user