From 7dc8fd4a1e8c5afb6fad53454935419c239838c0 Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期四, 01 四月 2021 18:06:21 +0800
Subject: [PATCH] 添加拉流代理与国标关联, 支持代理rtsp/rtmp/...,转发到国标

---
 web_src/src/components/StreamProxyList.vue |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/web_src/src/components/StreamProxyList.vue b/web_src/src/components/StreamProxyList.vue
index 0a1e03d..f76a164 100644
--- a/web_src/src/components/StreamProxyList.vue
+++ b/web_src/src/components/StreamProxyList.vue
@@ -13,7 +13,8 @@
 				</div>
 				<devicePlayer ref="devicePlayer"></devicePlayer>
 				<el-table :data="streamProxyList" border style="width: 100%" :height="winHeight">
-					<el-table-column prop="app" label="搴旂敤鍚�" align="center" show-overflow-tooltip/>
+					<el-table-column prop="name" label="鍚嶇О" align="center" show-overflow-tooltip/>
+					<el-table-column prop="app" label="娴佸簲鐢ㄥ悕" align="center" show-overflow-tooltip/>
 					<el-table-column prop="stream" label="娴両D" align="center" show-overflow-tooltip/>
 					<el-table-column label="娴佸湴鍧�" width="400" align="center" show-overflow-tooltip >
 						<template slot-scope="scope">
@@ -30,7 +31,7 @@
 						</div>
 						</template>
 					</el-table-column>
-
+					<el-table-column prop="gbId" label="鍥芥爣缂栫爜" width="180" align="center" show-overflow-tooltip/>
 					<el-table-column label="杞琀LS" width="120" align="center">
 						<template slot-scope="scope">
 						<div slot="reference" class="name-wrapper">
@@ -56,7 +57,6 @@
 						</template>
 					</el-table-column>
 
-					
 					<el-table-column label="鎿嶄綔" width="360" align="center" fixed="right">
 						<template slot-scope="scope">
 							<el-button-group>
@@ -64,6 +64,7 @@
 								<el-button size="mini" icon="el-icon-close" type="success" v-if="scope.row.enable" @click="stop(scope.row)">鍋滅敤</el-button>
 								<el-button size="mini" icon="el-icon-check" type="primary" v-if="!scope.row.enable" @click="start(scope.row)">鍚敤</el-button>
 								<el-button size="mini" icon="el-icon-delete" type="danger"  @click="deleteStreamProxy(scope.row)">鍒犻櫎</el-button>
+								<!-- <el-button size="mini" icon="el-icon-position" type="primary"  >鍔犲叆鍥芥爣</el-button> -->
 							</el-button-group>
 							</template>
 					</el-table-column>

--
Gitblit v1.8.0