From 3bdc299fbca1c725675e51e33938f21bc87335d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=AD=E6=B0=B8=E8=B6=85?= <2090205686@qq.com> Date: Fri, 22 Aug 2025 13:16:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F=E4=BC=98?= =?UTF-8?q?=E5=8C=96=EF=BC=8C=E5=B9=B3=E5=8F=B0=E5=90=8D=E7=A7=B0=E5=8F=98?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main/.env.development | 2 +- main/.env.pre | 2 +- main/.env.production | 2 +- main/.env.test | 14 +- main/src/micro/app copy.js | 127 ++++++++++++++++++ main/src/router/index.js | 2 + main/src/views/index.vue | 15 +-- main/src/views/login/index.vue | 4 +- .../components.d.ts | 1 - new-digital-agriculture-screen/src/main.js | 10 +- .../src/views/land/index.vue | 31 +++-- new-digital-agriculture-screen/vite.config.js | 10 ++ package.json | 2 +- 13 files changed, 178 insertions(+), 44 deletions(-) create mode 100644 main/src/micro/app copy.js diff --git a/main/.env.development b/main/.env.development index 4d9cc31..8aeab8e 100644 --- a/main/.env.development +++ b/main/.env.development @@ -1,7 +1,7 @@ # 开发环境 VITE_PORT = 9000 VITE_APP_NAME = 'daimp-front-main' -VITE_APP_TITLE = '全域数字农业产业管理平台' +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 = 'http://192.168.18.128:9528/sub-government-affairs-service/' diff --git a/main/.env.pre b/main/.env.pre index eaeb924..a4ad95a 100644 --- a/main/.env.pre +++ b/main/.env.pre @@ -1,6 +1,6 @@ # 本地环境 VITE_APP_NAME = 'daimp-front-main' -VITE_APP_TITLE = '全域数字农业产业管理平台' +VITE_APP_TITLE = '全域数字农业产业运营管理平台' VITE_APP_SUB_OS = '//localhost:8090/sub-operation-service/' VITE_APP_SUB_OA = '//localhost:8090/sub-operation-admin/' VITE_APP_SUB_GAS = '//localhost:8090/sub-government-affairs-service/' diff --git a/main/.env.production b/main/.env.production index f9514f8..fe55036 100644 --- a/main/.env.production +++ b/main/.env.production @@ -1,6 +1,6 @@ # 正式环境 VITE_APP_NAME = 'daimp-front-main' -VITE_APP_TITLE = '全域数字农业产业管理平台' +VITE_APP_TITLE = '全域数字农业产业运营管理平台' VITE_APP_SUB_OS = '//http://47.109.205.240/sub-operation-service/' VITE_APP_SUB_OA = '//http://47.109.205.240/sub-operation-admin/' VITE_APP_SUB_GAS = '//http://47.109.205.240/sub-government-affairs-service/' diff --git a/main/.env.test b/main/.env.test index 29cccd6..8b4631e 100644 --- a/main/.env.test +++ b/main/.env.test @@ -1,15 +1,15 @@ # 测试环境 VITE_APP_NAME = 'daimp-front-main' VITE_APP_TITLE = '全域数字农业产业管理平台' -VITE_APP_SUB_OS = '//192.168.18.99/sub-operation-service/' -VITE_APP_SUB_OA = '//192.168.18.99/sub-operation-admin/' -VITE_APP_SUB_GAS = '//192.168.18.99/sub-government-affairs-service/' -VITE_APP_SUB_GAA = '//192.168.18.99/sub-government-admin/' -VITE_APP_SUB_GSS = '//192.168.18.99/sub-government-screen-service/' -VITE_APP_SUB_GSR = '//192.168.18.99/new-digital-agriculture-screen/' +VITE_APP_SUB_OS = '//192.168.18.88/sub-operation-service/' +VITE_APP_SUB_OA = '//192.168.18.88/sub-operation-admin/' +VITE_APP_SUB_GAS = '//192.168.18.88/sub-government-affairs-service/' +VITE_APP_SUB_GAA = '//192.168.18.88/sub-government-admin/' +VITE_APP_SUB_GSS = '//192.168.18.88/sub-government-screen-service/' +VITE_APP_SUB_GSR = '//192.168.18.88/new-digital-agriculture-screen/' # 接口 VITE_APP_BASE_API = '/apis' VITE_APP_BASE_URL = '' VITE_APP_UPLOAD_API = '/uploadApis' VITE_APP_UPLOAD_URL = '' -VITE_APP_VIST_URL = 'http://192.168.18.99' \ No newline at end of file +VITE_APP_VIST_URL = 'http://192.168.18.88' \ No newline at end of file diff --git a/main/src/micro/app copy.js b/main/src/micro/app copy.js new file mode 100644 index 0000000..3ec68c9 --- /dev/null +++ b/main/src/micro/app copy.js @@ -0,0 +1,127 @@ +import actions from './actions'; + +const { VITE_APP_SUB_OS, VITE_APP_SUB_OA, VITE_APP_SUB_ADMIN, VITE_APP_SUB_GAS, VITE_APP_SUB_GSS, VITE_APP_SUB_GSR, VITE_APP_VIST_URL } = import.meta.env; + +export const leftApps = [ + { + 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-app2', + entry: VITE_APP_SUB_GAS, + activeRule: '/operation-app', + title: 'APP', + icon: 'images/platform/icon-app.png', + }, + { + name: 'sub-government-screen-service', + entry: VITE_APP_SUB_GSS, + activeRule: '/sub-government-screen-service', + title: '数据大屏', + icon: 'images/platform/icon-screen.png', + }, +]; + +export const rightApps = [ + { + name: 'sub-government-affairs-service', + entry: VITE_APP_SUB_GAS, + activeRule: '/sub-government-affairs-service', + title: '政务服务', + icon: 'images/platform/icon-home.png', + }, + { + name: 'sub-government-admin', + entry: VITE_APP_SUB_GAS, + activeRule: `/sub-government-admin`, + title: '管理后台', + icon: 'images/platform/icon-admin.png', + }, + { + name: 'sub-app1', + entry: VITE_APP_SUB_GAS, + activeRule: '/government-affairs-app', + title: 'APP', + icon: 'images/platform/icon-app.png', + }, + { + // name: 'sub-government-screen-service', + name: 'new-digital-agriculture-screen/v2/land', + // 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', + }, +]; + +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, + activeRule: '/sub-government-affairs-service', + title: '政务服务', + icon: 'images/platform/icon-home.png', + }, + { + 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', + }, + { + // 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', + }, +]; + +export const microApps = [...defaultApps]; +console.log(microApps); +const apps = microApps.map((item) => { + return { + ...item, + container: '#app', + props: { + routerBase: item.activeRule, + globalState: actions.getGlobalState(), + }, + }; +}); + +export default apps; diff --git a/main/src/router/index.js b/main/src/router/index.js index 665f38e..8bd3cb9 100644 --- a/main/src/router/index.js +++ b/main/src/router/index.js @@ -39,6 +39,8 @@ export const constantRoutes = [ }, ], }, + { path: '/sub-operation-admin*', redirect: '/' }, // 避免乾坤劫持该路径 + { path: '/sub-government-admin*', redirect: '/' }, // 避免乾坤劫持该路径 ]; const router = createRouter({ diff --git a/main/src/views/index.vue b/main/src/views/index.vue index 0747680..a6f7d5f 100644 --- a/main/src/views/index.vue +++ b/main/src/views/index.vue @@ -1,6 +1,6 @@