云端录像详情页添加返回按钮

src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java

@@ -2,25 +2,18 @@ package com.genersoft.iot.vmp.gb28181;
 
 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{

src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java

@@ -102,7 +102,7 @@ public class PlatformServiceImpl implements IPlatformService {
 
     @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) {

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);
         });
-      }
+      },
 
 
 		}

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');
       }
 		}
 	};

web_src/src/components/Login.vue

@@ -66,10 +66,6 @@ export default {
 
   	//登录请求
   	toLogin(){
-
-  		//一般要跟后端了解密码的加密规则
-  		//这里例子用的哈希算法来自./js/sha1.min.js
-
   		//需要想后端发送的登录参数
   		let loginParam = {
   			username: this.username,
@@ -78,12 +74,17 @@ export default {
       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 @@ export default {
               });
           }
       }).catch(function (error) {
+        console.log(error)
+        window.clearTimeout(timeoutTask)
         that.$message.error(error.response.data.msg);
         that.isLoging = false;
       });