From 51e5de52c520701c5ed2057d8fc2ea6df949b5c0 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Mon, 1 Nov 2021 20:07:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug=EF=BC=8C=E5=AE=9E=E9=AA=8C=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index.js                   |  1 +
 src/pages/account/login/index.vue  |  2 +-
 src/pages/info/details/index.vue   | 50 +++++++++++++++-----------
 src/pages/info/list/index.vue      |  4 +--
 src/pages/match/details/index.vue  | 46 ++++++++++++++----------
 src/pages/record/details/index.vue |  7 ++--
 src/pages/record/show/index.vue    | 56 ++++++++++++------------------
 7 files changed, 86 insertions(+), 80 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index 66e6fd8..7d77ea2 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -40,6 +40,7 @@ export default {
     exportPracticeInfo: `${host}occupationlab/achievement/exportPracticeInfo`, // 批量导出练习成绩
     practiceByStudentDetail: `${host}occupationlab/achievement/practiceByStudentDetail`, // 学生端练习实验情况
     exportPracticeByStudentDetail: `${host}occupationlab/achievement/exportPracticeByStudentDetail`, // 导出学生端练习实验情况
+    reportDetail: `${host}occupationlab/achievement/reportDetail`, // 成绩报告详情
 
     // 考核列表
     pageStuAssessment: `${host}occupationlab/assessment/pageStuAssessment`, // 学生端——学生考核列表
diff --git a/src/pages/account/login/index.vue b/src/pages/account/login/index.vue
index a38d3ec..8e9de3a 100644
--- a/src/pages/account/login/index.vue
+++ b/src/pages/account/login/index.vue
@@ -199,7 +199,7 @@ export default {
                 this.loginForm.phone = this.phone;
                 this.phoneVisible = false;
 
-                util.local.set(Setting.tokenKey, res.data.token, Setting.tokenExpires);
+                util.local.set(Setting.tokenKey, res.token, Setting.tokenExpires);
                 let redirect = this.$route.query.redirect ? decodeURIComponent(this.$route.query.redirect) : "/index";
                 this.$router.replace(redirect);
                 util.successMsg("登录成功");
diff --git a/src/pages/info/details/index.vue b/src/pages/info/details/index.vue
index c693ed5..d8068de 100644
--- a/src/pages/info/details/index.vue
+++ b/src/pages/info/details/index.vue
@@ -1,29 +1,32 @@
 <template>
-    <div style="padding: 24px">
-
-        <div class="article">
-            <el-card shadow="hover" class="m-b-20">
-                <div class="flex-between">
-                    <el-page-header @back="goBack" :content="'资讯详情'"></el-page-header>
-                </div>
-            </el-card>
-            <el-card shadow="hover" class="m-b-20">
-                <div class="page">
-                    <h6 class="title">{{title}}</h6>
-                    <div class="metas">
-                        <span>作者： {{author}}</span>
-                        <span>{{date.replace(' 00:00:00','')}}</span>
-                        <span>浏览量：{{viewCount}}</span>
+    <div>
+        <div class="banner-con"></div>
+        <div style="padding: 24px">
+            <div class="article">
+                <el-card shadow="hover" class="m-b-20">
+                    <div class="flex-between">
+                        <el-page-header @back="goBack" :content="'资讯详情'"></el-page-header>
                     </div>
+                </el-card>
+                <el-card shadow="hover" class="m-b-20">
+                    <div class="page">
+                        <h6 class="title">{{title}}</h6>
+                        <div class="metas">
+                            <span>作者： {{author}}</span>
+                            <span>{{date.replace(' 00:00:00','')}}</span>
+                            <span>浏览量：{{viewCount}}</span>
+                        </div>
 
-                    <div class="cover">
-                        <img :src="coverUrl" alt="">
+                        <div class="cover">
+                            <img :src="coverUrl" alt="">
+                        </div>
+                        <div class="content ql-editor" v-html="content"></div>
                     </div>
-                    <div class="content ql-editor" v-html="content"></div>
-                </div>
-            </el-card>
+                </el-card>
+            </div>
         </div>
     </div>
+
 </template>
 
 <script>
@@ -76,6 +79,13 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.banner-con{
+    width: 100vw;
+    height: 200px;
+    background-image: url('../../../assets/img/match-banner.jpg');
+    background-size: 100vw 200px;
+    background-repeat: no-repeat;
+}
 .article{
     //width: 70%;
     margin: 0 auto;
diff --git a/src/pages/info/list/index.vue b/src/pages/info/list/index.vue
index f104495..895db7a 100644
--- a/src/pages/info/list/index.vue
+++ b/src/pages/info/list/index.vue
@@ -1,8 +1,6 @@
 <template>
     <div>
-        <div class="banner-con">
-
-        </div>
+        <div class="banner-con"></div>
         <div class="main">
             <div class="nav">
                 <div class="sub-title">最新资讯</div>
diff --git a/src/pages/match/details/index.vue b/src/pages/match/details/index.vue
index a5d91df..cffdd57 100644
--- a/src/pages/match/details/index.vue
+++ b/src/pages/match/details/index.vue
@@ -1,20 +1,21 @@
 <template>
-    <div style="padding: 24px">
-        <el-card shadow="hover" class="m-b-20">
-            <div class="flex-between">
-                <el-page-header @back="goBack" :content="'赛事详情'"></el-page-header>
-            </div>
-        </el-card>
-        <el-card shadow="hover" class="m-b-20">
-            <div class="main">
-                <div class="nav">
-                    <div class="sub-title">赛事报名</div>
-                    <div class="sidebar">
-                        <div class="item" :class="{ active: curType === item.id }" v-for="(item, index) in typeList" :key="index" @click="tabChange(item.id)">{{item.name}}</div>
-                    </div>
+    <div>
+        <div class="banner-con"></div>
+        <div class="main">
+            <div class="nav">
+                <div class="sub-title">赛事报名</div>
+                <div class="sidebar">
+                    <div class="item" :class="{ active: curType === item.id }" v-for="(item, index) in typeList" :key="index" @click="tabChange(item.id)">{{item.name}}</div>
                 </div>
+            </div>
 
-                <div class="content-wrap">
+            <div class="content-wrap">
+                <el-card shadow="hover" style="margin: 24px 0">
+                    <div class="flex-between">
+                        <el-page-header @back="goBack" :content="'赛事详情'"></el-page-header>
+                    </div>
+                </el-card>
+                <el-card shadow="hover">
                     <div class="content">
                         <h6 class="title">{{title}}</h6>
                         <div class="meta">最近编辑时间：{{gmtModified}}</div>
@@ -29,9 +30,9 @@
                             </ul>
                         </div>
                     </div>
-                </div>
+                </el-card>
             </div>
-        </el-card>
+        </div>
     </div>
 </template>
 
@@ -97,7 +98,6 @@ export default {
         },
         getData() {
             this.loadIns = Loading.service()
-            console.log(111,this.id);
             this.$get(this.api.getContest + '/' + this.id)
                 .then(res => {
                     let data = res.contest
@@ -179,15 +179,23 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.banner-con{
+    width: 100vw;
+    height: 400px;
+    background-image: url('../../../assets/img/info-banner.png');
+    background-size: 100vw 400px;
+    background-repeat: no-repeat;
+}
 .main{
     display: flex;
     justify-content: center;
     align-items:flex-start;
-    //padding: 265px 0 20px;
+    padding-bottom: 40px;
     .nav{
         width: 220px;
         border-radius: 8px;
         overflow: hidden;
+        margin-top: -44px;
         .sub-title{
             line-height: 88px;
             color: #fff;
@@ -221,7 +229,7 @@ export default {
 
         .content{
             position: relative;
-            padding: 20px 60px;
+            padding: 20px 40px;
             background-color: #fff;
             border-radius: 8px;
 
diff --git a/src/pages/record/details/index.vue b/src/pages/record/details/index.vue
index c8a375d..25877ef 100644
--- a/src/pages/record/details/index.vue
+++ b/src/pages/record/details/index.vue
@@ -1,6 +1,6 @@
 <template>
     <!--实验情况-->
-    <div>
+    <div style="padding: 24px">
         <el-card shadow="hover" class="m-b-20">
             <div class="flex-between">
                 <el-page-header @back="goBack" :content="'实验情况'"></el-page-header>
@@ -21,6 +21,7 @@
                 :cell-style="tableRowStyle"
                 :data="listData"
                 @selection-change="handleSelectionChange"
+                row-key="reportId"
             >
                 <el-table-column type="selection" width="55" align="center" :reserve-selection="true"></el-table-column>
                 <el-table-column prop="id" label="次序" width="120" align="center" type="index"></el-table-column>
@@ -97,8 +98,8 @@ export default {
             }
         },
         toReport(row) {
-            this.setSystemId(this.systemId);
-            this.$router.push(`/record/show?id=${row.id}&recordId=${row.recordid}&reportId=${row.reportId}`);
+            // this.setSystemId(this.systemId);
+            this.$router.push(`/record/show?reportId=${row.reportId}`);
         }
     }
 };
diff --git a/src/pages/record/show/index.vue b/src/pages/record/show/index.vue
index 9243a6e..02bd5d8 100644
--- a/src/pages/record/show/index.vue
+++ b/src/pages/record/show/index.vue
@@ -24,10 +24,8 @@
 
             <div>
                 <el-table :data="infoData" class="info-table" stripe header-align="center">
-                    <el-table-column prop="userName" label="学生姓名" align="center">
-                    </el-table-column>
-                    <el-table-column prop="workNumber" label="学生学号" align="center">
-                    </el-table-column>
+                    <el-table-column prop="userName" label="学生姓名" align="center"></el-table-column>
+                    <el-table-column prop="workNumber" label="学生学号" align="center"></el-table-column>
                     <el-table-column prop="experimentalClassName" label="学生班级" align="center">
                         <template slot-scope="scope">
                             <template v-if="editing">
@@ -70,7 +68,6 @@
                     <p class="meta-title">实验目的</p>
                 </div>
                 <div class="pre-wrap" v-html="form.purpose"></div>
-                <!-- <el-input v-model="form.purpose" type="textarea" :disabled="!editing" rows="5"></el-input> -->
             </div>
 
             <div class="m-b-20">
@@ -83,19 +80,33 @@
                             {{ scope.$index + 1 }}
                         </template>
                     </el-table-column>
-                    <el-table-column prop="judgmentPointsName" label="任务名称" align="center">
+                    <el-table-column prop="judgmentName" label="任务名称">
                     </el-table-column>
                     <el-table-column prop="userAnswer" label="学生答案">
+                        <!--
                         <template slot-scope="scope">
                             <pre v-html="scope.row.userAnswer" style="white-space: pre-wrap"></pre>
                         </template>
+                        -->
+                        <template slot-scope="scope">
+                            <div v-for="(item, index) in scope.row.lcRuleRecords">
+                                <span>{{index+1}}. </span>{{item.userAnswer}}
+                            </div>
+                        </template>
                     </el-table-column>
                     <el-table-column prop="answer" label="参考答案">
+                        <!--
                         <template slot-scope="scope">
                             <pre v-html="scope.row.answer" style="white-space: pre-wrap"></pre>
                         </template>
+                        -->
+                        <template slot-scope="scope">
+                            <div v-for="(item, index) in scope.row.lcRuleRecords">
+                                <span>{{index+1}}. </span>{{item.ruleAnswer}}
+                            </div>
+                        </template>
                     </el-table-column>
-                    <el-table-column prop="codeScore" label="得分" align="center"></el-table-column>
+                    <el-table-column prop="score" label="得分" align="center"></el-table-column>
                 </el-table>
             </div>
 
@@ -182,31 +193,11 @@ export default {
     },
     methods: {
         getData() {
-            if (this.type) {
-                let data = {
-                    recordId: this.id
-                };
-                this.$get(this.api.queryVirtualReport, data).then(res => {
-                    this.form = res.data.report;
-                    let expData = res.data.data;
+            if (!this.type) {
+                this.$get(`${this.api.reportDetail}?reportId=${this.reportId}`).then(res => {
+                    this.form = res.report;
+                    this.expData = res.userScores;
                     let form = this.form;
-                    let score = form.score;
-
-                    if (expData) {
-                        if (score) {
-                            expData.map(n => {
-                                if (n.isError) { // isError为1则表示该题学生做错了，所以要从总分里减去该题的分数（这只是暂时的权宜之计，后端很难实现这个减分，所以在前端来实现）
-                                    score -= n.codeScore;
-                                    n.codeScore = 0;
-                                }
-                            });
-                            form.score = score;
-                        }
-                        expData[0].answer = expData[0].answer.replace("<pre class=\"ql-syntax\" spellcheck=\"false\">", "");
-                        expData[0].answer = expData[0].answer.replace("</pre>", "");
-
-                        this.expData = expData;
-                    }
                     this.infoData.push({
                         workNumber: form.workNumber,
                         experimentalClassName: form.experimentalClassName,
@@ -259,9 +250,6 @@ export default {
                 });
             }
         },
-        handleRemove(file, fileList) {
-            console.log(file, fileList);
-        },
         handlePreview(file) {
             console.log(file);
         },