diff --git a/sub-operation-service/src/assets/images/smartFarm/PM2.5.png b/sub-operation-service/src/assets/images/smartFarm/PM2.5.png new file mode 100644 index 0000000..4248adc Binary files /dev/null and b/sub-operation-service/src/assets/images/smartFarm/PM2.5.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..415d46f 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..7de46a8 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..8cfab56 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..9141b83 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..dc05dcc 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..da74a83 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..164035b 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..534984d 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..5465955 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..90df5b9 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..ad683a9 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..7a758d4 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..94df86a 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..deb684c 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..5f39d47 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..730c209 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..6eeb7d4 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..6e9b15f 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..51bdb06 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..c41265f 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..41f200f 100644 --- a/sub-operation-service/src/router/index.js +++ b/sub-operation-service/src/router/index.js @@ -127,6 +127,12 @@ export const constantRoutes = [ name: 'bugInspection', meta: { title: '病虫害监测' }, }, + { + path: '/sub-operation-service/smartFarm/envInspection', + component: () => import('@/views/smartFarm/inspection/envInspection.vue'), + name: 'envInspection', + 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/bugData.vue b/sub-operation-service/src/views/smartFarm/components/bugData.vue new file mode 100644 index 0000000..6852b8c --- /dev/null +++ b/sub-operation-service/src/views/smartFarm/components/bugData.vue @@ -0,0 +1,266 @@ + + + + + diff --git a/sub-operation-service/src/views/smartFarm/components/devices.vue b/sub-operation-service/src/views/smartFarm/components/devices.vue index ea8ce7f..3780d79 100644 --- a/sub-operation-service/src/views/smartFarm/components/devices.vue +++ b/sub-operation-service/src/views/smartFarm/components/devices.vue @@ -5,6 +5,40 @@ import { useRoute, useRouter } from 'vue-router'; const route = useRoute(); const router = useRouter(); +// 图标icon对照表 +const icons = [ + { 监控: 'camera' }, + { 传感器: 'sensor' }, + { 水质溶解氧: 'O2' }, + { 温度: 'temp' }, + { 酸碱度: 'ph' }, + { 水质电导率: 'elect' }, + { 浊度: 'dust' }, + { 悬浮物: 'float' }, + { 分光器: 'light' }, + { 阀门: 'valve' }, + { 喷头: 'sprinkler' }, + { 计时器: 'timer' }, + { 加热器: 'heater' }, + { 搅拌机: 'mixer' }, + { 热力: 'heat' }, + { 液位传感器: 'liquidSensor' }, + { 消毒灯: 'disinfectionLamp' }, + { 温度传感器: 'tempSensor' }, + { 智能阀控: 'intelligentValveControl' }, + { 供水阀: 'waterSupplyValve' }, + { 混合阀: 'mixingPump' }, + { 混合罐: 'mixingTank' }, + { 施肥: 'fertilization' }, + { 肥料罐: 'fertilizerTank' }, + { 电磁阀状态: 'solenoidValve' }, + { 'PM2.5': 'PM2.5' }, + { 风速仪: 'anemometer' }, + { 雨量计: 'rainGauge' }, + { 土壤传感器: 'soilSensor' }, + { 积水传感器: 'waterLoggingSensor' }, +]; + const props = defineProps({ devices: { type: Array, @@ -54,6 +88,27 @@ const props = defineProps({ + + + + + + + + + + + + + + + + + + + + +
{{ 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..6d12bb0 100644 --- a/sub-operation-service/src/views/smartFarm/components/leftMenu.vue +++ b/sub-operation-service/src/views/smartFarm/components/leftMenu.vue @@ -56,23 +56,29 @@ 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', + }, ], }, { 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/sickData.vue b/sub-operation-service/src/views/smartFarm/components/sickData.vue new file mode 100644 index 0000000..52830cb --- /dev/null +++ b/sub-operation-service/src/views/smartFarm/components/sickData.vue @@ -0,0 +1,124 @@ + + + diff --git a/sub-operation-service/src/views/smartFarm/inspection/bugInspection.vue b/sub-operation-service/src/views/smartFarm/inspection/bugInspection.vue index 0a3d9bc..9e4b2c9 100644 --- a/sub-operation-service/src/views/smartFarm/inspection/bugInspection.vue +++ b/sub-operation-service/src/views/smartFarm/inspection/bugInspection.vue @@ -1,13 +1,227 @@ 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 @@ + + + + +