whychdw
2021-07-20 6bbc87ccbb94fbb487bd1d7f36e52fef0ed3f828
提交内容
7个文件已修改
102 ■■■■■ 已修改文件
src/assets/css/common.css 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/js/realTime.js 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/dataTest/components/NiBianInfoTab.vue 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/dataTest/diagrams/grid/index.vue 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/dataTest/diagrams/grid/js/diagramStates.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/dataTest/diagrams/grid/js/gridCircuitDiagram.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/dataTest/realTime.vue 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/css/common.css
@@ -242,6 +242,16 @@
    -webkit-object-fit: contain;
    object-fit: contain;
}
.diagram-mask {
    position: absolute;
    top: 0;
    left: 0;
    bottom: 0;
    right: 0;
    z-index: 10;
    background-color:#000;
    opacity: .4;
}
.flex-page-content {
    height: 100%;
src/assets/js/realTime.js
@@ -198,6 +198,23 @@
}
/**
 * 获取逆变的其他信息
 */
export const inversionData = (dev_id) => {
    // 构造查询条件
    let params = {
        dev_id: dev_id,
    };
    // 查询后台
    return axios({
        method: "post",
        url: "FBS9100sBuscoupleStateAction_action_searchDataByDevId",
        data: "json=" + JSON.stringify(params)
    });
}
/**
 * 查询历史实时数据
 * @param params    查询参数
 * @returns {AxiosPromise}
src/pages/dataTest/components/NiBianInfoTab.vue
@@ -1,5 +1,6 @@
<template>
    <div class="NiBianInfoTab">
        <div class="ni-bian-mask" v-show="maskShow"></div>
        <div class="NiBian-left">
            <chart-wrapper class="InCurrent">
                <div class="flex-Con">
@@ -111,12 +112,26 @@
    import CirclePieChart from "@/components/chart/CirclePieChart";
    import ArcMeterChart from "@/components/chart/ArcMeterChart.vue";
    import RingChart from "@/components/chart/ringChart.vue";
    import {
        inversionInfo
    } from "@/assets/js/realTime";
    import {
        inversionData,
        inversionInfo
    } from "@/assets/js/realTime";
    import {Timeout} from "@/assets/js/tools";
    export default {
        props: ['name', 'devId'],
        props: {
            name: {
                type: String,
                default: "",
            },
            devId: {
                type: [Number, String],
                default: "",
            },
            maskShow: {
                type: Boolean,
                default: false,
            },
        },
        components: {
            ChartWrapper,
            GaugeChart,
@@ -410,6 +425,7 @@
                this.timer.start(()=>{
                    this.$axios.all([
                        this.inversionInfo(),
                        this.inversionData(),
                    ]).then(()=>{
                        this.timer.open();
                    }).catch(error=>{
@@ -531,6 +547,19 @@
                    console.log(error);
                });
            },
            inversionData() {
                inversionData(this.devId).then(res=>{
                    let rs = JSON.parse(res.data.result);
                    console.log(rs);
                    if(rs.code == 1) {
                    }else {
                    }
                }).catch(error=>{
                });
            },
            setInfo() {
                if (this.name == 'niBianInfoTab') {
                    this.startSearch();
@@ -589,6 +618,7 @@
<style scoped>
    .NiBianInfoTab {
        position: relative;
        padding: 4px 12px 12px;
        width: 100%;
        height: 100%;
@@ -795,4 +825,14 @@
        width: 33.333%;
        height: 100%;
    }
    .ni-bian-mask {
        position: absolute;
        top: 0;
        left: 0;
        bottom: 0;
        right: 0;
        z-index: 10;
        background-color:#000;
        opacity: .4;
    }
</style>
src/pages/dataTest/diagrams/grid/index.vue
@@ -2,6 +2,7 @@
    <div class="diagram-content">
        <div class="diagram-stc" ref="static"></div>
        <div class="diagram-flush" ref="flush"></div>
        <div class="diagram-mask" v-show="maskShow"></div>
    </div>
</template>
@@ -35,6 +36,11 @@
        update: {
            type: Boolean,
            default: true,
        }
    },
    data() {
        return {
            maskShow: false,
        }
    },
    watch: {
@@ -76,9 +82,11 @@
        },
        setDiagramByType() {
            let type = this.type;
            this.maskShow = false;
            switch(type) {
                case -1:    // 设备断开
                    diagramStates(diagram, 'break');
                    this.maskShow = true;
                    break;
                case 0:     // 浮充
                    diagramStates(diagram, 'float');
@@ -115,4 +123,8 @@
        diagram.stop();
    }
}
</script>
</script>
<style scoped>
</style>
src/pages/dataTest/diagrams/grid/js/diagramStates.js
@@ -43,7 +43,7 @@
            powerCutDischarge(diagram);
        break;
        case 'break':
            diagram.setOption('type', 'text', '设备未连接');
            diagram.setOption('type', 'text', '设备未连接,数据不再刷新');
        break;
        default:
            console.log('默认状态');
src/pages/dataTest/diagrams/grid/js/gridCircuitDiagram.js
@@ -735,7 +735,7 @@
        fontSize: textFont,
        align: 'center',
        point: [diagram.width/2, 10],
        text: '设备未连接',
        text: '设备未连接,数据不再刷新',
    });
}
src/pages/dataTest/realTime.vue
@@ -233,7 +233,7 @@
                        </el-tab-pane>
                        <el-tab-pane label="逆变信息" name="niBianInfoTab" v-if="isNiBian">
                            <ni-bian-info-tab ref="niBianInfoTab" :name="acTabs" :devId="batt.FBSDeviceId">
                            <ni-bian-info-tab ref="niBianInfoTab" :name="acTabs" :devId="batt.FBSDeviceId" :mask-show="maskShow">
                            </ni-bian-info-tab>
                        </el-tab-pane>
                        <el-tab-pane label="均衡供电" name="jggdInfoTab" v-if="isJhgd">
@@ -389,6 +389,7 @@
            let isCanTest = isHasPermit("batt_test_op_permit", permits);
            let stateList = const_61850.stateList;
            return {
                maskShow: false,
                eleOffImg: require('../../assets/images/eleOff.png'),
                eleOnImg: require('../../assets/images/eleOn.png'),
                isCanTest: isCanTest,
@@ -1249,6 +1250,8 @@
                this.setStateList("stopReason", "未知");
                // 操作失败原因
                this.setStateList("failReason", "未知");
                // 显示遮罩层
                this.maskShow = true;
            },
            // 基础信息
            setEquipBase(data) {
@@ -1288,6 +1291,7 @@
                    }
                    return;
                }
                // 判断workstatus
                switch (workstatus) {
                    case 0:
@@ -1351,6 +1355,7 @@
                        break;
                    default:
                        this.diagram.type = -1;
                        this.maskShow = true;
                        break;
                }
            },
@@ -1408,6 +1413,7 @@
                        //未知
                        this.diagram.type = -1;
                        this.diagram.desc = "(未知)";
                        this.maskShow = true;
                        break;
                }
@@ -1495,6 +1501,7 @@
                        break;
                    default:
                        this.diagram.type = -1;
                        this.maskShow = true;
                        break;
                }
            },