Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial

# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java

web_src/src/components/channelList.vue

@@ -244,7 +244,7 @@ export default {
       });
     },
     queryRecords: function (itemData) {
-      var format = moment().format("YYYY-M-D");
+      var format = moment().format("yyyy-MM-DD");
       let deviceId = this.deviceId;
       let channelId = itemData.channelId;
       this.$refs.devicePlayer.openDialog("record", deviceId, channelId, {date: format})

web_src/src/components/control.vue

@@ -576,7 +576,7 @@ export default {
       let that = this;
       this.$axios({
         method: 'get',
-        url: '/zlm/' + that.mediaServerChoose + '/index/api/kick_session&id=' + id
+        url: '/zlm/' + that.mediaServerChoose + '/index/api/kick_session?id=' + id
       }).then(function (res) {
         that.getAllSession();
         that.$message({

web_src/src/components/dialog/devicePlayer.vue

@@ -453,9 +453,19 @@ export default {
                 method: 'get',
                 url: '/api/gb_record/query/' + this.deviceId + '/' + this.channelId + '?startTime=' + startTime + '&endTime=' + endTime
             }).then(function (res) {
-                // 处理时间信息
-                that.videoHistory.searchHistoryResult = res.data.recordList;
-                that.recordsLoading = false;
+                console.log(res)
+                if(res.data.code === 0) {
+                  // 处理时间信息
+                  that.videoHistory.searchHistoryResult = res.data.data.recordList;
+                  that.recordsLoading = false;
+                }else {
+                  this.$message({
+                    showClose: true,
+                    message: res.data.msg,
+                    type: "error",
+                  });
+                }
+
             }).catch(function (e) {
                 console.log(e.message);
                 // that.videoHistory.searchHistoryResult = falsificationData.recordData;
@@ -671,7 +681,11 @@ export default {
           this.$axios({
             method: 'get',
             url: `/api/playback/seek/${this.streamId }/` + Math.floor(this.seekTime * val / 100000)
-          }).then(function (res) {});
+          }).then( (res)=> {
+            setTimeout(()=>{
+              this.$refs.videoPlayer.play(this.videoUrl)
+            }, 600)
+          });
         }
 
     }

web_src/src/components/dialog/recordDownload.vue

@@ -172,6 +172,7 @@ export default {
               isEnd: true,
             }
           }).then((res) => {
+            console.log(res)
             if (res.data.code == 0) {
                 this.percentage = parseFloat(res.data.data.percentage)*100
                  if (res.data.data[0].percentage === '1') {