Web/admin-govern
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

修改测试bug

Browse Source
This commit is contained in:
GGJ
2024-12-11 11:33:44 +08:00
parent 22d85dfca1
commit 26c971f3b0
10 changed files with 197 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/govern/device/control/analysisList/popup.vue
View File

@@ -26,7 +26,7 @@ import { defaultAttribute } from '@/components/table/defaultAttribute'
import { mainHeight } from '@/utils/layout'
const emit = defineEmits(['back'])
const dialogVisible = ref(false)
const tableHeight = mainHeight(550)
const tableHeight = mainHeight(440)
const height = ref(0)
height.value = window.innerHeight < 1080 ? 230 : 450

9
src/views/govern/device/control/index.vue
View File

@@ -109,6 +109,13 @@
:value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="数据来源" v-if="dataSet.includes('_items')">
<el-select v-model="formInline.targetType" >
<el-option v-for="item in dataSource" :key="item.id" :label="item.name"
:value="item.id" />
</el-select>
</el-form-item>
<el-form-item label="关键字" v-if="!dataSet.includes('_')">
<el-input style="width: 160px" v-model="searchValue" autocomplete="off" clearable
@input="handleSearch" placeholder="请输入关键词"></el-input>
@@ -640,6 +647,7 @@ const handleaddDevice = () => {
const deviceId: any = ref('')
const lineId: any = ref('')
const dataLevel: any = ref('')
const dataSource=ref([])
const nodeClick = async (e: anyObj) => {
// console.log("🚀 ~ nodeClick ~ e:", e)
if (e.level == 2) return
@@ -698,6 +706,7 @@ const nodeClick = async (e: anyObj) => {
if (item.type === 'event') {
item.id = item.id + '_event'
}
// 测试项日志
if (item.type === 'items') {
item.id = item.id + '_items'
}

38
src/views/govern/device/control/tabs/trend.vue
View File

@@ -14,16 +14,16 @@
:value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item >
<el-form-item>
<!-- <el-select style="min-width: 120px !important" v-model="searchForm.dataLevel">
<el-option value="Primary" label="一次值"></el-option>
<el-option value="Secondary" label="二次值"></el-option>
</el-select> -->
<el-radio-group v-model="searchForm.dataLevel" @change="init()">
<el-radio-button label="一次值" value="Primary" />
<el-radio-button label="二次值" value="Secondary" />
<el-radio-button label="一次值" value="Primary" />
<el-radio-button label="二次值" value="Secondary" />
</el-radio-group>
</el-radio-group>
</el-form-item>
<el-form-item label="统计类型">
<el-select style="min-width: 120px !important" placeholder="请选择" v-model="searchForm.valueType">
@@ -68,7 +68,7 @@ import { color } from '@/components/echarts/color'
import { ElMessage } from 'element-plus'
const dictData = useDictData()
defineOptions({
name: 'govern/device/control'
// name: 'govern/device/control'
})
const props = defineProps({
TrendList: {
@@ -86,7 +86,7 @@ const num = ref(0)
//值类型
const pageHeight = ref(mainHeight(290))
const loading = ref(true)
const searchForm:any = ref({})
const searchForm: any = ref({})
const tableHeaderRef = ref()
const typeOptions = [
{
@@ -229,7 +229,7 @@ const init = async () => {
if (item.phase == null) {
key = item.unit
} else {
key = item.unit
key = item.anotherName
}
if (!acc[key]) {
@@ -283,8 +283,17 @@ const init = async () => {
const xname = params[0].value[0]
let str = `${xname}<br>`
params.forEach((el: any, index: any) => {
let marker = ''
if (el.value[3] == 'dashed') {
for (let i = 0; i < 3; i++) {
marker += `<span style="display:inline-block;border: 2px ${el.color} solid;margin-right:5px;width:10px;height:0px;background-color:#ffffff00;"></span>`
}
} else {
marker = `<span style="display:inline-block;border: 2px ${el.color} ${el.value[3]};margin-right:5px;width:40px;height:0px;background-color:#ffffff00;"></span>`
}
let unit = el.value[2] ? el.value[2] : ''
str += `${el.marker}${el.seriesName.split('(')[0]}：${el.value[1]}${unit}
str += `${marker}${el.seriesName.split('(')[0]}：${el.value[1]}${unit}
<br>`
})
return str
@@ -398,7 +407,7 @@ const init = async () => {
yMethodList.push(cc.statisticalData?.toFixed(2) - 0)
}
seriesList.push([cc.time, cc.statisticalData?.toFixed(2), cc.unit])
seriesList.push([cc.time, cc.statisticalData?.toFixed(2), cc.unit, lineStyle[lineS].type])
})
// console.log(kk);
@@ -412,7 +421,7 @@ const init = async () => {
symbol: 'none',
data: seriesList,
lineStyle: lineStyle[lineS],
yAxisIndex: index
yAxisIndex: setList.indexOf(kk[0].unit)
})
})
let [min, max] = yMethod(yMethodList)
@@ -572,6 +581,7 @@ const countData: any = ref([])
//根据选择的指标处理谐波次数
const formatCountOptions = (list: any) => {
countData.value = []
if (list.length != 0) {
list.map((item: any, index: any) => {
if (!countData.value[index]) {
@@ -632,6 +642,14 @@ const onCountChange = (val: any, index: any) => {
const flag = ref(true)
const onIndexChange = (val: any) => {
num.value += 1
let pp: any = []
indexOptions.value.forEach((item: any) => {
const filteredResult = val.filter(vv => item.id == vv);
if (filteredResult.length > 0) {
pp.push(filteredResult[0]);
}
})
searchForm.value.index = pp
flag.value = true

35
src/views/govern/device/control/testItemRecords.vue
View File

@@ -1,9 +1,9 @@
<template>
<!-- 测试项日志 -->
<div :style="{ height: height }">
<vxe-table height="auto" auto-resize :data="dataList" v-bind="defaultAttribute" :key="key">
<vxe-column v-for="item in column" :field="item.field" :title="item.title" :formatter="formatter"
:min-width="item.width"></vxe-column>
:min-width="item.width" :sortable="item.sortable"></vxe-column>
<vxe-column title="操作" fixed="right" width="100">
<template v-slot:default="scoped">
<el-button link type="danger" @click="remove(scoped.row)">删除</el-button>
@@ -26,24 +26,25 @@ const voltageLevelList: any = dictData.getBasicData('Dev_Voltage_Stand')
import { deleteItem } from '@/api/cs-device-boot/csGroup'
const volConTypeList = dictData.getBasicData('Dev_Connect')
const emit = defineEmits(['onSubmit'])
const height = mainHeight(325).height
const height = mainHeight(295).height
const dataList = ref([])
const key: any = ref(0)
const column: any = ref([
{ field: 'itemName', title: '名称', width: '100px' },
{ field: 'startTime', title: '数据起始时间', width: '140px' },
{ field: 'endTime', title: '数据结束时间', width: '140px' },
{ field: 'statisticalInterval', title: '统计间隔', width: '100px' },
{ field: 'voltageLevel', title: '电压等级', width: '100px' },
{ field: 'volConType', title: ' 电压接线方式', width: '100px' },
{ field: 'capacitySi', title: '用户协议容量', width: '100px' },
{ field: 'capacitySscb', title: '基准短路容量', width: '100px' },
{ field: 'capacitySscmin', title: '最小短路容量', width: '100px' },
{ field: 'capacitySt', title: '供电设备容量', width: '100px' },
{ field: 'location', title: ' 测试位置', width: '100px' },
{ field: 'ct', title: 'CT', width: '70px' },
{ field: 'pt', title: 'PT', width: '70px' },
{ field: 'startTime', title: '数据起始时间', width: '140px', sortable: true },
{ field: 'endTime', title: '数据结束时间', width: '140px', sortable: true },
{ field: 'itemName', title: '数据来源', width: '100px' },
{ field: 'statisticalInterval', title: '统计间隔', width: '100px', },
{ field: '', title: '时间间隔', width: '140px', },
{ field: 'voltageLevel', title: '电压等级', width: '100px',sortable: true },
{ field: 'volConType', title: ' 电压接线方式', width: '100px', sortable: true },
{ field: 'capacitySi', title: '用户协议容量(MVA)', width: '140px', },
{ field: 'capacitySscb', title: '基准短路容量(MVA)', width: '140px', },
{ field: 'capacitySscmin', title: '最小短路容量(MVA)', width: '140px', },
{ field: 'capacitySt', title: '供电设备容量(MVA)', width: '140px', },
{ field: 'location', title: ' 测试位置', width: '100px', },
{ field: 'ct', title: 'CT', width: '70px', },
{ field: 'pt', title: 'PT', width: '70px', },
])
const setData = (data: any) => {