修改设备显示信息

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

@@ -1,47 +1,46 @@
-
 $(() => {
   tableAnimation('#chart2')
 
+  $.get(ctx + 'broad/home/deviceInfo', {}, (e) => {
+    let data = e.data[0]
+    console.log(data)
+    $('.bg1').html(`<p>${data.deviceFunction}</p>`)
+    $('.bg2').html(`<p>${data.deviceParam}</p>`)
+
+  })
 
   $.get(ctx + 'broad/home/queryParam', {}, (e) => {
-    let arr = [
-      {
-        name: "一体机切刀A",
-        top: '1%',
-        left: '15%',
-        data1: '转速',
-        data2: '电流',
-        unit1: 'n/s',
-        unit2: 'A',
-      },
-      {
-        name: "一体机A机头",
-        top: '35%',
-        left: '40%',
-        data1: '温度',
-        data2: '压力',
-        unit1: '℃',
-        unit2: 'Kpa',
-      },
-      {
-        name: "一体机A",
-        top: '45%',
-        left: '71%',
-        data1: '转速',
-        data2: '电流',
-        unit1: 'n/s',
-        unit2: 'A',
-      },
-    ]
+
+    let enumArr = {
+      '转速': 'n/s',
+      '电流': 'A',
+      '温度': '℃',
+      '压力': 'Kpa',
+    }
+    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
+    })
     arr.forEach(val => {
       let html = `
       <div class="centerInfo" style="top: ${val.top};left:${val.left}">
-        <div class="win">
+        <div class="win" style="display: none">
           <div class="title">${val.name}</div>
-          <div class="span1">${val.data1}: ${e.data.find(res => res.name === val.name && res.pointname === val.data1)?.data || 0}${val.unit1}</div>
-          <div class="span2">${val.data2}: ${e.data.find(res => res.name === val.name && res.pointname === val.data2)?.data || 0}${val.unit2}</div>
+          <div class="span1">${val.data1}: ${val.num1.data || 0}${val.unit1}</div>
+          <div class="span2">${val.data2}: ${val.num2.data || 0}${val.unit2}</div>
         </div>
-        <div class="icon"></div>
+        <div class="icon" onclick="show(this)"></div>
       </div>
       `
       $("#centerInfoDiv").append(html)
@@ -157,3 +156,11 @@ let chart1 = (el, data) => {
   };
   chart.setOption(option)
 }
+
+const show = (e) =>{
+  let node = $(e).prev()
+  node.show()
+  setTimeout(()=>{
+    node.hide()
+  },1000*3)
+}

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

@@ -162,15 +162,15 @@
       <div class="title">基本信息</div>
       <div class="title1">设备描述:</div>
       <div class="bg1">
-        <p>规格型号: PG -300</p>
-        <p>功能描述:利用膨化闪蒸原理，使胶料通过单螺杆的挤压输由高温高压到常温常压状态，利用胶料膨化闪蒸去除胶料内部的水分。</p>
+<!--        <p>规格型号: PG -300</p>-->
+<!--        <p>功能描述:利用膨化闪蒸原理，使胶料通过单螺杆的挤压输由高温高压到常温常压状态，利用胶料膨化闪蒸去除胶料内部的水分。</p>-->
       </div>
       <div class="title2">技术参数:</div>
       <div class="bg2">
-        <p>功率:800kw</p>
-        <p>电压:10000V</p>
-        <p>转速: 1480rpm</p>
-        <p>转速: 0~276rpr</p>
+<!--        <p>功率:800kw</p>-->
+<!--        <p>电压:10000V</p>-->
+<!--        <p>转速: 1480rpm</p>-->
+<!--        <p>转速: 0~276rpr</p>-->
       </div>
     </div>
   </div>