Merge branch 'master' of http://192.168.1.43:3000/v3/v3-lab-web

src/api/commonality/permission.js

@@ -79,7 +79,7 @@ export function subjectList(data) {
 //根据名称查询数据权限范围内的实验室(带相信信息)
 export function laboratorySubRelInfoGetRelListByPower(data) {
   return request({
-    url: '/laboratory/subRelInfo/getRelListByPower',
+    url: '/laboratory/subRelInfo/getRelListNotAuth',
     method: 'post',
     data: data
   })

src/router/index.js

@@ -31,16 +31,16 @@ export const constantRoutes = [
     component: (resolve) => require(['@/views/basicsModules/home'], resolve),
     hidden: true
   },
-  // {
-  //   path: '/login',
-  //   component: (resolve) => require(['@/views/basicsModules/login.vue'], resolve),
-  //   hidden: true
-  // },
   {
     path: '/login',
-    component: (resolve) => require(['@/views/basicsModules/ssoLogin.vue'], resolve),
+    component: (resolve) => require(['@/views/basicsModules/login.vue'], resolve),
     hidden: true
   },
+  // {
+  //   path: '/login',
+  //   component: (resolve) => require(['@/views/basicsModules/ssoLogin.vue'], resolve),
+  //   hidden: true
+  // },
   {
     path: '/home',
     component: (resolve) => require(['@/views/basicsModules/home'], resolve),