dev_2022-05-11
yujialong 4 years ago
parent 4cbc308740
commit f32d0f1491
  1. 33
      src/components/page/AddProject.vue
  2. 42
      src/components/page/PersonalCenter.vue

@ -522,7 +522,29 @@
this.systemId = data.systemId this.systemId = data.systemId
this.projectPermission = data.projectPermission; this.projectPermission = data.projectPermission;
this.state = data.state; this.state = data.state;
this.experimentData = data.experimentData
setTimeout(() => {
this.$get(this.api.queryUserIds).then(res => {
this.$get(this.api.QueryPointOfJudgement, {
systemId: this.systemId,
userId: this.userId,
pageNum: 1,
pageSize: 1000,
queryName: this.judgementpointsquery,
userIdList: res.message.retvalue.join()
}).then(res => {
let list = res.message.rows
let experimentData = data.experimentData
experimentData.map(n => {
let item = list.find(e => e.judgmentPointsId == n.judgmentPointsId)
n.experimentalRequirements = item.experimentalRequirements
n.judgmentPointsName = item.judgmentPointsName
})
this.experimentData = experimentData
}).catch(err => {})
}).catch(res => {})
},1000)
this.experimentalGoal = data.experimentalGoal; this.experimentalGoal = data.experimentalGoal;
this.caseDescription = data.caseDescription; this.caseDescription = data.caseDescription;
this.knowledgePoints = data.knowledgePoints; this.knowledgePoints = data.knowledgePoints;
@ -983,7 +1005,14 @@
data.systemId = this.systemId data.systemId = this.systemId
data.projectPermission = this.projectPermission data.projectPermission = this.projectPermission
this.state && (data.state = this.state) this.state && (data.state = this.state)
this.experimentData && (data.experimentData = this.experimentData) if(this.experimentData){
let experimentData = this.experimentData
experimentData.map(n => {
delete n.experimentalRequirements
delete n.judgmentPointsName
})
data.experimentData = experimentData
}
this.experimentalGoal && (data.experimentalGoal = this.experimentalGoal) this.experimentalGoal && (data.experimentalGoal = this.experimentalGoal)
this.caseDescription && (data.caseDescription = this.caseDescription) this.caseDescription && (data.caseDescription = this.caseDescription)
this.knowledgePoints && (data.knowledgePoints = this.knowledgePoints) this.knowledgePoints && (data.knowledgePoints = this.knowledgePoints)

@ -122,7 +122,7 @@
</div> </div>
<div class="item"> <div class="item">
<span>证件</span> <span>证件</span>
<input id="idnumber" class="idnumber" placeholder="请输入姓名" type="text" v-model="personalInformation.idNumber"/> <input id="idnumber" class="idnumber" placeholder="请输入证件" type="text" v-model="personalInformation.idNumber"/>
</div> </div>
</div> </div>
<div class="line"> <div class="line">
@ -279,35 +279,35 @@
</div> </div>
<div class="item"> <div class="item">
<span>手机号</span> <span>手机号</span>
<div class="btns"> <div class="btns flex-between">
{{personalInformation.phone}} <span>{{personalInformation.phone}}</span>
<el-button v-if="personalInformation.phone" style="margin-left: 5px;width:100%;" size="small" @click="bindPhone">更换</el-button> <el-button v-if="personalInformation.phone" type="primary" size="small" @click="bindPhone">更换</el-button>
<el-button v-else style="width:100%;" size="small" @click="bindPhone">绑定</el-button> <el-button v-else type="primary" size="small" @click="bindPhone">绑定</el-button>
</div> </div>
</div> </div>
</div> </div>
<div class="line"> <div class="line">
<div class="item"> <div class="item">
<span>邮箱</span> <span>邮箱</span>
<div class="btns"> <div class="btns flex-between">
{{personalInformation.email}} <span>{{personalInformation.email}}</span>
<el-button v-if="personalInformation.email" style="margin-left: 5px;width:100%;" size="small" @click="bindEmail">更换</el-button> <el-button v-if="personalInformation.email" type="primary" size="small" @click="bindEmail">更换</el-button>
<el-button v-else style="width:100%;" size="small" @click="bindEmail">绑定</el-button> <el-button v-else type="primary" size="small" @click="bindEmail">绑定</el-button>
</div> </div>
</div> </div>
<div class="item"> <!-- <div class="item">
<span>微信</span> <span>微信</span>
<input id="weChat" class="weChat" disabled placeholder="微信" type="text" v-model="personalInformation.weChatID"/> <input id="weChat" class="weChat" disabled placeholder="微信" type="text" v-model="personalInformation.weChatID"/>
</div> </div> -->
</div>
<div class="line"> <div class="line">
<div class="item"> <div class="item">
<span>密码</span> <span>密码</span>
<div class="btns"> <div class="btns flex-end-content">
<el-button size="small" style="width:100%;" @click="bindPassword">更换密码</el-button> <el-button type="primary" size="small" @click="bindPassword">更换</el-button>
</div> </div>
</div> </div>
<div class="item"></div> <!-- <div class="item"></div> -->
</div>
</div> </div>
</div> </div>
</div> </div>
@ -1144,7 +1144,7 @@ input:focus {
padding-left: 6px; padding-left: 6px;
margin: 20px 0 10px 0; margin: 20px 0 10px 0;
line-height: 1; line-height: 1;
border-left: 2px solid #9278ff; border-left: 4px solid #9278ff;
span{ span{
font-size: 16px; font-size: 16px;
color: #9278ff; color: #9278ff;
@ -1246,6 +1246,11 @@ input:focus {
.btns{ .btns{
display: inline-flex; display: inline-flex;
align-items: center; align-items: center;
border-bottom: 1px solid #b5b5b5;
padding: 5px 0;
}
.flex-end-content{
justify-content: flex-end;
} }
.selects{ .selects{
display: inline-flex; display: inline-flex;
@ -1272,11 +1277,14 @@ input:focus {
} }
/deep/.el-input__inner { /deep/.el-input__inner {
color: #656565; color: #656565;
font-size: 16px; font-size: 14px;
border-radius: 0 !important; border-radius: 0 !important;
border: 0px; border: 0px;
border-bottom: 1px solid #b5b5b5; border-bottom: 1px solid #b5b5b5;
} }
/deep/.el-input--prefix .el-input__inner{
padding-left: 15px;
}
/deep/.el-input__icon { /deep/.el-input__icon {
color: #9278ff; color: #9278ff;
&.el-icon-date{ &.el-icon-date{

Loading…
Cancel
Save