소스 검색

更改监控h5页面

huangyan 1 개월 전
부모
커밋
7161475596
4개의 변경된 파일18개의 추가작업 그리고 17개의 파일을 삭제
  1. 3 2
      internal/handler/hikvision.go
  2. 2 2
      internal/server/http.go
  3. 13 13
      templates/h5player.html
  4. 0 0
      templates/static/h5player.min.js

+ 3 - 2
internal/handler/hikvision.go

@@ -295,8 +295,9 @@ func (h *HikvisionHandler) GetHikvisionMonitoring(ctx *gin.Context) {
 		return
 	}
 	ctx.HTML(http.StatusOK, "h5player.html", gin.H{
-		"title":   "测试",
-		"message": "ws://127.0.0.1/" + cameraIndexCode,
+		"title":           "测试",
+		"wsurl":           "ws://127.0.0.1/" + cameraIndexCode,
+		"cameraIndexCode": cameraIndexCode,
 	})
 	//fmt.Println("cameraIndexCode", h.conf.GetString("hikvision.api.previewURLs"))
 	//hikvision, err := h.hikvisionService.Hikvision(h.conf.GetString("hikvision.api.previewURLs"), m, 15)

+ 2 - 2
internal/server/http.go

@@ -24,11 +24,11 @@ func NewServerHTTP(
 ) *gin.Engine {
 	gin.SetMode(gin.ReleaseMode)
 	r := gin.Default()
-	r.LoadHTMLGlob("templates/*")
-	r.LoadHTMLFiles("templates/*")
 	r.Use(
 		middleware.CORSMiddleware(),
 	)
+	r.LoadHTMLGlob("templates/h5player.html")
+	r.Static("/static", "./templates/static")
 
 	//出入口控制系统
 	Access := r.Group("/Access")

+ 13 - 13
templates/h5player.html

@@ -5,7 +5,7 @@
 		<meta http-equiv="X-UA-Compatible" content="IE=edge">
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
 		<title>H5playerVue</title>
-		<link rel="stylesheet" href="static/css/antd.min.css">
+		<link rel="stylesheet" href="/static/css/antd.min.css">
 		<style>
 			body {
 				padding: 0px;
@@ -276,24 +276,24 @@
 		</template>
 
 		<!-- 移动端调试 -->
-		<script src="static/js/vconsole.min.js"></script>
+		<script src="/static/js/vconsole.min.js"></script>
 		<!-- <script>
       if (IS_MOVE_DEVICE) {
         const vc = new VConsole()
       }
   </script> -->
 
-		<script src="static/js/moment.js"></script>
-		<script src="static/js/vue.js"></script>
-		<script src="static/js/antd.min.js"></script>
-		<script src="static/js/antd-with-locales.min.js"></script>
-		<script src="h5player.min.js"></script>
+		<script src="/static/js/moment.js"></script>
+		<script src="/static/js/vue.js"></script>
+		<script src="/static/js/antd.min.js"></script>
+		<script src="/static/js/antd-with-locales.min.js"></script>
+		<script src="/static/h5player.min.js"></script>
 		<script>
 			const {
 				LocaleProvider,
 				locales
 			} = window.antd
-			moment.locale('./static/js/zh-cn.js')
+			moment.locale('/static/js/zh-cn.js')
 
 			const IS_MOVE_DEVICE = document.body.clientWidth < 992 // 是否移动设备
 			const MSE_IS_SUPPORT = !!window.MediaSource // 是否支持mse
@@ -326,9 +326,9 @@
 						},
 						urls: {
 
-							realplay: {{.message}},
-							talk: {{.message}},
-							playback: {{.message}},
+							realplay: {{.wsurl}},
+							talk: {{.wsurl}},
+							playback: {{.wsurl}},
 						},
 						playback: {
 							startTime: '2023-08-16T00:00:00',
@@ -428,9 +428,9 @@
 					},
 					// 发送云台控制
 					sendControl(value) {
-						let cameraIndexCode = '231797cce4744f7a8335e25c1e628daa'
+						let cameraIndexCode = {{.cameraIndexCode}}
 						const url =
-							'http:/182.43.247.65:8000/Hikvision/controlling?cameraIndexCode=' + cameraIndexCode +
+							'./controlling?cameraIndexCode=' + cameraIndexCode +
 							'&action=' + value.action + '&command=' + value.command;
 						// 使用fetch发送GET请求
 						fetch(url)

+ 0 - 0
templates/h5player.min.js → templates/static/h5player.min.js