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/channelList.vue | 425 ++++++++++++++++++++++++++++++++--------------------
1 files changed, 260 insertions(+), 165 deletions(-)
diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue
old mode 100644
new mode 100755
index 8d06542..612416b
--- a/web_src/src/components/channelList.vue
+++ b/web_src/src/components/channelList.vue
@@ -2,124 +2,150 @@
<div id="channelList" style="width: 100%">
<div class="page-header">
<div class="page-title">
- <el-button icon="el-icon-arrow-left" size="mini" style="margin-right: 1rem;" type="primary" @click="showDevice">
- 杩斿洖
- </el-button>
- 閫氶亾鍒楄〃({{ parentChannelId == 0 ? deviceId : parentChannelId }})</div>
+ <el-button icon="el-icon-back" size="mini" style="font-size: 20px; color: #000;" type="text" @click="showDevice" ></el-button>
+ <el-divider direction="vertical"></el-divider>
+ 閫氶亾鍒楄〃
+ </div>
<div class="page-header-btn">
- 鎼滅储:
- <el-input @input="search" style="margin-right: 1rem; width: auto;" size="mini" placeholder="鍏抽敭瀛�"
- prefix-icon="el-icon-search" v-model="searchSrt" clearable></el-input>
+ <div v-if="!showTree" style="display: inline;">
+ 鎼滅储:
+ <el-input @input="search" style="margin-right: 1rem; width: auto;" size="mini" placeholder="鍏抽敭瀛�"
+ prefix-icon="el-icon-search" v-model="searchSrt" clearable></el-input>
- 閫氶亾绫诲瀷:
- <el-select size="mini" @change="search" style="margin-right: 1rem;" v-model="channelType" placeholder="璇烽�夋嫨"
- default-first-option>
- <el-option label="鍏ㄩ儴" value=""></el-option>
- <el-option label="璁惧" value="false"></el-option>
- <el-option label="瀛愮洰褰�" value="true"></el-option>
- </el-select>
- 鍦ㄧ嚎鐘舵��:
- <el-select size="mini" style="margin-right: 1rem;" @change="search" v-model="online" placeholder="璇烽�夋嫨"
- default-first-option>
- <el-option label="鍏ㄩ儴" value=""></el-option>
- <el-option label="鍦ㄧ嚎" value="true"></el-option>
- <el-option label="绂荤嚎" value="false"></el-option>
- </el-select>
- <el-checkbox size="mini" v-model="autoList" @change="autoListChange">
- 鑷姩鍒锋柊
- </el-checkbox>
+ 閫氶亾绫诲瀷:
+ <el-select size="mini" @change="search" style="margin-right: 1rem;" v-model="channelType" placeholder="璇烽�夋嫨"
+ default-first-option>
+ <el-option label="鍏ㄩ儴" value=""></el-option>
+ <el-option label="璁惧" value="false"></el-option>
+ <el-option label="瀛愮洰褰�" value="true"></el-option>
+ </el-select>
+ 鍦ㄧ嚎鐘舵��:
+ <el-select size="mini" style="margin-right: 1rem;" @change="search" v-model="online" placeholder="璇烽�夋嫨"
+ default-first-option>
+ <el-option label="鍏ㄩ儴" value=""></el-option>
+ <el-option label="鍦ㄧ嚎" value="true"></el-option>
+ <el-option label="绂荤嚎" value="false"></el-option>
+ </el-select>
+ 娓呮櫚搴�:
+ <el-select size="mini" style="margin-right: 1rem;" @change="search" v-model="isSubStream" placeholder="璇烽�夋嫨"
+ default-first-option>
+ <el-option label="鍘熺敾" :value="false"></el-option>
+ <el-option label="娴佺晠" :value="true"></el-option>
+ </el-select>
+ </div>
+ <el-button icon="el-icon-refresh-right" circle size="mini" @click="refresh()"></el-button>
+ <el-button v-if="showTree" icon="iconfont icon-list" circle size="mini" @click="switchList()"></el-button>
+ <el-button v-if="!showTree" icon="iconfont icon-tree" circle size="mini" @click="switchTree()"></el-button>
</div>
</div>
- <devicePlayer ref="devicePlayer" v-loading="isLoging"></devicePlayer>
+ <devicePlayer ref="devicePlayer" ></devicePlayer>
+ <el-container v-loading="isLoging" style="height: 82vh;">
+ <el-aside width="auto" style="height: 82vh; background-color: #ffffff; overflow: auto" v-if="showTree" >
+ <DeviceTree ref="deviceTree" :device="device" :onlyCatalog="true" :clickEvent="treeNodeClickEvent" ></DeviceTree>
+ </el-aside>
+ <el-main style="padding: 5px;">
+ <el-table ref="channelListTable" :data="deviceChannelList" :height="winHeight" style="width: 100%" header-row-class-name="table-header">
+ <el-table-column prop="channelId" label="閫氶亾缂栧彿" min-width="200">
+ </el-table-column>
+ <el-table-column prop="deviceId" label="璁惧缂栧彿" min-width="200">
+ </el-table-column>
+ <el-table-column prop="name" label="閫氶亾鍚嶇О" min-width="200">
+ </el-table-column>
+ <el-table-column label="蹇収" min-width="120">
+ <template v-slot:default="scope">
+ <el-image
+ :src="getSnap(scope.row)"
+ :preview-src-list="getBigSnap(scope.row)"
+ @error="getSnapErrorEvent(scope.row.deviceId, scope.row.channelId)"
+ :fit="'contain'"
+ style="width: 60px">
+ <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="瀛愯妭鐐规暟" min-width="120">
+ </el-table-column>
+ <el-table-column prop="manufacture" label="鍘傚" min-width="120">
+ </el-table-column>
+ <el-table-column label="浣嶇疆淇℃伅" min-width="200">
+ <template slot-scope="scope">
+ <span v-if="scope.row.longitude*scope.row.latitude > 0">{{ scope.row.longitude }},<br>{{ scope.row.latitude }}</span>
+ <span v-if="scope.row.longitude*scope.row.latitude === 0">鏃�</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="PTZTypeText" label="浜戝彴绫诲瀷" min-width="120"/>
+ <el-table-column label="寮�鍚煶棰�" min-width="120">
+ <template slot-scope="scope">
+ <el-switch @change="updateChannel(scope.row)" v-model="scope.row.hasAudio" active-color="#409EFF">
+ </el-switch>
+ </template>
+ </el-table-column>
+ <el-table-column label="鐘舵��" min-width="120">
+ <template slot-scope="scope">
+ <div slot="reference" class="name-wrapper">
+ <el-tag size="medium" v-if="scope.row.status === true">鍦ㄧ嚎</el-tag>
+ <el-tag size="medium" type="info" v-if="scope.row.status === false">绂荤嚎</el-tag>
+ </div>
+ </template>
+ </el-table-column>
+
+
+ <el-table-column label="鎿嶄綔" min-width="280" fixed="right">
+ <template slot-scope="scope">
+ <el-button size="medium" v-bind:disabled="device == null || device.online === 0" icon="el-icon-video-play" type="text" @click="sendDevicePush(scope.row)">鎾斁</el-button>
+ <el-button size="medium" v-bind:disabled="device == null || device.online === 0" icon="el-icon-switch-button" type="text" style="color: #f56c6c" v-if="!!scope.row.streamId"
+ @click="stopDevicePush(scope.row)">鍋滄
+ </el-button>
+ <el-divider direction="vertical"></el-divider>
+ <el-button size="medium" icon="el-icon-s-open" type="text" v-if="scope.row.subCount > 0 || scope.row.parental === 1"
+ @click="changeSubchannel(scope.row)">鏌ョ湅
+ </el-button>
+ <el-divider v-if="scope.row.subCount > 0 || scope.row.parental === 1" direction="vertical"></el-divider>
+ <el-button size="medium" v-bind:disabled="device == null || device.online === 0" icon="el-icon-video-camera" type="text" @click="queryRecords(scope.row)">璁惧褰曞儚
+ </el-button>
+ <el-button size="medium" v-bind:disabled="device == null || device.online === 0" icon="el-icon-cloudy"
+ type="text" @click="queryCloudRecords(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>
+ </el-main>
+ </el-container>
+
<!--璁惧鍒楄〃-->
- <el-table ref="channelListTable" :data="deviceChannelList" :height="winHeight" border style="width: 100%">
- <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;"
- v-if="scope.row.subCount === 0 && scope.row.parental === 0"
- :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">
- </el-switch>
- </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" v-if="scope.row.status == 1">寮�鍚�</el-tag>
- <el-tag size="medium" type="info" v-if="scope.row.status == 0">鍏抽棴</el-tag>
- </div>
- </template>
- </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.subCount > 0 || scope.row.parental === 1"
- @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>
- </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, 20, 30, 50]"
- layout="total, sizes, prev, pager, next" :total="total">
- </el-pagination>
</div>
</template>
<script>
import devicePlayer from './dialog/devicePlayer.vue'
import uiHeader from '../layout/UiHeader.vue'
-import moment from "moment";
+import DeviceService from "./service/DeviceService";
+import DeviceTree from "./common/DeviceTree";
export default {
name: 'channelList',
components: {
devicePlayer,
- uiHeader
+ uiHeader,
+ DeviceTree
},
data() {
return {
+ deviceService: new DeviceService(),
+ device: null,
deviceId: this.$route.params.deviceId,
parentChannelId: this.$route.params.parentChannelId,
deviceChannelList: [],
@@ -129,22 +155,29 @@
searchSrt: "",
channelType: "",
online: "",
- winHeight: window.innerHeight - 250,
- currentPage: parseInt(this.$route.params.page),
- count: parseInt(this.$route.params.count),
+ isSubStream: false,
+ winHeight: window.innerHeight - 200,
+ currentPage: 1,
+ count: 15,
total: 0,
beforeUrl: "/deviceList",
isLoging: false,
- autoList: true,
+ showTree: false,
loadSnap: {}
};
},
mounted() {
- this.initData();
- if (this.autoList) {
- this.updateLooper = setInterval(this.initData, 5000);
+ if (this.deviceId) {
+ this.deviceService.getDevice(this.deviceId, (result)=>{
+ this.device = result;
+
+ }, (error)=>{
+ console.log("鑾峰彇璁惧淇℃伅澶辫触")
+ console.error(error)
+ })
}
+ this.initData();
},
destroyed() {
@@ -162,27 +195,20 @@
initParam: function () {
this.deviceId = this.$route.params.deviceId;
this.parentChannelId = this.$route.params.parentChannelId;
- this.currentPage = parseInt(this.$route.params.page);
- this.count = parseInt(this.$route.params.count);
+ this.currentPage = 1;
+ this.count = 15;
if (this.parentChannelId == "" || this.parentChannelId == 0) {
this.beforeUrl = "/deviceList"
}
},
currentChange: function (val) {
- var url = `/${this.$router.currentRoute.name}/${this.deviceId}/${this.parentChannelId}/${this.count}/${val}`
- this.$router.push(url).then(() => {
- this.initParam();
- this.initData();
- })
+ this.currentPage = val;
+ this.initData();
},
handleSizeChange: function (val) {
- var url = `/${this.$router.currentRoute.name}/${this.$router.params.deviceId}/${this.$router.params.parentChannelId}/${val}/1`
- this.$router.push(url).then(() => {
- this.initParam();
- this.initData();
- })
-
+ this.count = val;
+ this.getDeviceChannelList();
},
getDeviceChannelList: function () {
let that = this;
@@ -198,12 +224,15 @@
channelType: that.channelType
}
}).then(function (res) {
- that.total = res.data.total;
- that.deviceChannelList = res.data.list;
- // 闃叉鍑虹幇琛ㄦ牸閿欎綅
- that.$nextTick(() => {
- that.$refs.channelListTable.doLayout();
- })
+ if (res.data.code === 0) {
+ that.total = res.data.data.total;
+ that.deviceChannelList = res.data.data.list;
+ // 闃叉鍑虹幇琛ㄦ牸閿欎綅
+ that.$nextTick(() => {
+ that.$refs.channelListTable.doLayout();
+ })
+ }
+
}).catch(function (error) {
console.log(error);
});
@@ -218,17 +247,22 @@
let that = this;
this.$axios({
method: 'get',
- url: '/api/play/start/' + deviceId + '/' + channelId
+ url: '/api/play/start/' + deviceId + '/' + channelId,
+ params:{
+ isSubStream: this.isSubStream
+ }
}).then(function (res) {
+ console.log(res)
that.isLoging = false;
if (res.data.code === 0) {
setTimeout(() => {
let snapId = deviceId + "_" + channelId;
- that.loadSnap[snapId] = 0;
+ that.loadSnap[deviceId + channelId] = 0;
that.getSnapErrorEvent(snapId)
}, 5000)
+ itemData.streamId = res.data.data.stream;
that.$refs.devicePlayer.openDialog("media", deviceId, channelId, {
streamInfo: res.data.data,
hasAudio: itemData.hasAudio
@@ -237,23 +271,35 @@
that.initData();
}, 1000)
- } else {
+ }else{
that.$message.error(res.data.msg);
}
}).catch(function (e) {
+ console.error(e)
+ that.isLoging = false;
+ // that.$message.error("璇锋眰瓒呮椂");
});
},
queryRecords: function (itemData) {
- var format = moment().format("YYYY-M-D");
let deviceId = this.deviceId;
let channelId = itemData.channelId;
- this.$refs.devicePlayer.openDialog("record", deviceId, channelId, {date: format})
+
+ this.$router.push(`/gbRecordDetail/${deviceId}/${channelId}`)
+ },
+ queryCloudRecords: function (itemData) {
+ let deviceId = this.deviceId;
+ let channelId = itemData.channelId;
+
+ this.$router.push(`/cloudRecordDetail/rtp/${deviceId}_${channelId}`)
},
stopDevicePush: function (itemData) {
var that = this;
this.$axios({
method: 'get',
- url: '/api/play/stop/' + this.deviceId + "/" + itemData.channelId
+ url: '/api/play/stop/' + this.deviceId + "/" + itemData.channelId,
+ params:{
+ isSubStream: this.isSubStream
+ }
}).then(function (res) {
that.initData();
}).catch(function (error) {
@@ -265,19 +311,24 @@
});
},
getSnap: function (row) {
- return '/static/snap/' + row.deviceId + '_' + row.channelId + '.jpg'
+ let baseUrl = window.baseUrl ? window.baseUrl : "";
+ return ((process.env.NODE_ENV === 'development') ? process.env.BASE_API : baseUrl) + '/api/device/query/snap/' + row.deviceId + '/' + row.channelId;
},
- getSnapErrorEvent: function (id) {
+ getBigSnap: function (row) {
+ return [this.getSnap(row)]
+ },
+ getSnapErrorEvent: function (deviceId, channelId) {
- if (typeof (this.loadSnap[id]) != "undefined") {
- console.log("涓嬭浇鎴浘" + this.loadSnap[id])
- if (this.loadSnap[id] > 5) {
- delete this.loadSnap[id];
+ if (typeof (this.loadSnap[deviceId + channelId]) != "undefined") {
+ console.log("涓嬭浇鎴浘" + this.loadSnap[deviceId + channelId])
+ if (this.loadSnap[deviceId + channelId] > 5) {
+ delete this.loadSnap[deviceId + channelId];
return;
}
setTimeout(() => {
- this.loadSnap[id]++
- document.getElementById(id).setAttribute("src", '/static/snap/' + id + '.jpg?' + new Date().getTime())
+ let url = (process.env.NODE_ENV === 'development'? "debug": "") + '/api/device/query/snap/' + deviceId + '/' + channelId
+ this.loadSnap[deviceId + channelId]++
+ document.getElementById(deviceId + channelId).setAttribute("src", url + '?' + new Date().getTime())
}, 1000)
}
@@ -291,7 +342,7 @@
changeSubchannel(itemData) {
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`
+ var url = `/${this.$router.currentRoute.name}/${this.$router.currentRoute.params.deviceId}/${itemData.channelId}`
this.$router.push(url).then(() => {
this.searchSrt = "";
this.channelType = "";
@@ -301,28 +352,53 @@
})
},
showSubchannels: function (channelId) {
- let that = this;
+ if (!this.showTree) {
+ this.$axios({
+ method: 'get',
+ url: `/api/device/query/sub_channels/${this.deviceId}/${this.parentChannelId}/channels`,
+ params: {
+ page: this.currentPage,
+ count: this.count,
+ query: this.searchSrt,
+ online: this.online,
+ channelType: this.channelType
+ }
+ }).then( (res) =>{
+ if (res.data.code === 0) {
+ this.total = res.data.data.total;
+ this.deviceChannelList = res.data.data.list;
+ // 闃叉鍑虹幇琛ㄦ牸閿欎綅
+ this.$nextTick(() => {
+ this.$refs.channelListTable.doLayout();
+ })
+ }
- this.$axios({
- method: 'get',
- url: `/api/device/query/sub_channels/${this.deviceId}/${this.parentChannelId}/channels`,
- params: {
- page: that.currentPage,
- count: that.count,
- query: that.searchSrt,
- online: that.online,
- channelType: that.channelType
- }
- }).then(function (res) {
- that.total = res.data.total;
- that.deviceChannelList = res.data.list;
- // 闃叉鍑虹幇琛ㄦ牸閿欎綅
- that.$nextTick(() => {
- that.$refs.channelListTable.doLayout();
- })
- }).catch(function (error) {
- console.log(error);
- });
+ }).catch(function (error) {
+ console.log(error);
+ });
+ }else {
+ this.$axios({
+ method: 'get',
+ url: `/api/device/query/tree/channel/${this.deviceId}`,
+ params: {
+ parentId: this.parentChannelId,
+ page: this.currentPage,
+ count: this.count,
+ }
+ }).then((res)=> {
+ if (res.data.code === 0) {
+ this.total = res.data.total;
+ this.deviceChannelList = res.data.list;
+ // 闃叉鍑虹幇琛ㄦ牸閿欎綅
+ this.$nextTick(() => {
+ this.$refs.channelListTable.doLayout();
+ })
+ }
+ }).catch(function (error) {
+ console.log(error);
+ });
+ }
+
},
search: function () {
this.currentPage = 1;
@@ -338,12 +414,31 @@
console.log(JSON.stringify(res));
});
},
- autoListChange: function () {
- if (this.autoList) {
- this.updateLooper = setInterval(this.initData, 1500);
- } else {
- window.clearInterval(this.updateLooper);
+ refresh: function () {
+ this.initData();
+ },
+ switchTree: function (){
+ this.showTree = true;
+ this.deviceChannelList = [];
+ this.parentChannelId = 0;
+ this.currentPage = 1;
+
+ },
+ switchList: function (){
+ this.showTree = false;
+ this.deviceChannelList = [];
+ this.parentChannelId = 0;
+ this.currentPage = 1;
+ this.initData();
+ },
+ treeNodeClickEvent: function (device, data, isCatalog) {
+ console.log(device)
+ if (!!!data.channelId) {
+ this.parentChannelId = device.deviceId;
+ }else {
+ this.parentChannelId = data.channelId;
}
+ this.initData();
}
}
--
Gitblit v1.8.0