From ba8633e99a27b90c55b47e8f7d6225f1f0efc6bb Mon Sep 17 00:00:00 2001
From: 648540858 <456panlinlin>
Date: 星期五, 08 四月 2022 18:09:23 +0800
Subject: [PATCH] 优化地图-添加地图页面以及设备树
---
web_src/src/components/ParentPlatformList.vue | 263 +++++++++++++++++++---------------------------------
1 files changed, 98 insertions(+), 165 deletions(-)
diff --git a/web_src/src/components/ParentPlatformList.vue b/web_src/src/components/ParentPlatformList.vue
index 947adec..5becea5 100644
--- a/web_src/src/components/ParentPlatformList.vue
+++ b/web_src/src/components/ParentPlatformList.vue
@@ -8,49 +8,55 @@
<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>
- <devicePlayer ref="devicePlayer"></devicePlayer>
+ <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="deviceList" border style="width: 100%" :height="winHeight">
- <el-table-column prop="name" label="鍚嶇О" width="180" align="center">
- </el-table-column>
- <el-table-column prop="deviceId" label="骞冲彴缂栧彿" width="240" align="center">
- </el-table-column>
- <el-table-column prop="deviceId" label="鏄惁鍚敤" width="50" align="center">
- </el-table-column>
- <el-table-column label="鐘舵��" width="180" align="center">
+ <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="骞冲彴缂栧彿" 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.online == 1">鍦ㄧ嚎</el-tag>
- <el-tag size="medium" type="info" v-if="scope.row.online == 0">绂荤嚎</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>
+ <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.host.address }}</el-tag>
+ <el-tag size="medium">{{ scope.row.serverIP}}:{{scope.row.serverPort }}</el-tag>
</div>
</template>
- <el-table-column prop="deviceId" label="璁惧鍥芥爣缂栧彿" width="240" align="center">
- </el-table-column>
</el-table-column>
-
- <el-table-column label="娴佷紶杈撴ā寮�" align="center" width="160">
+ <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">
<template slot-scope="scope">
- <el-select size="mini" @change="transportChange(scope.row)" v-model="scope.row.streamMode" placeholder="璇烽�夋嫨">
- <el-option key="UDP" label="UDP" value="UDP"></el-option>
- <el-option key="TCP-ACTIVE" label="TCP涓诲姩妯″紡" :disabled="true" value="TCP-ACTIVE"></el-option>
- <el-option key="TCP-PASSIVE" label="TCP琚姩妯″紡" value="TCP-PASSIVE"></el-option>
- </el-select>
+ <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 prop="channelCount" label="閫氶亾鏁�" align="center">
- </el-table-column>
- <el-table-column label="鎿嶄綔" width="240" align="center" fixed="right">
+ <el-table-column label="鎿嶄綔" width="300" align="center" fixed="right">
<template slot-scope="scope">
- <el-button size="mini" icon="el-icon-refresh" @click="refDevice(scope.row)">鍒锋柊閫氶亾</el-button>
- <el-button size="mini" icon="el-icon-s-open" type="primary" @click="showChannelList(scope.row)">鏌ョ湅閫氶亾</el-button>
+ <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>
@@ -64,48 +70,38 @@
layout="total, sizes, prev, pager, next"
:total="total">
</el-pagination>
-
+ <platformEdit ref="platformEdit" ></platformEdit>
+ <chooseChannelDialog ref="chooseChannelDialog" ></chooseChannelDialog>
</el-main>
</el-container>
</div>
</template>
<script>
-import devicePlayer from './gb28181/devicePlayer.vue'
+import platformEdit from './dialog/platformEdit.vue'
import uiHeader from './UiHeader.vue'
+import chooseChannelDialog from './dialog/chooseChannel.vue'
export default {
name: 'app',
components: {
- devicePlayer,
- uiHeader
+ platformEdit,
+ uiHeader,
+ chooseChannelDialog
},
data() {
return {
- deviceList: [], //璁惧鍒楄〃
- currentDevice: {}, //褰撳墠鎿嶄綔璁惧瀵硅薄
+ platformList: [], //璁惧鍒楄〃
- videoComponentList: [],
- updateLooper: 0, //鏁版嵁鍒锋柊杞鏍囧織
- currentDeviceChannelsLenth:0,
- winHeight: window.innerHeight - 200,
+ winHeight: window.innerHeight - 260,
currentPage:1,
count:15,
total:0
};
},
computed: {
- getcurrentDeviceChannels: function() {
- let data = this.currentDevice['channelMap'];
- let channels = null;
- if (data) {
- channels = Object.keys(data).map(key => {
- return data[key];
- });
- this.currentDeviceChannelsLenth = channels.length;
- }
- console.log("鏁版嵁锛�" + JSON.stringify(channels));
- return channels;
+ getcurrentDeviceChannels: function() {
+
}
},
mounted() {
@@ -113,146 +109,83 @@
this.updateLooper = setInterval(this.initData, 10000);
},
destroyed() {
- this.$destroy('videojs');
clearTimeout(this.updateLooper);
},
methods: {
+ addParentPlatform: function() {
+ this.$refs.platformEdit.openDialog(null, this.initData)
+ },
+ editPlatform: function(platform) {
+ console.log(platform)
+ this.$refs.platformEdit.openDialog(platform, this.initData)
+ },
+ deletePlatform: function(platform) {
+ var that = this;
+ that.$confirm('纭鍒犻櫎?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ that.deletePlatformCommit(platform)
+ })
+ },
+ deletePlatformCommit: function(platform) {
+ var that = this;
+ that.$axios({
+ method: 'delete',
+ url:`/api/platform/delete/${platform.serverGBId}`
+ }).then(function (res) {
+ if (res.data == "success") {
+ that.$message({
+ showClose: true,
+ message: '鍒犻櫎鎴愬姛',
+ type: 'success'
+ });
+ that.initData()
+ }
+ }).catch(function (error) {
+ console.log(error);
+ });
+ },
+ chooseChannel: function(platform) {
+ this.$refs.chooseChannelDialog.openDialog(platform.serverGBId, platform.name, platform.catalogId, this.initData)
+ },
initData: function() {
- this.getDeviceList();
+ this.getPlatformList();
},
currentChange: function(val){
this.currentPage = val;
- this.getDeviceList();
+ this.getPlatformList();
},
handleSizeChange: function(val){
this.count = val;
- this.getDeviceList();
+ this.getPlatformList();
},
- getDeviceList: function() {
+ getPlatformList: function() {
let that = this;
- this.$axios.get(`/api/devices`,{
- params: {
- page: that.currentPage - 1,
- count: that.count
- }
- } )
- .then(function (res) {
- console.log(res);
- that.total = res.data.total;
- that.deviceList = res.data.data;
- })
- .catch(function (error) {
- console.log(error);
- });
-
- },
- showChannelList: function(row) {
- console.log(JSON.stringify(row))
- this.$router.push(`/channelList/${row.deviceId}/0/15/1`);
- },
-
-
- //gb28181骞冲彴瀵规帴
- //鍒锋柊璁惧淇℃伅
- refDevice: function(itemData) {
- ///api/devices/{deviceId}/sync
- console.log("鍒锋柊瀵瑰簲璁惧:" + itemData.deviceId);
this.$axios({
- method: 'post',
- url: '/api/devices/' + itemData.deviceId + '/sync'
- }).then(function(res) {
- // console.log("鍒锋柊璁惧缁撴灉锛�"+JSON.stringify(res));
- }).catch(function(e) {
- that.$message({
- showClose: true,
- message: '璇锋眰鎴愬姛',
- type: 'success'
- });
- });;
- },
- //閫氱煡璁惧涓婁紶濯掍綋娴�
- sendDevicePush: function(itemData) {
- let deviceId = this.currentDevice.deviceId;
- let channelId = itemData.channelId;
- console.log("閫氱煡璁惧鎺ㄦ祦1锛�" + deviceId + " : " + channelId);
- let that = this;
- this.$axios({
- method: 'get',
- url: '/api/play/' + deviceId + '/' + channelId
- }).then(function(res) {
- let ssrc = res.data.ssrc;
- that.$refs.devicePlayer.play(ssrc,deviceId,channelId);
- }).catch(function(e) {
+ method: 'get',
+ url:`/api/platform/query/${that.count}/${that.currentPage}`
+ }).then(function (res) {
+ that.total = res.data.total;
+ that.platformList = res.data.list;
+ }).catch(function (error) {
+ console.log(error);
});
- },
- transportChange: function (row) {
- console.log(row);
- console.log(`淇敼浼犺緭鏂瑰紡涓� ${row.streamMode}锛�${row.deviceId} `);
- let that = this;
- this.$axios({
- method: 'get',
- url: '/api/devices/' + row.deviceId + '/transport/' + row.streamMode
- }).then(function(res) {
- }).catch(function(e) {
- });
}
}
};
</script>
-
<style>
-.videoList {
- display: flex;
- flex-wrap: wrap;
- align-content: flex-start;
+.subscribe-on{
+ color: #409EFF;
+ font-size: 18px;
}
-
-.video-item {
- position: relative;
- width: 15rem;
- height: 10rem;
- margin-right: 1rem;
- background-color: #000000;
-}
-
-.video-item-img {
- position: absolute;
- top: 0;
- bottom: 0;
- left: 0;
- right: 0;
- margin: auto;
- width: 100%;
- height: 100%;
-}
-
-.video-item-img:after {
- content: "";
- display: inline-block;
- position: absolute;
- z-index: 2;
- top: 0;
- bottom: 0;
- left: 0;
- right: 0;
- margin: auto;
- width: 3rem;
- height: 3rem;
- background-image: url("../assets/loading.png");
- background-size: cover;
- background-color: #000000;
-}
-
-.video-item-title {
- position: absolute;
- bottom: 0;
- color: #000000;
- background-color: #ffffff;
- line-height: 1.5rem;
- padding: 0.3rem;
- width: 14.4rem;
+.subscribe-off{
+ color: #afafb3;
+ font-size: 18px;
}
</style>
--
Gitblit v1.8.0