From ee490f5b9382285bcd48f834e6e0a1c700e88bdf Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 29 三月 2022 17:15:24 +0800
Subject: [PATCH] Merge pull request #413 from mk1990/wvp-28181-2.0
---
web_src/src/components/DeviceList.vue | 8 ++++----
web_src/src/components/control.vue | 14 +++++++-------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/web_src/src/components/DeviceList.vue b/web_src/src/components/DeviceList.vue
index 7922a93..74e3fbc 100644
--- a/web_src/src/components/DeviceList.vue
+++ b/web_src/src/components/DeviceList.vue
@@ -57,7 +57,7 @@
<el-table-column label="鎿嶄綔" width="450" align="center" fixed="right">
<template slot-scope="scope">
- <el-button size="mini" :ref="scope.row.deviceId + 'refbtn' " v-if="scope.row.online!=0" icon="el-icon-refresh" @click="refDevice(scope.row)">鍒锋柊</el-button>
+ <el-button size="mini" :loading="scope.row.loading" v-if="scope.row.online!=0" icon="el-icon-refresh" @click="refDevice(scope.row)">鍒锋柊</el-button>
<el-button-group>
<el-button size="mini" icon="el-icon-video-camera-solid" v-bind:disabled="scope.row.online==0" type="primary" @click="showChannelList(scope.row)">閫氶亾</el-button>
<el-button size="mini" icon="el-icon-location" v-bind:disabled="scope.row.online==0" type="primary" @click="showDevicePosition(scope.row)">瀹氫綅</el-button>
@@ -204,7 +204,7 @@
refDevice: function(itemData) {
console.log("鍒锋柊瀵瑰簲璁惧:" + itemData.deviceId);
var that = this;
- that.$refs[itemData.deviceId + 'refbtn' ].loading = true;
+ that.$set(itemData,"loading", true);
this.$axios({
method: 'post',
url: '/api/device/query/devices/' + itemData.deviceId + '/sync'
@@ -224,7 +224,7 @@
});
}
that.initData()
- that.$refs[itemData.deviceId + 'refbtn' ].loading = false;
+ that.$set(itemData,"loading", true);
}).catch(function(e) {
console.error(e)
that.$message({
@@ -232,7 +232,7 @@
message: e,
type: 'error'
});
- that.$refs[itemData.deviceId + 'refbtn' ].loading = false;
+ that.$set(itemData,"loading", true);
});
},
//閫氱煡璁惧涓婁紶濯掍綋娴�
diff --git a/web_src/src/components/control.vue b/web_src/src/components/control.vue
index 3651593..9a0a97e 100644
--- a/web_src/src/components/control.vue
+++ b/web_src/src/components/control.vue
@@ -21,7 +21,7 @@
<div style="position: absolute; right: 1rem; top: 0.3rem;">
<el-popover placement="bottom" width="900" height="300" trigger="click">
<div style="height: 600px; overflow:auto; padding: 20px">
- <el-descriptions v-for="(value, key, index) in serverConfig" :key="key" border column="1" style="margin-bottom: 1rem">
+ <el-descriptions v-for="(value, key, index) in serverConfig" :key="key" border :column="1" style="margin-bottom: 1rem">
<template slot="title">
{{key}}
</template>
@@ -37,9 +37,9 @@
</el-popover>
<el-popover placement="bottom" width="900" height="300" trigger="click">
<div style="height: 600px;overflow:auto; padding: 20px">
- <el-descriptions title="鍥芥爣閰嶇疆" border column="1">
+ <el-descriptions title="鍥芥爣閰嶇疆" border :column="1">
<template slot="extra">
- <el-button style="float: right;" type="primary" size="mini" icon="el-icon-document-copy" title="鐐瑰嚮鎷疯礉" v-clipboard="JSON.stringify(wvpServerConfig.sip)" @success="$message({type:'success', message:'鎴愬姛鎷疯礉鍒扮矘璐存澘'})"></el-button>
+ <el-button style="float: right;" type="primary" size="mini" icon="el-icon-document-copy" title="鐐瑰嚮鎷疯礉" v-clipboard="JSON.stringify(wvpServerConfig.sip)|| ''" @success="$message({type:'success', message:'鎴愬姛鎷疯礉鍒扮矘璐存澘'})"></el-button>
</template>
<el-descriptions-item v-for="(value, key, index) in wvpServerConfig.sip">
<template slot="label">
@@ -50,9 +50,9 @@
</el-descriptions>
<div style="margin-top: 1rem">
- <el-descriptions title="鍩虹閰嶇疆" border column="1">
+ <el-descriptions title="鍩虹閰嶇疆" border :column="1">
<template slot="extra">
- <el-button style="float: right;" type="primary" size="mini" icon="el-icon-document-copy" title="鐐瑰嚮鎷疯礉" v-clipboard="JSON.stringify(wvpServerConfig.base)" @success="$message({type:'success', message:'鎴愬姛鎷疯礉鍒扮矘璐存澘'})"></el-button>
+ <el-button style="float: right;" type="primary" size="mini" icon="el-icon-document-copy" title="鐐瑰嚮鎷疯礉" v-clipboard="JSON.stringify(wvpServerConfig.base)|| ''" @success="$message({type:'success', message:'鎴愬姛鎷疯礉鍒扮矘璐存澘'})"></el-button>
</template>
<el-descriptions-item v-for="(value, key, index) in wvpServerConfig.base" :key="key">
<template slot="label" >
@@ -84,9 +84,9 @@
</el-descriptions>
</div>
<div style="margin-top: 1rem">
- <el-descriptions title="鐗堟湰淇℃伅" border column="1">
+ <el-descriptions title="鐗堟湰淇℃伅" border :column="1">
<template slot="extra">
- <el-button style="float: right;" type="primary" size="mini" icon="el-icon-document-copy" title="鐐瑰嚮鎷疯礉" v-clipboard="JSON.stringify(wvpServerVersion)" @success="$message({type:'success', message:'鎴愬姛鎷疯礉鍒扮矘璐存澘'})"></el-button>
+ <el-button style="float: right;" type="primary" size="mini" icon="el-icon-document-copy" title="鐐瑰嚮鎷疯礉" v-clipboard="JSON.stringify(wvpServerVersion) || ''" @success="$message({type:'success', message:'鎴愬姛鎷疯礉鍒扮矘璐存澘'})"></el-button>
</template>
<el-descriptions-item v-for="(value, key, index) in wvpServerVersion" :key="key">
<template slot="label">
--
Gitblit v1.8.0