From d7afcab6016f46fa5f40962a079d003ebdf9172b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期日, 30 一月 2022 16:39:15 +0800
Subject: [PATCH] 优化媒体服务器配置展示界面

---
 web_src/src/components/PushVideoList.vue |   62 ++++++++++++++++++++++---------
 1 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/web_src/src/components/PushVideoList.vue b/web_src/src/components/PushVideoList.vue
index bdc086c..44372df 100644
--- a/web_src/src/components/PushVideoList.vue
+++ b/web_src/src/components/PushVideoList.vue
@@ -8,6 +8,13 @@
 				<div style="background-color: #FFFFFF; margin-bottom: 1rem; position: relative; padding: 0.5rem; text-align: left;">
 					<span style="font-size: 1rem; font-weight: bold;">鎺ㄦ祦鍒楄〃</span>
 				</div>
+        <div style="background-color: #FFFFFF; margin-bottom: 1rem; position: relative; padding: 0.5rem; text-align: left;font-size: 14px;">
+          <el-button icon="el-icon-upload2" size="mini" style="margin-right: 1rem;" type="primary" @click="importChannel">閫氶亾瀵煎叆</el-button>
+          <el-button icon="el-icon-download" size="mini" style="margin-right: 1rem;" type="primary" >
+            <a style="color: #FFFFFF; text-align: center; text-decoration: none" href="/static/file/鎺ㄦ祦閫氶亾瀵煎叆.zip" download='鎺ㄦ祦閫氶亾瀵煎叆.zip' >涓嬭浇妯℃澘</a>
+          </el-button>
+
+        </div>
 				<devicePlayer ref="devicePlayer"></devicePlayer>
 				<addStreamTOGB ref="addStreamTOGB"></addStreamTOGB>
 				<el-table :data="pushList" border style="width: 100%" :height="winHeight">
@@ -35,8 +42,8 @@
 					<el-table-column label="鎿嶄綔" width="360" align="center" fixed="right">
 						<template slot-scope="scope">
 							<el-button-group>
-								<el-button size="mini" icon="el-icon-video-play" @click="playPuhsh(scope.row)">鎾斁</el-button>
-								<el-button size="mini" icon="el-icon-switch-button" type="danger" v-if="!!scope.row.streamId" @click="stopPuhsh(scope.row)">鍋滄</el-button>
+								<el-button size="mini" icon="el-icon-video-play" v-if="(scope.row.status == false && scope.row.gbId == null) || scope.row.status" @click="playPuhsh(scope.row)">鎾斁</el-button>
+								<el-button size="mini" icon="el-icon-switch-button" type="danger" @click="stopPuhsh(scope.row)">绉婚櫎</el-button>
 								<el-button size="mini" icon="el-icon-position" type="primary" v-if="!!!scope.row.gbId" @click="addToGB(scope.row)">鍔犲叆鍥芥爣</el-button>
 								<el-button size="mini" icon="el-icon-position" type="primary" v-if="!!scope.row.gbId" @click="removeFromGB(scope.row)">绉诲嚭鍥芥爣</el-button>
 							</el-button-group>
@@ -54,6 +61,7 @@
 					:total="total">
 				</el-pagination>
 			<streamProxyEdit ref="streamProxyEdit" ></streamProxyEdit>
+			<importChannel ref="importChannel" ></importChannel>
 			</el-main>
 		</el-container>
 	</div>
@@ -64,13 +72,15 @@
 	import devicePlayer from './dialog/devicePlayer.vue'
 	import addStreamTOGB from './dialog/addStreamTOGB.vue'
 	import uiHeader from './UiHeader.vue'
+	import importChannel from './dialog/importChannel.vue'
 	export default {
 		name: 'pushVideoList',
 		components: {
 			devicePlayer,
 			addStreamTOGB,
 			streamProxyEdit,
-			uiHeader
+			uiHeader,
+      importChannel,
 		},
 		data() {
 			return {
@@ -117,8 +127,6 @@
 						count: that.count
 					}
 				}).then(function (res) {
-					console.log(res);
-					console.log(res.data.list);
 					that.total = res.data.total;
 					that.pushList = res.data.list;
 					that.getDeviceListLoading = false;
@@ -133,7 +141,7 @@
 				this.getListLoading = true;
 				this.$axios({
 					method: 'get',
-					url:`/api/media/stream_info_by_app_and_stream`,
+					url: '/api/media/stream_info_by_app_and_stream',
 					params: {
 						app: row.app,
 						stream: row.stream,
@@ -142,7 +150,7 @@
 				}).then(function (res) {
 					that.getListLoading = false;
 					that.$refs.devicePlayer.openDialog("streamPlay", null, null, {
-                        streamInfo: res.data,
+                        streamInfo: res.data.data,
                         hasAudio: true
                     });
 				}).catch(function (error) {
@@ -151,24 +159,38 @@
 				});
 			},
 			stopPuhsh: function(row){
-				console.log(row)
+        var that = this;
+        that.$axios({
+          method:"post",
+          url:"/api/push/stop",
+          params: {
+            app: row.app,
+            streamId: row.stream
+          }
+        }).then((res)=>{
+          if (res.data == "success") {
+            that.initData()
+          }
+        }).catch(function (error) {
+          console.log(error);
+        });
 			},
 			addToGB: function(row){
-				this.$refs.addStreamTOGB.openDialog({app: row.app, stream: row.stream}, this.initData);
+				this.$refs.addStreamTOGB.openDialog({app: row.app, stream: row.stream, mediaServerId: row.mediaServerId}, this.initData);
 			},
 			removeFromGB: function(row){
 				var that = this;
 				that.$axios({
-                    method:"delete",
-                    url:"/api/push/remove_form_gb",
-                    data:row
-                }).then((res)=>{
-                    if (res.data == "success") {
+            method:"delete",
+            url:"/api/push/remove_form_gb",
+            data:row
+        }).then((res)=>{
+            if (res.data == "success") {
 							that.initData()
 						}
-                }).catch(function (error) {
-                    console.log(error);
-                });
+        }).catch(function (error) {
+            console.log(error);
+        });
 			},
 			dateFormat: function(/** timestamp=0 **/) {
 				var ts = arguments[0] || 0;
@@ -182,8 +204,12 @@
 				s = t.getSeconds();
 				// 鍙牴鎹渶瑕佸湪杩欓噷瀹氫箟鏃堕棿鏍煎紡
 				return y+'-'+(m<10?'0'+m:m)+'-'+(d<10?'0'+d:d)+' '+(h<10?'0'+h:h)+':'+(i<10?'0'+i:i)+':'+(s<10?'0'+s:s);
-			}
+			},
+      importChannel: function () {
+        this.$refs.importChannel.openDialog(()=>{
 
+        })
+      },
 		}
 	};
 </script>

--
Gitblit v1.8.0