From ed96edec7c6dfd4944d0ee1c6d924c7cb808428c Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期五, 18 十月 2024 10:43:47 +0800
Subject: [PATCH] 修改了相应的bug
---
ruoyi-ui/src/views/meeting/Home.vue | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 101 insertions(+), 13 deletions(-)
diff --git a/ruoyi-ui/src/views/meeting/Home.vue b/ruoyi-ui/src/views/meeting/Home.vue
index 467ac69..e09ac85 100644
--- a/ruoyi-ui/src/views/meeting/Home.vue
+++ b/ruoyi-ui/src/views/meeting/Home.vue
@@ -12,25 +12,25 @@
<!-- quick demo 浣跨敤鎸囧紩 -->
<!-- <comp-guidance></comp-guidance> -->
<!-- sdkAppId銆乻ecretKey銆乽serId銆乺oomId 鍙傛暟杈撳叆鍖哄煙 -->
- <p class="label">{{ $t('鍩烘湰淇℃伅') }}</p>
- <div class="param-container" :class="$isMobile && 'param-container-mobile'">
- <comp-info-input
+ <!-- <p class="label">{{ $t('鍩烘湰淇℃伅') }}</p> -->
+ <div class="param-container" :class="$isMobile && 'param-container-mobile'">
+<!-- <comp-info-input
label="sdkAppId" type="number" @change="handleValueChange($event, 'sdkAppId')"></comp-info-input>
<comp-info-input
- label="secretKey" @change="handleValueChange($event, 'secretKey')"></comp-info-input>
- <comp-info-input
- label="鐢ㄦ埛鍚�" @change="handleValueChange($event, 'userId')"></comp-info-input>
- <comp-info-input
- label="鎴块棿鍙�" type="number" @change="handleValueChange($event, 'roomId')"></comp-info-input>
+ label="secretKey" @change="handleValueChange($event, 'secretKey')"></comp-info-input> -->
+<!-- <comp-info-input
+ label="鐢ㄦ埛鍚�" @change="handleValueChange($event, 'userId')"></comp-info-input> -->
+<!-- <comp-info-input
+ label="鎴块棿鍙�" type="number" @change="handleValueChange($event, 'roomId')"></comp-info-input> -->
</div>
- <div class='alert'>
+<!-- <div class='alert'>
<el-alert
type="error"
:closable="false"
>
<span>{{ $t("Alert")}} <a target="_blank" :href="$t('Url')">{{ $t("Click")}}</a></span>
</el-alert>
- </div>
+ </div> -->
<!-- 璁惧閫夋嫨鍖哄煙 -->
<p class="label">{{ $t('浼氳璁剧疆') }}</p>
<div class="param-container" :class="$isMobile && 'param-container-mobile'">
@@ -40,13 +40,16 @@
deviceType="microphone" @change="handleValueChange($event, 'microphoneId')"></comp-device-select>
</div>
<!-- rtc 鎴块棿 -->
+ <div v-if="showComponent" v-loading="loading">
<comp-room
+ ref="child"
:sdkAppId="Number(sdkAppId)"
:secretKey="secretKey"
:userId="userId"
:roomId="Number(roomId)"
:cameraId="cameraId"
:microphoneId="microphoneId"></comp-room>
+ </div>
</div>
</div>
</template>
@@ -57,8 +60,13 @@
import compInfoInput from '@/components/comp-info-input.vue';
import compDeviceSelect from '@/components/comp-device-select.vue';
import compRoom from '@/components/comp-room.vue';
+// const compRoom = () => import('@/components/comp-room.vue');
// import { clearUrlParam } from '@/utils/utils';
+import { getIndividualList } from "@/api/self";
+import { Loading } from 'element-ui'
+ //瀵煎叆鎺ュ彛鍑芥暟 --鎺ュソ浜�
+ import { getWebcastInfo } from "@/api/meeting/index";
export default {
name: '6666',
components: {
@@ -70,15 +78,95 @@
},
data() {
return {
- sdkAppId: 0,
- secretKey: '',
+ user:{},
+ showComponent: false,
+ time:undefined,
+ loading: true,
+ // 浼氳鍩烘湰淇℃伅
+ sdkAppId: 1600032250,
+ secretKey: 'abedcf588654e18888eff65dfdfde240a882c611710c6ed10e1044fb44818a89',
userId: '',
- roomId: 0,
+ roomId: '',
cameraId: '',
microphoneId: '',
};
},
+ created() {
+ this.getRoomId();
+ this.getUser();
+ },
+
+computed: {
+ isStartExercise() {
+ let roomId = this.roomId;
+ let userId = this.userId;
+ let time = this.time
+ return { roomId, userId, time };
+ }
+},
+
+watch: {
+
+ isStartExercise: {
+ immediate: true,
+ handler(n) {
+ if (n.roomId && n.userId) {
+ // 鍒ゆ柇杩欎袱涓�煎悓鏃跺瓨鍦�
+ this.loading = false;
+ this.showComponent = true;
+ }
+ if(n.time == false){
+ this.showComponent = false;
+ }
+ },
+ }
+
+ },
methods: {
+ // 鑾峰彇鎴块棿鍙�
+ getRoomId(){
+ const id = this.$route.params && this.$route.params.id;
+ getWebcastInfo(id).then(response => {
+ this.roomId = response.data.roomId
+ console.log(response.data,'datadtaadadsd')
+
+ let time = response.data.startTime.split(' ')[0]
+ // let now = new Date();
+ // let dateStr = now.toLocaleDateString().replaceAll('/','-'); // 鏈湴鏍煎紡鐨勬棩鏈熷瓧绗︿覆
+ const now = new Date();
+ const year = now.getFullYear();
+ const month = (now.getMonth() + 1).toString().padStart(2, '0');
+ const day = now.getDate().toString().padStart(2, '0');
+ let dateStr = `${year}-${month}-${day}`;
+ if(time == dateStr){
+ this.time = true
+ }else{
+ this.time = false
+ this.$modal.msgSuccess("涓嶅湪鐩存挱鏃堕棿鑼冨洿锛�");
+ }
+
+ })
+ },
+ // 鑾峰彇鐢ㄦ埛鍚�
+ getUser(id) {
+ getIndividualList().then(response => {
+ this.user = response.data;
+ this.userId = this.user.nickName
+ // alert(this.userId)
+ // alert(this.roomId)
+ });
+
+ // setTimeout(() => {
+ // this.loading = false;
+ // this.showComponent = true;
+ // }, 5000);
+ // if(this.userId !== '' && this.roomId !== ''){
+ // alert(123)
+ // this.loading = false;
+ // this.showComponent = true;
+ // }
+
+ },
handleValueChange(value, key) {
this[key] = value;
},
--
Gitblit v1.9.1