From ac1a4a027a7bd88efb32e9da666bdba4b5fa166f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 14 一月 2022 17:04:26 +0800
Subject: [PATCH] 支持国标级联的目录订阅功能

---
 web_src/src/components/channelList.vue |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue
index 548bd2c..2b06870 100644
--- a/web_src/src/components/channelList.vue
+++ b/web_src/src/components/channelList.vue
@@ -54,6 +54,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,8 +76,8 @@
                         </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>
@@ -154,7 +162,6 @@
         },
         currentChange: function (val) {
             var url = `/${this.$router.currentRoute.name}/${this.deviceId}/${this.parentChannelId}/${this.count}/${val}`
-            console.log(url)
             this.$router.push(url).then(() => {
                 this.initParam();
                 this.initData();
@@ -175,14 +182,13 @@
                 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) {
-                    console.log(res);
                     that.total = res.data.total;
                     that.deviceChannelList = res.data.list;
                     // 闃叉鍑虹幇琛ㄦ牸閿欎綅
@@ -196,7 +202,6 @@
 
         //閫氱煡璁惧涓婁紶濯掍綋娴�
         sendDevicePush: function (itemData) {
-            console.log(itemData);
             let deviceId = this.deviceId;
             this.isLoging = true;
             let channelId = itemData.channelId;
@@ -232,13 +237,11 @@
             this.$refs.devicePlayer.openDialog("record", deviceId, channelId, {date: format})
         },
         stopDevicePush: function (itemData) {
-            console.log(itemData)
             var that = this;
             this.$axios({
                 method: 'get',
                 url: '/api/play/stop/' + this.deviceId + "/" + itemData.channelId
             }).then(function (res) {
-                console.log(JSON.stringify(res));
                 that.initData();
             }).catch(function (error) {
               if (error.response.status === 402) { // 宸茬粡鍋滄杩�
@@ -273,7 +276,6 @@
             })
         },
         changeSubchannel(itemData) {
-            console.log(this.$router.currentRoute)
             this.beforeUrl = this.$router.currentRoute.path;
 
             var url = `/${this.$router.currentRoute.name}/${this.$router.currentRoute.params.deviceId}/${itemData.channelId}/${this.$router.currentRoute.params.count}/1`
@@ -310,13 +312,11 @@
             });
         },
         search: function () {
-            console.log(this.searchSrt)
             this.currentPage = 1;
             this.total = 0;
             this.initData();
         },
         updateChannel: function (row) {
-            console.log(row)
             this.$axios({
                 method: 'post',
                 url: `/api/device/query/channel/update/${this.deviceId}`,

--
Gitblit v1.8.0