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

修改测试bug

Browse Source
This commit is contained in:
GGJ
2024-12-09 16:30:40 +08:00
parent 2ed728ee71
commit 22d85dfca1
30 changed files with 499 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -100,8 +100,9 @@
</el-collapse>
<div v-if="JSON.stringify(echartsData) != '{}' && deviceData?.records?.length != 0">
<h3 class="mt10 mb10">历史趋势</h3>
<div class="history_trend">
<!-- <h3 class="mt10 mb10">历史趋势</h3> -->
<el-tabs type="border-card" class="mt10">
<el-tab-pane label="历史趋势"> <div class="history_trend" v-if="titleList != '(未绑定数据)'">
<div class="history_header" ref="headerRef">
<!-- <el-form :model="searchForm" class="history_select" id="history_select"> -->
<TableHeader :showSearch="false" ref="tableHeaderRef" @selectChange="selectChange">
@@ -154,6 +155,11 @@
<MyEchart ref="historyChart" v-if="echartsData" :isExport="true" :options="echartsData" />
</div>
</div>
<el-empty :style="EcharHeight" v-else description="未绑定数据" /></el-tab-pane>
<el-tab-pane label="暂态数据">Config</el-tab-pane>
</el-tabs>
</div>
</div>
<el-empty v-else description="请选择设备" class="device-manage-right" />
@@ -191,7 +197,7 @@ const voltageLevelList = dictData.getBasicData('Dev_Voltage_Stand')
const volConTypeList = dictData.getBasicData('Dev_Connect')
//值类型
const pageHeight = mainHeight(20)
const EcharHeight = ref(mainHeight(448))
const EcharHeight = ref(mainHeight(483))
const loading = ref(false)
const searchForm: any = ref({})
const typeOptions = [
@@ -314,7 +320,7 @@ const onAdd = () => {
handleOpen(0)
}
const bind = (data: any) => {
handleOpen(3, data)
handleOpen(4, data)
}
const handleOpen = (val: any, data?: any) => {
if (!deviceData.value) {
@@ -333,6 +339,10 @@ const handleOpen = (val: any, data?: any) => {
let name: any = ''
//数据绑定
if (val == 3) {
ids = data?.id
// name = data?.name
dialogRef.value.detailsType('table')
} else if (val == 4) {
ids = data?.id
name = data?.name
dialogRef.value.detailsType('table')
@@ -477,15 +487,15 @@ const init = (flag: boolean) => {
echartsData.value = {
title: {
text: chartTitle.value,
left: '0',
// title: {
// text: chartTitle.value,
// left: '0',
textStyle: {
color: '#000',
fontSize: '16'
},
},
// textStyle: {
// color: '#000',
// fontSize: '16'
// },
// },
toolbox: {
featureProps: {
myTool1: {
@@ -505,8 +515,8 @@ const init = (flag: boolean) => {
itemStyle: { opacity: 0 },//去圆点
type: 'scroll', // 开启滚动分页
right: 70,
width: 550,
// width: 550,
// height: 50
},
grid: {
@@ -846,15 +856,15 @@ const selectChange = (e: boolean) => {
if (activeColName.value == '0') {
if (flag.value) {
EcharHeight.value = mainHeight(492)
EcharHeight.value = mainHeight(527)
} else {
EcharHeight.value = mainHeight(448)
EcharHeight.value = mainHeight(483)
}
} else {
if (flag.value) {
EcharHeight.value = mainHeight(322)
EcharHeight.value = mainHeight(357)
} else {
EcharHeight.value = mainHeight(280)
EcharHeight.value = mainHeight(315)
}
}
}
@@ -862,15 +872,15 @@ const selectChange = (e: boolean) => {
const handleChange = () => {
if (activeColName.value == '0') {
if (flag.value) {
EcharHeight.value = mainHeight(492)
EcharHeight.value = mainHeight(527)
} else {
EcharHeight.value = mainHeight(448)
EcharHeight.value = mainHeight(483)
}
} else {
if (flag.value) {
EcharHeight.value = mainHeight(322)
EcharHeight.value = mainHeight(357)
} else {
EcharHeight.value = mainHeight(280)
EcharHeight.value = mainHeight(315)
}
}
}