From b1b6fae22c5ab3013d73df1a43cd42f7fe0fa347 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 09 四月 2024 10:35:11 +0800
Subject: [PATCH] Merge branch 'master' into dev/zlm
---
web_src/src/components/PushVideoList.vue | 61 ++++++++++++++++++------------
1 files changed, 36 insertions(+), 25 deletions(-)
diff --git a/web_src/src/components/PushVideoList.vue b/web_src/src/components/PushVideoList.vue
old mode 100644
new mode 100755
index 678d13f..e69f56d
--- a/web_src/src/components/PushVideoList.vue
+++ b/web_src/src/components/PushVideoList.vue
@@ -34,6 +34,8 @@
<el-button icon="el-icon-delete" size="mini" style="margin-right: 1rem;"
:disabled="multipleSelection.length === 0" type="danger" @click="batchDel">鎵归噺绉婚櫎
</el-button>
+ <el-button icon="el-icon-plus" size="mini" style="margin-right: 1rem;" type="primary" @click="addStream">娣诲姞閫氶亾
+ </el-button>
<el-button icon="el-icon-refresh-right" circle size="mini" @click="refresh()"></el-button>
</div>
</div>
@@ -56,20 +58,25 @@
<el-table-column label="寮�濮嬫椂闂�" min-width="200">
<template slot-scope="scope">
<el-button-group>
- {{ dateFormat(parseInt(scope.row.createStamp)) }}
+ {{ scope.row.pushTime == null? "-":scope.row.pushTime }}
</el-button-group>
</template>
</el-table-column>
<el-table-column label="姝ｅ湪鎺ㄦ祦" min-width="100">
<template slot-scope="scope">
- {{ (scope.row.status == false && scope.row.gbId == null) || scope.row.status ? '鏄�' : '鍚�' }}
+ {{scope.row.pushIng ? '鏄�' : '鍚�' }}
+ </template>
+ </el-table-column>
+ <el-table-column label="鏈钩鍙版帹娴�" min-width="100">
+ <template slot-scope="scope">
+ {{scope.row.pushIng && !!scope.row.self ? '鏄�' : '鍚�' }}
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" min-width="360" fixed="right">
<template slot-scope="scope">
<el-button size="medium" icon="el-icon-video-play"
- v-if="(scope.row.status == false && scope.row.gbId == null) || scope.row.status"
+ v-if="scope.row.pushIng === true"
@click="playPush(scope.row)" type="text">鎾斁
</el-button>
<el-divider direction="vertical"></el-divider>
@@ -81,6 +88,8 @@
<el-divider v-if="!!!scope.row.gbId" direction="vertical"></el-divider>
<el-button size="medium" icon="el-icon-position" type="text" v-if="!!scope.row.gbId"
@click="removeFromGB(scope.row)">绉诲嚭鍥芥爣
+ </el-button>
+ <el-button size="medium" icon="el-icon-cloudy" type="text" @click="queryCloudRecords(scope.row)">浜戠褰曞儚
</el-button>
</template>
</el-table-column>
@@ -103,7 +112,7 @@
<script>
import streamProxyEdit from './dialog/StreamProxyEdit.vue'
import devicePlayer from './dialog/devicePlayer.vue'
-import addStreamTOGB from './dialog/addStreamTOGB.vue'
+import addStreamTOGB from './dialog/pushStreamEdit.vue'
import uiHeader from '../layout/UiHeader.vue'
import importChannel from './dialog/importChannel.vue'
import MediaServer from './service/MediaServer'
@@ -173,8 +182,11 @@
mediaServerId: that.mediaServerId,
}
}).then(function (res) {
- that.total = res.data.total;
- that.pushList = res.data.list;
+ if (res.data.code === 0) {
+ that.total = res.data.data.total;
+ that.pushList = res.data.data.list;
+ }
+
that.getDeviceListLoading = false;
}).catch(function (error) {
console.error(error);
@@ -187,7 +199,7 @@
this.getListLoading = true;
this.$axios({
method: 'get',
- url: '/api/media/stream_info_by_app_and_stream',
+ url: '/api/push/getPlayUrl',
params: {
app: row.app,
stream: row.stream,
@@ -195,10 +207,15 @@
}
}).then(function (res) {
that.getListLoading = false;
- that.$refs.devicePlayer.openDialog("streamPlay", null, null, {
- streamInfo: res.data.data,
- hasAudio: true
- });
+ if (res.data.code === 0 ) {
+ that.$refs.devicePlayer.openDialog("streamPlay", null, null, {
+ streamInfo: res.data.data,
+ hasAudio: true
+ });
+ }else {
+ that.$message.error(res.data.msg);
+ }
+
}).catch(function (error) {
console.error(error);
that.getListLoading = false;
@@ -214,7 +231,7 @@
streamId: row.stream
}
}).then((res) => {
- if (res.data == "success") {
+ if (res.data.code === 0) {
that.initData()
}
}).catch(function (error) {
@@ -235,31 +252,25 @@
url: "/api/push/remove_form_gb",
data: row
}).then((res) => {
- if (res.data == "success") {
+ if (res.data.code === 0) {
that.initData()
}
}).catch(function (error) {
console.error(error);
});
},
- dateFormat: function (/** timestamp=0 **/) {
- 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();
- h = t.getHours();
- i = t.getMinutes();
- 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);
+ queryCloudRecords: function (row) {
+
+ this.$router.push(`/cloudRecordDetail/${row.app}/${row.stream}`)
},
importChannel: function () {
this.$refs.importChannel.openDialog(() => {
})
},
+ addStream: function (){
+ this.$refs.addStreamTOGB.openDialog(null, this.initData);
+ },
batchDel: function () {
this.$confirm(`纭畾鍒犻櫎閫変腑鐨�${this.multipleSelection.length}涓�氶亾?`, '鎻愮ず', {
confirmButtonText: '纭畾',
--
Gitblit v1.8.0