From 48af28415301f0827e75862b6450d6e4f458e4b1 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Thu, 24 Feb 2022 10:48:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E8=BE=A8=E7=8E=87=E5=85=BC=E5=AE=B9?=
 =?UTF-8?q?=E5=88=B01280?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/header/index.vue        |  1 +
 src/pages/ass/list/index.vue        | 21 ++++++---
 src/pages/course/details/index.vue  |  5 +++
 src/pages/record/show/index.vue     | 12 ++++-
 src/pages/setting/person/index.vue  | 68 ++++++++++++++++-------------
 src/pages/station/preview/index.vue |  5 +++
 6 files changed, 73 insertions(+), 39 deletions(-)

diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue
index a2fc7eb..35cca75 100644
--- a/src/layouts/header/index.vue
+++ b/src/layouts/header/index.vue
@@ -90,6 +90,7 @@ $height: 64px;
     top: 0;
     left: 0;
     width: 100%;
+    min-width: $min-width;
     height: $height;
     background-color: #fff;
     box-shadow: 0px 0px 6px 0px rgba(178, 178, 178, 0.32);
diff --git a/src/pages/ass/list/index.vue b/src/pages/ass/list/index.vue
index 2271cec..52b997d 100644
--- a/src/pages/ass/list/index.vue
+++ b/src/pages/ass/list/index.vue
@@ -1,6 +1,6 @@
 <template>
     <!--  考核列表  -->
-    <div>
+    <div class="wrap">
         <div class="page">
             <h6 class="p-title">筛选</h6>
             <div class="tool mul">
@@ -478,18 +478,27 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.page .tool {
+    margin-bottom: 14px;
+}
+.filter {
+    flex-wrap: wrap;
+    li {
+        margin-bottom: 10px;
+    }
+}
 /deep/ .el-tabs__nav-wrap::after {
     display: none;
 }
-
-.no-mb /deep/ .el-form-item {
-    margin-bottom: 0;
-}
-
 .el-radio.is-bordered + .el-radio.is-bordered {
     margin-left: 0;
 }
 .el-radio-group {
     white-space: nowrap;
 }
+@media (max-width: 1430px) {
+    .wrap {
+        padding: 12px 100px 20px;
+    }
+}
 </style>
\ No newline at end of file
diff --git a/src/pages/course/details/index.vue b/src/pages/course/details/index.vue
index fae0943..2042bf0 100644
--- a/src/pages/course/details/index.vue
+++ b/src/pages/course/details/index.vue
@@ -476,4 +476,9 @@ $height: 700px;
         margin: 0 auto;
     }
 }
+@media (max-width: 1430px) {
+    .wrap {
+        padding: 12px 100px 20px;
+    }
+}
 </style>
\ No newline at end of file
diff --git a/src/pages/record/show/index.vue b/src/pages/record/show/index.vue
index a2853e7..119cf23 100644
--- a/src/pages/record/show/index.vue
+++ b/src/pages/record/show/index.vue
@@ -132,8 +132,6 @@
                     </h6>
                     <quill v-if="editing" :border="true" v-model="form.summarize" :minHeight="150" :height="150" />
                     <div v-else class="pre-wrap" v-html="form.summarize"></div>
-                    <!-- <el-input v-if="editing" type="textarea" v-model="form.summarize"></el-input>
-                    <div v-else class="pre-wrap" v-html="form.summarize"></div> -->
                 </div>
             </div>
         </div>
@@ -366,4 +364,14 @@ pre {
     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;
+    }
+}
+@media (max-width: 1430px) {
+    .wrap {
+        padding: 12px 100px 20px;
+    }
+}
 </style>
\ No newline at end of file
diff --git a/src/pages/setting/person/index.vue b/src/pages/setting/person/index.vue
index 812c6bd..3ac04ea 100644
--- a/src/pages/setting/person/index.vue
+++ b/src/pages/setting/person/index.vue
@@ -81,39 +81,45 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-    .wrap{
-        display: flex;
-        padding-bottom: 0;
-        .left{
-            margin-right: 12px;
-            background-color: #fff;
-            box-shadow: 2px 0px 6px 0px #EEEEEE;
-            .inner{
-                width: 170px;
-                padding: 20px 0;
-            }
-            .avatar{
-                width: 80px;
-                height: 80px;
-                border-radius: 50%;
-            }
-            .menu{
-                margin-top: 32px;
-                li{
-                    padding: 0 20px;
-                    color: #303133;
-                    font-size: 14px;
-                    line-height: 38px;
-                    cursor: pointer;
-                    &.active{
-                        color: #fff;
-                        background-color: #006EFF;
-                    }
+.wrap{
+    display: flex;
+    padding-bottom: 0;
+    .left{
+        margin-right: 12px;
+        background-color: #fff;
+        box-shadow: 2px 0px 6px 0px #EEEEEE;
+        .inner{
+            width: 170px;
+            padding: 20px 0;
+        }
+        .avatar{
+            width: 80px;
+            height: 80px;
+            border-radius: 50%;
+        }
+        .menu{
+            margin-top: 32px;
+            li{
+                padding: 0 20px;
+                color: #303133;
+                font-size: 14px;
+                line-height: 38px;
+                cursor: pointer;
+                &.active{
+                    color: #fff;
+                    background-color: #006EFF;
                 }
             }
         }
-        .right{
-            flex: 1;
-        }
     }
+    .right{
+        flex: 1;
+    }
+}
+@media (max-width: 1750px) {
+    .wrap {
+        min-width: 1500px;
+        padding: 12px 100px 20px;
+    }
+}
 </style>
\ No newline at end of file
diff --git a/src/pages/station/preview/index.vue b/src/pages/station/preview/index.vue
index 1cd6b4c..1e0ece7 100644
--- a/src/pages/station/preview/index.vue
+++ b/src/pages/station/preview/index.vue
@@ -546,4 +546,9 @@ $height: 700px;
         margin: 0 auto;
     }
 }
+@media (max-width: 1430px) {
+    .wrap {
+        padding: 12px 100px 20px;
+    }
+}
 </style>
\ No newline at end of file