修改选择

1 year ago · af310f3e5d
parent 3cffd21819
commit af310f3e5d
3 changed files with 102 additions and 43 deletions
--- a/haiwei-admin/src/main/resources/static/board/board.js
+++ b/haiwei-admin/src/main/resources/static/board/board.js
@ -1,10 +1,10 @@
 $(() => {
-  setTimeout(()=>{
+  setTimeout(() => {
    $("#centerModal1").show()
    setTimeout(() => {
      document.getElementById("monitoringIframe1").contentWindow.login()
    }, 1000)
-  },1000)
+  }, 1000)
  tableAnimation('#chart2')

  $.get(ctx + 'broad/home/deviceInfo', {}, (e) => {
@ -43,7 +43,7 @@ $(() => {
        <div class="win" style="display: none">
          <div class="title">${val.name}</div>
          <div class="span1">${val.data1}: ${val.num1 || 0}${val.unit1}</div>
-          <div class="span2">${val.data2}: ${val.num2|| 0}${val.unit2}</div>
+          <div class="span2">${val.data2}: ${val.num2 || 0}${val.unit2}</div>
        </div>
        <div class="icon" onclick="show(this)"></div>
      </div>
@ -54,20 +54,42 @@ $(() => {
  })

  $.get(ctx + 'broad/home/queryDeviceState', {}, (data) => {
+    let imgSrc = (name) => {
+      switch (name) {
+        case '运行':
+          return 'green'
+        case '停机':
+          return 'yellow'
+        case '故障':
+          return 'red'
+      }
+    }
+    let po = [
+      {
+        top: 24,
+        left: 70
+      },
+      {
+        top: 33,
+        left: 25
+      },
+    ]
    console.log(data)
-      let html = `
-      <div class="status" style="top:80%;left:50%">
-      <div class="icon" style="background-image: url('../../board/img/${data.msg === '运行' ? 'green' : 'red'}.png');"></div>
-      <span>${data.msg}</span>
+    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)

  })
 })

 let chart1 = (el, data) => {
-  let xData = Object.keys(data?.[0]||{})?.filter(e => e !== 'time') || []
+  let xData = Object.keys(data?.[0] || {})?.filter(e => e !== 'time') || []
  let series = xData.map(e => {
    return {
      name: e,
@ -92,10 +114,10 @@ let chart1 = (el, data) => {
    toolbox: {
      show: true,
      feature: {
-        dataZoom: {show:false},
-        dataView: { show:false },
-        magicType: { show:false },
-        restore: {show:false},
+        dataZoom: {show: false},
+        dataView: {show: false},
+        magicType: {show: false},
+        restore: {show: false},
        saveAsImage: {}
      }
    },
@ -159,10 +181,27 @@ let chart1 = (el, data) => {
  chart.setOption(option)
 }

-const show = (e) =>{
+const show = (e) => {
  let node = $(e).prev()
  node.show()
-  setTimeout(()=>{
+  setTimeout(() => {
    node.hide()
-  },1000*3)
+  }, 1000 * 3)
+}
+let tableHeadChangeArr = [
+  "采集时间",
+  "一体机A转速",
+  "一体机A电流",
+  "一体机A机头压力",
+  "一体机A机头温度",
+  "一体机A切刀电流",
+  "一体机A切刀转速"
+]
+const tableHeadChange = (e, val) => {
+  if ($(val).is(":checked")) {
+    tableHeadChangeArr.push(e)
+  } else {
+    tableHeadChangeArr = tableHeadChangeArr.filter(v => v !== e)
+  }
+  console.log(tableHeadChangeArr)
 }
--- a/haiwei-admin/src/main/resources/templates/board/board1.html
+++ b/haiwei-admin/src/main/resources/templates/board/board1.html
@ -34,6 +34,10 @@
  }

  const hideModal = (e, el) => {
+    $("#centerModal1").append(`<iframe src="monitoring1" frameborder="0" id="monitoringIframe1" style="width: 100%;height: 100%"></iframe>`)
+    setTimeout(() => {
+      document.getElementById("monitoringIframe1").contentWindow.login()
+    }, 1000)
    status[`bottomBtn${e}S`] = false
    $($(el)[0].parentNode).hide()
    $("#bottomBtn" + e).css({
@ -43,10 +47,6 @@
      document.getElementById("monitoringIframe").contentWindow.edit()
      setTimeout(() => {
        $("#monitoring").empty()
-        $("#centerModal1").append(`<iframe src="monitoring1" frameborder="0" id="monitoringIframe1" style="width: 100%;height: 100%"></iframe>`)
-        setTimeout(() => {
-          document.getElementById("monitoringIframe1").contentWindow.login()
-        }, 1000)
      }, 100)
    }
  }
@ -58,14 +58,14 @@
    })
  }
  const bottomBtnInfo = (e, el) => {
+    $('#centerModal1').empty()
    if (e === 3) {
-      $('#centerModal1').empty()
      $("#monitoring").append(`<iframe src="monitoring" frameborder="0" id="monitoringIframe" style="width: 100%;height: 100%"></iframe>`)
      setTimeout(() => {
        document.getElementById("monitoringIframe").contentWindow.login()
      }, 1000)
    }
-    $("#modal" + e).toggle()
+    $("#modal" + e).show()
    switch (e) {
      case 1:
        status.bottomBtn1S = !status.bottomBtn1S
@ -99,7 +99,12 @@
      params.endTime = new Date($('#endTime1').val())
    }
    $.get(ctx + 'broad/home/queryParamList', params, (e) => {
-      chart1(document.getElementById('chart1'), e.data)
+      if (e.data.length > 0) {
+        $("#chart1").empty()
+        chart1(document.getElementById('chart1'), e.data)
+      } else {
+        $("#chart1").html(`<div style="width: 100%;height: 100%;text-align: center;line-height:35vw;color: #fff ">暂无数据</div>`)
+      }
    })
  }
  const Modal2Search = () => {
@ -113,22 +118,35 @@
    console.log(params)
    $.get(ctx + 'broad/home/queryParamList', params, (e) => {
      $("#chart2").empty()
-      dynamicTable({
-        el: '#chart2',
-        rowNum: 10,
-        timeout: 5,
-        header: ['序号', '采集时间', '一体机A转速', '一体机A电流', '一体机A机头压力', '一体机A机头温度', '一体机A切刀电流', '一体机A切刀转速'],
-        data: e.data.map((val, i) => [i, val.time, val['一体机A转速'], val['一体机A电流'], val['一体机A机头压力'], val['一体机A机头温度'], val['一体机A切刀电流'], val['一体机A切刀转速']]),
-        index: true,
-        fontColor: '#03BCD4 ',
-        indexBGC: '#86F3FF',
-        headerBGC: '#092A77',
-        oddRowBGC: '#092A77',
-        evenRowBGC: '#092A77',
-      })
+      tableHeadChangeArr =[
+        "采集时间",
+        "一体机A转速",
+        "一体机A电流",
+        "一体机A机头压力",
+        "一体机A机头温度",
+        "一体机A切刀电流",
+        "一体机A切刀转速"
+      ]
+      if (e.data.length > 0) {
+        dynamicTable({
+          el: '#chart2',
+          rowNum: 10,
+          timeout: 5,
+          header: ['序号', '<input type="checkbox" checked onchange="tableHeadChange(\'采集时间\',this)"/> 采集时间', '<input type="checkbox" checked onchange="tableHeadChange(\'一体机A转速\',this)"/> 一体机A转速', '<input type="checkbox" checked onchange="tableHeadChange(\'一体机A电流\',this)"/> 一体机A电流', '<input type="checkbox" checked onchange="tableHeadChange(\'一体机A机头压力\',this)"/> 一体机A机头压力', '<input type="checkbox" checked onchange="tableHeadChange(\'一体机A机头温度\',this)"/> 一体机A机头温度', '<input type="checkbox" checked onchange="tableHeadChange(\'一体机A切刀电流\',this)"/> 一体机A切刀电流', '<input type="checkbox" checked onchange="tableHeadChange(\'一体机A切刀转速\',this)"/> 一体机A切刀转速'],
+          data: e.data.map((val, i) => [i, val.time, val['一体机A转速'], val['一体机A电流'], val['一体机A机头压力'], val['一体机A机头温度'], val['一体机A切刀电流'], val['一体机A切刀转速']]),
+          index: true,
+          fontColor: '#03BCD4 ',
+          indexBGC: '#86F3FF',
+          headerBGC: '#092A77',
+          oddRowBGC: '#092A77',
+          evenRowBGC: '#092A77',
+        })
+      } else {
+        $("#chart2").html(`<div style="width: 100%;height: 100%;text-align: center;line-height:35vw;color: #fff ">暂无数据</div>`)
+      }
    })
  }
-  const derive = () =>{
+  const derive = () => {
    let canvasNode = $("#chart1 div canvas")[0]
    console.log(canvasNode)
    let canvasURL = canvasNode.toDataURL("image/png");
@ -138,7 +156,9 @@
    link.click();
  }
  const derive2 = () => {
-    let params = {}
+    let params = {
+      colms:tableHeadChangeArr.toString()
+    }
    if ($('#startTime2').val()) {
      params.beginTime = new Date($('#startTime2').val())
    }
@ -201,11 +221,11 @@
      <div class="title2">技术参数:</div>
      <div class="bg2">
      </div>
-      <div id="statusD">
-      </div>
    </div>

  </div>
+  <div id="statusD">
+  </div>

  <div class="eqModal" id="eqModal">
    <div class="shade" onclick="hideModal1()"></div>
@ -238,11 +258,11 @@
        <div style="position:relative;">
          <div style="display: inline-block">
            <span style="font-size: 1vw;color: #fff">客户名称： </span>
-            <input name="loginName" id="name" style="width: 10vw;height:2vw;display: inline-block" type="text"/>
+            <input id="name" name="loginName" style="width: 10vw;height:2vw;display: inline-block" type="text"/>
          </div>
          <div style="display: inline-block">
            <span style="font-size: 1vw;color: #fff">实验胶种： </span>
-            <input name="loginName" id="type" style="width: 10vw;height:2vw;display: inline-block" type="text"/>
+            <input id="type" name="loginName" style="width: 10vw;height:2vw;display: inline-block" type="text"/>
          </div>
          <div style="display: inline-block">
            <span style="font-size: 1vw;color: #fff">起止时间： </span>
--- a/haiwei-admin/src/main/resources/templates/board/monitoring1.html
+++ b/haiwei-admin/src/main/resources/templates/board/monitoring1.html
@ -7,7 +7,7 @@
 <link href="../../board/monitoring.css" rel="stylesheet">
 <style>
  body{
-    margin-top: 125%;
+    margin-top: 40%;
    margin-left: 30%;
    /*transform: translate(-50%,-50%);*/
  }