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

648540858

2021-01-15 c8b6ed5823fbe8e7eeef2e733859b4406b2ba4c5

 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>
@@ -101,16 +101,16 @@
            total: 0,
            beforeUrl: "/videoList",
            isLoging: false,
            autoList: false
            autoList: true
        };
    },

    mounted() {
        this.initData();
        if (this.autoList) {
            this.updateLooper = setInterval(this.initData, 1500);
            this.updateLooper = setInterval(this.initData, 5000);
        }
        

    },
    destroyed() {
        this.$destroy('videojs');
@@ -153,11 +153,10 @@
        },
        getDeviceChannelList: function () {
            let that = this;
            console.log(this.currentPage - 1)

            this.$axios.get(`/api/devices/${this.$route.params.deviceId}/channels`, {
                    params: {
                        page: that.currentPage - 1,
                        page: that.currentPage,
                        count: that.count,
                        query: that.searchSrt,
                        online: that.online,
@@ -181,7 +180,7 @@

        //通知设备上传媒体流
        sendDevicePush: function (itemData) {
            console.log(itemData)
            console.log(itemData);
            let deviceId = this.deviceId;
            this.isLoging = true;
            let channelId = itemData.channelId;
@@ -254,7 +253,7 @@

            this.$axios.get(`/api/subChannels/${this.deviceId}/${this.parentChannelId}/channels`, {
                    params: {
                        page: that.currentPage - 1,
                        page: that.currentPage,
                        count: that.count,
                        query: that.searchSrt,
                        online: that.online,