From 9dcef9c056e62af7a7bb2b27d2a3f73dedc3df6a Mon Sep 17 00:00:00 2001 From: "2090205686@qq.com" Date: Fri, 30 May 2025 09:37:24 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=B8=BB=E7=A8=8B=E5=BA=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E8=B7=B3=E8=BD=AC=E5=90=8E=E5=8F=B0=E7=9A=84=E5=9C=B0?= =?UTF-8?q?=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main/.env.development | 1 + main/.env.production | 1 + main/src/micro/app.js | 6 +++--- main/src/views/index.vue | 1 + new-digital-agriculture-screen/.env.production | 1 + 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/main/.env.development b/main/.env.development index 4054b6b..d95c820 100644 --- a/main/.env.development +++ b/main/.env.development @@ -18,3 +18,4 @@ VITE_APP_UPLOAD_API = '/uploadApis' # 内网接口地址 VITE_APP_BASE_URL = 'http://192.168.18.9:8080' VITE_APP_UPLOAD_URL = 'http://192.168.18.9:9300' +VITE_APP_VIST_URL = 'http://192.168.18.99' \ No newline at end of file diff --git a/main/.env.production b/main/.env.production index fe0fac2..b62b46b 100644 --- a/main/.env.production +++ b/main/.env.production @@ -12,4 +12,5 @@ VITE_APP_BASE_API = '/apis' VITE_APP_BASE_URL = '' VITE_APP_UPLOAD_API = '/uploadApis' VITE_APP_UPLOAD_URL = '' +VITE_APP_VIST_URL = 'http://47.109.205.240' diff --git a/main/src/micro/app.js b/main/src/micro/app.js index ba575ae..068f54f 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_OA, VITE_APP_SUB_ADMIN, VITE_APP_SUB_GAS, VITE_APP_SUB_GSS, VITE_APP_SUB_GSR } = import.meta.env; +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 = [ { @@ -13,7 +13,7 @@ export const leftApps = [ { name: 'sub-operation-admin', entry: VITE_APP_SUB_OA, - activeRule: 'http://192.168.18.99:82/login?loginType=2', + activeRule: `${VITE_APP_VIST_URL}:82/login`, title: '管理后台', icon: 'images/platform/icon-admin.png', }, @@ -44,7 +44,7 @@ export const rightApps = [ { name: 'sub-government-admin', entry: VITE_APP_SUB_GAS, - activeRule: 'http://192.168.18.99:81/login?loginType=1', + activeRule: `${VITE_APP_VIST_URL}:82/login`, title: '管理后台', icon: 'images/platform/icon-admin.png', }, diff --git a/main/src/views/index.vue b/main/src/views/index.vue index d2557a2..da15a38 100644 --- a/main/src/views/index.vue +++ b/main/src/views/index.vue @@ -36,6 +36,7 @@ import { getAssetsFile } from '@/utils'; const gotoPage = (row) => { // window.history.pushState({}, row.name, row.activeRule); + console.log(row.activeRule); if (row.name == 'sub-app1') { window.location.href = 'https://www.pgyer.com/MXd3uUrO'; } else if (row.name == 'sub-app2') { diff --git a/new-digital-agriculture-screen/.env.production b/new-digital-agriculture-screen/.env.production index 956fefa..b772ff3 100644 --- a/new-digital-agriculture-screen/.env.production +++ b/new-digital-agriculture-screen/.env.production @@ -7,6 +7,7 @@ VITE_APP_MIAN = 'daimp-front-main' VITE_APP_MIAN_URL = 'http://47.109.205.240:88' VITE_APP_NAME = 'new-digital-agriculture-screen' +VITE_APP_TITLE = '政务云数字农业智慧大屏' # 接口 VITE_APP_BASE_API = '/apis' VITE_APP_BASE_URL = '' From f62c14852b92b1470710efd0070ee0ff27f10ef6 Mon Sep 17 00:00:00 2001 From: 13713575202 <1345916905@qq.com> Date: Fri, 30 May 2025 11:41:57 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=A4=8F=E6=BB=A8=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=88=86=E6=8B=A3=E5=8C=85=E8=A3=85=E8=AF=A6=E6=83=85=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sub-operation-service/src/router/index.js | 6 + .../src/views/packaging/details.vue | 359 ++++++++++++++++++ .../src/views/packaging/index.vue | 9 +- .../src/views/packaging/sorting.vue | 9 +- 4 files changed, 375 insertions(+), 8 deletions(-) create mode 100644 sub-operation-service/src/views/packaging/details.vue diff --git a/sub-operation-service/src/router/index.js b/sub-operation-service/src/router/index.js index be10e20..cb2d0d5 100644 --- a/sub-operation-service/src/router/index.js +++ b/sub-operation-service/src/router/index.js @@ -236,6 +236,12 @@ export const constantRoutes = [ name: 'packagingMain', meta: { title: '包装首页' }, }, + { + path: '/sub-operation-service/packaging/details', + component: () => import('@/views/packaging/details.vue'), + name: 'detailsMain', + meta: { title: '详情页' }, + }, ], }, { diff --git a/sub-operation-service/src/views/packaging/details.vue b/sub-operation-service/src/views/packaging/details.vue new file mode 100644 index 0000000..1d545c9 --- /dev/null +++ b/sub-operation-service/src/views/packaging/details.vue @@ -0,0 +1,359 @@ + + + + + diff --git a/sub-operation-service/src/views/packaging/index.vue b/sub-operation-service/src/views/packaging/index.vue index edad294..460137b 100644 --- a/sub-operation-service/src/views/packaging/index.vue +++ b/sub-operation-service/src/views/packaging/index.vue @@ -222,10 +222,11 @@ const currentChange = (current) => { }; const toLink = (row) => { - // router.push({ - // path: '/sub-operation-service/warehouse-detail', - // query: { id: row?.id ?? '100' }, - // }); + row.data = ['高品质', '食品级', '塑料']; + router.push({ + path: '/sub-operation-service/packaging/details', + query: row, + }); };