Merge branch 'wvp-28181-2.0'

648540858

2022-11-23 12fa3b4c8da2af13a710400d64c9fe6d5d6b1e5e

 web_src/src/components/CloudRecordDetail.vue

@@ -1,7 +1,9 @@
<template>
   <div id="recordDetail">
      <el-container>

      <el-aside width="300px">

        <div class="record-list-box-box">
          <el-date-picker size="mini" v-model="chooseDate" :picker-options="pickerOptions" type="date" value-format="yyyy-MM-dd" placeholder="日期" @change="dateChange()"></el-date-picker>
          <div class="record-list-box" :style="recordListStyle">
@@ -15,7 +17,7 @@
                  <i class="el-icon-video-camera"  ></i>
                  {{ item.substring(0,17)}}
                </el-tag>
                <a class="el-icon-download" style="color: #409EFF;font-weight: 600;margin-left: 10px;" :href="`${basePath}/${mediaServerId}/record/${recordFile.app}/${recordFile.stream}/${chooseDate}/${item}`" download />
                <a class="el-icon-download" style="color: #409EFF;font-weight: 600;margin-left: 10px;" :href="`${basePath}/download.html?url=record/${recordFile.app}/${recordFile.stream}/${chooseDate}/${item}`" target="_blank" />
              </li>
            </ul>
          </div>
@@ -75,7 +77,7 @@
              <li class="task-list-item" v-for="item in taskListEnded">
                <div class="task-list-item-box" style="height: 2rem;line-height: 2rem;">
                  <span>{{ item.startTime.substr(10) }}-{{item.endTime.substr(10)}}</span>
                  <a class="el-icon-download download-btn" :href="basePath + '/' + item.recordFile" download >
                  <a class="el-icon-download download-btn" :href="basePath  + '/download.html?url=../' + item.recordFile" target="_blank">
                  </a>
                </div>
              </li>
@@ -103,7 +105,7 @@

<script>
  // TODO 根据查询的时间列表设置滑轨的最大值与最小值，
   import uiHeader from './UiHeader.vue'
   import uiHeader from '../layout/UiHeader.vue'
   import player from './dialog/easyPlayer.vue'
  import moment  from 'moment'
   export default {
@@ -111,10 +113,10 @@
      components: {
         uiHeader, player
      },
    props: ['recordFile', 'mediaServerId', 'dateFiles'],
    props: ['recordFile', 'mediaServerId', 'dateFiles', 'mediaServerPath'],
      data() {
         return {
        basePath: process.env.NODE_ENV === 'development'?`${location.origin}/debug/zlm/${this.mediaServerId}`:`${location.origin}/zlm/${this.mediaServerId}`,
        basePath: `${this.mediaServerPath}`,
           dateFilesObj: [],
           detailFiles: [],
        chooseDate: null,
@@ -249,8 +251,10 @@
            count: that.count
          }
        }).then(function (res) {
          that.total = res.data.data.total;
          that.detailFiles = that.detailFiles.concat(res.data.data.list);
          if (res.data.code === 0) {
            that.total = res.data.data.total;
            that.detailFiles = that.detailFiles.concat(res.data.data.list);
          }
          that.loading = false;
          if (callback) callback();
        }).catch(function (error) {
@@ -264,7 +268,7 @@
          this.videoUrl = "";
        }else {
             // TODO 控制列表滚动条
          this.videoUrl = `${this.basePath}/${this.mediaServerId}/record/${this.recordFile.app}/${this.recordFile.stream}/${this.chooseDate}/${this.choosedFile}`
          this.videoUrl = `${this.basePath}/record/${this.recordFile.app}/${this.recordFile.stream}/${this.chooseDate}/${this.choosedFile}`
          console.log(this.videoUrl)
        }

@@ -319,7 +323,7 @@
            count: that.count
          }
        }).then(function (res) {
          if (res.data.code == 0) {
          if (res.data.code === 0) {
            that.total = res.data.data.total;
            that.recordList = res.data.data.list;
          }
@@ -389,7 +393,7 @@
            endTime: moment(this.taskTimeRange[1]).format('YYYY-MM-DD HH:mm:ss'),
          }
        }).then(function (res) {
          if (res.data.code === 0 && res.data.msg === "success") {
          if (res.data.code === 0 ) {
            that.showTaskBox = false
            that.getTaskList(false);
          }else {
@@ -411,7 +415,7 @@
            isEnd: isEnd,
          }
        }).then(function (res) {
          if (res.data.code == 0) {
          if (res.data.code === 0) {
            if (isEnd){
              that.taskListEnded = res.data.data;
            }else {
@@ -421,6 +425,9 @@
        }).catch(function (error) {
          console.log(error);
        });
      },
      goBack(){
        this.$router.push('/cloudRecord');
      }
      }
   };