From 20e9ed291e6ff2eceed90ee41e0a9cb4ccb2a28b Mon Sep 17 00:00:00 2001
From: whychdw <49690745@qq.com>
Date: 星期四, 10 十月 2019 09:57:15 +0800
Subject: [PATCH] 提交内容
---
dist/pages/main/main.js | 87 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 82 insertions(+), 5 deletions(-)
diff --git a/dist/pages/main/main.js b/dist/pages/main/main.js
index 5418ead..5188516 100644
--- a/dist/pages/main/main.js
+++ b/dist/pages/main/main.js
@@ -14,6 +14,13 @@
var vm = new Vue({
el: bs.$el[0],
data: {
+ handleData: new HandleData(),
+ addressModal: {
+ address: '',
+ port: '',
+ show: false,
+ notSave: true
+ },
block: {
main: 0,
block1: 0,
@@ -199,6 +206,12 @@
}, {
path: 'system',
url: '../system/system.html'
+ }, {
+ path: 'address',
+ url: '../system/address.html'
+ }, {
+ path: 'history',
+ url: '../history/history.html'
}]
},
methods: {
@@ -207,6 +220,57 @@
if (url) {
router.load({ url: url, param: {} });
}
+ },
+ handerClickAlert: function handerClickAlert(str) {
+ switch (str) {
+ case 'address':
+ this.showAddressModal();
+ break;
+ }
+ },
+ showAddressModal: function showAddressModal() {
+ this.addressModal.show = true;
+ this.addressModal.notSave = true;
+ },
+ chagneSaveBtn: function chagneSaveBtn() {
+ this.addressModal.notSave = true;
+ },
+ testAddress: function testAddress() {
+ var url = 'http://' + this.addressModal.address + ':' + this.addressModal.port + '/Device_Manage/';
+ var self = this;
+ var searchParams = {
+ num: 2
+ };
+ var json = JSON.stringify(searchParams);
+ // 璇锋眰鍚庡彴
+ $.ajax({
+ type: 'post',
+ async: true,
+ url: url + "Batt_rtstateAction!serchByInfo",
+ data: 'json=' + json,
+ dataType: 'json',
+ timeout: 2000,
+ success: function success(res) {
+ self.$Message.info('娴嬭瘯杩炴帴鎴愬姛锛屽彲浠ヤ繚瀛樺湴鍧�锛�');
+ self.addressModal.notSave = false;
+ },
+ error: function error() {
+ self.$Message.error('娴嬭瘯杩炴帴澶辫触锛岃妫�鏌ヨ緭鍏ョ殑鍦板潃锛�');
+ }
+ });
+ },
+ saveAddress: function saveAddress() {
+ var address = this.addressModal;
+ bui.alert(address.address);
+ bui.alert(address.port);
+ try {
+ var result = Android.saveServerInfo(address.address, Number(address.port));
+ bui.alert(result);
+ } catch (e) {
+ this.$Message.warning('淇濆瓨澶辫触锛岃妫�鏌ュ綋鍓嶈繍琛岀幆澧冿紒');
+ }
+
+ this.addressModal.show = false;
},
getUrl: function getUrl(str) {
var url = '';
@@ -276,12 +340,23 @@
var rs = JSON.parse(res.result);
if (rs.code == 1) {
var data = rs.data;
- // console.log(data);
+ // console.log(self.tbls.alarm);
+ var page = self.tbls.alarm.page;
+ var alarmNum = page.pageCurr * page.pageSize;
// 璁剧疆涓嶅彲鐐瑰嚮
- if (data.length < 6) {
+ if (alarmNum >= self.numbers.alarms) {
self.tbls.alarm.pageBtn.next = true;
+ } else {
+ self.tbls.alarm.pageBtn.next = false;
}
- self.tbls.alarm.data = data;
+
+ // 娣诲姞鏁版嵁
+ if (self.tbls.alarm.data.length == 0) {
+ console.log(data);
+ self.tbls.alarm.data = data;
+ } else {
+ self.handleData.handle(self.tbls.alarm.data, data, ['num', 'alm_start_time']);
+ }
}
},
complete: function complete() {
@@ -312,7 +387,8 @@
var rs = JSON.parse(res.result);
if (rs.code == 1) {
var data = rs.data;
- self.tbls.charge.data = data;
+ // self.tbls.charge.data = data;
+ self.handleData.handle(self.tbls.charge.data, data, ['num', 'batt_test_starttime']);
}
},
complete: function complete() {
@@ -344,7 +420,8 @@
if (rs.code == 1) {
var data = rs.data;
// console.log(data);
- self.tbls.discharge.data = data;
+ // self.tbls.discharge.data = data;
+ self.handleData.handle(self.tbls.discharge.data, data, ['num', 'batt_test_starttime']);
}
},
complete: function complete() {
--
Gitblit v1.9.1