From edd6d4199a2c48f5d4fd6dd327ef5cd8b3821722 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Thu, 3 Mar 2022 15:57:49 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E3=80=81=E9=A1=B5=E8=84=9A?=
 =?UTF-8?q?=E7=AD=89=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/footer/index.vue      |  7 ++--
 src/layouts/header/index.vue      |  4 +-
 src/layouts/navbar/index.vue      |  6 ++-
 src/pages/account/login/index.vue | 66 ++++++++-----------------------
 src/pages/record/show/index.vue   | 35 +++++++---------
 src/pages/station/list/index.vue  |  2 +-
 src/styles/common.scss            | 19 ++++++++-
 7 files changed, 61 insertions(+), 78 deletions(-)

diff --git a/src/layouts/footer/index.vue b/src/layouts/footer/index.vue
index 547c0b1..62a1b87 100644
--- a/src/layouts/footer/index.vue
+++ b/src/layouts/footer/index.vue
@@ -1,19 +1,20 @@
 <template>
     <div class="footer">
-        <div class="info">
+        <div class="info" v-if="isIndex">
             <span class="m-r-20">客服邮箱：service@huorantech.cn</span>
         </div>
         <div class="copyright">
-            <span>© Copyright 2021 Occupation Lab 职站</span>
+            <span v-if="isIndex">© Copyright 2021 Occupation Lab 职站</span>
             <a href="https://beian.miit.gov.cn/#/Integrated/index" target="_blank">粤ICP备20072679号</a>
         </div>
     </div>
 </template>
 <script>
+import Setting from "@/setting";
 export default {
     data() {
         return {
-            
+            isIndex: this.$route.path !== '/login' && Setting.whiteList.some(e => e === this.$route.path) // 官网3个页面才能显示邮箱和版权号
         };
     },
     mounted(){
diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue
index f4d4127..0ae288c 100644
--- a/src/layouts/header/index.vue
+++ b/src/layouts/header/index.vue
@@ -103,7 +103,6 @@ $height: 64px;
         display: flex;
         justify-content: space-between;
         align-items: center;
-        max-width: $max-width;
         min-width: $min-width;
         padding: 0 80px 0 10px;
         margin: 0 auto;
@@ -168,6 +167,9 @@ $height: 64px;
 }
 @media (max-width: 1430px) {
     .header {
+        .logo {
+            left: 20px;
+        }
         .inner {
             padding-right: 20px;
         }
diff --git a/src/layouts/navbar/index.vue b/src/layouts/navbar/index.vue
index e50966d..b1feff9 100644
--- a/src/layouts/navbar/index.vue
+++ b/src/layouts/navbar/index.vue
@@ -101,14 +101,16 @@ export default {
 .nav{
     position: absolute;
     top: 0;
-    left: 280px;
+    left: 50%;
     display: flex;
+    transform: translateX(-50%);
     li{
         padding: 0 15px;
         margin: 0 20px;
         font-size: 16px;
         line-height: 60px;
         color: #3F3F3F;
+        white-space: nowrap;
         cursor: pointer;
         border-bottom: 4px solid transparent;
         &.active{
@@ -119,7 +121,7 @@ export default {
 }
 @media (max-width: 1430px) {
     .nav {
-        left: 200px;
+        left: 52%;
     }
 }
 </style>
\ No newline at end of file
diff --git a/src/pages/account/login/index.vue b/src/pages/account/login/index.vue
index f7c2210..b4bc38b 100644
--- a/src/pages/account/login/index.vue
+++ b/src/pages/account/login/index.vue
@@ -1,13 +1,5 @@
 <template>
     <div class="wrap">
-        <div class="shapes">
-            <img class="shape1" src="@/assets/img/shapes/shape1.png" alt="">
-            <img class="shape2" src="@/assets/img/shapes/shape2.png" alt="">
-            <img class="shape3" src="@/assets/img/shapes/shape3.png" alt="">
-            <img class="shape4" src="@/assets/img/shapes/shape4.png" alt="">
-            <img class="shape5" src="@/assets/img/shapes/shape5.png" alt="">
-            <img class="shape6" src="@/assets/img/shapes/shape6.png" alt="">
-        </div>
         <div class="login">
             <div class="form">
                 <h6 class="title">欢迎使用请登录</h6>
@@ -279,44 +271,20 @@ export default {
 <style scoped lang="scss">
 .wrap {
     min-height: 100%;
-    background-color:  #F3F6FA;
-    overflow: hidden;
-    .shapes{
-        img{
-            position: absolute;
-        }
-    }
-    .shape1{
-        top: 123px;
-    }
-    .shape2{
-        top: 238px;
-        left: 35px;
-    }
-    .shape3{
-        top: 485px;
-    }
-    .shape4{
-        bottom: 285px;
-        right: 0;
-    }
-    .shape5{
-        bottom: 145px;
-        right: 0;
-    }
-    .shape6{
-        bottom: 0;
-        right: 0;
-    }
+    background-color: #F3F6FA;
     .login{
-        z-index: 4;
-        position: absolute;
-        top: calc((100vh - 611px) / 2);
-        left: 50%;
-        width: 436px;
-        transform: translateX(-50%);
+        min-height: calc(100vh - 43px);
+        padding-top: calc((100vh - 584px) / 2);
+        background: url(../../../assets/img/shapes/shape1.png) (0 123px)/auto no-repeat,
+                    url(../../../assets/img/shapes/shape2.png) (35px 238px)/auto no-repeat,
+                    url(../../../assets/img/shapes/shape3.png) (0 485px)/auto no-repeat,
+                    url(../../../assets/img/shapes/shape4.png) (right 50%)/auto no-repeat,
+                    url(../../../assets/img/shapes/shape5.png) (right 80%)/auto no-repeat,
+                    url(../../../assets/img/shapes/shape6.png) (right bottom)/auto no-repeat;
         .form{
+            width: 436px;
             padding: 38px 38px 60px;
+            margin: 0 auto 0;
             border-radius: 6px;
             background-color: #fff;
             .title{
@@ -404,13 +372,6 @@ export default {
         }
     }
 }
-.footer{
-    z-index: 3;
-    position: fixed;
-    bottom: 0;
-    left: 0;
-    width: 100%;
-}
 .copyright{
     padding: 18px 0;
     font-size: 12px;
@@ -463,4 +424,9 @@ export default {
 /deep/.select-dia {
     margin-top: calc((100vh - 383px) / 2) !important;
 }
+@media (max-height: 680px) {
+    .wrap .login {
+        padding: 40px 0;
+    }
+}
 </style>
\ No newline at end of file
diff --git a/src/pages/record/show/index.vue b/src/pages/record/show/index.vue
index ab0f078..92788bc 100644
--- a/src/pages/record/show/index.vue
+++ b/src/pages/record/show/index.vue
@@ -106,7 +106,7 @@
                         <el-table-column prop="judgmentName" label="判分点" width="270" align="center"></el-table-column>
                         <el-table-column v-if='project' prop="judgmentName" label="考核点" align="center" width="150">
                             <template slot-scope="scope">
-                                <div v-for="(item, index) in scope.row.lcRuleRecords">
+                                <div v-for="(item, index) in scope.row.lcRuleRecords" :key="index">
                                     <span>
                                         <span>{{index+1}}. </span>{{item.name}}
                                     </span>
@@ -116,21 +116,19 @@
                         <el-table-column prop="ruleAnswer" label="参考答案" style='word-wrap: break-word' align="center">
                             <template slot-scope="scope">
                                 <div v-if='scope.row.lcRuleRecords'>
-                                    <div v-for="(item, index) in scope.row.lcRuleRecords">
+                                    <div v-for="(item, index) in scope.row.lcRuleRecords" :key="index">
                                     <span>
                                         <span>{{index+1}}. </span>{{item.ruleAnswer}}
                                     </span>
                                     </div>
                                 </div>
-                                <div v-else v-html="scope.row.referenceAnswer">
-<!--                                        {{}}-->
-                                </div>
+                                <div v-else v-html="scope.row.referenceAnswer"></div>
                             </template>
                         </el-table-column>
                         <el-table-column prop="userAnswer" label="学生答案" align="center">
                             <template slot-scope="scope">
                                 <div v-if='scope.row.lcRuleRecords'>
-                                    <div v-for="(item, index) in scope.row.lcRuleRecords">
+                                    <div v-for="(item, index) in scope.row.lcRuleRecords" :key="index">
                                         <span v-if='item.userAnswer'>
                                             <span>{{index+1}}. </span>{{item.userAnswer}}
                                         </span>
@@ -295,13 +293,22 @@ export default {
 .wrap {
     padding: 12px 300px 20px;
 }
-/deep/ pre, code, kbd, samp{
+code, kbd, samp{
     font-family: 'PingFang SC', "Helvetica Neue", Helvetica, "microsoft yahei", arial, STHeiTi, sans-serif;
     word-wrap: break-word;
     white-space: pre-wrap;
 }
 /deep/ pre{
-    white-space: pre-wrap;
+    white-space: pre-wrap;       /* css-3 */
+    white-space: -moz-pre-wrap;  /* Mozilla, since 1999 */
+    white-space: pre-wrap;      /* Opera 4-6 */
+    white-space: -o-pre-wrap;    /* Opera 7 */
+    word-wrap: break-word;       /* Internet Explorer 5.5+ */
+    word-break:break-all;
+    overflow:hidden;
+    font-size: 12px;
+    font-weight:400;
+    font-family:'PingFang SC', "Helvetica Neue", Helvetica, "microsoft yahei", arial, STHeiTi, sans-serif
 }
 .content {
     padding: 16px 40px;
@@ -391,18 +398,6 @@ export default {
         }
     }
 }
-pre {
-    white-space: pre-wrap;       /* css-3 */
-    white-space: -moz-pre-wrap;  /* Mozilla, since 1999 */
-    white-space: pre-wrap;      /* Opera 4-6 */
-    white-space: -o-pre-wrap;    /* Opera 7 */
-    word-wrap: break-word;       /* Internet Explorer 5.5+ */
-    word-break:break-all;
-    overflow:hidden;
-    font-size: 12px;
-    font-weight:400;
-    font-family:'PingFang SC', "Helvetica Neue", Helvetica, "microsoft yahei", arial, STHeiTi, sans-serif
-}
 @media (max-width: 1650px) {
     .wrap {
         padding: 12px 200px 20px;
diff --git a/src/pages/station/list/index.vue b/src/pages/station/list/index.vue
index 22b1107..3e9b3cd 100644
--- a/src/pages/station/list/index.vue
+++ b/src/pages/station/list/index.vue
@@ -85,13 +85,13 @@ export default {
 }
 
 .station {
+    min-height: calc(100vh - 520px);
     background: url(../../../assets/img/station1.png) (top left)/auto no-repeat,
                 url(../../../assets/img/station2.png) bottom right/auto no-repeat;
     .inner {
         display: flex;
         flex-wrap: wrap;
         width: 1072px;
-        min-height: calc(100vh - 520px);
         padding-top: 60px;
         margin: 0 auto;
     }
diff --git a/src/styles/common.scss b/src/styles/common.scss
index f1eaffb..9222d99 100644
--- a/src/styles/common.scss
+++ b/src/styles/common.scss
@@ -36,7 +36,7 @@
 .main {
   .view {
     min-width: $min-width;
-    min-height: calc(100vh - 134px);
+    min-height: calc(100vh - 107px);
     padding: 12px 200px 20px;
     margin: 0 auto;
     background-color: #F3F6FA;
@@ -348,6 +348,23 @@
 .el-tooltip__popper {
   width: 300px;
 }
+.el-tooltip__popper.is-dark {
+  padding: 18px 20px;
+  color: #606266;
+  line-height: 1.8;
+  background-color: #fff;
+  border: .0625rem solid #ebeef5;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+  border-radius: 4px;
+}
+.el-tooltip__popper[x-placement^="top"] {
+  .popper__arrow {
+    border-top-color: #fff;
+    &:after {
+      border-top-color: #fff;
+    }
+  }
+}
 
 @media(max-width: 1600px) {
   .el-table {