diff --git a/sub-operation-service/src/assets/images/smartFarm/broadcast.png b/sub-operation-service/src/assets/images/smartFarm/broadcast.png new file mode 100644 index 0000000..8e6357d Binary files /dev/null and b/sub-operation-service/src/assets/images/smartFarm/broadcast.png differ diff --git a/sub-operation-service/src/assets/images/smartFarm/排水泵.png b/sub-operation-service/src/assets/images/smartFarm/排水泵.png new file mode 100644 index 0000000..718fbeb Binary files /dev/null and b/sub-operation-service/src/assets/images/smartFarm/排水泵.png differ diff --git a/sub-operation-service/src/assets/images/smartFarm/液位传感器.png b/sub-operation-service/src/assets/images/smartFarm/液位传感器.png new file mode 100644 index 0000000..7ebfb55 Binary files /dev/null and b/sub-operation-service/src/assets/images/smartFarm/液位传感器.png differ diff --git a/sub-operation-service/src/assets/images/smartFarm/电动闸阀.png b/sub-operation-service/src/assets/images/smartFarm/电动闸阀.png new file mode 100644 index 0000000..da8e438 Binary files /dev/null and b/sub-operation-service/src/assets/images/smartFarm/电动闸阀.png differ diff --git a/sub-operation-service/src/router/index.js b/sub-operation-service/src/router/index.js index 3af58b4..c496f2f 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,30 @@ export const constantRoutes = [ name: 'growSeedlings', meta: { title: '一体育苗' }, }, + { + path: '/sub-operation-service/smartFarm/pestPrevention', + component: () => import('@/views/smartFarm/pestPrevention/index.vue'), + name: 'pestPrevention', + meta: { title: '病虫害防治' }, + }, + { + path: '/sub-operation-service/smartFarm/irrigationSystem', + component: () => import('@/views/smartFarm/irrigationSystem/index.vue'), + name: 'irrigationSystem', + meta: { title: '喷灌滴灌' }, + }, + { + path: '/sub-operation-service/smartFarm/drainageControl', + component: () => import('@/views/smartFarm/drainageControl/index.vue'), + name: 'drainageControl', + meta: { title: '排集水控制' }, + }, + { + path: '/sub-operation-service/smartFarm/openCurtain', + component: () => import('@/views/smartFarm/openCurtain/index.vue'), + name: 'openCurtain', + meta: { title: '开窗卷帘' }, + }, ], }, { diff --git a/sub-operation-service/src/views/smartFarm/components/common.vue b/sub-operation-service/src/views/smartFarm/components/common.vue index 0e048ba..81308e1 100644 --- a/sub-operation-service/src/views/smartFarm/components/common.vue +++ b/sub-operation-service/src/views/smartFarm/components/common.vue @@ -60,6 +60,30 @@ const menus = 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/controlDevices.vue b/sub-operation-service/src/views/smartFarm/components/controlDevices.vue new file mode 100644 index 0000000..42e1b5e --- /dev/null +++ b/sub-operation-service/src/views/smartFarm/components/controlDevices.vue @@ -0,0 +1,148 @@ + + + + + diff --git a/sub-operation-service/src/views/smartFarm/components/leftMenu.vue b/sub-operation-service/src/views/smartFarm/components/leftMenu.vue index 9207312..fdc9885 100644 --- a/sub-operation-service/src/views/smartFarm/components/leftMenu.vue +++ b/sub-operation-service/src/views/smartFarm/components/leftMenu.vue @@ -79,7 +79,7 @@ const leftMenu = reactive([ name: 'control', title: '生产管理控制', icon: 'menu3.png', - path: '/sub-operation-service/smartFarm/main', + path: '', isOpen: false, children: [ { @@ -88,6 +88,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..0709799 100644 --- a/sub-operation-service/src/views/smartFarm/components/myTable.vue +++ b/sub-operation-service/src/views/smartFarm/components/myTable.vue @@ -33,18 +33,22 @@ onMounted(() => {
{{ title }}
- - - - - - + + + + + + + + + +
- {{ item?.label || '' }} -
- {{ cell }} - {{ cell }} - {{ cell }} -
+ {{ item?.label || '' }} +
+ {{ 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/drainageControl/index.vue b/sub-operation-service/src/views/smartFarm/drainageControl/index.vue new file mode 100644 index 0000000..ad06448 --- /dev/null +++ b/sub-operation-service/src/views/smartFarm/drainageControl/index.vue @@ -0,0 +1,214 @@ + + + + + diff --git a/sub-operation-service/src/views/smartFarm/growSeedlings/index.vue b/sub-operation-service/src/views/smartFarm/growSeedlings/index.vue index 24cb0e8..c5f3b67 100644 --- a/sub-operation-service/src/views/smartFarm/growSeedlings/index.vue +++ b/sub-operation-service/src/views/smartFarm/growSeedlings/index.vue @@ -188,17 +188,4 @@ const rightTableTitle = ref([ ]); - + diff --git a/sub-operation-service/src/views/smartFarm/irrigationSystem/index.vue b/sub-operation-service/src/views/smartFarm/irrigationSystem/index.vue new file mode 100644 index 0000000..59fec92 --- /dev/null +++ b/sub-operation-service/src/views/smartFarm/irrigationSystem/index.vue @@ -0,0 +1,191 @@ + + + + + diff --git a/sub-operation-service/src/views/smartFarm/openCurtain/index.vue b/sub-operation-service/src/views/smartFarm/openCurtain/index.vue new file mode 100644 index 0000000..d8f77fb --- /dev/null +++ b/sub-operation-service/src/views/smartFarm/openCurtain/index.vue @@ -0,0 +1,211 @@ + + + + + diff --git a/sub-operation-service/src/views/smartFarm/pestPrevention/index.vue b/sub-operation-service/src/views/smartFarm/pestPrevention/index.vue new file mode 100644 index 0000000..8955f6c --- /dev/null +++ b/sub-operation-service/src/views/smartFarm/pestPrevention/index.vue @@ -0,0 +1,191 @@ + + + + +