优化一些东西

@@ -99,7 +99,7 @@ var axois_init = {
                     axios.defaults.headers.common['Authorization'] = sessionStorage.getItem('token');
                     axios.defaults.headers.common['Authorization'] = sessionStorage.getItem('token');
                 }
                 }
 
 
-                if (!jsutil.checkNull(user) && to.path != '/login' && !sessionStorage.getItem('menu') && !sessionStorage.getItem('token')) {
+                if (!jsutil.checkNull(user) && to.path != '/login' && !jsutil.checkNull(sessionStorage.getItem('token')) && !jsutil.checkNull(sessionStorage.getItem('menu'))) {
                     next({ path: '/login' })
                     next({ path: '/login' })
                 }else{
                 }else{
                     next()
                     next()

@@ -228,7 +228,7 @@
             checkUpdate() {
             checkUpdate() {
                 axios.get('/static/nmmsVer.json').then(function(response) {
                 axios.get('/static/nmmsVer.json').then(function(response) {
                     // 判断版本号是否与本地一致
                     // 判断版本号是否与本地一致
-                    if (response.data.nmmsVer != localStorage.getItem('nmmsVer')) {
+                    if (response && response.data.nmmsVer != localStorage.getItem('nmmsVer')) {
                         localStorage.setItem('nmmsVer', response.data.nmmsVer)
                         localStorage.setItem('nmmsVer', response.data.nmmsVer)
                         location.reload()
                         location.reload()
                     } else {
                     } else {

@@ -145,16 +145,11 @@
                             //设置token,设置axios 基本配置,但是刷新后 这个登录保存的就没了
                             //设置token,设置axios 基本配置,但是刷新后 这个登录保存的就没了
                             axios.defaults.headers.common['Authorization'] = 'Bearer '+token;
                             axios.defaults.headers.common['Authorization'] = 'Bearer '+token;
                             //处理用户menu
                             //处理用户menu
-                            // _this.userMenus =  loginUserMenus.list;
-                            // console.log("userMenus:");
-                            // console.log(_this.userMenus);
-                            // console.log(loginUserMenus.list);
-                            // let sysMenus = _this.$router.options.routes;
+                            _this.userMenus =  loginUserMenus.list;
+                            let sysMenus = _this.$router.options.routes;
 
 
-                            // console.log("sysMenus:");
-                            // console.log(sysMenus);
 
 
-                            // _this.handleMenuList(_this.$router.options.routes,_this.userMenus);
+                            _this.handleMenuList(_this.$router.options.routes,_this.userMenus);
 
 
                             // console.log("user:");
                             // console.log("user:");
                             // console.log(_this.$router.options.routes);
                             // console.log(_this.$router.options.routes);

@@ -338,8 +338,17 @@
             //条件查询方法
             //条件查询方法
             QueryData(){
             QueryData(){
                 if(jsutil.checkNull(this.defaultQuery.awba)||jsutil.checkNull(this.defaultQuery.flightdate)){
                 if(jsutil.checkNull(this.defaultQuery.awba)||jsutil.checkNull(this.defaultQuery.flightdate)){
-                    let params={currentPage:this.currentPage,pageSize:this.pageSize,awba:this.defaultQuery.awba,carrier:this.defaultQuery.carrier,
-                        flightno:this.defaultQuery.flightno,flightdate:this.defaultQuery.flightdate,status:this.defaultQuery.status,messageType:this.defaultQuery.messageType,departmentid:loginedUserInfo().companyInfo.departmentid};
+                    let params={
+                        currentPage:this.currentPage,
+                        pageSize:this.pageSize,
+                        awba:this.defaultQuery.awba,
+                        carrier:this.defaultQuery.carrier,
+                        flightno:this.defaultQuery.flightno,
+                        flightdate:this.defaultQuery.flightdate,
+                        status:this.defaultQuery.status,
+                        messageType:this.defaultQuery.messageType,
+                        departmentid:loginedUserInfo().companyInfo.departmentid
+                    };
                     this.tableloading=true;
                     this.tableloading=true;
                     QueryData(params).then(res =>{
                     QueryData(params).then(res =>{
                         let response=res.data.data;
                         let response=res.data.data;

@@ -4,7 +4,7 @@
             <el-row class="row-bg">
             <el-row class="row-bg">
                 <el-col :span="24"><div class="grid-content content co">进港舱单统计</div></el-col>
                 <el-col :span="24"><div class="grid-content content co">进港舱单统计</div></el-col>
             </el-row>
             </el-row>
-            <el-row style="display: block;background-color: white">
+            <el-row style="display: block;background-color: white;height:500px;">
                 <el-row>
                 <el-row>
                     <el-col :span="5">
                     <el-col :span="5">
                         <span>
                         <span>