Merge branch 'wvp-28181-2.0' into fix-269

648540858

2023-02-01 2b1f7a47394363e95deb4dfa0f1c67d41e747f7f

 web_src/src/components/PushVideoList.vue

@@ -1,45 +1,94 @@
<template>
   <div id="pushVideoList">
      <el-container>
         <el-header>
            <uiHeader></uiHeader>
         </el-header>
         <el-main>
            <div style="background-color: #FFFFFF; margin-bottom: 1rem; position: relative; padding: 0.5rem; text-align: left;">
               <span style="font-size: 1rem; font-weight: bold;">推流列表</span>
  <div id="pushVideoList" style="width: 100%">
    <div class="page-header">
      <div class="page-title">推流列表</div>
      <div class="page-header-btn">
        搜索:
        <el-input @input="getPushList" style="margin-right: 1rem; width: auto;" size="mini" placeholder="关键字"
                  prefix-icon="el-icon-search" v-model="searchSrt" clearable></el-input>
        流媒体:
        <el-select size="mini" @change="getPushList" style="margin-right: 1rem;" v-model="mediaServerId"
                   placeholder="请选择" default-first-option>
          <el-option label="全部" value=""></el-option>
          <el-option
            v-for="item in mediaServerList"
            :key="item.id"
            :label="item.id"
            :value="item.id">
          </el-option>
        </el-select>
        推流状态:
        <el-select size="mini" style="margin-right: 1rem;" @change="getPushList" v-model="pushing" placeholder="请选择"
                   default-first-option>
          <el-option label="全部" value=""></el-option>
          <el-option label="推流进行中" value="true"></el-option>
          <el-option label="推流未进行" value="false"></el-option>
        </el-select>
        <el-button icon="el-icon-upload2" size="mini" style="margin-right: 1rem;" type="primary" @click="importChannel">
          通道导入
        </el-button>
        <el-button icon="el-icon-download" size="mini" style="margin-right: 1rem;" type="primary">
          <a style="color: #FFFFFF; text-align: center; text-decoration: none" href="/static/file/推流通道导入.zip"
             download='推流通道导入.zip'>下载模板</a>
        </el-button>
        <el-button icon="el-icon-delete" size="mini" style="margin-right: 1rem;"
                   :disabled="multipleSelection.length === 0" type="danger" @click="batchDel">批量移除
        </el-button>
        <el-button icon="el-icon-plus" size="mini" style="margin-right: 1rem;" type="primary" @click="addStream">添加通道
        </el-button>
        <el-button icon="el-icon-refresh-right" circle size="mini" @click="refresh()"></el-button>
      </div>
            </div>
            <devicePlayer ref="devicePlayer"></devicePlayer>
            <addStreamTOGB ref="addStreamTOGB"></addStreamTOGB>
            <el-table :data="pushList" border style="width: 100%" :height="winHeight">
               <el-table-column prop="app" label="APP" width="180" align="center">
    <el-table ref="pushListTable" :data="pushList" style="width: 100%" :height="winHeight"
              @selection-change="handleSelectionChange" :row-key="(row)=> row.app + row.stream">
      <el-table-column  type="selection" :reserve-selection="true" min-width="55">
               </el-table-column>
               <el-table-column prop="stream" label="流ID" width="240" align="center">
      <el-table-column prop="name" label="名称" min-width="200">
               </el-table-column>
               <el-table-column prop="gbId" label="国标编码" width="150" align="center">
      <el-table-column prop="app" label="APP" min-width="200">
               </el-table-column>
               <el-table-column prop="mediaServerId" label="流媒体" width="150" align="center">
      <el-table-column prop="stream" label="流ID" min-width="200">
               </el-table-column>
               <el-table-column label="开始时间" align="center" >
      <el-table-column prop="gbId" label="国标编码" min-width="200" >
      </el-table-column>
      <el-table-column prop="mediaServerId" label="流媒体" min-width="200" >
      </el-table-column>
      <el-table-column label="开始时间"  min-width="200">
                  <template slot-scope="scope">
                     <el-button-group>
                        {{dateFormat(parseInt(scope.row.createStamp))}}
            {{ scope.row.pushTime == null? "-":scope.row.pushTime }}
                     </el-button-group>
                     </template>
               </el-table-column>
               <el-table-column label="正在推流" align="center" >
      <el-table-column label="正在推流"  min-width="100">
                  <template slot-scope="scope">
                     {{(scope.row.status == false && scope.row.gbId == null) || scope.row.status ?'是':'否'}}
          {{scope.row.pushIng ? '是' : '否' }}
        </template>
      </el-table-column>
      <el-table-column label="本平台推流"  min-width="100">
        <template slot-scope="scope">
          {{scope.row.pushIng && !!scope.row.self ? '是' : '否' }}
                  </template>
               </el-table-column>

               <el-table-column label="操作" width="360" align="center" fixed="right">
      <el-table-column label="操作" min-width="360"  fixed="right">
                  <template slot-scope="scope">
                     <el-button-group>
                        <el-button size="mini" icon="el-icon-video-play" v-if="scope.row.status" @click="playPuhsh(scope.row)">播放</el-button>
                        <el-button size="mini" icon="el-icon-switch-button" type="danger" @click="stopPuhsh(scope.row)">移除</el-button>
                        <el-button size="mini" icon="el-icon-position" type="primary" v-if="!!!scope.row.gbId" @click="addToGB(scope.row)">加入国标</el-button>
                        <el-button size="mini" icon="el-icon-position" type="primary" v-if="!!scope.row.gbId" @click="removeFromGB(scope.row)">移出国标</el-button>
                     </el-button-group>
          <el-button size="medium" icon="el-icon-video-play"
                     v-if="scope.row.pushIng === true"
                     @click="playPush(scope.row)" type="text">播放
          </el-button>
          <el-divider direction="vertical"></el-divider>
          <el-button size="medium" icon="el-icon-delete" type="text" @click="stopPush(scope.row)" style="color: #f56c6c" >移除</el-button>
          <el-divider direction="vertical"></el-divider>
          <el-button size="medium" icon="el-icon-position" type="text" v-if="!!!scope.row.gbId"
                     @click="addToGB(scope.row)">加入国标
          </el-button>
          <el-divider v-if="!!!scope.row.gbId" direction="vertical"></el-divider>
          <el-button size="medium" icon="el-icon-position" type="text" v-if="!!scope.row.gbId"
                     @click="removeFromGB(scope.row)">移出国标
          </el-button>
                     </template>
               </el-table-column>
            </el-table>
@@ -54,23 +103,26 @@
               :total="total">
            </el-pagination>
         <streamProxyEdit ref="streamProxyEdit" ></streamProxyEdit>
         </el-main>
      </el-container>
    <importChannel ref="importChannel"></importChannel>
   </div>
</template>

<script>
   import streamProxyEdit from './dialog/StreamProxyEdit.vue'
   import devicePlayer from './dialog/devicePlayer.vue'
   import addStreamTOGB from './dialog/addStreamTOGB.vue'
   import uiHeader from './UiHeader.vue'
import addStreamTOGB from './dialog/pushStreamEdit.vue'
import uiHeader from '../layout/UiHeader.vue'
import importChannel from './dialog/importChannel.vue'
import MediaServer from './service/MediaServer'

   export default {
      name: 'pushVideoList',
      components: {
         devicePlayer,
         addStreamTOGB,
         streamProxyEdit,
         uiHeader
    uiHeader,
    importChannel,
      },
      data() {
         return {
@@ -78,24 +130,32 @@
            currentPusher: {}, //当前操作设备对象
            updateLooper: 0, //数据刷新轮训标志
            currentDeviceChannelsLenth:0,
            winHeight: window.innerHeight - 200,
      winHeight: window.innerHeight - 250,
      mediaServerObj: new MediaServer(),
            currentPage:1,
            count:15,
            total:0,
      searchSrt: "",
      pushing: "",
      mediaServerId: "",
      mediaServerList: [],
      multipleSelection: [],
            getDeviceListLoading: false
         };
      },
      computed: {
      },
  computed: {},
      mounted() {
         this.initData();
         this.updateLooper = setInterval(this.initData, 2000);
    this.updateLooper = setInterval(this.getPushList, 2000);
      },
      destroyed() {
         clearTimeout(this.updateLooper);
      },
      methods: {
         initData: function() {
      this.mediaServerObj.getOnlineMediaServerList((data) => {
        this.mediaServerList = data.data;
      })
            this.getPushList();
         },
         currentChange: function(val){
@@ -114,26 +174,30 @@
               url:`/api/push/list`,
               params: {
                  page: that.currentPage,
                  count: that.count
          count: that.count,
          query: that.searchSrt,
          pushing: that.pushing,
          mediaServerId: that.mediaServerId,
               }
            }).then(function (res) {
               console.log(res);
               console.log(res.data.list);
               that.total = res.data.total;
               that.pushList = res.data.list;
          if (res.data.code === 0) {
            that.total = res.data.data.total;
            that.pushList = res.data.data.list;
          }

               that.getDeviceListLoading = false;
            }).catch(function (error) {
               console.log(error);
        console.error(error);
               that.getDeviceListLoading = false;
            });
         },

         playPuhsh: function(row){
    playPush: function (row) {
            let that = this;
            this.getListLoading = true;
            this.$axios({
               method: 'get',
               url: '/api/media/stream_info_by_app_and_stream',
        url: '/api/push/getPlayUrl',
               params: {
                  app: row.app,
                  stream: row.stream,
@@ -141,17 +205,22 @@
               }
            }).then(function (res) {
               that.getListLoading = false;
        if (res.data.code === 0 ) {
               that.$refs.devicePlayer.openDialog("streamPlay", null, null, {
                        streamInfo: res.data.data,
                        hasAudio: true
                    });
        }else {
          that.$message.error(res.data.msg);
        }

            }).catch(function (error) {
               console.log(error);
        console.error(error);
               that.getListLoading = false;
            });
         },
         stopPuhsh: function(row){
        var that = this;
    stopPush: function (row) {
      let that = this;
        that.$axios({
          method:"post",
          url:"/api/push/stop",
@@ -160,44 +229,71 @@
            streamId: row.stream
          }
        }).then((res)=>{
          if (res.data == "success") {
        if (res.data.code === 0) {
            that.initData()
          }
        }).catch(function (error) {
          console.log(error);
        console.error(error);
        });
         },
         addToGB: function(row){
            this.$refs.addStreamTOGB.openDialog({app: row.app, stream: row.stream, mediaServerId: row.mediaServerId}, this.initData);
      this.$refs.addStreamTOGB.openDialog({
        app: row.app,
        stream: row.stream,
        mediaServerId: row.mediaServerId
      }, this.initData);
         },
         removeFromGB: function(row){
            var that = this;
      let that = this;
            that.$axios({
            method:"delete",
            url:"/api/push/remove_form_gb",
            data:row
        }).then((res)=>{
            if (res.data == "success") {
        if (res.data.code === 0) {
                     that.initData()
                  }
        }).catch(function (error) {
            console.log(error);
        console.error(error);
        });
         },
         dateFormat: function(/** timestamp=0 **/) {
            var ts = arguments[0] || 0;
            var t,y,m,d,h,i,s;
            t = ts ? new Date(ts*1000) : new Date();
            y = t.getFullYear();
            m = t.getMonth()+1;
            d = t.getDate();
            h = t.getHours();
            i = t.getMinutes();
            s = t.getSeconds();
            // 可根据需要在这里定义时间格式
            return y+'-'+(m<10?'0'+m:m)+'-'+(d<10?'0'+d:d)+' '+(h<10?'0'+h:h)+':'+(i<10?'0'+i:i)+':'+(s<10?'0'+s:s);
         }
    importChannel: function () {
      this.$refs.importChannel.openDialog(() => {

      })
    },
    addStream: function (){
      this.$refs.addStreamTOGB.openDialog(null, this.initData);
    },
    batchDel: function () {
      this.$confirm(`确定删除选中的${this.multipleSelection.length}个通道?`, '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning'
      }).then(() => {
        let that = this;
        that.$axios({
          method: "delete",
          url: "/api/push/batchStop",
          data: {
            gbStreams: this.multipleSelection
          }
        }).then((res) => {
          this.initData();
          this.$refs.pushListTable.clearSelection();
        }).catch(function (error) {
          console.error(error);
        });
      }).catch(() => {

      });
    },
    handleSelectionChange: function (val) {
      this.multipleSelection = val;
    },
    refresh: function () {
      this.initData();
    },
      }
   };
</script>