FBS9600App.git - Gitblit

parent: 2e81500c | 补丁 | 提交 | show whitespace

Merge branch 'FBS9600' of http://whyclxw@118.89.139.230:10101/r/FBS9600App....

81041

2019-12-03 3c8b17e39ec7a92401f17e4d0054c924712e6536

Merge branch 'FBS9600' of http://whyclxw@118.89.139.230:10101/r/FBS9600App.git into FBS9600

8个文件已修改

	platforms/android/app/src/main/assets/www/index.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	platforms/android/app/src/main/assets/www/index.js	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	platforms/android/app/src/main/assets/www/pages/main/main.html	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	platforms/android/app/src/main/assets/www/pages/main/main.js	38 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	www/index.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	www/index.js	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	www/pages/main/main.html	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	www/pages/main/main.js	38 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 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?3aa0e315ae"></script>

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

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

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

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

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

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

    

    <script src="index.js?3aa0e315ae"></script>

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

</body>



</html>

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

@@ -1,7 +1,7 @@
"use strict";

window.router = bui.router();
new VConsole();
//new VConsole();
bui.ready(function () {
    // 初始化路由
    router.init({

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

@@ -23,7 +23,7 @@
                                <i class="iconfont icon-jinggao"></i>

                            </div>

                            <div class="tab-menu-fr">

                                <h3 class="item-title center" v-text="tabs.warning">0</h3>

                                <h3 class="item-title center" v-text="tbls.warning.page.PageAll">0</h3>

                                <p class="item-text">告警中</p>

                            </div>

                        </div>

@@ -78,17 +78,19 @@
            <div class="tab-item" style="display:none" v-show="tabs.active == 'warning'">

                <div class="tab-item-name">{{tbls.warning.name}}</div>

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

                    <el-table-column prop="num" header-align="center" label="电池组编号">

                    <el-table-column prop="num" align="center" align="center" label="电池组编号">

                    </el-table-column>

                    <el-table-column prop="BattGroupName" header-align="center" label="电池组名称">

                    <el-table-column prop="BattGroupName" align="center" label="电池组名称">

                    </el-table-column>

                    <el-table-column prop="WarningName" header-align="center" label="告警名称">

                    <el-table-column prop="alm_id" align="center" label="告警名称">

                    </el-table-column>

                    <el-table-column prop="monNum" header-align="center" label="单体编号">

                    <el-table-column prop="MonNum" align="center" label="单体编号">

                    </el-table-column>

                    <el-table-column prop="warningStartTime" header-align="center" label="告警开始时间">

                    <el-table-column prop="alm_start_time" align="center" align="center" label="告警开始时间">

                    </el-table-column>

                </el-table>

                <el-pagination large style="text-align:center" background layout="prev, pager, next" :total="tbls.warning.page.PageAll" @current-change="warningCurrentChange">

                </el-pagination>

            </div>

            <div class="tab-item" style="display:none" v-show="tabs.active == 'charge'">

                <div class="tab-item-name">{{tbls.charge.name}}</div>


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

@@ -182,23 +182,54 @@
                searchAlarmInfo: function searchAlarmInfo() {
                    // 查询实时告警信息
                    var self = this;
                    var page = this.warning.page;
                    var page = this.tbls.warning.page;
                    // 构造查询条件
                    var searchParams = {
                        alm_cleared_type: 0,
                        page: page
                    };
                    // 判断是否为手机端
                    if (typeof Battalram_dataService == "undefined") {
                    if (typeof Battalram_dataService != "undefined") {
                        Battalram_dataService.serchByCondition(JSON.stringify(searchParams));
                    } else {
                        this.setAlarmInfo({
                            code: 1,
                            cmd_type: 0,
                            data: [{
                                num: 1,
                                BattGroupName: '电池组1',
                                MonNum: 1,
                                alm_start_time: '2019-12-3 00:00:00',
                                alm_id: 2,
                                page: {
                                    PageAll: 40
                                }
                            }]
                        });
                        // 开启计时器
                        this.tbls.charge.timer.open();
                    }
                },
                setAlarmInfo: function setAlarmInfo(res) {
                    // 设置实时告警信息
                    if (res.code == 1) {
                        // 设置数据
                        this.tbls.warning.data = res.data;
                        // 设置分页
                        this.tbls.warning.page.PageAll = res.data[res.data.length - 1].page.PageAll;
                    } else {
                        // 设置数据
                        this.tbls.warning.data = [];
                        // 设置分页
                        this.tbls.warning.page.PageAll = 0;
                    }
                    console.log(res);
                },
                // 设置当前页
                warningCurrentChange: function warningCurrentChange(curr) {
                    this.tbls.warning.PageCurr = curr;
                    // 查询电池告警信息
                    this.startSearchAlarmInfo();
                },
                routerTo: function routerTo(path) {
                    var routes = this.routes;
@@ -229,6 +260,9 @@
                // 查询充电测试信息
                this.startReadBattCharInfo();

                // 查询告警
                this.startSearchAlarmInfo();

                // 后台触发事件查询所有的电池组放电信息
                window['DeviceServicereadBattDiscInfocalljs'] = function (res) {
                    // 设置电池信息

 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?3aa0e315ae"></script>

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

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

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

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

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

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

    

    <script src="index.js?3aa0e315ae"></script>

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

</body>



</html>

 www/index.js

@@ -1,7 +1,7 @@
"use strict";

window.router = bui.router();
new VConsole();
//new VConsole();
bui.ready(function () {
    // 初始化路由
    router.init({

 www/pages/main/main.html

@@ -23,7 +23,7 @@
                                <i class="iconfont icon-jinggao"></i>

                            </div>

                            <div class="tab-menu-fr">

                                <h3 class="item-title center" v-text="tabs.warning">0</h3>

                                <h3 class="item-title center" v-text="tbls.warning.page.PageAll">0</h3>

                                <p class="item-text">告警中</p>

                            </div>

                        </div>

@@ -78,17 +78,19 @@
            <div class="tab-item" style="display:none" v-show="tabs.active == 'warning'">

                <div class="tab-item-name">{{tbls.warning.name}}</div>

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

                    <el-table-column prop="num" header-align="center" label="电池组编号">

                    <el-table-column prop="num" align="center" align="center" label="电池组编号">

                    </el-table-column>

                    <el-table-column prop="BattGroupName" header-align="center" label="电池组名称">

                    <el-table-column prop="BattGroupName" align="center" label="电池组名称">

                    </el-table-column>

                    <el-table-column prop="WarningName" header-align="center" label="告警名称">

                    <el-table-column prop="alm_id" align="center" label="告警名称">

                    </el-table-column>

                    <el-table-column prop="monNum" header-align="center" label="单体编号">

                    <el-table-column prop="MonNum" align="center" label="单体编号">

                    </el-table-column>

                    <el-table-column prop="warningStartTime" header-align="center" label="告警开始时间">

                    <el-table-column prop="alm_start_time" align="center" align="center" label="告警开始时间">

                    </el-table-column>

                </el-table>

                <el-pagination large style="text-align:center" background layout="prev, pager, next" :total="tbls.warning.page.PageAll" @current-change="warningCurrentChange">

                </el-pagination>

            </div>

            <div class="tab-item" style="display:none" v-show="tabs.active == 'charge'">

                <div class="tab-item-name">{{tbls.charge.name}}</div>


 www/pages/main/main.js

@@ -182,23 +182,54 @@
                searchAlarmInfo: function searchAlarmInfo() {
                    // 查询实时告警信息
                    var self = this;
                    var page = this.warning.page;
                    var page = this.tbls.warning.page;
                    // 构造查询条件
                    var searchParams = {
                        alm_cleared_type: 0,
                        page: page
                    };
                    // 判断是否为手机端
                    if (typeof Battalram_dataService == "undefined") {
                    if (typeof Battalram_dataService != "undefined") {
                        Battalram_dataService.serchByCondition(JSON.stringify(searchParams));
                    } else {
                        this.setAlarmInfo({
                            code: 1,
                            cmd_type: 0,
                            data: [{
                                num: 1,
                                BattGroupName: '电池组1',
                                MonNum: 1,
                                alm_start_time: '2019-12-3 00:00:00',
                                alm_id: 2,
                                page: {
                                    PageAll: 40
                                }
                            }]
                        });
                        // 开启计时器
                        this.tbls.charge.timer.open();
                    }
                },
                setAlarmInfo: function setAlarmInfo(res) {
                    // 设置实时告警信息
                    if (res.code == 1) {
                        // 设置数据
                        this.tbls.warning.data = res.data;
                        // 设置分页
                        this.tbls.warning.page.PageAll = res.data[res.data.length - 1].page.PageAll;
                    } else {
                        // 设置数据
                        this.tbls.warning.data = [];
                        // 设置分页
                        this.tbls.warning.page.PageAll = 0;
                    }
                    console.log(res);
                },
                // 设置当前页
                warningCurrentChange: function warningCurrentChange(curr) {
                    this.tbls.warning.PageCurr = curr;
                    // 查询电池告警信息
                    this.startSearchAlarmInfo();
                },
                routerTo: function routerTo(path) {
                    var routes = this.routes;
@@ -229,6 +260,9 @@
                // 查询充电测试信息
                this.startReadBattCharInfo();

                // 查询告警
                this.startSearchAlarmInfo();

                // 后台触发事件查询所有的电池组放电信息
                window['DeviceServicereadBattDiscInfocalljs'] = function (res) {
                    // 设置电池信息

			@@ -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?3aa0e315ae"></script>
			<script src="css/element-ui/index.js?5b3f4281e8"></script>
			<script src="js/componets.js?ec02efd5f7"></script>
			<script src="css/highchart/highcharts.js"></script>
			<script src="js/hammer.min.js"></script>
			<script src="js/vue-touch.js"></script>
			<script src="js/vconsole.min.js"></script>

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

			</html>

			@@ -1,7 +1,7 @@
			"use strict";

			window.router = bui.router();
			new VConsole();
			//new VConsole();
			bui.ready(function () {
			// 初始化路由
			router.init({

			@@ -23,7 +23,7 @@
			<i class="iconfont icon-jinggao"></i>
			</div>
			<div class="tab-menu-fr">
			<h3 class="item-title center" v-text="tabs.warning">0</h3>
			<h3 class="item-title center" v-text="tbls.warning.page.PageAll">0</h3>
			<p class="item-text">告警中</p>
			</div>
			</div>
			@@ -78,17 +78,19 @@
			<div class="tab-item" style="display:none" v-show="tabs.active == 'warning'">
			<div class="tab-item-name">{{tbls.warning.name}}</div>
			<el-table stripe border size="mini" header-row-class-name="header-primary" :height="tbls.warning.height" :data="tbls.warning.data">
			<el-table-column prop="num" header-align="center" label="电池组编号">
			<el-table-column prop="num" align="center" align="center" label="电池组编号">
			</el-table-column>
			<el-table-column prop="BattGroupName" header-align="center" label="电池组名称">
			<el-table-column prop="BattGroupName" align="center" label="电池组名称">
			</el-table-column>
			<el-table-column prop="WarningName" header-align="center" label="告警名称">
			<el-table-column prop="alm_id" align="center" label="告警名称">
			</el-table-column>
			<el-table-column prop="monNum" header-align="center" label="单体编号">
			<el-table-column prop="MonNum" align="center" label="单体编号">
			</el-table-column>
			<el-table-column prop="warningStartTime" header-align="center" label="告警开始时间">
			<el-table-column prop="alm_start_time" align="center" align="center" label="告警开始时间">
			</el-table-column>
			</el-table>
			<el-pagination large style="text-align:center" background layout="prev, pager, next" :total="tbls.warning.page.PageAll" @current-change="warningCurrentChange">
			</el-pagination>
			</div>
			<div class="tab-item" style="display:none" v-show="tabs.active == 'charge'">
			<div class="tab-item-name">{{tbls.charge.name}}</div>

			@@ -182,23 +182,54 @@
			searchAlarmInfo: function searchAlarmInfo() {
			// 查询实时告警信息
			var self = this;
			var page = this.warning.page;
			var page = this.tbls.warning.page;
			// 构造查询条件
			var searchParams = {
			alm_cleared_type: 0,
			page: page
			};
			// 判断是否为手机端
			if (typeof Battalram_dataService == "undefined") {
			if (typeof Battalram_dataService != "undefined") {
			Battalram_dataService.serchByCondition(JSON.stringify(searchParams));
			} else {
			this.setAlarmInfo({
			code: 1,
			cmd_type: 0,
			data: [{
			num: 1,
			BattGroupName: '电池组1',
			MonNum: 1,
			alm_start_time: '2019-12-3 00:00:00',
			alm_id: 2,
			page: {
			PageAll: 40
			}
			}]
			});
			// 开启计时器
			this.tbls.charge.timer.open();
			}
			},
			setAlarmInfo: function setAlarmInfo(res) {
			// 设置实时告警信息
			if (res.code == 1) {
			// 设置数据
			this.tbls.warning.data = res.data;
			// 设置分页
			this.tbls.warning.page.PageAll = res.data[res.data.length - 1].page.PageAll;
			} else {
			// 设置数据
			this.tbls.warning.data = [];
			// 设置分页
			this.tbls.warning.page.PageAll = 0;
			}
			console.log(res);
			},
			// 设置当前页
			warningCurrentChange: function warningCurrentChange(curr) {
			this.tbls.warning.PageCurr = curr;
			// 查询电池告警信息
			this.startSearchAlarmInfo();
			},
			routerTo: function routerTo(path) {
			var routes = this.routes;
			@@ -229,6 +260,9 @@
			// 查询充电测试信息
			this.startReadBattCharInfo();

			// 查询告警
			this.startSearchAlarmInfo();

			// 后台触发事件查询所有的电池组放电信息
			window['DeviceServicereadBattDiscInfocalljs'] = function (res) {
			// 设置电池信息