From 6e4fc1e79b7b4b91d6eb36f6b5638fa902665a50 Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期六, 23 四月 2022 23:34:36 +0800
Subject: [PATCH] 1.修正了播放地址无法正常播放视频的问题，包含两个错误： 1.1修正播放器界面路由（此页面不需要layout边框，之前已经修复但在地图代码合并时又被错误覆盖） 1.2修正播放器id属性，此属性现在不需要父级组件传入（这是之前导致独立播放页面失效的主要原因） 2.调整滚动条美化样式到app.vue中，使其真正全局生效
---
web_src/src/components/service/DeviceService.js | 15 +--------------
1 files changed, 1 insertions(+), 14 deletions(-)
diff --git a/web_src/src/components/service/DeviceService.js b/web_src/src/components/service/DeviceService.js
index aae0418..6149579 100644
--- a/web_src/src/components/service/DeviceService.js
+++ b/web_src/src/components/service/DeviceService.js
@@ -32,7 +32,6 @@
getAllDeviceListIteration(deviceList, currentPage, count, callback, errorCallback) {
this.getDeviceList(currentPage, count, (data) => {
- console.log(data)
if (data.list) {
deviceList = deviceList.concat(data.list);
if (deviceList.length < data.total) {
@@ -55,14 +54,13 @@
getAllChannelIteration(isCatalog, deviceId, catalogList, currentPage, count, callback, errorCallback) {
this.getChanel(isCatalog, deviceId, currentPage, count, (data) => {
- console.log(data)
if (data.list) {
catalogList = catalogList.concat(data.list);
if (catalogList.length < data.total) {
currentPage ++
this.getAllChannelIteration(isCatalog, deviceId, catalogList, currentPage, count, callback, errorCallback)
}else {
- console.log(2222)
+ console.log(1)
if (typeof (callback) == "function") callback(catalogList)
}
}
@@ -94,7 +92,6 @@
getAllSubChannelIteration(isCatalog, deviceId,channelId, catalogList, currentPage, count, callback, errorCallback) {
this.getSubChannel(isCatalog, deviceId, channelId, currentPage, count, (data) => {
- console.log(data)
if (data.list) {
catalogList = catalogList.concat(data.list);
if (catalogList.length < data.total) {
@@ -119,16 +116,6 @@
}
}).then((res) =>{
if (typeof (callback) == "function") callback(res.data)
- }).catch(errorCallback);
- }
- getDeviceTree(deviceId, callback, errorCallback){
- this.$axios({
- method: 'get',
- url: `/api/device/query/${deviceId}/tree`,
- params:{}
- }).then((res) =>{
- console.log(res.data)
- if (typeof (callback) == "function") callback(res.data.data)
}).catch(errorCallback);
}
}
--
Gitblit v1.8.0