修改 测试bug
This commit is contained in:
@@ -74,7 +74,7 @@ const showUnfoldButton = ref(false)
|
||||
const headerFormSecondStyleOpen = {
|
||||
opacity: 1,
|
||||
height: 'auto',
|
||||
padding: '0 15px 13px 15px'
|
||||
padding: '0 15px 0px 15px'
|
||||
}
|
||||
const headerFormSecondStyleClose = {
|
||||
opacity: 0,
|
||||
@@ -129,6 +129,7 @@ const computedSearchRow = () => {
|
||||
headerFormSecond.value.$el.appendChild(elFormItem[i])
|
||||
}
|
||||
}
|
||||
console.log("🚀 ~ computedSearchRow ~ headerFormSecond.value.$el.scrollHeight :", headerFormSecond.value.$el.scrollHeight )
|
||||
|
||||
// 判断是否需要折叠
|
||||
if (headerFormSecond.value.$el.scrollHeight > 0) {
|
||||
|
||||
@@ -1,10 +1,6 @@
|
||||
<template>
|
||||
<div
|
||||
class="default-main device-control"
|
||||
:style="{ height: pageHeight.height }"
|
||||
v-loading="loading"
|
||||
style="position: relative"
|
||||
>
|
||||
<div class="default-main device-control" :style="{ height: pageHeight.height }" v-loading="loading"
|
||||
style="position: relative">
|
||||
<!-- @init="nodeClick" -->
|
||||
<PointTree @node-click="nodeClick" @pointTypeChange="pointTypeChange"></PointTree>
|
||||
<div class="device-control-right" v-if="deviceData">
|
||||
@@ -19,12 +15,8 @@
|
||||
<el-button v-if="deviceType == '1'" type="primary" icon="el-icon-Monitor" @click="handleaddDevice">
|
||||
在线补召
|
||||
</el-button>
|
||||
<el-button
|
||||
v-if="deviceType == '1'"
|
||||
type="primary"
|
||||
icon="el-icon-Tickets"
|
||||
@click="handleAnalysisList"
|
||||
>
|
||||
<el-button v-if="deviceType == '1'" type="primary" icon="el-icon-Tickets"
|
||||
@click="handleAnalysisList">
|
||||
补召日志
|
||||
</el-button>
|
||||
</template>
|
||||
@@ -49,13 +41,8 @@
|
||||
</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
<el-tabs v-model="dataSet" type="border-card" class="device-control-box-card" @tab-click="handleClick">
|
||||
<el-tab-pane
|
||||
lazy
|
||||
:label="item.name"
|
||||
:name="item.id"
|
||||
v-for="(item, index) in deviceData.dataSetList"
|
||||
:key="index"
|
||||
>
|
||||
<el-tab-pane lazy :label="item.name" :name="item.id" v-for="(item, index) in deviceData.dataSetList"
|
||||
:key="index">
|
||||
<template #label>
|
||||
<span class="custom-tabs-label">
|
||||
<el-icon>
|
||||
@@ -64,59 +51,44 @@
|
||||
<DataAnalysis v-if="item.name.includes('趋势数据')" />
|
||||
<Timer v-if="item.name.includes('实时数据')" />
|
||||
<Monitor v-if="item.name.includes('暂态事件')" />
|
||||
<Odometer
|
||||
v-if="
|
||||
<Odometer v-if="
|
||||
item.name != 'APF模块数据' &&
|
||||
item.name != '历史APF模块数据' &&
|
||||
!item.name.includes('历史监测') &&
|
||||
!item.name.includes('趋势数据') &&
|
||||
!item.name.includes('实时数据') &&
|
||||
!item.name.includes('暂态事件')
|
||||
"
|
||||
/>
|
||||
<Histogram
|
||||
v-if="
|
||||
" />
|
||||
<Histogram v-if="
|
||||
item.name != 'APF模块数据' &&
|
||||
item.name != '历史APF模块数据' &&
|
||||
item.name.includes('历史监测') &&
|
||||
!item.name.includes('趋势数据') &&
|
||||
!item.name.includes('实时数据') &&
|
||||
!item.name.includes('暂态事件')
|
||||
"
|
||||
/>
|
||||
" />
|
||||
</el-icon>
|
||||
<span>{{ item.name }}</span>
|
||||
</span>
|
||||
</template>
|
||||
</el-tab-pane>
|
||||
<TableHeader
|
||||
:showSearch="false"
|
||||
v-if="
|
||||
<TableHeader :showSearch="false" v-if="
|
||||
(dataSet.indexOf('_trenddata') == -1 &&
|
||||
dataSet.indexOf('_realtimedata') == -1 &&
|
||||
dataSet.indexOf('_event') == -1) ||
|
||||
realTimeFlag
|
||||
"
|
||||
>
|
||||
">
|
||||
<template #select>
|
||||
<el-form-item label="日期" v-show="dataSet.indexOf('_history') != -1">
|
||||
<DatePicker ref="datePickerRef"></DatePicker>
|
||||
</el-form-item>
|
||||
<el-form-item label="指标" v-show="!realTimeFlag">
|
||||
<el-input
|
||||
style="width: 160px"
|
||||
v-model="formInline.searchValue"
|
||||
autocomplete="off"
|
||||
clearable
|
||||
placeholder="请输入关键词"
|
||||
></el-input>
|
||||
<el-input style="width: 160px" v-model="formInline.searchValue" autocomplete="off" clearable
|
||||
placeholder="请输入关键词"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="值类型">
|
||||
<el-select
|
||||
style="min-width: 120px !important"
|
||||
v-model="formInline.dataLevel"
|
||||
:disabled="dataLevel == 'Primary' && deviceType == '0'"
|
||||
>
|
||||
<el-select style="min-width: 120px !important" v-model="formInline.dataLevel"
|
||||
:disabled="dataLevel == 'Primary' && deviceType == '0'">
|
||||
<el-option value="Primary" label="一次值"></el-option>
|
||||
<el-option value="Secondary" label="二次值"></el-option>
|
||||
</el-select>
|
||||
@@ -124,46 +96,27 @@
|
||||
</template>
|
||||
<template #operation>
|
||||
<el-button type="primary" icon="el-icon-Search" @click="handleClick">查询</el-button>
|
||||
<el-button
|
||||
type="primary"
|
||||
:disabled="tableLoading"
|
||||
v-if="realTimeFlag"
|
||||
:icon="DataLine"
|
||||
@click="handleTrend"
|
||||
>
|
||||
<el-button type="primary" :disabled="tableLoading" v-if="realTimeFlag" :icon="DataLine"
|
||||
@click="handleTrend">
|
||||
谐波频谱
|
||||
</el-button>
|
||||
<el-button
|
||||
type="primary"
|
||||
v-if="realTimeFlag"
|
||||
:icon="TrendCharts"
|
||||
@click="handleHarmonicSpectrum"
|
||||
:disabled="tableLoading"
|
||||
>
|
||||
<el-button type="primary" v-if="realTimeFlag" :icon="TrendCharts"
|
||||
@click="handleHarmonicSpectrum" :disabled="tableLoading">
|
||||
实时趋势
|
||||
</el-button>
|
||||
</template>
|
||||
</TableHeader>
|
||||
<div
|
||||
class="data_time"
|
||||
:style="{
|
||||
<div class="data_time" :style="{
|
||||
height: realTimeFlag ? '30px' : '40px',
|
||||
alignItems: realTimeFlag ? 'flex-end' : 'center'
|
||||
}"
|
||||
v-if="dataSet.includes('_realtimedata') && mqttMessage && mqttMessage.dataTime && sonTab != 2"
|
||||
>
|
||||
}" v-if="dataSet.includes('_realtimedata') && mqttMessage && mqttMessage.dataTime && sonTab != 2">
|
||||
<p>
|
||||
<span v-if="trendDataTime && !realTimeFlag">数据时间:{{ trendDataTime }}</span>
|
||||
<span v-if="realTimeFlag">数据时间:{{ mqttMessage.dataTime }}</span>
|
||||
</p>
|
||||
|
||||
<el-button
|
||||
v-if="!realTimeFlag && dataSet.includes('_realtimedata')"
|
||||
style="float: right !important"
|
||||
:icon="Back"
|
||||
@click="handleReturn"
|
||||
:loading="tableLoading"
|
||||
>
|
||||
<el-button v-if="!realTimeFlag && dataSet.includes('_realtimedata')" style="float: right !important"
|
||||
:icon="Back" @click="handleReturn" :loading="tableLoading">
|
||||
返回
|
||||
</el-button>
|
||||
</div>
|
||||
@@ -178,29 +131,20 @@
|
||||
"
|
||||
></div> -->
|
||||
<!-- v-loading="tableLoading" -->
|
||||
<div
|
||||
style="overflow: auto"
|
||||
:style="{ height: tableHeight }"
|
||||
v-loading="tableLoading"
|
||||
v-if="
|
||||
<div style="overflow: auto" :style="{ height: tableHeight }" v-loading="tableLoading" v-if="
|
||||
dataSet.indexOf('_trenddata') == -1 &&
|
||||
dataSet.indexOf('_realtimedata') == -1 &&
|
||||
dataSet.indexOf('_event') == -1 &&
|
||||
tableData.length != 0
|
||||
"
|
||||
>
|
||||
">
|
||||
<!-- 循环渲染的card 最新数据/历史数据显示 -->
|
||||
<div class="content" v-if="tableData.length != 0 && !tableLoading">
|
||||
<el-card class="box-card" v-for="(item, index) in tableData" :key="index">
|
||||
<template #header>
|
||||
<div class="clearfix">
|
||||
<span style="flex: 1">{{ item.name }}</span>
|
||||
<Icon
|
||||
name="el-icon-TrendCharts"
|
||||
class="ml10"
|
||||
@click="getDeviceDataTrend(item)"
|
||||
style="font-size: 26px; cursor: pointer; color: #fff"
|
||||
></Icon>
|
||||
<Icon name="el-icon-TrendCharts" class="ml10" @click="getDeviceDataTrend(item)"
|
||||
style="font-size: 26px; cursor: pointer; color: #fff"></Icon>
|
||||
</div>
|
||||
</template>
|
||||
<!-- 模块数据 -->
|
||||
@@ -215,12 +159,8 @@
|
||||
</div>
|
||||
<div v-else-if="item.children.length">
|
||||
<div style="display: flex; align-items: center">
|
||||
<el-tag
|
||||
effect="dark"
|
||||
type="danger"
|
||||
style="width: 40px; text-align: center"
|
||||
class="mr10"
|
||||
>
|
||||
<el-tag effect="dark" type="danger" style="width: 40px; text-align: center"
|
||||
class="mr10">
|
||||
MAX
|
||||
</el-tag>
|
||||
{{
|
||||
@@ -231,12 +171,8 @@
|
||||
}}
|
||||
</div>
|
||||
<div style="display: flex; align-items: center" class="mt10">
|
||||
<el-tag
|
||||
effect="dark"
|
||||
type="success"
|
||||
style="width: 40px; text-align: center"
|
||||
class="mr10"
|
||||
>
|
||||
<el-tag effect="dark" type="success" style="width: 40px; text-align: center"
|
||||
class="mr10">
|
||||
AVG
|
||||
</el-tag>
|
||||
{{
|
||||
@@ -247,12 +183,8 @@
|
||||
}}
|
||||
</div>
|
||||
<div style="display: flex; align-items: center" class="mt10">
|
||||
<el-tag
|
||||
effect="dark"
|
||||
type="warning"
|
||||
style="width: 40px; text-align: center"
|
||||
class="mr10"
|
||||
>
|
||||
<el-tag effect="dark" type="warning" style="width: 40px; text-align: center"
|
||||
class="mr10">
|
||||
MIN
|
||||
</el-tag>
|
||||
{{
|
||||
@@ -267,44 +199,30 @@
|
||||
<el-empty description="暂无数据" v-if="tableData.length === 0"></el-empty>
|
||||
</div>
|
||||
</div>
|
||||
<el-pagination
|
||||
v-if="
|
||||
<el-pagination v-if="
|
||||
tableData.length &&
|
||||
dataSet.indexOf('_trenddata') == -1 &&
|
||||
dataSet.indexOf('_realtimedata') == -1 &&
|
||||
dataSet.indexOf('_event') == -1
|
||||
"
|
||||
background
|
||||
class="mr2 mt10"
|
||||
style="float: right"
|
||||
@size-change="handleSizeChange"
|
||||
@current-change="pageChange"
|
||||
:current-page="formInline.pageNum"
|
||||
:page-sizes="[20, 30, 40, 50, 100]"
|
||||
:page-size="formInline.pageSize"
|
||||
layout="total, sizes, prev, pager, next, jumper"
|
||||
:total="formInline.total"
|
||||
></el-pagination>
|
||||
" background class="mr2 mt10" style="float: right" @size-change="handleSizeChange"
|
||||
@current-change="pageChange" :current-page="formInline.pageNum" :page-sizes="[20, 30, 40, 50, 100]"
|
||||
:page-size="formInline.pageSize" layout="total, sizes, prev, pager, next, jumper"
|
||||
:total="formInline.total"></el-pagination>
|
||||
|
||||
<!-- 趋势数据 -->
|
||||
<div style="height: calc(100vh - 340px)" v-if="dataSet.indexOf('_trenddata') != -1">
|
||||
<Trend ref="trendRef"></Trend>
|
||||
</div>
|
||||
<!-- 实时数据 -->
|
||||
<div
|
||||
style="height: calc(100vh - 340px)"
|
||||
v-if="dataSet.indexOf('_realtimedata') != -1"
|
||||
v-loading="tableLoading"
|
||||
>
|
||||
<div style="height: calc(100vh - 340px)" v-if="dataSet.indexOf('_realtimedata') != -1"
|
||||
v-loading="tableLoading">
|
||||
<!-- <div class="view_top_btn" v-if="realTimeFlag">
|
||||
<el-button type="primary" :icon="Platform" @click="handleRecordWaves">
|
||||
实时录波
|
||||
</el-button>
|
||||
</div> -->
|
||||
<div
|
||||
class="view_top_btn"
|
||||
v-if="dataSet.includes('_realtimedata') && !realTimeFlag && mqttMessage.dataTime && sonTab == 2"
|
||||
>
|
||||
<div class="view_top_btn"
|
||||
v-if="dataSet.includes('_realtimedata') && !realTimeFlag && mqttMessage.dataTime && sonTab == 2">
|
||||
<el-button :icon="Back" @click="handleReturn" :loading="tableLoading">返回</el-button>
|
||||
</div>
|
||||
<!-- 实时数据主界面组件 -->
|
||||
@@ -312,23 +230,16 @@
|
||||
<!-- 实时数据-实时录波组件 -->
|
||||
<recordWoves v-if="!realTimeFlag && sonTab == 0"></recordWoves>
|
||||
<!-- 实时数据-实时趋势组件 -->
|
||||
<realTrend
|
||||
v-if="!realTimeFlag && sonTab == 1"
|
||||
ref="realTrendRef"
|
||||
@changeTrendType="changeTrendType"
|
||||
></realTrend>
|
||||
<realTrend v-if="!realTimeFlag && sonTab == 1" ref="realTrendRef"
|
||||
@changeTrendType="changeTrendType">
|
||||
</realTrend>
|
||||
<!-- 实时数据-谐波频谱组件 -->
|
||||
<harmonicSpectrum
|
||||
v-show="!realTimeFlag && sonTab == 2"
|
||||
ref="harmonicSpectrumRef"
|
||||
></harmonicSpectrum>
|
||||
<harmonicSpectrum v-show="!realTimeFlag && sonTab == 2" ref="harmonicSpectrumRef">
|
||||
</harmonicSpectrum>
|
||||
</div>
|
||||
<!-- 暂态事件 -->
|
||||
<div
|
||||
style="height: calc(100vh - 340px)"
|
||||
v-if="dataSet.indexOf('_event') != -1"
|
||||
v-loading="tableLoading"
|
||||
>
|
||||
<div style="height: calc(100vh - 340px)" v-if="dataSet.indexOf('_event') != -1"
|
||||
v-loading="tableLoading">
|
||||
<Event ref="eventRef"></Event>
|
||||
</div>
|
||||
<div v-if="!tableData" style="height: 42px"></div>
|
||||
@@ -366,12 +277,14 @@ import offLineDataImport from './offLineDataImport/index.vue'
|
||||
import Event from './tabs/event.vue'
|
||||
import { useRouter } from 'vue-router'
|
||||
import TableHeader from '@/components/table/header/index.vue'
|
||||
import { useAdminInfo } from '@/stores/adminInfo'
|
||||
import { Histogram, TrendCharts, DataLine, DataAnalysis, Odometer, Monitor, Timer, Back } from '@element-plus/icons-vue'
|
||||
import analysisList from './analysisList/index.vue'
|
||||
import mqtt from 'mqtt'
|
||||
defineOptions({
|
||||
name: 'govern/device/control'
|
||||
})
|
||||
const adminInfo = useAdminInfo()
|
||||
const pageHeight = mainHeight(20)
|
||||
const loading = ref(true)
|
||||
const tableLoading = ref(false)
|
||||
@@ -556,6 +469,8 @@ const deviceId: any = ref('')
|
||||
const lineId: any = ref('')
|
||||
const dataLevel: any = ref('')
|
||||
const nodeClick = async (e: anyObj) => {
|
||||
console.log("🚀 ~ nodeClick ~ e:", e)
|
||||
if (e.level == 2) return
|
||||
deviceId.value = e?.pid
|
||||
lineId.value = e?.id
|
||||
if (!e) {
|
||||
@@ -669,6 +584,10 @@ const getRealDataMqttMsg = async () => {
|
||||
// JSON.parse(JSON.stringify(JSON.parse(new TextDecoder().decode(message))))
|
||||
// )
|
||||
let obj = JSON.parse(JSON.stringify(JSON.parse(new TextDecoder().decode(message))))
|
||||
if (lineId.value != obj.lineId && adminInfo.userIndex != obj.userId) return
|
||||
console.log("🚀 ~ mqttRef.value.on ~ obj:", obj)
|
||||
console.log("🚀 ~ mqttRef.value.on ~ formInline.dataLevel:", obj.dataLevel, formInline.dataLevel)
|
||||
|
||||
//处理mqtt数据 1转2除 2转1乘
|
||||
//如果消息返回值是二次值,下拉框是二次值只需要单位换算 除以1000
|
||||
//如果消息返回值是一次值,下拉框是一次值只需要单位换算 除以1000
|
||||
@@ -676,7 +595,7 @@ const getRealDataMqttMsg = async () => {
|
||||
obj = {
|
||||
...obj,
|
||||
// 电压有效值
|
||||
vRmsA: obj.vRmsA / 1000,
|
||||
vRmsA: (obj.vRmsA) / 1000,
|
||||
vRmsB: obj.vRmsB / 1000,
|
||||
vRmsC: obj.vRmsC / 1000,
|
||||
//基波电压幅值
|
||||
@@ -705,36 +624,36 @@ const getRealDataMqttMsg = async () => {
|
||||
obj = {
|
||||
...obj,
|
||||
// 电压有效值
|
||||
vRmsA: (obj.vRmsA * obj.pt) / 1000,
|
||||
vRmsB: (obj.vRmsA * obj.pt) / 1000,
|
||||
vRmsC: (obj.vRmsA * obj.pt) / 1000,
|
||||
vRmsA: ((obj.vRmsA * obj.pt) || 0) / 1000,
|
||||
vRmsB: ((obj.vRmsA * obj.pt) || 0) / 1000,
|
||||
vRmsC: ((obj.vRmsA * obj.pt) || 0) / 1000,
|
||||
// 电流有效值
|
||||
iRmsA: obj.iRmsA * obj.ct,
|
||||
iRmsB: obj.iRmsA * obj.ct,
|
||||
iRmsC: obj.iRmsA * obj.ct,
|
||||
iRmsA: (obj.iRmsA * obj.ct) || 0,
|
||||
iRmsB: (obj.iRmsA * obj.ct) || 0,
|
||||
iRmsC: (obj.iRmsA * obj.ct) || 0,
|
||||
//基波电压幅值
|
||||
v1A: (obj.v1A * obj.pt) / 1000,
|
||||
v1B: (obj.v1B * obj.pt) / 1000,
|
||||
v1C: (obj.v1C * obj.pt) / 1000,
|
||||
v1A: ((obj.v1A * obj.pt) || 0) / 1000,
|
||||
v1B: ((obj.v1B * obj.pt) || 0) / 1000,
|
||||
v1C: ((obj.v1C * obj.pt) || 0) / 1000,
|
||||
//基波电流幅值
|
||||
i1A: obj.i1A * obj.ct,
|
||||
i1B: obj.i1B * obj.ct,
|
||||
i1C: obj.i1C * obj.ct,
|
||||
i1A: (obj.i1A * obj.ct) || 0,
|
||||
i1B: (obj.i1B * obj.ct) || 0,
|
||||
i1C: (obj.i1C * obj.ct) || 0,
|
||||
//有功功率
|
||||
pA: (obj.pA * obj.pt * obj.ct) / 1000,
|
||||
pB: (obj.pB * obj.pt * obj.ct) / 1000,
|
||||
pC: (obj.pC * obj.pt * obj.ct) / 1000,
|
||||
pTot: (obj.pTot * obj.pt * obj.ct) / 1000,
|
||||
pA: ((obj.pA * obj.pt * obj.ct) || 0) / 1000,
|
||||
pB: ((obj.pB * obj.pt * obj.ct) || 0) / 1000,
|
||||
pC: ((obj.pC * obj.pt * obj.ct) || 0) / 1000,
|
||||
pTot: ((obj.pTot * obj.pt * obj.ct) || 0) / 1000,
|
||||
//无功功率
|
||||
qA: (obj.qA * obj.pt * obj.ct) / 1000,
|
||||
qB: (obj.qB * obj.pt * obj.ct) / 1000,
|
||||
qC: (obj.qC * obj.pt * obj.ct) / 1000,
|
||||
qTot: (obj.qTot * obj.pt * obj.ct) / 1000,
|
||||
qA: ((obj.qA * obj.pt * obj.ct) || 0) / 1000,
|
||||
qB: ((obj.qB * obj.pt * obj.ct) || 0) / 1000,
|
||||
qC: ((obj.qC * obj.pt * obj.ct) || 0) / 1000,
|
||||
qTot: ((obj.qTot * obj.pt * obj.ct) || 0) / 1000,
|
||||
//视在功率
|
||||
sA: (obj.sA * obj.pt * obj.ct) / 1000,
|
||||
sB: (obj.sB * obj.pt * obj.ct) / 1000,
|
||||
sC: (obj.sC * obj.pt * obj.ct) / 1000,
|
||||
sTot: (obj.sTot * obj.pt * obj.ct) / 1000
|
||||
sA: ((obj.sA * obj.pt * obj.ct) || 0) / 1000,
|
||||
sB: ((obj.sB * obj.pt * obj.ct) || 0) / 1000,
|
||||
sC: ((obj.sC * obj.pt * obj.ct) || 0) / 1000,
|
||||
sTot: ((obj.sTot * obj.pt * obj.ct) || 0) / 1000
|
||||
}
|
||||
}
|
||||
//如果消息返回值是一次值,下拉框是二次值需要单位换算 乘以1000 并且除以pt ct
|
||||
@@ -1093,6 +1012,7 @@ onBeforeUnmount(() => {
|
||||
text-align: center;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
p {
|
||||
font-weight: 800;
|
||||
font-size: 16px;
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<div>
|
||||
<!-- 历史趋势数据 -->
|
||||
<div>
|
||||
<TableHeader ref="tableHeaderRef" :showSearch="false" @selectChange="selectChange">
|
||||
<TableHeader ref="tableHeaderRef" :showSearch="false" @selectChange="selectChange" :key="numKey">
|
||||
<template v-slot:select :key="num">
|
||||
<el-form-item>
|
||||
<DatePicker ref="datePickerRef"></DatePicker>
|
||||
@@ -403,7 +403,7 @@ const init = async () => {
|
||||
}
|
||||
const selectChange = (flag: boolean) => {
|
||||
if (flag) {
|
||||
pageHeight.value = mainHeight(345)
|
||||
pageHeight.value = mainHeight(332)
|
||||
} else {
|
||||
pageHeight.value = mainHeight(290)
|
||||
}
|
||||
@@ -598,8 +598,23 @@ const onCountChange = (val: any, index: any) => {
|
||||
countData.value[index].count = countData.value[index].countOptions[0]
|
||||
}
|
||||
}
|
||||
const flag = ref(true)
|
||||
const numKey = ref(0)
|
||||
const onIndexChange = (val: any) => {
|
||||
num.value += 1
|
||||
flag.value = true
|
||||
setTimeout(() => {
|
||||
countData.value.forEach((item: any) => {
|
||||
if (item.countOptions.length > 0) {
|
||||
flag.value = false
|
||||
return
|
||||
}
|
||||
})
|
||||
if (flag.value) {
|
||||
numKey.value += 1
|
||||
}
|
||||
}, 500)
|
||||
|
||||
// if (val.length == 0) {
|
||||
// searchForm.value.index = [indexOptions.value[0].id]
|
||||
// }
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
<!-- <div class="history_title">
|
||||
<p>测试项信息</p>
|
||||
</div> -->
|
||||
<el-tabs v-model="activeName" type="border-card" @click.self="handleClickTabs">
|
||||
<el-tabs v-model="activeName" type="border-card" @click="handleClickTabs">
|
||||
<el-tab-pane v-for="(item, index) in deviceData?.records" :label="item.itemName"
|
||||
:name="item.id" :key="index">
|
||||
<template #label>
|
||||
@@ -104,7 +104,7 @@
|
||||
<div class="history_header" ref="headerRef">
|
||||
<!-- <el-form :model="searchForm" class="history_select" id="history_select"> -->
|
||||
<TableHeader :showSearch="false" ref="tableHeaderRef" @selectChange="selectChange">
|
||||
<template v-slot:select :key="num">
|
||||
<template v-slot:select >
|
||||
<el-form-item for="-" label="统计指标">
|
||||
<el-select style="min-width: 200px" collapse-tags collapse-tags-tooltip
|
||||
v-model="searchForm.index" placeholder="请选择统计指标" @change="onIndexChange($event)"
|
||||
@@ -145,10 +145,10 @@
|
||||
</template>
|
||||
</TableHeader>
|
||||
</div>
|
||||
<div class="history_title">
|
||||
<!-- <div class="history_title">
|
||||
<p>{{ chartTitle }}</p>
|
||||
</div>
|
||||
<div class="history_chart" v-loading="loading" :style="EcharHeight" :key="EcharHeight.height"
|
||||
</div> -->
|
||||
<div class="history_chart mt5" v-loading="loading" :style="EcharHeight" :key="EcharHeight.height"
|
||||
ref="chartRef">
|
||||
<MyEchart ref="historyChart" v-if="echartsData" :isExport="true" :options="echartsData" />
|
||||
</div>
|
||||
@@ -176,6 +176,7 @@ import { yMethod } from '@/utils/echartMethod'
|
||||
import { color, gradeColor3 } from '@/components/echarts/color'
|
||||
import TableHeader from '@/components/table/header/index.vue'
|
||||
import { useConfig } from '@/stores/config'
|
||||
import { getDeviceList } from '@/api/cs-device-boot/planData'
|
||||
const dictData = useDictData()
|
||||
defineOptions({
|
||||
name: 'govern/device/planData/index'
|
||||
@@ -189,7 +190,7 @@ const voltageLevelList = dictData.getBasicData('Dev_Voltage_Stand')
|
||||
const volConTypeList = dictData.getBasicData('Dev_Connect')
|
||||
//值类型
|
||||
const pageHeight = mainHeight(20)
|
||||
const EcharHeight = ref(mainHeight(510))
|
||||
const EcharHeight = ref(mainHeight(458))
|
||||
const loading = ref(false)
|
||||
const searchForm: any = ref({})
|
||||
const typeOptions = [
|
||||
@@ -343,9 +344,11 @@ const refreshTree = () => {
|
||||
const range = (start: any, end: any, step: any) => {
|
||||
return Array.from({ length: (end - start) / step + 1 }, (_, i) => start + i * step)
|
||||
}
|
||||
|
||||
const titleList: any = ref('')
|
||||
const init = (flag: boolean) => {
|
||||
titleList.value = ''
|
||||
let list: any = []
|
||||
|
||||
//颜色数组
|
||||
|
||||
if (historyDevId.value && legendDictList.value && legendDictList.value.selectedList) {
|
||||
@@ -358,6 +361,7 @@ const init = (flag: boolean) => {
|
||||
})
|
||||
})
|
||||
|
||||
|
||||
//选择的指标使用方法处理
|
||||
formatCountOptions(searchForm.value.index)
|
||||
//查询历史趋势
|
||||
@@ -377,7 +381,7 @@ const init = (flag: boolean) => {
|
||||
middleTitle = ''
|
||||
}
|
||||
let indexList = searchForm.value.index
|
||||
chartTitle.value = deviceData.value.itemName + '_' + middleTitle + '_'
|
||||
chartTitle.value = ''//deviceData.value.itemName + '_' + middleTitle + '_'
|
||||
indexList.map((item: any, indexs: any) => {
|
||||
indexOptions.value.map((vv: any) => {
|
||||
if (vv.id == item) {
|
||||
@@ -385,6 +389,7 @@ const init = (flag: boolean) => {
|
||||
}
|
||||
})
|
||||
})
|
||||
|
||||
let lists: any = []
|
||||
let frequencys: any = null
|
||||
countData.value.map((item: any, index: any) => {
|
||||
@@ -398,6 +403,10 @@ const init = (flag: boolean) => {
|
||||
frequencys: frequencys && frequencys.length != 0 ? [frequencys] : []
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
|
||||
|
||||
let obj = {
|
||||
devId: historyDevId.value,
|
||||
list: lists,
|
||||
@@ -409,6 +418,17 @@ const init = (flag: boolean) => {
|
||||
return
|
||||
}
|
||||
if (flag) {
|
||||
|
||||
getDeviceList({
|
||||
id: historyDevId.value,
|
||||
isTrueFlag: 1
|
||||
}).then(res => {
|
||||
if (res.data.length == 0) {
|
||||
titleList.value = '(未绑定数据)'
|
||||
}
|
||||
chartTitle.value = chartTitle.value + titleList.value
|
||||
})
|
||||
|
||||
loading.value = true
|
||||
getHistoryTrend(obj)
|
||||
.then((res: any) => {
|
||||
@@ -443,6 +463,10 @@ const init = (flag: boolean) => {
|
||||
}
|
||||
|
||||
echartsData.value = {
|
||||
title:{
|
||||
text:chartTitle.value,
|
||||
left:'0',
|
||||
},
|
||||
legend: {
|
||||
itemWidth: 20,
|
||||
itemHeight: 10,
|
||||
@@ -764,32 +788,35 @@ const formatCountOptions = (list: any) => {
|
||||
const flag = ref(false)
|
||||
const selectChange = (e: boolean) => {
|
||||
flag.value = e
|
||||
|
||||
if (activeColName.value == '0') {
|
||||
if (flag.value) {
|
||||
EcharHeight.value = mainHeight(565)
|
||||
EcharHeight.value = mainHeight(502)
|
||||
} else {
|
||||
EcharHeight.value = mainHeight(510)
|
||||
EcharHeight.value = mainHeight(458)
|
||||
}
|
||||
} else {
|
||||
if (flag.value) {
|
||||
EcharHeight.value = mainHeight(365)
|
||||
EcharHeight.value = mainHeight(332)
|
||||
} else {
|
||||
EcharHeight.value = mainHeight(310)
|
||||
EcharHeight.value = mainHeight(280)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const handleChange = () => {
|
||||
console.log("🚀 ~ handleChange ~ activeColName.value:", activeColName.value,flag.value)
|
||||
if (activeColName.value == '0') {
|
||||
if (flag.value) {
|
||||
EcharHeight.value = mainHeight(565)
|
||||
EcharHeight.value = mainHeight(502)
|
||||
} else {
|
||||
EcharHeight.value = mainHeight(510)
|
||||
EcharHeight.value = mainHeight(458)
|
||||
}
|
||||
} else {
|
||||
if (flag.value) {
|
||||
EcharHeight.value = mainHeight(365)
|
||||
EcharHeight.value = mainHeight(332)
|
||||
} else {
|
||||
EcharHeight.value = mainHeight(310)
|
||||
EcharHeight.value = mainHeight(280)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user