From cb897aaeed0f3a24f91dc4265b8ff0d2b31284c6 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期日, 23 四月 2023 17:35:00 +0800
Subject: [PATCH] Merge pull request #829 from kairlec/wvp-28181-2.0
---
web_src/src/components/channelList.vue | 56 ++++++++++++++++++++++++++++++++------------------------
1 files changed, 32 insertions(+), 24 deletions(-)
diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue
index 2a09c5c..563f43f 100644
--- a/web_src/src/components/channelList.vue
+++ b/web_src/src/components/channelList.vue
@@ -32,7 +32,7 @@
<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>
@@ -69,7 +69,7 @@
<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 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">
@@ -124,7 +124,6 @@
import devicePlayer from './dialog/devicePlayer.vue'
import uiHeader from '../layout/UiHeader.vue'
import moment from "moment";
-import DviceService from "./service/DeviceService";
import DeviceService from "./service/DeviceService";
import DeviceTree from "./common/DeviceTree";
@@ -216,12 +215,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);
});
@@ -248,6 +250,7 @@
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
@@ -266,10 +269,10 @@
});
},
queryRecords: function (itemData) {
- var format = moment().format("yyyy-MM-DD");
let deviceId = this.deviceId;
let channelId = itemData.channelId;
- this.$refs.devicePlayer.openDialog("record", deviceId, channelId, {date: format})
+
+ this.$router.push(`/gbRecordDetail/${deviceId}/${channelId}`)
},
stopDevicePush: function (itemData) {
var that = this;
@@ -318,7 +321,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 = "";
@@ -340,12 +343,15 @@
channelType: this.channelType
}
}).then( (res) =>{
- this.total = res.data.total;
- this.deviceChannelList = res.data.list;
- // 闃叉鍑虹幇琛ㄦ牸閿欎綅
- this.$nextTick(() => {
- this.$refs.channelListTable.doLayout();
- })
+ if (res.data.code === 0) {
+ this.total = res.data.data.total;
+ this.deviceChannelList = res.data.data.list;
+ // 闃叉鍑虹幇琛ㄦ牸閿欎綅
+ this.$nextTick(() => {
+ this.$refs.channelListTable.doLayout();
+ })
+ }
+
}).catch(function (error) {
console.log(error);
});
@@ -359,12 +365,14 @@
count: this.count,
}
}).then((res)=> {
- this.total = res.data.total;
- this.deviceChannelList = res.data.list;
- // 闃叉鍑虹幇琛ㄦ牸閿欎綅
- this.$nextTick(() => {
- this.$refs.channelListTable.doLayout();
- })
+ 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);
});
--
Gitblit v1.8.0