From 703c2e292a812f80d9a1a7551c18c2cf457f58ba Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 31 八月 2022 18:07:53 +0800
Subject: [PATCH] 云端录像详情页添加返回按钮
---
web_src/src/components/Login.vue | 11 +++++++----
src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java | 7 -------
src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java | 2 +-
web_src/src/components/CloudRecord.vue | 8 ++++++--
web_src/src/components/CloudRecordDetail.vue | 5 +++++
5 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java b/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java
index afc5671..f32bd26 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java
@@ -2,25 +2,18 @@
import com.genersoft.iot.vmp.conf.SipConfig;
import com.genersoft.iot.vmp.gb28181.transmit.ISIPProcessorObserver;
-import com.genersoft.iot.vmp.utils.DateUtil;
import gov.nist.javax.sip.SipProviderImpl;
import gov.nist.javax.sip.SipStackImpl;
-import org.apache.commons.lang3.time.DateFormatUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.DependsOn;
-import org.springframework.stereotype.Component;
import javax.sip.*;
-import java.text.DateFormat;
import java.util.Properties;
import java.util.TooManyListenersException;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
@Configuration
public class SipLayer{
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
index 3a5d19a..708d693 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
@@ -102,7 +102,7 @@
@Override
public void online(ParentPlatform parentPlatform) {
- logger.info("[鍥芥爣绾ц仈]锛歿}, 骞冲彴涓婄嚎", parentPlatform.getServerGBId());
+ logger.info("[鍥芥爣绾ц仈]锛歿}, 骞冲彴涓婄嚎/鏇存柊娉ㄥ唽", parentPlatform.getServerGBId());
platformMapper.updateParentPlatformStatus(parentPlatform.getServerGBId(), true);
ParentPlatformCatch parentPlatformCatch = redisCatchStorage.queryPlatformCatchInfo(parentPlatform.getServerGBId());
if (parentPlatformCatch != null) {
diff --git a/web_src/src/components/CloudRecord.vue b/web_src/src/components/CloudRecord.vue
index 73f20c1..4784e05 100644
--- a/web_src/src/components/CloudRecord.vue
+++ b/web_src/src/components/CloudRecord.vue
@@ -1,7 +1,11 @@
<template>
<div id="app" style="width: 100%">
<div class="page-header">
- <div class="page-title">浜戠褰曞儚</div>
+ <div class="page-title">
+ <el-page-header v-if="recordDetail" @back="backToList" content="浜戠褰曞儚"></el-page-header>
+ <div v-if="!recordDetail">浜戠褰曞儚</div>
+ </div>
+
<div class="page-header-btn">
鑺傜偣閫夋嫨:
<el-select size="mini" @change="chooseMediaChange" style="width: 16rem; margin-right: 1rem;" v-model="mediaServerId" placeholder="璇烽�夋嫨" :disabled="recordDetail">
@@ -183,7 +187,7 @@
}).catch(function (error) {
console.log(error);
});
- }
+ },
}
diff --git a/web_src/src/components/CloudRecordDetail.vue b/web_src/src/components/CloudRecordDetail.vue
index b96b606..143448e 100644
--- a/web_src/src/components/CloudRecordDetail.vue
+++ b/web_src/src/components/CloudRecordDetail.vue
@@ -1,7 +1,9 @@
<template>
<div id="recordDetail">
<el-container>
+
<el-aside width="300px">
+
<div class="record-list-box-box">
<el-date-picker size="mini" v-model="chooseDate" :picker-options="pickerOptions" type="date" value-format="yyyy-MM-dd" placeholder="鏃ユ湡" @change="dateChange()"></el-date-picker>
<div class="record-list-box" :style="recordListStyle">
@@ -423,6 +425,9 @@
}).catch(function (error) {
console.log(error);
});
+ },
+ goBack(){
+ this.$router.push('/cloudRecord');
}
}
};
diff --git a/web_src/src/components/Login.vue b/web_src/src/components/Login.vue
index 4ebc6d1..37c8a83 100644
--- a/web_src/src/components/Login.vue
+++ b/web_src/src/components/Login.vue
@@ -66,10 +66,6 @@
//鐧诲綍璇锋眰
toLogin(){
-
- //涓�鑸璺熷悗绔簡瑙ｅ瘑鐮佺殑鍔犲瘑瑙勫垯
- //杩欓噷渚嬪瓙鐢ㄧ殑鍝堝笇绠楁硶鏉ヨ嚜./js/sha1.min.js
-
//闇�瑕佹兂鍚庣鍙戦�佺殑鐧诲綍鍙傛暟
let loginParam = {
username: this.username,
@@ -78,12 +74,17 @@
var that = this;
//璁剧疆鍦ㄧ櫥褰曠姸鎬�
this.isLoging = true;
+ let timeoutTask = setTimeout(()=>{
+ that.$message.error("鐧诲綍瓒呮椂");
+ that.isLoging = false;
+ }, 1000)
this.$axios({
method: 'get',
url:"/api/user/login",
params: loginParam
}).then(function (res) {
+ window.clearTimeout(timeoutTask)
console.log(JSON.stringify(res));
if (res.data.code === 0 ) {
that.$cookies.set("session", {"username": that.username,"roleId":res.data.data.role.id}) ;
@@ -99,6 +100,8 @@
});
}
}).catch(function (error) {
+ console.log(error)
+ window.clearTimeout(timeoutTask)
that.$message.error(error.response.data.msg);
that.isLoging = false;
});
--
Gitblit v1.8.0