whyczyk
2021-10-11 c3a135a6fbbde6daba73dde10454583a8fc7ab73
问题修改
19个文件已修改
150 ■■■■ 已修改文件
src/assets/js/charts/persons/huodongwei.js 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/js/charts/persons/wangxuan.js 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/js/charts/persons/zengyvkai.js 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/js/socket.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/charts/AcInputWarp.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/charts/CustomPie.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/charts/MonCap.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/charts/PictorialBar.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/charts/RoseChart.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/charts/RoseChartED.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/charts/RoseChartHea.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/charts/abeamProChart.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/charts/dischargeCircuit.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/charts/histogramAlternating.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/charts/imgPieChart.vue 29 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/charts/latticeBar.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/charts/monomerVoltage.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/charts/powerChart.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/charts/triangleBarChart.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/js/charts/persons/huodongwei.js
@@ -40,7 +40,7 @@
}, {
    img: require("@/assets/images/CustomPie.jpg"),
    chartData: {
        name: '故障',
        name: '电源故障',
        id: 22,
        w: 0.235,
        h: 0.25,
@@ -82,7 +82,7 @@
}, {
    img: require("@/assets/images/PictorialBar.jpg"),
    chartData: {
        name: '在线电压和组端电压',
        name: '在线和组端电压告警',
        id: 23,
        w: 0.235,
        h: 0.25,
@@ -90,23 +90,23 @@
        y: 0.35,
        type: 'PictorialBar',
        setData: {
            xData: ['高告警数量', '低告警数量', '告警机房数\n比例', '告警机房总数'],
            xData: ['在线电压低\n告警', '在线电压告警\n告警', '组端电压低\n告警', '组端电压高\n告警'],
            series: [{
                name: "在线电压",
                data: [{
                    name: '高告警数量',
                    name: '在线电压低告警',
                    value: 2
                },
                {
                    name: '低告警数量',
                    name: '在线电压告警告警',
                    value: 15
                },
                {
                    name: '告警机房数',
                    name: '组端电压低告警',
                    value: 32
                },
                {
                    name: '告警机房总数',
                    name: '组端电压高告警',
                    value: 39
                },
                ],
@@ -115,19 +115,19 @@
            {
                name: "组端电压",
                data: [{
                    name: '高告警数量',
                    name: '在线电压低告警',
                    value: 22
                },
                {
                    name: '低告警数量',
                    name: '在线电压告警告警',
                    value: 25
                },
                {
                    name: '告警机房数',
                    name: '组端电压低告警',
                    value: 35
                },
                {
                    name: '告警机房总数',
                    name: '组端电压高告警',
                    value: 55
                },
                ],
@@ -163,7 +163,7 @@
        },
        {
            value: 8,
            name: '故障数量',
            name: '通讯故障数量',
            color: '#8278E9'
        },
        {
@@ -176,7 +176,7 @@
}, {
    img: require("@/assets/images/MonCap.jpg"),
    chartData: {
        name: '单体容量',
        name: '单体容量告警',
        id: 25,
        w: 0.235,
        h: 0.25,
@@ -185,30 +185,15 @@
        type: 'MonCap',
        setData: {
            circle: [{
                name: '告警数',
                name: '单体容量高告警',
                value: 380,
                color: '#00DFFC',
            },
            // {
            //     name: '告警占比',
            //     value: 180,
            //     color: '#FF8B34',
            // },
            {
                name: '告警总数',
                name: '单体容量低告警',
                value: 180,
                color: '#ED4882',
            },
            {
                name: '告警机房数',
                value: 280,
                color: '#2EEA9D',
            },
                // {
                //     name: '告警机房占比',
                //     value: 70,
                //     color: '#F3E501',
                // }
            ]
        }
    }
src/assets/js/charts/persons/wangxuan.js
@@ -21,7 +21,7 @@
}, {
    img: require("@/assets/images/monomerVoltage.png"),
    chartData: {
        name: '单体电压、内阻温度',
        name: '单体电压、内阻和温度告警',
        id: 12,
        w: 0.300,
        h: 0.35,
@@ -30,7 +30,7 @@
        type: 'monomerVoltage',
        setData: {
            legendData: ['单体电压', '单体内阻', '单体温度'],
            yAxisData: ['高告警数量', '低告警数量', '告警总数', '告警总数比例', '告警机房总数', '告警机房总数比例'],
            yAxisData: ['单体电压高告警', '单体电压低告警', '单体内阻高告警', '单体内阻低告警', '单体温度高告警', '单体内阻低告警'],
            data: [{
                name: '单体电压',
                type: 'bar',
@@ -60,7 +60,7 @@
}, {
    img: require("@/assets/images/dischargeCircuit.png"),
    chartData: {
        name: '放电电流',
        name: '放电电流告警',
        id: 13,
        w: 0.300,
        h: 0.35,
@@ -68,10 +68,10 @@
        y: 0.35,
        type: 'dischargeCircuit',
        setData: {
            xAxisData: ['低告警数量', '告警机房总数', '告警机房数比例', '告警总数', '告警总数比例'],
            maxYAxis: [50, 50, 50, 50, 50],
            xData: [30, 19, "37%", 44, "25%"],
            data: [30, 19, 37, 44, 25]
            xAxisData: ['放电电流高告警', '放电电流低告警'],
            maxYAxis: [50, 50],
            xData: [30, 19],
            data: [30, 19]
        }
    }
},
src/assets/js/charts/persons/zengyvkai.js
@@ -20,7 +20,7 @@
let modularData = [{
    img: require("@/assets/images/modular-latticeBar.png"),
    chartData: {
        name: '放电和充电电流',
        name: '放电和充电电流告警',
        id: 1,
        w: 0.235,
        h: 0.25,
@@ -28,14 +28,14 @@
        y: 0.35,
        type: 'latticeBar',
        setData: {
            xData: ['高告\n警数量', '告警\n总数', '告警机房\n总数'],
            xData: ['放电电流高\n告警', '放电电流低\n告警', '充电电流高\n告警', '充电电流低\n告警'],
            series: [{
                name: '放电',
                data: [120, 220, 80],
                data: [120, 220, 80, 100],
                color: '#90ec7d'
            }, {
                name: '充电',
                data: [80, 160, 310],
                data: [80, 160, 310, 180],
                color: '#ff6b6b'
            }]
        }
@@ -44,7 +44,7 @@
{
    img: require("@/assets/images/modular-ImgPieChart.png"),
    chartData: {
        name: '整流器',
        name: '电源整流器',
        id: 2,
        w: 0.235,
        h: 0.25,
@@ -62,7 +62,7 @@
            },
            {
                value: 120,
                name: '总故障'
                name: '整流器总故障'
            },
            {
                value: 50,
@@ -75,7 +75,7 @@
{
    img: require("@/assets/images/modular-TriangleBarChart.png"),
    chartData: {
        name: '电池组',
        name: '电池组告警',
        id: 3,
        w: 0.235,
        h: 0.25,
src/assets/js/socket.js
@@ -5,7 +5,7 @@
    constructor(url, msgCallback, time, port) {
        this.wsUrl = getWsUrl(url, port)
        this.msgCallback = msgCallback;
        this.time = time;     //心跳时间
        this.time = time || 15000;     //心跳时间
        this.initTime = 5000   //重连时间
        this.init()
    }
src/components/charts/AcInputWarp.vue
@@ -59,7 +59,7 @@
        },
        postData() {
            let userId = localStorage.getItem('userId');
            this.websock = new WebSocketClass(`/screen/powerAlarm/acInput/${userId}`, this.wsMessage, 4000)
            this.websock = new WebSocketClass(`/screen/powerAlarm/acInput/${userId}`, this.wsMessage)
        },
        wsMessage(res) {
            if (res.code == 1) {
src/components/charts/CustomPie.vue
@@ -301,7 +301,7 @@
        },
        postData() {
            let userId = localStorage.getItem('userId');
            this.websock = new WebSocketClass(`/screen/powerAlarm/error/${userId}`, this.wsMessage, 4000)
            this.websock = new WebSocketClass(`/screen/powerAlarm/error/${userId}`, this.wsMessage)
        },
        wsMessage(res) {
            if (res.code == 1) {
src/components/charts/MonCap.vue
@@ -84,7 +84,7 @@
        },
        postData() {
            let userId = localStorage.getItem('userId');
            this.websock = new WebSocketClass(`/screen/batteryAlarm/monCapacity/${userId}`, this.wsMessage, 4000)
            this.websock = new WebSocketClass(`/screen/batteryAlarm/monCapacity/${userId}`, this.wsMessage)
        },
        wsMessage(res) {
            if (res.code == 1) {
src/components/charts/PictorialBar.vue
@@ -116,7 +116,7 @@
        },
        postData() {
            let userId = localStorage.getItem('userId');
            this.websock = new WebSocketClass(`/screen/batteryAlarm/onlinegroupVolAnalysis/${userId}`, this.wsMessage, 4000)
            this.websock = new WebSocketClass(`/screen/batteryAlarm/onlinegroupVolAnalysis/${userId}`, this.wsMessage)
        },
        wsMessage(res) {
            if (res.code == 1) {
src/components/charts/RoseChart.vue
@@ -131,7 +131,7 @@
        },
        postData() {
            let userId = localStorage.getItem('userId');
            this.websock = new WebSocketClass(`/screen/batteryAlarm/btsStatus/${userId}`, this.wsMessage, 4000)
            this.websock = new WebSocketClass(`/screen/batteryAlarm/btsStatus/${userId}`, this.wsMessage)
        },
        wsMessage(res) {
            if (res.code == 1) {
src/components/charts/RoseChartED.vue
@@ -28,9 +28,9 @@
                cmd: "syncPage",
                params: {
                    pageInfo: {
                        label: "电池续航能力历史查询",
                        name: "endure",
                        src: "#/reportStatistics/endure",
                        label: "电池信息统计分析",
                        name: "produceTotal",
                        src: "#/dataMager/produceTotal",
                        closable: true
                    },
                }
@@ -70,7 +70,7 @@
        },
        postData() {
            let userId = localStorage.getItem('userId');
            this.websock = new WebSocketClass(`/screen/batteryData/endurance/${userId}`, this.wsMessage, 4000)
            this.websock = new WebSocketClass(`/screen/batteryData/endurance/${userId}`, this.wsMessage)
        },
        wsMessage(res) {
            if (res.code == 1) {
src/components/charts/RoseChartHea.vue
@@ -70,7 +70,7 @@
        },
        postData() {
            let userId = localStorage.getItem('userId');
            this.websock = new WebSocketClass(`/screen/batteryData/capStatus/${userId}`, this.wsMessage, 4000)
            this.websock = new WebSocketClass(`/screen/batteryData/capStatus/${userId}`, this.wsMessage)
        },
        wsMessage(res) {
            if (res.code == 1) {
src/components/charts/abeamProChart.vue
@@ -39,9 +39,9 @@
                cmd: "syncPage",
                params: {
                    pageInfo: {
                        label: "电池实时告警",
                        name: "batteryrTimequery",
                        src: "#/batteryrTimequery",
                        label: "设备状态查询",
                        name: "btsStatusTest",
                        src: "#/dataMager/btsStatus",
                        closable: true
                    },
                }
@@ -189,7 +189,7 @@
        },
        postData() {
            let userId = localStorage.getItem('userId');
            this.websock = new WebSocketClass(`/screen/battery/status/${userId}`, this.wsMessage, 4000)
            this.websock = new WebSocketClass(`/screen/battery/status/${userId}`, this.wsMessage)
        },
        wsMessage(res) {
            if (res.code == 1) {
src/components/charts/dischargeCircuit.vue
@@ -62,7 +62,7 @@
        },
        postData() {
            let userId = localStorage.getItem('userId');
            this.websock = new WebSocketClass(`/screen/batteryAlarm/dischargeAnalysis/${userId}`, this.wsMessage, 4000)
            this.websock = new WebSocketClass(`/screen/batteryAlarm/dischargeAnalysis/${userId}`, this.wsMessage)
        },
        wsMessage(res) {
            let self = this;
src/components/charts/histogramAlternating.vue
@@ -68,7 +68,7 @@
        },
        postData() {
            let userId = localStorage.getItem('userId');
            this.websock = new WebSocketClass(`/screen/powerAlarm/acABC/${userId}`, this.wsMessage, 4000)
            this.websock = new WebSocketClass(`/screen/powerAlarm/acABC/${userId}`, this.wsMessage)
        },
        wsMessage(res) {
            let self = this;
src/components/charts/imgPieChart.vue
@@ -184,19 +184,36 @@
        },
        postData() {
            let userId = localStorage.getItem('userId');
            this.websock = new WebSocketClass(`/screen/powerAlarm/rectifier/${userId}`, this.wsMessage, 4000)
            this.websock = new WebSocketClass(`/screen/powerAlarm/rectifier/${userId}`, this.wsMessage)
        },
        wsMessage(res) {
            if (res.code == 1) {
                let optionData = {
                    data: []
                    data: [{
                        value: 0,
                        name: '整流器交流异常'
                    },
                    {
                        value: 0,
                        name: '整流器过流'
                    },
                    {
                        value: 0,
                        name: '整流器总故障'
                    },
                    {
                        value: 0,
                        name: '整流器欠压'
                    },
                    ]
                }
                let resData = res.data;
                for (let key in resData) {
                    let obj = {};
                    obj.name = key;
                    obj.value = resData[key];
                    optionData.data.push(obj)
                    optionData.data.map(item => {
                        if (item.name == key) {
                            item.value = resData[key]
                        }
                    })
                }
                this.$options.chartData = optionData;
                this.organizeData(optionData)
src/components/charts/latticeBar.vue
@@ -188,7 +188,7 @@
        },
        postData() {
            let userId = localStorage.getItem('userId');
            this.websock = new WebSocketClass(`/screen/batteryAlarm/chargeAnalysis/${userId}`, this.wsMessage, 4000)
            this.websock = new WebSocketClass(`/screen/batteryAlarm/chargeAnalysis/${userId}`, this.wsMessage)
        },
        wsMessage(res) {
            if (res.code == 1) {
src/components/charts/monomerVoltage.vue
@@ -62,7 +62,7 @@
        },
        postData() {
            let userId = localStorage.getItem('userId');
            this.websock = new WebSocketClass(`/screen/batteryAlarm/monVRTAnalysis/${userId}`, this.wsMessage, 4000)
            this.websock = new WebSocketClass(`/screen/batteryAlarm/monVRTAnalysis/${userId}`, this.wsMessage)
        },
        wsMessage(res) {
            let self = this;
src/components/charts/powerChart.vue
@@ -67,7 +67,7 @@
        },
        postData() {
            let userId = localStorage.getItem('userId');
            this.websock = new WebSocketClass(`/screen/powerAlarm/status/${userId}`, this.wsMessage, 4000)
            this.websock = new WebSocketClass(`/screen/powerAlarm/status/${userId}`, this.wsMessage)
        },
        wsMessage(res) {
            if (res.code == 1) {
src/components/charts/triangleBarChart.vue
@@ -35,9 +35,9 @@
                cmd: "syncPage",
                params: {
                    pageInfo: {
                        label: "电池实时告警",
                        name: "batteryrTimequery",
                        src: "#/batteryrTimequery",
                        label: "电源实时告警",
                        name: "powerRealtimeInfo",
                        src: "#/powerRealtimeInfo",
                        closable: true
                    },
                }
@@ -188,7 +188,7 @@
        },
        postData() {
            let userId = localStorage.getItem('userId');
            this.websock = new WebSocketClass(`/screen/powerAlarm/batteryGroup/${userId}`, this.wsMessage, 4000)
            this.websock = new WebSocketClass(`/screen/powerAlarm/batteryGroup/${userId}`, this.wsMessage)
        },
        wsMessage(res) {
            if (res.code == 1) {