内容提交

whychdw

2019-12-02 45ed54a219a8901f36c4571b129a655a6c151cd0

内容提交

 platforms/android/app/src/main/assets/www/pages/monitor-data/monitor-data.html

@@ -10,7 +10,7 @@
        </div>

    </header>

    <main>

        <el-drawer v-cloak :visible.sync="open" direction="ltr">

        <el-drawer v-cloak v-if="shows.drawer" :visible.sync="open" direction="ltr">

            <div class="heading" slot="title"><div class="center">电池组列表</div></div>

            <hdw-list :list="battList" @handle-click="listClick"></hdw-list>

        </el-drawer>

@@ -84,7 +84,7 @@
                <ul>

                    

                    <li ref="tabItemHt">

                        <el-table border stripe size="mini" header-row-class-name="header-primary" height="100%" :data="tbls.monInfo.data">

                        <el-table v-if="shows.monList" border stripe size="mini" header-row-class-name="header-primary" height="100%" :data="tbls.monInfo.data">

                            <el-table-column prop="num1" align="center" label="编号">

                            </el-table-column>

                            <el-table-column prop="vol1" align="center" label="电压（V）">

@@ -112,7 +112,7 @@
                        </el-table>

                    </li>

                    <li style="display:none">

                        <el-table border stripe size="mini" header-row-class-name="header-primary" height="100%" :data="tbls.total.data">

                        <el-table v-if="shows.total" border stripe size="mini" header-row-class-name="header-primary" height="100%" :data="tbls.total.data">

                            <el-table-column prop="type" align="center" width="120" label="类型">

                            </el-table-column>

                            <el-table-column prop="high" align="center" label="较高单体">

@@ -125,17 +125,17 @@
                    </li>

                    <li style="display:none">

                        <v-touch @swipeleft="handleNextBtn" @swiperight="handlePreBtn">

                            <high-bar-chart :height="options.monVol.height" id="monVolBar" name="单体电压" unit="V" :colors="{min:'#ed4014', max: '#19be6b'}" ref="monVolBar"></high-bar-chart>

                            <high-bar-chart v-if="shows.monVol" :height="options.monVol.height" id="monVolBar" name="单体电压" unit="V" :colors="{min:'#ed4014', max: '#19be6b'}" ref="monVolBar"></high-bar-chart>

                        </v-touch>

                    </li>

                    <li style="display:none">

                        <v-touch @swipeleft="handleNextBtn" @swiperight="handlePreBtn">

                            <high-bar-chart :height="options.monRes.height" id="monResBar" name="单体内阻" unit="mΩ" :colors="{min:'#ed4014', max: '#19be6b'}" ref="monResBar"></high-bar-chart>

                            <high-bar-chart v-if="shows.monRes" :height="options.monRes.height" id="monResBar" name="单体内阻" unit="mΩ" :colors="{min:'#ed4014', max: '#19be6b'}" ref="monResBar"></high-bar-chart>

                        </v-touch>

                    </li>

                    <li style="display:none">

                        <v-touch @swipeleft="handleNextBtn" @swiperight="handlePreBtn">

                            <high-bar-chart :height="options.monTmp.height" id="monTmpBar" name="单体温度" unit="℃" :colors="{min:'#19be6b', max: '#ed4014'}" ref="monTmpBar"></high-bar-chart>

                            <high-bar-chart v-if="shows.monTmp" :height="options.monTmp.height" id="monTmpBar" name="单体温度" unit="℃" :colors="{min:'#19be6b', max: '#ed4014'}" ref="monTmpBar"></high-bar-chart>

                        </v-touch>

                    </li>

                </ul>


 platforms/android/app/src/main/assets/www/pages/monitor-data/monitor-data.js

@@ -14,6 +14,14 @@
        this.vm = new Vue({
            el: getPageRoot(module),
            data: {
                shows: {
                    drawer: false,
                    monList: false,
                    total: false,
                    monVol: false,
                    monRes: false,
                    monTmp: false
                },
                loading: bui.loading(),
                open: true,
                num: -1,
@@ -599,6 +607,33 @@
                    }
                }
            },
            created: function created() {
                var self = this;
                // 显示左侧弹出框
                setTimeout(function () {
                    self.shows.drawer = true;
                }, 0);
                // 显示单体列表
                setTimeout(function () {
                    self.shows.monList = true;
                }, 0);
                // 显示统计信息
                setTimeout(function () {
                    self.shows.total = true;
                }, 0);
                // 显示单体电压
                setTimeout(function () {
                    self.shows.monVol = true;
                }, 0);
                // 显示单体内阻
                setTimeout(function () {
                    self.shows.monRes = true;
                }, 0);
                // 显示单体温度
                setTimeout(function () {
                    self.shows.monTmp = true;
                }, 0);
            },
            computed: {
                getTitle: function getTitle() {
                    return this.title + '-监测数据';
@@ -728,9 +763,6 @@
                this.timer.stop();
            }
        });
    },
    show: function show() {
        console.log(this.vm);
    },
    destroyed: function destroyed() {
        this.vm.$destroy();

 www/pages/monitor-data/monitor-data.html

@@ -10,7 +10,7 @@
        </div>

    </header>

    <main>

        <el-drawer v-cloak :visible.sync="open" direction="ltr">

        <el-drawer v-cloak v-if="shows.drawer" :visible.sync="open" direction="ltr">

            <div class="heading" slot="title"><div class="center">电池组列表</div></div>

            <hdw-list :list="battList" @handle-click="listClick"></hdw-list>

        </el-drawer>

@@ -84,7 +84,7 @@
                <ul>

                    

                    <li ref="tabItemHt">

                        <el-table border stripe size="mini" header-row-class-name="header-primary" height="100%" :data="tbls.monInfo.data">

                        <el-table v-if="shows.monList" border stripe size="mini" header-row-class-name="header-primary" height="100%" :data="tbls.monInfo.data">

                            <el-table-column prop="num1" align="center" label="编号">

                            </el-table-column>

                            <el-table-column prop="vol1" align="center" label="电压（V）">

@@ -112,7 +112,7 @@
                        </el-table>

                    </li>

                    <li style="display:none">

                        <el-table border stripe size="mini" header-row-class-name="header-primary" height="100%" :data="tbls.total.data">

                        <el-table v-if="shows.total" border stripe size="mini" header-row-class-name="header-primary" height="100%" :data="tbls.total.data">

                            <el-table-column prop="type" align="center" width="120" label="类型">

                            </el-table-column>

                            <el-table-column prop="high" align="center" label="较高单体">

@@ -125,17 +125,17 @@
                    </li>

                    <li style="display:none">

                        <v-touch @swipeleft="handleNextBtn" @swiperight="handlePreBtn">

                            <high-bar-chart :height="options.monVol.height" id="monVolBar" name="单体电压" unit="V" :colors="{min:'#ed4014', max: '#19be6b'}" ref="monVolBar"></high-bar-chart>

                            <high-bar-chart v-if="shows.monVol" :height="options.monVol.height" id="monVolBar" name="单体电压" unit="V" :colors="{min:'#ed4014', max: '#19be6b'}" ref="monVolBar"></high-bar-chart>

                        </v-touch>

                    </li>

                    <li style="display:none">

                        <v-touch @swipeleft="handleNextBtn" @swiperight="handlePreBtn">

                            <high-bar-chart :height="options.monRes.height" id="monResBar" name="单体内阻" unit="mΩ" :colors="{min:'#ed4014', max: '#19be6b'}" ref="monResBar"></high-bar-chart>

                            <high-bar-chart v-if="shows.monRes" :height="options.monRes.height" id="monResBar" name="单体内阻" unit="mΩ" :colors="{min:'#ed4014', max: '#19be6b'}" ref="monResBar"></high-bar-chart>

                        </v-touch>

                    </li>

                    <li style="display:none">

                        <v-touch @swipeleft="handleNextBtn" @swiperight="handlePreBtn">

                            <high-bar-chart :height="options.monTmp.height" id="monTmpBar" name="单体温度" unit="℃" :colors="{min:'#19be6b', max: '#ed4014'}" ref="monTmpBar"></high-bar-chart>

                            <high-bar-chart v-if="shows.monTmp" :height="options.monTmp.height" id="monTmpBar" name="单体温度" unit="℃" :colors="{min:'#19be6b', max: '#ed4014'}" ref="monTmpBar"></high-bar-chart>

                        </v-touch>

                    </li>

                </ul>


 www/pages/monitor-data/monitor-data.js

@@ -14,6 +14,14 @@
        this.vm = new Vue({
            el: getPageRoot(module),
            data: {
                shows: {
                    drawer: false,
                    monList: false,
                    total: false,
                    monVol: false,
                    monRes: false,
                    monTmp: false
                },
                loading: bui.loading(),
                open: true,
                num: -1,
@@ -599,6 +607,33 @@
                    }
                }
            },
            created: function created() {
                var self = this;
                // 显示左侧弹出框
                setTimeout(function () {
                    self.shows.drawer = true;
                }, 0);
                // 显示单体列表
                setTimeout(function () {
                    self.shows.monList = true;
                }, 0);
                // 显示统计信息
                setTimeout(function () {
                    self.shows.total = true;
                }, 0);
                // 显示单体电压
                setTimeout(function () {
                    self.shows.monVol = true;
                }, 0);
                // 显示单体内阻
                setTimeout(function () {
                    self.shows.monRes = true;
                }, 0);
                // 显示单体温度
                setTimeout(function () {
                    self.shows.monTmp = true;
                }, 0);
            },
            computed: {
                getTitle: function getTitle() {
                    return this.title + '-监测数据';
@@ -728,9 +763,6 @@
                this.timer.stop();
            }
        });
    },
    show: function show() {
        console.log(this.vm);
    },
    destroyed: function destroyed() {
        this.vm.$destroy();