From 765e8f9595bc804a414ca19d51262394e29a1281 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Fri, 23 Apr 2021 15:00:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AD=94=E6=A1=88=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/page/ShowExperiment.vue | 17 ++++++++++++++---
 src/utils/api.js                       |  1 +
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/components/page/ShowExperiment.vue b/src/components/page/ShowExperiment.vue
index 4efcffb..28744b1 100644
--- a/src/components/page/ShowExperiment.vue
+++ b/src/components/page/ShowExperiment.vue
@@ -171,7 +171,7 @@
                         <el-input type="textarea" rows="5" v-model="form.comment" disabled></el-input>
                     </div>
 
-                    <div class="mgb20">
+                    <div class="mgb20" v-if="form.isSignature">
                         <div class="meta-title-wrap">
                             <p class="meta-title"><i class="el-icon-discount"></i> 老师签名</p>
                         </div>
@@ -263,10 +263,10 @@
                             this.$post(this.api.queryItem,n.levelThree)
                             .then((res) => {
                                 n.levelFour = res.subject.find(e => e.id == n.levelFour).itemDescription
-                                console.log(11,n)
                             }).catch((err) => {})
                         }
                     })
+                    let ids = []
                     setTimeout(() => {
                         score.map(n => {
                             let item = answerList.find(e => e.tradingJudgmentPointsId == n.tradingJudgmentPointsId)
@@ -274,9 +274,20 @@
                                 judgmentPointsName: item.judgmentPointsName,
                                 userAnswers: n.userAnswers,
                                 referenceAnswer: item.levelFour,
-                                score: n.score
+                                score: n.userScore,
+                                type: n.type
                             })
+                            n.type == 1 && ids.push(`ids=${n.userAnswers}`)
                         })
+                        this.$get(`${this.api.getItemContentByIds}?${ids.join('&')}`).then((res) => {
+                            let list = res.data
+                            sjData.map(n => {
+                                if(n.type == 1){
+                                    let item = list.find(e => e.id == n.userAnswers)
+                                    if(item) n.userAnswers = item.itemDescription
+                                }
+                            })
+                        }).catch((err) => {})
                     },500)
 
                     this.sjData = sjData
diff --git a/src/utils/api.js b/src/utils/api.js
index 1ca39f2..de94ec9 100644
--- a/src/utils/api.js
+++ b/src/utils/api.js
@@ -161,5 +161,6 @@ export default {
   userRecord: `${host}/evaluation/tms/classTech/userRecord`, //查询班级实验列表信息
   getReport: `${host}/evaluation/Achievement/getReport`,
   uploadSignature:`${host}/evaluation/evaluation/signature/uploadSignature`,
+  getItemContentByIds:`${host}/kdSys/getItemContentByIds`,
   queryItem: `http://116.63.168.79/kdSys/queryItem`,
 }
\ No newline at end of file