Merge pull request #294 from lawrencehj/wvp-28181-2.0

648540858

2021-12-30 e53ce59166b38880db2762293cca06011b1f66a3

 web_src/src/components/PushVideoList.vue

@@ -15,9 +15,9 @@
               </el-table-column>
               <el-table-column prop="stream" label="流ID" width="240" align="center">
               </el-table-column>
               <el-table-column prop="totalReaderCount" label="在线人数" width="240" align="center">
               </el-table-column>
               <el-table-column prop="gbId" label="国标编码" width="150" align="center">
               </el-table-column>
               <el-table-column prop="mediaServerId" label="流媒体" width="150" align="center">
               </el-table-column>
               <el-table-column label="开始时间" align="center" >
                  <template slot-scope="scope">
@@ -28,15 +28,15 @@
               </el-table-column>
               <el-table-column label="正在推流" align="center" >
                  <template slot-scope="scope">
                     {{!!scope.row.status?'是':'否'}}
                     {{(scope.row.status == false && scope.row.gbId == null) || scope.row.status ?'是':'否'}}
                  </template>
               </el-table-column>
					

               <el-table-column label="操作" width="360" align="center" fixed="right">
                  <template slot-scope="scope">
                     <el-button-group>
                        <el-button size="mini" icon="el-icon-video-play" @click="playPuhsh(scope.row)">播放</el-button>
                        <el-button size="mini" icon="el-icon-switch-button" type="danger" v-if="!!scope.row.streamId" @click="stopPuhsh(scope.row)">停止</el-button>
                        <el-button size="mini" icon="el-icon-video-play" v-if="(scope.row.status == false && scope.row.gbId == null) || 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>
@@ -109,65 +109,80 @@
         getPushList: function() {
            let that = this;
            this.getDeviceListLoading = true;
            this.$axios.get(`/api/push/list`,{
            this.$axios({
               method: 'get',
               url:`/api/push/list`,
               params: {
                  page: that.currentPage,
                  count: that.count
               }
            } )
            .then(function (res) {
            }).then(function (res) {
               console.log(res);
               console.log(res.data.list);
               that.total = res.data.total;
               that.pushList = res.data.list;
               that.getDeviceListLoading = false;
            })
            .catch(function (error) {
            }).catch(function (error) {
               console.log(error);
               that.getDeviceListLoading = false;
            });
         },
			

         playPuhsh: function(row){
            let that = this;
            this.getListLoading = true;
            this.$axios.get(`/api/media/getStreamInfoByAppAndStream`,{
            this.$axios({
               method: 'get',
               url: '/api/media/stream_info_by_app_and_stream',
               params: {
                  app: row.app,
                  stream: row.stream
                  stream: row.stream,
            mediaServerId: row.mediaServerId
               }
            })
            .then(function (res) {
            }).then(function (res) {
               that.getListLoading = false;
               that.$refs.devicePlayer.openDialog("streamPlay", null, null, {
                        streamInfo: res.data,
                        streamInfo: res.data.data,
                        hasAudio: true
                    });
            })
            .catch(function (error) {
            }).catch(function (error) {
               console.log(error);
               that.getListLoading = false;
            });
         },
         stopPuhsh: function(row){
            console.log(row)
        var that = this;
        that.$axios({
          method:"post",
          url:"/api/push/stop",
          params: {
            app: row.app,
            streamId: row.stream
          }
        }).then((res)=>{
          if (res.data == "success") {
            that.initData()
          }
        }).catch(function (error) {
          console.log(error);
        });
         },
         addToGB: function(row){
            this.$refs.addStreamTOGB.openDialog({app: row.app, stream: row.stream}, this.initData);
            this.$refs.addStreamTOGB.openDialog({app: row.app, stream: row.stream, mediaServerId: row.mediaServerId}, this.initData);
         },
         removeFromGB: function(row){
            var that = this;
            that.$axios.post(`/api/push/removeFormGB`, row)
               .then(function (res) {
                  console.log(res);
                  console.log(res.data == "success");
                  if (res.data == "success") {
            that.$axios({
            method:"delete",
            url:"/api/push/remove_form_gb",
            data:row
        }).then((res)=>{
            if (res.data == "success") {
                     that.initData()
                  }
               })
               .catch(function (error) {
                  console.log(error);
               });
        }).catch(function (error) {
            console.log(error);
        });
         },
         dateFormat: function(/** timestamp=0 **/) {
            var ts = arguments[0] || 0;