监管改造+动态企业ID

src/newApi/userInformationManagement.js

@@ -31,4 +31,15 @@ export default {
             method: 'get',
         })
     },
+    //获取企业ID
+    commonfreefindTenantId(data) {
+        return request({
+            url: '/common/free/findTenantId',
+            method: 'get',
+            params: data,
+            headers: {
+                isToken: false
+              },
+        })
+    },
 }

src/permission.js

@@ -11,19 +11,16 @@ NProgress.configure({ showSpinner: false })
 
 const whiteList = ['/login', '/auth-redirect', '/bind', '/register']
 
-router.beforeEach((to, from, next) => {
+router.beforeEach(async(to, from, next) => {
   if (to.path !== from.path) {
     NProgress.start();
   }
-  if (methods.getQueryVariable('TenantId') && !sessionStorage.TenantId) {
-    sessionStorage.TenantId = methods.getQueryVariable('TenantId')
-  }
-  if (methods.getQueryVariable('TenantId') && sessionStorage.TenantId == undefined) {
-    sessionStorage.TenantId = methods.getQueryVariable('TenantId')
-  }
-  if (methods.getQueryVariable('TenantId') && sessionStorage.TenantId != methods.getQueryVariable('TenantId')) {
-    sessionStorage.TenantId = methods.getQueryVariable('TenantId')
+  
+  if (!store.state.TENANT_NANE) {
+    await store.dispatch('findTenantId')
   }
+  // TENANT_NANE
+  // TenantId
   if (getToken()) {
     to.meta.title && store.dispatch('settings/setTitle', to.meta.title)
     /* has token*/
@@ -46,16 +43,11 @@ router.beforeEach((to, from, next) => {
           })
         })
       } else {
-        if (!to.query.TenantId) {
-          to.query.TenantId = sessionStorage.TenantId
-          next(to)
-        } else {
           if (!to.path.includes('/user/profile')) {
             checkFunc()
           }
           console.log("to:",to)
           next()
-        }
       }
     }
   } else {
@@ -64,11 +56,7 @@ router.beforeEach((to, from, next) => {
       // 在免登录白名单，直接进入
       next()
     } else {
-      if (sessionStorage.TenantId == undefined) {
-        next(`/login`) // 否则全部重定向到登录页
-      } else {
-        next(`/login?redirect=${to.fullPath}&TenantId=${sessionStorage.TenantId}`) // 否则全部重定向到登录页
-      }
+      next(`/login`)
       NProgress.done()
     }
   }

src/store/modules/user.js

@@ -2,6 +2,7 @@ import { login, logout, getInfo } from '@/api/login'
 import { getToken, setToken, removeToken } from '@/utils/auth'
 import methods from "@/utils/methodsTool";
 import { encrypt } from '@/utils/jsencrypt'
+import api from '@/api/api'
 
 const user = {
   state: {
@@ -10,7 +11,8 @@ const user = {
     avatar: '',
     roles: [],
     permissions: [],
-    userId: ''
+    userId: '',
+    TENANT_NANE:''
   },
 
   mutations: {
@@ -32,9 +34,32 @@ const user = {
     SET_USERID: (state, userId) => {
       state.userId = userId
     },
+    setTENANT_NANE(state, id) {
+      state.TENANT_NANE = id
+      console.log(state.TENANT_NANE)
+    },
   },
 
   actions: {
+    findTenantId({
+      commit
+    }) {
+      return new Promise(resolve => {
+        var urlReg = /[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\.[a-zA-Z0-9][-a-zA-Z0-9]{0,62})+\.?/;
+        var urls = location.origin.includes("localhost") ? '' : urlReg.exec(location.origin)[0];
+        if (location.origin.includes("192.168.1") || location.origin.includes("localhost") || location.origin.includes("120.79.166.78")) {
+          urls = "120.79.166.78:19012"
+        }
+        api.commonfreefindTenantId({hostAdmin:urls})
+          .then(function (response) {
+            commit('setTENANT_NANE', response.data)
+            resolve()
+          })
+          .catch(function (error) {
+            console.log("TenantIDerror:", error);
+          });
+      })
+    },
     // 登录
     Login({ commit }, userInfo) {
       const username = userInfo.username.trim()

src/utils/request.js

@@ -8,7 +8,7 @@ import methods from '@/utils/methodsTool';
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 // 创建axios实例
 export const baseURL = process.env.VUE_APP_BASE_API
-// export const baseURL = 'http://192.168.1.7:5030/'
+// export const baseURL = 'http://192.168.1.24:5030/'
 export const BASE_IMG_URL = process.env.VUE_APP_IMG_API
 const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
@@ -23,7 +23,7 @@ service.interceptors.request.use(config => {
   if (getToken() && !isToken) {
     config.headers['AuthorizationToken'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
   }
-  config.headers.TenantId = sessionStorage.TenantId || methods.getQueryVariable('TenantId')
+  config.headers.TenantId = store.state.user.TENANT_NANE
   // get请求映射params参数
   if (config.method === 'get' && config.params) {
     let url = config.url + '?';

src/views/secondJian/learningList/index.vue

@@ -127,7 +127,7 @@ export default {
           prop1: "recordStartTime",
           prop2: "recordEndTime",
           scope: "TimeLists",
-          hidden: false,
+          hidden: true,
         },
         {
           label: "时长",

src/views/secondZao/learningList/index.vue

@@ -127,7 +127,7 @@ export default {
           prop1: "recordStartTime",
           prop2: "recordEndTime",
           scope: "TimeLists",
-          hidden: false,
+          hidden: true,
         },
         {
           label: "时长",