From c8b6ed5823fbe8e7eeef2e733859b4406b2ba4c5 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 15 一月 2021 13:22:07 +0800
Subject: [PATCH] Merge pull request #38 from lawrencehj/wvp-28181-2.0

---
 web_src/src/components/channelList.vue |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue
index cd84eff..943fe3a 100644
--- a/web_src/src/components/channelList.vue
+++ b/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,9 +108,9 @@
     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,
@@ -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,

--
Gitblit v1.8.0