zhaoke 2 жил өмнө
parent
commit
e235bddc96

+ 2 - 2
public/config.js

@@ -1,7 +1,7 @@
 var PLATFROM_CONFIG = {};
-PLATFROM_CONFIG.baseUrl = "http://106.14.243.117:9111"; // http请求地址
+PLATFROM_CONFIG.baseUrl = "http://10.211.66.25:8092"; // http请求地址
 // PLATFROM_CONFIG.baseUrl = "http://10.211.66.25:8074"; // http请求地址
 PLATFROM_CONFIG.appSecret = "9inu7zpllz1folzsljm498dcpi0lsog1"; //appSecret
 PLATFROM_CONFIG.appId = "q7kdjmmaf0kerwpf"; //appid
 // PLATFROM_CONFIG.baseURLCA = "http://106.14.243.117:9114";
-PLATFROM_CONFIG.baseURLCA = "http://192.168.3.17:8080";
+PLATFROM_CONFIG.baseURLCA = "http://10.211.66.25:8092";

+ 1 - 1
src/router/index.js

@@ -121,7 +121,7 @@ router.beforeEach((to, from, next) => {
 });
 
 // Detail see: https://github.com/vuejs/vue-router/issues/1234#issuecomment-357941465
-export function resetRouter() {
+export function resetRouter () {
   const newRouter = createRouter();
   router.matcher = newRouter.matcher; // reset router
 }

+ 1 - 1
src/router/routes/routes-file-five.js

@@ -134,7 +134,7 @@ const arrivalRoutes = {
 const transferRoutes = {
   path: '/transfer',
   component: Layout,
-  meta: { roles: ['transit'] },
+  meta: { roles: ["is_showTransit"] },
   children: [
     {
       path: '/transfer/arrival',

+ 6 - 5
src/router/routes/routes-file-four.js

@@ -29,7 +29,7 @@ const authorityRoutes = {
           path: '/',
           name: 'AuthorityHome',
           component: {
-            render(c) {
+            render (c) {
               return c('router-view')
             }
           },
@@ -91,7 +91,7 @@ const roleRoutes = {
           path: '/',
           name: 'AuthorityRoleHome',
           component: {
-            render(c) {
+            render (c) {
               return c('router-view')
             }
           },
@@ -142,7 +142,7 @@ const accountRoutes = {
           path: '/account',
           name: 'accountHome',
           component: {
-            render(c) {
+            render (c) {
               return c('router-view')
             }
           },
@@ -182,7 +182,8 @@ const accountRoutes = {
 
 // 高级查询
 const advanceRoutes = {
-  path: '/advance',
+  path: '/',
+  redirect: '/advance',
   component: Layout,
   children: [
     {
@@ -199,7 +200,7 @@ const advanceRoutes = {
           path: '/',
           name: 'advanceHome',
           component: {
-            render(c) {
+            render (c) {
               return c('router-view')
             }
           },

+ 2 - 3
src/router/routes/routes-file-one.js

@@ -1,8 +1,7 @@
 import Layout from '@/layout'
 const BasicsDataRoutes = {
-  path: '/',
+  path: '/BasicsData',
   component: Layout,
-  redirect: "/BasicsData",
   meta: { roles: ['system_menu'] },
   children: [
     {
@@ -23,7 +22,7 @@ const BasicsDataRoutes = {
         {
           path: '/BasicsData/airportInfo',
           name: 'airportInfo',
-          component: { render(c) { return c('router-view') } },
+          component: { render (c) { return c('router-view') } },
           redirect: '/BasicsData/airportInfo',
           meta: { title: '机场信息维护' },
           hidden: true,

+ 1 - 2
src/router/routes/routes-file-three.js

@@ -1,8 +1,7 @@
 import Layout from '@/layout'
 const integrationRoutes = {
-  path: '/',
+  path: '/integration',
   component: Layout,
-  redirect: "/integration",
   meta: { roles: ['dataCollect'] },
   children: [
     {

+ 5 - 6
src/router/routes/routes-file-two.js

@@ -1,8 +1,7 @@
 import Layout from '@/layout'
 const systemSettingsRoutes = {
-  path: '/',
+  path: '/systemSettings',
   component: Layout,
-  redirect: "/systemSettings",
   meta: { roles: ['system_menu'] },
   children: [
     {
@@ -14,7 +13,7 @@ const systemSettingsRoutes = {
         {
           path: '/systemSettings',
           name: 'serviceManagement',
-          component: { render(c) { return c('router-view') } },
+          component: { render (c) { return c('router-view') } },
           redirect: '/systemSettings',
           meta: { title: '服务管理' },
           hidden: true,
@@ -39,7 +38,7 @@ const systemSettingsRoutes = {
         {
           path: '/systemSettings/sourceDataItemManagement',
           name: 'sourceDataItemManagement',
-          component: { render(c) { return c('router-view') } },
+          component: { render (c) { return c('router-view') } },
           redirect: '/systemSettings/sourceDataItemManagement',
           meta: { title: '源数据管理' },
           hidden: true,
@@ -64,7 +63,7 @@ const systemSettingsRoutes = {
         {
           path: '/systemSettings/targetDataManagement',
           name: 'targetDataManagement',
-          component: { render(c) { return c('router-view') } },
+          component: { render (c) { return c('router-view') } },
           redirect: '/systemSettings/targetDataManagement',
           meta: { title: '目标数据管理' },
           hidden: true,
@@ -106,7 +105,7 @@ const systemSettingsRoutes = {
         {
           path: '/systemSettings/warningSet',
           name: 'warningSet',
-          component: { render(c) { return c('router-view') } },
+          component: { render (c) { return c('router-view') } },
           redirect: '/systemSettings/warningSet',
           meta: { title: '报警预警设置' },
           hidden: true,

+ 6 - 4
src/store/modules/user.js

@@ -10,7 +10,8 @@ const getDefaultState = () => {
     roles: [],
     UserType: sessionStorage.getItem('UserType') ? sessionStorage.getItem('UserType') : '',
     UserId: sessionStorage.getItem('User_Id') ? sessionStorage.getItem('User_Id') : '',
-    userPoewrList: getToken('userAuthList') ? JSON.parse(getToken('userAuthList')) : []
+    userPoewrList: sessionStorage.getItem('userAuthList') ? JSON.parse(sessionStorage.getItem('userAuthList')) : []
+    // userPoewrList: sessionStorage.setItem('userAuthList') ? JSON.parse(sessionStorage.getItem('userAuthList')) : []
   }
 }
 
@@ -95,9 +96,10 @@ const actions = {
     console.log(state)
     return new Promise((resolve, reject) => {
       loginUp({ "UserId": state.UserId, "UserType": state.UserType }).then(result => {
-        sessionStorage.removeItem("userName");
-        sessionStorage.removeItem("UserType");
-        sessionStorage.removeItem("User_Id");
+        // sessionStorage.removeItem("userName");
+        // sessionStorage.removeItem("UserType");
+        // sessionStorage.removeItem("User_Id");
+        sessionStorage.clear();
         removeToken(); // must remove  token  first
         removeToken('codeToken');
         removeToken('systemSet');

+ 3 - 3
src/views/login/index.vue

@@ -170,11 +170,11 @@ export default {
                       for (const item of datas) {
                         arrs.push(item.AuthIdent);
                       }
-                      arrs.push('transit');
-                      setToken('userAuthList', arrs);
+                      // arrs.push('transit');
+                      sessionStorage.setItem('userAuthList', JSON.stringify(arrs));
                       this.$store.dispatch('user/setPowerList', arrs);
                     } else {
-                      setToken('userAuthList', []);
+                      sessionStorage.setItem('userAuthList', []);
                       this.$store.dispatch('user/setPowerList', []);
                     }
                     this.$router.push({ path: this.redirect || "/" });