whychdw
2021-07-31 ab0a09ee195c1d7e881b6590bba9f7fe44c354e5
充电单元为限流单元
7个文件已修改
45 ■■■■ 已修改文件
src/pages/dataTest/diagrams/grid/js/gridCircuitDiagram.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/dataTest/diagrams/load/js/loadCircuitDiagram.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/dataTest/diagrams/loadReverse/js/loadCircuitDiagram.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/dataTest/diagrams/normal/js/circuitDiagram.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/dataTest/movingRingSystem/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/dataTest/movingRingSystem/powerBox.vue 29 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/router/routes.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/dataTest/diagrams/grid/js/gridCircuitDiagram.js
@@ -141,7 +141,7 @@
    // 充电单元文本
    let charge_text = diagram.text({
        text: '充电单元',
        text: '限流单元',
        baseline: 'middle',
        fontSize: 16,
        point: [chargeState.right[0]+4, chargeState.right[1]]
src/pages/dataTest/diagrams/load/js/loadCircuitDiagram.js
@@ -130,7 +130,7 @@
    // 充电单元文本
    let charge_text = diagram.text({
        text: '充电单元',
        text: '限流单元',
        baseline: 'middle',
        fontSize: 16,
        hide: true,
@@ -296,7 +296,7 @@
    // 充电单元文本
    let chargeRectText = diagram.text({
        text: '充电单元',
        text: '限流单元',
        baseline: 'middle',
        fontSize: 16,
        point: [chargeStateRect.right[0]+4, chargeStateRect.right[1]]
src/pages/dataTest/diagrams/loadReverse/js/loadCircuitDiagram.js
@@ -130,7 +130,7 @@
    // 充电单元文本
    let charge_text = diagram.text({
        text: '充电单元',
        text: '限流单元',
        baseline: 'middle',
        fontSize: 16,
        hide: true,
@@ -296,7 +296,7 @@
    // 充电单元文本
    let chargeRectText = diagram.text({
        text: '充电单元',
        text: '限流单元',
        baseline: 'middle',
        fontSize: 16,
        point: [chargeStateRect.right[0]+4, chargeStateRect.right[1]]
src/pages/dataTest/diagrams/normal/js/circuitDiagram.js
@@ -128,7 +128,7 @@
    // 充电单元文本
    let charge_text = diagram.text({
        text: '充电单元',
        text: '限流单元',
        baseline: 'middle',
        fontSize: 16,
        point: [chargeState.right[0]+4, chargeState.right[1]]
src/pages/dataTest/movingRingSystem/index.vue
@@ -57,7 +57,7 @@
                        });
                    }else if(regEquipType(dev_id, 'power1')) {
                        this.$router.push({
                            path: '/moving-ring-system/power-box/' + data.BattGroupId + '/' + data.powerDeviceId,
                            path: '/moving-ring-system/power-box/'+ data.params.powerDeviceId,
                        });
                    } else {     // 404
                        this.$router.push({
src/pages/dataTest/movingRingSystem/powerBox.vue
@@ -412,11 +412,6 @@
        }
    },
    watch: {
        "$route.params.BattGroupId"(BattGroupId) {
            this.$nextTick(() => {
                this.getBattGroupInfo(BattGroupId);
            });
        },
        "$route.params.powerDeviceId"(powerDeviceId) {
            this.$nextTick(() => {
                this.getPowerInfo(powerDeviceId);
@@ -424,22 +419,6 @@
        },
    },
    methods: {
        getBattGroupInfo(BattGroupId) {
            this.homeListShow = false;
            this.$apis.dataMager.battGroupMager
                .getBattGroupInfo(BattGroupId)
                .then((res) => {
                    let rs = JSON.parse(res.data.result);
                    if (rs.code == 1) {
                        this.leafClick(rs.data[0]);
                    } else {
                        this.$layer.msg("未获取到电池组的信息");
                    }
                })
                .catch((error) => {
                    console.log(error);
                });
        },
        getPowerACDCConfigById() {
            let id = this.powerData.info.powerDeviceId;
            this.acDcSignalData = getAcDcSignalData();
@@ -612,9 +591,11 @@
            this.$apis.dataMager.powerMager.getInfoById({
                powerDeviceId: powerDeviceId
            }).then(res => {
                console.log(res);
                let rs = JSON.parse(res.data.result);
                if (rs.code == 1) {
                    this.powerData.info = rs.data;
                    this.batt.StationName = this.powerData.info.stationName;
                } else {
                    this.powerData.info = {
                        powerDeviceId: 0,
@@ -639,6 +620,7 @@
        getPowerBoxData() {
            let id = this.powerData.info.powerDeviceId;
            this.$apis.dataMager.powerMager.getPowerBoxData(id).then(res=>{
                console.log(res);
                let rs = JSON.parse(res.data.result);
                if(rs.code == 1) {
                    this.allSignal = 0;
@@ -977,11 +959,6 @@
        }
    },
    mounted() {
        let BattGroupId = this.$route.params.BattGroupId;
        if (BattGroupId) {
            this.getBattGroupInfo(BattGroupId);
        }
        // 获取电源信息
        let powerDeviceId = this.$route.params.powerDeviceId;
        if (powerDeviceId) {
src/router/routes.js
@@ -60,7 +60,7 @@
                component: (resolve) => require(['../pages/dataTest/realTimeAio.vue'], resolve)
            },
            {
                path: 'power-box/:BattGroupId/:powerDeviceId',
                path: 'power-box/:powerDeviceId',
                name: 'powerBox',
                meta: {},
                component: (resolve) => require(['../pages/dataTest/movingRingSystem/powerBox.vue'], resolve)