From ba8633e99a27b90c55b47e8f7d6225f1f0efc6bb Mon Sep 17 00:00:00 2001
From: 648540858 <456panlinlin>
Date: 星期五, 08 四月 2022 18:09:23 +0800
Subject: [PATCH] 优化地图-添加地图页面以及设备树
---
web_src/src/components/PushVideoList.vue | 77 ++++++++++++++++++++++++++------------
1 files changed, 53 insertions(+), 24 deletions(-)
diff --git a/web_src/src/components/PushVideoList.vue b/web_src/src/components/PushVideoList.vue
index ad07aff..4c803da 100644
--- a/web_src/src/components/PushVideoList.vue
+++ b/web_src/src/components/PushVideoList.vue
@@ -30,28 +30,31 @@
<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>
+ <el-button icon="el-icon-delete" size="mini" style="margin-right: 1rem;" :disabled="multipleSelection.length === 0" type="danger" @click="batchDel">鎵归噺绉婚櫎</el-button>
</div>
<devicePlayer ref="devicePlayer"></devicePlayer>
<addStreamTOGB ref="addStreamTOGB"></addStreamTOGB>
- <el-table :data="pushList" border style="width: 100%" :height="winHeight">
- <el-table-column prop="name" label="鍚嶇О" width="180" align="center">
+ <el-table ref="pushListTable" :data="pushList" border style="width: 100%" :height="winHeight" @selection-change="handleSelectionChange" :row-key="(row)=> row.app + row.stream">
+ <el-table-column align="center" type="selection" :reserve-selection="true" width="55">
+ </el-table-column>
+ <el-table-column prop="name" label="鍚嶇О" align="center">
</el-table-column>
- <el-table-column prop="app" label="APP" width="180" align="center">
+ <el-table-column prop="app" label="APP" align="center">
</el-table-column>
- <el-table-column prop="stream" label="娴両D" width="240" align="center">
+ <el-table-column prop="stream" label="娴両D" align="center">
</el-table-column>
- <el-table-column prop="gbId" label="鍥芥爣缂栫爜" width="150" align="center">
+ <el-table-column prop="gbId" label="鍥芥爣缂栫爜" width="200" align="center">
</el-table-column>
- <el-table-column prop="mediaServerId" label="娴佸獟浣�" width="150" align="center">
+ <el-table-column prop="mediaServerId" label="娴佸獟浣�" width="200" align="center">
</el-table-column>
- <el-table-column label="寮�濮嬫椂闂�" align="center" >
+ <el-table-column label="寮�濮嬫椂闂�" align="center" width="200">
<template slot-scope="scope">
<el-button-group>
{{dateFormat(parseInt(scope.row.createStamp))}}
</el-button-group>
</template>
</el-table-column>
- <el-table-column label="姝ｅ湪鎺ㄦ祦" align="center" >
+ <el-table-column label="姝ｅ湪鎺ㄦ祦" align="center" width="100">
<template slot-scope="scope">
{{(scope.row.status == false && scope.row.gbId == null) || scope.row.status ?'鏄�':'鍚�'}}
</template>
@@ -60,8 +63,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" 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-video-play" v-if="(scope.row.status == false && scope.row.gbId == null) || scope.row.status" @click="playPush(scope.row)">鎾斁</el-button>
+ <el-button size="mini" icon="el-icon-delete" type="danger" @click="stopPush(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>
@@ -107,7 +110,7 @@
currentPusher: {}, //褰撳墠鎿嶄綔璁惧瀵硅薄
updateLooper: 0, //鏁版嵁鍒锋柊杞鏍囧織
currentDeviceChannelsLenth:0,
- winHeight: window.innerHeight - 200,
+ winHeight: window.innerHeight - 250,
mediaServerObj : new MediaServer(),
currentPage:1,
count:15,
@@ -116,6 +119,7 @@
pushing: "",
mediaServerId: "",
mediaServerList: [],
+ multipleSelection: [],
getDeviceListLoading: false
};
},
@@ -123,7 +127,7 @@
},
mounted() {
this.initData();
- this.updateLooper = setInterval(this.initData, 2000);
+ this.updateLooper = setInterval(this.getPushList, 2000);
},
destroyed() {
clearTimeout(this.updateLooper);
@@ -131,7 +135,6 @@
methods: {
initData: function() {
this.mediaServerObj.getOnlineMediaServerList((data)=>{
- console.log(data)
this.mediaServerList = data.data;
})
this.getPushList();
@@ -162,12 +165,12 @@
that.pushList = res.data.list;
that.getDeviceListLoading = false;
}).catch(function (error) {
- console.log(error);
+ console.error(error);
that.getDeviceListLoading = false;
});
},
- playPuhsh: function(row){
+ playPush: function(row){
let that = this;
this.getListLoading = true;
this.$axios({
@@ -185,12 +188,12 @@
hasAudio: true
});
}).catch(function (error) {
- console.log(error);
+ console.error(error);
that.getListLoading = false;
});
},
- stopPuhsh: function(row){
- var that = this;
+ stopPush: function(row){
+ let that = this;
that.$axios({
method:"post",
url:"/api/push/stop",
@@ -203,14 +206,14 @@
that.initData()
}
}).catch(function (error) {
- console.log(error);
+ console.error(error);
});
},
addToGB: function(row){
this.$refs.addStreamTOGB.openDialog({app: row.app, stream: row.stream, mediaServerId: row.mediaServerId}, this.initData);
},
removeFromGB: function(row){
- var that = this;
+ let that = this;
that.$axios({
method:"delete",
url:"/api/push/remove_form_gb",
@@ -220,13 +223,13 @@
that.initData()
}
}).catch(function (error) {
- console.log(error);
+ console.error(error);
});
},
dateFormat: function(/** timestamp=0 **/) {
- var ts = arguments[0] || 0;
- var t,y,m,d,h,i,s;
- t = ts ? new Date(ts*1000) : new Date();
+ let ts = arguments[0] || 0;
+ let t,y,m,d,h,i,s;
+ t = ts ? new Date(ts) : new Date();
y = t.getFullYear();
m = t.getMonth()+1;
d = t.getDate();
@@ -241,6 +244,32 @@
})
},
+ batchDel: function () {
+ this.$confirm(`纭畾鍒犻櫎閫変腑鐨�${this.multipleSelection.length}涓�氶亾?`, '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ let that = this;
+ that.$axios({
+ method:"delete",
+ url:"/api/push/batchStop",
+ data: {
+ gbStreams: this.multipleSelection
+ }
+ }).then((res)=>{
+ this.initData();
+ this.$refs.pushListTable.clearSelection();
+ }).catch(function (error) {
+ console.error(error);
+ });
+ }).catch(() => {
+
+ });
+ },
+ handleSelectionChange: function (val) {
+ this.multipleSelection = val;
+ },
}
};
</script>
--
Gitblit v1.8.0