From bf4cb195c34e79dae5576b21a215118b7ef1357f Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期四, 11 七月 2024 21:33:39 +0800
Subject: [PATCH] 修改了bug和用户管理配偶显示问题
---
ruoyi-ui/src/components/comp-room.vue | 4 +
ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue | 13 ++++--
ruoyi-ui/src/views/meeting/webcast.vue | 8 +++
ruoyi-ui/src/views/system/user/index.vue | 15 ++++---
ruoyi-ui/src/views/selfeconomy/index.vue | 13 ++++--
ruoyi-ui/src/views/meeting/meetingInfo.vue | 6 ++
ruoyi-ui/src/views/meeting/index.vue | 4 -
7 files changed, 42 insertions(+), 21 deletions(-)
diff --git a/ruoyi-ui/src/components/comp-room.vue b/ruoyi-ui/src/components/comp-room.vue
index c33b14e..fb303a2 100644
--- a/ruoyi-ui/src/components/comp-room.vue
+++ b/ruoyi-ui/src/components/comp-room.vue
@@ -77,8 +77,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"></div> -->
<!-- 鏈湴娴佹搷浣滄爮 -->
<div v-if="isPlayingLocalStream" class="local-stream-control">
<div class="video-control control">
@@ -103,6 +104,7 @@
<!-- 杩滅娴佸尯鍩� -->
<div class="remote-container">
+ <!-- <div style="background-color: red; width: 20px;height: 20px">456456</div> -->
<div
v-for="(item) in remoteStreamList"
:key="item.getUserId()"
diff --git a/ruoyi-ui/src/views/meeting/index.vue b/ruoyi-ui/src/views/meeting/index.vue
index 4fa0894..a54459e 100644
--- a/ruoyi-ui/src/views/meeting/index.vue
+++ b/ruoyi-ui/src/views/meeting/index.vue
@@ -208,9 +208,7 @@
</el-table-column>
<el-table-column label="鐘舵��" prop="statu" sortable align="center">
- <!-- <template slot-scope="scope">{{scope.row.statu===1? '鍚屾剰': '鎷掔粷'}}</template> -->
- <template slot-scope="scope">{{scope.row.statu ===3 ? '寰呭鎵�' : (scope.row.statu===1? '鍚屾剰': '鎷掔粷')}}</template>
- <!-- scope.row.statu ==='寰呭鎵�' ? '寰呭鎵�' : (scope.row.statu===1? '鍚屾剰': '鎷掔粷') -->
+ <template slot-scope="scope">{{scope.row.statu===1? '鍚屾剰': (scope.row.statu ===0 ? '鎷掔粷' : '寰呭鎵�')}}</template>
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" width="200" class-name="small-padding fixed-width">
diff --git a/ruoyi-ui/src/views/meeting/meetingInfo.vue b/ruoyi-ui/src/views/meeting/meetingInfo.vue
index 77d23e9..8448af4 100644
--- a/ruoyi-ui/src/views/meeting/meetingInfo.vue
+++ b/ruoyi-ui/src/views/meeting/meetingInfo.vue
@@ -123,7 +123,7 @@
<el-cow>
<el-form-item label="鐘舵��" prop="statu" label-width="120px"
style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-select v-model="formData.statu" placeholder="璇烽�夋嫨 " clearable :style="{width: '100%'}"
+ <el-select v-model="formData.statu" placeholder="" clearable :style="{width: '100%'}"
:disabled="true">
<el-option v-for="(item, index) in typeOptions2" :key="index" :label="item.label"
:value="item.value"></el-option>
@@ -314,6 +314,10 @@
getMeetingInfo(id).then((response) => {
console.log(response.data,'123123123')
this.formData = response.data;
+ if(this.formData.statu == undefined){
+ this.formData.statu = 3
+ // alert(this.formData.statu)
+ }
// let paths = this.formData.url.split(",");
// for(let i = 0; i < paths.length; i++)
// {
diff --git a/ruoyi-ui/src/views/meeting/webcast.vue b/ruoyi-ui/src/views/meeting/webcast.vue
index 0946aff..b5907dc 100644
--- a/ruoyi-ui/src/views/meeting/webcast.vue
+++ b/ruoyi-ui/src/views/meeting/webcast.vue
@@ -113,6 +113,11 @@
</el-input>
</el-form-item>
+ <el-form-item label="鏈�澶氫汉鏁�" prop="maxPerson">
+ <el-input v-model="formDat.maxPerson" placeholder="璇疯緭鍏ユ渶澶氫汉鏁�" clearable :style="{width: '100%'}">
+ </el-input>
+ </el-form-item>
+
<el-form-item label="浼氳鏍囬" prop="title">
<el-input v-model="formDat.title" placeholder="璇疯緭鍏ヤ細璁爣棰�" clearable :style="{width: '100%'}">
</el-input>
@@ -205,7 +210,8 @@
contactPerson: undefined,
contactPhone: undefined,
createTime: undefined,
- roomId:undefined
+ roomId:undefined,
+ maxPerson:undefined
},
}
diff --git a/ruoyi-ui/src/views/selfeconomy/index.vue b/ruoyi-ui/src/views/selfeconomy/index.vue
index be926cd..a7c3ccd 100644
--- a/ruoyi-ui/src/views/selfeconomy/index.vue
+++ b/ruoyi-ui/src/views/selfeconomy/index.vue
@@ -584,13 +584,18 @@
label: '鍚�',
}],
typeOptions1: [{
- value: '鍙樻洿',
- label: '鍙樻洿',
- },
+ value: '鍙樻洿',
+ label: '鍙樻洿',
+ },
{
value: '娉ㄩ攢',
label: '娉ㄩ攢',
- }],
+ },
+ {
+ value: '璐拱',
+ label: '璐拱',
+ },
+ ],
};
},
created() {
diff --git a/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue b/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
index d2337a7..e757523 100644
--- a/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
+++ b/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
@@ -346,10 +346,15 @@
value: '鍙樻洿',
label: '鍙樻洿',
},
- {
- value: '娉ㄩ攢',
- label: '娉ㄩ攢',
- }],
+ {
+ value: '娉ㄩ攢',
+ label: '娉ㄩ攢',
+ },
+ {
+ value: '璐拱',
+ label: '璐拱',
+ },
+ ],
}
},
computed: {},
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index 4f0408d..dcb53c0 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -297,8 +297,8 @@
<el-form-item label="閰嶅伓淇℃伅" prop="spouseId" >
<el-select v-model="form.spouseId" placeholder="璇烽�夋嫨閰嶅伓淇℃伅" @change="handleSpouse">
<el-option
- v-for="item in allInfo2"
- :key="item.userId"
+ v-for="(item, index) in allInfo2"
+ :key="index"
:label="item.nickName"
:value="item.userId"
></el-option>
@@ -548,14 +548,14 @@
if(this.a == 1){
addPO(this.sex).then(response =>{
for(let i in response.data[0]){
- this.allInfo2.push({'nickName':response.data[0][i],'userId':i})
+ this.allInfo2.push({'nickName':response.data[0][i],'userId': parseInt(i)})
}
console.log(this.allInfo2,'鏂板a=1鏂板a=1鏂板a=1')
})
}else{
updatePO(tpfid,this.sex).then(response =>{
for(let i in response.data[0]){
- this.allInfo2.push({'nickName':response.data[0][i],'userId':i})
+ this.allInfo2.push({'nickName':response.data[0][i],'userId': parseInt(i)})
}
console.log(this.allInfo2,'淇敼a=2淇敼a=2淇敼a=2')
})
@@ -823,10 +823,11 @@
getUser(userId).then(response => {
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)
+ // console.log(this.roleOptions)
// this.$set(this.form, "postIds", response.postIds);
// this.$set(this.form, "roleIds", response.roleIds);
// alert(response.roleIds.length)
@@ -837,7 +838,7 @@
getIndividual(userId).then(response => {
// alert(123)
// console.log('++++++++-----0000((((((9999))))))')
- // console.log(response.data)
+ console.log(response.data,'getIndividualgetIndividualgetIndividual')
if(response.data!=undefined)
{
@@ -913,7 +914,7 @@
fm.sysId = this.form.userId
fm.userName = this.form.userName
fm.remark = this.form.remark
- alert(fm.remark)
+ // alert(fm.remark)
console.log(fm)
if (valid) {
--
Gitblit v1.9.1