修改内容

whychdw

2019-09-05 a021b459247a5cf825c2a132f3da1e5d31e8037c

修改内容

 dist/index.html

@@ -34,7 +34,7 @@
    
    <script src="index.js"></script>
    <script src="js/lazyload.js"></script>
    <script src="js/load_lazy.js?bce3841820"></script>
    <script src="js/load_lazy.js?4eb0eb411a"></script>
</body>

</html>

 dist/js/components.js

@@ -325,6 +325,11 @@
        };
    },

    watch: {
        height: function height(value) {
            this.chart.setSize(undefined, value);
        }
    },
    methods: {
        init: function init() {
            var self = this;

 dist/pages/battery/batteryInfo.html

@@ -56,26 +56,24 @@
                        
                    </ul>
                </div>
                <div class="bui-tab-main">
                <div class="bui-tab-main" ref="tabMain">
                    <ul>
                        
                        <li>
                            <iview-table height="370" style="margin-top:8px;margin-left:0;margin-right:0" :columns="tbls.monList.columns" :data="tbls.monList.data"></iview-table>
                            <iview-table :height="getTabHt()" style="margin-top:8px;margin-left:0;margin-right:0" :columns="tbls.monList.columns" :data="tbls.monList.data"></iview-table>
                        </li>
                        <li style="display:none">
                            <iview-table style="margin-top:8px;margin-left:0;margin-right:0" :columns="tbls.totalInfo.columns" :data="tbls.totalInfo.data"></iview-table>
                        </li>
                        <li style="display:none">
                            <high-bar-chart height="370px" id="monVolBar" name="电压" unit="V" ref="monVolBar"></high-bar-chart>
                            <high-bar-chart :height="getTabHt('px')" id="monVolBar" name="电压" unit="V" ref="monVolBar"></high-bar-chart>
                        </li>
                        <li style="display:none">
                            <high-bar-chart height="370px" id="monResBar" name="内阻" unit="mΩ" ref="monResBar"></high-bar-chart>
                            <high-bar-chart :height="getTabHt('px')" id="monResBar" name="内阻" unit="mΩ" :colors="{min:'#19be6b', max: '#ed4014'}" ref="monResBar"></high-bar-chart>
                        </li>
                        <li style="display:none">
                            <high-bar-chart height="370px" id="monTmpBar" name="温度" unit="℃" :colors="{min:'#19be6b', max: '#ed4014'}" ref="monTmpBar"></high-bar-chart>
                            <high-bar-chart :height="getTabHt('px')" id="monTmpBar" name="温度" unit="℃" :colors="{min:'#19be6b', max: '#ed4014'}" ref="monTmpBar"></high-bar-chart>
                        </li>
                        <li style="display:none">当前告警</li>
                        <li style="display:none">测试数据</li>
                    </ul>
                </div>
            </div>

 dist/pages/battery/batteryInfo.js

@@ -28,6 +28,9 @@
        var vm = this.vm = new Vue({
            el: bs.$el[0],
            data: {
                block: {
                    tabMain: 0
                },
                params: params,
                title: '未知',
                timer: {
@@ -398,6 +401,18 @@
                    // 关闭页面的计时器
                    this.timer.rtState.stop();
                    this.timer.rtData.stop();
                },
                setBlock: function setBlock() {
                    this.block.tabMain = this.$refs.tabMain.offsetHeight;
                },
                getTabHt: function getTabHt(unit) {
                    var result = 0;
                    if (unit) {
                        result = this.block.tabMain - 5 + unit;
                    } else {
                        result = this.block.tabMain - 10;
                    }
                    return result;
                }
            },
            computed: {
@@ -434,6 +449,10 @@
                });

                this.startSearch();
                setTimeout(function () {
                    // 设置模块的高度
                    self.setBlock();
                }, 10);
            },
            beforeDestroy: function beforeDestroy() {
                this.stopTimers();

 dist/pages/main/main.html

@@ -1,9 +1,9 @@

<div class="bui-page" id="main">
    <main>
    <main ref="main">
        
        <div class="main-inner">
            <ul class="bui-list bui-fluid exammine">
            <ul class="bui-list bui-fluid exammine" ref="block1">
                <li class="bui-btn bui-box span3" @click="handlerTabs('menu')">
                    <div class="thumbnail success"><i class="icon">&#xe665;</i></div>
                    <div class="span1">
@@ -75,17 +75,17 @@
                    </ul>
                </div>
                <div class="tab-item" v-show="tabs.alarm" style="display:none">
                    <iview-table :columns="tbls.alarm.columns" :data="tbls.alarm.data" :title="tbls.alarm.title" height="430" style="margin:0"></iview-table>
                    <div class="tbl-page mt8" style="text-align:center">
                    <iview-table :columns="tbls.alarm.columns" :data="tbls.alarm.data" :title="tbls.alarm.title" :height="getAlarmHt()" style="margin:0"></iview-table>
                    <div class="tbl-page mt8" style="text-align:center" ref="alarmBlock1">
                        <i-button type="info" @click="pre('alarm')" :disabled="tbls.alarm.pageBtn.pre">上一页</i-button>
                        <i-button type="info" class="ml8" @click="next('alarm')" :disabled="tbls.alarm.pageBtn.next">下一页</i-button>
                    </div>
                </div>
                <div class="tab-item" v-show="tabs.charge" style="display:none">
                    <iview-table :columns="tbls.charge.columns" :data="tbls.charge.data" :title="tbls.charge.title" height="460" style="margin:0"></iview-table>
                    <iview-table :columns="tbls.charge.columns" :data="tbls.charge.data" :title="tbls.charge.title" :height="getTblHt()" style="margin:0"></iview-table>
                </div>
                <div class="tab-item" v-show="tabs.discharge" style="display:none">
                    <iview-table :columns="tbls.discharge.columns" :data="tbls.discharge.data" :title="tbls.discharge.title" height="460" style="margin:0"></iview-table>
                    <iview-table :columns="tbls.discharge.columns" :data="tbls.discharge.data" :title="tbls.discharge.title" :height="getTblHt()" style="margin:0"></iview-table>
                </div>
            </div>
        </div>

 dist/pages/main/main.js

@@ -14,6 +14,11 @@
    var vm = new Vue({
        el: bs.$el[0],
        data: {
            block: {
                main: 0,
                block1: 0,
                alarmBlock1: 0
            },
            numbers: {
                alarms: 0,
                charge: 0,
@@ -456,6 +461,26 @@
                    url: '../battery/batteryInfo.html',
                    param: param
                });
            },
            setBlock: function setBlock() {
                var main = this.$refs.main.offsetHeight;
                var block1 = this.$refs.block1.offsetHeight;
                var alarmBlock1 = this.$refs.alarmBlock1.offsetHeight;
                this.block.main = main;
                this.block.block1 = block1;
                this.block.alarmBlock1 = alarmBlock1;
            },
            getAlarmHt: function getAlarmHt() {
                return this.getTblHt() - 45;
            },
            getTblHt: function getTblHt() {
                return this.block.main - this.block.block1 - 40;
            }
        },
        computed: {
            getAlarmHt: function getAlarmHt() {

                return 400;
            }
        },
        mounted: function mounted() {
@@ -470,6 +495,7 @@

            // 查询告警，充电，放电的数目
            this.searchNums();
            this.setBlock();
        },
        destroyed: function destroyed() {}
    });

 dist/pages/warn/warn.html

@@ -18,19 +18,19 @@
                    <li class="bui-btn">历史告警</li>
                </ul>
            </div>
            <div class="bui-tab-main">
            <div class="bui-tab-main" ref="tabMain">
                <ul>
                    
                    <li>
                        <iview-table :columns="currTbl.columns" :data="currTbl.data" height="380" style="margin:0"></iview-table>
                        <div class="tbl-page mt8" style="text-align:center">
                        <div class="tbl-page mt8" style="text-align:center" ref="currBlock1">
                            <i-button type="info" @click="pre('alarm')" :disabled="currTbl.pageBtn.pre">上一页</i-button>
                            <i-button type="info" class="ml8" @click="next('alarm')" :disabled="currTbl.pageBtn.next">下一页</i-button>
                        </div>
                    </li>
                    <li style="display:none">
                        <iview-table :columns="hisTbl.columns" :data="hisTbl.data" height="380" style="margin:0"></iview-table>
                        <div class="tbl-page mt8" style="text-align:center">
                        <div class="tbl-page mt8" style="text-align:center" ref="hisBlock1">
                            <i-button type="info" @click="pre('his')" :disabled="hisTbl.pageBtn.pre">上一页</i-button>
                            <i-button type="info" class="ml8" @click="next('his')" :disabled="hisTbl.pageBtn.next">下一页</i-button>
                        </div>

 src/js/components.js

@@ -386,6 +386,11 @@
            chart: ''
        }
    },
    watch: {
        height: function(value) {
            this.chart.setSize(undefined, value);
        }
    },
    methods: {
        init: function() {
            var self = this;

 src/js/load_lazy.js

@@ -8,7 +8,7 @@
  lazyload.js([ 
        // 'js/zepto.js',
        // 'js/bui.js',
        'js/echarts.min.js',
        // 'js/echarts.min.js',
        'css/highchart/highcharts.js',
        // 'js/const_var.js',
        // 'js/common_functions.js',

 src/pages/battery/batteryInfo.html

@@ -57,12 +57,12 @@
                        <li class="bui-btn">测试数据</li> -->
                    </ul>
                </div>
                <div class="bui-tab-main">
                <div class="bui-tab-main" ref="tabMain">
                    <ul>
                        <!-- 内容必须在li里面 -->
                        <li>
                            <iview-table
                            height="370"
                            :height="getTabHt()"
                            style="margin-top: 8px; margin-left: 0; margin-right: 0;"
                            :columns="tbls.monList.columns"
                            :data="tbls.monList.data"></iview-table>
@@ -75,28 +75,27 @@
                        </li>
                        <li style="display: none">
                            <high-bar-chart 
                            height="370px"
                            :height="getTabHt('px')"
                            id="monVolBar"
                            name="电压" unit="V" 
                            ref="monVolBar"></high-bar-chart>
                        </li>
                        <li style="display: none">
                            <high-bar-chart 
                            height="370px"
                            :height="getTabHt('px')"
                            id="monResBar"
                            name="内阻" unit="mΩ" 
                            :colors="{min:'#19be6b', max: '#ed4014'}"
                            ref="monResBar"></high-bar-chart>
                        </li>
                        <li style="display: none">
                            <high-bar-chart 
                            height="370px"
                            :height="getTabHt('px')"
                            id="monTmpBar"
                            name="温度" unit="℃"
                            :colors="{min:'#19be6b', max: '#ed4014'}" 
                            ref="monTmpBar"></high-bar-chart>
                        </li>
                        <li style="display: none">当前告警</li>
                        <li style="display: none">测试数据</li>
                    </ul>
                </div>
            </div>

 src/pages/battery/batteryInfo.js

@@ -26,6 +26,9 @@
        var vm = this.vm = new Vue({
            el: bs.$el[0],
            data: {
                block: {
                    tabMain: 0,
                },
                params: params,
                title: '未知',
                timer: {
@@ -422,6 +425,18 @@
                    // 关闭页面的计时器
                    this.timer.rtState.stop();
                    this.timer.rtData.stop();
                },
                setBlock: function() {
                    this.block.tabMain = this.$refs.tabMain.offsetHeight;
                },
                getTabHt: function(unit) {
                    var result = 0;
                    if(unit) {
                        result = this.block.tabMain - 5+unit;
                    }else {
                        result = this.block.tabMain - 10;
                    }
                    return result;
                }
            },
            computed: {
@@ -458,6 +473,10 @@
                });

                this.startSearch();
                setTimeout(function() {
                    // 设置模块的高度
                    self.setBlock();
                }, 10);
            },
            beforeDestroy() {
                this.stopTimers();

 src/pages/main/main.html

@@ -1,9 +1,9 @@
<!-- 这里还是一个标准的BUI页面 -->
<div class="bui-page" id="main">
    <main>
    <main ref="main">
        <!-- 中间内容 -->
        <div class="main-inner">
            <ul class="bui-list bui-fluid exammine">
            <ul class="bui-list bui-fluid exammine" ref="block1">
                <li class="bui-btn bui-box span3" @click="handlerTabs('menu')">
                    <div class="thumbnail success"><i class="icon">&#xe665;</i></div>
                    <div class="span1">
@@ -79,9 +79,9 @@
                    :columns="tbls.alarm.columns"
                    :data="tbls.alarm.data"
                    :title="tbls.alarm.title"
                    height="430"
                    :height="getAlarmHt()"
                    style="margin: 0"></iview-table>
                    <div class="tbl-page mt8" style="text-align: center">
                    <div class="tbl-page mt8" style="text-align: center" ref="alarmBlock1">
                        <i-button 
                        type="info" 
                        @click="pre('alarm')"
@@ -94,7 +94,7 @@
                    :columns="tbls.charge.columns"
                    :data="tbls.charge.data"
                    :title="tbls.charge.title"
                    height="460"
                    :height="getTblHt()"
                    style="margin: 0"></iview-table>
                </div>
                <div class="tab-item" v-show="tabs.discharge" style="display: none">
@@ -102,7 +102,7 @@
                    :columns="tbls.discharge.columns"
                    :data="tbls.discharge.data"
                    :title="tbls.discharge.title"
                    height="460"
                    :height="getTblHt()"
                    style="margin: 0"></iview-table>
                </div>
            </div>

 src/pages/main/main.js

@@ -12,6 +12,11 @@
    var vm =new Vue({
        el: bs.$el[0],
        data: {
            block: {
                main: 0,
                block1: 0,
                alarmBlock1: 0
            },
            numbers: {
                alarms: 0,
                charge: 0,
@@ -477,6 +482,26 @@
                    url: '../battery/batteryInfo.html',
                    param: param
                });
            },
            setBlock: function() {
                var main = this.$refs.main.offsetHeight;
                var block1 = this.$refs.block1.offsetHeight;
                var alarmBlock1 = this.$refs.alarmBlock1.offsetHeight;
                this.block.main = main;
                this.block.block1 = block1;
                this.block.alarmBlock1 = alarmBlock1;
            },
            getAlarmHt: function() {
                return this.getTblHt() - 45;
            },
            getTblHt: function() {
                return this.block.main - this.block.block1 - 40;
            }
        },
        computed: {
            getAlarmHt: function() {
                
                return 400;
            }
        },
        mounted() {
@@ -491,6 +516,7 @@

            // 查询告警，充电，放电的数目
            this.searchNums();
            this.setBlock();
        },
        destroyed() {
            

 src/pages/warn/warn.html

@@ -18,7 +18,7 @@
                    <li class="bui-btn">历史告警</li>
                </ul>
            </div>
            <div class="bui-tab-main">
            <div class="bui-tab-main" ref="tabMain">
                <ul>
                    <!-- 内容必须在li里面 -->
                    <li >
@@ -27,7 +27,7 @@
                        :data="currTbl.data"
                        height="380"
                        style="margin: 0"></iview-table>
                        <div class="tbl-page mt8" style="text-align: center">
                        <div class="tbl-page mt8" style="text-align: center" ref="currBlock1">
                            <i-button 
                            type="info" 
                            @click="pre('alarm')"
@@ -45,7 +45,7 @@
                        :data="hisTbl.data"
                        height="380"
                        style="margin: 0"></iview-table>
                        <div class="tbl-page mt8" style="text-align: center">
                        <div class="tbl-page mt8" style="text-align: center" ref="hisBlock1">
                            <i-button 
                            type="info" 
                            @click="pre('his')"