Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pcmgr

# Conflicts:
#	vue.config.js

src/layout/components/common/tree.vue

@@ -46,7 +46,7 @@ const _ = require('lodash');
 export default {
   data() {
     return {
-      compId: sessionStorage.getItem('enterprise-front-companyId'),
+      compId: localStorage.getItem('enterprise-front-companyId'),
       centerDialogVisible: false,
       addSection: {
         compId: '',

src/layout/components/navigation.vue

@@ -157,8 +157,8 @@ export default {
   name: 'Navigation',
   data() {
     return {
-      userName: sessionStorage.getItem('enterprise-front-userRealName'),
-      companyName: sessionStorage.getItem('enterprise-front-companyName'),
+      userName: localStorage.getItem('enterprise-front-userRealName'),
+      companyName: localStorage.getItem('enterprise-front-companyName'),
       uploadUserFlag: false,
       uploadTitle:'',
       loginMsgRules:{
@@ -314,7 +314,7 @@ export default {
               type: 'success',
               showClose: true,
             });
-            sessionStorage.setItem('enterprise-front-userRealName', this.userList[index].staffName)
+            localStorage.setItem('enterprise-front-userRealName', this.userList[index].staffName)
             let dom = document.getElementsByClassName("hello-title")[0]
             dom.textContent = dom.textContent.split('，')[0] + '，' + this.userList[index].staffName
             this.userName = this.userList[index].staffName
@@ -442,15 +442,15 @@ export default {
         if(this.lastStepFlag){
           data = {
             mobilePhone,
-            domainName: sessionStorage.getItem('enterprise-front-domainName'),
-            companyId: sessionStorage.getItem('enterprise-front-companyId')
+            domainName: localStorage.getItem('enterprise-front-domainName'),
+            companyId: localStorage.getItem('enterprise-front-companyId')
           };
         }else{
           data = {
             mobilePhone,
-            domainName: sessionStorage.getItem('enterprise-front-domainName'),
+            domainName: localStorage.getItem('enterprise-front-domainName'),
             userKind : "STAFF",
-            companyId: sessionStorage.getItem('enterprise-front-companyId')
+            companyId: localStorage.getItem('enterprise-front-companyId')
           };
         }
         sendMsg(data).then(() => {

src/layout/components/tree.vue

@@ -46,7 +46,7 @@ const _ = require('lodash');
 export default {
   data() {
     return {
-      compId: sessionStorage.getItem('enterprise-front-companyId'),
+      compId: localStorage.getItem('enterprise-front-companyId'),
       centerDialogVisible: false,
       addSection: {
         compId: '',

src/permission.js

@@ -6,7 +6,7 @@ import { ftruncate } from 'fs'
 const whiteList = ['/login']
 
 router.beforeEach(async (to, _, next) => {
-  // 用户刷新页面，sessionStorage还在，但vuex.store里的东西会reset
+  // 用户刷新页面，localStorage还在，但vuex.store里的东西会reset
   const hasToken = getToken()
   if (hasToken) {
     if (to.path === '/login') {

src/store/getters.js

@@ -9,7 +9,7 @@ const getters = {
       return state.user.serviceType
     }
     if (!state.user.serviceType) {
-      return sessionStorage.getItem('set_service_type')
+      return localStorage.getItem('set_service_type')
     }
   },
   companyLogo: state => state.user.companyLogo,

src/store/modules/user.js

@@ -29,7 +29,7 @@ const mutations = {
   },
   SET_SERVICE_TYPE: (context, serviceType) => {
     context.serviceType = serviceType;
-    sessionStorage.setItem('set_service_type', serviceType)
+    localStorage.setItem('set_service_type', serviceType)
   },
 };
 

src/utils/auth.js

@@ -2,13 +2,13 @@
 const TokenKey = 'enterprise-front-admin-token';
 
 export function getToken() {
-  return sessionStorage.getItem(TokenKey);
+  return localStorage.getItem(TokenKey);
 }
 
 export function setToken(token) {
-  return sessionStorage.setItem(TokenKey, token)
+  return localStorage.setItem(TokenKey, token)
 }
 
 export function clearStorage() {
-  return sessionStorage.clear();
+  return localStorage.clear();
 }

src/views/bayed/bayed.vue

@@ -63,7 +63,7 @@ export default {
       });
     },
     goDetail (data) {
-      sessionStorage.setItem('enterprise-front-pluginId', data);
+      localStorage.setItem('enterprise-front-pluginId', data);
       this.$router.push({
         name: 'bayedDetail',
       });

src/views/bayed/bayedDetail.vue

@@ -57,7 +57,7 @@ export default {
     };
   },
   created() {
-    this.pluginId = sessionStorage.getItem('enterprise-front-pluginId');
+    this.pluginId = localStorage.getItem('enterprise-front-pluginId');
     this.getPluginsDetail();
   },
   filters: {

src/views/businessSettings/businessSettings.vue

@@ -509,7 +509,7 @@ export default {
       if (value === 0) {
         this.getCompany();
         this.allCoins = await getSystemConsts({
-          compId: sessionStorage.getItem('enterprise-front-companyId'),
+          compId: localStorage.getItem('enterprise-front-companyId'),
           constCode: 'CURRENCY'
         })
       } else if (value === 2) {
@@ -572,7 +572,7 @@ export default {
         const data = {
           mobilePhone,
           domainName: 'yh',
-          companyId: sessionStorage.getItem('enterprise-front-companyId')
+          companyId: localStorage.getItem('enterprise-front-companyId')
         };
         sendMsg(data).then(() => {
           this.$message({

src/views/businessSettings/shipManagement.vue

@@ -12,7 +12,7 @@ export default {
     return {
       url: `${
         process.env.VUE_APP_TB_SERV_API
-      }/login.jsp?token=${sessionStorage.getItem("ws-pf_token")}`
+      }/login.jsp?token=${localStorage.getItem("ws-pf_token")}`
     };
   },
   created() {},

src/views/check-flow/index.vue

@@ -382,7 +382,7 @@ export default {
       overdueTime: 0,
       overdueTimeUnit: 'HOUR',
       checkList: [],
-      compId: sessionStorage.getItem('enterprise-front-companyId')
+      compId: localStorage.getItem('enterprise-front-companyId')
     };
   },
   watch: {
@@ -437,7 +437,7 @@ export default {
       this.allPersons = res.records;
     },
     async getAllRoles () {
-      const res = await queryAllRolesInCompany({ compId: sessionStorage.getItem('enterprise-front-companyId') });
+      const res = await queryAllRolesInCompany({ compId: localStorage.getItem('enterprise-front-companyId') });
       this.allRoles = res[0].children;
     },
     async getDialogDepartments () {
@@ -486,12 +486,12 @@ export default {
       this.rightLoading = false;
     },
     async getCompanyDepartments () {
-      if (!sessionStorage.getItem('enterprise-front-companyId')) {
+      if (!localStorage.getItem('enterprise-front-companyId')) {
         this.$message.error('没找到对应的公司ID');
         return;
       }
       const res = await getTreeList({
-        compId: sessionStorage.getItem('enterprise-front-companyId')
+        compId: localStorage.getItem('enterprise-front-companyId')
       });
       return res[0].children;
     },

src/views/companyInfo/companyInfoIndex.vue

@@ -255,7 +255,7 @@ export default {
       url: "",
       title: "",
       deptId: "",
-      compId: sessionStorage.getItem("enterprise-front-companyId"),
+      compId: localStorage.getItem("enterprise-front-companyId"),
       checklist: [],
       list: false,
       headState: "/organization",
@@ -334,7 +334,7 @@ export default {
   methods: {
     async basicInfo() {
       this.curyencyList = await getSystemConsts({
-        compId: sessionStorage.getItem("enterprise-front-companyId"),
+        compId: localStorage.getItem("enterprise-front-companyId"),
         constCode: "CURRENCY"
       });
     },
@@ -465,7 +465,7 @@ export default {
           this.companyInfoList.compHeadimg =
             "http://winsea-saas-test.oss-cn-shanghai.aliyuncs.com/default-logo.png";
         }
-        sessionStorage.setItem(
+        localStorage.setItem(
           "enterprise-front-companyLogo",
           this.companyInfoList.compHeadimg
         );

src/views/companyInfo/tree.vue

@@ -61,7 +61,7 @@ export default {
         deptName_en: '',
         parentDeptId: ''
       },
-      compId: sessionStorage.getItem('enterprise-front-companyId'),
+      compId: localStorage.getItem('enterprise-front-companyId'),
       datamsg: [],
     };
   },

src/views/home/home.vue

@@ -116,20 +116,20 @@ export default {
       zhuye: false,
       helloTitle: "",
       days: "",
-      helloAdmin: sessionStorage.getItem("enterprise-front-userRealName"),
-      companyName: sessionStorage.getItem("enterprise-front-companyName"),
-      companyLogo: !sessionStorage.getItem("enterprise-front-companyLogo")
+      helloAdmin: localStorage.getItem("enterprise-front-userRealName"),
+      companyName: localStorage.getItem("enterprise-front-companyName"),
+      companyLogo: !localStorage.getItem("enterprise-front-companyLogo")
         ? require("../../static/images/page/login/login.png")
-        : sessionStorage.getItem("enterprise-front-companyLogo"),
+        : localStorage.getItem("enterprise-front-companyLogo"),
       headState: "/home",
       homeContent: {}
       // url: `${
       //   process.env.VUE_APP_TB_SERV_API
-      // }/login.jsp?token=${sessionStorage.getItem("ws-pf_token")}`
+      // }/login.jsp?token=${localStorage.getItem("ws-pf_token")}`
     };
   },
   created() {
-    this.getIndexCompany(sessionStorage.getItem("enterprise-front-companyId"));
+    this.getIndexCompany(localStorage.getItem("enterprise-front-companyId"));
     // this.zhuye = true
     this.restTimer();
     this.getNowHour();
@@ -142,7 +142,7 @@ export default {
         compId: compId
       }).then(response => {
         //this.companyInfoList = response;
-        sessionStorage.setItem(
+        localStorage.setItem(
           "enterprise-front-companyLogo",
           response.compHeadimg
         );
@@ -159,7 +159,7 @@ export default {
     // },
     getHomeCount() {
       const params = {
-        compId: sessionStorage.getItem("enterprise-front-companyId")
+        compId: localStorage.getItem("enterprise-front-companyId")
       };
       homeContent(params)
         .then(response => {
@@ -175,7 +175,7 @@ export default {
         });
     },
     goMessageDetail(value) {
-      sessionStorage.setItem(
+      localStorage.setItem(
         "enterprise-front-systemMessageId",
         JSON.stringify(value)
       );

src/views/home/messageDetail.vue

@@ -31,7 +31,7 @@ export default {
     return {
       headState: '/home',
       msg: 'Welcome to Your messageList.js App',
-      compId: sessionStorage.getItem('enterprise-front-compId'),
+      compId: localStorage.getItem('enterprise-front-compId'),
       messageDetail: {}
     };
   },
@@ -40,7 +40,7 @@ export default {
   },
   methods: {
     messageDetailInit() {
-      this.messageDetail = JSON.parse(sessionStorage.getItem('enterprise-front-systemMessageId'));
+      this.messageDetail = JSON.parse(localStorage.getItem('enterprise-front-systemMessageId'));
       const params = {
         id: this.messageDetail.id
       };

src/views/home/messageList.vue

@@ -59,7 +59,7 @@ export default {
     getHomeCount() {
       this.pageSwitch = false;
       const params = {
-        compId: sessionStorage.getItem('enterprise-front-companyId'),
+        compId: localStorage.getItem('enterprise-front-companyId'),
         currentPage: this.page,
         pageSize: 20
       };
@@ -81,7 +81,7 @@ export default {
     },
 
     goMessageDetail(value) {
-      sessionStorage.setItem('enterprise-front-systemMessageId', JSON.stringify(value));
+      localStorage.setItem('enterprise-front-systemMessageId', JSON.stringify(value));
       this.$router.push({ path: '/messageDetail', name: 'messageDetail' });
     },
 

src/views/jobAuthority/jobAuthority.vue

@@ -156,7 +156,7 @@ export default {
       centerDialogVisible: false,
       /* 添加部门弹窗 */
       addSection: {
-        compId: sessionStorage.getItem('enterprise-front-companyId'),
+        compId: localStorage.getItem('enterprise-front-companyId'),
         deptName: '',
         parentDeptId: ''
       },
@@ -166,7 +166,7 @@ export default {
         total: 0
       },
       jobInfo: {
-        label: sessionStorage.getItem('enterprise-front-companyName')
+        label: localStorage.getItem('enterprise-front-companyName')
       }, // 部门信息
       headState: '/organization',
       clickNavStatus: true, // 部门下有无职务 列表切换
@@ -251,7 +251,7 @@ export default {
     getNewJob() {
       this.jobName = '';
       this.messageBox = true;
-      if (this.jobInfo.label === sessionStorage.getItem('enterprise-front-companyName')) {
+      if (this.jobInfo.label === localStorage.getItem('enterprise-front-companyName')) {
         this.deptList.jobName = '';
         this.modifyText = '设置';
         this.modifyStatus = false;
@@ -384,8 +384,8 @@ export default {
             roleId: this.msg.roleId
           }
         });
-        sessionStorage.setItem('enterprise-front-roleId', this.msg.roleId);
-        sessionStorage.setItem('enterprise-front-deptId', this.msg.deptId);
+        localStorage.setItem('enterprise-front-roleId', this.msg.roleId);
+        localStorage.setItem('enterprise-front-deptId', this.msg.deptId);
       }
     },
     /* 按钮删除角色 */

src/views/jobAuthority/jobScope.vue

@@ -133,11 +133,11 @@ export default {
   },
   data() {
     return {
-      compId: sessionStorage.getItem('enterprise-front-companyId'),
+      compId: localStorage.getItem('enterprise-front-companyId'),
       centerDialogVisible: false,
       /* 添加部门弹窗 */
       addSection: {
-        compId: sessionStorage.getItem('enterprise-front-companyId'),
+        compId: localStorage.getItem('enterprise-front-companyId'),
         deptName: '',
         parentDeptId: ''
       },
@@ -149,7 +149,7 @@ export default {
       treeData: [], // 展开成一维数组，并加父级属性标识
       roleId: '', // 跳转传过来的角色id
       deptId: '', // 跳转传过来的部门id
-      companyName: sessionStorage.getItem('enterprise-front-companyName') // 获取公司名称
+      companyName: localStorage.getItem('enterprise-front-companyName') // 获取公司名称
     };
   },
   computed: {
@@ -180,7 +180,7 @@ export default {
     /* 获取当前角色详情 */
     getJumpRoleInfo() {
       const data = {
-        roleId: this.roleId ? this.roleId : sessionStorage.getItem('enterprise-front-roleId')
+        roleId: this.roleId ? this.roleId : localStorage.getItem('enterprise-front-roleId')
       };
       getRoleInfo(data).then((response) => {
         this.jumpRole = response;
@@ -190,7 +190,7 @@ export default {
     /* 获取插件列表 */
     getPluginList() {
       getlist({
-        tenantId: sessionStorage.getItem('enterprise-front-tenantId')
+        tenantId: localStorage.getItem('enterprise-front-tenantId')
       }).then((response) => {
         this.queryList = response;
         this.setDefaultChecked(this.queryList);
@@ -252,7 +252,7 @@ export default {
         this.deepFind(item, checkedList);
       })
       const data = {
-        roleId: this.roleId ? this.roleId : sessionStorage.getItem('enterprise-front-roleId'), // 角色ID
+        roleId: this.roleId ? this.roleId : localStorage.getItem('enterprise-front-roleId'), // 角色ID
         resources: checkedList
       };
       bindResources(data).then(() => {
@@ -294,7 +294,7 @@ export default {
     /* 初始化获取下拉的角色列表 */
     getRoleList() {
       const data = {
-        deptId: this.deptId ? this.deptId : sessionStorage.getItem('enterprise-front-deptId')
+        deptId: this.deptId ? this.deptId : localStorage.getItem('enterprise-front-deptId')
       };
       findRoles(data).then((response) => {
         this.positionList = response.records;
@@ -303,7 +303,7 @@ export default {
     /* 点击下拉中的部门 获取角色列表 */
     getJumpChangRoleList() {
       const data = {
-        deptId: this.deptId ? this.deptId : sessionStorage.getItem('enterprise-front-deptId')
+        deptId: this.deptId ? this.deptId : localStorage.getItem('enterprise-front-deptId')
       };
       findRoles(data).then((response) => {
         this.positionList = response.records;

src/views/jobAuthorityShip/jobAuthority.vue

@@ -105,7 +105,7 @@ export default {
       centerDialogVisible: false,
       /* 添加部门弹窗 */
       addSection: {
-        compId: sessionStorage.getItem('enterprise-front-companyId'),
+        compId: localStorage.getItem('enterprise-front-companyId'),
         deptName: '',
         parentDeptId: ''
       },
@@ -115,7 +115,7 @@ export default {
         total: 0
       },
       jobInfo: {
-        label: sessionStorage.getItem('enterprise-front-companyName')
+        label: localStorage.getItem('enterprise-front-companyName')
       }, // 部门信息
       headState: '/organization',
       clickNavStatus: true, // 部门下有无职务 列表切换
@@ -155,7 +155,7 @@ export default {
   created() {
     this.showLoading = true
     this.getRoleComList();
-    getVesselDeptByCompId({ compId: sessionStorage.getItem('enterprise-front-companyId') }).then((response) => {
+    getVesselDeptByCompId({ compId: localStorage.getItem('enterprise-front-companyId') }).then((response) => {
       this.initDeptList = response
       this.showLoading = false
     });
@@ -171,7 +171,7 @@ export default {
     },
     /* 点击公司名获取所有角色列表 */
     getRoleComList() {
-      getRoleDutyByCompId({ compId: sessionStorage.getItem('enterprise-front-companyId'), vesselBankFlag: 'V' }).then((response) => {
+      getRoleDutyByCompId({ compId: localStorage.getItem('enterprise-front-companyId'), vesselBankFlag: 'V' }).then((response) => {
         this.roleList = response;
         this.page.total = response.length;
       });
@@ -213,8 +213,8 @@ export default {
       });
     },
     settingAuth(row) {
-      sessionStorage.setItem('enterprise-front-roleId', this.msg.roleId);
-      sessionStorage.setItem('enterprise-front-deptId', this.msg.deptId);
+      localStorage.setItem('enterprise-front-roleId', this.msg.roleId);
+      localStorage.setItem('enterprise-front-deptId', this.msg.deptId);
       this.$router.push({
         name: 'jobScopeShip',
         params: {

src/views/jobAuthorityShip/jobScope.vue

@@ -95,11 +95,11 @@ export default {
   },
   data() {
     return {
-      compId: sessionStorage.getItem("enterprise-front-companyId"),
+      compId: localStorage.getItem("enterprise-front-companyId"),
       centerDialogVisible: false,
       /* 添加部门弹窗 */
       addSection: {
-        compId: sessionStorage.getItem("enterprise-front-companyId"),
+        compId: localStorage.getItem("enterprise-front-companyId"),
         deptName: "",
         parentDeptId: ""
       },
@@ -111,7 +111,7 @@ export default {
       treeData: [], // 展开成一维数组，并加父级属性标识
       roleId: "", // 跳转传过来的角色id
       deptId: "", // 跳转传过来的部门id
-      companyName: sessionStorage.getItem("enterprise-front-companyName") // 获取公司名称
+      companyName: localStorage.getItem("enterprise-front-companyName") // 获取公司名称
     };
   },
   created() {
@@ -261,7 +261,7 @@ export default {
     },
     /* 初始化获取下拉的角色列表 */
     getRoleList() {
-      // let data = this.deptId ? this.deptId : sessionStorage.getItem('enterprise-front-deptId')
+      // let data = this.deptId ? this.deptId : localStorage.getItem('enterprise-front-deptId')
       // findRolesShip(data).then((response) => {
       //   this.positionList = response;
       // });
@@ -270,7 +270,7 @@ export default {
     getJumpChangRoleList() {
       const data = this.deptId
         ? this.deptId
-        : sessionStorage.getItem("enterprise-front-deptId");
+        : localStorage.getItem("enterprise-front-deptId");
       const param = { deptId: data };
       findRolesShip(param).then(response => {
         this.positionList = response;

src/views/jobAuthorityShip/tree.vue

@@ -61,7 +61,7 @@ export default {
       },
       ss: '',
       treemsg: '',
-      compId: sessionStorage.getItem('enterprise-front-companyId'),
+      compId: localStorage.getItem('enterprise-front-companyId'),
       msg: '',
       maxexpandId: 6,
       non_maxexpandId: 6,
@@ -101,7 +101,7 @@ export default {
             id: "1",
             index: 1,
             isEdit: false,
-            label: sessionStorage.getItem('enterprise-front-companyName'),
+            label: localStorage.getItem('enterprise-front-companyName'),
             parentId: "-1",
         }]
         const tree = treeObj;

src/views/jobAuthorityShip/treeScope.vue

@@ -60,7 +60,7 @@ export default {
       },
       ss: '',
       treemsg: '',
-      compId: sessionStorage.getItem('enterprise-front-companyId'),
+      compId: localStorage.getItem('enterprise-front-companyId'),
       msg: '',
       maxexpandId: 6,
       non_maxexpandId: 6,
@@ -100,7 +100,7 @@ export default {
           id: '1',
           index: 1,
           isEdit: false,
-          label: sessionStorage.getItem('enterprise-front-companyName'),
+          label: localStorage.getItem('enterprise-front-companyName'),
           parentId: '-1',
         }]
         const tree = treeObj;

src/views/login/index.vue

@@ -156,7 +156,7 @@ export default {
       loginBox: true,
       messageBox: false,
       compOptionList:[],
-      companyName: sessionStorage.getItem('enterprise-front-companyName'),
+      companyName: localStorage.getItem('enterprise-front-companyName'),
       formData: {
         domainName: '',
         username: '',
@@ -323,20 +323,20 @@ export default {
       getCompany().then((res) => {
           this.compOptionList=res
         })
-      sessionStorage.setItem('enterprise-front-domainName', this.formData.domainName);
+      localStorage.setItem('enterprise-front-domainName', this.formData.domainName);
       if (response) {
         if (response.compHeadimg) {
           this.companyLogo = response.compHeadimg;
-          sessionStorage.setItem('enterprise-front-companyLogo', this.companyLogo);
+          localStorage.setItem('enterprise-front-companyLogo', this.companyLogo);
           this.$store.commit('user/SET_LOGO', this.companyLogo);
         } else {
-          sessionStorage.setItem('enterprise-front-companyLogo', '');
+          localStorage.setItem('enterprise-front-companyLogo', '');
         }
         if (response.compName && response.managerInfo.managerName) {
-          sessionStorage.setItem('enterprise-front-companyName', response.compName);
+          localStorage.setItem('enterprise-front-companyName', response.compName);
           this.companyName = response.compName;
-          // sessionStorage.setItem('enterprise-front-companyId', response.compId);
-          // sessionStorage.setItem(
+          // localStorage.setItem('enterprise-front-companyId', response.compId);
+          // localStorage.setItem(
           //  'enterprise-front-userRealName',
           //  response.managerInfo.managerName
           // );
@@ -408,7 +408,7 @@ export default {
         });
       } else {
         let userPas = this.formData.domainName + ',' + this.formData.username.trim() + ',' + this.formData.password + ',' + this.formData.domainName;
-        sessionStorage.setItem("ws-pf_token", this.b64Encode(userPas));
+        localStorage.setItem("ws-pf_token", this.b64Encode(userPas));
 
         const data = {
           companyName: this.formData.domainName,
@@ -430,11 +430,11 @@ export default {
               }
             })
             setToken('Admin-Token');
-            sessionStorage.setItem('enterprise-front-tenantId', response.tenantId);
-            sessionStorage.setItem('enterprise-front-companyId', response.compId);
-            sessionStorage.setItem('enterprise-front-userRealName', response.loginName);
-            sessionStorage.setItem('enterprise-front-tenantType', response.tenantType);
-            sessionStorage.setItem('enterprise-front-customerServiceStaffPhone', response.customerServiceStaffPhone);
+            localStorage.setItem('enterprise-front-tenantId', response.tenantId);
+            localStorage.setItem('enterprise-front-companyId', response.compId);
+            localStorage.setItem('enterprise-front-userRealName', response.loginName);
+            localStorage.setItem('enterprise-front-tenantType', response.tenantType);
+            localStorage.setItem('enterprise-front-customerServiceStaffPhone', response.customerServiceStaffPhone);
             await this.getCompInfo();
             this.$router.push({
               path: this.redirect || '/'

src/views/organization/forbidden.vue

@@ -83,7 +83,7 @@ export default {
     };
   },
   created() {
-    this.datamsg = sessionStorage.getItem('enterprise-front-id');
+    this.datamsg = localStorage.getItem('enterprise-front-id');
     this.getEnabledMsg(this.datamsg);
   },
   methods: {
@@ -115,7 +115,7 @@ export default {
       }
     },
     rowClick(row) {
-      sessionStorage.setItem('enterprise-front-showMsg', row.staffId);
+      localStorage.setItem('enterprise-front-showMsg', row.staffId);
       this.$router.push({
         name: 'showMessage',
         params: row

src/views/organization/orgAddMan.vue

@@ -315,7 +315,7 @@ export default {
       }
     };
     return {
-      compId: sessionStorage.getItem('enterprise-front-companyId'),
+      compId: localStorage.getItem('enterprise-front-companyId'),
       datamsg: '',
       /* 页面传递来的数据 */
       checklist: [{
@@ -416,7 +416,7 @@ export default {
     };
   },
   created() {
-    const msg = JSON.parse(sessionStorage.getItem('enterpriseOrgId'))
+    const msg = JSON.parse(localStorage.getItem('enterpriseOrgId'))
     this.datamsg = msg
     this.ruleForm.deptId = this.datamsg.id;
     this.getbumenmsg();

src/views/organization/orgEdit.vue

@@ -219,7 +219,7 @@ export default {
       selected: [], // 部门默认选中
       selected1: [], // 职务默认选中
       selected2: [], // 船舶默认选中
-      compId: sessionStorage.getItem('enterprise-front-companyId'),
+      compId: localStorage.getItem('enterprise-front-companyId'),
       datamsg: '',
       /* 页面传递来的数据 */
       checklist: [{
@@ -316,7 +316,7 @@ export default {
     };
   },
   created() {
-    const staffId = sessionStorage.getItem('enterprise-front-showMsg');
+    const staffId = localStorage.getItem('enterprise-front-showMsg');
     this.datamsg = this.$route.params;
     this.ruleForm.deptId = this.datamsg.id;
     this.getbumenmsg();

src/views/organization/organization.vue

@@ -142,7 +142,7 @@ export default {
       newAddMan: false,
       title: '',
       deptId: '',
-      compId: sessionStorage.getItem('enterprise-front-companyId'),
+      compId: localStorage.getItem('enterprise-front-companyId'),
       checklist: [],
       list: false,
       headState: '/organization',
@@ -292,7 +292,7 @@ export default {
     },
     skp(msg) {
       if (msg === 'skip1') {
-        sessionStorage.setItem('enterprise-front-showMsg', this.editmsg.staffId);
+        localStorage.setItem('enterprise-front-showMsg', this.editmsg.staffId);
         this.$router.push({
           name: 'orgEdit',
           params: this.editmsg
@@ -325,7 +325,7 @@ export default {
       }
     },
     rowClick(row) {
-      sessionStorage.setItem('enterprise-front-showMsg', row.staffId);
+      localStorage.setItem('enterprise-front-showMsg', row.staffId);
       this.$router.push({
         name: 'showMessage',
         params: {}
@@ -387,7 +387,7 @@ export default {
     },
 
     addman() {
-      sessionStorage.setItem('enterpriseOrgId', JSON.stringify(this.listdata))
+      localStorage.setItem('enterpriseOrgId', JSON.stringify(this.listdata))
       this.$router.push({
         name: 'orgAddMan',
         params: {

src/views/organization/showMessage.vue

@@ -82,7 +82,7 @@ export default {
   name: 'ShowMessang',
   data() {
     return {
-      compId: sessionStorage.getItem('enterprise-front-companyId'),
+      compId: localStorage.getItem('enterprise-front-companyId'),
       statetf: true,
       url: urladdress.urlmsg,
       msg: {
@@ -111,7 +111,7 @@ export default {
     };
   },
   created() {
-    const staffId = sessionStorage.getItem('enterprise-front-showMsg');
+    const staffId = localStorage.getItem('enterprise-front-showMsg');
     this.data = this.$route.params;
     if (this.data.enabled === 0) {
       this.state = '启用';

src/views/organization/tree.vue

@@ -62,7 +62,7 @@ export default {
       },
       ss: '',
       treemsg: '',
-      compId: sessionStorage.getItem('enterprise-front-companyId'),
+      compId: localStorage.getItem('enterprise-front-companyId'),
       msg: '',
       maxexpandId: 6,
       non_maxexpandId: 6,

src/views/organizationNew/crewMembers.vue

@@ -312,7 +312,7 @@ export default {
         roleName: [{ required: true, trigger: "change" }]
       },
       page: {
-        compId: sessionStorage.getItem("enterprise-front-companyId"),
+        compId: localStorage.getItem("enterprise-front-companyId"),
         underCompId: "",
         deptId: "",
         enabled: "1",
@@ -355,7 +355,7 @@ export default {
       shoreBasedMembersList: [],
       postList: [],
       postListList: {
-        compId: sessionStorage.getItem("enterprise-front-companyId"),
+        compId: localStorage.getItem("enterprise-front-companyId"),
         pageSize: 50,
         currentPage: 1,
         vesselBankFlag: "V"

src/views/organizationNew/organizationIndex.vue

@@ -56,7 +56,7 @@ export default {
     };
   },
   created () {
-    const active = sessionStorage.getItem("ws-pf_activeName");
+    const active = localStorage.getItem("ws-pf_activeName");
     if (active != null) {
       this.activeName = active;
     } else {
@@ -65,7 +65,7 @@ export default {
   },
   methods: {
     handleClick (tab, event) {
-      sessionStorage.setItem("ws-pf_activeName", tab.name);
+      localStorage.setItem("ws-pf_activeName", tab.name);
     }
   }
 };

src/views/organizationNew/shipDept.vue

@@ -104,7 +104,7 @@
           deptShortName: [{ required: true, trigger: 'change' }],
         },
         page:{
-          compId: sessionStorage.getItem('enterprise-front-companyId'),
+          compId: localStorage.getItem('enterprise-front-companyId'),
           pageSize:10,
           currentPage:1,
           vesselBankFlag:'V',

src/views/organizationNew/shoreAuth.vue

@@ -228,7 +228,7 @@ export default {
         deptId: [{ required: true, trigger: "change" }]
       },
       page: {
-        compId: sessionStorage.getItem("enterprise-front-companyId"),
+        compId: localStorage.getItem("enterprise-front-companyId"),
         pageSize: 10,
         currentPage: 1,
         vesselBankFlag: "B",
@@ -290,7 +290,7 @@ export default {
         if (this.queryList.length === 0) {
           // 获取插件列表;
           const resp4 = await shoreApi.getTenantlist({
-            tenantId: sessionStorage.getItem("enterprise-front-tenantId")
+            tenantId: localStorage.getItem("enterprise-front-tenantId")
           });
           resp4.forEach((value, index) => {
             value.activatedServices.forEach((value2, index2) => {

src/views/organizationNew/shoreBasedMembers.vue

@@ -104,7 +104,7 @@ export default {
         deptShortName: [{ required: true, trigger: "change" }]
       },
       page: {
-        compId: sessionStorage.getItem("enterprise-front-companyId"),
+        compId: localStorage.getItem("enterprise-front-companyId"),
         underCompId: "",
         deptId: "",
         enabled: "1",

src/views/organizationNew/shoreDept.vue

@@ -100,7 +100,7 @@ export default {
         deptShortName: [{ required: true, trigger: "change" }]
       },
       page: {
-        compId: sessionStorage.getItem("enterprise-front-companyId"),
+        compId: localStorage.getItem("enterprise-front-companyId"),
         pageSize: 10,
         currentPage: 1,
         vesselBankFlag: "B",

src/views/organizationNew/shoreMemberAdd.vue

@@ -518,7 +518,7 @@ export default {
       loadingVessel: false,
       checkAll: false,
       checkAntiFlag: false,
-      compId: sessionStorage.getItem("enterprise-front-companyId"),
+      compId: localStorage.getItem("enterprise-front-companyId"),
       searchKeyword: "", // 关联船舶 搜索关键词
       datamsg: "",
       title: "",
@@ -752,7 +752,8 @@ export default {
       }
     },
     radioGroupChange (data, val, node) {
-      this.check=[]
+      console.log(data)
+      // this.check=[]
       for (let i = 0; i < val.length; i++) {
         data.id=val[i].deptId+'_'+val[i].roleId
         this.$set(this.check, data.id, [val[i]]);

src/views/organizationNew/shoreMemberDetail.vue

@@ -86,7 +86,7 @@
     name: 'shoreMemberAdd',
     data() {
       return {
-        compId: sessionStorage.getItem('enterprise-front-companyId'),
+        compId: localStorage.getItem('enterprise-front-companyId'),
         datamsg: '',
         /* 页面传递来的数据 */
         checklist: [{
@@ -180,15 +180,19 @@
         })
 
         response.roles.forEach(item=>{
-          item.vessels.forEach(itemA =>{
-            this.jobList.forEach(ite =>{
-              if(ite.roleId === item.roleId){
-                ite.asd.push(itemA)
-              }
+          console.log()
+          // if(item.vessels){
+          //   item.vessels.forEach(itemA =>{
+          //     this.jobList.forEach(ite =>{
+          //       if(ite.roleId === item.roleId){
+          //         ite.asd.push(itemA)
+          //       }
+                
+          //     })
               
-            })
-            
-          })
+          //   })
+          // }
+          
         })
           // response.roles.find(item=>{
           //   if(item.major === '1'){

src/views/organizationNew/vesselAuth.vue

@@ -225,7 +225,7 @@ export default {
         deptId: [{ required: true, trigger: "change" }]
       },
       page: {
-        compId: sessionStorage.getItem("enterprise-front-companyId"),
+        compId: localStorage.getItem("enterprise-front-companyId"),
         pageSize: 10,
         currentPage: 1,
         vesselBankFlag: "V",
@@ -294,7 +294,7 @@ export default {
         if (this.queryList.length === 0) {
           // 获取插件列表;
           const resp4 = await shoreApi.getTenantlist({
-            tenantId: sessionStorage.getItem("enterprise-front-tenantId")
+            tenantId: localStorage.getItem("enterprise-front-tenantId")
           });
           resp4.forEach((value, index) => {
             value.activatedServices.forEach((value2, index2) => {
@@ -504,7 +504,7 @@ export default {
         this.companyList = resp[0].children;
         // 获取部门
         const resp2 = await shoreApi.getDeptPageByCompId({
-          compId: sessionStorage.getItem("enterprise-front-companyId"),
+          compId: localStorage.getItem("enterprise-front-companyId"),
           vesselBankFlag: "V"
         });
         this.deptList = resp2.records;

src/views/organizationShip/forbidden.vue

@@ -114,7 +114,7 @@ export default {
       }
     },
     rowClick(row) {
-      sessionStorage.setItem('enterprise-front-showMsg', row.staffId);
+      localStorage.setItem('enterprise-front-showMsg', row.staffId);
       this.$router.push({
         name: 'showMessage',
         params: row

src/views/organizationShip/orgAddMan.vue

@@ -174,7 +174,7 @@
                 roleId_isMajor:'1',
                 shipList:[],
 
-                compId: sessionStorage.getItem('enterprise-front-companyId'),
+                compId: localStorage.getItem('enterprise-front-companyId'),
                 datamsg: '',
                 /* 页面传递来的数据 */
                 checklist: [{

src/views/organizationShip/orgEdit.vue

@@ -170,7 +170,7 @@
                 roleId_isMajor:'1',
                 shipList:[],
 
-                compId: sessionStorage.getItem('enterprise-front-companyId'),
+                compId: localStorage.getItem('enterprise-front-companyId'),
                 datamsg: '',
                 /* 页面传递来的数据 */
                 checklist: [{
@@ -237,7 +237,7 @@
         },
         mounted(){
             this.$nextTick(()=>{
-                const staffId = sessionStorage.getItem('enterprise-front-showMsg');
+                const staffId = localStorage.getItem('enterprise-front-showMsg');
                 this.getmsg(staffId);
             })
         },

src/views/organizationShip/organization.vue

@@ -141,7 +141,7 @@ export default {
       newAddMan: false,
       title: '',
       deptId: '',
-      compId: sessionStorage.getItem('enterprise-front-companyId'),
+      compId: localStorage.getItem('enterprise-front-companyId'),
       checklist: [],
       list: false,
       headState: '/organization',
@@ -291,7 +291,7 @@ export default {
     },
     skp(msg) {
       if (msg === 'skip1') {
-        sessionStorage.setItem('enterprise-front-showMsg', this.editmsg.staffId);
+        localStorage.setItem('enterprise-front-showMsg', this.editmsg.staffId);
         this.$router.push({
           name: 'orgEditShip',
           params: this.editmsg
@@ -324,7 +324,7 @@ export default {
       }
     },
     rowClick(row) {
-      sessionStorage.setItem('enterprise-front-showMsg', row.staffId);
+      localStorage.setItem('enterprise-front-showMsg', row.staffId);
       this.$router.push({
         name: 'showMessageShip',
         params: row
@@ -452,7 +452,7 @@ export default {
           id: '1',
           index: 1,
           isEdit: false,
-          label: sessionStorage.getItem('enterprise-front-companyName'),
+          label: localStorage.getItem('enterprise-front-companyName'),
           parentId: '-1'
         }]
         this.data = treeObj;

src/views/organizationShip/showMessage.vue

@@ -82,7 +82,7 @@ export default {
   name: 'ShowMessang',
   data() {
     return {
-      compId: sessionStorage.getItem('enterprise-front-companyId'),
+      compId: localStorage.getItem('enterprise-front-companyId'),
       statetf: true,
       url: urladdress.urlmsg,
       msg: {
@@ -111,7 +111,7 @@ export default {
     };
   },
   created() {
-    const staffId = sessionStorage.getItem('enterprise-front-showMsg');
+    const staffId = localStorage.getItem('enterprise-front-showMsg');
     this.data = this.$route.params;
     if (this.data.enabled === 0) {
       this.state = '启用';

src/views/organizationShip/tree.vue

@@ -64,7 +64,7 @@ export default {
       },
       ss: '',
       treemsg: '',
-      compId: sessionStorage.getItem('enterprise-front-companyId'),
+      compId: localStorage.getItem('enterprise-front-companyId'),
       msg: '',
       maxexpandId: 6,
       non_maxexpandId: 6,
@@ -104,7 +104,7 @@ export default {
           id: '1',
           index: 1,
           isEdit: false,
-          label: sessionStorage.getItem('enterprise-front-companyName'),
+          label: localStorage.getItem('enterprise-front-companyName'),
           parentId: '-1',
         }]
         const tree = treeObj;