Merge pull request #1 from lawrencehj/master

648540858

2020-10-20 9af5ab43af105f458fad7a21814b20824f3157a9

 web_src/src/components/channelList.vue

@@ -11,7 +11,7 @@

            </div>
            <div style="background-color: #FFFFFF; margin-bottom: 1rem; position: relative; padding: 0.5rem; text-align: left;font-size: 14px;">
               <el-button icon="el-icon-arrow-left" size="mini" style="margin-right: 1rem;" @click="showDevice">返回</el-button>
                <el-button icon="el-icon-arrow-left" size="mini" style="margin-right: 1rem;" type="primary" @click="showDevice">返回</el-button>
               搜索: <el-input @input="search" 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="search" style="margin-right: 1rem;" v-model="channelType" placeholder="请选择" default-first-option>
@@ -37,10 +37,7 @@
                  </el-table-column>
          <el-table-column label="开启音频" align="center">
            <template slot-scope="scope">
              <el-switch
                @change="updateChannel(scope.row)"
                v-model="scope.row.hasAudio"
                active-color="#409EFF">
                        <el-switch @change="updateChannel(scope.row)" v-model="scope.row.hasAudio" active-color="#409EFF">
              </el-switch>
            </template>
          </el-table-column>
@@ -66,15 +63,7 @@
                     </template>
                  </el-table-column>
            </el-table>
            <el-pagination
               style="float: right"
               @size-change="handleSizeChange"
               @current-change="currentChange"
               :current-page="currentPage"
               :page-size="count"
               :page-sizes="[15, 20, 30, 50]"
               layout="total, sizes, prev, pager, next"
               :total="total">
            <el-pagination style="float: right" @size-change="handleSizeChange" @current-change="currentChange" :current-page="currentPage" :page-size="count" :page-sizes="[15, 20, 30, 50]" layout="total, sizes, prev, pager, next" :total="total">
            </el-pagination>

         </el-main>
@@ -185,7 +174,6 @@

         },


         //gb28181平台对接
         //刷新设备信息
         refDevice: function(itemData) {
@@ -218,15 +206,14 @@
            }).then(function(res) {
          console.log(res.data)
               let ssrc = res.data.ssrc;
          that.isLoging = false
                that.isLoging = false;
          if (!!ssrc) {
            that.$refs.devicePlayer.play(res.data,deviceId,channelId,itemData.hasAudio);
            that.initData();
          }else {
            that.$message.error(res.data);
          }
            }).catch(function(e) {
            });
            }).catch(function (e) {});
         },
      stopDevicePush: function(itemData) {
           console.log(itemData)