Merge remote-tracking branch 'origin/visu_forest_0_1' into visu_forest_0_1

src/api/meeting.js

@@ -0,0 +1,17 @@
+import request from '@/utils/request'
+
+// 查询该事件是否有会议
+export function hasConferences(eventId) {
+  return request({
+    url: '/center-event/hwMeeting/hasConferences?eventId=' + eventId,
+    method: 'post'
+  })
+}
+
+// 根据事件ID和标题创建会议
+export function createConferences(eventId, subject) {
+  return request({
+    url: '/center-event/hwMeeting/createConferences?eventId='+eventId+'&subject='+subject,
+    method: 'post'
+  })
+}

src/views/eventdetailsdialog.vue

@@ -158,7 +158,7 @@
                                 </el-button>
                               </div>
                               <div class="z-info-btm-grp-right">
-                                <el-button size="small" icon="el-icon-mic">会议
+                                <el-button size="small" icon="el-icon-mic" @click="joinMeeting()">会议
                                 </el-button>
                               </div>
                             </div>
@@ -977,7 +977,10 @@ import {
 import {
   getHaiKangVideoServer
 } from '@/api/haikang/haikang'
-
+import {
+  hasConferences,
+  createConferences
+} from "@/api/meeting"
 export default {
   dicts: ['task_source'],
   watch: {
@@ -2187,11 +2190,14 @@ export default {
         }
       })
     },
-//RSA加密
+    //RSA加密
     setEncrypt(value) {
       var encrypt = new JSEncrypt()
       encrypt.setPublicKey(this.pubKey)
       return encrypt.encrypt(value)
+    },
+    joinMeeting(){
+      console.log(this.eventId);
     }
     /** ----------------------------------海康摄像头预览结束------------------------------------- */
   }

src/views/system/login.vue

@@ -2,9 +2,8 @@
   <div class="login" :style="{backgroundImage: 'url('+backgroudImg+')'}">
     <StarBackground />
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="sub-title" v-if="systemTitle.subTitle">{{systemTitle.subTitle}}</h3>
       <h3 class="title">{{systemTitle.title}}</h3>
-
+      <h3 class="sub-title" v-if="systemTitle.subTitle">{{systemTitle.subTitle}}</h3>
       <div class="login-container">
         <h4>请登录</h4>
         <el-form-item prop="username">
@@ -212,14 +211,20 @@
     font-family: $fontFk;
     font-size: 55px;
   }
-	.title {
-		margin: 0px auto 30px auto;
-		text-align: center;
-		color: #fff;
-		font-family: $fontFk;
-		font-size: 38px;
+  .title {
+    margin: 0px auto 10px auto;
+    text-align: center;
+    color: #fff;
+    font-family: $fontFk;
+    font-size: 38px;
 
-	}
+  }
+  .sub-title {
+    text-align: center;
+    color: #fff;
+    font-family: $fontFk;
+    font-size: 38px;
+  }
 
 	.login-form {
 		border-radius: 6px;