From e8441ac89031664b59fcbd23a402228b3222cf24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Mon, 25 Sep 2023 11:44:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/api/board/equipment.js                    |  9 ---------
 ruoyi-ui/src/views/board/equipment/index.vue           | 10 ----------
 ruoyi-ui/src/views/board/equipmentMonitoring/index.vue | 10 +++++++---
 ruoyi-ui/src/views/board/index/index.vue               |  2 ++
 4 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/ruoyi-ui/src/api/board/equipment.js b/ruoyi-ui/src/api/board/equipment.js
index 942c573..a40c2ea 100644
--- a/ruoyi-ui/src/api/board/equipment.js
+++ b/ruoyi-ui/src/api/board/equipment.js
@@ -17,15 +17,6 @@ export function selectDevicesByMonitorUnitId(query=0,data=0) {
     data:query
   })
 }
-// 右
-export function selectLatestDataByDeviceMode(query) {
-  return request({
-    // baseURL:'/monitoring-api',
-    url: '/business/monitorPlatform/selectLatestDataByDeviceMode',
-    method: 'post',
-    data:query
-  })
-}
 // 中上
 export function getMonitorById(query=0) {
   return request({
diff --git a/ruoyi-ui/src/views/board/equipment/index.vue b/ruoyi-ui/src/views/board/equipment/index.vue
index 3f1dd24..15763f4 100644
--- a/ruoyi-ui/src/views/board/equipment/index.vue
+++ b/ruoyi-ui/src/views/board/equipment/index.vue
@@ -84,7 +84,6 @@
 import {
   treeList,
   selectDevicesByMonitorUnitId,
-  selectLatestDataByDeviceMode,
   getMonitorById
 } from '@/api/board/equipment'
 
@@ -147,7 +146,6 @@ export default {
       if (!e.children?.length > 0) {
         this.monitorUnitId = e.id
         this.getDevice(e.id)
-        this.getRightDevice(e.id)
         this.setMonitorById(e)
         this.show = true
         if (typeof getDeviceInterval === 'number') {
@@ -164,14 +162,6 @@ export default {
       this.controlList = data.control
       this.acquisitionList = data.acquisition
     },
-    async getRightDevice(e) {
-      const data = await selectLatestDataByDeviceMode({
-        "sceneId": this.$store.getters.sceneId,
-        "deviceModeId": 1,
-        "offset": 0,
-        "limit": 1
-      })
-    },
     async setMonitorById(e) {
       const {data} = await getMonitorById(e.id)
       this.MonitorInfo = data
diff --git a/ruoyi-ui/src/views/board/equipmentMonitoring/index.vue b/ruoyi-ui/src/views/board/equipmentMonitoring/index.vue
index b0f5919..acb0730 100644
--- a/ruoyi-ui/src/views/board/equipmentMonitoring/index.vue
+++ b/ruoyi-ui/src/views/board/equipmentMonitoring/index.vue
@@ -2,7 +2,7 @@
   <div class="container">
     <div class="centerImg"></div>
     <div class="leftMenu">
-      <div v-for="i in deviceList" class="item" @click="getRightData(i)">
+      <div v-for="(i,k) in deviceList" class="item" @click="getRightData(i)" :key="k">
         <span>{{ i.deviceModeName }}</span>
       </div>
     </div>
@@ -23,13 +23,14 @@
             </el-date-picker>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" @click="onSubmit">查询</el-button>
-            <el-button @click="onSubmit">重置</el-button>
+            <el-button type="primary" @click="()=>{}">查询</el-button>
+            <el-button @click="()=>{}">重置</el-button>
           </el-form-item>
         </el-form>
       </div>
       <div :style="{height:maxHeight+'px'}" class="table">
         <el-table
+          v-loading="loading"
           v-if='tableShow'
           :cell-style="setStyle"
           :data="tableData"
@@ -93,6 +94,7 @@ export default {
   },
   data() {
     return {
+      loading:false,
       tableShow: false,
       form: {
         data1: '',
@@ -115,6 +117,7 @@ export default {
   },
   methods: {
     async getRightData(e){
+      this.loading = true
       await this.setSelectLatestDataByDeviceMode({
         "sceneId": this.$store.getters.sceneId,
         "deviceModeId": e.deviceModeId,
@@ -122,6 +125,7 @@ export default {
         "offset": this.offset,
         "limit": 10
       })
+      this.loading = false
     },
     async getData() {
       await this.setDeviceModesBySceneId()
diff --git a/ruoyi-ui/src/views/board/index/index.vue b/ruoyi-ui/src/views/board/index/index.vue
index ad3b6ab..975e55e 100644
--- a/ruoyi-ui/src/views/board/index/index.vue
+++ b/ruoyi-ui/src/views/board/index/index.vue
@@ -198,9 +198,11 @@ export default {
       chart2Option: {
         color: ["#22acfd", "#22fe97", "#f9e728", "#ff922b", "#ed1814"],
         legend: {
+          type:'scroll',
           orient: "vertical",
           x: "right",
           y: "center",
+          width:'100px',
           textStyle: {
             color: '#fff'
           }