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/leftMenu.vue b/sub-operation-service/src/views/smartFarm/components/leftMenu.vue
index 19ad8d8..0f2dc5c 100644
--- a/sub-operation-service/src/views/smartFarm/components/leftMenu.vue
+++ b/sub-operation-service/src/views/smartFarm/components/leftMenu.vue
@@ -91,7 +91,7 @@ const leftMenu = reactive([
name: 'control',
title: '生产管理控制',
icon: 'menu3.png',
- path: '/sub-operation-service/smartFarm/main',
+ path: '',
isOpen: false,
children: [
{
@@ -100,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/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 }}