内容调成

whychdw

2021-08-03 a82b6eb05820368bd047d7a47fac6797567e99b3

 src/pages/switchboard/switchboard.vue

@@ -26,9 +26,9 @@
                        <el-input size="mini" v-model="formData.thisInfo.btdy" style="width:100px"></el-input>
                    </el-form-item>
                </el-col>
                <el-form-item label="直流配电板：">
                <!-- <el-form-item label="直流配电板：">
                    <el-input size="mini" v-model="formData.thisInfo.zlpdb" style="width:100px"></el-input>
                </el-form-item>
                </el-form-item> -->
            </el-form>
        </div>
        <div class="content_cent">
@@ -89,9 +89,9 @@
            <div class="flex-page-content">
                <div class="batteryrHistoryquery" style="width: 100%;height: 100%;">
                    <el-table :data="tableData" style="width: 100%" max-height="145px"> 
                        <el-table-column prop="date" label="告警时间" width="180"></el-table-column>
                        <el-table-column prop="name" label="告警名称" width="180"></el-table-column>
                        <el-table-column prop="address" label="告警描述"></el-table-column>
                        <el-table-column prop="date" label="报警时间" width="180"></el-table-column>
                        <el-table-column prop="name" label="报警名称" width="180"></el-table-column>
                        <el-table-column prop="address" label="报警描述"></el-table-column>
                    </el-table>
                </div>
            </div>
@@ -115,6 +115,7 @@
import getWsUrl from "@/assets/js/getWsUrl";
import * as echarts from 'echarts';
import gridCircuitDiagram from '@/pages/switchboard/js/gridCircuitDiagram'
import diagramStates from '@/pages/switchboard/js/diagramStates'
let diagram;
export default {
    chart: {},
@@ -155,6 +156,7 @@
        
        let self = this;
        diagram = gridCircuitDiagram(this.$refs.static, this.$refs.flush);
        diagramStates(diagram, 'run1');
        self.initEcharts();
        self.openSocket();
    },
@@ -267,7 +269,8 @@
                        bottom: '30'
                    },
                    tooltip: {
                        show: true
                        show: true,
                        "trigger":"axis",
                    },
                    xAxis: {
                        type: 'category',
@@ -305,6 +308,7 @@
                        // xAxisIndex: 0,
                        yAxisIndex: 0,//使用的 y 轴的 index，在单个图表实例中存在多个 y轴的时候有用。
                        type: 'line',
                        symbol: 'none',
                        step: false,
                        smooth: true
                    },{
@@ -312,6 +316,7 @@
                        // xAxisIndex: 0,
                        yAxisIndex: 1,//使用的 y 轴的 index，在单个图表实例中存在多个 y轴的时候有用。
                        type: 'line',
                        symbol: 'none',
                        // step: false,
                        smooth: true
                    },]
@@ -385,13 +390,13 @@
    padding: 1%;
}
.content_top{
    height: 25%;
    height: 18%;
}
.content_cent{
    height: 40%;
}
.content_bottom{
    height: 33%;
    height: 40%;
}
.content_cent{
    margin: 1% 0;