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

648540858

2021-03-27 f8fe76add24fc2a26449c6b4007a303decb46d99

 web_src/src/components/channelList.vue

@@ -99,7 +99,7 @@
            currentPage: parseInt(this.$route.params.page),
            count: parseInt(this.$route.params.count),
            total: 0,
            beforeUrl: "/videoList",
            beforeUrl: "/deviceList",
            isLoging: false,
            autoList: true
        };
@@ -110,7 +110,7 @@
        if (this.autoList) {
            this.updateLooper = setInterval(this.initData, 5000);
        }
        

    },
    destroyed() {
        this.$destroy('videojs');
@@ -131,7 +131,7 @@
            this.currentPage = parseInt(this.$route.params.page);
            this.count = parseInt(this.$route.params.count);
            if (this.parentChannelId == "" || this.parentChannelId == 0) {
                this.beforeUrl = "/videoList"
                this.beforeUrl = "/deviceList"
            }

        },
@@ -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,
@@ -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,