修改内容

whychdw

2019-12-02 122f5f304b274d069a88a80839268707cb5afc33

修改内容

 platforms/android/app/src/main/assets/www/index.html

@@ -22,14 +22,14 @@
    <script src="js/bui.js"></script>

    <script src="js/common_functions.js"></script>

    <script src="js/vue.min.js"></script>

    <script src="css/element-ui/index.js?5b3f4281e8"></script>

    <script src="js/componets.js"></script>

    <script src="css/element-ui/index.js"></script>

    <script src="js/componets.js?3122c865b1"></script>

    <script src="css/highchart/highcharts.js"></script>

    <script src="js/hammer.min.js"></script>

    <script src="js/vue-touch.js?9348b335be"></script>

    <script src="js/vue-touch.js"></script>

    <script src="js/vconsole.min.js"></script>

    

    <script src="index.js?5b3f4281e8"></script>

    <script src="index.js"></script>

</body>



</html>

 platforms/android/app/src/main/assets/www/js/componets.js

@@ -592,13 +592,16 @@
    });
};
BarChart.prototype.setOption = function (option) {};

Vue.directive('swipeleft', {
var FragmentFactory = Vue.FragmentFactory;
var remove = Vue.util.remove;
var createAnchor = Vue.util.createAnchor;
console.log(createAnchor);
console.log(FragmentFactory);
// 定义v-lazy指令
Vue.directive('lazy', {
    terminal: true,
    // 当绑定元素插入到 DOM 中。
    inserted: function inserted(el) {
        var pinch = new Hammer.Pinch();
        var rotate = new Hammer.Rotate();
        pinch.recognizeWith(rotate);
        console.log(pinch);
        console.log(Vue.FragmentFactory);
    }
});

 platforms/android/app/src/main/assets/www/js/vue-lazy-component.js

New file
@@ -0,0 +1,42 @@
"use strict";

var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };

!function (t, e) {
  "object" == (typeof exports === "undefined" ? "undefined" : _typeof(exports)) && "object" == (typeof module === "undefined" ? "undefined" : _typeof(module)) ? module.exports = e() : "function" == typeof define && define.amd ? define([], e) : "object" == (typeof exports === "undefined" ? "undefined" : _typeof(exports)) ? exports["vue-lazy-component"] = e() : t["vue-lazy-component"] = e();
}(undefined, function () {
  return function (t) {
    function e(n) {
      if (i[n]) return i[n].exports;var r = i[n] = { exports: {}, id: n, loaded: !1 };return t[n].call(r.exports, r, r.exports, e), r.loaded = !0, r.exports;
    }var i = {};return e.m = t, e.c = i, e.p = "", e(0);
  }([function (t, e) {
    "use strict";
    function i(t) {
      var e = t.node;if (t.end) for (; !e.__vue__ && e !== t.end && e.nextSibling;) {
        e = e.nextSibling;
      }return e.__vue__;
    }function n(t) {
      var e = arguments.length <= 1 || void 0 === arguments[1] ? {} : arguments[1],
          n = t.FragmentFactory,
          r = t.util,
          o = r.createAnchor,
          s = r.replace;t.directive(e.name || "lazy", { terminal: !0, bind: function bind() {
          this.isInit = !1, this.anchor = o("v-if"), s(this.el, this.anchor);
        }, update: function update(t) {
          var e = this;this.isInit || window.setTimeout(function () {
            e.insert(), e.updateRef(), e.isInit = !0;
          }, t || 0);
        }, unbind: function unbind() {
          this.frag && this.frag.destroy();
        }, insert: function insert() {
          this.factory || (this.factory = new n(this.vm, this.el)), this.frag = this.factory.create(this._host, this._scope, this._frag), this.frag.before(this.anchor, !this.modifiers["no-animation"]);
        }, updateRef: function updateRef() {
          var t = this.descriptor.ref;if (t) {
            var e = (this.vm || this._scope).$refs,
                n = e[t],
                r = this._frag.scope.$key;n && (Array.isArray(n) ? n.push(i(this._frag)) : n[r] = i(this._frag));
          }
        } });
    }Object.defineProperty(e, "__esModule", { value: !0 }), e["default"] = n;
  }]);
});

 platforms/android/app/src/main/assets/www/js/vue.js

New file
Diff too large

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

@@ -52,13 +52,13 @@
                        <ul>

                            

                            <li ref="chartTabItem">

                                <high-line-chart :height="lineChart.height" id="groupVolLine" :names="['组端电压', '在线电压']" name="端电压" unit="V" :colors="{min:'#ed4014', max: '#19be6b'}" ref="groupVolLine">

                                <high-line-chart v-if="shows.groupVolLine" :height="lineChart.height" id="groupVolLine" :names="['组端电压', '在线电压']" name="端电压" unit="V" :colors="{min:'#ed4014', max: '#19be6b'}" ref="groupVolLine">

                            </high-line-chart></li>

                            <li style="display:none">

                                <high-line-chart :height="lineChart.height" id="groupCurrLine" name="组端电流" unit="A" :colors="{min:'#ed4014', max: '#19be6b'}" ref="groupCurrLine">

                                <high-line-chart v-if="shows.groupCurrLine" :height="lineChart.height" id="groupCurrLine" name="组端电流" unit="A" :colors="{min:'#ed4014', max: '#19be6b'}" ref="groupCurrLine">

                            </high-line-chart></li>

                            <li style="display:none">

                                <high-line-chart :height="lineChart.height" id="monInfoLine" name="单体信息" unit="V" :colors="{min:'#ed4014', max: '#19be6b'}" ref="monInfoLine"></high-line-chart>

                                <high-line-chart v-if="shows.monInfoLine" :height="lineChart.height" id="monInfoLine" name="单体信息" unit="V" :colors="{min:'#ed4014', max: '#19be6b'}" ref="monInfoLine"></high-line-chart>

                            </li>

                        </ul>

                    </div>


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

@@ -14,6 +14,11 @@
        this.vm = new Vue({
            el: getPageRoot(module),
            data: {
                shows: {
                    groupVolLine: false,
                    groupCurrLine: false,
                    monInfoLine: false
                },
                loading: bui.loading({
                    autoClose: false
                }),
@@ -314,6 +319,21 @@
                    return this.title + '-运维数据';
                }
            },
            created: function created() {
                var self = this;
                // 端电压
                setTimeout(function () {
                    self.shows.groupVolLine = true;
                }, 10);
                // 组端电流
                setTimeout(function () {
                    self.shows.groupCurrLine = true;
                }, 0);
                // 单体信息
                setTimeout(function () {
                    self.shows.monInfoLine = true;
                }, 0);
            },
            mounted: function mounted() {
                var self = this;
                // console.log(this);
@@ -324,14 +344,17 @@

                var chartTab = this.$refs['chartTab'];

                // 选项卡
                var uiTab = bui.tab({
                    id: "#uiTab",
                    width: chartTab.offsetWidth,
                    onInited: function onInited(option) {
                        self.lineChart.height = self.$refs['chartTabItem'].offsetHeight;
                    }
                });
                // 延时执行选项卡
                setTimeout(function () {
                    // 选项卡
                    var uiTab = bui.tab({
                        id: "#uiTab",
                        width: chartTab.offsetWidth,
                        onInited: function onInited(option) {
                            self.lineChart.height = self.$refs['chartTabItem'].offsetHeight;
                        }
                    });
                }, 0);

                // 查询所有已经安装的电池组
                this.searchAll();

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

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

    </header>

    <main>

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

        <el-drawer v-cloak v-lazy="0" :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>


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

@@ -15,7 +15,6 @@
            el: getPageRoot(module),
            data: {
                shows: {
                    drawer: false,
                    monList: false,
                    total: false,
                    monVol: false,
@@ -671,7 +670,6 @@
            },
            mounted: function mounted() {
                var self = this;

                // 页面选项卡
                var uiTab = bui.tab({
                    id: "#uiTab",

 www/index.html

@@ -22,14 +22,14 @@
    <script src="js/bui.js"></script>

    <script src="js/common_functions.js"></script>

    <script src="js/vue.min.js"></script>

    <script src="css/element-ui/index.js?5b3f4281e8"></script>

    <script src="js/componets.js"></script>

    <script src="css/element-ui/index.js"></script>

    <script src="js/componets.js?3122c865b1"></script>

    <script src="css/highchart/highcharts.js"></script>

    <script src="js/hammer.min.js"></script>

    <script src="js/vue-touch.js?9348b335be"></script>

    <script src="js/vue-touch.js"></script>

    <script src="js/vconsole.min.js"></script>

    

    <script src="index.js?5b3f4281e8"></script>

    <script src="index.js"></script>

</body>



</html>

 www/js/componets.js

@@ -592,13 +592,16 @@
    });
};
BarChart.prototype.setOption = function (option) {};

Vue.directive('swipeleft', {
var FragmentFactory = Vue.FragmentFactory;
var remove = Vue.util.remove;
var createAnchor = Vue.util.createAnchor;
console.log(createAnchor);
console.log(FragmentFactory);
// 定义v-lazy指令
Vue.directive('lazy', {
    terminal: true,
    // 当绑定元素插入到 DOM 中。
    inserted: function inserted(el) {
        var pinch = new Hammer.Pinch();
        var rotate = new Hammer.Rotate();
        pinch.recognizeWith(rotate);
        console.log(pinch);
        console.log(Vue.FragmentFactory);
    }
});

 www/js/vue-lazy-component.js

New file
@@ -0,0 +1,42 @@
"use strict";

var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };

!function (t, e) {
  "object" == (typeof exports === "undefined" ? "undefined" : _typeof(exports)) && "object" == (typeof module === "undefined" ? "undefined" : _typeof(module)) ? module.exports = e() : "function" == typeof define && define.amd ? define([], e) : "object" == (typeof exports === "undefined" ? "undefined" : _typeof(exports)) ? exports["vue-lazy-component"] = e() : t["vue-lazy-component"] = e();
}(undefined, function () {
  return function (t) {
    function e(n) {
      if (i[n]) return i[n].exports;var r = i[n] = { exports: {}, id: n, loaded: !1 };return t[n].call(r.exports, r, r.exports, e), r.loaded = !0, r.exports;
    }var i = {};return e.m = t, e.c = i, e.p = "", e(0);
  }([function (t, e) {
    "use strict";
    function i(t) {
      var e = t.node;if (t.end) for (; !e.__vue__ && e !== t.end && e.nextSibling;) {
        e = e.nextSibling;
      }return e.__vue__;
    }function n(t) {
      var e = arguments.length <= 1 || void 0 === arguments[1] ? {} : arguments[1],
          n = t.FragmentFactory,
          r = t.util,
          o = r.createAnchor,
          s = r.replace;t.directive(e.name || "lazy", { terminal: !0, bind: function bind() {
          this.isInit = !1, this.anchor = o("v-if"), s(this.el, this.anchor);
        }, update: function update(t) {
          var e = this;this.isInit || window.setTimeout(function () {
            e.insert(), e.updateRef(), e.isInit = !0;
          }, t || 0);
        }, unbind: function unbind() {
          this.frag && this.frag.destroy();
        }, insert: function insert() {
          this.factory || (this.factory = new n(this.vm, this.el)), this.frag = this.factory.create(this._host, this._scope, this._frag), this.frag.before(this.anchor, !this.modifiers["no-animation"]);
        }, updateRef: function updateRef() {
          var t = this.descriptor.ref;if (t) {
            var e = (this.vm || this._scope).$refs,
                n = e[t],
                r = this._frag.scope.$key;n && (Array.isArray(n) ? n.push(i(this._frag)) : n[r] = i(this._frag));
          }
        } });
    }Object.defineProperty(e, "__esModule", { value: !0 }), e["default"] = n;
  }]);
});

 www/js/vue.js

New file
Diff too large

 www/pages/history-data/history-data.html

@@ -52,13 +52,13 @@
                        <ul>

                            

                            <li ref="chartTabItem">

                                <high-line-chart :height="lineChart.height" id="groupVolLine" :names="['组端电压', '在线电压']" name="端电压" unit="V" :colors="{min:'#ed4014', max: '#19be6b'}" ref="groupVolLine">

                                <high-line-chart v-if="shows.groupVolLine" :height="lineChart.height" id="groupVolLine" :names="['组端电压', '在线电压']" name="端电压" unit="V" :colors="{min:'#ed4014', max: '#19be6b'}" ref="groupVolLine">

                            </high-line-chart></li>

                            <li style="display:none">

                                <high-line-chart :height="lineChart.height" id="groupCurrLine" name="组端电流" unit="A" :colors="{min:'#ed4014', max: '#19be6b'}" ref="groupCurrLine">

                                <high-line-chart v-if="shows.groupCurrLine" :height="lineChart.height" id="groupCurrLine" name="组端电流" unit="A" :colors="{min:'#ed4014', max: '#19be6b'}" ref="groupCurrLine">

                            </high-line-chart></li>

                            <li style="display:none">

                                <high-line-chart :height="lineChart.height" id="monInfoLine" name="单体信息" unit="V" :colors="{min:'#ed4014', max: '#19be6b'}" ref="monInfoLine"></high-line-chart>

                                <high-line-chart v-if="shows.monInfoLine" :height="lineChart.height" id="monInfoLine" name="单体信息" unit="V" :colors="{min:'#ed4014', max: '#19be6b'}" ref="monInfoLine"></high-line-chart>

                            </li>

                        </ul>

                    </div>


 www/pages/history-data/history-data.js

@@ -14,6 +14,11 @@
        this.vm = new Vue({
            el: getPageRoot(module),
            data: {
                shows: {
                    groupVolLine: false,
                    groupCurrLine: false,
                    monInfoLine: false
                },
                loading: bui.loading({
                    autoClose: false
                }),
@@ -314,6 +319,21 @@
                    return this.title + '-运维数据';
                }
            },
            created: function created() {
                var self = this;
                // 端电压
                setTimeout(function () {
                    self.shows.groupVolLine = true;
                }, 10);
                // 组端电流
                setTimeout(function () {
                    self.shows.groupCurrLine = true;
                }, 0);
                // 单体信息
                setTimeout(function () {
                    self.shows.monInfoLine = true;
                }, 0);
            },
            mounted: function mounted() {
                var self = this;
                // console.log(this);
@@ -324,14 +344,17 @@

                var chartTab = this.$refs['chartTab'];

                // 选项卡
                var uiTab = bui.tab({
                    id: "#uiTab",
                    width: chartTab.offsetWidth,
                    onInited: function onInited(option) {
                        self.lineChart.height = self.$refs['chartTabItem'].offsetHeight;
                    }
                });
                // 延时执行选项卡
                setTimeout(function () {
                    // 选项卡
                    var uiTab = bui.tab({
                        id: "#uiTab",
                        width: chartTab.offsetWidth,
                        onInited: function onInited(option) {
                            self.lineChart.height = self.$refs['chartTabItem'].offsetHeight;
                        }
                    });
                }, 0);

                // 查询所有已经安装的电池组
                this.searchAll();

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

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

    </header>

    <main>

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

        <el-drawer v-cloak v-lazy="0" :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>


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

@@ -15,7 +15,6 @@
            el: getPageRoot(module),
            data: {
                shows: {
                    drawer: false,
                    monList: false,
                    total: false,
                    monVol: false,
@@ -671,7 +670,6 @@
            },
            mounted: function mounted() {
                var self = this;

                // 页面选项卡
                var uiTab = bui.tab({
                    id: "#uiTab",