From 9c5b1060af4e6c468b2cf95fbb9ec6d0a05fad5c Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 28 二月 2022 17:56:27 +0800
Subject: [PATCH] 支持删除在线设备

---
 web_src/src/components/channelList.vue |   31 ++++++++++++++++++++-----------
 1 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue
index 3891ab5..6eae383 100644
--- a/web_src/src/components/channelList.vue
+++ b/web_src/src/components/channelList.vue
@@ -28,9 +28,7 @@
             <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="deviceId" label="璁惧缂栧彿" width="210">
+                <el-table-column prop="channelId" label="閫氶亾缂栧彿" width="200">
                 </el-table-column>
                 <el-table-column prop="name" label="閫氶亾鍚嶇О">
                 </el-table-column>
@@ -54,6 +52,14 @@
                 </el-table-column>
                 <el-table-column prop="subCount" label="瀛愯妭鐐规暟">
                 </el-table-column>
+                <el-table-column prop="manufacture" label="鍘傚">
+                </el-table-column>
+                <el-table-column label="浣嶇疆淇℃伅" align="center">
+                  <template slot-scope="scope">
+                    <span>{{scope.row.longitude}},{{scope.row.latitude}}</span>
+                  </template>
+                </el-table-column>
+              <el-table-column prop="ptztypeText" label="浜戝彴绫诲瀷"/>
                 <el-table-column label="寮�鍚煶棰�" align="center">
                     <template slot-scope="scope">
                         <el-switch @change="updateChannel(scope.row)" v-model="scope.row.hasAudio" active-color="#409EFF">
@@ -68,15 +74,15 @@
                         </div>
                     </template>
                 </el-table-column>
-                <el-table-column prop="ptztypeText" label="浜戝彴绫诲瀷">
-                </el-table-column>
+
+
                 <el-table-column label="鎿嶄綔" width="280" align="center" fixed="right">
                     <template slot-scope="scope">
                         <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.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-s-open" type="primary" v-if="scope.row.subCount > 0" @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> -->
                         </el-button-group>
@@ -174,12 +180,12 @@
                 method: 'get',
                 url: `/api/device/query/devices/${this.$route.params.deviceId}/channels`,
                 params:{
-						page: that.currentPage,
+						            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;
@@ -204,10 +210,10 @@
                 url: '/api/play/start/' + deviceId + '/' + channelId
             }).then(function (res) {
                 that.isLoging = false;
-                if (res.data.code == 0) {
+                if (res.data.code === 0) {
 
                   setTimeout(()=>{
-                    console.log("涓嬭浇鎴浘")
+
                     let snapId = deviceId + "_" + channelId;
                     that.loadSnap[snapId] = 0;
                     that.getSnapErrorEvent(snapId)
@@ -216,7 +222,10 @@
                     streamInfo: res.data.data,
                     hasAudio: itemData.hasAudio
                   });
-                  that.initData();
+                  setTimeout(()=>{
+                    that.initData();
+                  },1000)
+
                 }else {
                   that.$message.error(res.data.msg);
                 }

--
Gitblit v1.8.0