From 6ac131bcf6ec034ffc9e5813c68c56c6e5c32b70 Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期三, 01 十二月 2021 22:45:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
web_src/src/components/channelList.vue | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue
index b8633b1..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>
--
Gitblit v1.8.0