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

648540858

2021-12-30 e53ce59166b38880db2762293cca06011b1f66a3

 web_src/src/components/StreamProxyList.vue

@@ -32,7 +32,25 @@
                  </div>
                  </template>
               </el-table-column>
          <el-table-column prop="mediaServerId" label="流媒体" width="150" align="center"></el-table-column>
          <el-table-column label="类型" width="100" align="center">
            <template slot-scope="scope">
              <div slot="reference" class="name-wrapper">
                <el-tag size="medium">{{scope.row.type}}</el-tag>
              </div>
            </template>
          </el-table-column>

               <el-table-column prop="gbId" label="国标编码" width="180" align="center" show-overflow-tooltip/>
          <el-table-column label="启用" width="120" align="center">
            <template slot-scope="scope">
              <div slot="reference" class="name-wrapper">
                <el-tag size="medium" v-if="scope.row.enable">已启用</el-tag>
                <el-tag size="medium" type="info" v-if="!scope.row.enable">未启用</el-tag>
              </div>
            </template>
          </el-table-column>
          <el-table-column prop="createTime" label="创建时间" align="center" width="150" show-overflow-tooltip/>
               <el-table-column label="转HLS" width="120" align="center">
                  <template slot-scope="scope">
                  <div slot="reference" class="name-wrapper">
@@ -49,14 +67,15 @@
                  </div>
                  </template>
               </el-table-column>
               <el-table-column label="启用" width="120" align="center">
               <el-table-column label="无人观看自动删除" width="160" align="center">
                  <template slot-scope="scope">
                  <div slot="reference" class="name-wrapper">
                     <el-tag size="medium" v-if="scope.row.enable">已启用</el-tag>
                     <el-tag size="medium" type="info" v-if="!scope.row.enable">未启用</el-tag>
                     <el-tag size="medium" v-if="scope.row.enable_remove_none_reader">已启用</el-tag>
                     <el-tag size="medium" type="info" v-if="!scope.row.enable_remove_none_reader">未启用</el-tag>
                  </div>
                  </template>
               </el-table-column>


               <el-table-column label="操作" width="360" align="center" fixed="right">
                  <template slot-scope="scope">
@@ -105,7 +124,7 @@
            currentPusher: {}, //当前操作设备对象
            updateLooper: 0, //数据刷新轮训标志
            currentDeviceChannelsLenth:0,
            winHeight: window.innerHeight - 200,
            winHeight: window.innerHeight - 250,
            currentPage:1,
            count:15,
            total:0,
@@ -146,8 +165,6 @@
                  count: that.count
               }
            }).then(function (res) {
               console.log(res);
               console.log(res.data.list);
               that.total = res.data.total;
               that.streamProxyList = res.data.list;
               that.getListLoading = false;
@@ -169,7 +186,6 @@
          this.getListLoading = false;
          if (res.data.code == 0 ){
            if (res.data.data.length > 0) {
              console.log(res.data.data)
              this.$refs.onvifEdit.openDialog(res.data.data, (url)=>{
                  if (url != null) {
                    this.$refs.onvifEdit.close();
@@ -199,14 +215,24 @@
               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) {
               that.getListLoading = false;
               that.$refs.devicePlayer.openDialog("streamPlay", null, null, {
                        streamInfo: res.data,
                        hasAudio: true
                    });
               if (res.data.code === 0) {
            that.$refs.devicePlayer.openDialog("streamPlay", null, null, {
              streamInfo: res.data.data,
              hasAudio: true
            });
          }else {
            that.$message({
              showClose: true,
              message: "获取地址失败：" + res.data.msg,
              type: "error",
            });
          }

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