修改测试问题
This commit is contained in:
@@ -4,8 +4,8 @@
|
||||
<div class="harmonic_select" v-if="!loading">
|
||||
<el-form :model="searchForm" id="history_select">
|
||||
<el-form-item label="稳态指标">
|
||||
<el-select multiple collapse-tags collapse-tags-tooltip v-model.trim="searchForm.index"
|
||||
placeholder="请选择统计指标" :multiple-limit="3" value-key="id">
|
||||
<el-select multiple collapse-tags collapse-tags-tooltip filterable v-model.trim="searchForm.index"
|
||||
placeholder="请选择统计指标" :multiple-limit="3" value-key="id">
|
||||
<el-option v-for="(item, index) in indexOptions" :label="item.name" :key="index"
|
||||
:value="item"></el-option>
|
||||
</el-select>
|
||||
@@ -347,7 +347,7 @@ const init = () => {
|
||||
// }
|
||||
// },
|
||||
boundaryGap: false,
|
||||
data: xAixsTimeList.value
|
||||
// data: xAixsTimeList.value
|
||||
},
|
||||
yAxis: {
|
||||
// type: 'value',
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
<template>
|
||||
<div class="view">
|
||||
<TableHeader datePicker ref="headerRef" v-if="!isWaveCharts" :showReset="false"></TableHeader>
|
||||
<Table ref="tableRef" v-if="!isWaveCharts" />
|
||||
<div v-show="!isWaveCharts">
|
||||
<TableHeader datePicker ref="headerRef" :showReset="false"></TableHeader>
|
||||
<Table ref="tableRef" />
|
||||
</div>
|
||||
<waveFormAnalysis
|
||||
v-loading="loading"
|
||||
v-if="isWaveCharts"
|
||||
@@ -62,8 +64,7 @@ const tableStore: any = new TableStore({
|
||||
title: '相别',
|
||||
minWidth: 80,
|
||||
formatter: (row: any) => {
|
||||
row.cellValue = row.cellValue ? row.cellValue : '/'
|
||||
return row.cellValue
|
||||
return row.cellValue || '/'
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -71,9 +72,9 @@ const tableStore: any = new TableStore({
|
||||
title: '持续时间(s)',
|
||||
minWidth: 110,
|
||||
formatter: (row: any) => {
|
||||
console.log('row.cellValue', row.cellValue)
|
||||
row.cellValue = row.cellValue ? row.cellValue.toFixed(2) : '/'
|
||||
return row.cellValue
|
||||
console.log('🚀 ~ row.cellValue:', row.cellValue)
|
||||
|
||||
return row.cellValue ? (row.cellValue - 0).toFixed(2) : '/'
|
||||
},
|
||||
sortable: true
|
||||
},
|
||||
@@ -91,10 +92,11 @@ const tableStore: any = new TableStore({
|
||||
}
|
||||
},
|
||||
{
|
||||
title: '操作', fixed: 'right',
|
||||
title: '操作',
|
||||
fixed: 'right',
|
||||
width: 180,
|
||||
render: 'buttons',
|
||||
|
||||
|
||||
buttons: [
|
||||
{
|
||||
name: 'edit',
|
||||
@@ -196,7 +198,6 @@ const tableStore: any = new TableStore({
|
||||
tableStore.table.params.devId = tableParams.value.devId
|
||||
tableStore.table.params.lineId = tableParams.value.lineId
|
||||
tableStore.table.params.list = tableParams.value.list
|
||||
console.log('🚀 ~ ableParams.value:', tableParams.value)
|
||||
tableStore.table.params.type = 3
|
||||
},
|
||||
loadCallback: () => {}
|
||||
|
||||
@@ -69,8 +69,8 @@
|
||||
<br />
|
||||
<vxe-table border height="" :data="realList" :column-config="{ resizable: true, tooltip: true }"
|
||||
:tooltip-config="{ enterable: true }">
|
||||
<vxe-column align="center" field="freqDev" width="140" title="频率(Hz)"></vxe-column>
|
||||
<vxe-column align="center" field="freq" width="120" title="频率偏差(Hz)"></vxe-column>
|
||||
<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>
|
||||
<vxe-column align="center" width="180" field="iUnbalance" title="电流不平衡度(%)"></vxe-column>
|
||||
<vxe-colgroup align="center" :title="`基波电压幅值(${voltageUnit})`">
|
||||
@@ -128,13 +128,13 @@
|
||||
<vxe-column align="center" field="sC" title="C相"></vxe-column>
|
||||
<vxe-column align="center" field="sTot" title="总"></vxe-column>
|
||||
</vxe-colgroup>
|
||||
<vxe-colgroup align="center" title="功率因数">
|
||||
<vxe-colgroup align="center" title="视在功率因数">
|
||||
<vxe-column align="center" field="pfA" title="A相"></vxe-column>
|
||||
<vxe-column align="center" field="pfB" title="B相"></vxe-column>
|
||||
<vxe-column align="center" field="pfC" title="C相"></vxe-column>
|
||||
<vxe-column align="center" field="pfTot" title="总"></vxe-column>
|
||||
</vxe-colgroup>
|
||||
<vxe-colgroup align="center" title="基波功率因数">
|
||||
<vxe-colgroup align="center" title="位移功率因数">
|
||||
<vxe-column align="center" field="dpfA" title="A相"></vxe-column>
|
||||
<vxe-column align="center" field="dpfB" title="B相"></vxe-column>
|
||||
<vxe-column align="center" field="dpfC" title="C相"></vxe-column>
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
multiple
|
||||
:multiple-limit="3"
|
||||
collapse-tags
|
||||
filterable
|
||||
collapse-tags-tooltip
|
||||
v-model="searchForm.index"
|
||||
placeholder="请选择统计指标"
|
||||
@@ -67,7 +68,7 @@
|
||||
<el-option
|
||||
v-for="vv in item.countOptions"
|
||||
:key="vv"
|
||||
:label="vv"
|
||||
:label="item.name.includes('间谐波') ? vv - 0.5 : vv"
|
||||
:value="vv"
|
||||
></el-option>
|
||||
</el-select>
|
||||
@@ -157,7 +158,13 @@ const countOptions: any = ref([])
|
||||
// Harmonic_Type
|
||||
// portable-harmonic
|
||||
const legendDictList: any = ref([])
|
||||
queryByCode(props?.TrendList?.lineType == 0 ? 'apf-harmonic' : 'portable-harmonic').then(res => {
|
||||
queryByCode(
|
||||
props?.TrendList?.lineType == 0
|
||||
? 'apf-harmonic'
|
||||
: props?.TrendList?.conType == 1
|
||||
? 'portable-harmonic-jx'
|
||||
: 'portable-harmonic'
|
||||
).then(res => {
|
||||
queryCsDictTree(res.data.id).then(item => {
|
||||
//排序
|
||||
indexOptions.value = item.data.sort((a: any, b: any) => {
|
||||
@@ -185,15 +192,15 @@ queryByCode(props?.TrendList?.lineType == 0 ? 'apf-harmonic' : 'portable-harmoni
|
||||
if (kk.harmStart && kk.harmEnd) {
|
||||
range(0, 0, 0)
|
||||
|
||||
if (kk.showName == '间谐波电压含有率') {
|
||||
countDataCopy.value[index].countOptions = range(kk.harmStart, kk.harmEnd, 1).map(
|
||||
(item: any) => {
|
||||
return item - 0.5
|
||||
}
|
||||
)
|
||||
} else {
|
||||
// if (kk.showName == '间谐波电压含有率') {
|
||||
// countDataCopy.value[index].countOptions = range(kk.harmStart, kk.harmEnd, 1).map(
|
||||
// (item: any) => {
|
||||
// return item - 0.5
|
||||
// }
|
||||
// )
|
||||
// } else {
|
||||
countDataCopy.value[index].countOptions = range(kk.harmStart, kk.harmEnd, 1)
|
||||
}
|
||||
// }
|
||||
if (!countDataCopy.value[index].count || countDataCopy.value[index].count.length == 0) {
|
||||
countDataCopy.value[index].count = countDataCopy.value[index].countOptions[0]
|
||||
}
|
||||
@@ -232,7 +239,7 @@ const init = async () => {
|
||||
loading.value = true
|
||||
// 选择指标的时候切换legend内容和data数据
|
||||
let list: any = []
|
||||
echartsData.value={}
|
||||
echartsData.value = {}
|
||||
legendDictList.value?.selectedList?.map((item: any) => {
|
||||
searchForm.value.index.map((vv: any) => {
|
||||
if (item.dataType == vv) {
|
||||
@@ -260,7 +267,7 @@ const init = async () => {
|
||||
let frequencys: any = null
|
||||
countData.value.map((item: any, index: any) => {
|
||||
if (item.name.includes('间谐波电压')) {
|
||||
frequencys = item.count + 0.5
|
||||
frequencys = item.count //+ 0.5
|
||||
} else {
|
||||
frequencys = item.count
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user