修改 海南测试bug

This commit is contained in:
GGJ
2024-12-11 16:14:08 +08:00
parent 9b952f2016
commit 16c25ddf6b
28 changed files with 338 additions and 220 deletions

View File

@@ -10,11 +10,8 @@
<div class="boxSteps">
<el-steps>
<template v-for="(item, i) in Voltage">
<el-step
:class="active == i ? 'highlight' : ''"
:title="item.name"
@click="handleClick(i)"
></el-step>
<el-step :class="active == i ? 'highlight' : ''" :title="item.name"
@click="handleClick(i)"></el-step>
</template>
</el-steps>
</div>
@@ -106,7 +103,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: {
@@ -205,19 +202,23 @@ defineExpose({ open })
:deep(.el-select) {
min-width: 80px;
}
.title {
display: flex;
justify-content: space-between;
margin: 10px;
span {
font-weight: 550;
font-size: 18px;
}
}
.pie {
display: flex;
justify-content: space-around;
}
.evaluationData {
height: 40px;
margin: 8px 30px;
@@ -226,6 +227,7 @@ defineExpose({ open })
display: flex;
font-size: 18px;
line-height: 40px;
img {
height: 30px;
width: 30px;
@@ -236,6 +238,7 @@ defineExpose({ open })
.el-steps {
margin-top: 5px;
}
:deep(.el-step__icon) {
border: none;
background: #ccc;
@@ -243,15 +246,18 @@ defineExpose({ open })
width: 15px;
height: 15px;
}
:deep(.el-step__icon-inner) {
display: none;
}
:deep(.boxSteps) {
border-radius: 50px;
width: 60%;
height: 25px;
margin: auto;
margin-top: 30px;
.el-step__title {
line-height: 18px;
font-size: 16px;
@@ -262,14 +268,17 @@ defineExpose({ open })
top: -50px;
}
}
:deep(.highlight) {
.el-step__icon {
background: var(--el-color-primary);
}
.el-step__title {
font-weight: 700 !important;
color: var(--el-color-primary) !important;
}
// .is-wait {
// color: var(--el-color-primary) !important;
// }

View File

@@ -10,11 +10,8 @@
<div class="boxSteps">
<el-steps>
<template v-for="(item, i) in Voltage">
<el-step
:class="active == i ? 'highlight' : ''"
:title="item.name"
@click="handleClick(i)"
></el-step>
<el-step :class="active == i ? 'highlight' : ''" :title="item.name"
@click="handleClick(i)"></el-step>
</template>
</el-steps>
</div>
@@ -111,7 +108,7 @@ const echart = (row: any) => {
let chart = echarts.init(chartRef.value as HTMLDivElement)
let dataname = [ '频率偏差(Hz)',
let dataname = ['频率偏差(Hz)',
'电压偏差(%)',
'电压总谐波畸变率(%)',
'三相电压不平衡度(%)',
@@ -145,9 +142,9 @@ 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,
position:'bottom'
position: 'bottom'
},
legend: {
data: row.map((item: any) => item.time),
@@ -253,19 +250,23 @@ defineExpose({ open })
:deep(.el-select) {
min-width: 80px;
}
.title {
display: flex;
justify-content: space-between;
margin: 10px;
span {
font-weight: 550;
font-size: 18px;
}
}
.pie {
display: flex;
justify-content: space-around;
}
.evaluationData {
height: 33px;
margin: 8px 30px;
@@ -274,6 +275,7 @@ defineExpose({ open })
display: flex;
font-size: 18px;
line-height: 35px;
img {
height: 25px;
width: 25px;
@@ -284,6 +286,7 @@ defineExpose({ open })
.el-steps {
margin-top: 5px;
}
:deep(.el-step__icon) {
border: none;
background: #ccc;
@@ -291,15 +294,18 @@ defineExpose({ open })
width: 15px;
height: 15px;
}
:deep(.el-step__icon-inner) {
display: none;
}
:deep(.boxSteps) {
border-radius: 50px;
width: 60%;
height: 25px;
margin: auto;
margin-top: 30px;
.el-step__title {
line-height: 18px;
font-size: 16px;
@@ -310,18 +316,22 @@ defineExpose({ open })
top: -50px;
}
}
:deep(.highlight) {
.el-step__icon {
background: var(--el-color-primary);
}
.el-step__title {
font-weight: 700 !important;
color: var(--el-color-primary) !important;
}
// .is-wait {
// color: var(--el-color-primary) !important;
// }
}
:deep(.el-dialog__body) {
max-height: none !important;
}

View File

@@ -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

View File

@@ -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: {