提交内容

whychdw

2021-01-05 e38f6d61525cb345788bfa7a28d6aaadc4a62fcb

提交内容

 src/assets/js/const/const_9100.js

@@ -19,6 +19,10 @@
        {
            label: '内阻测试',
            value: 50
        },
        {
            label: '充电测试',
            value: 0x40,
        }
    ],
    dischargeRules: {

 src/assets/js/const/const_devType.js

New file
@@ -0,0 +1,50 @@
export default  {
    batt: [
        {
            value: 61850,
            label: '61850BTS'
        },
        {
            value: 9100,
            label: 'DCDCBTS'
        },
        {
            value: 9110,
            label: '假负载BTS'
        },
        {
            value: 9120,
            label: '逆变BTS'
        },
        {
            value: 71850,
            label: "71850BTS"
        },
        {
            value: 9605,
            label: "9605BTS"
        }
    ],
    power: [
        {
            value: 110,
            label: "电源系统",
        },
        {
            value: 111,
            label: "绝缘装置",
        },
        {
            value: 112,
            label: "充电机",
        },
        {
            value: 113,
            label: "空调系统",
        },
        {
            value: 114,
            label: "视频系统",
        },
    ]
};

 src/assets/js/const/index.js

@@ -9,6 +9,7 @@
import const_outline from "@/assets/js/const/const_outline";
import const_font from "@/assets/js/const/const_font";
import const_chart from "@/assets/js/const/const_chart";
import const_devType from "@/assets/js/const/const_devType"
export {
    const_9100,
    const_61850,
@@ -20,5 +21,6 @@
    const_plan,
    const_outline,
    const_font,
    const_chart
    const_chart,
    const_devType
};

 src/components/battGroupMager/AddBattGroup.vue

@@ -338,8 +338,9 @@

import  {
    const_province_city_county,
    const_battGroup
} from '../../assets/js/const'
    const_battGroup,
    const_devType
} from '@/assets/js/const'

import {
    searchProvince,
@@ -358,7 +359,7 @@
    },
    data() {
        let rules = const_battGroup.rules;

        let devTypes = const_devType.batt;
        return {
            layout: {
                span: 8,
@@ -551,32 +552,7 @@
                dialogVisible: false,
                value: '',
            },
            devTypes: [
                {
                    value: 61850,
                    label: '61850BTS'
                },
                {
                    value: 9100,
                    label: 'DCDCBTS'
                },
                {
                    value: 9110,
                    label: '假负载BTS'
                },
                {
                    value: 9120,
                    label: '逆变BTS'
                },
                {
                    value: 71850,
                    label: "71850BTS"
                },
                {
                    value: 9605,
                    label: "9605BTS"
                }
            ]
            devTypes: devTypes
        };
    },
    methods: {

 src/components/chart/LineChart.vue

@@ -1,10 +1,10 @@
<template>
  <div class="e-chart-root" @dblclick="fullScreen" :class="{'full-screen': fullScreenState}">
    <div class="e-chart-container">
      <div class="e-chart" :id="id" :ref="id"></div>
    <div class="e-chart-root" @dblclick="fullScreen" :class="{'full-screen': fullScreenState}">
        <div class="e-chart-container">
            <div class="e-chart" :id="id" :ref="id"></div>
        </div>
        <!-- <object ref="resizeBox" tabindex="-1" type="text/html" aria-hidden='true' data="about:blank" class="resize-box"></object> -->
    </div>
    <!-- <object ref="resizeBox" tabindex="-1" type="text/html" aria-hidden='true' data="about:blank" class="resize-box"></object> -->
  </div>
</template>

<script>
@@ -30,204 +30,212 @@
//import EleResize from "./theme/EleResize.js";

export default {
  props: {
    id: {
      type: String,
      required: true,
    },
    unit: {
      type: String,
      default: '',
    }
  },
  data() {
    return {
      fullScreenState: false,
    }
  },
  methods: {
    getOption(opt) {
      let unit = this.unit;
      // 整体配置项
      let option = {
        animation: false,
        color: this.getColor(opt),
        title: this.getTitle(opt),
        tooltip: this.getTooltip(opt),
        grid: {
          left: '1%',
          right: '1%',
          bottom: '2%',
          containLabel: true
    props: {
        id: {
            type: String,
            required: true,
        },
        legend: this.getLegend(opt),
        xAxis: this.getXAxis(opt),
        yAxis: [{
          type: 'value',
          splitLine: {
            show: true,
          },
          min: function (data) {
            let min = data.min;
            if (min == Infinity) {
              return 0;
            }
            if (min > 0) {
              return Math.floor(min * 0.9);
            } else {
              return Math.floor(min * 1.01);
            }

          },
          max: function (data) {
            let max = data.max;
            if (max == -Infinity) {
              return 1;
            }
            return Math.ceil(max * 1.01);
          }
        }],
        series: this.getSeries(opt),
      };
      return option;
    },
    setOption(opt) {
      let option = this.getOption(opt);
      // 清理画布
      this.$G.chartManage.get(this.id).clear();
      // 设置配置项
      this.$G.chartManage.get(this.id).setOption(option);
    },
    getColor(opt) { // 配置自定义颜色
      // 未配置自定义颜色
      if (!opt || !opt.color) {
        return []
      }

      // 返回颜色
      return opt.color;
    },
    getTitle(opt) { // 配置标题
      // 未配置标题
      if (!opt || !opt.title) {
        return {
          show: false,
        };
      }

      // 返回标题
      return opt.title;
    },
    getTooltip(opt) { // 配置标题
      // 未配置标题
      if (!opt || !opt.tooltip) {
        return {
          trigger: 'axis',
          axisPointer: { // 坐标轴指示器，坐标轴触发有效
            type: 'line' // 默认为直线，可选为：'line' | 'shadow'
          },
          appendToBody: true,
          // formatter(params) {
          //     var res = params[0].name + '<br/>';
          //     params.forEach(item => {
          //         res += item.marker;
          //         res += item.seriesName;
          //         res += ' : ' + item.data[1] + unit + '</br>';
          //     });
          //     return res;
          // }
        };
      }

      // 返回标题
      return opt.tooltip;
    },
    getLegend(opt) {
      // 未配置legend
      if (!opt || !opt.legend) {
        return {
          show: false,
        unit: {
            type: String,
            default: '',
        }
      }
    },
    data() {
        return {
            fullScreenState: false,
        }
    },
    methods: {
        getOption(opt) {
            let unit = this.unit;
            // 整体配置项
            let option = {
                animation: false,
                color: this.getColor(opt),
                title: this.getTitle(opt),
                tooltip: this.getTooltip(opt),
                grid: {
                    left: '1%',
                    right: '1%',
                    bottom: '2%',
                    containLabel: true
                },
                legend: this.getLegend(opt),
                xAxis: this.getXAxis(opt),
                yAxis: this.getYAxis(opt),
                series: this.getSeries(opt),
            };
            return option;
        },
        setOption(opt) {
            let option = this.getOption(opt);
            console.log(option);
            // 清理画布
            this.$G.chartManage.get(this.id).clear();
            // 设置配置项
            this.$G.chartManage.get(this.id).setOption(option);
        },
        getColor(opt) { // 配置自定义颜色
            // 未配置自定义颜色
            if (!opt || !opt.color) {
                return []
            }

      return opt.legend;
    },
    getXAxis(opt) {
      // 未配置x轴
      if (!opt || !opt.xAxis) {
        return [{
          type: 'category',
          boundaryGap: 0,
          axisLine: {
            onZero: false
          }
        }]
      }
            // 返回颜色
            return opt.color;
        },
        getTitle(opt) { // 配置标题
            // 未配置标题
            if (!opt || !opt.title) {
                return {
                    show: false,
                };
            }

      return opt.xAxis;
    },
    getSeries(opt) { // 设置series
      // 未配置series
      if (!opt || !opt.series) {
        return [];
      }
      // 设置配置项
      let series = opt.series.map(item => {
        // 设置类型
        item.type = "line";
        // 设置平滑的线条，关闭圆圈，设置采样点
        item.smooth = true;
        item.symbolSize = 0;
        item.sampling = 'average';
        return item;
      });
      // 返回
      return series;
    },
    getMax(list) {
      let arr = list.map(item => {
        return item[1];
      });
      return Math.max.apply(null, arr);
    },
    getMin(list) {
      let arr = list.map(item => {
        return item[1];
      });
      return Math.min.apply(null, arr);
    },
    fullScreen() {
      this.fullScreenState = this.fullScreenState ? false : true;
      this.$nextTick(() => {
        // 重置大小
        this.$G.chartManage.get(this.id).resize();
      });
    },
    resize() {
      // 重置大小
      this.$G.chartManage.get(this.id).resize();
    },
  },
  mounted() {
    // 基于准备好的dom，初始化echarts实例
    let chart = ECharts.init(this.$refs[this.id], 'transparent');
    // 将图表添加到图表管理
    this.$G.chartManage.set(this.id, chart);
    // 设置配置项
    this.setOption();
            // 返回标题
            return opt.title;
        },
        getTooltip(opt) { // 配置标题
            // 未配置标题
            if (!opt || !opt.tooltip) {
                return {
                    trigger: 'axis',
                    axisPointer: { // 坐标轴指示器，坐标轴触发有效
                        type: 'line' // 默认为直线，可选为：'line' | 'shadow'
                    },
                    appendToBody: true,
                    // formatter(params) {
                    //     var res = params[0].name + '<br/>';
                    //     params.forEach(item => {
                    //         res += item.marker;
                    //         res += item.seriesName;
                    //         res += ' : ' + item.data[1] + unit + '</br>';
                    //     });
                    //     return res;
                    // }
                };
            }

    let resizeDiv = document.getElementById(this.id)
    //监听拖拽和改变大小时echart自适应
    let listener = () => {
      chart.resize()
            // 返回标题
            return opt.tooltip;
        },
        getLegend(opt) {
            // 未配置legend
            if (!opt || !opt.legend) {
                return {
                    show: false,
                }
            }

            return opt.legend;
        },
        getXAxis(opt) {
            // 未配置x轴
            if (!opt || !opt.xAxis) {
                return [{
                    type: 'category',
                    boundaryGap: 0,
                    axisLine: {
                        onZero: false
                    }
                }]
            }

            return opt.xAxis;
        },
        getYAxis(opt) {
            // 未配置x轴
            if (!opt || !opt.yAxis) {
                return [{
                    type: 'value',
                    splitLine: {
                        show: true,
                    },
                    min: function (data) {
                        let min = data.min;
                        if (min == Infinity) {
                            return 0;
                        }
                        if (min > 0) {
                            return Math.floor(min * 0.9);
                        } else {
                            return Math.floor(min * 1.01);
                        }

                    },
                    max: function (data) {
                        let max = data.max;
                        if (max == -Infinity) {
                            return 1;
                        }
                        return Math.ceil(max * 1.01);
                    }
                }];
            }
            return opt.yAxis;
        },
        getSeries(opt) { // 设置series
            // 未配置series
            if (!opt || !opt.series) {
                return [];
            }
            // 设置配置项
            let series = opt.series.map(item => {
                // 设置类型
                item.type = "line";
                // 设置平滑的线条，关闭圆圈，设置采样点
                item.smooth = item.smooth == undefined?true: item.smooth;
                item.symbolSize = item.symbolSize == undefined?0:item.symbolSize;
                item.sampling = 'average';
                return item;
            });
            // 返回
            return series;
        },
        getMax(list) {
            let arr = list.map(item => {
                return item[1];
            });
            return Math.max.apply(null, arr);
        },
        getMin(list) {
            let arr = list.map(item => {
                return item[1];
            });
            return Math.min.apply(null, arr);
        },
        fullScreen() {
            this.fullScreenState = this.fullScreenState ? false : true;
            this.$nextTick(() => {
                // 重置大小
                this.$G.chartManage.get(this.id).resize();
            });
        },
        resize() {
            // 重置大小
            this.$G.chartManage.get(this.id).resize();
        },
    },
    mounted() {
        // 基于准备好的dom，初始化echarts实例
        let chart = ECharts.init(this.$refs[this.id], 'transparent');
        // 将图表添加到图表管理
        this.$G.chartManage.set(this.id, chart);
        // 设置配置项
        this.setOption();

        let resizeDiv = document.getElementById(this.id)
        //监听拖拽和改变大小时echart自适应
        let listener = () => {
            chart.resize()
        }
        //EleResize.on(resizeDiv, listener)

        // // 容器大小发生变化
        // this.$refs.resizeBox.contentDocument.defaultView.addEventListener('resize', () => {
        //     chart.resize();
        // });
    }
    //EleResize.on(resizeDiv, listener)

    // // 容器大小发生变化
    // this.$refs.resizeBox.contentDocument.defaultView.addEventListener('resize', () => {
    //     chart.resize();
    // });
  }
}
</script>

@@ -235,32 +243,32 @@
.e-chart-root,
.e-chart-container,
.e-chart {
  height: 100%;
  box-sizing: border-box;
    height: 100%;
    box-sizing: border-box;
}

.e-chart-root.full-screen .e-chart-container {
  position: fixed;
  top: 0;
  left: 0;
  right: 0;
  bottom: 0;
  background-size: 100% 100%;
  z-index: 9999;
    position: fixed;
    top: 0;
    left: 0;
    right: 0;
    bottom: 0;
    background-size: 100% 100%;
    z-index: 9999;
}

.resize-box {
  display: block;
  position: absolute;
  top: 0px;
  left: 0px;
  width: 100%;
  height: 100%;
  border: none;
  padding: 0px;
  margin: 0px;
  opacity: 0;
  z-index: -1000;
  pointer-events: none
    display: block;
    position: absolute;
    top: 0px;
    left: 0px;
    width: 100%;
    height: 100%;
    border: none;
    padding: 0px;
    margin: 0px;
    opacity: 0;
    z-index: -1000;
    pointer-events: none
}
</style>

 src/components/params/BTS/DischargeParams.vue

@@ -250,6 +250,7 @@
                    // 设置的命令和dev_id
                    this.params.num = this.cmd.set;
                    this.params.dev_id = this.batt.FBSDeviceId;
                    this.params.BattGroupNum = this.otherParams.GroupIndexInFBSDevice;
                    this.$layer.msg('读取成功！');
                    // 设置按钮可点击
                    this.setTestFlag = true;

 src/pages/dataMager/components/IsolatingDeviceTabPane.vue

@@ -183,6 +183,15 @@
        }
    },
    data() {
        let resLineConfig = {
            axisLineColor: "#125984",
            axisLineType: 'dashed',
            axisLabelColor: '#fff',
            line1Color: "#90ED7D",
            line2Color: '#F69F41',
            lineType: 'dashed',

        };
        return {
            branchNumber: [
                {name: '模块1', value: '???'},
@@ -269,10 +278,137 @@
                value: 10,
                unit: 'Ω',
                max: 50,
            }
            },
            resLine: {
                tooltip:  {
                    show: false
                },
                xAxis: [{
                    type: 'category',
                    boundaryGap: 0,
                    axisLine: {
                        onZero: false,
                        lineStyle: {
                            color: resLineConfig.axisLineColor,
                            type: resLineConfig.axisLineType,
                        },
                    },
                    axisTick: {
                        show: false,
                    },
                    axisLabel: {
                        color: resLineConfig.axisLabelColor,
                    },
                    splitLine: {
                        show: true,
                        lineStyle: {
                            color: resLineConfig.axisLineColor,
                            type: resLineConfig.axisLineType,
                        },
                    },
                }],
                yAxis: [{
                    type: 'value',
                    axisLine: {
                        lineStyle: {
                            color: resLineConfig.axisLineColor,
                            type: resLineConfig.axisLineType,
                        },
                    },
                    axisTick: {
                        show: false,
                    },
                    axisLabel: {
                        color: resLineConfig.axisLabelColor,
                    },
                    splitLine: {
                        show: true,
                        lineStyle: {
                            color: resLineConfig.axisLineColor,
                            type: resLineConfig.axisLineType,
                        },
                    },
                    max: function (data) {
                        let max = data.max;
                        if (max == -Infinity) {
                            return 1;
                        }
                        return Math.ceil(max * 1.01);
                    }
                }],
                series: [
                    {
                        name: '绝缘监测模块支路正对地电阻',
                        smooth: false,
                        symbol: 'circle',
                        symbolSize: 8,
                        data: [
                            ['模块1', 10],
                            ['模块2', 20],
                            ['模块3', 10],
                            ['模块4', 20],
                            ['模块5', 10],
                            ['模块6', 20],
                            ['模块7', 10],
                            ['模块8', 20],
                            ['模块9', 10],
                            ['模块10', 20],
                            ['模块11', 10],
                            ['模块12', 20],
                            ['模块13', 10],
                            ['模块14', 20],
                            ['模块15', 10],
                            ['模块16', 20],
                        ],
                        itemStyle: {
                            normal:  {
                                color: resLineConfig.line1Color
                            },
                        },
                        lineStyle: {
                            color: resLineConfig.line1Color,
                            type: resLineConfig.lineType
                        }
                    },
                    {
                        name: '绝缘监测模块支路负对地电阻',
                        smooth: false,
                        symbol: 'circle',
                        symbolSize: 8,
                        data: [
                            ['模块1', 5],
                            ['模块2', 8],
                            ['模块3', 10],
                            ['模块4', 12],
                            ['模块5', 10],
                            ['模块6', 20],
                            ['模块7', 30],
                            ['模块8', 21],
                            ['模块9', 22],
                            ['模块10', 28],
                            ['模块11', 19],
                            ['模块12', 15],
                            ['模块13', 10],
                            ['模块14', 7],
                            ['模块15', 8],
                            ['模块16', 10],
                        ],
                        itemStyle: {
                            normal:  {
                                color: resLineConfig.line2Color,
                            },
                        },
                        lineStyle: {
                            color: resLineConfig.line2Color,
                            type: resLineConfig.lineType
                        }
                    },
                ]
            },
        }
    },
    mounted() {
        this.$refs.resLine.setOption(this.resLine);
        this.resize();
    },
    methods: {

 src/pages/dataTest/CircuitDiagram.vue

@@ -42,7 +42,9 @@
        :batt-curr="battCurr"
        :dev-temp="devTemp"
        :type="type"
        :update="update"></normal-circuit-diagram>
        :update="update"
        :drop-vol="dropVol"
        :contact-res="contactRes"></normal-circuit-diagram>
</template>

<script>
@@ -92,6 +94,14 @@
            type: String,
            default: ""
        },
        dropVol: {       // 导通压降
            type: [String, Number],
            default: 0
        },
        contactRes: {       // 接触器阻抗
            type: [String, Number],
            default: 0
        },
        batt: {
            type: Object,
            default() {

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

@@ -34,7 +34,15 @@
        update: {
            type: Boolean,
            default: true,
        }
        },
        dropVol: {       // 导通压降
            type: [String, Number],
            default: 0
        },
        contactRes: {       // 接触器阻抗
            type: [String, Number],
            default: 0
        },
    },
    watch: {
        onlineVol(val) {
@@ -58,6 +66,12 @@
            }else {
                diagram.stop();
            }
        },
        dropVol(val) {
            diagram.setOption('dropVol', 'text', '导通压降:'+val+'V');
        },
        contactRes(val) {
            diagram.setOption('contactRes', 'text', '接触器阻抗:'+val+'mΩ');
        }
    },
    methods: {
@@ -67,6 +81,8 @@
            diagram.setOption('groupVol', 'text', this.groupVol+'V');
            diagram.setOption('battCurr', 'text', this.battCurr+'A');
            diagram.setOption('devTemp', 'text', '设备温度：'+this.devTemp+'℃');
            diagram.setOption('dropVol', 'text', '导通压降:'+this.dropVol+'V');
            diagram.setOption('contactRes', 'text', '接触器阻抗:'+this.contactRes+'mΩ');

            // 设置更新状态
            if(!this.update) {

 src/pages/dataTest/diagrams/normal/js/circuitDiagram.js

@@ -719,5 +719,27 @@
        point: [diagram.width/2, 10],
        text: '设备未连接',
    });

    let line132 = diagram.getOption('line132').points;
    // 设置导通压降
    diagram.text({
        id: 'dropVol',
        flush: true,
        fontSize: 16,
        align: 'left',
        point: [line132[1][0]+20, line132[1][1]+30],
        text: '导通压降:0V',
    });

    // 设置接触器阻抗
    let line14 = diagram.getOption('line14').points;
    diagram.text({
        id: 'contactRes',
        flush: true,
        fontSize: 16,
        align: 'left',
        point: [line14[0][0]+10, line14[0][1]+10],
        text: '接触器阻抗:0mΩ',
    });
}
export default circuitDiagram;

 src/pages/dataTest/movingRingSystem/HomeList.vue

@@ -4,7 +4,7 @@
    toggle
    @toggleChange="toggleChange"
    class="siteList context-box-w">
        <box-tools slot="box-tools" :batt="batt"></box-tools>
<!--        <box-tools slot="box-tools" :batt="batt"></box-tools>-->
        <flex-layout>
            <div slot="header">
                <el-select 
@@ -38,7 +38,6 @@
import pinyinMatch from 'pinyin-match'
import ContentBox from '@/components/ContentBox'
import MyElTree from '@/components/MyElTree'
import BoxTools from "@/pages/dataTest/BoxTools";

import {
   searchStation,
@@ -52,7 +51,6 @@

export default {
    components: {
        BoxTools,
        ContentBox,
        MyElTree,
    },

 src/pages/dataTest/realTime.vue

@@ -132,7 +132,7 @@
                            </science-box>
                            <circuit-diagram :batt="batt" :online-vol="inputs.online_vol" :group-vol="inputs.group_vol"
                                :batt-curr="inputs.group_curr" :dev-temp="diagram.temp" :type="diagram.type" :update="diagram.update"
                                :version="dev_version"></circuit-diagram>
                                :version="dev_version" :contact-res="diagram.contactRes" :drop-vol="diagram.dropVol"></circuit-diagram>
                        </el-tab-pane>
                        <el-tab-pane label="电压" name="vol">
                            <bar-chart ref="vol" id="vol" unit="V" right-menu></bar-chart>
@@ -231,7 +231,6 @@
    import RightMenu from "@/components/RightMenu";
    import NiBian from "@/pages/dataTest/dialogs/NiBian";
    import StopCuring from "@/pages/dataTest/dialogs/StopCuring";
    import NiBianInfo from "@/pages/dataTest/components/NiBianInfo";
    import NiBianInfoTab from "@/pages/dataTest/components/NiBianInfoTab";
    import {
        realTimeSearch,
@@ -367,6 +366,8 @@
                    desc: "",
                    powerCut: 1,
                    temp: 0, // 设备温度
                    contactRes: 0, // 接触器阻抗
                    dropVol: 0, // 导通压降
                },
                dischargeDialog: {
                    show: false,
@@ -1054,6 +1055,7 @@
                        let data = rs.data[0];
                        // 设置版本号
                        this.dev_version = data.dev_version;
                        console.log(data);
                        // 基础信息
                        this.setEquipBase(data);

@@ -1103,8 +1105,11 @@
            },
            // 基础信息
            setEquipBase(data) {
                let groupIndex = this.batt.GroupIndexInFBSDevice;
                // 设备的温度
                this.diagram.temp = data.dev_temp;
                this.diagram.contactRes = groupIndex!=0?data.dev_conresist1:data.dev_conresist;
                this.diagram.dropVol = groupIndex!=0?data.dev_condvoldp:data.dev_condvoldp1;
            },
            // BTS设备信息
            setEquipBTS(data) {