whychdw
2019-09-02 fbcd9309799ca799b084d814e01da9129179baae
修改内容
3个文件已修改
30 ■■■■■ 已修改文件
Device_Manage/WebRoot/index.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Device_Manage/WebRoot/js/common_functions.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Device_Manage/WebRoot/pages/battery/battery.js 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Device_Manage/WebRoot/index.html
@@ -24,12 +24,12 @@
    
    <script src="js/const_var.js"></script>
    
    <script src="js/common_functions.js?ba55c045e4"></script>
    <script src="js/common_functions.js"></script>
    
    <script src="js/vue.min.js"></script>
    <script src="css/iview/iview.min.js"></script>
    
    <script src="js/components.js?6fb15de846"></script>
    <script src="js/components.js"></script>
    
    <script src="index.js"></script>
</body>
Device_Manage/WebRoot/js/common_functions.js
@@ -1,6 +1,6 @@
'use strict';
//const CORS= 'http://192.168.7.113:8080/Device_Manage/';        // 开启跨域请求(调试时开启)
// const CORS= 'http://192.168.7.113:8080/Device_Manage/';        // 开启跨域请求(调试时开启)
var CORS = ''; // 关闭跨域请求(发布时开启)
//定义计时器
Device_Manage/WebRoot/pages/battery/battery.js
@@ -11,11 +11,8 @@
        loading: ''
    },
    loaded: function loaded(require, exports, module) {
        this.loading = bui.loading();
        var loading = this.loading = bui.loading();
        this.loading.show();
    },
    show: function show() {
        var loading = this.loading;
        var bs = bui.store({
            scope: 'page',
            data: {}
@@ -134,7 +131,7 @@
                                var data = rs.data;
                                for (var i = 0; i < data.length; i++) {
                                    var _data = data[i];
                                    // console.log(_data);
                                    //console.log(_data);
                                    _data.title = _data.StationName3;
                                }
                                self.devInfos.list = data;
@@ -180,6 +177,7 @@
                handlerListClick: function handlerListClick(item) {
                    this.setDevInfo(this.formateListData(item));
                    this.startBattInfo(item.FBSDeviceId);
                    console.log(this.uiSidebar);
                    this.uiSidebar.close();
                },
                formateListData: function formateListData(data) {
@@ -228,23 +226,21 @@
                // 关闭等待框
                loading.hide();
                // 脚本都需要在这里执行
                var uiTab = bui.tab({
                    id: "#uiTab"
                });
                // 获取所有设备的信息
                this.searchDevice();
                // 侧边栏
                this.uiSidebar = bui.sidebar({
                    id: "#sidebarWrap", //菜单的ID(必须)
                    width: 500,
                    trigger: "#menu",
                    isActive: true,
                    onInited: function onInited() {
                        // 获取所有设备的信息
                        self.searchDevice();
                    }
                    isActive: true
                });
                this.uiSidebar.open();
                // 脚本都需要在这里执行
                var uiTab = bui.tab({
                    id: "#uiTab"
                });
                router.preload({
                    url: 'pages/battery/batteryInfo.html'
                });