From 30743bd4e07ad7f349aa8872b32e015f3ffccf81 Mon Sep 17 00:00:00 2001
From: 13713575202 <1345916905@qq.com>
Date: Wed, 21 May 2025 09:00:10 +0800
Subject: [PATCH 1/3] xiabin
---
main/src/micro/app.js | 2 +-
main/src/views/index.vue | 5 +-
main/yarn.lock | 17620 +++++++---------
.../src/router/index.js | 66 +-
.../src/assets/images/business/b1-1.png | Bin 0 -> 615307 bytes
.../src/assets/images/business/b1-2.png | Bin 0 -> 41294 bytes
.../src/assets/images/business/b2-1.png | Bin 0 -> 615260 bytes
.../src/assets/images/business/b2-2.png | Bin 0 -> 43485 bytes
.../src/assets/images/business/bg_title.png | Bin 0 -> 11766 bytes
.../src/views/dashboard/index.vue | 3 +
.../views/smartFarm/components/myTable.vue | 4 +-
.../smartFarm/inspection/bugInspection.vue | 12 +-
12 files changed, 7320 insertions(+), 10392 deletions(-)
create mode 100644 sub-operation-service/src/assets/images/business/b1-1.png
create mode 100644 sub-operation-service/src/assets/images/business/b1-2.png
create mode 100644 sub-operation-service/src/assets/images/business/b2-1.png
create mode 100644 sub-operation-service/src/assets/images/business/b2-2.png
create mode 100644 sub-operation-service/src/assets/images/business/bg_title.png
diff --git a/main/src/micro/app.js b/main/src/micro/app.js
index 36f7b87..9e29066 100644
--- a/main/src/micro/app.js
+++ b/main/src/micro/app.js
@@ -61,7 +61,7 @@ export const rightApps = [
// entry: VITE_APP_SUB_GSS,
entry: VITE_APP_SUB_GSR,
// activeRule: '/sub-government-screen-service',
- activeRule: '/new-digital-agriculture-screen/v2/land',
+ activeRule: '/new-digital-agriculture-screen',
title: '数据大屏',
icon: 'images/platform/icon-screen.png',
},
diff --git a/main/src/views/index.vue b/main/src/views/index.vue
index 0a8688b..fd39627 100644
--- a/main/src/views/index.vue
+++ b/main/src/views/index.vue
@@ -35,9 +35,8 @@ import { leftApps, rightApps } from '@/micro/app';
import { getAssetsFile } from '@/utils';
const gotoPage = (row) => {
- console.log(row);
- console.log(window.history.pushState({}, row.name, row.activeRule));
- window.history.pushState({}, row.name, row.activeRule);
+ // window.history.pushState({}, row.name, row.activeRule);
+ window.location.href = row.activeRule;
};
+
From 7f86f02178b8daa0a711fd8b5edee6ed7b9565d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9A=E4=BF=8A=E6=97=AD?= <398847134@qq.com>
Date: Wed, 21 May 2025 10:14:25 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=99=BA=E8=83=BD=E9=85=8D=E8=82=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sub-operation-service/src/router/index.js | 8 +-
.../views/smartFarm/components/devices.vue | 2 +-
.../views/smartFarm/components/leftMenu.vue | 6 +
.../inspection/intelligentFertilizer.vue | 161 ++++++++++++++++++
4 files changed, 175 insertions(+), 2 deletions(-)
create mode 100644 sub-operation-service/src/views/smartFarm/inspection/intelligentFertilizer.vue
diff --git a/sub-operation-service/src/router/index.js b/sub-operation-service/src/router/index.js
index 41f200f..3e1beb4 100644
--- a/sub-operation-service/src/router/index.js
+++ b/sub-operation-service/src/router/index.js
@@ -66,7 +66,7 @@ export const constantRoutes = [
name: 'userOrders',
meta: { title: '我的订单' },
},
- {
+ {
path: '/sub-operation-service/userLands',
component: () => import('@/views/userCenter/userLands.vue'),
name: 'userLands',
@@ -133,6 +133,12 @@ export const constantRoutes = [
name: 'envInspection',
meta: { title: '环境监测' },
},
+ {
+ path: '/sub-operation-service/smartFarm/intelligentFertilizer',
+ component: () => import('@/views/smartFarm/inspection/intelligentFertilizer.vue'),
+ name: 'intelligentFertilizer',
+ meta: { title: '智能配肥' },
+ },
{
path: '/sub-operation-service/smartFarm/growSeedlings',
component: () => import('@/views/smartFarm/growSeedlings/index.vue'),
diff --git a/sub-operation-service/src/views/smartFarm/components/devices.vue b/sub-operation-service/src/views/smartFarm/components/devices.vue
index 3780d79..8fb46b6 100644
--- a/sub-operation-service/src/views/smartFarm/components/devices.vue
+++ b/sub-operation-service/src/views/smartFarm/components/devices.vue
@@ -27,7 +27,7 @@ const icons = [
{ 温度传感器: 'tempSensor' },
{ 智能阀控: 'intelligentValveControl' },
{ 供水阀: 'waterSupplyValve' },
- { 混合阀: 'mixingPump' },
+ { 混合泵: 'mixingPump' },
{ 混合罐: 'mixingTank' },
{ 施肥: 'fertilization' },
{ 肥料罐: 'fertilizerTank' },
diff --git a/sub-operation-service/src/views/smartFarm/components/leftMenu.vue b/sub-operation-service/src/views/smartFarm/components/leftMenu.vue
index 6d12bb0..19ad8d8 100644
--- a/sub-operation-service/src/views/smartFarm/components/leftMenu.vue
+++ b/sub-operation-service/src/views/smartFarm/components/leftMenu.vue
@@ -79,6 +79,12 @@ const leftMenu = reactive([
icon: 'menu1.png',
path: '/sub-operation-service/smartFarm/envInspection',
},
+ {
+ name: 'intelligentFertilizer',
+ title: '智能配肥',
+ icon: 'menu1.png',
+ path: '/sub-operation-service/smartFarm/intelligentFertilizer',
+ },
],
},
{
diff --git a/sub-operation-service/src/views/smartFarm/inspection/intelligentFertilizer.vue b/sub-operation-service/src/views/smartFarm/inspection/intelligentFertilizer.vue
new file mode 100644
index 0000000..d940b37
--- /dev/null
+++ b/sub-operation-service/src/views/smartFarm/inspection/intelligentFertilizer.vue
@@ -0,0 +1,161 @@
+
+
+
+
+
+
+
+
+
+
+ 配肥分析
+
+
+
+
+
+
+
+
+