From e42d5134188b4e93ebb0580ef60034976c987f0f Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 05 九月 2023 10:56:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/resources/templates/test.html | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ard-work/src/main/resources/templates/test.html b/ard-work/src/main/resources/templates/test.html
index bc58555..3c125fa 100644
--- a/ard-work/src/main/resources/templates/test.html
+++ b/ard-work/src/main/resources/templates/test.html
@@ -130,8 +130,9 @@
</div>
</div>
</div>
-<script th:inline="javascript">
- var cameraId, opt, token;
+<script th:inline="javascript" th:type="module">
+
+ var cameraId, opt, optOpen, optClose, token;
window.onload = function () {
$.ajax({
url: "../hik/list",
@@ -161,7 +162,6 @@
}
}
})
-
opt = {"username": "admin", "password": "admin123"};
$.ajax({
headers: {
@@ -782,7 +782,7 @@
} 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, camera.port);
+ realViewHik("127.0.0.1", ID, camera.username, camera.password, camera.ipaddr, camera.port);
}
}
});
--
Gitblit v1.9.3