From 4020eb5d5d5ef51f94394b303c1fb3cfd6f3fd47 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Tue, 11 May 2021 11:16:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AD=A3=E5=BC=8F=E7=8E=AF=E5=A2=83=E9=9A=90?=
 =?UTF-8?q?=E8=97=8F=E6=9C=80=E5=90=8E=E4=B8=A4=E4=B8=AA=E5=AD=90=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/css/main.css                |  2 +-
 src/components/common/Footer.vue       |  2 +-
 src/components/page/Backstage.vue      | 34 ++++++++++++++------------
 src/components/page/Dashboard.vue      |  8 +++---
 src/components/page/Login.vue          |  7 +++---
 src/components/page/ShowExperiment.vue | 15 +++++++++---
 src/config/index.js                    | 15 ++++++------
 7 files changed, 49 insertions(+), 34 deletions(-)

diff --git a/src/assets/css/main.css b/src/assets/css/main.css
index c5d0032..3308725 100644
--- a/src/assets/css/main.css
+++ b/src/assets/css/main.css
@@ -59,7 +59,7 @@ li {
     left: 65px;
 }
 .box{
-    min-height: calc(100vh - 201px);
+    min-height: calc(100vh - 175px);
     box-sizing: border-box;
 }
 
diff --git a/src/components/common/Footer.vue b/src/components/common/Footer.vue
index d3217f0..4245605 100644
--- a/src/components/common/Footer.vue
+++ b/src/components/common/Footer.vue
@@ -1,7 +1,7 @@
 <template>
     <div>
         <div class="copyright">
-        <p>技术支持：深圳或然科技有限公司</p>
+        <!-- <p>技术支持：深圳或然科技有限公司</p> -->
             <a href="https://beian.miit.gov.cn/#/Integrated/index" target="_blank">粤ICP备20072679号</a></div>
     </div>
 </template>
diff --git a/src/components/page/Backstage.vue b/src/components/page/Backstage.vue
index 04dfff3..335eeb2 100644
--- a/src/components/page/Backstage.vue
+++ b/src/components/page/Backstage.vue
@@ -47,25 +47,28 @@ export default {
             },{
                 imgSrc: require('../../assets/img/station10.png'),
                 name: '大数据分析<br>实验教学系统'
-            },{
-                imgSrc: require('../../assets/img/station11.png'),
-                name: 'Python数据清洗<br>教学实验系统'
-            },{
-                imgSrc: require('../../assets/img/station12.png'),
-                name: 'Python数据采集（爬虫）<br>教学实验系统'
-            },
-            {
-                imgSrc: require('../../assets/img/station4.png'),
-                name: '数字货币交易'
             },
+            // {
+            //     imgSrc: require('../../assets/img/station11.png'),
+            //     name: 'Python数据清洗<br>教学实验系统'
+            // },{
+            //     imgSrc: require('../../assets/img/station12.png'),
+            //     name: 'Python数据采集（爬虫）<br>教学实验系统'
+            // },
+            // {
+            //     imgSrc: require('../../assets/img/station4.png'),
+            //     name: '数字货币交易'
+            // },
+            // {
+            //     imgSrc: require('../../assets/img/station6.png'),
+            //     name: '担保实训教学系统'
+            // },
+
+
             // {
             //     imgSrc: require('../../assets/img/station5.png'),
             //     name: '小额贷款业务实训系统'
             // },
-            {
-                imgSrc: require('../../assets/img/station6.png'),
-                name: '担保实训教学系统'
-            },
             // {
             //     imgSrc: require('../../assets/img/station7.png'),
             //     name: '投资银行实验教学系统'
@@ -187,7 +190,8 @@ export default {
         box-sizing: border-box;
 
         .item{
-            width: 16%;
+            // width: 16%;
+            width: 30%;
             margin: 20px;
             text-align: center;
             cursor: pointer;
diff --git a/src/components/page/Dashboard.vue b/src/components/page/Dashboard.vue
index 69205e8..188fe8f 100644
--- a/src/components/page/Dashboard.vue
+++ b/src/components/page/Dashboard.vue
@@ -367,10 +367,10 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.content-wrap{
-    min-height: calc(100vh);
-    overflow: auto;
-}
+// .content-wrap{
+//     min-height: calc(100vh);
+//     overflow: auto;
+// }
 /deep/.el-tabs__item:focus{
     outline: none;
     box-shadow: none !important;
diff --git a/src/components/page/Login.vue b/src/components/page/Login.vue
index 3dc9916..3ff1fab 100644
--- a/src/components/page/Login.vue
+++ b/src/components/page/Login.vue
@@ -142,9 +142,10 @@ export default {
             activeName: '0',
             isReg: false,
             loginForm: {
-                // username: '18818574533',
-                username: '18156547156',
-                password: '111aaa',
+                // username: '18156547156',
+                // password: '111aaa',
+                username: '',
+                password: '',
             },
             loginRules: {
                 username: [{ required: true, message: '请输入用户名', trigger: 'blur' }],
diff --git a/src/components/page/ShowExperiment.vue b/src/components/page/ShowExperiment.vue
index cbddb07..977044d 100644
--- a/src/components/page/ShowExperiment.vue
+++ b/src/components/page/ShowExperiment.vue
@@ -72,7 +72,8 @@
                         <div class="meta-title-wrap">
                             <p class="meta-title">实验目的</p>
                         </div>
-                        <el-input v-model="form.purpose" type="textarea" :disabled="!editing" rows="5"></el-input>
+                        <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="mgb20">
@@ -89,12 +90,12 @@
                             </el-table-column>
                             <el-table-column prop="userAnswer" label="学生答案">
                                 <template slot-scope="scope">
-                                    <pre v-html="scope.row.userAnswer"></pre>
+                                    <pre v-html="scope.row.userAnswer" style="white-space: pre-wrap"></pre>
                                 </template>
                             </el-table-column>
                             <el-table-column prop="answer" label="参考答案">
                                 <template slot-scope="scope">
-                                    <div v-html="scope.row.answer"></div>
+                                    <pre v-html="scope.row.answer" style="white-space: pre-wrap"></pre>
                                 </template>
                             </el-table-column>
                             <el-table-column prop="codeScore" label="得分" align="center"></el-table-column>
@@ -193,6 +194,8 @@
                                 })
                                 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
                         }
@@ -423,6 +426,12 @@
             }
         }
     }
+    .pre-wrap{
+        min-height: 117px;
+        padding: 5px 15px;
+        color: #777;
+        background-color: #e5dfff;
+    }
     
     /deep/.cell{
         font-size: 12px;
diff --git a/src/config/index.js b/src/config/index.js
index 6debbad..020525d 100644
--- a/src/config/index.js
+++ b/src/config/index.js
@@ -43,12 +43,13 @@ export default {
         },{
             id: 8,
             label: '大数据分析实验教学系统'
-        },{
-            id: 9,
-            label: 'Python数据清洗教学实验系统'
-        },{
-            id: 10,
-            label: 'Python数据采集（爬虫）教学实验系统'
-        }
+        },
+        // {
+        //     id: 9,
+        //     label: 'Python数据清洗教学实验系统'
+        // },{
+        //     id: 10,
+        //     label: 'Python数据采集（爬虫）教学实验系统'
+        // }
     ],
 }
\ No newline at end of file