修改显示

haiwei-admin/src/main/resources/static/board/board.js

@@ -16,32 +16,33 @@ $(() => {
 
   })
 
-  $.get(ctx + 'broad/home/queryParam', {name}, (e) => {
+  let request = () =>{
+    $.get(ctx + 'broad/home/queryParam', {name}, (e) => {
 
-    let enumArr = {
-      '转速': ' rpm',
-      '电流': ' A',
-      '温度': ' ℃',
-      '压力': ' MPa',
-    }
-    let data = e.data
-    let arrNum = Array.from(new Set([...e.data.map(e => e.order_by)]))
-    let arr = arrNum.map(e => {
-      let data1 = data.filter(val => val.order_by === e)
-      let obj = {}
-      data1.forEach((e, i) => {
-        obj.left = e.location_x + '%'
-        obj.top = e.location_y + '%'
-        obj.name = e.name
-        obj['data' + (i + 1)] = e.pointname
-        obj['num' + (i + 1)] = e.data
-        obj['unit' + (i + 1)] = enumArr[e.pointname]
+      let enumArr = {
+        '转速': ' rpm',
+        '电流': ' A',
+        '温度': ' ℃',
+        '压力': ' MPa',
+      }
+      let data = e.data
+      let arrNum = Array.from(new Set([...e.data.map(e => e.order_by)]))
+      let arr = arrNum.map(e => {
+        let data1 = data.filter(val => val.order_by === e)
+        let obj = {}
+        data1.forEach((e, i) => {
+          obj.left = e.location_x + '%'
+          obj.top = e.location_y + '%'
+          obj.name = e.name
+          obj['data' + (i + 1)] = e.pointname
+          obj['num' + (i + 1)] = e.data
+          obj['unit' + (i + 1)] = enumArr[e.pointname]
+        })
+        return obj
       })
-      return obj
-    })
-    arr.forEach(val => {
-      let html = `
-      <div class="centerInfo" style="top: ${val.top};left:${val.left}">
+      arr.forEach(val => {
+        let html = `
+      <div class="centerInfo" style="top: ${val.top};left:${val.left};z-index:2000">
         <div class="win" style="display: none">
           <div class="title">${val.name}</div>
           <div class="span1">${val.data1}: ${val.num1 || 0}${val.unit1}</div>
@@ -50,44 +51,50 @@ $(() => {
         <div class="icon" onclick="show(this)"></div>
       </div>
       `
-      $("#centerInfoDiv").append(html)
-    })
+        $("#centerInfoDiv").append(html)
+      })
 
-  })
+    })
 
-  $.get(ctx + 'broad/home/queryDeviceState', {name}, (data) => {
-    let imgSrc = (name) => {
-      switch (name) {
-        case '运行':
-          return 'green'
-        case '停机':
-          return 'yellow'
-        case '故障':
-          return 'red'
+    $.get(ctx + 'broad/home/queryDeviceState', {name}, (data) => {
+      let imgSrc = (name) => {
+        switch (name) {
+          case '运行':
+            return 'green'
+          case '停机':
+            return 'yellow'
+          case '故障':
+            return 'red'
+        }
       }
-    }
-    let po = [
-      {
-        top: 33,
-        left: 73
-      },
-      {
-        top: 33,
-        left: 38
-      },
-    ]
-    console.log(data)
-    let html = ``
-    po.forEach((e, i) => {
-      html += `<div class="status" style="top:${e.top}%;left:${e.left}%">
+      let po = [
+        {
+          top: 33,
+          left: 73
+        },
+        {
+          top: 33,
+          left: 38
+        },
+      ]
+      console.log(data)
+      let html = ``
+      po.forEach((e, i) => {
+        html += `<div class="status" style="top:${e.top}%;left:${e.left}%">
       <div class="icon" style="background-image: url('../../board/img/${imgSrc(data.data[i].state)}.png');"></div>
 <!--      <span>${data.data[i].state}</span>-->
     </div>
       `
+      })
+      $("#statusD").html(html)
+
     })
-    $("#statusD").html(html)
+  }
+  request()
 
-  })
+  setInterval(() => {
+    request()
+  }, 1000 * 60)
 })
 
 let chart = null

haiwei-admin/src/main/resources/templates/board/board1.html

@@ -209,8 +209,8 @@
       <div class="bg2">
       </div>
     </div>
-
   </div>
+
   <div id="centerInfoDiv" class="centerInfoDiv" >
 
   </div>