diff --git a/main/.env.development b/main/.env.development index 6335034..aa5286e 100644 --- a/main/.env.development +++ b/main/.env.development @@ -5,7 +5,7 @@ VITE_APP_TITLE = '数字农业产业管理平台' VITE_APP_SUB_OS = '//localhost:9526/sub-operation-service/' 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_GAA = '//localhost:9525/sub-government-admin/' VITE_APP_SUB_GSS = '//localhost:9529/sub-government-screen-service/' # 接口 VITE_APP_BASE_API = '/apis' diff --git a/main/.env.production b/main/.env.production index 7d32088..500eb93 100644 --- a/main/.env.production +++ b/main/.env.production @@ -4,7 +4,7 @@ VITE_APP_TITLE = '数字农业产业管理平台' VITE_APP_SUB_OS = '//47.109.205.240:80/sub-operation-service/' VITE_APP_SUB_OA = '//47.109.205.240:80/sub-operation-admin/' VITE_APP_SUB_GAS = '//47.109.205.240:80/sub-government-affairs-service/' -VITE_APP_SUB_GAA = '//47.109.205.240:80/sub-government-affairs-admin/' +VITE_APP_SUB_GAA = '//47.109.205.240:80/sub-government-admin/' VITE_APP_SUB_GSS = '//47.109.205.240:80/sub-government-screen-service/' # 接口 VITE_APP_BASE_API = '/apis' diff --git a/main/.env.test b/main/.env.test index 014e47a..8bdf169 100644 --- a/main/.env.test +++ b/main/.env.test @@ -4,7 +4,7 @@ VITE_APP_TITLE = '数字农业产业管理平台' VITE_APP_SUB_OS = '//192.168.18.99:88/sub-operation-service/' 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_GAA = '//192.168.18.99:88/sub-government-admin/' VITE_APP_SUB_GSS = '//192.168.18.99:88/sub-government-screen-service/' # 接口 VITE_APP_BASE_API = '/apis' diff --git a/main/src/micro/app.js b/main/src/micro/app.js index 9eb68b3..9d1df48 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_OA, VITE_APP_SUB_APP, VITE_APP_SUB_GAA, VITE_APP_SUB_GAS, VITE_APP_SUB_GSS } = import.meta.env; export const leftApps = [ { @@ -11,23 +11,23 @@ export const leftApps = [ icon: 'images/platform/icon-home.png', }, { - name: 'sub-admin', - entry: VITE_APP_SUB_ADMIN, - activeRule: '/sub-admin', + name: 'sub-operation-admin', + entry: VITE_APP_SUB_OA, + activeRule: '/sub-operation-admin', title: '管理后台', icon: 'images/platform/icon-admin.png', }, { name: 'sub-app', - entry: VITE_APP_SUB_ADMIN, + entry: VITE_APP_SUB_APP, activeRule: '/sub-app', title: 'APP', icon: 'images/platform/icon-app.png', }, { - name: 'sub-screen', - entry: VITE_APP_SUB_ADMIN, - activeRule: '/sub-screen', + name: 'sub-government-screen-service', + entry: VITE_APP_SUB_GSS, + activeRule: '/sub-government-screen-service', title: '数据大屏', icon: 'images/platform/icon-screen.png', }, @@ -43,15 +43,15 @@ export const rightApps = [ }, { name: 'sub-government-admin', - entry: VITE_APP_SUB_ADMIN, - activeRule: '/sub-government-admin', + entry: VITE_APP_SUB_GAA, + activeRule: '/sub-government-affairs-service', title: '管理后台', icon: 'images/platform/icon-admin.png', }, { - name: 'sub-government-app', - entry: VITE_APP_SUB_ADMIN, - activeRule: '/sub-government-app', + name: 'sub-app', + entry: VITE_APP_SUB_APP, + activeRule: '/sub-app', title: 'APP', icon: 'images/platform/icon-app.png', }, @@ -65,6 +65,20 @@ export const rightApps = [ ]; export const defaultApps = [ + { + name: 'sub-operation-service', + entry: VITE_APP_SUB_OS, + activeRule: '/sub-operation-service', + title: '运营服务', + icon: 'images/platform/icon-home.png', + }, + { + name: 'sub-operation-admin', + entry: VITE_APP_SUB_OA, + activeRule: '/sub-operation-admin', + title: '运营管理后台', + icon: 'images/platform/icon-admin.png', + }, { name: 'sub-government-affairs-service', entry: VITE_APP_SUB_GAS, @@ -79,16 +93,8 @@ export const defaultApps = [ title: '数据大屏', icon: 'images/platform/icon-screen.png', }, - { - name: 'sub-operation-service', - entry: VITE_APP_SUB_OS, - activeRule: '/sub-operation-service', - title: '运营服务', - icon: 'images/platform/icon-home.png', - }, ]; -// export const microApps = [...defaultApps, ...leftApps, ...rightApps]; export const microApps = [...defaultApps]; const apps = microApps.map((item) => { diff --git a/main/src/views/index.vue b/main/src/views/index.vue index c52f0eb..a3dcbdb 100644 --- a/main/src/views/index.vue +++ b/main/src/views/index.vue @@ -31,8 +31,7 @@ - - -
-