From 8b6449ce3ac8eb4a0f59f3a6e3974d9190dcd133 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 29 八月 2022 09:55:09 +0800
Subject: [PATCH] 升级版本号
---
web_src/src/components/StreamProxyList.vue | 73 ++++++++++++++++++++----------------
1 files changed, 41 insertions(+), 32 deletions(-)
diff --git a/web_src/src/components/StreamProxyList.vue b/web_src/src/components/StreamProxyList.vue
index d553392..99b2226 100644
--- a/web_src/src/components/StreamProxyList.vue
+++ b/web_src/src/components/StreamProxyList.vue
@@ -5,14 +5,15 @@
<div class="page-header-btn">
<el-button icon="el-icon-plus" size="mini" style="margin-right: 1rem;" type="primary" @click="addStreamProxy">娣诲姞浠g悊</el-button>
<el-button v-if="false" icon="el-icon-search" size="mini" style="margin-right: 1rem;" type="primary" @click="addOnvif">鎼滅储ONVIF</el-button>
+ <el-button icon="el-icon-refresh-right" circle size="mini" @click="refresh()"></el-button>
</div>
</div>
<devicePlayer ref="devicePlayer"></devicePlayer>
- <el-table :data="streamProxyList" border style="width: 100%" :height="winHeight">
- <el-table-column prop="name" label="鍚嶇О" align="center" show-overflow-tooltip/>
- <el-table-column prop="app" label="娴佸簲鐢ㄥ悕" align="center" show-overflow-tooltip/>
- <el-table-column prop="stream" label="娴両D" align="center" show-overflow-tooltip/>
- <el-table-column label="娴佸湴鍧�" width="400" align="center" show-overflow-tooltip >
+ <el-table :data="streamProxyList" style="width: 100%" :height="winHeight">
+ <el-table-column prop="name" label="鍚嶇О" min-width="120" show-overflow-tooltip/>
+ <el-table-column prop="app" label="娴佸簲鐢ㄥ悕" min-width="120" show-overflow-tooltip/>
+ <el-table-column prop="stream" label="娴両D" min-width="120" show-overflow-tooltip/>
+ <el-table-column label="娴佸湴鍧�" min-width="400" show-overflow-tooltip >
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
@@ -27,8 +28,8 @@
</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">
+ <el-table-column prop="mediaServerId" label="娴佸獟浣�" min-width="180" ></el-table-column>
+ <el-table-column label="绫诲瀷" width="100" >
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<el-tag size="medium">{{scope.row.type}}</el-tag>
@@ -36,8 +37,8 @@
</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">
+ <el-table-column prop="gbId" label="鍥芥爣缂栫爜" min-width="180" show-overflow-tooltip/>
+ <el-table-column label="鐘舵��" min-width="120" >
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<el-tag size="medium" v-if="scope.row.status">鍦ㄧ嚎</el-tag>
@@ -45,7 +46,7 @@
</div>
</template>
</el-table-column>
- <el-table-column label="鍚敤" width="120" align="center">
+ <el-table-column label="鍚敤" min-width="120" >
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<el-tag size="medium" v-if="scope.row.enable">宸插惎鐢�</el-tag>
@@ -53,8 +54,8 @@
</div>
</template>
</el-table-column>
- <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" align="center" width="150" show-overflow-tooltip/>
- <el-table-column label="杞琀LS" width="120" align="center">
+ <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" min-width="150" show-overflow-tooltip/>
+ <el-table-column label="杞琀LS" min-width="120" >
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<el-tag size="medium" v-if="scope.row.enable_hls">宸插惎鐢�</el-tag>
@@ -62,7 +63,7 @@
</div>
</template>
</el-table-column>
- <el-table-column label="MP4褰曞埗" width="120" align="center">
+ <el-table-column label="MP4褰曞埗" min-width="120" >
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<el-tag size="medium" v-if="scope.row.enable_mp4">宸插惎鐢�</el-tag>
@@ -70,7 +71,7 @@
</div>
</template>
</el-table-column>
- <el-table-column label="鏃犱汉瑙傜湅鑷姩鍒犻櫎" width="160" align="center">
+ <el-table-column label="鏃犱汉瑙傜湅鑷姩鍒犻櫎" min-width="160" >
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<el-tag size="medium" v-if="scope.row.enable_remove_none_reader">宸插惎鐢�</el-tag>
@@ -80,14 +81,15 @@
</el-table-column>
- <el-table-column label="鎿嶄綔" width="360" align="center" fixed="right">
+ <el-table-column label="鎿嶄綔" width="360" fixed="right">
<template slot-scope="scope">
- <el-button-group>
- <el-button size="mini" icon="el-icon-video-play" v-if="scope.row.enable" @click="play(scope.row)">鎾斁</el-button>
- <el-button size="mini" icon="el-icon-close" type="success" v-if="scope.row.enable" @click="stop(scope.row)">鍋滅敤</el-button>
- <el-button size="mini" icon="el-icon-check" type="primary" :loading="startBtnLaoding" v-if="!scope.row.enable" @click="start(scope.row)">鍚敤</el-button>
- <el-button size="mini" icon="el-icon-delete" type="danger" @click="deleteStreamProxy(scope.row)">鍒犻櫎</el-button>
- </el-button-group>
+ <el-button size="medium" icon="el-icon-video-play" type="text" v-if="scope.row.enable" @click="play(scope.row)">鎾斁</el-button>
+ <el-divider direction="vertical"></el-divider>
+ <el-button size="medium" icon="el-icon-switch-button" type="text" v-if="scope.row.enable" @click="stop(scope.row)">鍋滅敤</el-button>
+ <el-divider direction="vertical"></el-divider>
+ <el-button size="medium" icon="el-icon-check" type="text" :loading="scope.row.startBtnLoading" v-if="!scope.row.enable" @click="start(scope.row)">鍚敤</el-button>
+ <el-divider v-if="!scope.row.enable" direction="vertical"></el-divider>
+ <el-button size="medium" icon="el-icon-delete" type="text" style="color: #f56c6c" @click="deleteStreamProxy(scope.row)">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
@@ -130,7 +132,7 @@
count:15,
total:0,
getListLoading: false,
- startBtnLaoding: false
+ startBtnLoading: false
};
},
computed: {
@@ -166,9 +168,14 @@
count: that.count
}
}).then(function (res) {
- that.total = res.data.total;
- that.streamProxyList = res.data.list;
- that.getListLoading = false;
+ if (res.data.code === 0) {
+ that.total = res.data.data.total;
+ for (let i = 0; i < res.data.data.list.length; i++) {
+ res.data.data.list[i]["startBtnLoading"] = false;
+ }
+ that.streamProxyList = res.data.data.list;
+ }
+ that.getListLoading = false;
}).catch(function (error) {
console.log(error);
that.getListLoading = false;
@@ -185,7 +192,7 @@
url:`/api/onvif/search?timeout=3000`,
}).then((res) =>{
this.getListLoading = false;
- if (res.data.code == 0 ){
+ if (res.data.code === 0 ){
if (res.data.data.length > 0) {
this.$refs.onvifEdit.openDialog(res.data.data, (url)=>{
if (url != null) {
@@ -261,7 +268,7 @@
start: function(row){
let that = this;
this.getListLoading = true;
- this.startBtnLaoding = true;
+ this.$set(row, 'startBtnLoading', true)
this.$axios({
method: 'get',
url:`/api/proxy/start`,
@@ -271,8 +278,8 @@
}
}).then(function (res) {
that.getListLoading = false;
- that.startBtnLaoding = false;
- if (res.data == "success"){
+ that.$set(row, 'startBtnLoading', false)
+ if (res.data.code === 0){
that.initData()
}else {
that.$message({
@@ -285,7 +292,7 @@
}).catch(function (error) {
console.log(error);
that.getListLoading = false;
- that.startBtnLaoding = false;
+ that.$set(row, 'startBtnLoading', false)
});
},
stop: function(row){
@@ -305,8 +312,10 @@
console.log(error);
that.getListLoading = false;
});
- }
-
+ },
+ refresh: function (){
+ this.initData();
+ }
}
};
</script>
--
Gitblit v1.8.0