内容提交

whychdw

2020-11-11 9dc6a91230af4d04a0e442f36f1614e77a99c54c

内容提交

 package.json

@@ -1,6 +1,6 @@
{
  "name": "admin_manage",
  "version": "2.1.5",
  "version": "2.1.6",
  "private": true,
  "scripts": {
    "serve": "vue-cli-service serve --mode dev",

 src/components/PageHeader.vue

@@ -5,7 +5,7 @@
                <div class="page-header-left" slot="header">
                    <img class="header-first-logo" src="../assets/images/gjdw-log.png">
                    <span class="header-carve-up"></span>
                    <span>综合电力监控平台</span>
                    <span>蓄电池监控平台</span>
                    <span class="sys-version">V{{version}}</span>
                </div>
                <div class="page-header-content">

 src/components/RightMenu.vue

New file
@@ -0,0 +1,89 @@
<template>
        <div
            class="right-menu"
            :style="containerStyle"
            v-show="visible">
            <div class="right-menu-content" @click.stop="handleWrapperClick">
                <slot></slot>
            </div>
        </div>
</template>

<script>
export default {
    name: "RightMenu",
    props: {
        visible: {
            type: Boolean,
            default: false
        },
        x: {
            type: Number,
            default: 0,
        },
        y: {
            type: Number,
            default: 0,
        },
        autoClose: {
            type: Boolean,
            default: true
        },
    },
    data() {
        return {}
    },
    computed: {
        containerStyle() {
            return {
                top: this.y+'px',
                left: this.x+'px'
            }
        }
    },
    methods: {
        handleWrapperClick() {
            if(this.autoClose) {
                this.handleClose();
            }
        },
        handleClose() {
            this.hide();
        },
        hide() {
            this.$emit('update:visible', false);
        },
    },
    mounted() {
        // æ·»åŠ ç‚¹å‡»äº‹ä»¶
        document.body.addEventListener('click', (event) => {
           this.handleClose();
            event.stopPropagation();
        }, false);
    }
}
</script>

<style scoped>
.right-menu {
    position: fixed;
    top: 0;
    left: 0;
    z-index: 999;
}
.right-menu-list {
    min-width: 220px;
    padding: 4px 0;
    font-size: 12px;
    background-color: #FFFFFF;
}
.right-menu-list a {
    display: block;
    text-indent: 22px;
    color: #000000;
    padding: 4px;
}
.right-menu-list a:hover {
    background-color: #cccccc;
}
</style>

 src/components/chart/BarChart.vue

@@ -47,6 +47,10 @@
        minColor:  {
            type: String,
            default: 'red',
        },
        rightMenu: {
            type: Boolean,
            default: false,
        }
    },
    data() {
@@ -225,6 +229,13 @@
        this.$G.chartManage.set(this.id, chart);
        // è®¾ç½®é…ç½®é¡¹
        this.setOption();

        // æ ¹æ®åŠŸèƒ½å±è”½å³é”®èœå•
        if (this.rightMenu) {
            document.getElementById(this.id).oncontextmenu= function() {
                return false;
            };
        }
    }
}
</script>

 src/pages/dataTest/diagrams/grid/index.vue

@@ -61,12 +61,21 @@
        }
    },
    methods: {
        init() {
            // è®¾ç½®åœ¨çº¿ï¼Œç»„端，电流，和温度
            diagram.setOption('onlineVol', 'text', this.onlineVol+'V');
            diagram.setOption('groupVol', 'text', this.groupVol+'V');
            diagram.setOption('battCurr', 'text', this.battCurr+'A');
            diagram.setOption('devTemp', 'text', '设备温度：'+this.devTemp+'℃');
        },
        setDiagramByType() {

        }
    },
    mounted() {
        diagram = gridCircuitDiagram(this.$refs.static, this.$refs.flush);
        // åˆå§‹åŒ–数据
        this.init();
        // è®¾ç½®å……放电的类型
        this.setDiagramByType();
    },

 src/pages/dataTest/diagrams/load/index.vue

@@ -63,6 +63,13 @@
        },
    },
    methods: {
        init() {
            // è®¾ç½®åœ¨çº¿ï¼Œç»„端，电流，和温度
            diagram.setOption('onlineVol', 'text', this.onlineVol+'V');
            diagram.setOption('groupVol', 'text', this.groupVol+'V');
            diagram.setOption('battCurr', 'text', this.battCurr+'A');
            diagram.setOption('devTemp', 'text', '设备温度：'+this.devTemp+'℃');
        },
        setDiagramByType() {
            let type = this.type;
            switch (type) {
@@ -90,7 +97,8 @@
    },
    mounted() {
        diagram = loadCircuitDiagram(this.$refs.static, this.$refs.flush);

        // åˆå§‹åŒ–数据
        this.init();
        // è®¾ç½®å……放电的类型
        this.setDiagramByType();
    },

 src/pages/dataTest/diagrams/normal/index.vue

@@ -61,6 +61,13 @@
        }
    },
    methods: {
        init() {
            // è®¾ç½®åœ¨çº¿ï¼Œç»„端，电流，和温度
            diagram.setOption('onlineVol', 'text', this.onlineVol+'V');
            diagram.setOption('groupVol', 'text', this.groupVol+'V');
            diagram.setOption('battCurr', 'text', this.battCurr+'A');
            diagram.setOption('devTemp', 'text', '设备温度：'+this.devTemp+'℃');
        },
        setDiagramByType() {
            let type = this.type;
            switch(type) {
@@ -90,8 +97,11 @@
    },
    mounted() {
        diagram = circuitDiagram(this.$refs.static, this.$refs.flush);
        // åˆå§‹åŒ–数据
        this.init();
        // è®¾ç½®å……放电的类型
        this.setDiagramByType();

    },
    destroyed() {
        diagram.stop();

 src/pages/dataTest/realTime.vue

@@ -232,19 +232,19 @@
                                :update="diagram.update"></circuit-diagram>
                        </el-tab-pane>
                        <el-tab-pane label="电压" name="vol">
                            <bar-chart ref="vol" id="vol" unit="V"></bar-chart>
                            <bar-chart ref="vol" id="vol" unit="V" right-menu></bar-chart>
                        </el-tab-pane>
                        <el-tab-pane label="内阻" name="res">
                            <bar-chart ref="res" id="res" unit="mΩ" max-color="red" min-color="green"></bar-chart>
                            <bar-chart ref="res" id="res" unit="mΩ" max-color="red" min-color="green" right-menu></bar-chart>
                        </el-tab-pane>
                        <el-tab-pane label="温度" name="temp">
                            <bar-chart ref="temp" id="temp" unit="℃" max-color="red" min-color="green"></bar-chart>
                            <bar-chart ref="temp" id="temp" unit="℃" max-color="red" min-color="green" right-menu></bar-chart>
                        </el-tab-pane>
                        <el-tab-pane label="电导" name="conduct">
                            <bar-chart ref="conduct" id="conduct"></bar-chart>
                            <bar-chart ref="conduct" id="conduct" right-menu></bar-chart>
                        </el-tab-pane>
                        <el-tab-pane label="均衡电流" name="curr">
                            <bar-chart ref="curr" id="curr" unit="A"></bar-chart>
                            <bar-chart ref="curr" id="curr" unit="A" right-menu></bar-chart>
                        </el-tab-pane>
                        <el-tab-pane label="数据表格" name="tblData" class="el-table-wrapper">
                            <el-table
@@ -299,6 +299,13 @@
            <history-realtime-data
                :batt="batt" v-if="historyRealTimeDataDialog.show"></history-realtime-data>
        </el-dialog>
        <right-menu :visible.sync="rightMenu.show" :x="rightMenu.x" :y="rightMenu.y">
            <div class="right-menu-list">
                <ul>
                    <li><a href="javascript:;" @click="payAttentionMon">添加关注单体</a></li>
                </ul>
            </div>
        </right-menu>
    </flex-layout>
</template>

@@ -316,6 +323,7 @@
import RestartPlanParams from "@/components/params/RestartPlanParams";
import ChartWrapper from "@/components/ChartWrapper";
import HistoryRealtimeData from "@/pages/dataTest/HistoryRealtimeData";
import RightMenu from "@/components/RightMenu";

import {
    realTimeSearch,
@@ -354,6 +362,7 @@
        RestartPlanParams,
        ChartWrapper,
        HistoryRealtimeData,
        RightMenu,
    },
    data() {
        let permits = this.$store.state.user.permits;
@@ -361,6 +370,11 @@
        return {
            isCanTest: isCanTest,
            username: sessionStorage.getItem('username'),
            rightMenu: {
                show: false,
                x: 0,
                y: 0,
            },
            /* ç”µæ± çŠ¶æ€ æ¨¡å— ç»„端展示 */
            inputs: {
                group_vol: 0 /* ç«¯ç”µåŽ‹-组端电压 */ ,
@@ -1057,6 +1071,12 @@
                            this.diagram.desc = '(开关闭合)';
                        }
                    }

                    // å½“前设备是BTS设备
                    if(data.dev_testtype == 81) {
                        this.diagram.desc += '(KD测试)';
                        this.diagram.type = 3;
                    }
                    break;
                case 2:
                    //辨别当前电池组是否在充电
@@ -1489,6 +1509,14 @@
            requestAnimationFrame(()=>{
                this.monitorPage();
            });
        },
        setRightMenuPos(x, y) {
            this.rightMenu.show = true;
            this.rightMenu.x = x;
            this.rightMenu.y = y;
        },
        payAttentionMon() {

        }
    },
    computed: {
@@ -1567,7 +1595,7 @@
        },
        histroyDataTitle() {
            return this.batt.StationName+"-历史实时数据";
        }
        },
    },
    mounted() {
        // æŸ¥è¯¢æ‹“扑图状态的显示
@@ -1588,6 +1616,13 @@

        // ç›‘控是否已经切换到当前页面
        this.monitorPage();
        // ç›‘听点击事件
        // this.$G.chartManage.get("vol").getZr().on('contextmenu', params=>{
        //     let pointInPixel= [params.offsetX, params.offsetY];
        //     console.log(this.$G.chartManage.get("vol").containPixel('grid',pointInPixel));
        //     this.setRightMenuPos(params.event.clientX, params.event.clientY);
        // });

    },
    destroyed() {
        this.timer.stop();

 src/pages/index.vue

@@ -178,22 +178,24 @@
                        });
                    }
                },
                {
            ];
            // å¯ä»¥ç¼–辑
            if(this.isCanEdit) {
                txtMenuItem.push({
                    text: '设置机房',
                    callback: (e) =>{
                        let point = new BMap.Point(e.lng, e.lat);
                        // æ·»åŠ æœºæˆ¿
                        this.addHomeDot(map, point);
                    }
                },
            ];
                });
            }

            for(var i=0; i < txtMenuItem.length; i++){
                menu.addItem(new BMap.MenuItem(txtMenuItem[i].text,txtMenuItem[i].callback,100));
            }
            if(this.isCanEdit) {
                map.addContextMenu(menu);
            }

            // åœ°å›¾èœå•
            map.addContextMenu(menu);
        },
        initOverlay() {
            normalOverlay.img.setData([]);

 src/pages/login.vue

@@ -3,7 +3,7 @@
        <div class="sliderCon">
            <div class="logo">
                <img src="../assets/images/yuanchang_logo2.png" class="logoImg">
                ç»¼åˆç”µåŠ›ç›‘控平台
                è“„电池后台监控管理平台
            </div>
            <img src="../assets/images/login-img.png" class="picImg">
        </div>

 ÏîÄ¿ÐèÇó.md

@@ -40,4 +40,9 @@
```
1.大屏数据配置是全局配置还是用户自己根据自己的需求进行配置
```
####2020-11-05
```
1.调整实时和历史数据机房标题栏为两行省-市-区县一行剩下的一行并用鲜亮的字体
2.调整echarts为立体图形
```