diff --git a/main/.env.development b/main/.env.development index 6335034..1454701 100644 --- a/main/.env.development +++ b/main/.env.development @@ -7,6 +7,7 @@ VITE_APP_SUB_OA = '//localhost:9527/sub-operation-admin/' VITE_APP_SUB_GAS = '//localhost:9528/sub-government-affairs-service/' VITE_APP_SUB_GAA = '//localhost:9525/sub-government-affairs-admin/' VITE_APP_SUB_GSS = '//localhost:9529/sub-government-screen-service/' +VITE_APP_SUB_GSR = '//localhost:9530/new-digital-agriculture-screen/' # 接口 VITE_APP_BASE_API = '/apis' VITE_APP_BASE_URL = 'http://192.168.18.99:8080' diff --git a/main/.env.production b/main/.env.production index 0e3a084..fe0fac2 100644 --- a/main/.env.production +++ b/main/.env.production @@ -6,6 +6,7 @@ VITE_APP_SUB_OA = '//http://47.109.205.240:88/sub-operation-admin/' VITE_APP_SUB_GAS = '//http://47.109.205.240:88/sub-government-affairs-service/' VITE_APP_SUB_GAA = '//http://47.109.205.240:88/sub-government-affairs-admin/' VITE_APP_SUB_GSS = '//http://47.109.205.240:88/sub-government-screen-service/' +VITE_APP_SUB_GSR = '//http://47.109.205.240:88/new-digital-agriculture-screen/' # 接口 VITE_APP_BASE_API = '/apis' VITE_APP_BASE_URL = '' diff --git a/main/.env.test b/main/.env.test index 014e47a..53b6341 100644 --- a/main/.env.test +++ b/main/.env.test @@ -6,6 +6,7 @@ VITE_APP_SUB_OA = '//192.168.18.99:88/sub-operation-admin/' VITE_APP_SUB_GAS = '//192.168.18.99:88/sub-government-affairs-service/' VITE_APP_SUB_GAA = '//192.168.18.99:88/sub-government-affairs-admin/' VITE_APP_SUB_GSS = '//192.168.18.99:88/sub-government-screen-service/' +VITE_APP_SUB_GSR = '//192.168.18.99:88/new-digital-agriculture-screen/' # 接口 VITE_APP_BASE_API = '/apis' VITE_APP_BASE_URL = '' diff --git a/main/src/micro/app.js b/main/src/micro/app.js index a03555b..934bcf2 100644 --- a/main/src/micro/app.js +++ b/main/src/micro/app.js @@ -1,6 +1,6 @@ import actions from './actions'; -const { VITE_APP_SUB_OS, VITE_APP_SUB_ADMIN, VITE_APP_SUB_GAS, VITE_APP_SUB_GSS } = import.meta.env; +const { VITE_APP_SUB_OS, VITE_APP_SUB_ADMIN, VITE_APP_SUB_GAS, VITE_APP_SUB_GSS, VITE_APP_SUB_GSR } = import.meta.env; export const leftApps = [ { @@ -56,9 +56,12 @@ export const rightApps = [ icon: 'images/platform/icon-app.png', }, { - name: 'sub-government-screen-service', - entry: VITE_APP_SUB_GSS, - activeRule: '/sub-government-screen-service', + // name: 'sub-government-screen-service', + name: 'new-digital-agriculture-screen', + // entry: VITE_APP_SUB_GSS, + entry: VITE_APP_SUB_GSR, + // activeRule: '/sub-government-screen-service', + activeRule: '/new-digital-agriculture-screen', title: '数据大屏', icon: 'images/platform/icon-screen.png', }, @@ -73,9 +76,12 @@ export const defaultApps = [ icon: 'images/platform/icon-home.png', }, { - name: 'sub-government-screen-service', - entry: VITE_APP_SUB_GSS, - activeRule: '/sub-government-screen-service', + // name: 'sub-government-screen-service', + name: 'new-digital-agriculture-screen', + // entry: VITE_APP_SUB_GSS, + entry: VITE_APP_SUB_GSR, + // activeRule: '/sub-government-screen-service', + activeRule: '/new-digital-agriculture-screen', title: '数据大屏', icon: 'images/platform/icon-screen.png', }, @@ -91,8 +97,6 @@ export const defaultApps = [ // export const microApps = [...defaultApps, ...leftApps, ...rightApps]; export const microApps = [...defaultApps]; console.log(microApps); - -debugger; const apps = microApps.map((item) => { return { ...item, diff --git a/main/src/views/index.vue b/main/src/views/index.vue index b0e2a95..68f153c 100644 --- a/main/src/views/index.vue +++ b/main/src/views/index.vue @@ -36,6 +36,9 @@ import actions from '@/micro/actions'; import { getAssetsFile } from '@/utils'; const gotoPage = (row) => { + console.log(row); + console.log(window.history.pushState({}, row.name, row.activeRule)); + debugger; window.history.pushState({}, row.name, row.activeRule); }; diff --git a/package.json b/package.json index 625bdfa..155c067 100644 --- a/package.json +++ b/package.json @@ -10,18 +10,21 @@ "install:sub-gas": "cd sub-government-affairs-service && yarn install", "install:sub-gss": "cd sub-government-screen-service && yarn install", "install:sub-os": "cd sub-operation-service && yarn install", + "install:sub-gsr": "cd new-digital-agriculture-screen && yarn install", "dev": "npm-run-all --parallel dev:*", "dev:main": "cd main && yarn dev", "dev:sub-admin": "cd sub-app && yarn dev", "dev:sub-gas": "cd sub-government-affairs-service && yarn dev", "dev:sub-gss": "cd sub-government-screen-service && yarn dev", "dev:sub-os": "cd sub-operation-service && yarn dev", + "dev:sub-gsr": "cd new-digital-agriculture-screen && yarn dev", "build": "npm-run-all --serial build:*", "build:main": "cd main && yarn build", "build:sub-admin": "cd sub-admin && yarn build", "build:sub-gas": "cd sub-government-affairs-service && yarn build", "build:sub-gss": "cd sub-government-screen-service && yarn build", "build:sub-os": "cd sub-operation-service && yarn build", + "build:sub-gsr": "cd new-digital-agriculture-screen && yarn build", "test": "echo \"Error: no test specified\" && exit 1" }, "keywords": [ diff --git a/sub-government-affairs-service/src/utils/permission.js b/sub-government-affairs-service/src/utils/permission.js index e223b6d..16400df 100644 --- a/sub-government-affairs-service/src/utils/permission.js +++ b/sub-government-affairs-service/src/utils/permission.js @@ -27,7 +27,7 @@ router.beforeEach(async (to, from, next) => { if (!hasToken) { if (to.path === '/login') { next({ path: '/' }); - } else { + } else { try { const PermissionStore = usePermissionStore(); if (!PermissionStore.routes.length) {