From 9c5b1060af4e6c468b2cf95fbb9ec6d0a05fad5c Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 28 二月 2022 17:56:27 +0800
Subject: [PATCH] 支持删除在线设备
---
web_src/src/components/channelList.vue | 110 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 74 insertions(+), 36 deletions(-)
diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue
index 5e778f7..6eae383 100644
--- a/web_src/src/components/channelList.vue
+++ b/web_src/src/components/channelList.vue
@@ -1,7 +1,6 @@
<template>
<div id="channelList">
<el-container>
-
<el-header>
<uiHeader></uiHeader>
</el-header>
@@ -29,14 +28,38 @@
<devicePlayer ref="devicePlayer" v-loading="isLoging"></devicePlayer>
<!--璁惧鍒楄〃-->
<el-table ref="channelListTable" :data="deviceChannelList" :height="winHeight" border style="width: 100%">
- <el-table-column prop="channelId" label="閫氶亾缂栧彿" width="210">
- </el-table-column>
- <el-table-column prop="channelId" label="璁惧缂栧彿" width="210">
+ <el-table-column prop="channelId" label="閫氶亾缂栧彿" width="200">
</el-table-column>
<el-table-column prop="name" label="閫氶亾鍚嶇О">
</el-table-column>
+ <el-table-column label="蹇収" width="80" align="center">
+ <template slot-scope="scope">
+ <img style="max-height: 3rem;max-width: 4rem;"
+ :id="scope.row.deviceId + '_' + scope.row.channelId"
+ :src="getSnap(scope.row)"
+ @error="getSnapErrorEvent($event.target.id)"
+ alt="">
+<!-- <el-image-->
+<!-- :id="'snapImg_' + scope.row.deviceId + '_' + scope.row.channelId"-->
+<!-- :src="getSnap(scope.row)"-->
+<!-- @error="getSnapErrorEvent($event, scope.row)"-->
+<!-- :fit="'contain'">-->
+<!-- <div slot="error" class="image-slot">-->
+<!-- <i class="el-icon-picture-outline"></i>-->
+<!-- </div>-->
+<!-- </el-image>-->
+ </template>
+ </el-table-column>
<el-table-column prop="subCount" label="瀛愯妭鐐规暟">
</el-table-column>
+ <el-table-column prop="manufacture" label="鍘傚">
+ </el-table-column>
+ <el-table-column label="浣嶇疆淇℃伅" align="center">
+ <template slot-scope="scope">
+ <span>{{scope.row.longitude}},{{scope.row.latitude}}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="ptztypeText" label="浜戝彴绫诲瀷"/>
<el-table-column label="寮�鍚煶棰�" align="center">
<template slot-scope="scope">
<el-switch @change="updateChannel(scope.row)" v-model="scope.row.hasAudio" active-color="#409EFF">
@@ -51,15 +74,15 @@
</div>
</template>
</el-table-column>
- <el-table-column prop="ptztypeText" label="浜戝彴绫诲瀷">
- </el-table-column>
+
+
<el-table-column label="鎿嶄綔" width="280" align="center" fixed="right">
<template slot-scope="scope">
<el-button-group>
<!-- <el-button size="mini" icon="el-icon-video-play" v-if="scope.row.parental == 0" @click="sendDevicePush(scope.row)">鎾斁</el-button> -->
<el-button size="mini" icon="el-icon-video-play" @click="sendDevicePush(scope.row)">鎾斁</el-button>
<el-button size="mini" icon="el-icon-switch-button" type="danger" v-if="!!scope.row.streamId" @click="stopDevicePush(scope.row)">鍋滄</el-button>
- <el-button size="mini" icon="el-icon-s-open" type="primary" v-if="scope.row.parental == 1" @click="changeSubchannel(scope.row)">鏌ョ湅</el-button>
+ <el-button size="mini" icon="el-icon-s-open" type="primary" v-if="scope.row.subCount > 0" @click="changeSubchannel(scope.row)">鏌ョ湅</el-button>
<el-button size="mini" icon="el-icon-video-camera" type="primary" @click="queryRecords(scope.row)">璁惧褰曡薄</el-button>
<!-- <el-button size="mini" @click="sendDevicePush(scope.row)">褰曞儚鏌ヨ</el-button> -->
</el-button-group>
@@ -101,7 +124,8 @@
total: 0,
beforeUrl: "/deviceList",
isLoging: false,
- autoList: true
+ autoList: true,
+ loadSnap:{}
};
},
@@ -118,12 +142,11 @@
},
methods: {
initData: function () {
- if (this.parentChannelId == "" || this.parentChannelId == 0) {
+ if (typeof (this.parentChannelId) == "undefined" || this.parentChannelId == 0) {
this.getDeviceChannelList();
} else {
this.showSubchannels();
}
-
},
initParam: function () {
this.deviceId = this.$route.params.deviceId;
@@ -137,7 +160,6 @@
},
currentChange: function (val) {
var url = `/${this.$router.currentRoute.name}/${this.deviceId}/${this.parentChannelId}/${this.count}/${val}`
- console.log(url)
this.$router.push(url).then(() => {
this.initParam();
this.initData();
@@ -153,18 +175,18 @@
},
getDeviceChannelList: function () {
let that = this;
+ if (typeof (this.$route.params.deviceId) == "undefined") return;
this.$axios({
method: 'get',
url: `/api/device/query/devices/${this.$route.params.deviceId}/channels`,
params:{
- page: that.currentPage,
+ page: that.currentPage,
count: that.count,
query: that.searchSrt,
online: that.online,
channelType: that.channelType
- }
+ }
}).then(function (res) {
- console.log(res);
that.total = res.data.total;
that.deviceChannelList = res.data.list;
// 闃叉鍑虹幇琛ㄦ牸閿欎綅
@@ -174,13 +196,10 @@
}).catch(function (error) {
console.log(error);
});
-
-
},
//閫氱煡璁惧涓婁紶濯掍綋娴�
sendDevicePush: function (itemData) {
- console.log(itemData);
let deviceId = this.deviceId;
this.isLoging = true;
let channelId = itemData.channelId;
@@ -190,18 +209,25 @@
method: 'get',
url: '/api/play/start/' + deviceId + '/' + channelId
}).then(function (res) {
- console.log(res.data)
- let streamId = res.data.streamId;
that.isLoging = false;
- if (!!streamId) {
- // that.$refs.devicePlayer.play(res.data, deviceId, channelId, itemData.hasAudio);
- that.$refs.devicePlayer.openDialog("media", deviceId, channelId, {
- streamInfo: res.data,
- hasAudio: itemData.hasAudio
- });
+ if (res.data.code === 0) {
+
+ setTimeout(()=>{
+
+ let snapId = deviceId + "_" + channelId;
+ that.loadSnap[snapId] = 0;
+ that.getSnapErrorEvent(snapId)
+ },5000)
+ that.$refs.devicePlayer.openDialog("media", deviceId, channelId, {
+ streamInfo: res.data.data,
+ hasAudio: itemData.hasAudio
+ });
+ setTimeout(()=>{
that.initData();
- } else {
- that.$message.error(res.data);
+ },1000)
+
+ }else {
+ that.$message.error(res.data.msg);
}
}).catch(function (e) {});
},
@@ -212,23 +238,38 @@
this.$refs.devicePlayer.openDialog("record", deviceId, channelId, {date: format})
},
stopDevicePush: function (itemData) {
- console.log(itemData)
var that = this;
this.$axios({
method: 'get',
- url: '/api/play/stop/' + itemData.streamId
+ url: '/api/play/stop/' + this.deviceId + "/" + itemData.channelId
}).then(function (res) {
- console.log(JSON.stringify(res));
that.initData();
}).catch(function (error) {
- if (error.response.status == 402) { // 宸茬粡鍋滄杩�
+ if (error.response.status === 402) { // 宸茬粡鍋滄杩�
that.initData();
}else {
- console.log(e)
+ console.log(error)
}
});
},
+ getSnap: function (row){
+ return '/static/snap/' + row.deviceId + '_' + row.channelId + '.jpg'
+ },
+ getSnapErrorEvent: function (id){
+ if (typeof (this.loadSnap[id]) != "undefined") {
+ console.log("涓嬭浇鎴浘" + this.loadSnap[id])
+ if (this.loadSnap[id] > 5) {
+ delete this.loadSnap[id];
+ return;
+ }
+ setTimeout(()=>{
+ this.loadSnap[id] ++
+ document.getElementById(id).setAttribute("src", '/static/snap/' + id + '.jpg?' + new Date().getTime())
+ },1000)
+
+ }
+ },
showDevice: function () {
this.$router.push(this.beforeUrl).then(() => {
this.initParam();
@@ -236,7 +277,6 @@
})
},
changeSubchannel(itemData) {
- console.log(this.$router.currentRoute)
this.beforeUrl = this.$router.currentRoute.path;
var url = `/${this.$router.currentRoute.name}/${this.$router.currentRoute.params.deviceId}/${itemData.channelId}/${this.$router.currentRoute.params.count}/1`
@@ -253,7 +293,7 @@
this.$axios({
method: 'get',
- url:`/api/device/query/sub_channels/${this.deviceId}/${this.parentChannelId}/channels`,
+ url:`/api/device/query/sub_channels/${this.deviceId}/${this.parentChannelId}/channels`,
params: {
page: that.currentPage,
count: that.count,
@@ -273,13 +313,11 @@
});
},
search: function () {
- console.log(this.searchSrt)
this.currentPage = 1;
this.total = 0;
this.initData();
},
updateChannel: function (row) {
- console.log(row)
this.$axios({
method: 'post',
url: `/api/device/query/channel/update/${this.deviceId}`,
--
Gitblit v1.8.0