From f32d0f14911091f51dd8b469bc15ae6563ab4992 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Mon, 26 Apr 2021 16:52:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A4=E5=88=86=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/page/AddProject.vue     | 35 +++++++++++++++++--
 src/components/page/PersonalCenter.vue | 48 +++++++++++++++-----------
 2 files changed, 60 insertions(+), 23 deletions(-)

diff --git a/src/components/page/AddProject.vue b/src/components/page/AddProject.vue
index 2b80506..599c104 100644
--- a/src/components/page/AddProject.vue
+++ b/src/components/page/AddProject.vue
@@ -522,7 +522,29 @@
                     this.systemId = data.systemId
                     this.projectPermission = data.projectPermission;
                     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.caseDescription = data.caseDescription;
                     this.knowledgePoints = data.knowledgePoints;
@@ -841,7 +863,7 @@
                 let systemId = this.systemId
                 // if(systemId == 4 || systemId == 5) systemId = 1
                 this.dialogVisible1 = true;
-                this.$nextTick(() => {
+                this.$nextTick(() => { 
                     this.$refs.judgementTable.clearSelection()
                 })
                 if(systemId == 2 || systemId == 3){
@@ -983,7 +1005,14 @@
                 data.systemId = this.systemId
                 data.projectPermission = this.projectPermission
                 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.caseDescription && (data.caseDescription = this.caseDescription)
                 this.knowledgePoints && (data.knowledgePoints = this.knowledgePoints)
diff --git a/src/components/page/PersonalCenter.vue b/src/components/page/PersonalCenter.vue
index 6478701..f1c1e5e 100644
--- a/src/components/page/PersonalCenter.vue
+++ b/src/components/page/PersonalCenter.vue
@@ -122,7 +122,7 @@
                     </div>
                     <div class="item">
                         <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 class="line">
@@ -279,35 +279,35 @@
                     </div>
                     <div class="item">
                         <span>手机号</span>
-                        <div class="btns">
-                            {{personalInformation.phone}}
-                            <el-button v-if="personalInformation.phone" style="margin-left: 5px;width:100%;" size="small" @click="bindPhone">更换</el-button>
-                            <el-button v-else style="width:100%;" size="small" @click="bindPhone">绑定</el-button>
+                        <div class="btns flex-between">
+                            <span>{{personalInformation.phone}}</span>
+                            <el-button v-if="personalInformation.phone" type="primary" size="small" @click="bindPhone">更换</el-button>
+                            <el-button v-else type="primary" size="small" @click="bindPhone">绑定</el-button>
                         </div>
                     </div>
                 </div>
                 <div class="line">
                     <div class="item">
                         <span>邮箱</span>
-                        <div class="btns">
-                            {{personalInformation.email}}
-                            <el-button v-if="personalInformation.email" style="margin-left: 5px;width:100%;" size="small" @click="bindEmail">更换</el-button>
-                            <el-button v-else style="width:100%;" size="small" @click="bindEmail">绑定</el-button>
+                        <div class="btns flex-between">
+                            <span>{{personalInformation.email}}</span>
+                            <el-button v-if="personalInformation.email" type="primary" size="small" @click="bindEmail">更换</el-button>
+                            <el-button v-else type="primary" size="small" @click="bindEmail">绑定</el-button>
                         </div>
                     </div>
-                    <div class="item">
+                    <!-- <div class="item">
                         <span>微信</span>
                         <input id="weChat" class="weChat" disabled placeholder="微信" type="text" v-model="personalInformation.weChatID"/>
-                    </div>
-                </div>
-                <div class="line">
-                    <div class="item">
-                        <span>密码</span>
-                        <div class="btns">
-                            <el-button size="small" style="width:100%;" @click="bindPassword">更换密码</el-button>
+                    </div> -->
+                    <div class="line">
+                        <div class="item">
+                            <span>密码</span>
+                            <div class="btns flex-end-content">
+                                <el-button type="primary" size="small" @click="bindPassword">更换</el-button>
+                            </div>
                         </div>
+                        <!-- <div class="item"></div> -->
                     </div>
-                    <div class="item"></div>
                 </div>
             </div>
         </div>
@@ -1144,7 +1144,7 @@ input:focus {
         padding-left: 6px;
         margin: 20px 0 10px 0;
         line-height: 1;
-        border-left: 2px solid #9278ff;
+        border-left: 4px solid #9278ff;
         span{
             font-size: 16px;
             color: #9278ff;
@@ -1246,6 +1246,11 @@ input:focus {
                 .btns{
                     display: inline-flex;
                     align-items: center;
+                    border-bottom: 1px solid #b5b5b5;
+                    padding: 5px 0;
+                }
+                .flex-end-content{
+                    justify-content: flex-end;
                 }
                 .selects{
                     display: inline-flex;
@@ -1272,11 +1277,14 @@ input:focus {
             }
             /deep/.el-input__inner {
                 color: #656565;
-                font-size: 16px;
+                font-size: 14px;
                 border-radius: 0 !important;
                 border: 0px;
                 border-bottom: 1px solid #b5b5b5;
             }
+            /deep/.el-input--prefix .el-input__inner{
+                padding-left: 15px;
+            }
             /deep/.el-input__icon {
                 color: #9278ff;
                 &.el-icon-date{