From 0984290ca2a75cf0316c3ca312bf8026b4edcf3e Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期三, 01 十二月 2021 22:45:38 +0800
Subject: [PATCH] 继续优化docker配置： 1.启动命令增加ASSIST_JVM_CONFIG和WVP_JVM_CONFIG两个字段，方便配置JVM参数 2.修复一处错误，application.yml media.stream-ip的值应该等于media.ip而不是之前的sip.ip
---
web_src/src/components/StreamProxyList.vue | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/web_src/src/components/StreamProxyList.vue b/web_src/src/components/StreamProxyList.vue
index 90425b5..746bcdb 100644
--- a/web_src/src/components/StreamProxyList.vue
+++ b/web_src/src/components/StreamProxyList.vue
@@ -32,6 +32,15 @@
</div>
</template>
</el-table-column>
+ <el-table-column prop="mediaServerId" label="娴佸獟浣�" width="150" align="center"></el-table-column>
+ <el-table-column label="绫诲瀷" width="100" align="center">
+ <template slot-scope="scope">
+ <div slot="reference" class="name-wrapper">
+ <el-tag size="medium">{{scope.row.type}}</el-tag>
+ </div>
+ </template>
+ </el-table-column>
+
<el-table-column prop="gbId" label="鍥芥爣缂栫爜" width="180" align="center" show-overflow-tooltip/>
<el-table-column label="鍚敤" width="120" align="center">
<template slot-scope="scope">
@@ -147,8 +156,6 @@
count: that.count
}
}).then(function (res) {
- console.log(res);
- console.log(res.data.list);
that.total = res.data.total;
that.streamProxyList = res.data.list;
that.getListLoading = false;
@@ -170,7 +177,6 @@
this.getListLoading = false;
if (res.data.code == 0 ){
if (res.data.data.length > 0) {
- console.log(res.data.data)
this.$refs.onvifEdit.openDialog(res.data.data, (url)=>{
if (url != null) {
this.$refs.onvifEdit.close();
@@ -200,14 +206,24 @@
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) {
that.getListLoading = false;
- that.$refs.devicePlayer.openDialog("streamPlay", null, null, {
- streamInfo: res.data,
- hasAudio: true
- });
+ if (res.data.code === 0) {
+ that.$refs.devicePlayer.openDialog("streamPlay", null, null, {
+ streamInfo: res.data.data,
+ hasAudio: true
+ });
+ }else {
+ that.$message({
+ showClose: true,
+ message: "鑾峰彇鍦板潃澶辫触锛�" + res.data.msg,
+ type: "error",
+ });
+ }
+
}).catch(function (error) {
console.log(error);
that.getListLoading = false;
--
Gitblit v1.8.0