From fd803c21ec5d36758d4914b4dfdc46314e33d6be Mon Sep 17 00:00:00 2001
From: 648540858 <18010473990@163.com>
Date: 星期日, 08 八月 2021 09:10:58 +0800
Subject: [PATCH] 修复前端登录

---
 web_src/src/components/PushVideoList.vue |   53 +++++++++++++++++++++++++++--------------------------
 1 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/web_src/src/components/PushVideoList.vue b/web_src/src/components/PushVideoList.vue
index 0955cc9..8bf71c5 100644
--- a/web_src/src/components/PushVideoList.vue
+++ b/web_src/src/components/PushVideoList.vue
@@ -15,9 +15,9 @@
 					</el-table-column>
 					<el-table-column prop="stream" label="娴両D" width="240" align="center">
 					</el-table-column>
-					<el-table-column prop="totalReaderCount" label="鍦ㄧ嚎浜烘暟" width="240" align="center">
-					</el-table-column>
 					<el-table-column prop="gbId" label="鍥芥爣缂栫爜" width="150" align="center">
+					</el-table-column>
+					<el-table-column prop="mediaServerId" label="娴佸獟浣�" width="150" align="center">
 					</el-table-column>
 					<el-table-column label="寮�濮嬫椂闂�" align="center" >
 						<template slot-scope="scope">
@@ -28,10 +28,10 @@
 					</el-table-column>
 					<el-table-column label="姝e湪鎺ㄦ祦" align="center" >
 						<template slot-scope="scope">
-							{{!!scope.row.status?'鏄�':'鍚�'}}
+							{{(scope.row.status == false && scope.row.gbId == null) || scope.row.status ?'鏄�':'鍚�'}}
 						</template>
 					</el-table-column>
-					
+
 					<el-table-column label="鎿嶄綔" width="360" align="center" fixed="right">
 						<template slot-scope="scope">
 							<el-button-group>
@@ -109,42 +109,43 @@
 			getPushList: function() {
 				let that = this;
 				this.getDeviceListLoading = true;
-				this.$axios.get(`/api/push/list`,{
+				this.$axios({
+					method: 'get',
+					url:`/api/push/list`,
 					params: {
 						page: that.currentPage,
 						count: that.count
 					}
-				} )
-				.then(function (res) {
+				}).then(function (res) {
 					console.log(res);
 					console.log(res.data.list);
 					that.total = res.data.total;
 					that.pushList = res.data.list;
 					that.getDeviceListLoading = false;
-				})
-				.catch(function (error) {
+				}).catch(function (error) {
 					console.log(error);
 					that.getDeviceListLoading = false;
 				});
 			},
-			
+
 			playPuhsh: function(row){
 				let that = this;
 				this.getListLoading = true;
-				this.$axios.get(`/api/media/getStreamInfoByAppAndStream`,{
+				this.$axios({
+					method: 'get',
+					url: '/api/media/stream_info_by_app_and_stream',
 					params: {
 						app: row.app,
-						stream: row.stream
+						stream: row.stream,
+            mediaServerId: row.mediaServerId
 					}
-				})
-				.then(function (res) {
+				}).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) {
+				}).catch(function (error) {
 					console.log(error);
 					that.getListLoading = false;
 				});
@@ -157,17 +158,17 @@
 			},
 			removeFromGB: function(row){
 				var that = this;
-				that.$axios.post(`/api/push/removeFormGB`, row)
-					.then(function (res) {
-						console.log(res);
-						console.log(res.data == "success");
-						if (res.data == "success") {
+				that.$axios({
+                    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;

--
Gitblit v1.8.0