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;
};
diff --git a/sub-operation-service/src/views/smartFarm/components/common.vue b/sub-operation-service/src/views/smartFarm/components/common.vue
index 0e048ba..847afce 100644
--- a/sub-operation-service/src/views/smartFarm/components/common.vue
+++ b/sub-operation-service/src/views/smartFarm/components/common.vue
@@ -51,14 +51,38 @@ const menus = reactive([
name: 'control',
title: '生产管理控制',
icon: 'menu3.png',
- path: '/sub-operation-service/ecommerce-purchaser',
+ path: '',
isOpen: false,
children: [
{
name: 'control',
title: '一体育苗',
icon: 'menu3.png',
- path: '/sub-operation-service/smartFarm/growSeedlings',
+ path: '/sub-operation-service/smartFarm/manageControl/growSeedlings',
+ },
+ {
+ name: 'control',
+ title: '病虫害预防',
+ icon: 'menu3.png',
+ path: '/sub-operation-service/smartFarm/manageControl/pestPrevention',
+ },
+ {
+ name: 'control',
+ title: '喷灌滴灌',
+ icon: 'menu3.png',
+ path: '/sub-operation-service/smartFarm/manageControl/irrigationSystem',
+ },
+ {
+ name: 'control',
+ title: '排集水控制',
+ icon: 'menu3.png',
+ path: '/sub-operation-service/smartFarm/manageControl/drainageControl',
+ },
+ {
+ name: 'control',
+ title: '开窗卷帘',
+ icon: 'menu3.png',
+ path: '/sub-operation-service/smartFarm/manageControl/openCurtain',
},
],
},
diff --git a/sub-operation-service/src/views/smartFarm/components/controlDevices.vue b/sub-operation-service/src/views/smartFarm/components/controlDevices.vue
new file mode 100644
index 0000000..ffb1771
--- /dev/null
+++ b/sub-operation-service/src/views/smartFarm/components/controlDevices.vue
@@ -0,0 +1,143 @@
+
+
+
+
+
+
+
![]()
+
+
+
{{ item.title }}
+
+
+
正常
+
离线
+
故障
+
+
+
{{ device.serial }}
+
+
+
+
+
+
+
+
![]()
![]()
![]()
+ ![]()
+ ![]()
+ ![]()
+ ![]()
+ ![]()
+ ![]()
+ ![]()
+ ![]()
+ ![]()
+ ![]()
+ ![]()
+ ![]()
+ ![]()
+ ![]()
+ ![]()
+ ![]()
+ ![]()
+ ![]()
+ ![]()
+ ![]()
+ ![]()
{{ item.name }}
diff --git a/sub-operation-service/src/views/smartFarm/components/leftMenu.vue b/sub-operation-service/src/views/smartFarm/components/leftMenu.vue
index 9207312..0f2dc5c 100644
--- a/sub-operation-service/src/views/smartFarm/components/leftMenu.vue
+++ b/sub-operation-service/src/views/smartFarm/components/leftMenu.vue
@@ -56,30 +56,42 @@ const leftMenu = reactive([
isOpen: true,
children: [
{
- name: 'supplier',
+ name: 'fieldInspection',
title: '田间监测',
icon: 'menu1.png',
path: '/sub-operation-service/smartFarm/fieldInspection',
},
{
- name: 'supplier',
+ name: 'waterInspection',
title: '水质监测',
icon: 'menu1.png',
path: '/sub-operation-service/smartFarm/waterInspection',
},
{
- name: 'supplier',
+ name: 'bugInspection',
title: '病虫害监测',
icon: 'menu1.png',
path: '/sub-operation-service/smartFarm/bugInspection',
},
+ {
+ name: 'envInspection',
+ title: '环境监测',
+ icon: 'menu1.png',
+ path: '/sub-operation-service/smartFarm/envInspection',
+ },
+ {
+ name: 'intelligentFertilizer',
+ title: '智能配肥',
+ icon: 'menu1.png',
+ path: '/sub-operation-service/smartFarm/intelligentFertilizer',
+ },
],
},
{
name: 'control',
title: '生产管理控制',
icon: 'menu3.png',
- path: '/sub-operation-service/smartFarm/main',
+ path: '',
isOpen: false,
children: [
{
@@ -88,6 +100,30 @@ const leftMenu = reactive([
icon: 'menu3.png',
path: '/sub-operation-service/smartFarm/growSeedlings',
},
+ {
+ name: 'control',
+ title: '病虫害预防',
+ icon: 'menu3.png',
+ path: '/sub-operation-service/smartFarm/pestPrevention',
+ },
+ {
+ name: 'control',
+ title: '喷灌滴灌',
+ icon: 'menu3.png',
+ path: '/sub-operation-service/smartFarm/irrigationSystem',
+ },
+ {
+ name: 'control',
+ title: '排集水控制',
+ icon: 'menu3.png',
+ path: '/sub-operation-service/smartFarm/drainageControl',
+ },
+ {
+ name: 'control',
+ title: '开窗卷帘',
+ icon: 'menu3.png',
+ path: '/sub-operation-service/smartFarm/openCurtain',
+ },
],
},
]);
diff --git a/sub-operation-service/src/views/smartFarm/components/myTable.vue b/sub-operation-service/src/views/smartFarm/components/myTable.vue
index 68c8f68..1c932d2 100644
--- a/sub-operation-service/src/views/smartFarm/components/myTable.vue
+++ b/sub-operation-service/src/views/smartFarm/components/myTable.vue
@@ -40,8 +40,8 @@ onMounted(() => {
|
- {{ cell }}
- {{ cell }}
+ {{ cell }}
+ {{ cell }}
{{ cell }}
|
diff --git a/sub-operation-service/src/views/smartFarm/components/produceDevices.vue b/sub-operation-service/src/views/smartFarm/components/produceDevices.vue
index fd2e168..cc46717 100644
--- a/sub-operation-service/src/views/smartFarm/components/produceDevices.vue
+++ b/sub-operation-service/src/views/smartFarm/components/produceDevices.vue
@@ -52,7 +52,7 @@ const props = defineProps({
![]()
![]()
-
{{ item.name }}
+
{{ item.name }}
{{ item.serial }}
-
-
+
-
+
diff --git a/sub-operation-service/src/views/smartFarm/inspection/envInspection.vue b/sub-operation-service/src/views/smartFarm/inspection/envInspection.vue
new file mode 100644
index 0000000..1eb17dc
--- /dev/null
+++ b/sub-operation-service/src/views/smartFarm/inspection/envInspection.vue
@@ -0,0 +1,285 @@
+
+
+
+
+
+
+
+
+
+
+
+
实时环境监测
+
+ 当前设备
+
+
+
+
+
+
+
![]()
+
{{ item.title }}
+
+
+
+ 作物生长状态
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 配肥分析
+
+
+
+
+
+
+
+
+