From cb5849d8a14f55241c44bdf6724b18de7950564d Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期三, 14 四月 2021 16:33:10 +0800
Subject: [PATCH] 支持接口鉴权,支持修改密码,

---
 web_src/src/components/channelList.vue |  109 ++++++++++++++++++++++++++++++------------------------
 1 files changed, 60 insertions(+), 49 deletions(-)

diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue
index 2867d7b..89fe0ae 100644
--- a/web_src/src/components/channelList.vue
+++ b/web_src/src/components/channelList.vue
@@ -19,17 +19,19 @@
                     <el-option label="璁惧" value="false"></el-option>
                     <el-option label="瀛愮洰褰�" value="true"></el-option>
                 </el-select>
-                鍦ㄧ嚎鐘舵��: <el-select size="mini" @change="search" v-model="online" placeholder="璇烽�夋嫨" default-first-option>
+                鍦ㄧ嚎鐘舵��: <el-select size="mini" style="margin-right: 1rem;" @change="search" v-model="online" placeholder="璇烽�夋嫨" default-first-option>
                     <el-option label="鍏ㄩ儴" value=""></el-option>
                     <el-option label="鍦ㄧ嚎" value="true"></el-option>
                     <el-option label="绂荤嚎" value="false"></el-option>
                 </el-select>
-
+                <el-checkbox size="mini" style="margin-right: 1rem; float: right;" v-model="autoList" @change="autoListChange">鑷姩鍒锋柊</el-checkbox>
             </div>
             <devicePlayer ref="devicePlayer" v-loading="isLoging"></devicePlayer>
             <!--璁惧鍒楄〃-->
             <el-table ref="channelListTable" :data="deviceChannelList" :height="winHeight" border style="width: 100%">
                 <el-table-column prop="channelId" label="閫氶亾缂栧彿" width="210">
+                </el-table-column>
+                <el-table-column prop="channelId" label="璁惧缂栧彿" width="210">
                 </el-table-column>
                 <el-table-column prop="name" label="閫氶亾鍚嶇О">
                 </el-table-column>
@@ -44,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>
@@ -56,7 +58,7 @@
                         <el-button-group>
                             <!-- <el-button size="mini" icon="el-icon-video-play" v-if="scope.row.parental == 0" @click="sendDevicePush(scope.row)">鎾斁</el-button> -->
                             <el-button size="mini" icon="el-icon-video-play" @click="sendDevicePush(scope.row)">鎾斁</el-button>
-                            <el-button size="mini" icon="el-icon-switch-button" type="danger" v-if="scope.row.play" @click="stopDevicePush(scope.row)">鍋滄</el-button>
+                            <el-button size="mini" icon="el-icon-switch-button" type="danger" v-if="!!scope.row.streamId" @click="stopDevicePush(scope.row)">鍋滄</el-button>
                             <el-button size="mini" icon="el-icon-s-open" type="primary" v-if="scope.row.parental == 1" @click="changeSubchannel(scope.row)">鏌ョ湅</el-button>
                             <el-button size="mini" icon="el-icon-video-camera" type="primary" @click="queryRecords(scope.row)">璁惧褰曡薄</el-button>
                             <!--                             <el-button size="mini" @click="sendDevicePush(scope.row)">褰曞儚鏌ヨ</el-button> -->
@@ -73,7 +75,7 @@
 </template>
 
 <script>
-import devicePlayer from './gb28181/devicePlayer.vue'
+import devicePlayer from './dialog/devicePlayer.vue'
 import uiHeader from './UiHeader.vue'
 import moment from "moment";
 export default {
@@ -97,14 +99,18 @@
             currentPage: parseInt(this.$route.params.page),
             count: parseInt(this.$route.params.count),
             total: 0,
-            beforeUrl: "/videoList",
-            isLoging: false
+            beforeUrl: "/deviceList",
+            isLoging: false,
+            autoList: true
         };
     },
 
     mounted() {
         this.initData();
-        this.updateLooper = setInterval(this.initData, 1000);
+        if (this.autoList) {
+            this.updateLooper = setInterval(this.initData, 5000);
+        }
+
     },
     destroyed() {
         this.$destroy('videojs');
@@ -125,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"
             }
 
         },
@@ -147,18 +153,17 @@
         },
         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,
+            this.$axios({
+                method: 'get',
+                url: `/api/device/query/devices/${this.$route.params.deviceId}/channels`,
+                params:{
+						page: that.currentPage,
                         count: that.count,
                         query: that.searchSrt,
                         online: that.online,
                         channelType: that.channelType
-                    }
-                })
-                .then(function (res) {
+					}
+            }).then(function (res) {
                     console.log(res);
                     that.total = res.data.total;
                     that.deviceChannelList = res.data.list;
@@ -166,25 +171,24 @@
                     that.$nextTick(() => {
                         that.$refs.channelListTable.doLayout();
                     })
-                })
-                .catch(function (error) {
-                    console.log(error);
-                });
+            }).catch(function (error) {
+                console.log(error);
+            });
+
 
         },
 
         //閫氱煡璁惧涓婁紶濯掍綋娴�
         sendDevicePush: function (itemData) {
-            console.log(itemData)
+            console.log(itemData);
             let deviceId = this.deviceId;
             this.isLoging = true;
             let channelId = itemData.channelId;
-            let getEncoding = itemData.hasAudio ? '1' : '0'
-            console.log("閫氱煡璁惧鎺ㄦ祦1锛�" + deviceId + " : " + channelId + ":" + getEncoding);
+            console.log("閫氱煡璁惧鎺ㄦ祦1锛�" + deviceId + " : " + channelId );
             let that = this;
             this.$axios({
                 method: 'get',
-                url: '/api/play/' + deviceId + '/' + channelId + '?getEncoding=' + getEncoding
+                url: '/api/play/start/' + deviceId + '/' + channelId
             }).then(function (res) {
                 console.log(res.data)
                 let streamId = res.data.streamId;
@@ -211,8 +215,8 @@
             console.log(itemData)
             var that = this;
             this.$axios({
-                method: 'post',
-                url: '/api/play/' + itemData.streamId + '/stop'
+                method: 'get',
+                url: '/api/play/stop/' + itemData.streamId 
             }).then(function (res) {
                 console.log(JSON.stringify(res));
                 that.initData();
@@ -220,7 +224,7 @@
               if (error.response.status == 402) { // 宸茬粡鍋滄杩�
                 that.initData();
               }else {
-                console.log(e)
+                console.log(error)
               }
             });
         },
@@ -247,26 +251,26 @@
         showSubchannels: function (channelId) {
             let that = this;
 
-            this.$axios.get(`/api/subChannels/${this.deviceId}/${this.parentChannelId}/channels`, {
-                    params: {
-                        page: that.currentPage - 1,
-                        count: that.count,
-                        query: that.searchSrt,
-                        online: that.online,
-                        channelType: that.channelType
-                    }
+            this.$axios({
+                method: 'get',
+                url:`/api/device/query/sub_channels/${this.deviceId}/${this.parentChannelId}/channels`, 
+                params: {
+                    page: that.currentPage,
+                    count: that.count,
+                    query: that.searchSrt,
+                    online: that.online,
+                    channelType: that.channelType
+                }
+            }).then(function (res) {
+                that.total = res.data.total;
+                that.deviceChannelList = res.data.list;
+                // 闃叉鍑虹幇琛ㄦ牸閿欎綅
+                that.$nextTick(() => {
+                    that.$refs.channelListTable.doLayout();
                 })
-                .then(function (res) {
-                    that.total = res.data.total;
-                    that.deviceChannelList = res.data.data;
-                    // 闃叉鍑虹幇琛ㄦ牸閿欎綅
-                    that.$nextTick(() => {
-                        that.$refs.channelListTable.doLayout();
-                    })
-                })
-                .catch(function (error) {
-                    console.log(error);
-                });
+            }).catch(function (error) {
+                console.log(error);
+            });
         },
         search: function () {
             console.log(this.searchSrt)
@@ -278,11 +282,18 @@
             console.log(row)
             this.$axios({
                 method: 'post',
-                url: `/api/channel/update/${this.deviceId}`,
+                url: `/api/device/query/channel/update/${this.deviceId}`,
                 params: row
             }).then(function (res) {
                 console.log(JSON.stringify(res));
             });
+        },
+        autoListChange: function () {
+            if (this.autoList) {
+                this.updateLooper = setInterval(this.initData, 1500);
+            }else{
+                window.clearInterval(this.updateLooper);
+            }
         }
 
     }

--
Gitblit v1.8.0