Merge branch 'hdw' of http://118.89.139.230:10101/r/admin_manage into hdw

whychdw

2021-09-26 b79fda42a312ac661242febc8b656a82cd47d00c

Merge branch 'hdw' of http://118.89.139.230:10101/r/admin_manage into hdw

 src/pages/alarmMager/DCmeasure.vue

@@ -13,7 +13,7 @@
                                            <i class="icon"></i><span class="text-color">高频开关电源柜温度</span>
                                        </el-col>
                                        <el-col :span="5">
                                            <span class="text-span">85℃</span>
                                            <span class="text-span">{{ dcData.temperature }}℃</span>
                                        </el-col>
                                    </p>
                                    <p class="center-list-title">
@@ -21,7 +21,7 @@
                                            <i class="icon"></i><span class="text-color">直流输出电压告警阙值上限</span>
                                        </el-col>
                                        <el-col :span="5">
                                            <span class="text-span">220V</span>
                                            <span class="text-span">{{ dcData.acVolHLimit }}V</span>
                                        </el-col>
                                    </p>
                                    <p class="center-list-title">
@@ -29,7 +29,7 @@
                                            <i class="icon"></i><span class="text-color">直流输出电压告警阙值下限</span>
                                        </el-col>
                                        <el-col :span="5">
                                            <span class="text-span">220V</span>
                                            <span class="text-span">{{ dcData.acVolLLimit }}V</span>
                                        </el-col>
                                    </p>
                                    <div class="arrows-box border-left-top"></div>
@@ -94,8 +94,8 @@
                                        <el-table :data="tableData" stripe style="width: 100%" :show-header="false">
                                            <el-table-column prop="data" align="center"></el-table-column>
                                            <el-table-column  >
                                                <template>
                                                    <div><hdw-light></hdw-light></div>
                                                <template slot-scope="scope">
                                                    <div><hdw-light :type="scope.row.status"></hdw-light></div>
                                                </template>
                                            </el-table-column>
                                        </el-table>
@@ -109,9 +109,9 @@
                                    <div class="table-list">
                                        <el-table :data="tableData2" stripe style="width: 100%" :show-header="false">
                                            <el-table-column prop="data" align="center"></el-table-column>
                                            <el-table-column  >
                                                <template>
                                                    <div><hdw-light></hdw-light></div>
                                            <el-table-column>
                                                <template slot-scope="scope">
                                                    <div><hdw-light :type="scope.row.status"></hdw-light></div>
                                                </template>
                                            </el-table-column>
                                        </el-table>
@@ -127,8 +127,8 @@
                                <el-table :data="tableData4" stripe style="width: 100%" :show-header="false">
                                    <el-table-column prop="data" align="center"></el-table-column>
                                    <el-table-column  >
                                        <template>
                                            <div><hdw-light></hdw-light></div>
                                        <template slot-scope="scope">
                                            <div><hdw-light :type="scope.row.status"></hdw-light></div>
                                        </template>
                                    </el-table-column>
                                </el-table>
@@ -137,8 +137,8 @@
                                <el-table :data="tableData5" stripe style="width: 100%" :show-header="false">
                                    <el-table-column prop="data" align="center"></el-table-column>
                                    <el-table-column  >
                                        <template>
                                            <div><hdw-light></hdw-light></div>
                                        <template slot-scope="scope">
                                            <div><hdw-light :type="scope.row.status"></hdw-light></div>
                                        </template>
                                    </el-table-column>
                                </el-table>
@@ -156,52 +156,20 @@
import HdwLight from "@/pages/dataMager/components/HdwLight";
export default {
    chart:{},
    props: {
        powerDeviceId: {
            type: String,
            default: "110000112"
        },
    },
    data(){
        return {
            jfcdy:"89V",
            tableData:[
                {data:"第1路直流过压"},
                {data:"第1路直流欠压"},
                {data:"第2路直流过压"},
                {data:"第2路直流欠压"},
                {data:"第1路输入开关跳闸"},
                {data:"第2路输入开关跳闸"},
            ],
            tableData2:[
                {data:"温度告警"},
                {data:"监控单元故障"}, 
                {data:"直流配电柜总告警"},    
            ],
            tableData4:[
                {data:"1段交流母线输出开关1跳闸"},
                {data:"1段交流母线输出开关2跳闸"}, 
                {data:"1段交流母线输出开关3跳闸"},
                {data:"1段交流母线输出开关4跳闸"},
                {data:"1段交流母线输出开关5跳闸"},
                {data:"1段交流母线输出开关6跳闸"},
                {data:"1段交流母线输出开关7跳闸"},
                {data:"1段交流母线输出开关8跳闸"},
                {data:"1段交流母线输出开关9跳闸"},
                {data:"1段交流母线输出开关10跳闸"},   
                {data:"1段交流母线输出开关11跳闸"},       
                {data:"1段交流母线输出开关12跳闸"},
                {data:"1段交流母线输出开关13跳闸"},
            ],
            tableData5:[
                {data:"2段交流母线输出开关1跳闸"},
                {data:"2段交流母线输出开关2跳闸"}, 
                {data:"2段交流母线输出开关3跳闸"},
                {data:"2段交流母线输出开关4跳闸"},
                {data:"2段交流母线输出开关5跳闸"},
                {data:"2段交流母线输出开关6跳闸"},
                {data:"2段交流母线输出开关7跳闸"},
                {data:"2段交流母线输出开关8跳闸"},
                {data:"2段交流母线输出开关9跳闸"},
                {data:"2段交流母线输出开关10跳闸"},   
                {data:"2段交流母线输出开关11跳闸"},  
                {data:"1段交流母线输出开关11跳闸"},
                {data:"2段交流母线输出开关11跳闸"},     
            ]
            dcData:{},
            tableData:[],
            tableData2:[],
            tableData4:[],
            tableData5:[]
        }
        

@@ -212,13 +180,37 @@
    mounted() {
        
        let self = this;
            self.setOption();
            self.intData();
            window.addEventListener('resize', function(){
                for(let item in self.$options.chart){
                    self.$options.chart[item].resize() ;          }
            });
    },
    methods: {
        intData:function(){
            let self = this;
            let id = self.powerDeviceId;
            this.$apis.dataMager.powerMager.getPowerBoxData(id).then(res=>{
                let rs = JSON.parse(res.data.result);
                    if(rs.code == 1){
                        self.dcData = rs.data.dc;
                        console.log(rs);
                        self.$nextTick(function(){
                            self.setOption();
                        })
                        self.setListData(rs.data.dc);
                        
                    }else{
                        self.dcData = rs.data.dc;
                        console.log(rs);
                        self.$nextTick(function(){
                            self.setOption();
                        })
                        self.setListData(rs.data.dc);
                    }
                    
            })
        },
        // 初始化chart图表
        setOption:function(){
            // 基于准备好的dom，初始化echarts实例chartcurrent1
@@ -234,8 +226,9 @@
        },
        // 直流输入电压
        optionData1:function(){
            let chartdata = [
                [123, 80],
            let self = this;
            let chartdata = [ 
                [self.dcData.dcIn1Vol, self.dcData.dcIn2Vol],
                ['第一路', '第一路'],
            ];

@@ -499,8 +492,9 @@
        },
        // 直流母线输入电压
        optionData2:function(){
            let self = this;
            let chartdata = [
                [123, 80],
                [self.dcData.dcOut1Vol, self.dcData.dcOut2Vol],
                ['1段', '2段'],
            ];

@@ -764,6 +758,8 @@
        },
        // 直流母线输出电流1
        optionData4:function(){
            let self = this;
            let dcOut1Curr = self.dcData.dcOut1Curr;
            let option = {
                    // backgroundColor: '#111',
                    grid: {
@@ -828,11 +824,11 @@
                                    value: 170,
                                    label: {
                                        normal: {
                                            formatter: '51%',
                                            formatter: dcOut1Curr + 'A',
                                            position: 'center',
                                            show: true,
                                            textStyle: {
                                                fontSize: '20',
                                                fontSize: '16',
                                                fontWeight: 'normal',
                                                color: '#fff'
                                            }
@@ -881,6 +877,8 @@
        },
        // 直流母线输出电流2
        optionData5:function(){
            let self = this;
            let dcOut2Curr = self.dcData.dcOut2Curr;
            let option = {
                    // backgroundColor: '#111',
                    grid: {
@@ -945,11 +943,11 @@
                                    value: 160,
                                    label: {
                                        normal: {
                                            formatter: '51%',
                                            formatter: dcOut2Curr + 'A',
                                            position: 'center',
                                            show: true,
                                            textStyle: {
                                                fontSize: '20',
                                                fontSize: '16',
                                                fontWeight: 'normal',
                                                color: '#fff'
                                            }
@@ -996,6 +994,36 @@
                }
            this.$options.chart.chartcurrent2.setOption(option);
        },
        // 列表布尔值数据处理
        setListData:function(data){
            let self = this;
                // 过欠压跳闸
                self.tableData=[
                    {data:"第1路直流过压",status:data.isDc1OverVol},
                    {data:"第1路直流欠压",status:data.isDc1UnderVol},
                    {data:"第2路直流过压",status:data.isDc2OverVol},
                    {data:"第2路直流欠压",status:data.isDc2UnderVol},
                    {data:"第1路输入开关跳闸",status:data.isIn1SWTrip},
                    {data:"第2路输入开关跳闸",status:data.isIn2SWTrip},
                ];
                // 温度、监控、配电柜
                self.tableData2 = [
                    {data:"温度告警",status:data.isTempAlarm},
                    {data:"监控单元故障",status:data.isDcMonitorErr},
                    {data:"直流配电柜总告警",status:data.isTotalAlarm},
                ];
                // 1段交流母线输出开关
                for(let i=1;i<101;i++){
                    let obj = {data:'1段交流母线输出开关' + i + '跳闸',status:data['isFsw1Sw'+i+'trip']};
                        self.tableData4.push(obj)
                }
                // 2段交流母线输出开关
                for(let i=1;i<87;i++){
                    let obj = {data:'2段交流母线输出开关' + i + '跳闸',status:data['isFsw1Sw'+i+'trip']};
                        self.tableData5.push(obj)
                }

        }
    },
}
</script>
@@ -1038,7 +1066,7 @@
    }
    .left-list-box{
        /* width: 100%; */
        height: 24%;
        height: 22.5%;
        padding: 15px;
        margin-top: 10px;
        position:relative;

 src/pages/alarmMager/GGDmeasure.vue

@@ -13,7 +13,7 @@
                                            <i class="icon"></i><span class="text-color">交流配电柜温度</span>
                                        </el-col>
                                        <el-col :span="5">
                                            <span class="text-span">85℃</span>
                                            <span class="text-span">{{ acData.temperature }}℃</span>
                                        </el-col>
                                    </p>
                                    <p class="center-list-title">
@@ -21,7 +21,7 @@
                                            <i class="icon"></i><span class="text-color">交流电压告警阙值上限</span>
                                        </el-col>
                                        <el-col :span="5">
                                            <span class="text-span">220V</span>
                                            <span class="text-span">{{ acData.acVolHLimit }}V</span>
                                        </el-col>
                                    </p>
                                    <p class="center-list-title">
@@ -29,7 +29,7 @@
                                            <i class="icon"></i><span class="text-color">交流电压告警阙值下限</span>
                                        </el-col>
                                        <el-col :span="5">
                                            <span class="text-span">220V</span>
                                            <span class="text-span">{{ acData.acVolLLimit }}V</span>
                                        </el-col>
                                    </p>
                                        <div class="arrows-box border-left-top"></div>
@@ -116,8 +116,8 @@
                                        <el-table :data="tableData" stripe style="width: 100%" :show-header="false">
                                            <el-table-column prop="data" align="center"></el-table-column>
                                            <el-table-column  >
                                                <template>
                                                    <div><hdw-light></hdw-light></div>
                                                <template slot-scope="scope">
                                                    <div><hdw-light :type="scope.row.status"></hdw-light></div>
                                                </template>
                                            </el-table-column>
                                        </el-table>
@@ -132,8 +132,8 @@
                                        <el-table :data="tableData2" stripe style="width: 100%" :show-header="false">
                                            <el-table-column prop="data" align="center"></el-table-column>
                                            <el-table-column  >
                                                <template>
                                                    <div><hdw-light></hdw-light></div>
                                                <template slot-scope="scope">
                                                    <div><hdw-light :type="scope.row.status"></hdw-light></div>
                                                </template>
                                            </el-table-column>
                                        </el-table>
@@ -148,8 +148,8 @@
                                        <el-table :data="tableData3" stripe style="width: 100%" :show-header="false">
                                            <el-table-column prop="data" align="center"></el-table-column>
                                            <el-table-column  >
                                                <template>
                                                    <div><hdw-light></hdw-light></div>
                                                <template slot-scope="scope">
                                                    <div><hdw-light :type="scope.row.status"></hdw-light></div>
                                                </template>
                                            </el-table-column>
                                        </el-table>
@@ -165,8 +165,8 @@
                                <el-table :data="tableData4" style="width: 100%" :show-header="false">
                                    <el-table-column prop="data" align="center"></el-table-column>
                                    <el-table-column  >
                                        <template>
                                            <div><hdw-light></hdw-light></div>
                                        <template slot-scope="scope">
                                            <div><hdw-light :type="scope.row.status"></hdw-light></div>
                                        </template>
                                    </el-table-column>
                                </el-table>
@@ -175,8 +175,8 @@
                                <el-table :data="tableData5" style="width: 100%" :show-header="false">
                                    <el-table-column prop="data" align="center"></el-table-column>
                                    <el-table-column  >
                                        <template>
                                            <div><hdw-light></hdw-light></div>
                                        <template slot-scope="scope">
                                            <div><hdw-light :type="scope.row.status"></hdw-light></div>
                                        </template>
                                    </el-table-column>
                                </el-table>
@@ -194,71 +194,21 @@
import HdwLight from "@/pages/dataMager/components/HdwLight";
export default {
    chart:{},
    props: {
        powerDeviceId: {
            type: String,
            default: "110000112"
        },
    },
    data(){
        return {
            jfcdy:"89V",
            tableData:[
                {data:"交流输入1停电"},
                {data:"交流输入2停电"},
                {data:"交流输入1防雷器故障"},
                {data:"交流输入2防雷器故障"},
                {data:"第2路交流A相过压"},
                {data:"第2路交流A相欠压"},
                {data:"第2路就留B相过压"},
                {data:"第2路就留B相欠压"},
            ],
            tableData2:[
                {data:"第1路交流输入开关跳闸"},
                {data:"第2路交流输入开关跳闸"}, 
                {data:"第1路交流A相过压"},
                {data:"第1路交流A相欠压"},
                {data:"第2路交流C相过压"},
                {data:"第2路交流C相欠压"},
                {data:"第1路交流B相缺压"},
                {data:"第1路交流C相缺压"},
                {data:"交流监控单元故障"},     
            ],
            tableData3:[
                {data:"第1路交流B相过压"},
                {data:"第1路交流B相欠压"}, 
                {data:"第1路交流C相过压"},
                {data:"第1路交流C相欠压"},
                {data:"第2路交流A相缺压"},
                {data:"第2路交流B相欠压"},
                {data:"第2路交流C相过压"},
                {data:"交流配电柜总告警"},
                {data:"交流配电柜温度告警"},     
            ],
            tableData4:[
                {data:"1段交流母线输出开关1跳闸"},
                {data:"1段交流母线输出开关2跳闸"}, 
                {data:"1段交流母线输出开关3跳闸"},
                {data:"1段交流母线输出开关4跳闸"},
                {data:"1段交流母线输出开关5跳闸"},
                {data:"1段交流母线输出开关6跳闸"},
                {data:"1段交流母线输出开关7跳闸"},
                {data:"1段交流母线输出开关8跳闸"},
                {data:"1段交流母线输出开关9跳闸"},
                {data:"1段交流母线输出开关10跳闸"},   
                {data:"1段交流母线输出开关11跳闸"},       
                {data:"1段交流母线输出开关12跳闸"},
                {data:"1段交流母线输出开关13跳闸"},
            ],
            tableData5:[
                {data:"2段交流母线输出开关1跳闸"},
                {data:"2段交流母线输出开关2跳闸"}, 
                {data:"2段交流母线输出开关3跳闸"},
                {data:"2段交流母线输出开关4跳闸"},
                {data:"2段交流母线输出开关5跳闸"},
                {data:"2段交流母线输出开关6跳闸"},
                {data:"2段交流母线输出开关7跳闸"},
                {data:"2段交流母线输出开关8跳闸"},
                {data:"2段交流母线输出开关9跳闸"},
                {data:"2段交流母线输出开关10跳闸"},   
                {data:"2段交流母线输出开关11跳闸"},  
                {data:"1段交流母线输出开关11跳闸"},
                {data:"2段交流母线输出开关11跳闸"},     
            ]
            acData:{},
            tableData:[],
            tableData2:[],
            tableData3:[],
            tableData4:[],
            tableData5:[]
        }
        

@@ -269,13 +219,36 @@
    mounted() {
        
        let self = this;
            self.setOption();
            self.intData();
            window.addEventListener('resize', function(){
                for(let item in self.$options.chart){
                    self.$options.chart[item].resize() ;          }
            });
    },
    methods: {
        intData:function(){
            let self = this;
            let id = self.powerDeviceId;
            this.$apis.dataMager.powerMager.getPowerBoxData(id).then(res=>{
                let rs = JSON.parse(res.data.result);
                    if(rs.code == 1){
                        self.acData = rs.data.ac;
                        console.log(rs);
                        self.$nextTick(function(){
                            self.setOption();
                        })
                        self.setListData(rs.data.ac);
                    }else{
                        self.acData = rs.data.ac;
                        console.log(rs);
                        self.$nextTick(function(){
                            self.setOption();
                        })
                        self.setListData(rs.data.ac);
                    }
                    
            })
        },
        // 初始化chart图表
        setOption:function(){
            // 基于准备好的dom，初始化echarts实例chartcurrent1
@@ -299,8 +272,9 @@
        },
        // 第1路交流三相输入电压（V）
        optionData1:function(){
            let self = this;
            let chartdata = [
                [123, 80, 55],
                [self.acData.acIn1VolA, self.acData.acIn1VolB, self.acData.acIn1VolC],
                ['A相', 'B相', 'C相'],
            ];

@@ -564,8 +538,9 @@
        },
        // 第2路交流三相输入电压（V）
        optionData2:function(){
            let self = this;
            let chartdata = [
                [123, 80, 55],
                [self.acData.acIn2VolA, self.acData.acIn2VolB, self.acData.acIn2VolC],
                ['A相', 'B相', 'C相'],
            ];

@@ -829,7 +804,8 @@
        },
        // 第1路三相交流输入电流（A）  A相
        optionData4:function(){
            var percent = 56.8; //百分数
            let self = this;
            var percent = self.acData.acIn1CurrA; //百分数
            let option = {
                title: {
                    "x": '50%',
@@ -1032,7 +1008,8 @@
        },
        // 第1路三相交流输入电流（A）  B相
        optionData5:function(){
            var percent = 23.8; //百分数
            let self = this;
            var percent = self.acData.acIn1CurrB; //百分数
            let option = {
                title: {
                    "x": '50%',
@@ -1235,7 +1212,8 @@
        },
        // 第1路三相交流输入电流（A）  C相
        optionData6:function(){
            var percent = 78.8; //百分数
            let self = this;
            var percent = self.acData.acIn1CurrC; //百分数
            let option = {
                title: {
                    "x": '50%',
@@ -1438,7 +1416,8 @@
        },
        // 第2路三相交流输入电流（A）  A相
        optionData7:function(){
            var percent = 56.8; //百分数
            let self = this;
            var percent = self.acData.acIn2CurrA; //百分数
            let option = {
                title: {
                    "x": '50%',
@@ -1641,7 +1620,8 @@
        },
        // 第2路三相交流输入电流（A）  B相
        optionData8:function(){
            var percent = 23.8; //百分数
            let self = this;
            var percent = self.acData.acIn2CurrB; //百分数
            let option = {
                title: {
                    "x": '50%',
@@ -1844,7 +1824,8 @@
        },
        // 第2路三相交流输入电流（A）  C相
        optionData9:function(){
            var percent = 78.8; //百分数
            let self = this;
            var percent = self.acData.acIn2CurrC; //百分数
            let option = {
                title: {
                    "x": '50%',
@@ -2045,6 +2026,56 @@
            };
            this.$options.chart.chartcurrent6.setOption(option);
        },
        // 列表布尔值数据处理
        setListData:function(data){
            let self = this;
                // 过欠压停电
                self.tableData=[
                    {data:"交流输入1停电",status:data.isAcIn1PowerDown},
                    {data:"交流输入2停电",status:data.isAcIn2PowerDown},
                    {data:"交流输入1防雷器故障",status:data.isAcIn1ThunderErr},
                    {data:"交流输入2防雷器故障",status:data.isAcIn2ThunderErr},
                    {data:"第2路交流A相过压",status:data.isAcIn2OverVolA},
                    {data:"第2路交流A相欠压",status:data.isAcIn2UnderVolA},
                    {data:"第2路交流B相过压",status:data.isAcIn2OverVolB},
                    {data:"第2路交流B相欠压",status:data.isAcIn2UnderVolB},
                ];
                // 监控
                self.tableData2 = [
                    {data:"第1路交流输入开关跳闸",status:data.isAcIn1Trip},
                    {data:"第2路交流输入开关跳闸",status:data.isAcIn2Trip}, 
                    {data:"第1路交流A相过压",status:data.isAcIn1OverVolA},
                    {data:"第1路交流A相欠压",status:data.isAcIn1UnderVolA},
                    {data:"第2路交流C相过压",status:data.isAcIn2OverVolC},
                    {data:"第2路交流C相欠压",status:data.isAcIn2UnderVolC},
                    {data:"第1路交流B相缺相",status:data.isAcIn1LessB},
                    {data:"第1路交流C相缺相",status:data.isAcIn1LessC},
                    {data:"交流监控单元故障",status:data.isAcIn1MonitorErr},     
                ];
                // 总告警
                self.tableData3 = [
                    {data:"第1路交流B相过压",status:data.isAcIn1OverVolB},
                    {data:"第1路交流B相欠压",status:data.isAcIn1UnderVolB}, 
                    {data:"第1路交流C相过压",status:data.isAcIn1OverVolC},
                    {data:"第1路交流C相欠压",status:data.isAcIn1UnderVolC},
                    {data:"第2路交流A相缺相",status:data.isAcIn2LessA},
                    {data:"第2路交流B相欠压",status:data.isAcIn2UnderVolB},
                    {data:"第2路交流C相过压",status:data.isAcIn2OverVolC},
                    {data:"交流配电柜总告警",status:data.isTotalAlarm},
                    {data:"交流配电柜温度告警",status:data.isAcTempAlarm},     
                ];
                // 1段交流母线输出开关
                for(let i=1;i<101;i++){
                    let obj = {data:'1段交流母线输出开关' + i + '跳闸',status:data['isFsw1Sw'+i+'trip']};
                        self.tableData4.push(obj)
                }
                // 2段交流母线输出开关
                for(let i=1;i<87;i++){
                    let obj = {data:'2段交流母线输出开关' + i + '跳闸',status:data['isFsw1Sw'+i+'trip']};
                        self.tableData5.push(obj)
                }

        }
    },
}
</script>

 src/pages/alarmMager/hfSwitch.vue

@@ -67,7 +67,7 @@
                                                <i class="icon"></i><span class="text-color">高频开关电源柜温度</span>
                                            </el-col>
                                            <el-col :span="5">
                                                <span class="text-span">85℃</span>
                                                <span class="text-span">{{ acdcData.acdcmTemp }}℃</span>
                                            </el-col>
                                        </p>
                                        <p class="center-list-title">
@@ -75,7 +75,7 @@
                                                <i class="icon"></i><span class="text-color">直流输出电压</span>
                                            </el-col>
                                            <el-col :span="5">
                                                <span class="text-span">220V</span>
                                                <span class="text-span">{{ acdcData.dcOutVol }}V</span>
                                            </el-col>
                                        </p>
                                        <p class="center-list-title">
@@ -83,7 +83,7 @@
                                                <i class="icon"></i><span class="text-color">负载电流</span>
                                            </el-col>
                                            <el-col :span="5">
                                                <span class="text-span">110A</span>
                                                <span class="text-span">{{ acdcData.loaderCurr }}A</span>
                                            </el-col>
                                        </p>
                                        <p class="center-list-title">
@@ -91,7 +91,7 @@
                                                <i class="icon"></i><span class="text-color">电池充电限流值</span>
                                            </el-col>
                                            <el-col :span="5">
                                                <span class="text-span">58A</span>
                                                <span class="text-span">{{ acdcData.chargLimitCurr }}A</span>
                                            </el-col>
                                        </p>
                                    </el-col>
@@ -101,7 +101,7 @@
                                                <i class="icon"></i><span class="text-color">交流电压告警阙值上限</span>
                                            </el-col>
                                            <el-col :span="5">
                                                <span class="text-span">220V</span>
                                                <span class="text-span">{{ acdcData.acVolHLimit }}V</span>
                                            </el-col>
                                        </p>
                                        <p class="center-list-title">
@@ -109,7 +109,7 @@
                                                <i class="icon"></i><span class="text-color">交流电压告警阙值下限</span>
                                            </el-col>
                                            <el-col :span="5">
                                                <span class="text-span">220V</span>
                                                <span class="text-span">{{ acdcData.acVolLLimit }}V</span>
                                            </el-col>
                                        </p>
                                        <p class="center-list-title">
@@ -117,7 +117,7 @@
                                                <i class="icon"></i><span class="text-color">直流输出电压告警阙值上限</span>
                                            </el-col>
                                            <el-col :span="5">
                                                <span class="text-span">220V</span>
                                                <span class="text-span">{{ acdcData.dcOutVolHLimit }}V</span>
                                            </el-col>
                                        </p>
                                        <p class="center-list-title">
@@ -125,7 +125,7 @@
                                                <i class="icon"></i><span class="text-color">直流输出电压告警阙值下限</span>
                                            </el-col>
                                            <el-col :span="5">
                                                <span class="text-span">220V</span>
                                                <span class="text-span">{{ acdcData.dcOutVolLLimit }}V</span>
                                            </el-col>
                                        </p>
                                    </el-col>
@@ -141,22 +141,22 @@
                                            <div class="height42">
                                                <div class="height98">
                                                    <el-col :span="16" class="height98">
                                                        <div ref="chartvol4" class="chart-fc">123</div>
                                                        <div ref="chartvol4" class="chart-fc"></div>
                                                    </el-col>
                                                    <el-col :span="8">
                                                        <div class="chart-input">
                                                            <span class="text-span marign-top40">89V</span>
                                                            <span class="text-span marign-top40">{{ acdcData.junChargeVol }}V</span>
                                                        </div>
                                                    </el-col>
                                                </div>
                                            </div>
                                            <div class="height42">
                                                <el-col :span="16" class="height98">
                                                    <div ref="chartvol5" class="chart-fc">123</div>
                                                    <div ref="chartvol5" class="chart-fc"></div>
                                                </el-col>
                                                <el-col :span="8">
                                                    <div class="chart-input">
                                                        <span class="text-span marign-top40">89V</span>
                                                        <span class="text-span marign-top40">{{  acdcData.floatChargeVol }}V</span>
                                                    </div>
                                                </el-col>
                                            </div>
@@ -176,7 +176,7 @@
                                                    </el-col>
                                                    <el-col :span="8">
                                                        <div class="chart-input">
                                                            <span class="text-span marign-top40">89V</span>
                                                            <span class="text-span marign-top40">{{ acdcData.battgroup1Vol }}V</span>
                                                        </div>
                                                    </el-col>
                                                </div>
@@ -187,7 +187,7 @@
                                                </el-col>
                                                <el-col :span="8">
                                                    <div class="chart-input">
                                                        <span class="text-span marign-top40">89V</span>
                                                        <span class="text-span marign-top40">{{  acdcData.battgroup2Vol }}V</span>
                                                    </div>
                                                </el-col>
                                            </div>
@@ -238,8 +238,8 @@
                             <el-table :data="tableData" stripe style="width: 100%" :show-header="false">
                                <el-table-column prop="data" align="center"></el-table-column>
                                <el-table-column  >
                                    <template>
                                        <div><hdw-light></hdw-light></div>
                                    <template slot-scope="scope">
                                        <div><hdw-light :type="scope.row.status"></hdw-light></div>
                                    </template>
                                </el-table-column>
                            </el-table>
@@ -265,34 +265,18 @@
import HdwLight from "@/pages/dataMager/components/HdwLight";
export default {
    chart:{},
    props: {
        powerDeviceId: {
            type: String,
            default: "110000112"
        },
    },
    data(){
        return {
            jfcdy:"89V",
            tableData:[
                {data:"第1路交流输入开关跳闸"},
                {data:"第2路交流输入开关跳闸"},
                {data:"第1路交流A相过压"},
                {data:"第1路交流A相欠压"},
                {data:"第2路交流C相过压"},
                {data:"第2路交流C相欠压"},
                {data:"第1路交流B相缺压"},
                {data:"第1路交流C相缺压"},
                {data:"交流监控单元故障"},
                {data:"交流配电柜总告警"},
                {data:"交流配电柜温度告警"},
            ],
            tableData2:[
                {data:"1段交流母线输出开关1跳闸"},
                {data:"1段交流母线输出开关2跳闸"}, 
                {data:"1段交流母线输出开关3跳闸"},
                {data:"1段交流母线输出开关4跳闸"},
                {data:"1段交流母线输出开关5跳闸"},
                {data:"1段交流母线输出开关6跳闸"},
                {data:"1段交流母线输出开关7跳闸"},
                {data:"1段交流母线输出开关8跳闸"},
                {data:"1段交流母线输出开关9跳闸"},
                {data:"1段交流母线输出开关10跳闸"},   
                {data:"1段交流母线输出开关11跳闸"},       ]
            acdcData:{},
            tableData:[],
            tableData2:[]
        }
    },
    components:{
@@ -300,13 +284,36 @@
    },
    mounted() {
        let self =this;
        this.setOption();
        this.intData();
        window.addEventListener('resize', function(){
            for(let item in self.$options.chart){
                self.$options.chart[item].resize() ;          }
        });
    },
    methods: {
        intData:function(){
            let self = this;
            let id = self.powerDeviceId;
            this.$apis.dataMager.powerMager.getPowerBoxData(id).then(res=>{
                let rs = JSON.parse(res.data.result);
                    if(rs.code == 1){
                        self.acdcData = rs.data.acdc;
                        console.log(rs);
                        self.$nextTick(function(){
                            self.setOption();
                        })
                        self.setListData(rs.data.acdc);
                    }else{
                        self.acdcData = rs.data.acdc;
                        console.log(rs);
                        self.$nextTick(function(){
                            self.setOption();
                        })
                        self.setListData(rs.data.acdc);
                    }
                    
            })
        },
        // 初始化chart图表
        setOption:function(){
            // 基于准备好的dom，初始化echarts实例chartcurrent1
@@ -340,8 +347,9 @@
        },
        // 第1路交流三相输入电压（V）
        optionData1:function(){
            let self = this;
            let chartdata = [
                [123, 80, 55],
                [self.acdcData.acIn1VolA, self.acdcData.acIn1VolB, self.acdcData.acIn1VolC],
                ['A相', 'B相', 'C相'],
            ];

@@ -605,8 +613,9 @@
        },
        // 第2路交流三相输入电压（V）
        optionData2:function(){
            let self = this;
            let chartdata = [
                [123, 80, 55],
                [self.acdcData.acIn2VolA, self.acdcData.acIn2VolB, self.acdcData.acIn2VolC],
                ['A相', 'B相', 'C相'],
            ];

@@ -870,8 +879,9 @@
        },
        // 三相交流输入电压（V）
        optionData3:function(){
            let self = this;
            let chartdata = [
                [123, 80, 55],
                [self.acdcData.acOutVolA, self.acdcData.acOutVolB, self.acdcData.acOutVolC],
                ['A相', 'B相', 'C相'],
            ];

@@ -1135,7 +1145,8 @@
        },
        // 三相交流输入电流（A）  A相
        optionData4:function(){
            var percent = 56.8; //百分数
            let self = this;
            var percent = self.acdcData.acOutCurrA; //百分数
            let option = {
                title: {
                    "x": '50%',
@@ -1338,7 +1349,8 @@
        },
        // 三相交流输入电流（A）  B相
        optionData5:function(){
            var percent = 23.8; //百分数
            let self = this;
            var percent = self.acdcData.acOutCurrB; //百分数
            let option = {
                title: {
                    "x": '50%',
@@ -1541,7 +1553,8 @@
        },
        // 三相交流输入电流（A）  C相
        optionData6:function(){
            var percent = 78.8; //百分数
            let self = this;
            var percent = self.acdcData.acOutCurrC; //百分数
            let option = {
                title: {
                    "x": '50%',
@@ -2449,6 +2462,8 @@
        } ,
        // 蓄电池组1
        optionData11:function(){
            let self = this;
            let battgroup1Curr = self.acdcData.battgroup1Curr;
            let option = {
                    // backgroundColor: '#111',
                    grid: {
@@ -2513,7 +2528,7 @@
                                    value: 160,
                                    label: {
                                        normal: {
                                            formatter: '51%',
                                            formatter: battgroup1Curr + "A",
                                            position: 'center',
                                            show: true,
                                            textStyle: {
@@ -2566,6 +2581,8 @@
        },
        // 蓄电池组1
        optionData12:function(){
            let self = this;
            let battgroup2Curr = self.acdcData.battgroup2Curr;
            let option = {
                    // backgroundColor: '#111',
                    grid: {
@@ -2630,7 +2647,7 @@
                                    value: 160,
                                    label: {
                                        normal: {
                                            formatter: '51%',
                                            formatter: battgroup2Curr + 'A',
                                            position: 'center',
                                            show: true,
                                            textStyle: {
@@ -2683,12 +2700,27 @@
        },
        // 模块输出电流
        optionData13:function(){
            let self = this;
            let data = [];
            let dataName = [];
            let dataInfo = ["m1OutCurr","m2OutCurr","m3OutCurr","m4OutCurr","m5OutCurr","m6OutCurr","m7OutCurr","m8OutCurr","m9OutCurr","m10OutCurr","m11OutCurr","m12OutCurr","m13OutCurr","m14OutCurr","m15OutCurr","m16OutCurr",];
                dataInfo.forEach((item,i) => {
                    let index = i + 1;
                        dataName.push("模块" + index);
                        data.push(self.acdcData[item]);
                });
            let option = {
                    grid: {
                        top: '20%',
                        left: '10%',
                        right: '5%',
                        bottom: '15%',
                    },
                    tooltip:{
                        trigger:"axis",
                        axisPointer:{
                            type:"cross"
                        }
                    },
                    xAxis: [{
                        type: 'category',
@@ -2705,7 +2737,7 @@
                            show: false
                        },
                        boundaryGap: false,
                        data: ["模块1","模块2","模块3","模块4","模块5","模块6","模块7","模块8","模块9","模块10","模块11","模块12","模块13","模块14","模块15","模块16"],
                        data: dataName,

                    }],

@@ -2779,12 +2811,36 @@
                                    shadowBlur: 10
                                }
                            },
                            data: [20, 80, 100, 40,30, 95,60,65,40,80,20,60,70,50,20,80 ]
                            data: data
                        },
                        
                    ]
                };
                this.$options.chart.chartcurrent6.setOption(option);
        },
        // 列表布尔值数据处理
        setListData:function(data){
            let self = this;
                // 过欠压跳闸
                self.tableData=[
                    {data:"第1路交流输入开关跳闸",status:data.isAcIn1Trip},
                    {data:"第2路交流输入开关跳闸",status:data.isAcIn2Trip},
                    {data:"第1路交流A相过压",status:data.isAcIn1OverVolA},
                    {data:"第1路交流A相欠压",status:data.isAcIn1UnderVolA},
                    {data:"第2路交流C相过压",status:data.isAcIn2OverVolC},
                    {data:"第2路交流C相欠压",status:data.isAcIn2UnderVolC},
                    {data:"第1路交流B相缺相",status:data.isAcIn1LessB},
                    {data:"第1路交流C相缺缺相",status:data.isAcIn1OverVolC},
                    {data:"交流监控单元故障",status:data.isAcInMonitorerr},
                    {data:"交流配电柜总告警",status:data.isTotalAlarm},
                    {data:"交流配电柜温度告警",status:data.temprature},
                ];
                // 1段交流母线输出开关
                for(let i=1;i<17;i++){
                    let obj = {data:'1段交流母线输出开关' + i + '跳闸',status:data['isAcdcMod'+i+'Off']};
                        self.tableData2.push(obj)
                }

        }
    },
}
@@ -2927,8 +2983,9 @@
        border: #00feff 1px solid;
        border-radius: 3px;
        color:#ffe329;
        width: 85%;
        width: 99%;
        text-align: center;
        font-size: 16px;
        /* padding:0 15px */

    }

 src/router/routes.js

@@ -328,6 +328,13 @@
    component: (resolve) => require(['../pages/alarmMager/GGDmeasure.vue'], resolve)
},
{
    name: 'DCmeasure',
    path: '/DCmeasure',
    /* 直流配电柜遥测量 */
    meta: {},
    component: (resolve) => require(['../pages/alarmMager/DCmeasure.vue'], resolve)
},
{
    name: 'powerAlarmTimeout',
    path: '/powerAlarmTimeout',
    /* 通信电源超时告警 */