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 | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/web_src/src/components/ParentPlatformList.vue b/web_src/src/components/ParentPlatformList.vue
index 39aeb3c..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>
@@ -68,9 +68,9 @@
</template>
<script>
-import platformEdit from './platformEdit.vue'
+import platformEdit from './dialog/platformEdit.vue'
import uiHeader from './UiHeader.vue'
-import chooseChannelDialog from './gb28181/chooseChannel.vue'
+import chooseChannelDialog from './dialog/chooseChannel.vue'
export default {
name: 'app',
components: {
@@ -89,13 +89,12 @@
};
},
computed: {
-
+
getcurrentDeviceChannels: function() {
-
+
}
},
mounted() {
- this.$refs.chooseChannelDialog.openDialog()
this.initData();
this.updateLooper = setInterval(this.initData, 10000);
},
@@ -122,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({
@@ -138,7 +137,9 @@
});
},
chooseChannel: function(platform) {
- this.$refs.chooseChannelDialog.openDialog()
+ this.$refs.chooseChannelDialog.openDialog(platform.serverGBId, ()=>{
+ this.initData()
+ })
},
initData: function() {
this.getPlatformList();
@@ -154,7 +155,7 @@
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.list;
--
Gitblit v1.8.0