whychdw
2019-11-26 99b7014fc1ee0b94cef37ac1d51f1617c606a3a3
加载内容
4个文件已添加
8个文件已修改
468 ■■■■■ 已修改文件
platforms/android/app/src/main/assets/www/index.html 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platforms/android/app/src/main/assets/www/js/componets.js 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platforms/android/app/src/main/assets/www/pages/batt-info-set/batt-info-set.html 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platforms/android/app/src/main/assets/www/pages/batt-info-set/batt-info-set.js 156 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platforms/android/app/src/main/assets/www/pages/main/main.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
platforms/android/app/src/main/assets/www/pages/main/main.js 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
www/index.html 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
www/js/componets.js 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
www/pages/batt-info-set/batt-info-set.html 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
www/pages/batt-info-set/batt-info-set.js 156 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
www/pages/main/main.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
www/pages/main/main.js 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platforms/android/app/src/main/assets/www/index.html
@@ -22,11 +22,11 @@
    <script src="js/bui.js"></script>
    <script src="js/common_functions.js?7a37f1e251"></script>
    <script src="js/vue.min.js"></script>
    <script src="css/element-ui/index.js"></script>
    <script src="js/componets.js?be57509bd9"></script>
    <script src="css/element-ui/index.js?12fd3b4c55"></script>
    <script src="js/componets.js?4dacdaa4ab"></script>
    <script src="css/highchart/highcharts.js"></script>
    
    <script src="index.js"></script>
    <script src="index.js?12fd3b4c55"></script>
</body>
</html>
platforms/android/app/src/main/assets/www/js/componets.js
@@ -18,10 +18,24 @@
            type: String
        }
    },
    template: '\n        <div class="menu-btn" @click="handlerClick">\n            <div class="menu-btn-icon" :class="type">\n                <i class="iconfont" :class="icon"></i>\n            </div>\n            <div class="menu-btn-text">{{text}}</div>\n        </div>\n    ',
    template: '\n        <div \n        class="menu-btn" \n        @click="handlerClick" \n        v-loading="loading"\n        element-loading-spinner="el-icon-loading"\n        element-loading-background="rgba(0, 0, 0, 0.5)">\n            <div class="menu-btn-icon" :class="type">\n                <i class="iconfont" :class="icon"></i>\n            </div>\n            <div class="menu-btn-text">{{text}}</div>\n        </div>\n    ',
    data: function data() {
        return {
            loading: false
        };
    },
    methods: {
        handlerClick: function handlerClick() {
            var self = this;
            if (this.loading == true) {
                return;
            }
            this.loading = true;
            this.$emit('click', this.to);
            // 3秒钟后才可以再次触发
            setTimeout(function () {
                self.loading = false;
            }, 3000);
        }
    }
});
platforms/android/app/src/main/assets/www/pages/batt-info-set/batt-info-set.html
New file
@@ -0,0 +1,39 @@
<div class="bui-page">
    <header class="bui-bar">
        <div class="bui-bar-left">
            <div class="bui-btn btn-back"><i class="icon-back"></i></div>
        </div>
        <div class="bui-bar-main">电池信息配置</div>
        <div class="bui-bar-right"></div>
    </header>
    <main>
        <el-table border stripe size="mini" header-row-class-name="header-primary" height="100%" :data="tbl.data">
            <el-table-column prop="num" align="center" label="电池组编号">
            </el-table-column>
            <el-table-column prop="BattGroupName" align="center" label="电池组名称">
            </el-table-column>
            <el-table-column prop="MonCount" align="center" label="单体个数">
            </el-table-column>
            <el-table-column prop="MonCapStd" align="center" label="单体标称容量(AH)">
            </el-table-column>
            <el-table-column prop="MonVolStd" align="center" label="单体标称电压(V)">
            </el-table-column>
            <el-table-column prop="station_install" align="center" label="安装状态">
                <template slot-scope="scope">
                    <el-button size="mini" :type="scope.row.station_install==1?'success':''">
                        {{scope.row.station_install==1?'已安装':'未安装'}}
                    </el-button>
                </template>
            </el-table-column>
            <el-table-column align="center" width="150" label="操作">
                <template slot-scope="scope">
                    <el-button size="mini" type="primary" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
                </template>
            </el-table-column>
        </el-table>
    </main>
    <footer>
    </footer>
</div>
platforms/android/app/src/main/assets/www/pages/batt-info-set/batt-info-set.js
New file
@@ -0,0 +1,156 @@
'use strict';
/**
 * 模板模块
 * 默认模块名: batt-info-set
 * @return {[object]}  [ 返回一个对象 ]
 */
loader.define({
    data: {
        vm: ''
    },
    loaded: function loaded(require, exports, module) {
        // 引入vue
        this.vm = new Vue({
            el: getPageRoot(module),
            data: {
                dialogFormVisible: false,
                tbl: {
                    noData: '暂无电池信息',
                    height: 300,
                    loading: '',
                    data: [{
                        num: 1,
                        BattGroupId: 1,
                        BattGroupName: '电池组1',
                        BattGroupName1: '电池组',
                        BattFloatCurrent: 3,
                        MonCapStd: 100,
                        MonVolStd: 2,
                        MonCount: 24,
                        MonResStd: 0.2,
                        MonSerStd: 5000,
                        MonTmpStd: 24,
                        BattProducer: '',
                        BattInUseDate: '2019-11-20',
                        station_install: 1
                    }, {
                        num: 2,
                        BattGroupId: 2,
                        BattGroupName: '电池组-plus2',
                        BattGroupName1: '电池组-plus',
                        BattFloatCurrent: 3,
                        MonCapStd: 100,
                        MonVolStd: 2,
                        MonCount: 2,
                        MonResStd: 0.2,
                        MonSerStd: 5000,
                        MonTmpStd: 24,
                        BattProducer: '',
                        BattInUseDate: '2019-11-20',
                        station_install: 0
                    }, {
                        num: 3,
                        BattGroupId: 3,
                        BattGroupName: '电池组-plus3',
                        BattGroupName1: '电池组-plus',
                        BattFloatCurrent: 3,
                        MonCapStd: 100,
                        MonVolStd: 2,
                        MonCount: 2,
                        MonResStd: 0.2,
                        MonSerStd: 5000,
                        MonTmpStd: 24,
                        BattProducer: '',
                        BattInUseDate: '2019-11-20',
                        station_install: 1
                    }]
                },
                battInfo: {
                    rules: {},
                    loading: false,
                    data: {}
                }
            },
            methods: {
                searchAll: function searchAll() {
                    if (typeof BattinfService != 'undefined') {
                        BattinfService.searchAll();
                    }
                },
                handleEdit: function handleEdit(index, row) {
                    this.showDialog(row);
                },
                showDialog: function showDialog(row) {
                    // 初始化电池信息
                    this.initBattInfo(row);
                    this.dialogFormVisible = true;
                },
                closeDialog: function closeDialog() {
                    this.dialogFormVisible = false;
                },
                initBattInfo: function initBattInfo(row) {
                    var data = Object.assign({}, row);
                    this.battInfo.data = data;
                },
                update: function update() {
                    var _this = this;
                    this.battInfo.loading = true;
                    var data = this.battInfo.data;
                    // 特殊数据处理
                    data.BattGroupName = data.BattGroupName1 + data.num;
                    data.BattInUseDate = new Date().format('yyyy-MM-dd');
                    if (typeof BattinfService != 'undefined') {
                        BattinfService.update(JSON.stringify(data));
                    } else {
                        setTimeout(function () {
                            _this.battInfo.loading = false;
                            // 提示信息
                            _this.$message({
                                message: '修改成功',
                                type: 'success'
                            });
                            // 关闭对话框
                            _this.dialogFormVisible = false;
                        }, 3000);
                    }
                }
            },
            mounted: function mounted() {
                var self = this;
                // 查询电池信息
                this.searchAll();
                // 后台触发事件查询所有的电池组信息
                window['BattinfServicesearchAllcalljs'] = function (res) {
                    var data = res.data;
                    self.tbl.data = data;
                };
                // 更新电池组信息
                window['BattinfServiceupdatecalljs'] = function (res) {
                    // 关闭按钮的等待框
                    self.battInfo.loading = false;
                    if (res.code == 1) {
                        // 提示信息
                        self.$message({
                            message: '修改成功',
                            type: 'success'
                        });
                        // 关闭对话框
                        self.dialogFormVisible = false;
                        // 查询电池组信息
                        self.searchAll();
                    } else {
                        self.$message.error('修改失败');
                    }
                };
            },
            destroyed: function destroyed() {}
        });
    },
    destroyed: function destroyed() {
        this.vm.$destroy();
    }
});
platforms/android/app/src/main/assets/www/pages/main/main.html
@@ -67,7 +67,7 @@
                        <menu-btn type="warning" text="告警管理" icon="icon-gaojing"></menu-btn>
                    </div>
                    <div class="span4">
                        <menu-btn text="电池信息配置" icon="icon-dianchiguanli"></menu-btn>
                        <menu-btn to="/batt-info-set" @click="routerTo" text="电池信息配置" icon="icon-dianchiguanli"></menu-btn>
                    </div>
                    <div class="span4">
                        <menu-btn type="error" text="退出系统" icon="icon-tuichu"></menu-btn>
platforms/android/app/src/main/assets/www/pages/main/main.js
@@ -46,6 +46,9 @@
                routes: [{
                    path: '/monitor-data',
                    url: '../monitor-data/monitor-data.html'
                }, {
                    path: '/batt-info-set',
                    url: '../batt-info-set/batt-info-set.html'
                }]
            },
            methods: {
@@ -138,11 +141,13 @@
                            url = route.url;
                        }
                    }
                    // 跳转
                    router.load({
                        url: url,
                        param: {}
                    });
                    setTimeout(function () {
                        // 跳转
                        router.load({
                            url: url,
                            param: {}
                        });
                    }, 100);
                }
            },
            mounted: function mounted() {
www/index.html
@@ -22,11 +22,11 @@
    <script src="js/bui.js"></script>
    <script src="js/common_functions.js?7a37f1e251"></script>
    <script src="js/vue.min.js"></script>
    <script src="css/element-ui/index.js"></script>
    <script src="js/componets.js?be57509bd9"></script>
    <script src="css/element-ui/index.js?12fd3b4c55"></script>
    <script src="js/componets.js?4dacdaa4ab"></script>
    <script src="css/highchart/highcharts.js"></script>
    
    <script src="index.js"></script>
    <script src="index.js?12fd3b4c55"></script>
</body>
</html>
www/js/componets.js
@@ -18,10 +18,24 @@
            type: String
        }
    },
    template: '\n        <div class="menu-btn" @click="handlerClick">\n            <div class="menu-btn-icon" :class="type">\n                <i class="iconfont" :class="icon"></i>\n            </div>\n            <div class="menu-btn-text">{{text}}</div>\n        </div>\n    ',
    template: '\n        <div \n        class="menu-btn" \n        @click="handlerClick" \n        v-loading="loading"\n        element-loading-spinner="el-icon-loading"\n        element-loading-background="rgba(0, 0, 0, 0.5)">\n            <div class="menu-btn-icon" :class="type">\n                <i class="iconfont" :class="icon"></i>\n            </div>\n            <div class="menu-btn-text">{{text}}</div>\n        </div>\n    ',
    data: function data() {
        return {
            loading: false
        };
    },
    methods: {
        handlerClick: function handlerClick() {
            var self = this;
            if (this.loading == true) {
                return;
            }
            this.loading = true;
            this.$emit('click', this.to);
            // 3秒钟后才可以再次触发
            setTimeout(function () {
                self.loading = false;
            }, 3000);
        }
    }
});
www/pages/batt-info-set/batt-info-set.html
New file
@@ -0,0 +1,39 @@
<div class="bui-page">
    <header class="bui-bar">
        <div class="bui-bar-left">
            <div class="bui-btn btn-back"><i class="icon-back"></i></div>
        </div>
        <div class="bui-bar-main">电池信息配置</div>
        <div class="bui-bar-right"></div>
    </header>
    <main>
        <el-table border stripe size="mini" header-row-class-name="header-primary" height="100%" :data="tbl.data">
            <el-table-column prop="num" align="center" label="电池组编号">
            </el-table-column>
            <el-table-column prop="BattGroupName" align="center" label="电池组名称">
            </el-table-column>
            <el-table-column prop="MonCount" align="center" label="单体个数">
            </el-table-column>
            <el-table-column prop="MonCapStd" align="center" label="单体标称容量(AH)">
            </el-table-column>
            <el-table-column prop="MonVolStd" align="center" label="单体标称电压(V)">
            </el-table-column>
            <el-table-column prop="station_install" align="center" label="安装状态">
                <template slot-scope="scope">
                    <el-button size="mini" :type="scope.row.station_install==1?'success':''">
                        {{scope.row.station_install==1?'已安装':'未安装'}}
                    </el-button>
                </template>
            </el-table-column>
            <el-table-column align="center" width="150" label="操作">
                <template slot-scope="scope">
                    <el-button size="mini" type="primary" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
                </template>
            </el-table-column>
        </el-table>
    </main>
    <footer>
    </footer>
</div>
www/pages/batt-info-set/batt-info-set.js
New file
@@ -0,0 +1,156 @@
'use strict';
/**
 * 模板模块
 * 默认模块名: batt-info-set
 * @return {[object]}  [ 返回一个对象 ]
 */
loader.define({
    data: {
        vm: ''
    },
    loaded: function loaded(require, exports, module) {
        // 引入vue
        this.vm = new Vue({
            el: getPageRoot(module),
            data: {
                dialogFormVisible: false,
                tbl: {
                    noData: '暂无电池信息',
                    height: 300,
                    loading: '',
                    data: [{
                        num: 1,
                        BattGroupId: 1,
                        BattGroupName: '电池组1',
                        BattGroupName1: '电池组',
                        BattFloatCurrent: 3,
                        MonCapStd: 100,
                        MonVolStd: 2,
                        MonCount: 24,
                        MonResStd: 0.2,
                        MonSerStd: 5000,
                        MonTmpStd: 24,
                        BattProducer: '',
                        BattInUseDate: '2019-11-20',
                        station_install: 1
                    }, {
                        num: 2,
                        BattGroupId: 2,
                        BattGroupName: '电池组-plus2',
                        BattGroupName1: '电池组-plus',
                        BattFloatCurrent: 3,
                        MonCapStd: 100,
                        MonVolStd: 2,
                        MonCount: 2,
                        MonResStd: 0.2,
                        MonSerStd: 5000,
                        MonTmpStd: 24,
                        BattProducer: '',
                        BattInUseDate: '2019-11-20',
                        station_install: 0
                    }, {
                        num: 3,
                        BattGroupId: 3,
                        BattGroupName: '电池组-plus3',
                        BattGroupName1: '电池组-plus',
                        BattFloatCurrent: 3,
                        MonCapStd: 100,
                        MonVolStd: 2,
                        MonCount: 2,
                        MonResStd: 0.2,
                        MonSerStd: 5000,
                        MonTmpStd: 24,
                        BattProducer: '',
                        BattInUseDate: '2019-11-20',
                        station_install: 1
                    }]
                },
                battInfo: {
                    rules: {},
                    loading: false,
                    data: {}
                }
            },
            methods: {
                searchAll: function searchAll() {
                    if (typeof BattinfService != 'undefined') {
                        BattinfService.searchAll();
                    }
                },
                handleEdit: function handleEdit(index, row) {
                    this.showDialog(row);
                },
                showDialog: function showDialog(row) {
                    // 初始化电池信息
                    this.initBattInfo(row);
                    this.dialogFormVisible = true;
                },
                closeDialog: function closeDialog() {
                    this.dialogFormVisible = false;
                },
                initBattInfo: function initBattInfo(row) {
                    var data = Object.assign({}, row);
                    this.battInfo.data = data;
                },
                update: function update() {
                    var _this = this;
                    this.battInfo.loading = true;
                    var data = this.battInfo.data;
                    // 特殊数据处理
                    data.BattGroupName = data.BattGroupName1 + data.num;
                    data.BattInUseDate = new Date().format('yyyy-MM-dd');
                    if (typeof BattinfService != 'undefined') {
                        BattinfService.update(JSON.stringify(data));
                    } else {
                        setTimeout(function () {
                            _this.battInfo.loading = false;
                            // 提示信息
                            _this.$message({
                                message: '修改成功',
                                type: 'success'
                            });
                            // 关闭对话框
                            _this.dialogFormVisible = false;
                        }, 3000);
                    }
                }
            },
            mounted: function mounted() {
                var self = this;
                // 查询电池信息
                this.searchAll();
                // 后台触发事件查询所有的电池组信息
                window['BattinfServicesearchAllcalljs'] = function (res) {
                    var data = res.data;
                    self.tbl.data = data;
                };
                // 更新电池组信息
                window['BattinfServiceupdatecalljs'] = function (res) {
                    // 关闭按钮的等待框
                    self.battInfo.loading = false;
                    if (res.code == 1) {
                        // 提示信息
                        self.$message({
                            message: '修改成功',
                            type: 'success'
                        });
                        // 关闭对话框
                        self.dialogFormVisible = false;
                        // 查询电池组信息
                        self.searchAll();
                    } else {
                        self.$message.error('修改失败');
                    }
                };
            },
            destroyed: function destroyed() {}
        });
    },
    destroyed: function destroyed() {
        this.vm.$destroy();
    }
});
www/pages/main/main.html
@@ -67,7 +67,7 @@
                        <menu-btn type="warning" text="告警管理" icon="icon-gaojing"></menu-btn>
                    </div>
                    <div class="span4">
                        <menu-btn text="电池信息配置" icon="icon-dianchiguanli"></menu-btn>
                        <menu-btn to="/batt-info-set" @click="routerTo" text="电池信息配置" icon="icon-dianchiguanli"></menu-btn>
                    </div>
                    <div class="span4">
                        <menu-btn type="error" text="退出系统" icon="icon-tuichu"></menu-btn>
www/pages/main/main.js
@@ -46,6 +46,9 @@
                routes: [{
                    path: '/monitor-data',
                    url: '../monitor-data/monitor-data.html'
                }, {
                    path: '/batt-info-set',
                    url: '../batt-info-set/batt-info-set.html'
                }]
            },
            methods: {
@@ -138,11 +141,13 @@
                            url = route.url;
                        }
                    }
                    // 跳转
                    router.load({
                        url: url,
                        param: {}
                    });
                    setTimeout(function () {
                        // 跳转
                        router.load({
                            url: url,
                            param: {}
                        });
                    }, 100);
                }
            },
            mounted: function mounted() {