From 828ee2ca38997e90bfceb922aae863f9db7034c5 Mon Sep 17 00:00:00 2001
From: xc <double72cheng@gmail.com>
Date: Thu, 29 Apr 2021 16:52:26 +0800
Subject: [PATCH] 样式
---
src/main/resources/public/js/history/historyComponent.js | 61 ++++++++++++++++--------------
1 files changed, 32 insertions(+), 29 deletions(-)
diff --git a/src/main/resources/public/js/history/historyComponent.js b/src/main/resources/public/js/history/historyComponent.js
index e0a310e..d03ad5a 100755
--- a/src/main/resources/public/js/history/historyComponent.js
+++ b/src/main/resources/public/js/history/historyComponent.js
@@ -36,6 +36,8 @@
callback: function (config) {
console.log(config);
currentTimer = config.time;
+ //刷新精确时间输入框
+ $("#currentTimer").val(undefined);
},
animateCallback: function (config) {
// 假如动画完成之后请求数据需要两秒
@@ -48,30 +50,30 @@
let progressTimelayer = window.progressTime;
- let beginDateStr=new Date(formatDate(new Date(new Date().getTime() - dayTimestamp * 1), "YYYY/MM/DD 00:00:00"));
- let endDateStr= new Date(formatDate(new Date(), "YYYY/MM/DD 00:00:00"));
+ let beginDateStr = new Date(formatDate(new Date(new Date().getTime() - dayTimestamp * 1), "YYYY/MM/DD 00:00:00"));
+ let endDateStr = new Date(formatDate(new Date(), "YYYY/MM/DD 00:00:00"));
//创建精确时间选择器
- jeDate("#currentTimer",{
- festival:false, //是否显示农历节日
- minDate:"1900-01-01", //最小日期
- maxDate:"2099-12-31", //最大日期
- method:{
- choose:function (params) {
+ jeDate("#currentTimer", {
+ festival: false, //是否显示农历节日
+ minDate: "1900-01-01", //最小日期
+ maxDate: "2099-12-31", //最大日期
+ method: {
+ choose: function (params) {
}
},
- donefun:function(obj) {
- currentTimer=obj.val;
- let flag = compareTime(beginDateStr,endDateStr,currentTimer);
+ donefun: function (obj) {
+ currentTimer = obj.val;
+ let flag = compareTime(beginDateStr, endDateStr, currentTimer);
if (flag) {
//只有在指定时间才刷新指针位置
progressTimelayer.setTime({
- time:currentTimer,//指针显示时间
- timer:currentTimer,//指针位置计算时间
- originalEvent:{
- layerX:undefined,
+ time: currentTimer,//指针显示时间
+ timer: currentTimer,//指针位置计算时间
+ originalEvent: {
+ layerX: undefined,
},
- type:"",
+ type: "",
});
progressTimelayer.resize();
}
@@ -80,28 +82,29 @@
});
//判断时间是否属于区间内
- function compareTime(begin,end,timer){
+ function compareTime(begin, end, timer) {
var date1 = Date.parse(new Date(begin));
var date2 = Date.parse(new Date(end));
var time = Date.parse(new Date(timer));
- if (date1<time&&date2>time) {
+ if (date1 < time && date2 > time) {
return true;
- };
+ }
+ ;
return false;
}
//播放
$(".progressTime-left-b-start").on("click", function () {
- if (opt.rtspUrl){
+ if (opt.rtspUrl) {
let rtspUrl = opt.rtspUrl;
- historyComponent.playVideoRTSP(rtspUrl,currentTimer,function (result) {
+ historyComponent.playVideoRTSP(rtspUrl, currentTimer, function (result) {
h5lc.play(result.jessicaURL)
- stream_path=result.streamPath;
+ stream_path = result.streamPath;
});
- }else {
- historyComponent.playVideo(cameraId,currentTimer,function (result) {
+ } else {
+ historyComponent.playVideo(cameraId, currentTimer, function (result) {
h5lc.play(result.jessicaURL)
- stream_path=result.streamPath;
+ stream_path = result.streamPath;
});
}
});
@@ -130,10 +133,10 @@
}
//播放 - 针对摄像头id
- HistoryComponent.prototype.playVideo = function (video_id,starttime, callback) {
+ HistoryComponent.prototype.playVideo = function (video_id, starttime, callback) {
$.ajax({
type: "get",
- url: "../../monica/history?param=" + video_id+ "&startTime=" + starttime+"&endTime=",
+ url: "../../monica/history?param=" + video_id + "&startTime=" + starttime + "&endTime=",
timeout: 5000,
async: false,
success: function (result) {
@@ -142,10 +145,10 @@
});
};
//播放 - 针对rtsp
- HistoryComponent.prototype.playVideoRTSP = function (rtspURL,starttime, callback) {
+ HistoryComponent.prototype.playVideoRTSP = function (rtspURL, starttime, callback) {
$.ajax({
type: "get",
- url: "../../monica/rtsp/history?param=" + rtspURL+ "&startTime=" + starttime+"&endTime=",
+ url: "../../monica/rtsp/history?param=" + rtspURL + "&startTime=" + starttime + "&endTime=",
timeout: 5000,
async: false,
success: function (result) {
--
Gitblit v1.9.1