From 61cfd79f90f7463ba1f9149d8d988bb081f6a3a1 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期四, 29 八月 2024 12:30:19 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web
---
ruoyi-ui/src/views/meeting/Home.vue | 71 +++++++++++++++++++++++++++++++++--
1 files changed, 66 insertions(+), 5 deletions(-)
diff --git a/ruoyi-ui/src/views/meeting/Home.vue b/ruoyi-ui/src/views/meeting/Home.vue
index 6ed5520..e09ac85 100644
--- a/ruoyi-ui/src/views/meeting/Home.vue
+++ b/ruoyi-ui/src/views/meeting/Home.vue
@@ -65,6 +65,8 @@
import { getIndividualList } from "@/api/self";
import { Loading } from 'element-ui'
+ //瀵煎叆鎺ュ彛鍑芥暟 --鎺ュソ浜�
+ import { getWebcastInfo } from "@/api/meeting/index";
export default {
name: '6666',
components: {
@@ -78,32 +80,91 @@
return {
user:{},
showComponent: false,
+ time:undefined,
loading: true,
// 浼氳鍩烘湰淇℃伅
sdkAppId: 1600032250,
secretKey: 'abedcf588654e18888eff65dfdfde240a882c611710c6ed10e1044fb44818a89',
userId: '',
- roomId: 123,
+ 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;
- }, 3000);
+
+ // setTimeout(() => {
+ // this.loading = false;
+ // this.showComponent = true;
+ // }, 5000);
+ // if(this.userId !== '' && this.roomId !== ''){
+ // alert(123)
+ // this.loading = false;
+ // this.showComponent = true;
+ // }
},
handleValueChange(value, key) {
--
Gitblit v1.9.1