From 7d6aaf3bb0a4bdcc319eaec1840c78ab32cfa81e Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 12 十月 2023 16:36:07 +0800
Subject: [PATCH] 修复国标接连选择通道相关的问题
---
web_src/src/components/ParentPlatformList.vue | 210 +++++++++++++++++++++++++++++----------------------
1 files changed, 119 insertions(+), 91 deletions(-)
diff --git a/web_src/src/components/ParentPlatformList.vue b/web_src/src/components/ParentPlatformList.vue
old mode 100644
new mode 100755
index 0d3ce69..c3c9735
--- a/web_src/src/components/ParentPlatformList.vue
+++ b/web_src/src/components/ParentPlatformList.vue
@@ -1,79 +1,87 @@
<template>
- <div id="app">
- <el-container>
- <el-header>
- <uiHeader></uiHeader>
- </el-header>
- <el-main>
- <div style="background-color: #FFFFFF; margin-bottom: 1rem; position: relative; padding: 0.5rem; text-align: left;">
- <span style="font-size: 1rem; font-weight: bold;">涓婄骇骞冲彴鍒楄〃</span>
- </div>
- <div style="background-color: #FFFFFF; margin-bottom: 1rem; position: relative; padding: 0.5rem; text-align: left;font-size: 14px;">
- <el-button icon="el-icon-plus" size="mini" style="margin-right: 1rem;" type="primary" @click="addParentPlatform">娣诲姞</el-button>
- </div>
- <!--璁惧鍒楄〃-->
- <el-table :data="platformList" border style="width: 100%" :height="winHeight">
- <el-table-column prop="name" label="鍚嶇О" width="240" align="center"></el-table-column>
- <el-table-column prop="serverGBId" label="骞冲彴缂栧彿" width="180" align="center"></el-table-column>
- <el-table-column label="鏄惁鍚敤" width="120" align="center">
- <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>
- </div>
- </template>
- </el-table-column>
- <el-table-column label="鐘舵��" width="120" align="center">
- <template slot-scope="scope">
- <div slot="reference" class="name-wrapper">
- <el-tag size="medium" v-if="scope.row.status">鍦ㄧ嚎</el-tag>
- <el-tag size="medium" type="info" v-if="!scope.row.status">绂荤嚎</el-tag>
- </div>
- </template>
- </el-table-column>
- <el-table-column label="鍦板潃" width="180" align="center">
- <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="240" 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>
- <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>
- </template>
- </el-table-column>
- </el-table>
- <el-pagination
- style="float: right"
- @size-change="handleSizeChange"
- @current-change="currentChange"
- :current-page="currentPage"
- :page-size="count"
- :page-sizes="[15, 25, 35, 50]"
- layout="total, sizes, prev, pager, next"
- :total="total">
- </el-pagination>
- <platformEdit ref="platformEdit" ></platformEdit>
- </el-main>
- </el-container>
+ <div id="app" style="width: 100%">
+ <div class="page-header">
+ <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" 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>
+ <el-tag size="medium" type="info" v-if="!scope.row.enable">鏈惎鐢�</el-tag>
+ </div>
+ </template>
+ </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.status">鍦ㄧ嚎</el-tag>
+ <el-tag size="medium" type="info" v-if="!scope.row.status">绂荤嚎</el-tag>
+ </div>
+ </template>
+ </el-table-column>
+ <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="璁惧鍥芥爣缂栧彿" 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>
+ <i v-if="scope.row.catalogSubscribe" title="鐩綍璁㈤槄" class="iconfont icon-gjichus subscribe-on" ></i>
+ <i v-if="!scope.row.catalogSubscribe" title="鐩綍璁㈤槄" class="iconfont icon-gjichus subscribe-off" ></i>
+ <i v-if="scope.row.mobilePositionSubscribe" title="浣嶇疆璁㈤槄" class="iconfont icon-gxunjians subscribe-on" ></i>
+ <i v-if="!scope.row.mobilePositionSubscribe" title="浣嶇疆璁㈤槄" class="iconfont icon-gxunjians subscribe-off" ></i>
+ </template>
+ </el-table-column>
+
+ <el-table-column label="鎿嶄綔" min-width="240" fixed="right">
+ <template slot-scope="scope">
+ <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>
+ <el-pagination
+ style="float: right"
+ @size-change="handleSizeChange"
+ @current-change="currentChange"
+ :current-page="currentPage"
+ :page-size="count"
+ :page-sizes="[15, 25, 35, 50]"
+ layout="total, sizes, prev, pager, next"
+ :total="total">
+ </el-pagination>
+ <platformEdit ref="platformEdit" ></platformEdit>
+ <chooseChannelDialog ref="chooseChannelDialog" ></chooseChannelDialog>
</div>
</template>
<script>
-import platformEdit from './platformEdit.vue'
-import uiHeader from './UiHeader.vue'
+import platformEdit from './dialog/platformEdit.vue'
+import uiHeader from '../layout/UiHeader.vue'
+import chooseChannelDialog from './dialog/chooseChannel.vue'
export default {
name: 'app',
components: {
platformEdit,
- uiHeader
+ uiHeader,
+ chooseChannelDialog
},
data() {
return {
@@ -86,8 +94,9 @@
};
},
computed: {
+
getcurrentDeviceChannels: function() {
-
+
}
},
mounted() {
@@ -117,23 +126,25 @@
},
deletePlatformCommit: function(platform) {
var that = this;
- that.$axios.post(`/api/platforms/delete`, platform)
- .then(function (res) {
- if (res.data == "success") {
- that.$message({
- showClose: true,
- message: '鍒犻櫎鎴愬姛',
- type: 'success'
- });
- that.initData()
- }
- })
- .catch(function (error) {
- console.log(error);
- });
+ that.$axios({
+ method: 'delete',
+ url:`/api/platform/delete/${platform.serverGBId}`
+ }).then(function (res) {
+ if (res.data.code === 0) {
+ that.$message({
+ showClose: true,
+ message: '鍒犻櫎鎴愬姛',
+ type: 'success'
+ });
+ that.initData()
+ }
+ }).catch(function (error) {
+ console.log(error);
+ });
},
chooseChannel: function(platform) {
-
+ console.log("platform.name: " + platform.name)
+ this.$refs.chooseChannelDialog.openDialog(platform.serverGBId,platform.deviceGBId, platform.name, platform.catalogId, this.initData)
},
initData: function() {
this.getPlatformList();
@@ -149,17 +160,34 @@
getPlatformList: function() {
let that = this;
- this.$axios.get(`/api/platforms/${that.count}/${that.currentPage - 1}`)
- .then(function (res) {
- that.total = res.data.total;
- that.platformList = res.data.list;
- })
- .catch(function (error) {
- console.log(error);
- });
+ this.$axios({
+ method: 'get',
+ url:`/api/platform/query/${that.count}/${that.currentPage}`
+ }).then(function (res) {
+ 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();
}
}
};
</script>
+<style>
+.subscribe-on{
+ color: #409EFF;
+ font-size: 18px;
+}
+.subscribe-off{
+ color: #afafb3;
+ font-size: 18px;
+}
+</style>
--
Gitblit v1.8.0