Merge remote-tracking branch 'origin/master' into wvp-28181-2.0

panlinlin

2021-01-11 d94135c9cd8b12fc511055af4398ad3a584a44d6

 web_src/src/components/channelList.vue

@@ -46,8 +46,8 @@
                <el-table-column label="状态" width="180" align="center">
                    <template slot-scope="scope">
                        <div slot="reference" class="name-wrapper">
                            <el-tag size="medium" v-if="scope.row.status == 1">在线</el-tag>
                            <el-tag size="medium" type="info" v-if="scope.row.status == 0">离线</el-tag>
                            <el-tag size="medium" v-if="scope.row.status == 1">开启</el-tag>
                            <el-tag size="medium" type="info" v-if="scope.row.status == 0">关闭</el-tag>
                        </div>
                    </template>
                </el-table-column>
@@ -108,7 +108,7 @@
    mounted() {
        this.initData();
        if (this.autoList) {
            this.updateLooper = setInterval(this.initData, 1500);
            this.updateLooper = setInterval(this.initData, 5000);
        }
        
    },