From 9e193feb0ea8f21ae65c30c882db1199c74484f8 Mon Sep 17 00:00:00 2001
From: "2090205686@qq.com" <guoyongchao666>
Date: Wed, 21 May 2025 14:33:34 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E6=99=BA=E8=83=BD=E7=81=8C=E6=BA=89?=
 =?UTF-8?q?=E5=92=8C=E6=99=BA=E8=83=BD=E6=B5=B8=E7=A7=8D=E5=BC=80=E5=8F=91?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=EF=BC=8C=E5=90=AB=E5=8F=B3=E4=BE=A7=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E7=BB=84=E4=BB=B6=EF=BC=8C=E5=8E=9F=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84=E8=B0=83=E6=95=B4=EF=BC=8C=E8=B7=AF=E7=94=B1?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/assets/images/smartFarm/demo-list.png | Bin 0 -> 15524 bytes
 sub-operation-service/src/router/index.js     |  12 ++
 .../smartFarm/components/dataDisplay.vue      |  71 ++++++++
 .../views/smartFarm/components/devices.vue    |  24 +--
 .../views/smartFarm/components/leftMenu.vue   |  14 +-
 .../smartFarm/components/produceDevices.vue   |  15 --
 .../src/views/smartFarm/components/stream.vue |  13 --
 .../inspection/IntelligentIrrigation.vue      | 156 ++++++++++++++++++
 .../inspection/IntelligentSeedSoaking.vue     | 156 ++++++++++++++++++
 .../inspection/intelligentFertilizer.vue      |   2 +-
 sub-operation-service/vite.config.js          |   1 +
 11 files changed, 417 insertions(+), 47 deletions(-)
 create mode 100644 sub-operation-service/src/assets/images/smartFarm/demo-list.png
 create mode 100644 sub-operation-service/src/views/smartFarm/components/dataDisplay.vue
 create mode 100644 sub-operation-service/src/views/smartFarm/inspection/IntelligentIrrigation.vue
 create mode 100644 sub-operation-service/src/views/smartFarm/inspection/IntelligentSeedSoaking.vue

diff --git a/sub-operation-service/src/assets/images/smartFarm/demo-list.png b/sub-operation-service/src/assets/images/smartFarm/demo-list.png
new file mode 100644
index 0000000000000000000000000000000000000000..e478a7db833d14825df071facb48222173e3e726
GIT binary patch
literal 15524
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

literal 0
HcmV?d00001

diff --git a/sub-operation-service/src/router/index.js b/sub-operation-service/src/router/index.js
index 907f460..ab4ff1d 100644
--- a/sub-operation-service/src/router/index.js
+++ b/sub-operation-service/src/router/index.js
@@ -139,6 +139,18 @@ export const constantRoutes = [
         name: 'intelligentFertilizer',
         meta: { title: '智能配肥' },
       },
+      {
+        path: '/sub-operation-service/smartFarm/IntelligentIrrigation',
+        component: () => import('@/views/smartFarm/inspection/IntelligentIrrigation.vue'),
+        name: 'IntelligentIrrigation',
+        meta: { title: '智能灌溉' },
+      },
+      {
+        path: '/sub-operation-service/smartFarm/IntelligentSeedSoaking',
+        component: () => import('@/views/smartFarm/inspection/IntelligentSeedSoaking.vue'),
+        name: 'IntelligentSeedSoaking',
+        meta: { title: '智能浸种' },
+      },
       {
         path: '/sub-operation-service/smartFarm/growSeedlings',
         component: () => import('@/views/smartFarm/manageControl/growSeedlings.vue'),
diff --git a/sub-operation-service/src/views/smartFarm/components/dataDisplay.vue b/sub-operation-service/src/views/smartFarm/components/dataDisplay.vue
new file mode 100644
index 0000000..792ae08
--- /dev/null
+++ b/sub-operation-service/src/views/smartFarm/components/dataDisplay.vue
@@ -0,0 +1,71 @@
+<script setup>
+import { ref, reactive, onMounted, watch } from 'vue';
+import { isEmpty, getAssetsFile } from '@/utils';
+
+const props = defineProps({
+  data: {
+    type: Array,
+    required: true,
+    default: () => [],
+  },
+  title: {
+    type: String,
+    required: true,
+    default: () => '',
+    validator: (items) => {
+      return items;
+    },
+  },
+  showImage: {
+    type: Boolean,
+    default: false,
+  },
+  imageList: {
+    type: Array,
+    default: () => [],
+  },
+});
+</script>
+
+<template>
+  <div>
+    <el-card style="border-radius: 16px; min-height: 316px">
+      <div class="my-card-title" style="">{{ title }}</div>
+      <div v-for="(item, index) in data" :key="index" class="show-data-box">
+        <div class="left-title">{{ item.title }}:</div>
+        <div :style="{ color: item.status == '0' ? '#FE4066' : '#25BF82' }">{{ item.statusText }}</div>
+      </div>
+      <div v-if="showImage">
+        <p style="font-size: 14px; text-align: left; color: #000000; margin-bottom: 10px">灌溉记录:</p>
+        <el-image
+          style="width: 100%"
+          :src="imageList[0]"
+          :zoom-rate="1.2"
+          :max-scale="7"
+          :min-scale="0.2"
+          :preview-src-list="imageList"
+          show-progress
+          :initial-index="4"
+          fit="cover"
+        />
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<style scoped lang="scss">
+.my-card-title {
+  font-size: 16px;
+  font-weight: bold;
+  text-align: left;
+  color: #000;
+  margin-bottom: 16px;
+}
+.show-data-box {
+  display: flex;
+  justify-content: space-between;
+  font-size: 14px;
+  margin: 7px 0;
+  color: #000000;
+}
+</style>
diff --git a/sub-operation-service/src/views/smartFarm/components/devices.vue b/sub-operation-service/src/views/smartFarm/components/devices.vue
index 8fb46b6..1a4ca56 100644
--- a/sub-operation-service/src/views/smartFarm/components/devices.vue
+++ b/sub-operation-service/src/views/smartFarm/components/devices.vue
@@ -37,6 +37,8 @@ const icons = [
   { 雨量计: 'rainGauge' },
   { 土壤传感器: 'soilSensor' },
   { 积水传感器: 'waterLoggingSensor' },
+  { 土壤温度: 'temperature' },
+  { 土壤湿度: 'humidity' },
 ];
 
 const props = defineProps({
@@ -44,19 +46,6 @@ const props = defineProps({
     type: Array,
     required: true,
     default: () => [],
-    validator: (items) => {
-      return items.every((item) => {
-        return (
-          typeof item === 'object' &&
-          item !== null &&
-          typeof item.id === 'number' &&
-          typeof item.name === 'string' &&
-          typeof item.detail === 'string' &&
-          typeof item.icon === 'string' &&
-          (!item.status || typeof item.status === 'number')
-        );
-      });
-    },
   },
   title: {
     type: String,
@@ -72,8 +61,8 @@ const props = defineProps({
 <template>
   <div>
     <el-card style="border-radius: 16px">
-      <div style="font-size: 16px; font-weight: bold; text-align: left; color: #000">{{ title }}</div>
-      <div style="display: flex; justify-content: flex-start; flex-wrap: wrap">
+      <div style="font-size: 16px; font-weight: bold; text-align: left; color: #000; margin-bottom: 20px">{{ title }}</div>
+      <div style="display: flex; justify-content: flex-start; flex-wrap: wrap; gap: 20px">
         <div v-for="(item, index) in devices" :key="index" class="device">
           <div v-if="item.status == 1" class="status" style="background-color: #25bf82">正常</div>
           <div v-else-if="item.status == 0" class="status" style="background-color: #999999">离线</div>
@@ -109,6 +98,8 @@ const props = defineProps({
             <img v-else-if="item.icon === 'rainGauge'" :src="getAssetsFile('images/smartFarm/雨量计.png')" alt="" />
             <img v-else-if="item.icon === 'soilSensor'" :src="getAssetsFile('images/smartFarm/土壤传感器.png')" alt="" />
             <img v-else-if="item.icon === 'waterLoggingSensor'" :src="getAssetsFile('images/smartFarm/积水传感器.png')" alt="" />
+            <img v-else-if="item.icon === 'temperature'" :src="getAssetsFile('images/smartFarm/土壤温度.png')" alt="" />
+            <img v-else-if="item.icon === 'humidity'" :src="getAssetsFile('images/smartFarm/土壤湿度.png')" alt="" />
             <div style="text-align: left; font-weight: bold; font-size: 18px">{{ item.name }}</div>
           </div>
         </div>
@@ -120,9 +111,8 @@ const props = defineProps({
 <style scoped lang="scss">
 .device {
   height: 100px;
-  width: 14%;
+  width: 14.6%;
   background-color: #f5f5f5;
-  margin: 20px 1%;
   border-radius: 16px;
   position: relative;
   cursor: pointer;
diff --git a/sub-operation-service/src/views/smartFarm/components/leftMenu.vue b/sub-operation-service/src/views/smartFarm/components/leftMenu.vue
index 0f2dc5c..6b59b46 100644
--- a/sub-operation-service/src/views/smartFarm/components/leftMenu.vue
+++ b/sub-operation-service/src/views/smartFarm/components/leftMenu.vue
@@ -85,6 +85,18 @@ const leftMenu = reactive([
         icon: 'menu1.png',
         path: '/sub-operation-service/smartFarm/intelligentFertilizer',
       },
+      {
+        name: 'IntelligentIrrigation',
+        title: '智能灌溉',
+        icon: 'menu1.png',
+        path: '/sub-operation-service/smartFarm/IntelligentIrrigation',
+      },
+      {
+        name: 'IntelligentSeedSoaking',
+        title: '智能浸种',
+        icon: 'menu1.png',
+        path: '/sub-operation-service/smartFarm/IntelligentSeedSoaking',
+      },
     ],
   },
   {
@@ -179,7 +191,7 @@ const openList = (index) => {
   color: $color-main;
 }
 .smartFarm-left-menu-warp {
-  padding: 0 30px;
+  padding: 0 30px 0 10px;
   width: 100%;
   height: 100%;
   .left-menu {
diff --git a/sub-operation-service/src/views/smartFarm/components/produceDevices.vue b/sub-operation-service/src/views/smartFarm/components/produceDevices.vue
index cc46717..cf24327 100644
--- a/sub-operation-service/src/views/smartFarm/components/produceDevices.vue
+++ b/sub-operation-service/src/views/smartFarm/components/produceDevices.vue
@@ -10,21 +10,6 @@ const props = defineProps({
     type: Array,
     required: true,
     default: () => [],
-    validator: (items) => {
-      return items.every((item) => {
-        return (
-          typeof item === 'object' &&
-          item !== null &&
-          typeof item.id === 'number' &&
-          typeof item.isOpen === 'number' &&
-          typeof item.isOperation === 'number' &&
-          typeof item.name === 'string' &&
-          typeof item.serial === 'string' &&
-          typeof item.icon === 'string' &&
-          (!item.status || typeof item.status === 'number')
-        );
-      });
-    },
   },
   title: {
     type: String,
diff --git a/sub-operation-service/src/views/smartFarm/components/stream.vue b/sub-operation-service/src/views/smartFarm/components/stream.vue
index 004df44..05a40d7 100644
--- a/sub-operation-service/src/views/smartFarm/components/stream.vue
+++ b/sub-operation-service/src/views/smartFarm/components/stream.vue
@@ -27,19 +27,6 @@ const props = defineProps({
     type: Array,
     required: true,
     default: () => [],
-    validator: (items) => {
-      return items.every((item) => {
-        return (
-          typeof item === 'object' &&
-          item !== null &&
-          typeof item.id === 'number' &&
-          typeof item.name === 'string' &&
-          typeof item.icon === 'string' &&
-          typeof item.detail === 'string' &&
-          (!item.status || typeof item.status === 'number')
-        );
-      });
-    },
   },
 });
 
diff --git a/sub-operation-service/src/views/smartFarm/inspection/IntelligentIrrigation.vue b/sub-operation-service/src/views/smartFarm/inspection/IntelligentIrrigation.vue
new file mode 100644
index 0000000..e744020
--- /dev/null
+++ b/sub-operation-service/src/views/smartFarm/inspection/IntelligentIrrigation.vue
@@ -0,0 +1,156 @@
+<template>
+  <section>
+    <common>
+      <template #main>
+        <div>
+          <devices :title="'智能灌溉设备'" :devices="devices"></devices>
+        </div>
+        <div style="display: flex; align-items: stretch; justify-content: space-between; margin-top: 20px">
+          <stream :title="'灌溉监测实时监控'" :devices="devices" style="width: 60%; margin-right: 20px; height: fit-content"></stream>
+          <DataDisplay :title="'灌溉分析'" :data="rightData" :show-image="true" :image-list="srcList" style="flex: 1"></DataDisplay>
+        </div>
+      </template>
+    </common>
+  </section>
+</template>
+
+<script setup>
+import { ref, onMounted } from 'vue';
+import Common from '../components/common.vue';
+import Devices from '@/views/smartFarm/components/devices.vue';
+import Stream from '@/views/smartFarm/components/stream.vue';
+import DataDisplay from '@/views/smartFarm/components/dataDisplay.vue';
+
+const devices = ref([
+  {
+    name: 'A-001',
+    icon: 'temperature',
+    detail: 'A区-监控设备9',
+    status: '1', //  0: 离线 1: 正常 -1: 异常
+    id: 0,
+  },
+  {
+    name: 'A-002',
+    icon: 'temperature',
+    detail: 'A区-监控设备66',
+    status: '1',
+    id: 1,
+  },
+  {
+    name: 'A-003',
+    icon: 'humidity',
+    detail: 'A区-监控设备7',
+    status: '0',
+    id: 2,
+  },
+  {
+    name: 'A-004',
+    icon: 'humidity',
+    detail: 'A区-监控设备1',
+    status: '-1',
+    id: 3,
+  },
+  {
+    name: 'A-005',
+    icon: 'valve',
+    detail: 'A区-监控设备5',
+    status: '-1',
+    id: 4,
+  },
+  {
+    name: 'A-006',
+    icon: 'valve',
+    status: '0',
+    detail: 'A区-监控设备21',
+    id: 5,
+  },
+  {
+    name: 'A-007',
+    icon: 'sprinkler',
+    status: '0',
+    detail: 'A区-监控设备4',
+    id: 6,
+  },
+  {
+    name: 'A-008',
+    detail: 'A区-监控设备3',
+    icon: 'sprinkler',
+    status: '-1',
+    id: 7,
+  },
+  {
+    name: 'A-009',
+    detail: 'A区-监控设备9',
+    icon: 'waterSupplyValve',
+    status: '-1',
+    id: 8,
+  },
+  {
+    name: 'A-010',
+    detail: 'A区-监控设备10',
+    icon: 'waterSupplyValve',
+    status: '0',
+    id: 9,
+  },
+  {
+    name: 'A-011',
+    detail: 'A区-监控设备3',
+    icon: 'intelligentValveControl',
+    status: '1',
+    id: 10,
+  },
+  {
+    name: 'A-012',
+    detail: 'A区-监控设备3',
+    icon: 'intelligentValveControl',
+    status: '1',
+    id: 11,
+  },
+]);
+
+const srcList = ref(['https://fuss10.elemecdn.com/a/3f/3302e58f9a181d2509f3dc0fa68b0jpeg.jpeg']);
+const rightData = ref([
+  {
+    title: '土壤温度', //左侧文本
+    status: '1', //  0:不正常 1:正常
+    statusText: '正常', //右侧文本
+  },
+  {
+    title: '土壤养分含量',
+    status: '1',
+    statusText: '正常',
+  },
+  {
+    title: '光照强度',
+    status: '0',
+    statusText: '偏高',
+  },
+  {
+    title: '降水量',
+    status: '0',
+    statusText: '偏低',
+  },
+  {
+    title: '空气湿度',
+    status: '1',
+    statusText: '正常',
+  },
+  {
+    title: '风速',
+    status: '1',
+    statusText: '微风',
+  },
+  {
+    title: '设备状态',
+    status: '1',
+    statusText: '正常',
+  },
+  {
+    title: '用水储备',
+    status: '1',
+    statusText: '充足',
+  },
+]);
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/sub-operation-service/src/views/smartFarm/inspection/IntelligentSeedSoaking.vue b/sub-operation-service/src/views/smartFarm/inspection/IntelligentSeedSoaking.vue
new file mode 100644
index 0000000..1359ff4
--- /dev/null
+++ b/sub-operation-service/src/views/smartFarm/inspection/IntelligentSeedSoaking.vue
@@ -0,0 +1,156 @@
+<template>
+  <section>
+    <common>
+      <template #main>
+        <div>
+          <devices :title="'智能浸种设备'" :devices="devices"></devices>
+        </div>
+        <div style="display: flex; align-items: stretch; justify-content: space-between; margin-top: 20px">
+          <stream :title="'浸种监测实时监控'" :devices="devices" style="width: 60%; margin-right: 20px; height: fit-content"></stream>
+          <DataDisplay :title="'浸种分析'" :data="rightData" :show-image="true" :image-list="srcList" style="flex: 1"></DataDisplay>
+        </div>
+      </template>
+    </common>
+  </section>
+</template>
+
+<script setup>
+import { ref, onMounted } from 'vue';
+import Common from '../components/common.vue';
+import Devices from '@/views/smartFarm/components/devices.vue';
+import Stream from '@/views/smartFarm/components/stream.vue';
+import DataDisplay from '@/views/smartFarm/components/dataDisplay.vue';
+
+const devices = ref([
+  {
+    name: 'A-001',
+    icon: 'tempSensor',
+    detail: 'A区-监控设备9',
+    status: '1', //  0: 离线 1: 正常 -1: 异常
+    id: 0,
+  },
+  {
+    name: 'A-002',
+    icon: 'tempSensor',
+    detail: 'A区-监控设备66',
+    status: '1',
+    id: 1,
+  },
+  {
+    name: 'A-003',
+    icon: 'heater',
+    detail: 'A区-监控设备7',
+    status: '1',
+    id: 2,
+  },
+  {
+    name: 'A-004',
+    icon: 'heater',
+    detail: 'A区-监控设备1',
+    status: '-1',
+    id: 3,
+  },
+  {
+    name: 'A-005',
+    icon: 'heat',
+    detail: 'A区-监控设备5',
+    status: '1',
+    id: 4,
+  },
+  {
+    name: 'A-006',
+    icon: 'disinfectionLamp',
+    status: '0',
+    detail: 'A区-监控设备21',
+    id: 5,
+  },
+  {
+    name: 'A-007',
+    icon: 'timer',
+    status: '1',
+    detail: 'A区-监控设备4',
+    id: 6,
+  },
+  {
+    name: 'A-008',
+    detail: 'A区-监控设备3',
+    icon: 'timer',
+    status: '-1',
+    id: 7,
+  },
+  {
+    name: 'A-009',
+    detail: 'A区-监控设备9',
+    icon: 'mixer',
+    status: '1',
+    id: 8,
+  },
+  {
+    name: 'A-010',
+    detail: 'A区-监控设备10',
+    icon: 'liquidSensor',
+    status: '1',
+    id: 9,
+  },
+  {
+    name: 'A-011',
+    detail: 'A区-监控设备3',
+    icon: 'liquidSensor',
+    status: '0',
+    id: 10,
+  },
+  {
+    name: 'A-012',
+    detail: 'A区-监控设备3',
+    icon: 'disinfectionLamp',
+    status: '1',
+    id: 11,
+  },
+]);
+
+const srcList = ref(['https://fuss10.elemecdn.com/a/3f/3302e58f9a181d2509f3dc0fa68b0jpeg.jpeg']);
+const rightData = ref([
+  {
+    title: '温度', //左侧文本
+    status: '1', //  0:不正常 1:正常
+    statusText: '21℃ 正常', //左侧文本
+  },
+  {
+    title: '湿度',
+    status: '1',
+    statusText: '18℃ 正常',
+  },
+  {
+    title: '光照强度',
+    status: '1',
+    statusText: '正常',
+  },
+  {
+    title: '浸泡液位',
+    status: '1',
+    statusText: '正常',
+  },
+  {
+    title: '溶解氧含量',
+    status: '1',
+    statusText: '36% 正常',
+  },
+  {
+    title: '酸碱度',
+    status: '1',
+    statusText: '6.7 正常',
+  },
+  {
+    title: '设备状态',
+    status: '1',
+    statusText: '正常',
+  },
+  {
+    title: '种子状态',
+    status: '1',
+    statusText: '出芽',
+  },
+]);
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/sub-operation-service/src/views/smartFarm/inspection/intelligentFertilizer.vue b/sub-operation-service/src/views/smartFarm/inspection/intelligentFertilizer.vue
index d940b37..440f165 100644
--- a/sub-operation-service/src/views/smartFarm/inspection/intelligentFertilizer.vue
+++ b/sub-operation-service/src/views/smartFarm/inspection/intelligentFertilizer.vue
@@ -7,7 +7,7 @@
         </div>
         <div style="display: flex; justify-content: space-between; margin-top: 10px">
           <stream :title="'施肥监测实时监控'" :devices="devices" style="width: 60%; height: fit-content"></stream>
-          <el-card style="width: calc(40% - 20px); border-radius: 16px; padding: 10px">
+          <el-card style="width: calc(40% - 20px); border-radius: 16px">
             <div style="font-size: 16px; font-weight: bold; text-align: left">配肥分析</div>
             <div class="plantStatus">
               <div class="leftKey">土壤酸碱度:</div>
diff --git a/sub-operation-service/vite.config.js b/sub-operation-service/vite.config.js
index 25a6e20..6345e9f 100644
--- a/sub-operation-service/vite.config.js
+++ b/sub-operation-service/vite.config.js
@@ -36,6 +36,7 @@ export default defineConfig(({ command, mode }) => {
       port: VITE_PORT,
       open: true,
       https: false,
+      origin: 'http://localhost:9526',
       headers: {
         'Access-Control-Allow-Origin': '*',
       },

From af11fa876baae27c21151305f0c98c0b6f2f8a35 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 14:51:24 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=9B=9E=E6=BB=9A?=
 =?UTF-8?q?=E7=97=85=E8=99=AB=E5=AE=B3=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../smartFarm/inspection/bugInspection.vue    | 226 +++++++++++++++++-
 1 file changed, 223 insertions(+), 3 deletions(-)

diff --git a/sub-operation-service/src/views/smartFarm/inspection/bugInspection.vue b/sub-operation-service/src/views/smartFarm/inspection/bugInspection.vue
index 2ef8b5c..9e4b2c9 100644
--- a/sub-operation-service/src/views/smartFarm/inspection/bugInspection.vue
+++ b/sub-operation-service/src/views/smartFarm/inspection/bugInspection.vue
@@ -1,7 +1,227 @@
-<script setup></script>
+<script setup>
+import Devices from '@/views/smartFarm/components/devices.vue';
+import Common from '@/views/smartFarm/components/common.vue';
+import stream from '@/views/smartFarm/components/stream.vue';
+import { ref, onMounted, onBeforeUnmount } from 'vue';
+import { getAssetsFile } from '@/utils/index.js';
+import * as echarts from 'echarts';
+import BugData from '@/views/smartFarm/components/bugData.vue';
+import SickData from '@/views/smartFarm/components/sickData.vue';
+
+const currentDevice = ref(0);
+const devices = ref([
+  {
+    name: 'A-001',
+    icon: 'temp',
+    detail: 'A区-监控设备1',
+    status: '1',
+    id: 0,
+  },
+  {
+    name: 'A-002',
+    icon: 'temp',
+    detail: 'A区-监控设备2',
+    status: '1',
+    id: 1,
+  },
+  {
+    name: 'A-003',
+    icon: 'ph',
+    detail: 'A区-监控设备3',
+    status: '1',
+    id: 2,
+  },
+  {
+    name: 'A-004',
+    icon: 'ph',
+    detail: 'A区-监控设备4',
+    status: '-1',
+    id: 3,
+  },
+  {
+    name: 'A-005',
+    icon: 'O2',
+    detail: 'A区-监控设备5',
+    status: '1',
+    id: 4,
+  },
+  {
+    name: 'A-006',
+    icon: 'elect',
+    detail: 'A区-监控设备6',
+    status: '0',
+    id: 5,
+  },
+  {
+    name: 'B-001',
+    icon: 'light',
+    detail: 'B区-监控设备1',
+    status: '1',
+    id: 6,
+  },
+  {
+    name: 'B-002',
+    icon: 'elect',
+    detail: 'B区-监控设备2',
+    status: '-1',
+    id: 7,
+  },
+  {
+    name: 'B-003',
+    icon: 'dust',
+    detail: 'B区-监控设备3',
+    status: '1',
+    id: 8,
+  },
+  {
+    name: 'B-004',
+    icon: 'dust',
+    detail: 'B区-监控设备4',
+    status: '1',
+    id: 9,
+  },
+  {
+    name: 'B-005',
+    icon: 'float',
+    detail: 'B区-监控设备5',
+    status: '1',
+    id: 10,
+  },
+  {
+    name: 'B-006',
+    icon: 'float',
+    detail: 'B区-监控设备6',
+    status: '1',
+    id: 11,
+  },
+]);
+const rules = ref([
+  {
+    name: '温度',
+    icon: 'temp',
+    unit: '℃',
+    goat: '15',
+    status: '1',
+  },
+  {
+    name: 'PH值',
+    icon: 'ph',
+    unit: '',
+    goat: '6.5',
+    status: '1',
+  },
+  {
+    name: '溶解氧',
+    icon: 'O2',
+    goat: '0.4',
+    unit: 'mg/L',
+    status: '1',
+  },
+  {
+    name: '色度',
+    icon: 'light',
+    goat: '15',
+    unit: 'PCU',
+    status: '1',
+  },
+  {
+    name: '浊度',
+    icon: 'dust',
+    goat: '1.5',
+    unit: 'NTU',
+    status: '1',
+  },
+  {
+    name: '导电率',
+    icon: 'elect',
+    goat: '3000',
+    unit: 'μS/cm',
+    status: '1',
+  },
+  {
+    name: '悬浮物',
+    icon: 'float',
+    goat: '9000',
+    unit: 'mg/L',
+    status: '0',
+  },
+]);
+const isFullscreen = ref(false);
+const toggleFullscreen = () => {
+  isFullscreen.value = !isFullscreen.value;
+};
+
+const chooseIcon = (type) => {
+  switch (type) {
+    case 'light':
+      return '分光器.png';
+    case 'float':
+      return '悬浮物.png';
+    case 'O2':
+      return '水质溶解氧.png';
+    case 'elect':
+      return '水质电导率.png';
+    case 'dust':
+      return '浊度.png';
+    case 'temp':
+      return '温度.png';
+    case 'ph':
+      return '酸碱度.png';
+  }
+};
+
+// #endregion
+</script>
 
 <template>
-  <div></div>
+  <div>
+    <common>
+      <template #main>
+        <div>
+          <devices :title="'病虫害监测设备'" :devices="devices"></devices>
+        </div>
+        <div style="margin-top: 10px; display: flex; justify-content: space-between">
+          <div style="display: flex; justify-content: space-between; margin-top: 10px">
+            <stream :title="'病害监测实时监控'" :devices="devices" style="width: 60%; height: fit-content"></stream>
+            <div style="width: 38%">
+              <el-card style="border-radius: 16px; padding: 10px">
+                <div style="font-size: 16px; font-weight: bold; text-align: left; color: #000">虫害数据</div>
+                <sick-data style="width: 38%; min-width: 300px"></sick-data>
+              </el-card>
+            </div>
+          </div>
+        </div>
+        <div style="margin-top: 10px; display: flex; justify-content: space-between">
+          <div style="display: flex; justify-content: space-between; margin-top: 10px; width: 100%">
+            <stream :title="'虫害监测实时监控'" :devices="devices" style="width: 60%; height: fit-content"></stream>
+            <div style="width: 38%">
+              <el-card style="border-radius: 16px; padding: 10px">
+                <div style="font-size: 16px; font-weight: bold; text-align: left; color: #000">虫害数据</div>
+                <bug-data style="width: 38%; min-width: 300px"></bug-data>
+              </el-card>
+            </div>
+          </div>
+        </div>
+      </template>
+    </common>
+  </div>
 </template>
 
-<style scoped lang="scss"></style>
+<style scoped lang="scss">
+.rates {
+  margin: 10px 0;
+  height: 100px;
+  font-size: 14px;
+  display: flex;
+  align-items: center;
+  flex-direction: column;
+  justify-content: center;
+  background-size: 80%;
+  background-repeat: no-repeat;
+  background-position: center;
+  width: 25%;
+  img {
+    height: 20px;
+  }
+}
+</style>

From 78255cea066a096088d6fdce8d70957b6ebdc7c2 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 15:36:06 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E9=9A=8F=E6=9C=BA=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=20=20=E7=94=B0=E9=97=B4=E7=9B=91=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../smartFarm/components/dataDisplay.vue      | 278 ++++++++++-
 .../src/views/smartFarm/components/stream.vue |  28 +-
 .../smartFarm/inspection/fieldInspection.vue  | 440 ++++++------------
 3 files changed, 453 insertions(+), 293 deletions(-)

diff --git a/sub-operation-service/src/views/smartFarm/components/dataDisplay.vue b/sub-operation-service/src/views/smartFarm/components/dataDisplay.vue
index 792ae08..863f282 100644
--- a/sub-operation-service/src/views/smartFarm/components/dataDisplay.vue
+++ b/sub-operation-service/src/views/smartFarm/components/dataDisplay.vue
@@ -1,6 +1,206 @@
 <script setup>
-import { ref, reactive, onMounted, watch } from 'vue';
+import { ref, reactive, onMounted, watch, onBeforeUnmount } from 'vue';
 import { isEmpty, getAssetsFile } from '@/utils';
+import * as echarts from 'echarts';
+
+// 图表 DOM 引用
+const chartRef = ref(null);
+// ECharts 实例
+let chartInstance = null;
+// 颜色列表
+const colorList = ['#3685FE', '#FFD500', '#25BF82'];
+// x轴数据
+const xData = ['1月', '2月', '3月', '4月', '5月', '6月'];
+
+// 图表配置
+const option = {
+  backgroundColor: '#fff',
+  title: {
+    text: '',
+    textStyle: {
+      fontSize: 12,
+      fontWeight: 400,
+    },
+    left: 'center',
+    top: '5%',
+  },
+  legend: {
+    icon: 'circle',
+    top: '0',
+    right: '5%',
+    itemWidth: 6,
+    itemGap: 20,
+    textStyle: {
+      color: '#556677',
+    },
+  },
+  tooltip: {
+    trigger: 'axis',
+    axisPointer: {
+      label: {
+        show: true,
+        backgroundColor: '#fff',
+        color: '#556677',
+        borderColor: 'rgba(0,0,0,0)',
+        shadowColor: 'rgba(0,0,0,0)',
+        shadowOffsetY: 0,
+      },
+      lineStyle: {
+        width: 0,
+      },
+    },
+    backgroundColor: '#fff',
+    textStyle: {
+      color: '#5c6c7c',
+    },
+    padding: [10, 10],
+    extraCssText: 'box-shadow: 1px 0 2px 0 rgba(163,163,163,0.5)',
+  },
+  grid: {
+    top: '20%',
+  },
+  xAxis: [
+    {
+      type: 'category',
+      data: xData,
+      axisLine: {
+        lineStyle: {
+          color: 'rgba(107,107,107,0.37)',
+        },
+      },
+      axisTick: {
+        show: false,
+      },
+      axisLabel: {
+        interval: 0,
+        textStyle: {
+          color: '#999',
+        },
+        margin: 15,
+      },
+      axisPointer: {
+        label: {
+          padding: [11, 5, 7],
+          backgroundColor: {
+            type: 'linear',
+            x: 0,
+            y: 0,
+            x2: 0,
+            y2: 1,
+            colorStops: [
+              {
+                offset: 0,
+                color: '#fff',
+              },
+              {
+                offset: 0.9,
+                color: '#fff',
+              },
+              {
+                offset: 0.9,
+                color: '#33c0cd',
+              },
+              {
+                offset: 1,
+                color: '#33c0cd',
+              },
+            ],
+            global: false,
+          },
+        },
+      },
+      boundaryGap: false,
+    },
+  ],
+  yAxis: [
+    {
+      type: 'value',
+      show: false,
+      axisTick: {
+        show: false,
+      },
+      axisLine: {
+        show: true,
+        lineStyle: {
+          color: 'rgba(107,107,107,0.37)',
+        },
+      },
+      axisLabel: {
+        textStyle: {
+          color: '#999',
+        },
+      },
+      splitLine: {
+        show: false,
+      },
+    },
+  ],
+  series: [
+    {
+      name: '茎秆高度',
+      type: 'line',
+      data: [10, 10, 30, 12, 15, 3],
+      symbolSize: 1,
+      symbol: 'circle',
+      smooth: true,
+      yAxisIndex: 0,
+      showSymbol: false,
+      lineStyle: {
+        width: 5,
+        color: '#3685FE',
+        shadowColor: 'rgba(158,135,255, 0.3)',
+        shadowBlur: 10,
+        shadowOffsetY: 20,
+      },
+      itemStyle: {
+        color: colorList[0],
+        borderColor: colorList[0],
+      },
+    },
+    {
+      name: '叶片温度',
+      type: 'line',
+      data: [5, 12, 11, 14, 25, 16],
+      symbolSize: 1,
+      symbol: 'circle',
+      smooth: true,
+      yAxisIndex: 0,
+      showSymbol: false,
+      lineStyle: {
+        width: 5,
+        color: '#FFD500',
+        shadowColor: 'rgba(115,221,255, 0.3)',
+        shadowBlur: 10,
+        shadowOffsetY: 20,
+      },
+      itemStyle: {
+        color: colorList[1],
+        borderColor: colorList[1],
+      },
+    },
+    {
+      name: '果实大小',
+      type: 'line',
+      data: [6, 14, 17, 25, 21, 10],
+      symbolSize: 1,
+      symbol: 'circle',
+      smooth: true,
+      yAxisIndex: 0,
+      showSymbol: false,
+      lineStyle: {
+        width: 5,
+        color: '#25BF82',
+        shadowColor: 'rgba(115,221,255, 0.3)',
+        shadowBlur: 10,
+        shadowOffsetY: 20,
+      },
+      itemStyle: {
+        color: colorList[2],
+        borderColor: colorList[2],
+      },
+    },
+  ],
+};
 
 const props = defineProps({
   data: {
@@ -8,6 +208,11 @@ const props = defineProps({
     required: true,
     default: () => [],
   },
+  chartsData: {
+    type: Array,
+    required: false,
+    default: () => [],
+  },
   title: {
     type: String,
     required: true,
@@ -20,11 +225,79 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
+  showCharts: {
+    type: Boolean,
+    default: false,
+  },
   imageList: {
     type: Array,
     default: () => [],
   },
 });
+
+/* --------------- methods --------------- */
+// #region
+// 初始化图表
+const initChart = () => {
+  if (chartRef.value) {
+    // 基于准备好的dom，初始化echarts实例
+    chartInstance = echarts.init(chartRef.value);
+    // 绘制图表
+    chartInstance.setOption(option);
+    // 自动显示最大值点的tooltip
+    // showMaxValueTooltip();
+    // 响应式调整
+    window.addEventListener('resize', resizeChart);
+  }
+};
+
+const showMaxValueTooltip = () => {
+  if (!chartInstance) return;
+
+  // 找出所有系列中的最大值点
+  let maxValue = -Infinity;
+  let maxSeriesIndex = 0;
+  let maxDataIndex = 0;
+
+  option.series.forEach((series, seriesIndex) => {
+    series.data.forEach((value, dataIndex) => {
+      if (value > maxValue) {
+        maxValue = value;
+        maxSeriesIndex = seriesIndex;
+        maxDataIndex = dataIndex;
+      }
+    });
+  });
+
+  // 延迟执行确保图表渲染完成
+  setTimeout(() => {
+    chartInstance.dispatchAction({
+      type: 'showTip',
+      seriesIndex: maxSeriesIndex,
+      dataIndex: maxDataIndex,
+    });
+  }, 300);
+};
+
+// 组件挂载时初始化图表
+onMounted(() => {
+  initChart();
+});
+// 组件卸载前销毁图表
+onBeforeUnmount(() => {
+  if (chartInstance) {
+    window.removeEventListener('resize', resizeChart);
+    chartInstance.dispose();
+    chartInstance = null;
+  }
+});
+// 调整图表大小
+const resizeChart = () => {
+  if (chartInstance) {
+    chartInstance.resize();
+  }
+};
+// #endregion
 </script>
 
 <template>
@@ -49,6 +322,9 @@ const props = defineProps({
           fit="cover"
         />
       </div>
+      <div v-if="showCharts">
+        <div ref="chartRef" style="width: 100%; height: 200px"></div>
+      </div>
     </el-card>
   </div>
 </template>
diff --git a/sub-operation-service/src/views/smartFarm/components/stream.vue b/sub-operation-service/src/views/smartFarm/components/stream.vue
index 05a40d7..672a317 100644
--- a/sub-operation-service/src/views/smartFarm/components/stream.vue
+++ b/sub-operation-service/src/views/smartFarm/components/stream.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, reactive, onMounted, onUnmounted } from 'vue';
+import { ref, watch, onMounted, onUnmounted, computed } from 'vue';
 import { isEmpty, getAssetsFile } from '@/utils';
 import { useRoute, useRouter } from 'vue-router';
 import Hls from 'hls.js';
@@ -27,9 +27,35 @@ const props = defineProps({
     type: Array,
     required: true,
     default: () => [],
+    validator: (items) => {
+      const validItems = items.filter((item) => item.icon === 'camera');
+      return validItems.every((item) => {
+        return (
+          typeof item === 'object' &&
+          item !== null &&
+          typeof item.id === 'number' &&
+          typeof item.name === 'string' &&
+          typeof item.icon === 'string' &&
+          typeof item.detail === 'string' &&
+          (!item.status || typeof item.status === 'number')
+        );
+      });
+    },
   },
 });
 
+const emit = defineEmits(['changeDevice']);
+// 显示天气详情弹窗
+const showWeatherDetail = (data) => {
+  emit('changeDevice', { message: data });
+};
+
+// 监听 currentDevice 的变化
+watch(currentDevice, (newValue, oldValue) => {
+  showWeatherDetail(newValue);
+  // console.log(`count 从 ${oldValue} 变为 ${newValue}`);
+});
+
 onUnmounted(() => {
   if (hls.value) {
     hls.value.destroy();
diff --git a/sub-operation-service/src/views/smartFarm/inspection/fieldInspection.vue b/sub-operation-service/src/views/smartFarm/inspection/fieldInspection.vue
index 3feacd0..7504c30 100644
--- a/sub-operation-service/src/views/smartFarm/inspection/fieldInspection.vue
+++ b/sub-operation-service/src/views/smartFarm/inspection/fieldInspection.vue
@@ -6,43 +6,8 @@
           <devices :title="'田间监测设备'" :devices="devices"></devices>
         </div>
         <div style="display: flex; justify-content: space-between; margin-top: 10px">
-          <stream :title="'田间监测实时监控'" :devices="devices" style="width: 60%; height: fit-content"></stream>
-          <el-card style="width: calc(40% - 20px); border-radius: 16px; padding: 10px">
-            <div style="font-size: 16px; font-weight: bold; text-align: left">作物生长状态</div>
-            <div class="plantStatus">
-              <div class="leftKey">作物名称:</div>
-              <div class="rightValue">橙子</div>
-            </div>
-            <div class="plantStatus">
-              <div class="leftKey">生长状态:</div>
-              <div class="rightValue">成熟期</div>
-            </div>
-            <div class="plantStatus">
-              <div class="leftKey">植株形态:</div>
-              <div class="rightValue">果木型</div>
-            </div>
-            <div class="plantStatus">
-              <div class="leftKey">叶片形态:</div>
-              <div class="rightValue">阔叶型</div>
-            </div>
-            <div class="plantStatus">
-              <div class="leftKey">生长态势:</div>
-              <div class="rightValue">良好</div>
-            </div>
-            <div class="plantStatus">
-              <div class="leftKey">田间有机质含量:</div>
-              <div class="rightValue">橙子</div>
-            </div>
-            <div class="plantStatus">
-              <div class="leftKey">田间有机质含量:</div>
-              <div class="rightValue">16%</div>
-            </div>
-            <div class="plantStatus">
-              <div class="leftKey">生长趋势图</div>
-              <div class="rightValue">&nbsp;</div>
-            </div>
-            <div ref="chartRef1" style="width: 100%; height: 200px"></div>
-          </el-card>
+          <stream :title="'田间监测实时监控'" :devices="devices" style="width: 60%; height: fit-content" @change-device="changeDevice"></stream>
+          <data-display style="width: calc(40% - 20px)" title="作物生长状态" show-charts :data="textData"></data-display>
         </div>
       </template>
     </common>
@@ -55,29 +20,62 @@ import Common from '../components/common.vue';
 import Devices from '@/views/smartFarm/components/devices.vue';
 import Stream from '@/views/smartFarm/components/stream.vue';
 import * as echarts from 'echarts';
+import Mock from 'mockjs';
+import DataDisplay from '@/views/smartFarm/components/dataDisplay.vue';
 /* --------------- data --------------- */
 // #region
-// 图表 DOM 引用
-const chartRef1 = ref(null);
-// ECharts 实例
-let chartInstance = null;
-// 颜色列表
-const colorList = ['#3685FE', '#FFD500', '#25BF82'];
-// x轴数据
-const xData = ['1月', '2月', '3月', '4月', '5月', '6月'];
+
+const textData = ref([
+  {
+    title: '作物名称', //左侧文本
+    status: '1', //  0:不正常 1:正常
+    statusText: '橙子', //左侧文本
+  },
+  {
+    title: '生长状态',
+    status: '1',
+    statusText: '成熟期',
+  },
+  {
+    title: '植株形态',
+    status: '1',
+    statusText: '果木型',
+  },
+  {
+    title: '叶片形态',
+    status: '1',
+    statusText: '阔叶型',
+  },
+  {
+    title: '生长态势',
+    status: '1',
+    statusText: '良好',
+  },
+  {
+    title: '田间有机质含量',
+    status: '1',
+    statusText: '16%',
+  },
+  {
+    title: '生长趋势图',
+    status: '1',
+    statusText: '',
+  },
+]);
+
 const devices = ref([
   {
     name: 'A-001',
     icon: 'camera',
     detail: 'A区-监控设备9',
-    status: '0',
+    status: '1',
     id: 0,
   },
   {
     name: 'A-002',
     icon: 'camera',
     detail: 'A区-监控设备66',
-    status: '0',
+    status: '1',
     id: 1,
   },
   {
@@ -123,258 +121,118 @@ const devices = ref([
     id: 7,
   },
 ]);
-// 图表配置
-const option = {
-  backgroundColor: '#fff',
-  title: {
-    text: '',
-    textStyle: {
-      fontSize: 12,
-      fontWeight: 400,
-    },
-    left: 'center',
-    top: '5%',
-  },
-  legend: {
-    icon: 'circle',
-    top: '0',
-    right: '5%',
-    itemWidth: 6,
-    itemGap: 20,
-    textStyle: {
-      color: '#556677',
-    },
-  },
-  tooltip: {
-    trigger: 'axis',
-    axisPointer: {
-      label: {
-        show: true,
-        backgroundColor: '#fff',
-        color: '#556677',
-        borderColor: 'rgba(0,0,0,0)',
-        shadowColor: 'rgba(0,0,0,0)',
-        shadowOffsetY: 0,
-      },
-      lineStyle: {
-        width: 0,
-      },
-    },
-    backgroundColor: '#fff',
-    textStyle: {
-      color: '#5c6c7c',
-    },
-    padding: [10, 10],
-    extraCssText: 'box-shadow: 1px 0 2px 0 rgba(163,163,163,0.5)',
-  },
-  grid: {
-    top: '20%',
-  },
-  xAxis: [
-    {
-      type: 'category',
-      data: xData,
-      axisLine: {
-        lineStyle: {
-          color: 'rgba(107,107,107,0.37)',
-        },
-      },
-      axisTick: {
-        show: false,
-      },
-      axisLabel: {
-        interval: 0,
-        textStyle: {
-          color: '#999',
-        },
-        margin: 15,
-      },
-      axisPointer: {
-        label: {
-          padding: [11, 5, 7],
-          backgroundColor: {
-            type: 'linear',
-            x: 0,
-            y: 0,
-            x2: 0,
-            y2: 1,
-            colorStops: [
-              {
-                offset: 0,
-                color: '#fff',
-              },
-              {
-                offset: 0.9,
-                color: '#fff',
-              },
-              {
-                offset: 0.9,
-                color: '#33c0cd',
-              },
-              {
-                offset: 1,
-                color: '#33c0cd',
-              },
-            ],
-            global: false,
-          },
-        },
-      },
-      boundaryGap: false,
-    },
-  ],
-  yAxis: [
-    {
-      type: 'value',
-      show: false,
-      axisTick: {
-        show: false,
-      },
-      axisLine: {
-        show: true,
-        lineStyle: {
-          color: 'rgba(107,107,107,0.37)',
-        },
-      },
-      axisLabel: {
-        textStyle: {
-          color: '#999',
-        },
-      },
-      splitLine: {
-        show: false,
-      },
-    },
-  ],
-  series: [
-    {
-      name: '茎秆高度',
-      type: 'line',
-      data: [10, 10, 30, 12, 15, 3],
-      symbolSize: 1,
-      symbol: 'circle',
-      smooth: true,
-      yAxisIndex: 0,
-      showSymbol: false,
-      lineStyle: {
-        width: 5,
-        color: '#3685FE',
-        shadowColor: 'rgba(158,135,255, 0.3)',
-        shadowBlur: 10,
-        shadowOffsetY: 20,
-      },
-      itemStyle: {
-        color: colorList[0],
-        borderColor: colorList[0],
-      },
-    },
-    {
-      name: '叶片温度',
-      type: 'line',
-      data: [5, 12, 11, 14, 25, 16],
-      symbolSize: 1,
-      symbol: 'circle',
-      smooth: true,
-      yAxisIndex: 0,
-      showSymbol: false,
-      lineStyle: {
-        width: 5,
-        color: '#FFD500',
-        shadowColor: 'rgba(115,221,255, 0.3)',
-        shadowBlur: 10,
-        shadowOffsetY: 20,
-      },
-      itemStyle: {
-        color: colorList[1],
-        borderColor: colorList[1],
-      },
-    },
-    {
-      name: '果实大小',
-      type: 'line',
-      data: [6, 14, 17, 25, 21, 10],
-      symbolSize: 1,
-      symbol: 'circle',
-      smooth: true,
-      yAxisIndex: 0,
-      showSymbol: false,
-      lineStyle: {
-        width: 5,
-        color: '#25BF82',
-        shadowColor: 'rgba(115,221,255, 0.3)',
-        shadowBlur: 10,
-        shadowOffsetY: 20,
-      },
-      itemStyle: {
-        color: colorList[2],
-        borderColor: colorList[2],
-      },
-    },
-  ],
-};
+
 // #endregion
 /* --------------- methods --------------- */
 // #region
-// 初始化图表
-const initChart = () => {
-  if (chartRef1.value) {
-    // 基于准备好的dom，初始化echarts实例
-    chartInstance = echarts.init(chartRef1.value);
-    // 绘制图表
-    chartInstance.setOption(option);
-    // 自动显示最大值点的tooltip
-    // showMaxValueTooltip();
-    // 响应式调整
-    window.addEventListener('resize', resizeChart);
-  }
+const changeDevice = (params) => {
+  console.log(params);
+  textData.value = generateCropReport();
 };
 
-const showMaxValueTooltip = () => {
-  if (!chartInstance) return;
-
-  // 找出所有系列中的最大值点
-  let maxValue = -Infinity;
-  let maxSeriesIndex = 0;
-  let maxDataIndex = 0;
-
-  option.series.forEach((series, seriesIndex) => {
-    series.data.forEach((value, dataIndex) => {
-      if (value > maxValue) {
-        maxValue = value;
-        maxSeriesIndex = seriesIndex;
-        maxDataIndex = dataIndex;
-      }
-    });
-  });
-
-  // 延迟执行确保图表渲染完成
-  setTimeout(() => {
-    chartInstance.dispatchAction({
-      type: 'showTip',
-      seriesIndex: maxSeriesIndex,
-      dataIndex: maxDataIndex,
-    });
-  }, 300);
+// 生成模拟数据
+// 农业知识库
+const AGRICULTURE_KNOWLEDGE = {
+  crops: ['橙子', '蓝莓', '水稻', '番茄', '小麦', '苹果', '葡萄'],
+  plantTypes: {
+    橙子: '乔木型',
+    蓝莓: '灌木型',
+    水稻: '禾本型',
+    番茄: '藤本型',
+    小麦: '草本型',
+    苹果: '乔木型',
+    葡萄: '藤本型',
+  },
+  leafTypes: {
+    橙子: '革质叶',
+    蓝莓: '卵形叶',
+    水稻: '线形叶',
+    番茄: '羽状叶',
+    小麦: '披针叶',
+    苹果: '椭圆形叶',
+    葡萄: '掌状叶',
+  },
+  growthStages: {
+    橙子: ['幼苗期', '生长期', '开花期', '结果期'],
+    蓝莓: ['萌芽期', '开花期', '果实膨大期', '成熟期'],
+    水稻: ['分蘖期', '拔节期', '抽穗期', '灌浆期'],
+    番茄: ['育苗期', '定植期', '开花坐果期', '采收期'],
+    小麦: ['出苗期', '越冬期', '返青期', '成熟期'],
+    苹果: ['花芽期', '展叶期', '果实发育期', '成熟期'],
+    葡萄: ['萌芽期', '新梢生长期', '果实生长期', '成熟期'],
+  },
+  organicMatterRange: {
+    橙子: [12, 20],
+    蓝莓: [8, 15],
+    水稻: [15, 25],
+    番茄: [10, 18],
+    小麦: [18, 30],
+    苹果: [10, 22],
+    葡萄: [12, 18],
+  },
 };
 
-// 组件挂载时初始化图表
-onMounted(() => {
-  initChart();
+// 生成单组作物数据
+function generateCropReport() {
+  const crop = Mock.Random.pick(AGRICULTURE_KNOWLEDGE.crops);
+  const isHealthy = Mock.Random.integer(0, 10) > 1; // 80%概率健康
+  const growthStage = Mock.Random.pick(AGRICULTURE_KNOWLEDGE.growthStages[crop]);
+
+  // 异常数据生成
+  const abnormalTexts = {
+    growth: ['发育迟缓', '生长停滞', '提前成熟'],
+    leaf: ['枯黄', '卷曲', '病斑'],
+    status: ['欠佳', '受阻', '严重滞后'],
+    organic: ['过低', '严重不足', '失衡'],
+  };
+
+  return [
+    {
+      title: '作物名称',
+      status: isHealthy ? 1 : 0,
+      statusText: crop,
+    },
+    {
+      title: '生长状态',
+      status: isHealthy ? 1 : 0,
+      statusText: isHealthy ? growthStage : `${Mock.Random.pick(abnormalTexts.growth)}${growthStage}`,
+    },
+    {
+      title: '植株形态',
+      status: isHealthy ? 1 : 0,
+      statusText: AGRICULTURE_KNOWLEDGE.plantTypes[crop],
+    },
+    {
+      title: '叶片形态',
+      status: isHealthy ? 1 : 0,
+      statusText: isHealthy
+        ? AGRICULTURE_KNOWLEDGE.leafTypes[crop]
+        : `${Mock.Random.pick(abnormalTexts.leaf)}${AGRICULTURE_KNOWLEDGE.leafTypes[crop]}`,
+    },
+    {
+      title: '生长态势',
+      status: isHealthy ? 1 : 0,
+      statusText: isHealthy ? '良好' : Mock.Random.pick(abnormalTexts.status),
+    },
+    {
+      title: '田间有机质含量',
+      status: isHealthy ? 1 : 0,
+      statusText: isHealthy
+        ? `${Mock.Random.integer(...AGRICULTURE_KNOWLEDGE.organicMatterRange[crop])}%`
+        : `${Mock.Random.integer(3, 8)}% (${Mock.Random.pick(abnormalTexts.organic)})`,
+    },
+    {
+      title: '生长趋势图',
+      status: isHealthy ? 1 : 0,
+      statusText: '',
+    },
+  ];
+}
+
+// 生成7组不同作物数据
+const cropMonitoringData = Mock.mock({
+  'data|7': [generateCropReport],
 });
-// 组件卸载前销毁图表
-onBeforeUnmount(() => {
-  if (chartInstance) {
-    window.removeEventListener('resize', resizeChart);
-    chartInstance.dispose();
-    chartInstance = null;
-  }
-});
-// 调整图表大小
-const resizeChart = () => {
-  if (chartInstance) {
-    chartInstance.resize();
-  }
-};
 // #endregion
 </script>
 

From 24f4a42ca416772d2b71ff23581972e0e023c9ce 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 17:13:19 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8F=9C=E5=8D=95BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/smartFarm/components/leftMenu.vue   | 90 +++++++++++--------
 1 file changed, 52 insertions(+), 38 deletions(-)

diff --git a/sub-operation-service/src/views/smartFarm/components/leftMenu.vue b/sub-operation-service/src/views/smartFarm/components/leftMenu.vue
index 6b59b46..c5c3b30 100644
--- a/sub-operation-service/src/views/smartFarm/components/leftMenu.vue
+++ b/sub-operation-service/src/views/smartFarm/components/leftMenu.vue
@@ -1,19 +1,22 @@
 <template>
   <div class="smartFarm-left-menu-warp">
     <div class="left-menu">
-      <div v-for="(n, index) in leftMenu" :key="index" class="left-menu-item" style="position: relative">
-        <div style="display: flex; justify-content: flex-start; align-items: center" @click.stop="toLink(index)">
+      <div
+        v-for="(n, index) in leftMenu"
+        :key="index"
+        class="left-menu-item"
+        style="position: relative"
+        @click.stop="
+          toLink(index);
+          openList(index);
+        "
+      >
+        <div style="display: flex; justify-content: flex-start; align-items: center">
           <div class="item-img">
             <img :src="getAssetsFile('images/smartFarm/' + n.icon)?.href ?? ''" alt="" />
           </div>
           <span :class="n.isOpen ? 'active' : ''" class="item-title">{{ n.title }}</span>
-          <img
-            v-if="n.children && n.isOpen"
-            alt=""
-            :src="getAssetsFile('images/smartFarm/closing.png')"
-            class="isOpen"
-            @click.stop="openList(index)"
-          />
+          <img v-if="n.children && n.isOpen" alt="" :src="getAssetsFile('images/smartFarm/closing.png')" class="isOpen" />
           <img
             v-if="n.children && !n.isOpen"
             alt=""
@@ -25,7 +28,7 @@
         <div v-if="n.children && n.isOpen" class="item-children">
           <div v-for="(item, indexC) in n.children" :key="indexC">
             <ul style="overflow: visible; padding-left: 40px; text-align: left; list-style-type: disc !important">
-              <li :class="indexC === currentCIndex ? 'active' : ''" @click.stop="toLinkSub(index, indexC)">
+              <li :class="item.name === currentCIndex ? 'active' : ''" @click.stop="toLinkSub(index, item.name)">
                 <div class="dot"></div>
                 {{ item.title }}
               </li>
@@ -43,17 +46,13 @@ import { useRoute, useRouter } from 'vue-router';
 const route = useRoute();
 const router = useRouter();
 
-// const props = defineProps({
-//   currentName: { type: String, default: 'dashboard' },
-// });
-
 const leftMenu = reactive([
   {
-    name: 'supplier',
+    name: 'inspection',
     title: '农业环境监测',
     icon: 'menu1.png',
     path: '/sub-operation-service/smartFarm/main',
-    isOpen: true,
+    isOpen: false,
     children: [
       {
         name: 'fieldInspection',
@@ -107,31 +106,31 @@ const leftMenu = reactive([
     isOpen: false,
     children: [
       {
-        name: 'control',
+        name: 'growSeedlings',
         title: '一体育苗',
         icon: 'menu3.png',
         path: '/sub-operation-service/smartFarm/growSeedlings',
       },
       {
-        name: 'control',
+        name: 'pestPrevention',
         title: '病虫害预防',
         icon: 'menu3.png',
         path: '/sub-operation-service/smartFarm/pestPrevention',
       },
       {
-        name: 'control',
+        name: 'irrigationSystem',
         title: '喷灌滴灌',
         icon: 'menu3.png',
         path: '/sub-operation-service/smartFarm/irrigationSystem',
       },
       {
-        name: 'control',
+        name: 'drainageControl',
         title: '排集水控制',
         icon: 'menu3.png',
         path: '/sub-operation-service/smartFarm/drainageControl',
       },
       {
-        name: 'control',
+        name: 'openCurtain',
         title: '开窗卷帘',
         icon: 'menu3.png',
         path: '/sub-operation-service/smartFarm/openCurtain',
@@ -141,32 +140,31 @@ const leftMenu = reactive([
 ]);
 
 let currentIndex = ref(0);
-let currentCIndex = ref(-1);
-
-// watch(
-//   () => props.currentName,
-//   () => {
-//     console.info('currentName', props.currentName);
-//     currentIndex.value = leftMenu.findIndex((m) => {
-//       return m.name === props.currentName;
-//     });
-//   },
-//   { deep: true, immediate: true }
-// );
+let currentCIndex = ref('');
 
 const toLink = (index) => {
   currentIndex.value = index;
-  currentCIndex.value = -1;
+  window.sessionStorage.setItem('currentOpen', index);
+  if (index === 0) {
+    window.sessionStorage.setItem('currentChild', 'main');
+  }
+  currentCIndex.value = '';
   let path = index !== undefined ? leftMenu[index].path : null;
   if (path) {
     router.push(path);
   }
 };
-const toLinkSub = (index, c) => {
+const toLinkSub = (index, name) => {
   console.info('index', index);
-  console.info('c', c);
-  currentCIndex.value = c;
-  let path = leftMenu[index].children[c].path;
+  console.info('currentChild', name);
+  currentCIndex.value = name;
+  window.sessionStorage.setItem('currentChild', name);
+  let path;
+  for (let i in leftMenu[index].children) {
+    if (leftMenu[index].children[i].name === name) {
+      path = leftMenu[index].children[i].path;
+    }
+  }
   if (path) {
     console.info('path', path);
     router.push(path);
@@ -176,6 +174,22 @@ const openList = (index) => {
   currentIndex.value = index;
   leftMenu[index].isOpen = !leftMenu[index].isOpen;
 };
+
+onMounted(() => {
+  const currentMenu = window.sessionStorage.getItem('currentOpen');
+  if (currentMenu) {
+    for (let i in leftMenu) {
+      leftMenu[i].isOpen = i === currentMenu;
+    }
+  }
+  const currentChild = window.sessionStorage.getItem('currentChild');
+  if (currentChild && currentChild === 'main') {
+    currentIndex.value = 0;
+    currentCIndex.value = '';
+  } else if (currentChild) {
+    currentCIndex.value = currentChild;
+  }
+});
 </script>
 <style lang="scss" scoped>
 .fz {

From b5d6451b39549dd78572d8946f459d44cf2c72be Mon Sep 17 00:00:00 2001
From: "2090205686@qq.com" <guoyongchao666>
Date: Wed, 21 May 2025 17:21:03 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E7=8E=AF=E5=A2=83=E7=9B=91=E6=B5=8B?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0=E6=8B=9F=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../smartFarm/inspection/envInspection.vue    | 133 +++++++++++-------
 1 file changed, 83 insertions(+), 50 deletions(-)

diff --git a/sub-operation-service/src/views/smartFarm/inspection/envInspection.vue b/sub-operation-service/src/views/smartFarm/inspection/envInspection.vue
index 1eb17dc..df7a24a 100644
--- a/sub-operation-service/src/views/smartFarm/inspection/envInspection.vue
+++ b/sub-operation-service/src/views/smartFarm/inspection/envInspection.vue
@@ -7,90 +7,65 @@
         </div>
         <div style="margin-top: 10px; display: flex; justify-content: space-between">
           <div style="display: flex; justify-content: space-between; margin-top: 10px; width: 100%">
-            <el-card style="width: 60%">
+            <el-card style="width: 60%; margin-right: 20px; border-radius: 16px">
               <div style="display: flex; justify-content: space-between">
                 <div style="font-size: 16px; font-weight: bold; text-align: left">实时环境监测</div>
                 <div style="color: #999999; line-height: 25px">
                   当前设备
-                  <el-select v-model="currentDevice" placeholder="Select" size="small" style="width: 160px; margin-left: 10px">
+                  <el-select
+                    v-model="currentDevice"
+                    placeholder="Select"
+                    size="small"
+                    style="width: 160px; margin-left: 10px"
+                    @change="changeDevice($event)"
+                  >
                     <el-option v-for="item in devices" :key="item.value" :label="item.detail" :value="item.id" />
                   </el-select>
                 </div>
               </div>
               <div class="envData">
                 <div class="dt">
-                  <div class="values">21℃</div>
+                  <div class="values">{{ monitorData.co2 }}</div>
                   <div class="points">空气温度</div>
                 </div>
                 <div class="dt">
-                  <div class="values">61%</div>
+                  <div class="values">{{ monitorData.humidity }}</div>
                   <div class="points">空气湿度</div>
                 </div>
                 <div class="dt">
-                  <div class="values">1600mm</div>
-                  <div class="points">空气温度</div>
+                  <div class="values">{{ monitorData.rainfall }}</div>
+                  <div class="points">降水量</div>
                 </div>
                 <div class="dt">
-                  <div class="values">东南风</div>
+                  <div class="values">{{ monitorData.wind }}</div>
                   <div class="points">风向</div>
                 </div>
-              </div>
-              <div class="envData">
+
                 <div class="dt">
-                  <div class="values">12μg/m³</div>
+                  <div class="values">{{ monitorData.pm25 }}</div>
                   <div class="points">PM2.5</div>
                 </div>
                 <div class="dt">
-                  <div class="values">679Lux</div>
+                  <div class="values">{{ monitorData.light }}</div>
                   <div class="points">光照强度</div>
                 </div>
                 <div class="dt">
-                  <div class="values">440ppm</div>
+                  <div class="values">{{ monitorData.co2 }}</div>
                   <div class="points">二氧化碳浓度</div>
                 </div>
                 <div class="dt">
-                  <div class="values">1.5m/s</div>
+                  <div class="values">{{ monitorData.windSpeed }}</div>
                   <div class="points">风速</div>
                 </div>
               </div>
               <div class="notices">
                 <div v-for="(item, index) in notices" :key="index">
-                  <img :src="getAssetsFile('images/smartFarm/bell.png')" alt="" style="height: 20px" />
+                  <img :src="getAssetsFile('images/smartFarm/bell.png')" alt="" style="height: 20px; margin-right: 5px" />
                   <span style="font-size: 14px">{{ item.title }}</span>
                 </div>
               </div>
             </el-card>
-            <el-card style="width: calc(40% - 20px); border-radius: 16px; padding: 10px">
-              <div style="font-size: 16px; font-weight: bold; text-align: left">作物生长状态</div>
-              <div class="plantStatus">
-                <div class="leftKey">酸碱度:</div>
-                <div class="rightValue">6.5 正常</div>
-              </div>
-              <div class="plantStatus">
-                <div class="leftKey">养分含量:</div>
-                <div class="errorValue">N 元素含量不足</div>
-              </div>
-              <div class="plantStatus">
-                <div class="leftKey">重金属含量:</div>
-                <div class="errorValue">Hg 金属含量超标</div>
-              </div>
-              <div class="plantStatus">
-                <div class="leftKey">水温:</div>
-                <div class="errorValue">38℃ 偏高</div>
-              </div>
-              <div class="plantStatus">
-                <div class="leftKey">水浑浊度:</div>
-                <div class="rightValue">良好</div>
-              </div>
-              <div class="plantStatus">
-                <div class="leftKey">酸碱度:</div>
-                <div class="rightValue">正常</div>
-              </div>
-              <div class="plantStatus">
-                <div class="leftKey">盐分含量:</div>
-                <div class="rightValue">正常</div>
-              </div>
-            </el-card>
+            <DataDisplay :title="'环境分析报告'" :data="rightData" style="flex: 1"></DataDisplay>
           </div>
         </div>
       </template>
@@ -99,10 +74,12 @@
 </template>
 
 <script setup>
-import { ref } from 'vue';
+import { onMounted, ref } from 'vue';
 import Devices from '@/views/smartFarm/components/devices.vue';
 import Common from '@/views/smartFarm/components/common.vue';
 import { getAssetsFile } from '@/utils/index.js';
+import DataDisplay from '@/views/smartFarm/components/dataDisplay.vue';
+import Mock from 'mockjs';
 
 /* --------------- data --------------- */
 // #region
@@ -195,14 +172,68 @@ const devices = ref([
 const currentDevice = ref(0);
 const notices = ref([
   {
-    title: '2025年1月1日，预计将会有特大暴雨，请提前做好防护措施！',
+    title: '2025年1月2日，预计将会有特大暴雨，请提前做好防护措施！',
     content: '',
   },
   {
-    title: '2025年1月1日，预计将会有特大暴雨，请提前做好防护措施！',
+    title: '2025年1月1日，预计将会有大雨，请提前做好防护措施！',
     content: '',
   },
 ]);
+let monitorData = ref({});
+let rightData = ref([]);
+const changeDevice = (id) => {
+  currentDevice.value = id;
+  monitorData.value = getMockData()[0];
+  rightData.value = getMockData()[1];
+};
+// 生成模拟数据
+const getMockData = () => {
+  // 左侧环境监测数据
+  const leftData = Mock.mock({
+    co2: () => randomRange(200, 800, 0) + 'ppm', // CO₂浓度（300~800ppm）
+    temperature: () => randomRange(-10, 40, 1) + '℃', // 温度（-10~40℃）
+    humidity: () => randomRange(10, 100, 0) + '%', // 湿度（10%~100%）
+    wind: '@pick(["东南风", "西南风", "东北风", "西北风"])',
+    rainfall: () => randomRange(0, 200, 1) + 'mm', // 降水量（0~200mm，1位小数）
+    pm25: () => randomRange(0, 300, 0) + 'μg/m³', // PM2.5（0~300μg/m³，整数）
+    light: () => randomRange(100, 1000, 0) + 'Lux', // 光照强度（100~1000Lux，整数）
+    windSpeed: () => randomRange(0, 10, 1) + 'm/s', // 风速（0~10m/s，1位小数）
+  });
+  // 右侧环境分析报告数据
+  const rightData = Mock.mock({
+    'list|6': [
+      {
+        // 基础字段
+        'title|+1': ['酸碱度(pH)', '养分含量', '重金属含量', '水温', '水浑浊度', '盐分含量'],
+        'status|1': ['0', '1'],
+        'unit|+1': ['pH值', '%', 'mg/kg', '℃', 'NTU', 'dS/m'],
+
+        // 动态生成异常文本
+        statusText: function () {
+          const statusMap = {
+            '酸碱度(pH)':
+              this.status === '0' ? `酸碱度${Mock.mock('@float(4.0, 9.0, 1, 1)')}（${Mock.mock('@pick(["酸性过强","碱性过强"])')}）` : '正常',
+            养分含量: this.status === '0' ? `${Mock.mock('@pick(["N","P","K","Ca","Mg"])')}元素含量不足` : '正常',
+            重金属含量: this.status === '0' ? `${Mock.mock('@pick(["镉","铅","砷","汞"])')}超标(${Mock.mock('@float(1, 5, 1, 1)')}mg/kg)` : '正常',
+            水温: this.status === '0' ? `${Mock.mock('@integer(10, 40)')}℃（${Mock.mock('@pick(["低温胁迫","高温胁迫"])')}）` : '正常',
+            水浑浊度: this.status === '0' ? `浊度${Mock.mock('@integer(10, 50)')}NTU` : '正常',
+            盐分含量: this.status === '0' ? `盐分${Mock.mock('@float(2, 5, 1, 1)')}dS/m` : '正常',
+          };
+          return statusMap[this.title];
+        },
+      },
+    ],
+  });
+  return [leftData, rightData.list];
+};
+// 自定义随机范围函数
+const randomRange = (min, max, fixed = 0) => {
+  return Mock.Random.float(min, max, fixed).toFixed(fixed);
+};
+onMounted(() => {
+  changeDevice(0);
+});
 // #endregion
 
 /* --------------- methods --------------- */
@@ -253,10 +284,12 @@ const chooseIcon = (type) => {
 .envData {
   display: flex;
   justify-content: space-between;
-  margin: 20px 0;
+  flex-wrap: wrap;
+  margin-top: 20px;
   .dt {
-    width: 24%;
+    width: 25%;
     text-align: left;
+    margin-bottom: 20px;
     .values {
       color: #25bf82;
       font-size: 20px;

From efa30129c50d3d8b0766c8b8d0d84b125c31564a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9A=E4=BF=8A=E6=97=AD?= <398847134@qq.com>
Date: Thu, 22 May 2025 09:09:35 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E5=9C=9F=E5=9C=B0?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/land/components/basicInfo.vue   |  60 +++++++++
 .../src/views/land/components/landOne.vue     |   9 +-
 .../src/views/land/components/warning.vue     | 118 ++++++++++++++++++
 .../src/views/land/index.vue                  |  83 ++++++------
 4 files changed, 220 insertions(+), 50 deletions(-)
 create mode 100644 new-digital-agriculture-screen/src/views/land/components/basicInfo.vue
 create mode 100644 new-digital-agriculture-screen/src/views/land/components/warning.vue

diff --git a/new-digital-agriculture-screen/src/views/land/components/basicInfo.vue b/new-digital-agriculture-screen/src/views/land/components/basicInfo.vue
new file mode 100644
index 0000000..ae246de
--- /dev/null
+++ b/new-digital-agriculture-screen/src/views/land/components/basicInfo.vue
@@ -0,0 +1,60 @@
+<template>
+  <div style="width: 100%; height: 100%">
+    <div class="basic">
+      <div v-for="(item, index) in data" :key="index" class="line">
+        <div class="title">{{ item.title }}</div>
+        <div class="values">{{ item.value }}</div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref } from 'vue';
+
+/* --------------- data --------------- */
+// #region
+const props = defineProps({
+  data: {
+    type: Array,
+    default: () => [],
+  },
+});
+
+// #endregion
+
+/* --------------- methods --------------- */
+// #region
+
+// #endregion
+</script>
+
+<style lang="scss" scoped>
+.basic {
+  width: 100%;
+  margin-top: 10px;
+  height: 100%;
+  border: 2px solid #01fefd;
+  border-radius: 16px;
+  backdrop-filter: blur(2px);
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  color: #ffffff;
+  padding: 20px;
+  .line {
+    display: flex;
+    justify-content: space-between;
+    text-align: left;
+    line-height: 20px;
+    .title {
+      font-size: 16px;
+      width: 40%;
+    }
+    .values {
+      font-size: 20px;
+      width: 60%;
+    }
+  }
+}
+</style>
diff --git a/new-digital-agriculture-screen/src/views/land/components/landOne.vue b/new-digital-agriculture-screen/src/views/land/components/landOne.vue
index 51e5bf3..8c7cf27 100644
--- a/new-digital-agriculture-screen/src/views/land/components/landOne.vue
+++ b/new-digital-agriculture-screen/src/views/land/components/landOne.vue
@@ -13,6 +13,7 @@ const props = defineProps({
 });
 
 const state = reactive({
+  total: 0, // 存储所有乡镇面积总和
   option: {
     grid: {
       left: '5%',
@@ -31,11 +32,12 @@ const state = reactive({
       borderRadius: 8,
       formatter: (data) => {
         const params = data[0];
-        let str = `<div class="custom-echarts-tips" >
+        const percentage = ((params.value / state.total) * 100).toFixed(2);
+        return `<div class="custom-echarts-tips" >
           <span>${params.name}</span><br/>
-          <span>${params.marker} ${params.data} 万亩</span>
+          <span>${params.marker} ${params.data} km²</span><br/>
+          <span>占比 ${percentage}%</span>
         </div>`;
-        return str;
       },
       extraCssText: 'backdrop-filter: blur(8px);',
     },
@@ -85,6 +87,7 @@ watch(
   (val) => {
     if (!isEmpty(val)) {
       state.data = val;
+      state.total = val.reduce((sum, item) => sum + item.value, 0); // 计算总和
     }
   },
   {
diff --git a/new-digital-agriculture-screen/src/views/land/components/warning.vue b/new-digital-agriculture-screen/src/views/land/components/warning.vue
new file mode 100644
index 0000000..e4d5a91
--- /dev/null
+++ b/new-digital-agriculture-screen/src/views/land/components/warning.vue
@@ -0,0 +1,118 @@
+<template>
+  <div style="display: flex; justify-content: space-around; width: 100%">
+    <section class="land_area_all">
+      <section v-for="(item, index) in data" :key="index" class="_left">
+        <section class="_circle">{{ item.value }}</section>
+        <section class="_text">{{ item.title }}</section>
+      </section>
+    </section>
+  </div>
+</template>
+
+<script setup>
+import { ref } from 'vue';
+
+/* --------------- data --------------- */
+// #region
+const props = defineProps({
+  data: {
+    type: Array,
+    default: () => [],
+  },
+});
+// #endregion
+
+/* --------------- methods --------------- */
+// #region
+
+// #endregion
+</script>
+
+<style lang="scss" scoped>
+.land_area_all {
+  display: grid;
+  grid-template-columns: repeat(2, 1fr);
+  gap: 20px;
+  height: 100%;
+  width: 100%; /* 限制宽度 */
+  max-width: 400px; /* 可选最大值 */
+  ._left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    align-items: center;
+    height: 100%;
+    ._circle {
+      padding-top: 18%;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      font-family: 'JinBuTi';
+      width: 80%;
+      aspect-ratio: 1/1;
+      font-size: 18px;
+      color: #fff;
+      border-radius: 50%;
+      font-weight: bold;
+      background: url('../../../assets/images/land/countCircleBG.png') no-repeat center center / cover;
+    }
+    ._text {
+      width: 100%;
+      height: 40px;
+      background: url('../../../assets/images/land/countTextBG.png') no-repeat center center / cover;
+      text-align: center;
+      line-height: 40px;
+      color: #fff;
+      font-size: 18px;
+      text-shadow: 0 0 1px #fff;
+    }
+  }
+  ._right {
+    padding-right: 4px;
+    height: 100%;
+    overflow-y: auto;
+    .list_item {
+      padding: 0 24px;
+      position: relative;
+      display: flex;
+      grid-template-columns: 60% 40%;
+      justify-content: space-between;
+      align-items: center;
+      height: 32px;
+      color: #fff;
+      cursor: pointer;
+      user-select: none;
+      &.active {
+        background: rgba(38, 122, 102, 0.3);
+        border: 1px solid #35d0c0;
+        border-radius: 4px;
+        overflow: hidden;
+        .spot {
+          transform: scale(1.2);
+        }
+        ._label {
+          font-size: 16px;
+        }
+      }
+      ._label {
+        ._spot {
+          display: inline-block;
+          position: absolute;
+          left: 8px;
+          top: 50%;
+          transform: translateY(-25%);
+          width: 8px;
+          height: 8px;
+          border-radius: 50%;
+        }
+      }
+      ._value {
+        text-align: right;
+      }
+    }
+  }
+  ._right::-webkit-scrollbar {
+    display: none;
+  }
+}
+</style>
diff --git a/new-digital-agriculture-screen/src/views/land/index.vue b/new-digital-agriculture-screen/src/views/land/index.vue
index 3b72863..98be3c9 100644
--- a/new-digital-agriculture-screen/src/views/land/index.vue
+++ b/new-digital-agriculture-screen/src/views/land/index.vue
@@ -2,46 +2,20 @@
   <el-row class="data-home-index">
     <el-col :span="6" class="left-charts">
       <div class="left-charts-item">
-        <customBack top-title="耕地面积统计" :top-postion="'left'">
+        <customBack top-title="基础地理信息" :top-postion="'left'">
+          <template #back>
+            <!--            <landTwo :data="state.data.two" />-->
+            <basic-info :data="state.data.basic"></basic-info>
+          </template>
+        </customBack>
+      </div>
+      <div class="left-charts-item">
+        <customBack top-title="土地分布数据" :top-postion="'left'">
           <template #back>
             <landOne :data="state.data.one" />
           </template>
         </customBack>
       </div>
-      <div class="left-charts-item">
-        <customBack top-title="农村土地资源" :top-postion="'left'">
-          <template #back>
-            <landTwo :data="state.data.two" />
-          </template>
-        </customBack>
-      </div>
-      <div class="left-charts-item">
-        <customBack
-          top-title="项目效益分析"
-          :top-postion="'left'"
-          :down-title="'全县'"
-          :label-field="'label'"
-          :value-field="'value'"
-          :down-width="'100px'"
-          :options="[
-            { label: '全县', value: '530926' },
-            { label: '耿马镇', value: '42611' },
-            { label: '勐撒镇', value: '9259' },
-            { label: '勐永镇', value: '17787' },
-            { label: '孟定镇', value: '42610' },
-            { label: '勐简乡', value: '17788' },
-            { label: '贺派乡', value: '40161' },
-            { label: '四排山乡', value: '40163' },
-            { label: '大兴乡', value: '40159' },
-          ]"
-          :is-down="true"
-          @command="handleCommand"
-        >
-          <template #back>
-            <landThere :data="state.data.there" :query="state.queryCode" />
-          </template>
-        </customBack>
-      </div>
     </el-col>
     <el-col :span="12">
       <landMap />
@@ -79,9 +53,10 @@
         </customBack>
       </div>
       <div class="right-charts-item">
-        <customBack top-title="全县作物情况" :top-postion="'right'">
+        <customBack top-title="土地违规使用风险预警" :top-postion="'right'">
           <template #back>
-            <landSix :data="state.data.six" />
+            <warning :data="state.data.warnings"></warning>
+            <!--            <landSix :data="state.data.six" />-->
           </template>
         </customBack>
       </div>
@@ -100,6 +75,8 @@ import landSix from './components/landSix.vue';
 import { useApp } from '@/hooks';
 import { sleep } from '@/utils';
 import { GetLandInfo } from '@/apis/land';
+import BasicInfo from './components/basicInfo.vue';
+import Warning from '@/views/land/components/warning.vue';
 
 const state = reactive({
   loading: false,
@@ -122,15 +99,15 @@ const loadData = async () => {
   await sleep(500);
   state.data = {
     one: [
-      { value: 20, name: '耿马镇' },
-      { value: 15, name: '勐撒镇' },
-      { value: 12, name: '勐永镇' },
-      { value: 16, name: '孟定镇' },
-      { value: 8, name: '勐简乡' },
-      { value: 12, name: '贺派乡' },
-      { value: 10, name: '四排山乡' },
-      { value: 9, name: '芒洪乡' },
-      { value: 8, name: '大兴乡' },
+      { value: 441.96, name: '耿马镇' },
+      { value: 515.11, name: '勐撒镇' },
+      { value: 399.6, name: '勐永镇' },
+      { value: 1069.15, name: '孟定镇' },
+      { value: 281.19, name: '勐简乡' },
+      { value: 251.74, name: '贺派乡' },
+      { value: 349.86, name: '四排山乡' },
+      { value: 314, name: '芒洪乡' },
+      { value: 456, name: '大兴乡' },
     ],
     two: [
       { name: '耿马镇', value: 87.84 },
@@ -200,6 +177,18 @@ const loadData = async () => {
         value: 32.1,
       },
     ],
+    basic: [
+      { value: '3837km²', title: '政区域面积' },
+      { value: '9个乡（镇）,3个农场', title: '下辖地区' },
+      { value: '27.88万人', title: '常住人口' },
+      { value: '18.8℃ - 19.2℃', title: '年均气温' },
+      { value: '946.2毫米（山区）', title: '年降水量' },
+      { value: '优越，适宜农业发展', title: '光热水土条件' },
+    ],
+    warnings: [
+      { value: 2, title: '当前风险预警数量' },
+      { value: 30, title: '已处理土地违规案件' },
+    ],
   };
   state.loading = false;
 };
@@ -240,7 +229,7 @@ const handleCommand = (data) => {
   }
   .left-charts-item {
     width: calc(100% - 5px);
-    height: calc((100% - 30px) / 3);
+    height: calc((100% - 30px) / 2);
   }
 
   .right-charts {

From b653e6a28b4023beff93df738b5cc9815c63891b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9A=E4=BF=8A=E6=97=AD?= <398847134@qq.com>
Date: Thu, 22 May 2025 10:08:35 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=9C=9F=E5=9C=B0?=
 =?UTF-8?q?=E4=BA=A4=E6=98=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/ecommerce/components/leftMenu.vue                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sub-operation-service/src/views/ecommerce/components/leftMenu.vue b/sub-operation-service/src/views/ecommerce/components/leftMenu.vue
index 4b2880e..3cd6bf4 100644
--- a/sub-operation-service/src/views/ecommerce/components/leftMenu.vue
+++ b/sub-operation-service/src/views/ecommerce/components/leftMenu.vue
@@ -25,7 +25,7 @@ const leftMenu = reactive([
   { name: 'agricultural', title: '农资交易', icon: 'menu2.png', path: '/sub-operation-service/ecommerce-agricultural' },
   { name: 'supplier', title: '供应商服务', icon: 'menu1.png', path: '/sub-operation-service/ecommerce-supplier' },
   { name: 'purchaser', title: '采购商服务', icon: 'menu3.png', path: '/sub-operation-service/ecommerce-purchaser' },
-  { name: 'land', title: '土地交易', icon: 'menu4.png', path: '/sub-operation-service/ecommerce-land' },
+  // { name: 'land', title: '土地交易', icon: 'menu4.png', path: '/sub-operation-service/ecommerce-land' },
 ]);
 
 let currentIndex = ref(0);