From 6f09936092d5b567cd5a04e18a2fdfa195b1f2bb Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期六, 06 五月 2023 17:05:03 +0800
Subject: [PATCH] 优化

---
 ard-work/target/classes/templates/test.html |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ard-work/target/classes/templates/test.html b/ard-work/target/classes/templates/test.html
index f9c520f..e315584 100644
--- a/ard-work/target/classes/templates/test.html
+++ b/ard-work/target/classes/templates/test.html
@@ -130,11 +130,11 @@
                 for (var i = 0; i < arr.length; i++) {
                     console.log(arr[i].id);
                     var camera = {
-                        type: arr[i].type,
+                        type: arr[i].gdtype,
                         ipaddr: arr[i].ip,
                         username: arr[i].username,
                         password: arr[i].password,
-                        port: 554
+                        port: arr[i].rtspPort
                     };
                     cameraMap.set(arr[i].id, camera);
                     //鍏堝垱寤哄ソselect閲岄潰鐨刼ption鍏冪礌
@@ -146,6 +146,7 @@
                 }
             }
         })
+
         opt = {"username": "admin", "password": "admin123"};
         $.ajax({
             headers: {
@@ -699,6 +700,7 @@
             })
         }
     })
+
     var cameraMap = new Map();
 
     /*浜戝彴鍏叡鏂规硶*/
@@ -737,11 +739,10 @@
             } else if (camera.type == "dh") {
                 realViewDh("127.0.0.1", ID, camera.username, camera.password, camera.ipaddr, camera.port);
             } else {
-                realViewHik("192.168.1.15", ID, camera.username, camera.password, camera.ipaddr, "21500");
+                realViewHik("192.168.1.15", ID, camera.username, camera.password, camera.ipaddr,  camera.port);
             }
         }
     });
-
 
     //棰勮娴峰悍鐩告満
     function realViewHik(serverip, elem, username, password, ipaddr, port) {

--
Gitblit v1.9.3