yz3456
2024-07-29 fae5df1d3f1ae875ac546cacfb4744b2e8230ca2
修改了bug
5个文件已修改
74 ■■■■ 已修改文件
ruoyi-ui/src/components/comp-room.vue 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/doctor/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/meeting/Home.vue 41 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/meeting/webcast.vue 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/system/user/index.vue 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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 {
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 = "分享";
    },
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) {
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] = '';
            });
          }
        });
      },
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