修改看板

1 year ago · c293228f8a
parent 4b8ef1cdc3
commit c293228f8a
7 changed files with 2036 additions and 64 deletions
--- a/haiwei-admin/src/main/java/com/haiwei/web/controller/broad/Monitoring.java
+++ b/haiwei-admin/src/main/java/com/haiwei/web/controller/broad/Monitoring.java
@ -0,0 +1,16 @@
+package com.haiwei.web.controller.broad;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * @author wanghao
+ * @date 2023/8/14  10:18
+ */
+@Controller
+@RequestMapping("/board/monitoring")
+public class Monitoring {
+
+    private String prefix = "monitoring";
+
+}
--- a/haiwei-admin/src/main/resources/static/board/board.css
+++ b/haiwei-admin/src/main/resources/static/board/board.css
@ -256,3 +256,7 @@ body {
    width: 92%;
    height: 90%;
 }
+.plugin{
+    width: 100%;
+    height: 100%;
+}
--- a/haiwei-admin/src/main/resources/static/board/board.js
+++ b/haiwei-admin/src/main/resources/static/board/board.js
@ -1,29 +1,8 @@
-$(() => {
-
-  // 初始化插件参数及插入插件
-  WebVideoCtrl.I_InitPlugin({
-    bWndFull: true,     //是否支持单窗口双击全屏，默认支持 true:支持 false:不支持
-    iWndowType: 1,
-    cbSelWnd: function (xmlDoc) {
-      g_iWndIndex = parseInt($(xmlDoc).find("SelectWnd").eq(0).text(), 10);
-      var szInfo = "当前选择的窗口编号：" + g_iWndIndex;
-    },
-    cbInitPluginComplete: function () {
-      WebVideoCtrl.I_InsertOBJECTPlugin("divPlugin").then(() => {
-        // 检查插件是否最新
-        WebVideoCtrl.I_CheckPluginVersion().then((bFlag) => {
-          if (bFlag) {
-            alert("检测到新的插件版本，双击开发包目录里的HCWebSDKPlugin.exe升级！");
-          }
-        });
-      }, () => {
-        alert("插件初始化失败，请确认是否已安装插件；如果未安装，请双击开发包目录里的HCWebSDKPlugin.exe安装！");
-      });
-    }
-  });

+$(() => {
  tableAnimation('#chart2')

+
  $.get(ctx + 'broad/home/queryParam', {}, (e) => {
    let arr = [
      {
@ -95,45 +74,6 @@ $(() => {
  })
 })

-function clickLogin() {
-  var szIP = '192.168.0.64',
-    szPort = '80',
-    szUsername = 'admin',
-    szPassword = 'dlts84288437';
-
-  WebVideoCtrl.I_Login(szIP, 1, szPort, szUsername, szPassword, {
-    timeout: 3000,
-    success: function (xmlDoc) {
-      setTimeout(function () {
-        clickStartRealPlay()
-      }, 10);
-    },
-    error: function (oError) {
-    }
-  });
-}
-
-function clickStartRealPlay() {
-  var oWndInfo = WebVideoCtrl.I_GetWindowStatus(0),
-    szDeviceIdentify = '192.168.0.64_80',
-    iRtspPort = 554,
-    iChannelID = 1,
-    bZeroChannel = false,
-    szInfo = "";
-  let iStreamType = 1
-  var startRealPlay = function () {
-    WebVideoCtrl.I_StartRealPlay(szDeviceIdentify, {
-      iStreamType: iStreamType,
-      iChannelID: iChannelID,
-      bZeroChannel: bZeroChannel,
-      success: function () {
-        szInfo = "开始预览成功！";
-      },
-    });
-  };
-  startRealPlay();
-}
-
 let chart1 = (el, data) => {
  console.log(data)
  let xData = Object.keys(data[0]).filter(e => e !== 'time')
--- a/haiwei-admin/src/main/resources/static/board/monitoring.css
+++ b/haiwei-admin/src/main/resources/static/board/monitoring.css
--- a/haiwei-admin/src/main/resources/static/board/monitoring.js
+++ b/haiwei-admin/src/main/resources/static/board/monitoring.js
--- a/haiwei-admin/src/main/resources/templates/board/board1.html
+++ b/haiwei-admin/src/main/resources/templates/board/board1.html
@ -38,7 +38,7 @@
      backgroundImage: status[`bottomBtn${e}S`] ? 'url("../../board/img/btn1bg.png")' : 'url("../../board/img/btnbg.png")'
    })
    if (e === 3) {
-      clickLogin()
+      // clickStopRealPlay()
    }
  }
  const toggleInfo = () => {
@ -49,6 +49,9 @@
    })
  }
  const bottomBtnInfo = (e, el) => {
+    if (e === 3) {
+      // clickLogin()
+    }
    $("#modal" + e).toggle()
    switch (e) {
      case 1:
@ -228,7 +231,7 @@
    <div class="shade" onclick="hideModal(3,this)"></div>
    <div class="centerModal">
      <div class="monitoring" id="monitoring">
-        <div class="plugin" id="divPlugin"></div>
+        <iframe src="monitoring" frameborder="0" style="width: 100%;height: 100%"></iframe>
      </div>
    </div>
  </div>
--- a/haiwei-admin/src/main/resources/templates/board/monitoring.html
+++ b/haiwei-admin/src/main/resources/templates/board/monitoring.html
@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
+<head>
+  <th:block th:include="include :: header('设备智能驾驶舱')"/>
+</head>
+<body class="white-bg">
+<link href="../../board/monitoring.css" rel="stylesheet">
+<script src="../../js/echarts.js"></script>
+<script>
+
+  const edit = () => {
+    clickStopRealPlay()
+  }
+  const login = () => {
+    clickLogin()
+  }
+</script>
+<div>
+  <div class="plugin" id="divPlugin"></div>
+</div>
+<th:block th:include="include :: footer"/>
+<script id="videonode" src="../../js/webVideoCtrl.js"></script>
+<script src="../../board/monitoring.js"></script>
+</body>
+</html>