From fec9d3ec09548e4a82090e34615726591ffb4206 Mon Sep 17 00:00:00 2001
From: e <2432808546@qq.com>
Date: Mon, 20 Dec 2021 11:30:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B9=8B=E5=89=8D=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E5=AD=97=E6=AE=B5=E6=B5=8B=E8=AF=95,=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/ass/list/index.vue    |  8 ++++----
 src/pages/record/show/index.vue | 28 +++++++++++++++++-----------
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/src/pages/ass/list/index.vue b/src/pages/ass/list/index.vue
index 487e786..67b36a8 100644
--- a/src/pages/ass/list/index.vue
+++ b/src/pages/ass/list/index.vue
@@ -451,16 +451,16 @@ export default {
             let curriculumId = this.curRow.curriculumId;
             let token = util.local.get(Setting.tokenKey);
             let href = "";
-            let aaa = '';
+            let domainName = '';
             console.log(curriculumId)
-            aaa = host.slice(0,host.length-6)
+            domainName = host.slice(0,host.length-6)
             if (curriculumId == 11){
                 //线上
                 // href = `http://www.huorantech.cn/${this.url}/#/index/list?token=${token}&cid=${this.cid}&systemId=${this.systemId}&projectId=${this.projectId}&assessmentId=${this.assessmentId}&classId=${this.classId}&stopTime=${this.stopTime}`;
                 //测试与本地
-                href = `${aaa}/${this.url}/#/index/list?token=${token}&cid=${this.cid}&systemId=${this.systemId}&projectId=${this.projectId}&assessmentId=${this.assessmentId}&classId=${this.classId}&stopTime=${this.stopTime}`;
+                href = `${domainName}/${this.url}/#/index/list?token=${token}&cid=${this.cid}&systemId=${this.systemId}&projectId=${this.projectId}&assessmentId=${this.assessmentId}&classId=${this.classId}&stopTime=${this.stopTime}`;
             }else{
-                href = `${aaa}/${this.url}/#/index/list?token=${token}&cid=${this.cid}&systemId=${this.systemId}&projectId=${this.projectId}&assessmentId=${this.assessmentId}&classId=${this.classId}&stopTime=${this.stopTime}`;
+                href = `${domainName}/${this.url}/#/index/list?token=${token}&cid=${this.cid}&systemId=${this.systemId}&projectId=${this.projectId}&assessmentId=${this.assessmentId}&classId=${this.classId}&stopTime=${this.stopTime}`;
             }
             // switch (curriculumId) {
             //     // case 1:
diff --git a/src/pages/record/show/index.vue b/src/pages/record/show/index.vue
index f823c7e..e8f1240 100644
--- a/src/pages/record/show/index.vue
+++ b/src/pages/record/show/index.vue
@@ -5,18 +5,18 @@
             <div class="flex-between">
                 <el-page-header @back="goBack" content="查看报告"></el-page-header>
                 <div>
+                    <el-button v-if="!loading" size="mini" @click="editReport">
+                        {{ editing ? "保存" : "编辑" }}
+                    </el-button>
                     <el-button type="primary" size="mini" @click="exportPage">导出实验报告</el-button>
                 </div>
             </div>
         </div>
-        <div style='width: 1125.25px;background: #fff;box-shadow: 0px 2px 25px 2px #D1D1D1;margin:10px auto;height: calc(100vh - 0px);'>
+        <div style='width: 1125.25px;background: #fff;box-shadow: 0px 2px 25px 2px #D1D1D1;margin:50px auto;'>
             <div class="report-wrap" :class="{loading}" id="pdfDom">
                 <div style='padding: 30px 100px;overflow: hidden;width:100%'>
-                    <div style="position: relative;">
+                    <div style="position: relative;margin-top:30px">
                         <h6 style="text-align: center;font-size: 20px">标准实验报告</h6>
-                        <el-button v-if="!loading" style="position: absolute;top: 0;right: 0;" size="mini" @click="editReport">
-                            {{ editing ? "保存" : "编辑" }}
-                        </el-button>
                     </div>
                     <div class="flex-center m-b-20 user_header">
                         <p class="addhr_tag"></p>
@@ -59,13 +59,13 @@
                         <div class="meta-title-wrap">
                             <p class="meta-title"><img src="@/assets/img/cup.png" alt=""> 实验项目名称</p>
                         </div>
-                        <el-input class='textAreaFont' v-model="form.projectName" type="textarea" :disabled="!editing" rows="5"></el-input>
+                        <el-input style='font-size: 14px' class='textAreaFont' v-model="form.projectName" type="textarea" :disabled="!editing" rows="5"></el-input>
                     </div>
                     <div class="m-b-20">
                         <div class="meta-title-wrap">
                             <p class="meta-title">实验目的</p>
                         </div>
-                        <div class="pre-wrap" v-html="form.purpose"></div>
+                        <div style='font-size: 14px' class="pre-wrap" v-html="form.purpose"></div>
                     </div>
                     <div class="m-b-20">
                         <div class="meta-title-wrap">
@@ -115,7 +115,12 @@
                         <div class="meta-title-wrap">
                             <p class="meta-title">实验总结与体会</p>
                         </div>
-                        <el-input type="textarea" v-model="form.summarize" rows="5" :disabled="!editing"></el-input>
+                        <div v-if='!editing' style='background: #e5dfff;color: #777;min-height: 100px;overflow: hidden'>
+                            <div style='padding: 10px;font-size: 14px'>
+                                {{form.summarize}}
+                            </div>
+                        </div>
+                        <el-input v-else type="textarea" v-model="form.summarize" rows="5" :disabled="!editing"></el-input>
                     </div>
                 </div>
             </div>
@@ -257,7 +262,8 @@ export default {
 
 #pdfDom {
     width: 100%;
-    height: calc(100vh - 100px);
+    height: 100%;
+    //height: calc(100vh - 200px);
     background: #fff;
     box-sizing: border-box;
     //box-shadow: 0px 2px 25px 2px #D1D1D1;
@@ -324,8 +330,8 @@ export default {
 }
 
 /deep/ .cell {
-    font-size: 16px;
-    line-height: 35px;
+    font-size: 14px;
+    line-height: 25px;
 }
 
 // /deep/.el-row{