修改页面表格刷新规则

whychdw

2019-09-25 ee64f8201335dbd6611381a1de6407e993575bfe

修改页面表格刷新规则

 Device_Manage/WebRoot/index.html

@@ -9,7 +9,7 @@
    <link rel="stylesheet" href="css/bui.css">

    <link rel="stylesheet" href="css/style.css">

    <link rel="stylesheet" href="css/iconfont/iconfont.css">

    <link rel="stylesheet" href="css/commons.css">

    <link rel="stylesheet" href="css/commons.css?12c28f2299">

    <link rel="stylesheet" href="css/iview/styles/iview.css">

</head>



@@ -31,7 +31,7 @@
    

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

    

    <script src="js/common_functions.js?97536446f3"></script>

    <script src="js/common_functions.js?4768fa2a26"></script>

    

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

    


 Device_Manage/WebRoot/js/common_functions.js

@@ -376,3 +376,108 @@
    }
    return str;
}

// 对数据进行处理
var HandleData = function HandleData() {};
// 处理数据
HandleData.prototype.handle = function (oldData, newData, keys) {
    var result = {
        del: [],
        add: []
    };
    // 添加被删除的数据
    this._addDel(result, oldData, newData, keys);

    // 添加被添加的数据
    this._addAdd(result, oldData, newData, keys);

    // 删除数据
    this._del(result, oldData, keys);

    // 添加数据
    this._add(result, oldData, keys);
};
// 添加被删除的数据
HandleData.prototype._addDel = function (result, oldData, newData, keys) {
    // 遍历old数据并和newData对比,筛选出需要删除的数据
    for (var i = 0; i < oldData.length; i++) {
        var _oldData = oldData[i];
        var exist = this.checkExistObj(_oldData, newData, keys);
        if (!exist) {
            result.del.push(_oldData);
        }
    }
};

// 添加被添加的数据
HandleData.prototype._addAdd = function (result, oldData, newData, keys) {
    // 遍历new数据和old数据对比，筛选出需要添加的数据
    for (var i = 0; i < newData.length; i++) {
        var _newData = newData[i];
        var exist = this.checkExistObj(_newData, oldData, keys);
        if (!exist) {
            result.add.push(_newData);
        }
    }
};

// 删除数据
HandleData.prototype._del = function (result, oldData, keys) {
    // 删除数据
    for (var i = 0; i < result.del.length; i++) {
        var del = result.del[i];
        for (var k = 0; k < oldData.length; k++) {
            var _oldData = oldData[k];
            var equal = this.checkObjEqual(_oldData, del, keys);
            if (equal || typeof equal == 'undefined') {
                oldData.splice(k, 1);
                break;
            }
        }
    }
};

// 添加数据
HandleData.prototype._add = function (result, oldData, keys) {
    // 添加数据
    for (var i = 0; i < result.add.length; i++) {
        var add = result.add[i];
        oldData.push(add);
    }
};

// 检测对象是否存在于对象集合
HandleData.prototype.checkExistObj = function (obj, list, keys) {
    var exist = false;
    // 遍历list
    for (var i = 0; i < list.length; i++) {
        var _list = list[i];
        // 遍历键值集合
        var equal = this.checkObjEqual(obj, _list, keys);
        // 对象与对象集合中第i个等效
        if (equal) {
            exist = true;
            break;
        }
    }
    // 返回内容
    return exist;
};

// 检测对象是否等效(返回undefined说明keys存在问题)
HandleData.prototype.checkObjEqual = function (obj1, obj2, keys) {
    // 遍历键值集合
    var equal = true;
    for (var k = 0; k < keys.length; k++) {
        var key = keys[k];
        if (obj1.hasOwnProperty(key) && obj2.hasOwnProperty(key)) {
            if (obj1[key] != obj2[key]) {
                equal = false;
                break;
            }
        } else {
            equal = undefined;
        }
    }
    return equal;
};

 Device_Manage/WebRoot/pages/main/main.js

@@ -14,6 +14,7 @@
    var vm = new Vue({
        el: bs.$el[0],
        data: {
            handleData: new HandleData(),
            addressModal: {
                address: '',
                port: '',
@@ -257,8 +258,11 @@
            },
            saveAddress: function saveAddress() {
                var address = this.addressModal;
                bui.alert(address.address);
                bui.alert(address.port);
                try {
                    Android.saveServerInfo(address.address, address.port);
                    var result = Android.saveServerInfo(address.address, Number(address.port));
                    bui.alert(result);
                } catch (e) {
                    this.$Message.warning('保存失败，请检查当前运行环境！');
                }
@@ -333,12 +337,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;
                            }

                            // 添加数据
                            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() {
@@ -369,7 +384,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() {
@@ -401,7 +417,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() {

 Device_Manage/src/com/fgkj/db/DBUtil.java

@@ -18,7 +18,7 @@
    

    private static String username="root";

    private static String password="lmx8688139";

    private static String url="jdbc:mysql://118.89.139.230:3360/db_user";

    private static String url="jdbc:mysql://49.234.20.113:3360/db_user";

    //private static String url="jdbc:mysql://123.207.82.239:3360/db_user";

    //private static String url="jdbc:mysql://192.168.0.34:3360/db_user";

    //private static String url="jdbc:mysql://127.0.0.1:3360/db_user";