Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/nmms_import/OrigFlightList.vue

@@ -24,11 +24,9 @@ export const setUserRole = params => { return http.put(`${baseUrl}/roleset`,para
 export const resetToken = params => { return http.put(`${baseUrl}/resetToken`,params)};
 export const resetToken = params => { return http.put(`${baseUrl}/resetToken`,params)};
 
 
 export const loginedUserInfo = () => {
 export const loginedUserInfo = () => {
-    console.log("获取用户信息:")
     let session_user_info = sessionStorage.getItem('user');
     let session_user_info = sessionStorage.getItem('user');
     if (session_user_info && jsutil.checkNull(session_user_info)){
     if (session_user_info && jsutil.checkNull(session_user_info)){
         let user =  JSON.parse(sessionStorage.getItem('user'));
         let user =  JSON.parse(sessionStorage.getItem('user'));
-        console.log("获取用户信息:"+sessionStorage.getItem('user'))
         return user;
         return user;
     }else {
     }else {
         // Message({
         // Message({
@@ -36,7 +34,15 @@ export const loginedUserInfo = () => {
         //     type:"error",
         //     type:"error",
         // });
         // });
         return {
         return {
-            username:""
-        };
+                userId: 0,
+                username: '',
+                companyId: 0,
+                companyName: '',
+                realname: '',
+                userface: '',
+                companyInfo:{
+                    departmentid:"00"
+                }
+        }
     }
     }
 };
 };

@@ -91,16 +91,6 @@ var axois_init = {
                 sessionStorage.removeItem('user');
                 sessionStorage.removeItem('user');
                 sessionStorage.removeItem('menu');
                 sessionStorage.removeItem('menu');
                 sessionStorage.removeItem('token');
                 sessionStorage.removeItem('token');
-                this.$store.commit('set_user_menu', []);
-                this.$store.commit('set_user_info', {
-                    userId: 0,
-                    username: '',
-                    companyId: 0,
-                    companyName: '',
-                    realname: '',
-                    userface: '',
-                    companyInfo:{}
-                });
                 axios.defaults.headers.common['Authorization'] = undefined;
                 axios.defaults.headers.common['Authorization'] = undefined;
                 next()
                 next()
             }else{
             }else{

@@ -18,7 +18,9 @@
                 <div>
                 <div>
                     <el-col :span="24" class="content-wrapper">
                     <el-col :span="24" class="content-wrapper">
                         <transition name="fade" mode="out-in">
                         <transition name="fade" mode="out-in">
+                            <keep-alive>
                                 <router-view></router-view>
                                 <router-view></router-view>
+                            </keep-alive>
                         </transition>
                         </transition>
                     </el-col>
                     </el-col>
                 </div>
                 </div>

@@ -266,6 +266,23 @@
             changePass:function(){
             changePass:function(){
                 this.dialogFormVisible=true;
                 this.dialogFormVisible=true;
             },
             },
+            updateCache:function(){
+                resetToken().then( res =>{
+                    let response  = res.data;
+                    if (response.code === '200'){
+                        this.$notify({
+                            title: '成功',
+                            message: '缓存更新成功',
+                            type: 'success'
+                        });
+                    }else{
+                        this.$notify.error({
+                            title: '失败',
+                            message: '缓存更新失败'
+                        });
+                    }
+                })
+            },
         },
         },
 
 
         computed: {
         computed: {
@@ -276,13 +293,6 @@
 
 
             this.checkUpdate();
             this.checkUpdate();
             var _this = this;
             var _this = this;
-            var user = loginuserInfo;
-            if (user) {
-                this.sysUserName = user.username || '';
-                this.sysUserId=user.userId||'';
-
-                this.sysUserAvatar = user.userface || '~img/faceDefault.jpg';
-            }
             //操作路由,判断本地存储的用户栏目列表是否存在，如果存在则加载路由
             //操作路由,判断本地存储的用户栏目列表是否存在，如果存在则加载路由
             var userRouters = sessionStorage.getItem('menu');
             var userRouters = sessionStorage.getItem('menu');
             if (userRouters) {
             if (userRouters) {

@@ -174,6 +174,16 @@
         }
         }
     },
     },
       mounted:function () {
       mounted:function () {
+          this.$store.commit('set_user_menu', []);
+          this.$store.commit('set_user_info', {
+            userId: 0,
+            username: '',
+            companyId: 0,
+            companyName: '',
+            realname: '',
+            userface: '',
+            companyInfo:{}
+          });
           const _this = this
           const _this = this
           window.onresize = () => {
           window.onresize = () => {
               const windowWidth = document.body.clientWidth
               const windowWidth = document.body.clientWidth

@@ -191,6 +191,7 @@
 	import { getList, remove, batchRemove, edit, add } from '../../api/perm_api';
 	import { getList, remove, batchRemove, edit, add } from '../../api/perm_api';
 	import moment from 'moment'
 	import moment from 'moment'
 	export default {
 	export default {
+		name:'Perm',
 		data() {
 		data() {
 			return {
 			return {
 				filters: {
 				filters: {
@@ -450,7 +451,7 @@
 		},
 		},
 		mounted() {
 		mounted() {
 			this.getTableList();
 			this.getTableList();
-			this.cascaderOptions = this.$router.options.routes;
+			// this.cascaderOptions = this.$router.options.routes;
 		}
 		}
 	}
 	}
 
 

@@ -187,6 +187,7 @@
     import { getList as permList } from '../../api/perm_api';
     import { getList as permList } from '../../api/perm_api';
     import moment from 'moment'
     import moment from 'moment'
 	export default {
 	export default {
+    	name:'Role',
 		data() {
 		data() {
 			return {
 			return {
 				filters: {
 				filters: {

@@ -220,6 +220,7 @@
 	import { getList as getRoleList} from '../../api/role_api';
 	import { getList as getRoleList} from '../../api/role_api';
     import moment from 'moment'
     import moment from 'moment'
 	export default {
 	export default {
+    	name:'User',
 		data() {
 		data() {
 			var validatePass = (rule, value, callback) => {
 			var validatePass = (rule, value, callback) => {
 				if (value === '') {
 				if (value === '') {

@@ -740,6 +740,7 @@
     import {mapActions, mapGetters} from 'vuex'
     import {mapActions, mapGetters} from 'vuex'
     import {loginedUserInfo} from "../../api/user";
     import {loginedUserInfo} from "../../api/user";
     export default {
     export default {
+        name:'Origmaster',
         data() {
         data() {
             /*初始数据*/
             /*初始数据*/
             return {
             return {

@@ -968,7 +968,7 @@
     .toolbar{
     .toolbar{
         height: 60px;
         height: 60px;
         background-color: white;
         background-color: white;
-        line-height: 60px;
+        /*line-height: 60px;*/
         vertical-align: middle;
         vertical-align: middle;
         border-radius: 5px 5px 5px 5px;
         border-radius: 5px 5px 5px 5px;
         padding: 15px 0 0 20px;
         padding: 15px 0 0 20px;