From c1bc45fe8fc898b451b52d4f9dd2fc7d01e94878 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 06 十一月 2023 15:13:58 +0800
Subject: [PATCH] 修复点播接口状态判断错误
---
web_src/src/components/ParentPlatformList.vue | 48 ++++++++++++++++++++++++++++--------------------
1 files changed, 28 insertions(+), 20 deletions(-)
diff --git a/web_src/src/components/ParentPlatformList.vue b/web_src/src/components/ParentPlatformList.vue
old mode 100644
new mode 100755
index 20a3e82..c3c9735
--- a/web_src/src/components/ParentPlatformList.vue
+++ b/web_src/src/components/ParentPlatformList.vue
@@ -4,14 +4,15 @@
<div class="page-title">涓婄骇骞冲彴鍒楄〃</div>
<div class="page-header-btn">
<el-button icon="el-icon-plus" size="mini" style="margin-right: 1rem;" type="primary" @click="addParentPlatform">娣诲姞</el-button>
+ <el-button icon="el-icon-refresh-right" circle size="mini" @click="refresh()"></el-button>
</div>
</div>
<!--璁惧鍒楄〃-->
- <el-table :data="platformList" border style="width: 100%" :height="winHeight">
- <el-table-column prop="name" label="鍚嶇О" align="center"></el-table-column>
- <el-table-column prop="serverGBId" label="骞冲彴缂栧彿" align="center"></el-table-column>
- <el-table-column label="鏄惁鍚敤" width="120" align="center">
+ <el-table :data="platformList" style="width: 100%" :height="winHeight">
+ <el-table-column prop="name" label="鍚嶇О" ></el-table-column>
+ <el-table-column prop="serverGBId" label="骞冲彴缂栧彿" min-width="200"></el-table-column>
+ <el-table-column label="鏄惁鍚敤" min-width="80" >
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<el-tag size="medium" v-if="scope.row.enable">宸插惎鐢�</el-tag>
@@ -19,7 +20,7 @@
</div>
</template>
</el-table-column>
- <el-table-column label="鐘舵��" width="120" align="center">
+ <el-table-column label="鐘舵��" min-width="80" >
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<el-tag size="medium" v-if="scope.row.status">鍦ㄧ嚎</el-tag>
@@ -27,17 +28,17 @@
</div>
</template>
</el-table-column>
- <el-table-column label="鍦板潃" width="180" align="center">
+ <el-table-column label="鍦板潃" min-width="160" >
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<el-tag size="medium">{{ scope.row.serverIP}}:{{scope.row.serverPort }}</el-tag>
</div>
</template>
</el-table-column>
- <el-table-column prop="deviceGBId" label="璁惧鍥芥爣缂栧彿" width="200" align="center"></el-table-column>
- <el-table-column prop="transport" label="淇′护浼犺緭妯″紡" width="120" align="center"></el-table-column>
- <el-table-column prop="channelCount" label="閫氶亾鏁�" width="120" align="center"></el-table-column>
- <el-table-column label="璁㈤槄淇℃伅" width="240" align="center" fixed="right">
+ <el-table-column prop="deviceGBId" label="璁惧鍥芥爣缂栧彿" min-width="200" ></el-table-column>
+ <el-table-column prop="transport" label="淇′护浼犺緭妯″紡" min-width="120" ></el-table-column>
+ <el-table-column prop="channelCount" label="閫氶亾鏁�" min-width="120" ></el-table-column>
+ <el-table-column label="璁㈤槄淇℃伅" min-width="120" fixed="right">
<template slot-scope="scope">
<i v-if="scope.row.alarmSubscribe" style="font-size: 20px" title="鎶ヨ璁㈤槄" class="iconfont icon-gbaojings subscribe-on " ></i>
<i v-if="!scope.row.alarmSubscribe" style="font-size: 20px" title="鎶ヨ璁㈤槄" class="iconfont icon-gbaojings subscribe-off " ></i>
@@ -48,11 +49,11 @@
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" width="300" align="center" fixed="right">
+ <el-table-column label="鎿嶄綔" min-width="240" fixed="right">
<template slot-scope="scope">
- <el-button size="mini" icon="el-icon-edit" @click="editPlatform(scope.row)">缂栬緫</el-button>
- <el-button size="mini" icon="el-icon-share" type="primary" @click="chooseChannel(scope.row)">閫夋嫨閫氶亾</el-button>
- <el-button size="mini" icon="el-icon-delete" type="danger" @click="deletePlatform(scope.row)">鍒犻櫎</el-button>
+ <el-button size="medium" icon="el-icon-edit" type="text" @click="editPlatform(scope.row)">缂栬緫</el-button>
+ <el-button size="medium" icon="el-icon-share" type="text" @click="chooseChannel(scope.row)">閫夋嫨閫氶亾</el-button>
+ <el-button size="medium" icon="el-icon-delete" type="text" style="color: #f56c6c" @click="deletePlatform(scope.row)">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
@@ -126,10 +127,10 @@
deletePlatformCommit: function(platform) {
var that = this;
that.$axios({
- method: 'delete',
- url:`/api/platform/delete/${platform.serverGBId}`
+ method: 'delete',
+ url:`/api/platform/delete/${platform.serverGBId}`
}).then(function (res) {
- if (res.data == "success") {
+ if (res.data.code === 0) {
that.$message({
showClose: true,
message: '鍒犻櫎鎴愬姛',
@@ -142,7 +143,8 @@
});
},
chooseChannel: function(platform) {
- this.$refs.chooseChannelDialog.openDialog(platform.serverGBId, platform.name, platform.catalogId, this.initData)
+ console.log("platform.name: " + platform.name)
+ this.$refs.chooseChannelDialog.openDialog(platform.serverGBId,platform.deviceGBId, platform.name, platform.catalogId, this.initData)
},
initData: function() {
this.getPlatformList();
@@ -162,12 +164,18 @@
method: 'get',
url:`/api/platform/query/${that.count}/${that.currentPage}`
}).then(function (res) {
- that.total = res.data.total;
- that.platformList = res.data.list;
+ if (res.data.code === 0) {
+ that.total = res.data.data.total;
+ that.platformList = res.data.data.list;
+ }
+
}).catch(function (error) {
console.log(error);
});
+ },
+ refresh: function (){
+ this.initData();
}
}
--
Gitblit v1.8.0