From 89244932c6185cd39e9a9f8aa8bf3acf99329335 Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期日, 11 四月 2021 15:00:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
web_src/src/components/ParentPlatformList.vue | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/web_src/src/components/ParentPlatformList.vue b/web_src/src/components/ParentPlatformList.vue
index 98b0b41..ee0d342 100644
--- a/web_src/src/components/ParentPlatformList.vue
+++ b/web_src/src/components/ParentPlatformList.vue
@@ -19,7 +19,7 @@
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<el-tag size="medium" v-if="scope.row.enable">宸插惎鐢�</el-tag>
- <el-tag size="medium" v-if="!scope.row.enable">鏈惎鐢�</el-tag>
+ <el-tag size="medium" type="info" v-if="!scope.row.enable">鏈惎鐢�</el-tag>
</div>
</template>
</el-table-column>
@@ -39,9 +39,9 @@
</template>
</el-table-column>
<el-table-column prop="deviceGBId" label="璁惧鍥芥爣缂栧彿" width="240" align="center"></el-table-column>
- <el-table-column prop="transport" label="娴佷紶杈撴ā寮�" width="120" align="center"></el-table-column>
+ <el-table-column prop="transport" label="淇′护浼犺緭妯″紡" width="120" align="center"></el-table-column>
<el-table-column prop="channelCount" label="閫氶亾鏁�" align="center"></el-table-column>
-
+
<el-table-column label="鎿嶄綔" width="300" align="center" fixed="right">
<template slot-scope="scope">
<el-button size="mini" icon="el-icon-edit" @click="editPlatform(scope.row)">缂栬緫</el-button>
@@ -61,19 +61,22 @@
:total="total">
</el-pagination>
<platformEdit ref="platformEdit" ></platformEdit>
+ <chooseChannelDialog ref="chooseChannelDialog" ></chooseChannelDialog>
</el-main>
</el-container>
</div>
</template>
<script>
-import platformEdit from './platformEdit.vue'
+import platformEdit from './dialog/platformEdit.vue'
import uiHeader from './UiHeader.vue'
+import chooseChannelDialog from './dialog/chooseChannel.vue'
export default {
name: 'app',
components: {
platformEdit,
- uiHeader
+ uiHeader,
+ chooseChannelDialog
},
data() {
return {
@@ -86,8 +89,9 @@
};
},
computed: {
+
getcurrentDeviceChannels: function() {
-
+
}
},
mounted() {
@@ -117,7 +121,7 @@
},
deletePlatformCommit: function(platform) {
var that = this;
- that.$axios.post(`/api/platforms/delete`, platform)
+ that.$axios.delete(`/api/platform/delete/${platform.serverGBId}`)
.then(function (res) {
if (res.data == "success") {
that.$message({
@@ -133,7 +137,9 @@
});
},
chooseChannel: function(platform) {
-
+ this.$refs.chooseChannelDialog.openDialog(platform.serverGBId, ()=>{
+ this.initData()
+ })
},
initData: function() {
this.getPlatformList();
@@ -149,10 +155,10 @@
getPlatformList: function() {
let that = this;
- this.$axios.get(`/api/platforms/${that.count}/${that.currentPage - 1}`)
+ this.$axios.get(`/api/platform/query/${that.count}/${that.currentPage}`)
.then(function (res) {
that.total = res.data.total;
- that.platformList = res.data.data;
+ that.platformList = res.data.list;
})
.catch(function (error) {
console.log(error);
--
Gitblit v1.8.0