修改南工程测试问题
This commit is contained in:
@@ -71,7 +71,7 @@ const formData = reactive<{
|
||||
searchEndTime: '',
|
||||
condition: ['10', '11', '12'],
|
||||
valueType: 1,
|
||||
harmonic: 2,
|
||||
harmonic: 1,
|
||||
inHarmonic: 1,
|
||||
ptType: 0
|
||||
})
|
||||
@@ -1092,10 +1092,27 @@ const shujuchuli = (res: any) => {
|
||||
}
|
||||
const rendering = () => {
|
||||
height.value = mainHeight(200, list.value.length > 1 ? 2 : 1)
|
||||
|
||||
list.value.forEach((item: any) => {
|
||||
if (item.targetName == '电压不平衡') {
|
||||
|
||||
item.valueName = ''
|
||||
item.legend = item.legend.map((item2: any) => {
|
||||
if (item2 == '零序电压') {
|
||||
item2 = item2 + '(V)'
|
||||
} else if (item2 == '正序电压') {
|
||||
item2 = item2 + '(kV)'
|
||||
} else if (item2 == '负序电压') {
|
||||
item2 = item2 + '(V)'
|
||||
}
|
||||
return item2
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
let opitonserise: any[] = []
|
||||
item.legend.forEach((item2: any) => {
|
||||
if (item.avalue !== undefined && (item2 == 'A相' || item2 == 'AB相' || item2 == '零序电压')) {
|
||||
if (item.avalue !== undefined && (item2 == 'A相' || item2 == 'AB相' || item2 == '零序电压(V)')) {
|
||||
let data = {
|
||||
name: item2,
|
||||
symbol: 'none',
|
||||
@@ -1111,7 +1128,7 @@ const rendering = () => {
|
||||
data: item.avalue
|
||||
}
|
||||
opitonserise.push(data)
|
||||
} else if (item.bvalue !== undefined && (item2 == 'B相' || item2 == 'BC相' || item2 == '正序电压')) {
|
||||
} else if (item.bvalue !== undefined && (item2 == 'B相' || item2 == 'BC相' || item2 == '正序电压(kV)')) {
|
||||
let data = {
|
||||
name: item2,
|
||||
symbol: 'none',
|
||||
@@ -1127,7 +1144,7 @@ const rendering = () => {
|
||||
data: item.bvalue
|
||||
}
|
||||
opitonserise.push(data)
|
||||
} else if (item.cvalue !== undefined && (item2 == 'C相' || item2 == 'CA相' || item2 == '负序电压')) {
|
||||
} else if (item.cvalue !== undefined && (item2 == 'C相' || item2 == 'CA相' || item2 == '负序电压(V)')) {
|
||||
let data = {
|
||||
name: item2,
|
||||
symbol: 'none',
|
||||
@@ -1356,17 +1373,17 @@ const getEcharts = () => {
|
||||
: params[i].value[1] == 0
|
||||
? '总谐波电流方向:无<br/>'
|
||||
: '总谐波电流方向:流出<br/>'
|
||||
} else if (params[i].seriesName == '正序电压') {
|
||||
} else if (params[i].seriesName == '正序电压(kV)') {
|
||||
let str = (params[i].value[1] * 1).toString()
|
||||
let reg = str.indexOf('.') > -1 ? /(\d)(?=(\d{3})+\.)/g : /(\d)(?=(?:\d{3})+$)/g
|
||||
let str1 = str.replace(reg, '$1,')
|
||||
tips += params[i].seriesName + ':' + str1 + 'kV<br/>'
|
||||
} else if (params[i].seriesName == '零序电压' || params[i].seriesName == '负序电压') {
|
||||
tips += params[i].seriesName.replace("(kV)", "") + ':' + str1 + 'kV<br/>'
|
||||
} else if (params[i].seriesName == '零序电压(V)' || params[i].seriesName == '负序电压(V)') {
|
||||
let str = (params[i].value[1] * 1).toString()
|
||||
let reg = str.indexOf('.') > -1 ? /(\d)(?=(\d{3})+\.)/g : /(\d)(?=(?:\d{3})+$)/g
|
||||
let str1 = str.replace(reg, '$1,')
|
||||
tips += params[i].seriesName + ':' + str1 + 'V<br/>'
|
||||
} else if (params[i].seriesName !== '正序电压') {
|
||||
tips += params[i].seriesName.replace("(V)", "") + ':' + str1 + 'V<br/>'
|
||||
} else if (params[i].seriesName !== '正序电压(kV)') {
|
||||
let str = (params[i].value[1] * 1).toString()
|
||||
let reg = str.indexOf('.') > -1 ? /(\d)(?=(\d{3})+\.)/g : /(\d)(?=(?:\d{3})+$)/g
|
||||
let str1 = str.replace(reg, '$1,')
|
||||
@@ -1407,8 +1424,8 @@ const getEcharts = () => {
|
||||
}
|
||||
},
|
||||
grid: {
|
||||
top: '70px',
|
||||
},
|
||||
top: '70px',
|
||||
},
|
||||
xAxis: [
|
||||
{
|
||||
type: 'time',
|
||||
|
||||
@@ -2,40 +2,34 @@
|
||||
<div class="default-main" :style="height">
|
||||
<splitpanes style="height: 100%" class="default-theme" id="navigation-splitpanes">
|
||||
<pane :size="size">
|
||||
<PointTree
|
||||
:default-expand-all="false"
|
||||
@node-click="handleNodeClick"
|
||||
@init="handleNodeClick"
|
||||
></PointTree>
|
||||
<PointTree v-if="showTree" :default-expand-all="false" @node-click="handleNodeClick"
|
||||
@init="handleNodeClick">
|
||||
</PointTree>
|
||||
</pane>
|
||||
<pane style="background: #fff" :style="height">
|
||||
<TableHeader ref="TableHeaderRef" datePicker>
|
||||
<template v-slot:select>
|
||||
<el-form-item label="模板策略">
|
||||
<el-select v-model="Template" @change="changetype" placeholder="请选择模版" value-key="id">
|
||||
<el-option
|
||||
v-for="item in templatePolicy"
|
||||
:key="item.id"
|
||||
:label="item.name"
|
||||
:value="item"
|
||||
></el-option>
|
||||
<el-option v-for="item in templatePolicy" :key="item.id" :label="item.name"
|
||||
:value="item"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="报表类型">
|
||||
<el-input readonly type='text' value='分析报表'></el-input>
|
||||
<!-- <el-select-->
|
||||
<!-- :disabled="true"-->
|
||||
<!-- v-model="reportForm"-->
|
||||
<!-- :popper-append-to-body="false"-->
|
||||
<!-- placeholder="请选择报表类型"-->
|
||||
<!-- >-->
|
||||
<!-- <el-option-->
|
||||
<!-- v-for="item in reportFormList"-->
|
||||
<!-- :key="item.value"-->
|
||||
<!-- :label="item.label"-->
|
||||
<!-- :value="item.value"-->
|
||||
<!-- ></el-option>-->
|
||||
<!-- </el-select>-->
|
||||
<el-input readonly type='text' value='分析报表'></el-input>
|
||||
<!-- <el-select-->
|
||||
<!-- :disabled="true"-->
|
||||
<!-- v-model="reportForm"-->
|
||||
<!-- :popper-append-to-body="false"-->
|
||||
<!-- placeholder="请选择报表类型"-->
|
||||
<!-- >-->
|
||||
<!-- <el-option-->
|
||||
<!-- v-for="item in reportFormList"-->
|
||||
<!-- :key="item.value"-->
|
||||
<!-- :label="item.label"-->
|
||||
<!-- :value="item.value"-->
|
||||
<!-- ></el-option>-->
|
||||
<!-- </el-select>-->
|
||||
</el-form-item>
|
||||
</template>
|
||||
<template #operation>
|
||||
@@ -64,6 +58,7 @@ import { exportExcel } from '@/views/system/reportForms/export.js'
|
||||
defineOptions({
|
||||
name: 'harmonic-boot/xieboReport'
|
||||
})
|
||||
const showTree = ref(false)
|
||||
const height = mainHeight(20)
|
||||
const size = ref(0)
|
||||
const dictData = useDictData()
|
||||
@@ -99,7 +94,7 @@ const tableStore = new TableStore({
|
||||
tableStore.table.data.forEach((item: any) => {
|
||||
item.data1 ? (item.data = JSON.parse(item.data1)) : ''
|
||||
item.celldata.forEach((k: any) => {
|
||||
item.data[k.r][k.c].v ? (item.data[k.r][k.c] = k.v ) : ''
|
||||
item.data[k.r][k.c].v ? (item.data[k.r][k.c] = k.v) : ''
|
||||
})
|
||||
})
|
||||
console.log(tableStore.table.data)
|
||||
@@ -128,6 +123,9 @@ getTemplateByDept({ id: dictData.state.area[0].id }).then((res: any) => {
|
||||
templatePolicy.value = res.data
|
||||
Template.value = res.data[0]
|
||||
reportForm.value = res.data[0]?.reportForm
|
||||
showTree.value = true
|
||||
}).catch((err: any) => {
|
||||
showTree.value = true
|
||||
})
|
||||
const changetype = (val: any) => {
|
||||
reportForm.value = val.reportForm
|
||||
|
||||
Reference in New Issue
Block a user