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

修改方案数据设备监控问题

Browse Source
This commit is contained in:
zhujiyan
2024-10-09 08:49:19 +08:00
parent 01f0cd7871
commit 5abe4755af
2 changed files with 167 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -81,15 +81,16 @@
:inline="true"
style="white-space: nowrap; margin-top: 10px"
v-if="
dataSet.indexOf('_trenddata') == -1 &&
(dataSet.indexOf('_trenddata') == -1 &&
dataSet.indexOf('_realtimedata') == -1 &&
dataSet.indexOf('_event') == -1
dataSet.indexOf('_event') == -1) ||
realTimeFlag
"
>
<el-form-item label="日期" v-show="dataSet.indexOf('_history') != -1">
<DatePicker ref="datePickerRef"></DatePicker>
</el-form-item>
<el-form-item label="指标">
<el-form-item label="指标" v-show="!realTimeFlag">
<el-input
style="width: 160px"
v-model="formInline.searchValue"
@@ -536,7 +537,7 @@ const handleClick = async (tab?: any) => {
lineId: lineId.value,
devId: dataSet.value.replace('_trenddata', '')
}
],
]
// startTime: datePickerRef.value && datePickerRef.value.timeValue[0],
// endTime: datePickerRef.value && datePickerRef.value.timeValue[1]
}
@@ -551,6 +552,7 @@ const handleClick = async (tab?: any) => {
realTimeFlag.value = true
let obj = {
type: 2,
dataLevel: formInline.dataLevel,
devId: deviceId.value, //e.id
lineId: lineId.value //e.pid
}

122
src/views/govern/device/planData/index.vue
View File

@@ -97,14 +97,17 @@
</el-tab-pane>
</el-tabs>
</div>
<div class="monitor_info" v-else>
<el-empty />
</div>
</el-collapse-item>
<el-collapse-item title="历史趋势" name="1">
<!-- <div class="history_title">
<p>历史趋势</p>
</div> -->
<div class="history_header">
<el-form :model="searchForm" class="history_select" id="history_select">
<el-form-item label="统计指标" label-width="80px">
<el-collapse-item title="历史趋势" name="1" class="history_collapse">
<div class="history_trend">
<div class="history_header" ref="headerRef">
<!-- <el-form :model="searchForm" class="history_select" id="history_select"> -->
<TableHeader :showSearch="false" ref="tableHeaderRef" :key="searchFormIndex">
<template v-slot:select>
<el-form-item for="-" label="统计指标" label-width="80px">
<el-select
collapse-tags
collapse-tags-tooltip
@@ -121,7 +124,7 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="值类型">
<el-form-item for="-" label="值类型">
<el-select style="width: 160px !important" v-model="searchForm.dataLevel">
<el-option value="Primary" label="一次值"></el-option>
<el-option value="Secondary" label="二次值"></el-option>
@@ -129,6 +132,7 @@
</el-form-item>
<div v-for="(item, index) in countData" :key="index">
<el-form-item
for="-"
:label="item.name + '谐波次数'"
label-width="180px"
v-if="item.countOptions.length != 0"
@@ -150,7 +154,7 @@
</el-select>
</el-form-item>
</div>
<el-form-item label="统计类型" label-width="80px">
<el-form-item for="-" label="统计类型" label-width="80px">
<el-select v-model="searchForm.type" placeholder="请选择值类型">
<el-option
v-for="item in typeOptions"
@@ -160,17 +164,24 @@
></el-option>
</el-select>
</el-form-item>
</el-form>
<div class="history_searchBtn">
</template>
<template v-slot:operation>
<el-button type="primary" icon="el-icon-Search" @click="init(true)">查询</el-button>
</div>
</template>
</TableHeader>
<!-- </el-form> -->
<!-- <div class="history_searchBtn">
</div> -->
</div>
<div class="history_title">
<p>{{ chartTitle }}</p>
</div>
<div class="history_chart" v-loading="loading">
<div class="history_chart" v-loading="loading" ref="chartRef">
<MyEchart ref="historyChart" v-if="echartsData" :isExport="true" :options="echartsData" />
</div>
</div>
</el-collapse-item>
</el-collapse>
</div>
@@ -184,7 +195,7 @@ import popup from './components/popup.vue'
import schemeTree from './components/schemeTree.vue'
import { mainHeight } from '@/utils/layout'
import { queryByCode, queryCsDictTree } from '@/api/system-boot/dictTree'
import { ref, onMounted, watch } from 'vue'
import { ref, onMounted, watch, nextTick } from 'vue'
import { ElMessage } from 'element-plus'
import MyEchart from '@/components/echarts/MyEchart.vue'
import { getTestRecordInfo, getHistoryTrend } from '@/api/cs-device-boot/planData'
@@ -192,6 +203,7 @@ import { useDictData } from '@/stores/dictData'
import { queryStatistical } from '@/api/system-boot/csstatisticalset'
import { TrendCharts, Plus, Platform } from '@element-plus/icons-vue'
import { yMethod } from '@/utils/echartMethod'
import TableHeader from '@/components/table/header/index.vue'
const dictData = useDictData()
defineOptions({
name: 'govern/device/planData/index'
@@ -362,9 +374,6 @@ const init = (flag: boolean) => {
if (historyDevId.value && legendDictList.value && legendDictList.value.selectedList) {
// 选择指标的时候切换legend内容和data数据
legendDictList.value?.selectedList?.map((item: any) => {
// if (item.dataType == searchForm.value.index) {
// list.push(item.eleEpdPqdVOS)
// }
searchForm.value.index.map((vv: any) => {
if (item.dataType == vv) {
list.push(item.eleEpdPqdVOS)
@@ -434,9 +443,12 @@ const init = (flag: boolean) => {
unitList.push(item.unit)
}
})
xAxis = timeList.sort((a: any, b: any) => {
xAxis = new Set(
timeList.sort((a: any, b: any) => {
return new Date(a).getTime() - new Date(b).getTime()
})
)
let [min, max] = [0, 0]
list.map((item: any, index: any) => {
item.map((vv: any, indexs: any) => {
@@ -455,7 +467,6 @@ const init = (flag: boolean) => {
item.max = max
})
})
console.log(list, '00000000000000')
echartsData.value = {
options: {
title: [
@@ -616,7 +627,8 @@ const init = (flag: boolean) => {
chartsList
.map((kk: any, kks: any) => {
if (kk.statisticalName == vv.name) {
return [xAxis[kks], kk.statisticalData]
// xAxis[kks]
return [kk.time, kk.statisticalData]
} else {
return ''
}
@@ -756,7 +768,7 @@ const handleExport = async () => {
xAxis = timeList.sort((a: any, b: any) => {
new Date(a).getTime() - new Date(b).getTime()
})
// xAxis = Array.from(new Set(xAxis))
xAxis = Array.from(new Set(xAxis))
// 使用这个函数转换数据为CSV格式
let csv: any = ''
const list = echartsData.value.options.series
@@ -780,7 +792,6 @@ const handleExport = async () => {
count = index
}
let itemList: any = list[index].data[indexs]
console.log(itemList)
if (itemList && itemList.length != 0) {
index == list.length - 1 ? (strs += itemList[1]) : (strs += itemList[1] + ',')
} else {
@@ -849,15 +860,15 @@ const formatCountOptions = (list: any) => {
})
}
}
const tableHeaderRef = ref<any>()
const searchFormIndex = ref<any>()
watch(
() => searchForm.value.index,
(val: any, oldval: any) => {
if (val) {
let list = val
// formatCountOptions(list)
// if (val == 0) {
// countData.value = []
// }
searchFormIndex.value = val
formatCountOptions(list)
countData.value.map((item: any, key: any) => {
if (
list.findIndex((vv: any) => {
@@ -886,13 +897,11 @@ onMounted(() => {
.device-manage {
display: flex;
height: calc(100vh - 100px);
// overflow-y: auto;
&-right {
// overflow: auto;
flex: 1;
padding: 10px 10px 10px 0;
.el-descriptions__header {
height: 36px;
margin-bottom: 7px;
@@ -921,7 +930,6 @@ onMounted(() => {
.history_title {
width: 100%;
p {
height: 32px;
line-height: 32px;
@@ -933,51 +941,31 @@ onMounted(() => {
::v-deep .monitor_info {
width: 100%;
.el-tabs__content {
padding: 0 !important;
min-height: 130px !important;
}
}
.history_header {
display: flex;
// flex-wrap: wrap;
#history_select {
width: 95%;
display: flex;
justify-content: flex-start;
overflow-x: auto;
// height: 45px;
// padding-top: 18px;
// flex-wrap: wrap;
.el-form-item {
flex: none;
max-width: 380px !important;
display: flex;
align-items: center;
}
.el-select {
margin-right: 10px;
}
}
.history_searchBtn {
flex: 1;
display: flex;
justify-content: flex-end;
// margin-top: 3px;
}
}
.history_chart {
.history_collapse {
height: calc(100vh - 300px);
width: 100%;
height: calc(100vh - 440px) !important;
flex: 1;
.history_trend {
width: 100%;
height: calc(100vh - 340px);
display: flex;
flex-direction: column;
.history_header {
width: 100%;
height: auto;
overflow: hidden;
}
.history_chart {
width: 100%;
flex: 1 !important;
margin-top: 10px;
margin: 10px 0;
}
}
}
::v-deep .el-select {