|
@@ -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);
|
|
|
}
|
|
|
/** ----------------------------------海康摄像头预览结束------------------------------------- */
|
|
|
}
|