diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index caf4dfcd..ef46c2ad 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,3 +1,3 @@
spring:
profiles:
- active: dev
\ No newline at end of file
+ active: local
\ No newline at end of file
diff --git a/web_src/src/components/gb28181/devicePlayer.vue b/web_src/src/components/gb28181/devicePlayer.vue
index ed8464af..ef82ae87 100644
--- a/web_src/src/components/gb28181/devicePlayer.vue
+++ b/web_src/src/components/gb28181/devicePlayer.vue
@@ -64,9 +64,13 @@
-
-
+
+
+
+
+
+
预置位编号
@@ -167,6 +171,7 @@ export default {
loadingRecords: false,
recordsLoading: false,
isLoging: false,
+ controSpeed: 30,
timeVal: 0,
timeMin: 0,
timeMax: 1440,
@@ -399,7 +404,7 @@ export default {
method: 'post',
// url: '/api/ptz/' + this.deviceId + '/' + this.channelId + '?leftRight=' + leftRight + '&upDown=' + upDown +
// '&inOut=' + zoom + '&moveSpeed=50&zoomSpeed=50'
- url: '/api/ptz/' + this.deviceId + '/' + this.channelId + '?cmdCode=' + (zoom * 16 + upDown * 4 + leftRight) + '&horizonSpeed=30&verticalSpeed=30&zoomSpeed=' + (2 * 16)
+ url: '/api/ptz/' + this.deviceId + '/' + this.channelId + '?cmdCode=' + (zoom * 16 + upDown * 4 + leftRight) + '&horizonSpeed=' + this.controSpeed + '&verticalSpeed=' + this.controSpeed + '&zoomSpeed=' + this.controSpeed
}).then(function (res) {});
},
//////////////////////播放器事件处理//////////////////////////
@@ -490,7 +495,7 @@ export default {
max-width: 6.25rem;
max-height: 6.25rem;
border-radius: 100%;
- margin-top: 2.5rem;
+ margin-top: 1.5rem;
margin-left: 0.5rem;
float: left;
}
@@ -514,6 +519,9 @@ export default {
box-sizing: border-box;
transition: all 0.3s linear;
}
+.control-btn:hover {
+ cursor:pointer
+}
.control-btn i {
font-size: 20px;
@@ -522,6 +530,12 @@ export default {
justify-content: center;
align-items: center;
}
+.control-btn i:hover {
+ cursor:pointer
+}
+.control-zoom-btn:hover {
+ cursor:pointer
+}
.control-round {
position: absolute;