修改监控

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

@@ -1,4 +1,7 @@
 $(() => {
+  setTimeout(()=>{
+    $("#centerModal1").show()
+  },1000)
   tableAnimation('#chart2')
 
   $.get(ctx + 'broad/home/deviceInfo', {}, (e) => {
@@ -36,8 +39,8 @@ $(() => {
       <div class="centerInfo" style="top: ${val.top};left:${val.left}">
         <div class="win" style="display: none">
           <div class="title">${val.name}</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 class="span1">${val.data1}: ${val.num1 || 0}${val.unit1}</div>
+          <div class="span2">${val.data2}: ${val.num2 || 0}${val.unit2}</div>
         </div>
         <div class="icon" onclick="show(this)"></div>
       </div>

haiwei-admin/src/main/resources/static/board/monitoring1.css

@@ -0,0 +1,4 @@
+.plugin{
+    width: 100%;
+    height: 100%;
+}

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

@@ -236,7 +236,7 @@
       </div>
     </div>
   </div>
-  <div class="centerModal1" id="centerModal1">
+  <div class="centerModal1" id="centerModal1" style="display: none">
       <iframe frameborder="0" id="monitoringIframe" src="monitoring1" style="width: 100%;height: 100%"></iframe>
   </div>
 </div>

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

@@ -25,7 +25,7 @@
   <div class="plugin" id="divPlugin" style="width: 100vw;height: 100vh"></div>
 </div>
 <th:block th:include="include :: footer"/>
-<script id="videonode" src="../../js/webVideoCtrl.js"></script>
-<script src="../../board/monitoring.js"></script>
+<script id="videonode" src="../../js/webVideoCtrl1.js"></script>
+<script src="../../board/monitoring1.js"></script>
 </body>
 </html>