From c4304f8da7c7c568346f415334c3db7bd25b0bae Mon Sep 17 00:00:00 2001
From: "2090205686@qq.com" <guoyongchao666>
Date: Tue, 20 May 2025 13:25:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=99=BA=E6=85=A7=E7=A7=8D=E6=A4=8D=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E4=B8=80=E4=BD=93=E8=82=B2=E8=8B=97=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91=EF=BC=8Cnew=E6=94=BF=E5=8A=A1=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=A4=A7=E5=B1=8F=E8=B7=AF=E7=94=B1=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/src/micro/app.js                         |   4 +-
 .../src/components/baseBg.vue                 |   2 +-
 .../components/custom-scroll-title/index.vue  |   2 +-
 .../src/layouts/index.vue                     |   6 +-
 .../src/router/index.js                       |  31 +--
 .../src/router/modules/v2.js                  |   2 +-
 sub-operation-service/package.json            |   1 +
 .../src/assets/images/smartFarm/灌溉控制.png  | Bin 0 -> 3107 bytes
 .../src/assets/images/smartFarm/病虫害.png    | Bin 0 -> 1892 bytes
 .../src/assets/images/smartFarm/育苗.png      | Bin 0 -> 1937 bytes
 sub-operation-service/src/router/index.js     |   6 +
 .../src/views/smartFarm/components/common.vue |  11 +-
 .../views/smartFarm/components/leftMenu.vue   |  16 +-
 .../views/smartFarm/components/myTable.vue    |  79 +++++++
 .../smartFarm/components/produceDevices.vue   | 158 ++++++++++++++
 .../views/smartFarm/growSeedlings/index.vue   | 204 ++++++++++++++++++
 sub-operation-service/yarn.lock               |   8 +
 17 files changed, 502 insertions(+), 28 deletions(-)
 create mode 100644 sub-operation-service/src/assets/images/smartFarm/灌溉控制.png
 create mode 100644 sub-operation-service/src/assets/images/smartFarm/病虫害.png
 create mode 100644 sub-operation-service/src/assets/images/smartFarm/育苗.png
 create mode 100644 sub-operation-service/src/views/smartFarm/components/myTable.vue
 create mode 100644 sub-operation-service/src/views/smartFarm/components/produceDevices.vue
 create mode 100644 sub-operation-service/src/views/smartFarm/growSeedlings/index.vue

diff --git a/main/src/micro/app.js b/main/src/micro/app.js
index d8c045d..36f7b87 100644
--- a/main/src/micro/app.js
+++ b/main/src/micro/app.js
@@ -57,11 +57,11 @@ export const rightApps = [
   },
   {
     // name: 'sub-government-screen-service',
-    name: 'new-digital-agriculture-screen',
+    name: 'new-digital-agriculture-screen/v2/land',
     // entry: VITE_APP_SUB_GSS,
     entry: VITE_APP_SUB_GSR,
     // activeRule: '/sub-government-screen-service',
-    activeRule: '/new-digital-agriculture-screen',
+    activeRule: '/new-digital-agriculture-screen/v2/land',
     title: '数据大屏',
     icon: 'images/platform/icon-screen.png',
   },
diff --git a/new-digital-agriculture-screen/src/components/baseBg.vue b/new-digital-agriculture-screen/src/components/baseBg.vue
index 3808d40..2787213 100644
--- a/new-digital-agriculture-screen/src/components/baseBg.vue
+++ b/new-digital-agriculture-screen/src/components/baseBg.vue
@@ -28,7 +28,7 @@ const props = defineProps({
 });
 
 const titles = ref([
-  { label: '首页', value: 'home' },
+  // { label: '首页', value: 'home' },
   { label: '土地资源', value: 'land' },
   { label: '投入品', value: 'inputs' },
   { label: '生产经营主体', value: 'entities' },
diff --git a/new-digital-agriculture-screen/src/components/custom-scroll-title/index.vue b/new-digital-agriculture-screen/src/components/custom-scroll-title/index.vue
index 166f4e9..86d8906 100644
--- a/new-digital-agriculture-screen/src/components/custom-scroll-title/index.vue
+++ b/new-digital-agriculture-screen/src/components/custom-scroll-title/index.vue
@@ -54,7 +54,7 @@ const props = defineProps({
     type: Array,
     default() {
       return [
-        { label: '首页', value: '/new-digital-agriculture-screen/v2/home' },
+        // { label: '首页', value: '/new-digital-agriculture-screen/v2/home' },
         { label: '土地资源', value: '/new-digital-agriculture-screen/v2/land' },
         { label: '投入品监管', value: '/new-digital-agriculture-screen/v2/inputs' },
         { label: '产出品管理', value: '/new-digital-agriculture-screen/v2/entities' },
diff --git a/new-digital-agriculture-screen/src/layouts/index.vue b/new-digital-agriculture-screen/src/layouts/index.vue
index 2dbc94f..649e476 100644
--- a/new-digital-agriculture-screen/src/layouts/index.vue
+++ b/new-digital-agriculture-screen/src/layouts/index.vue
@@ -58,10 +58,10 @@ onMounted(() => {
   user-select: none;
   box-sizing: border-box;
   width: 100%;
-  height: 100;
+  height: 100%;
   background:
-    url('@/assets/images/basic/containerBG.png') no-repeat center 100%,
-    url('@/assets/images/basic/containerBotBG.png') no-repeat bottom center;
+    url('../assets/images/basic/containerBG.png') no-repeat center 100%,
+    url('../assets/images/basic/containerBotBG.png') no-repeat bottom center;
   &-header {
     width: 100%;
     margin-bottom: 16px;
diff --git a/new-digital-agriculture-screen/src/router/index.js b/new-digital-agriculture-screen/src/router/index.js
index a256543..b775f4a 100644
--- a/new-digital-agriculture-screen/src/router/index.js
+++ b/new-digital-agriculture-screen/src/router/index.js
@@ -17,21 +17,22 @@ export const constantRoutes = [
     component: () => import('@/views/error/403.vue'),
     hidden: true,
   },
-  {
-    path: '/new-digital-agriculture-screen',
-    name: 'layout',
-    component: Layout,
-    redirect: '/new-digital-agriculture-screen/v2/home',
-    meta: { title: '首页', icon: 'House' },
-    children: [
-      {
-        path: '/new-digital-agriculture-screen/v2/home',
-        component: () => import('@/views/home/index.vue'),
-        name: 'home',
-        meta: { title: '首页', icon: '' },
-      },
-    ],
-  },
+  // {
+  //   // 原来的首页默认配置
+  //   path: '/new-digital-agriculture-screen',
+  //   name: 'layout',
+  //   component: Layout,
+  //   redirect: '/new-digital-agriculture-screen/v2/home',
+  //   meta: { title: '首页', icon: 'House' },
+  //   children: [
+  //     {
+  //       path: '/new-digital-agriculture-screen/v2/home',
+  //       component: () => import('@/views/home/index.vue'),
+  //       name: 'home',
+  //       meta: { title: '首页', icon: '' },
+  //     },
+  //   ],
+  // },
   // ...demoRouters,
   v2,
   // {
diff --git a/new-digital-agriculture-screen/src/router/modules/v2.js b/new-digital-agriculture-screen/src/router/modules/v2.js
index 914f818..6a60597 100644
--- a/new-digital-agriculture-screen/src/router/modules/v2.js
+++ b/new-digital-agriculture-screen/src/router/modules/v2.js
@@ -4,7 +4,7 @@ export default {
   path: '/new-digital-agriculture-screen',
   name: 'layout',
   component: Layout,
-  redirect: '/new-digital-agriculture-screen/v2/home',
+  redirect: '/new-digital-agriculture-screen/v2/land', //原home
   meta: { title: '首页', icon: '' },
   children: [
     {
diff --git a/sub-operation-service/package.json b/sub-operation-service/package.json
index 5b02f67..95b5182 100644
--- a/sub-operation-service/package.json
+++ b/sub-operation-service/package.json
@@ -23,6 +23,7 @@
     "axios": "^1.6.5",
     "echarts": "^5.6.0",
     "element-plus": "^2.7.2",
+    "hls.js": "^1.6.2",
     "js-base64": "^3.7.6",
     "lodash": "^4.17.21",
     "moment": "^2.30.1",
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 0000000000000000000000000000000000000000..915a7f0e9af2047dd9962057a9c39d88a40f8e27
GIT binary patch
literal 3107
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

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..b32d07cfd1e4819c92e008bf51e3ab9ad53507f5
GIT binary patch
literal 1892
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

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..0d0589d4123024017aaf1d4085f710084abf38c2
GIT binary patch
literal 1937
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
Xr!$6MEgKl@00000NkvXXu0mjfRWzd@

literal 0
HcmV?d00001

diff --git a/sub-operation-service/src/router/index.js b/sub-operation-service/src/router/index.js
index 10bb445..456aa81 100644
--- a/sub-operation-service/src/router/index.js
+++ b/sub-operation-service/src/router/index.js
@@ -63,6 +63,12 @@ export const constantRoutes = [
         name: 'fieldInspection',
         meta: { title: '田间检测' },
       },
+      {
+        path: '/sub-operation-service/smartFarm/growSeedlings',
+        component: () => import('@/views/smartFarm/growSeedlings/index.vue'),
+        name: 'growSeedlings',
+        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 8062d88..dc530b3 100644
--- a/sub-operation-service/src/views/smartFarm/components/common.vue
+++ b/sub-operation-service/src/views/smartFarm/components/common.vue
@@ -48,12 +48,19 @@ const menus = reactive([
     ],
   },
   {
-    name: 'purchaser',
+    name: 'control',
     title: '生产管理控制',
     icon: 'menu3.png',
     path: '/sub-operation-service/ecommerce-purchaser',
     isOpen: false,
-    children: [],
+    children: [
+      {
+        name: 'control',
+        title: '一体育苗',
+        icon: 'menu3.png',
+        path: '/sub-operation-service/smartFarm/growSeedlings',
+      },
+    ],
   },
 ]);
 </script>
diff --git a/sub-operation-service/src/views/smartFarm/components/leftMenu.vue b/sub-operation-service/src/views/smartFarm/components/leftMenu.vue
index d04774e..cac5253 100644
--- a/sub-operation-service/src/views/smartFarm/components/leftMenu.vue
+++ b/sub-operation-service/src/views/smartFarm/components/leftMenu.vue
@@ -76,12 +76,19 @@ const leftMenu = reactive([
     ],
   },
   {
-    name: 'purchaser',
+    name: 'control',
     title: '生产管理控制',
     icon: 'menu3.png',
-    path: '/sub-operation-service/ecommerce-purchaser',
+    path: '/sub-operation-service/smartFarm/main',
     isOpen: false,
-    children: [],
+    children: [
+      {
+        name: 'control',
+        title: '一体育苗',
+        icon: 'menu3.png',
+        path: '/sub-operation-service/smartFarm/growSeedlings',
+      },
+    ],
   },
 ]);
 
@@ -108,9 +115,12 @@ const toLink = (index) => {
   }
 };
 const toLinkSub = (index, c) => {
+  console.info('index', index);
+  console.info('c', c);
   currentCIndex.value = c;
   let path = leftMenu[index].children[c].path;
   if (path) {
+    console.info('path', path);
     router.push(path);
   }
 };
diff --git a/sub-operation-service/src/views/smartFarm/components/myTable.vue b/sub-operation-service/src/views/smartFarm/components/myTable.vue
new file mode 100644
index 0000000..68c8f68
--- /dev/null
+++ b/sub-operation-service/src/views/smartFarm/components/myTable.vue
@@ -0,0 +1,79 @@
+<script setup>
+import { ref, reactive, onMounted, watch } from 'vue';
+
+const props = defineProps({
+  column: {
+    type: Array,
+    required: true,
+    default: () => [],
+  },
+  data: {
+    type: Array,
+    required: true,
+    default: () => [],
+  },
+  title: {
+    type: String,
+    required: true,
+    default: () => '',
+    validator: (items) => {
+      return items;
+    },
+  },
+});
+
+onMounted(() => {
+  console.log(props.column);
+});
+</script>
+
+<template>
+  <div>
+    <el-card style="border-radius: 16px">
+      <div class="my-table-title" style="">{{ title }}</div>
+      <div style="height: 170px">
+        <table border="0" cellspacing="0" cellpadding="8">
+          <tr class="my-table-th">
+            <th v-for="(item, index) in column" :key="item.prop || index">
+              {{ item?.label || '' }}
+            </th>
+          </tr>
+          <tr v-for="(item, index) in data" :key="item.id || index">
+            <td v-for="(cell, i) of item" :key="item.id || i">
+              <span style="color: #25bf82" v-if="cell == '开启'">{{ cell }}</span>
+              <span style="color: #fe4066" v-else-if="cell == '关闭'">{{ cell }}</span>
+              <span v-else>{{ cell }}</span>
+            </td>
+          </tr>
+        </table>
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<style scoped lang="scss">
+.my-table-title {
+  font-size: 16px;
+  font-weight: bold;
+  text-align: left;
+  color: #000;
+  margin-bottom: 16px;
+}
+table {
+  width: 100%;
+  display: table;
+  border-collapse: collapse;
+}
+td,
+th {
+  display: table-cell;
+  width: auto;
+  padding: 5px;
+  text-align: left;
+}
+.my-table-th {
+  color: #999;
+  font-weight: 300;
+  background-color: rgba(37, 191, 130, 0.05);
+}
+</style>
diff --git a/sub-operation-service/src/views/smartFarm/components/produceDevices.vue b/sub-operation-service/src/views/smartFarm/components/produceDevices.vue
new file mode 100644
index 0000000..fd2e168
--- /dev/null
+++ b/sub-operation-service/src/views/smartFarm/components/produceDevices.vue
@@ -0,0 +1,158 @@
+<script setup>
+import { ref, reactive, onMounted, watch } from 'vue';
+import { isEmpty, getAssetsFile } from '@/utils';
+import { useRoute, useRouter } from 'vue-router';
+const route = useRoute();
+const router = useRouter();
+
+const props = defineProps({
+  devices: {
+    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,
+    required: true,
+    default: () => '',
+    validator: (items) => {
+      return items;
+    },
+  },
+});
+</script>
+
+<template>
+  <div>
+    <el-card style="border-radius: 16px">
+      <div class="device-list-title" style="">{{ title }}</div>
+      <div style="display: flex; justify-content: flex-start; flex-wrap: wrap; gap: 16px">
+        <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>
+          <div v-else-if="item.status == -1" class="status" style="background-color: #fe4066">故障</div>
+          <div style="display: flex; flex-direction: column; justify-content: space-between; height: 100%">
+            <div style="display: flex; justify-content: flex-start">
+              <img v-if="item.icon === 'plant'" :src="getAssetsFile('images/smartFarm/育苗.png')" alt="" />
+              <img v-else-if="item.icon === 'gogga'" :src="getAssetsFile('images/smartFarm/病虫害.png')" alt="" />
+              <img v-else-if="item.icon === 'water'" :src="getAssetsFile('images/smartFarm/灌溉控制.png')" alt="" />
+              <div style="margin-left: 10px">
+                <div style="font-size: 16px; text-align: left">{{ item.name }}</div>
+                <div style="font-size: 12px; text-align: left">{{ item.serial }}</div>
+              </div>
+            </div>
+            <div style="text-align: left; font-size: 16px; display: flex; justify-content: space-between; padding-left: 6px">
+              <div style="width: 128px; height: 30px; border-radius: 15px; background-color: #ffffff">
+                <div v-if="item.status == '0'" :class="{ 'swich-box2': true, 'swich-box-close': item.isOpen == 0 }">
+                  <span class="swich-btn" :style="{ color: item.isOpen == 0 ? '#999999' : '#ffffff' }">开启</span>
+                  <span class="swich-btn" :style="{ color: item.isOpen == 1 ? '#999999' : '#ffffff' }">关闭</span>
+                </div>
+                <div v-else :class="{ 'swich-box': true, 'swich-box-close': item.isOpen == 0 }">
+                  <span class="swich-btn" :style="{ color: item.isOpen == 0 ? '#25bf82' : '#ffffff' }" @click="item.isOpen = 1">开启</span>
+                  <span class="swich-btn" :style="{ color: item.isOpen == 1 ? '#999999' : '#ffffff' }" @click="item.isOpen = 0">关闭</span>
+                </div>
+              </div>
+              <span v-if="item.isOperation == 0" style="color: #999999">待机中...</span>
+              <span v-else-if="item.isOperation == 1" style="color: #25bf82">运作中...</span>
+            </div>
+          </div>
+        </div>
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<style scoped lang="scss">
+.device-list-title {
+  font-size: 16px;
+  font-weight: bold;
+  text-align: left;
+  color: #000;
+  margin-bottom: 20px;
+}
+.device {
+  height: 150px;
+  flex: 0 0 calc(33.33% - 11px);
+  background-color: #f5f5f5;
+  border-radius: 16px;
+  position: relative;
+  cursor: pointer;
+  padding: 16px 16px 16px 10px;
+  img {
+    height: 64px;
+    width: 64px;
+  }
+}
+.status {
+  border-radius: 0 16px 0 16px;
+  height: 32px;
+  line-height: 26px;
+  width: 40px;
+  position: absolute;
+  right: 0;
+  top: 0;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  color: #ffffff;
+  font-size: 12px;
+}
+
+.swich-box,
+.swich-box2 {
+  width: 128px;
+  height: 30px;
+  border-radius: 15px;
+  z-index: 0;
+  position: relative;
+  &::before {
+    display: inline-block;
+    position: absolute;
+    content: '';
+    top: 0;
+    left: 0;
+    z-index: -1;
+    width: 64px;
+    height: 30px;
+    background-color: #25bf82;
+    border-radius: 15px;
+    transition: all 0.3s ease-in-out;
+  }
+
+  &.swich-box-close::before {
+    left: 64px;
+    background-color: #999999;
+  }
+
+  ::v-deep .swich-btn {
+    display: inline-block;
+    font-size: 16px;
+    width: 64px;
+    height: 30px;
+    line-height: 30px;
+    border-radius: 15px;
+    text-align: center;
+    transition: all 0.3s ease-in-out;
+  }
+}
+.swich-box2 {
+  &::before {
+    background-color: #999999;
+  }
+}
+</style>
diff --git a/sub-operation-service/src/views/smartFarm/growSeedlings/index.vue b/sub-operation-service/src/views/smartFarm/growSeedlings/index.vue
new file mode 100644
index 0000000..24cb0e8
--- /dev/null
+++ b/sub-operation-service/src/views/smartFarm/growSeedlings/index.vue
@@ -0,0 +1,204 @@
+<template>
+  <section>
+    <common>
+      <template #main>
+        <div>
+          <ProduceDevices :title="'育苗设备'" :devices="devices"></ProduceDevices>
+        </div>
+        <div style="display: flex; justify-content: space-between; margin-top: 20px">
+          <MyTable :title="'育苗策略'" :data="leftTableData" :column="leftTableTitle" style="width: 60%; margin-right: 20px"></MyTable>
+          <MyTable :title="'育苗记录'" :data="rightTableData" :column="rightTableTitle" style="flex: 1"></MyTable>
+        </div>
+      </template>
+    </common>
+  </section>
+</template>
+
+<script setup>
+import { ref } from 'vue';
+import Common from '../components/common.vue';
+import MyTable from '@/views/smartFarm/components/myTable.vue';
+import ProduceDevices from '@/views/smartFarm/components/produceDevices.vue';
+
+const devices = ref([
+  {
+    name: 'A-001',
+    serial: 'YM20250101001', // 设备序列号
+    icon: 'plant', // plant育苗 gogga病虫害 water喷灌
+    isOpen: 1, // 0:关闭 1:开启
+    isOperation: 0, // 0:待机中 1:运作中
+    status: '1', // -1:故障 0:离线 1:正常
+    id: 0,
+  },
+  {
+    name: 'A-002',
+    serial: 'YM20250101002',
+    icon: 'plant',
+    isOpen: 0,
+    isOperation: 1,
+    status: '1',
+    id: 1,
+  },
+  {
+    name: 'A-003',
+    serial: 'YM20250101003',
+    icon: 'gogga',
+    isOpen: 0,
+    isOperation: 0,
+    status: '-1',
+    id: 2,
+  },
+  {
+    name: 'A-004',
+    serial: 'YM20250101004',
+    icon: 'water',
+    isOpen: 1,
+    isOperation: 0,
+    status: '0',
+    id: 3,
+  },
+  {
+    name: 'A-005',
+    serial: 'YM20250101005',
+    icon: 'gogga',
+    isOpen: 0,
+    isOperation: 1,
+    status: '1',
+    id: 4,
+  },
+  {
+    name: 'A-006',
+    serial: 'YM20250101006',
+    icon: 'water',
+    isOpen: 1,
+    isOperation: 0,
+    status: '1',
+    id: 5,
+  },
+]);
+
+const leftTableData = ref([
+  {
+    name: '温度',
+    value: '>25',
+    device: '制冷机',
+    behavior: '开启',
+    time: 10,
+  },
+  {
+    name: '湿度',
+    value: '<24',
+    device: '喷洒机',
+    behavior: '关闭',
+    time: 15,
+  },
+  {
+    name: 'PH值',
+    value: '>8',
+    device: '配肥机',
+    behavior: '开启',
+    time: 5,
+  },
+  {
+    name: '风速',
+    value: '>中风',
+    device: '通风窗',
+    behavior: '关闭',
+    time: '/',
+  },
+  {
+    name: '光照',
+    value: '>强光',
+    device: '幕布',
+    behavior: '开启',
+    time: '/',
+  },
+]);
+const leftTableTitle = ref([
+  {
+    label: '参数名称',
+    prop: 'name',
+    width: 'auto',
+  },
+  {
+    label: '参数值',
+    prop: 'value',
+    width: 'auto',
+  },
+  {
+    label: '智能设备',
+    prop: 'device',
+    width: 'auto',
+  },
+  {
+    label: '机械行为',
+    prop: 'behavior',
+    width: 'auto',
+  },
+  {
+    label: '持续时间(min)',
+    prop: 'time',
+    width: 'auto',
+  },
+]);
+
+const rightTableData = ref([
+  {
+    date: '2025-01-01 10:36',
+    device: '制冷机',
+    behavior: '开启',
+  },
+  {
+    date: '2025-01-01 10:30',
+    device: '喷洒机',
+    behavior: '关闭',
+  },
+  {
+    date: '2025-01-01 10:22',
+    device: '配肥机',
+    behavior: '开启',
+  },
+  {
+    date: '2025-01-01 10:10',
+    device: '通风窗',
+    behavior: '关闭',
+  },
+  {
+    date: '2025-01-01 10:00',
+    device: '幕布',
+    behavior: '开启',
+  },
+]);
+const rightTableTitle = ref([
+  {
+    label: '执行时间',
+    prop: 'date',
+    width: 'auto',
+  },
+  {
+    label: '智能设备',
+    prop: 'device',
+    width: 'auto',
+  },
+  {
+    label: '机械行为',
+    prop: 'behavior',
+    width: 'auto',
+  },
+]);
+</script>
+
+<style lang="scss" scoped>
+.plantStatus {
+  display: flex;
+  justify-content: space-between;
+  font-size: 14px;
+  margin: 7px 0;
+  .leftKey {
+    color: #000000;
+  }
+  .rightValue {
+    color: #25bf82;
+  }
+}
+</style>
diff --git a/sub-operation-service/yarn.lock b/sub-operation-service/yarn.lock
index 74c0f4d..4d6a32f 100644
--- a/sub-operation-service/yarn.lock
+++ b/sub-operation-service/yarn.lock
@@ -4417,6 +4417,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"hls.js@npm:^1.6.2":
+  version: 1.6.2
+  resolution: "hls.js@npm:1.6.2"
+  checksum: 10c0/c8700d88610afa85bf441cd624f6d548c1fea59c0e510fb05be02f9a33660b8a46cb17910ea5179b9d1307ce9242f4e904d8aa98d7f63d0df750d6d0f6e85134
+  languageName: node
+  linkType: hard
+
 "hookified@npm:^1.6.0":
   version: 1.6.0
   resolution: "hookified@npm:1.6.0"
@@ -8512,6 +8519,7 @@ __metadata:
     eslint-config-prettier: "npm:^9.1.0"
     eslint-plugin-prettier: "npm:^5.1.3"
     eslint-plugin-vue: "npm:^9.20.1"
+    hls.js: "npm:^1.6.2"
     js-base64: "npm:^3.7.6"
     lodash: "npm:^4.17.21"
     mockjs: "npm:^1.1.0"