From 940953cd84b4cef034564f26993179a8a88d4f2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=AD=E6=B0=B8=E8=B6=85?= <2090205686@qq.com> Date: Tue, 1 Jul 2025 16:01:49 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E9=A1=B5=E9=9D=A2=E8=B0=83?= =?UTF-8?q?=E6=95=B4=EF=BC=8C=E6=B7=BB=E5=8A=A0app=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main/src/assets/images/quit.svg | 1 + main/src/micro/app.js | 4 +-- main/src/router/index.js | 12 +++++++ .../views/appPage/government-affairs-app.vue | 32 +++++++++++++++++++ main/src/views/appPage/operation-app.vue | 32 +++++++++++++++++++ main/src/views/index.vue | 8 +++-- .../src/layouts/component/Header/index.vue | 3 +- .../trace/planting/seedling/use/index.vue | 4 +-- sub-operation-service/.env.test | 2 +- sub-operation-service/components.d.ts | 1 - .../src/layouts/component/Header/index.vue | 5 ++- 11 files changed, 94 insertions(+), 10 deletions(-) create mode 100644 main/src/assets/images/quit.svg create mode 100644 main/src/views/appPage/government-affairs-app.vue create mode 100644 main/src/views/appPage/operation-app.vue diff --git a/main/src/assets/images/quit.svg b/main/src/assets/images/quit.svg new file mode 100644 index 0000000..29ae4a3 --- /dev/null +++ b/main/src/assets/images/quit.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/main/src/micro/app.js b/main/src/micro/app.js index 2ad4af2..60c9d7d 100644 --- a/main/src/micro/app.js +++ b/main/src/micro/app.js @@ -20,7 +20,7 @@ export const leftApps = [ { name: 'sub-app2', entry: VITE_APP_SUB_GAS, - activeRule: '/sub-app', + activeRule: '/operation-app', title: 'APP', icon: 'images/platform/icon-app.png', }, @@ -51,7 +51,7 @@ export const rightApps = [ { name: 'sub-app1', entry: VITE_APP_SUB_GAS, - activeRule: '/sub-app', + activeRule: '/government-affairs-app', title: 'APP', icon: 'images/platform/icon-app.png', }, diff --git a/main/src/router/index.js b/main/src/router/index.js index 0ec93ba..b58a0ea 100644 --- a/main/src/router/index.js +++ b/main/src/router/index.js @@ -25,6 +25,18 @@ export const constantRoutes = [ name: 'platform', meta: { title: '平台入口', icon: 'House' }, }, + { + path: '/government-affairs-app', + component: () => import('@/views/appPage/government-affairs-app.vue'), + name: 'government-affairs-app', + meta: { title: '农业产业政务平台APP', icon: '' }, + }, + { + path: '/operation-app', + component: () => import('@/views/appPage/operation-app.vue'), + name: 'operation-app', + meta: { title: '农业产业运营平台APP', icon: '' }, + }, ], }, ]; diff --git a/main/src/views/appPage/government-affairs-app.vue b/main/src/views/appPage/government-affairs-app.vue new file mode 100644 index 0000000..d163c76 --- /dev/null +++ b/main/src/views/appPage/government-affairs-app.vue @@ -0,0 +1,32 @@ + + + + + diff --git a/main/src/views/appPage/operation-app.vue b/main/src/views/appPage/operation-app.vue new file mode 100644 index 0000000..4ee4970 --- /dev/null +++ b/main/src/views/appPage/operation-app.vue @@ -0,0 +1,32 @@ + + + + + diff --git a/main/src/views/index.vue b/main/src/views/index.vue index 12db49c..ca82398 100644 --- a/main/src/views/index.vue +++ b/main/src/views/index.vue @@ -37,9 +37,13 @@ import { getAssetsFile } from '@/utils'; const gotoPage = (row) => { // window.history.pushState({}, row.name, row.activeRule); if (row.name == 'sub-app1') { - window.location.href = 'https://www.pgyer.com/MXd3uUrO'; + // 政务app + // window.location.href = 'https://www.pgyer.com/MXd3uUrO'; + window.location.href = row.activeRule; } else if (row.name == 'sub-app2') { - window.location.href = 'https://www.pgyer.com/4SVVtpob'; + // 运营app + // window.location.href = 'https://www.pgyer.com/4SVVtpob'; + window.location.href = row.activeRule; } else { window.location.href = row.activeRule; } diff --git a/sub-government-affairs-service/src/layouts/component/Header/index.vue b/sub-government-affairs-service/src/layouts/component/Header/index.vue index 726c9ff..9ada9d3 100644 --- a/sub-government-affairs-service/src/layouts/component/Header/index.vue +++ b/sub-government-affairs-service/src/layouts/component/Header/index.vue @@ -37,7 +37,8 @@ import TagsView from '../TagsView'; const { VITE_APP_PLATFORM } = import.meta.env; const goHome = () => { - window.location.href = VITE_APP_PLATFORM; + // window.location.href = VITE_APP_PLATFORM; + window.location.href = '/'; }; const SettingStore = useSettingStore(); diff --git a/sub-government-affairs-service/src/views/trace/planting/seedling/use/index.vue b/sub-government-affairs-service/src/views/trace/planting/seedling/use/index.vue index b3d0c42..80b1096 100644 --- a/sub-government-affairs-service/src/views/trace/planting/seedling/use/index.vue +++ b/sub-government-affairs-service/src/views/trace/planting/seedling/use/index.vue @@ -145,9 +145,9 @@ const columns = ref([ { prop: 'gridName', label: '所属网格' }, { prop: 'name', label: '姓名' }, { prop: 'phone', label: '联系方式' }, - { prop: 'provenanceId', label: '种子编号' }, + { prop: 'provenanceId', label: '种子种苗编号' }, { prop: 'provenanceName', label: '种子种苗名称' }, - { prop: 'useNumber', label: '使用量' }, + { prop: 'useNumber', label: '使用量', formatter: (row) => `${row.useNumber} ${row.useUnit}` }, { prop: 'useTime', label: '使用时间' }, { prop: 'action', label: '操作', slotName: 'action', width: 100, fixed: 'right' }, ]); diff --git a/sub-operation-service/.env.test b/sub-operation-service/.env.test index c18f6bd..3e9ef77 100644 --- a/sub-operation-service/.env.test +++ b/sub-operation-service/.env.test @@ -1,6 +1,6 @@ # 测试环境 VITE_APP_MIAN = 'daimp-front-main' -VITE_APP_MIAN_URL = 'http://192.168.18.99:88' +VITE_APP_MIAN_URL = 'http://192.168.18.99' VITE_APP_NAME = 'sub-operation-service' # 接口 VITE_APP_BASE_API = '/apis' diff --git a/sub-operation-service/components.d.ts b/sub-operation-service/components.d.ts index 32f9580..850fee4 100644 --- a/sub-operation-service/components.d.ts +++ b/sub-operation-service/components.d.ts @@ -10,7 +10,6 @@ declare module 'vue' { BreadComp: typeof import('./src/components/breadComp.vue')['default'] CenterMap: typeof import('./src/components/centerMap.vue')['default'] CodeDialog: typeof import('./src/components/code-dialog/index.vue')['default'] - copy: typeof import('./src/components/custom-scroll-title copy/index.vue')['default'] CostomImg: typeof import('./src/components/costomImg.vue')['default'] CustomBack: typeof import('./src/components/customBack.vue')['default'] CustomCarouselPicture: typeof import('./src/components/custom-carousel-picture/index.vue')['default'] diff --git a/sub-operation-service/src/layouts/component/Header/index.vue b/sub-operation-service/src/layouts/component/Header/index.vue index 189fede..26d5661 100644 --- a/sub-operation-service/src/layouts/component/Header/index.vue +++ b/sub-operation-service/src/layouts/component/Header/index.vue @@ -78,6 +78,8 @@ import { getAssetsFile } from '@/utils'; import { getGoodNum } from '@/apis/agricultural.js'; import { useMethodsStore } from '@/store/modules/methods'; +const { VITE_APP_PLATFORM } = import.meta.env; + const router = useRouter(); const keyword = ref(''); @@ -143,7 +145,8 @@ function Search() { const toHome = () => { console.info('toHome', router); - router.push('/'); + // window.location.href = VITE_APP_PLATFORM; + window.location.href = '/'; }; const toUserCenter = () => {