From 4ed82ecdc666553f4a610e8a984b6f7b9585fe5b Mon Sep 17 00:00:00 2001
From: e <2432808546@qq.com>
Date: Mon, 20 Dec 2021 18:01:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=90=E7=BB=A9=E6=8A=A5=E5=91=8A=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E9=93=B6=E8=A1=8C=E4=B8=8Epy=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E4=B8=8D=E5=90=8C=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/achievement/show/index.vue | 54 +++++++++++++++++++++-------
 src/styles/common.scss               |  1 +
 2 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/src/pages/achievement/show/index.vue b/src/pages/achievement/show/index.vue
index 6f78d13..83be907 100644
--- a/src/pages/achievement/show/index.vue
+++ b/src/pages/achievement/show/index.vue
@@ -54,14 +54,14 @@
                             <p class="meta-title">实验数据</p>
                         </div>
                         <el-table :data="expData" class="table" stripe header-align="center">
-                            <el-table-column type="index" width="100" label="序号" align="center">
+                            <el-table-column type="index" width="50" label="序号" align="center">
                                 <template slot-scope="scope">
                                     {{ scope.$index + 1 }}
                                 </template>
                             </el-table-column>
-                            <el-table-column prop="judgmentName" label="任务名称" align="center">
+                            <el-table-column prop="judgmentName" width="150" label="任务名称" align="center">
                             </el-table-column>
-                            <el-table-column prop="userAnswer" label="考核点" align="center">
+                            <el-table-column v-if='project' prop="userAnswer" label="考核点" align="center">
                                 <template slot-scope="scope">
                                     <div v-for="(item, index) in scope.row.lcRuleRecords">
                                         <span>{{index+1}}. </span>{{item.name}}
@@ -70,19 +70,29 @@
                             </el-table-column>
                             <el-table-column prop="userAnswer" label="学生答案" align="center">
                                 <template slot-scope="scope">
-                                    <div v-for="(item, index) in scope.row.lcRuleRecords">
-                                        <span>{{index+1}}. </span>{{item.ruleAnswer}}
+                                    <div v-if=' scope.row.lcRuleRecords'>
+                                        <div v-for="(item, index) in scope.row.lcRuleRecords">
+                                            <span>{{index+1}}. </span>{{item.userAnswer}}
+                                        </div>
+                                    </div>
+                                    <div v-else>
+                                        {{scope.row.answer}}
                                     </div>
                                 </template>
                             </el-table-column>
                             <el-table-column prop="answer" label="参考答案" align="center">
                                 <template slot-scope="scope">
-                                    <div v-for="(item, index) in scope.row.lcRuleRecords">
-                                        <span>{{index+1}}. </span>{{item.ruleAnswer}}
+                                    <div v-if=' scope.row.lcRuleRecords'>
+                                        <div v-for="(item, index) in scope.row.lcRuleRecords">
+                                            <span>{{index+1}}. </span>{{item.ruleAnswer}}
+                                        </div>
+                                    </div>
+                                    <div v-else>
+                                        {{scope.row.referenceAnswer}}
                                     </div>
                                 </template>
                             </el-table-column>
-                            <el-table-column prop="score" label="得分" align="center">
+                            <el-table-column prop="score" width="50" label="得分" align="center">
                             </el-table-column>
                         </el-table>
                     </div>
@@ -142,6 +152,7 @@ export default {
             autograph: "1",
             pages: 1,
             ipVisible: false,
+            project:false,
             fileList: [{ name: "food.jpeg", url: "https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100" }, {
                 name: "food2.jpeg",
                 url: "https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100"
@@ -160,6 +171,7 @@ export default {
         ])
     },
     mounted() {
+
         this.getData();
     },
     methods: {
@@ -173,6 +185,16 @@ export default {
                     let expData = res.userScores;
                     let form = this.form;
                     let score = form.score;
+                    for(var i=0;i<expData.length;i++){
+                        console.log(expData[i].referenceAnswer)
+                        if (expData[i].referenceAnswer != undefined && expData[i].referenceAnswer){
+                            console.log('123')
+                            this.project = false
+                        }else{
+                            console.log('456')
+                            this.project = true
+                        }
+                    }
                     if (expData) {
                         if (score) {
                             expData.map(n => {
@@ -183,7 +205,6 @@ export default {
                             });
                             form.score = score;
                         }
-
                         this.expData = expData;
                     }
                     this.infoData.push({
@@ -212,7 +233,16 @@ export default {
                     let expData = res.userScores;
                     let form = this.form;
                     let score = form.score;
-
+                    for(var i=0;i<expData.length;i++){
+                        console.log(expData[i].referenceAnswer)
+                        if (expData[i].referenceAnswer != undefined && expData[i].referenceAnswer){
+                            console.log('123')
+                            this.project = false
+                        }else{
+                            console.log('456')
+                            this.project = true
+                        }
+                    }
                     if (expData) {
                         if (score) {
                             expData.map(n => {
@@ -345,12 +375,11 @@ export default {
     /deep/ .info-table {
         margin-bottom: 40px;
         border: 0;
-
         th {
             background-color: #fff !important;
-
             .cell {
                 color: #444;
+                line-height: 35px;
             }
         }
 
@@ -385,6 +414,7 @@ export default {
         background-color: #e1eaff !important;
 
         .cell {
+            line-height: 35px;
             color: #555555;
         }
     }
diff --git a/src/styles/common.scss b/src/styles/common.scss
index 5dab496..7a9d882 100644
--- a/src/styles/common.scss
+++ b/src/styles/common.scss
@@ -138,6 +138,7 @@
 
   .cell {
     font-size: 14px;
+    line-height: 35px;
   }
 
   th {