From fae5df1d3f1ae875ac546cacfb4744b2e8230ca2 Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期一, 29 七月 2024 11:07:24 +0800
Subject: [PATCH] 修改了bug
---
ruoyi-ui/src/components/comp-room.vue | 6 ++-
ruoyi-ui/src/views/meeting/webcast.vue | 11 ++++-
ruoyi-ui/src/views/system/user/index.vue | 14 ++++---
ruoyi-ui/src/views/meeting/Home.vue | 41 ++++++++++++++++++--
ruoyi-ui/src/views/doctor/index.vue | 2
5 files changed, 58 insertions(+), 16 deletions(-)
diff --git a/ruoyi-ui/src/components/comp-room.vue b/ruoyi-ui/src/components/comp-room.vue
index ee77ef5..5395691 100644
--- a/ruoyi-ui/src/components/comp-room.vue
+++ b/ruoyi-ui/src/components/comp-room.vue
@@ -79,7 +79,9 @@
<div v-if="localStream" class="local-stream-container">
<!-- <div style="background-color: red; width: 20px;height: 20px">123123</div> -->
<!-- 鏈湴娴佹挱鏀惧尯鍩� -->
- <div id="localStream" class="local-stream-content"></div>
+ <div id="localStream" class="local-stream-content" ref="myDiv">
+ <!-- <div v-if="bj" style="background-color: red; width: 50%;height: 50%">123123</div> -->
+ </div>
<!-- 鏈湴娴佹搷浣滄爮 -->
<div v-if="isPlayingLocalStream" class="local-stream-control">
<div class="video-control control">
@@ -334,7 +336,7 @@
}
.info-container {
- width: 100%;
+ width: 0%;
display: flex;
justify-content: space-between;
// .log-container {
diff --git a/ruoyi-ui/src/views/doctor/index.vue b/ruoyi-ui/src/views/doctor/index.vue
index aa9d11c..a5ff635 100644
--- a/ruoyi-ui/src/views/doctor/index.vue
+++ b/ruoyi-ui/src/views/doctor/index.vue
@@ -876,7 +876,7 @@
/** 鍒嗕韩鎿嶄綔 */
handleShare(row) {
- this.id1 = row.id
+ this.id1 = [row.id]
this.open1 = true;
this.title1 = "鍒嗕韩";
},
diff --git a/ruoyi-ui/src/views/meeting/Home.vue b/ruoyi-ui/src/views/meeting/Home.vue
index 9144f00..337d8e3 100644
--- a/ruoyi-ui/src/views/meeting/Home.vue
+++ b/ruoyi-ui/src/views/meeting/Home.vue
@@ -91,8 +91,33 @@
};
},
created() {
- this.getUser();
this.getRoomId();
+ this.getUser();
+ },
+
+computed: {
+ isStartExercise() {
+ let roomId = this.roomId
+ let userId = this.userId;
+ return { roomId, userId };
+ }
+},
+
+watch: {
+
+ isStartExercise: {
+ immediate: true,
+ handler(n) {
+ if (n.roomId && n.userId) {
+ // 鍒ゆ柇杩欎袱涓�煎悓鏃跺瓨鍦�
+ // alert(this.userId)
+ // alert(this.roomId)
+ this.loading = false;
+ this.showComponent = true;
+ }
+ },
+ }
+
},
methods: {
// 鑾峰彇鎴块棿鍙�
@@ -108,11 +133,17 @@
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) {
diff --git a/ruoyi-ui/src/views/meeting/webcast.vue b/ruoyi-ui/src/views/meeting/webcast.vue
index b5907dc..0ddabd1 100644
--- a/ruoyi-ui/src/views/meeting/webcast.vue
+++ b/ruoyi-ui/src/views/meeting/webcast.vue
@@ -109,7 +109,7 @@
</el-form-item> -->
<el-form-item label="鎴块棿鍙�" prop="roomId">
- <el-input v-model="formDat.roomId" placeholder="璇疯緭鍏ユ埧闂村彿" clearable :style="{width: '100%'}">
+ <el-input v-model="formDat.roomId" type="number" :min="1" placeholder="璇疯緭鍏ユ埧闂村彿" clearable :style="{width: '100%'}">
</el-input>
</el-form-item>
@@ -239,7 +239,7 @@
},
submitDataScope: function() {
this.$refs["elForm"].validate(valid => {
- if (valid) {
+ if (valid && this.formDat.roomId > 0) {
addWebcast(this.formDat).then(response => {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
@@ -256,7 +256,14 @@
// }
this.getList();
});
+ }else{
+ this.$message.error("鏂板澶辫触锛屾埧闂村彿涓嶈兘鏄礋鏁�");
+ this.open = false;
+ Object.keys(this.formDat).forEach(key => {
+ this.formDat[key] = '';
+ });
}
+
});
},
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index dcb53c0..baf41eb 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -802,7 +802,7 @@
this.roleOptions= []
this.roleOptions.push(response.roles[1])
this.roleOptions.push(response.roles[3])
- console.log(this.roleOptions)
+ console.log(this.roleOptions,'roleOptionsroleOptionsroleOptions')
console.log("0-009888")
this.open = true;
this.title = "娣诲姞鐢ㄦ埛";
@@ -824,10 +824,12 @@
this.form = response.data;
console.log(response.data,'formformformformform')
console.log(this.form.spouseId,'浼翠荆id')
- // console.log(response.data)
this.postOptions = response.posts;
- this.roleOptions = response.roles;
- // console.log(this.roleOptions)
+ this.roleOptions= []
+ this.roleOptions.push(response.roles[1])
+ this.roleOptions.push(response.roles[3])
+ // this.roleOptions = response.roles;
+ console.log(this.roleOptions,'roleOptionsroleOptionsroleOptions')
// this.$set(this.form, "postIds", response.postIds);
// this.$set(this.form, "roleIds", response.roleIds);
// alert(response.roleIds.length)
@@ -916,7 +918,7 @@
fm.remark = this.form.remark
// alert(fm.remark)
- console.log(fm)
+ console.log(fm,'fmfmfmfmfmfmfmfm')
if (valid) {
if (this.form.userId != undefined) {
updateUser(fm).then(response => {
@@ -925,7 +927,7 @@
// this.isshowMar = false
// this.isshowMri = false
// updateUserInfo(fm).then(response=>{
- // this.$modal.msgSuccess("淇敼鎴愬姛");
+ this.$modal.msgSuccess("淇敼鎴愬姛");
// this.open = false;
// this.getList();
// _this.rt = undefined
--
Gitblit v1.9.1