cxmo 1 سال پیش
والد
کامیت
c6a4fa4ef8
2فایلهای تغییر یافته به همراه18 افزوده شده و 11 حذف شده
  1. 9 10
      src/views/positionAnalysis_manage/components/indexContent.vue
  2. 9 1
      src/views/positionAnalysis_manage/detail.vue

+ 9 - 10
src/views/positionAnalysis_manage/components/indexContent.vue

@@ -4,17 +4,10 @@
             <span style="margin-right:20px">{{num}}品种</span>
             <span>{{time}}</span>
         </div>
-        <!-- <div style="margin:30px 0">
-            <el-switch
-                v-model="isHistory"
-                size="large"
-                active-text="历史合约"
-            />
-        </div> -->
         <div class="list-wrap">
             <div class="item" v-for="item in clist" :key="item.ClassifyName">
                 <div class="label">{{item.ClassifyName}}</div>
-                <div style="flex:1">
+                <div style="margin-top:20px;">
                     <div 
                         class="opt" 
                         v-for="_item in item.Items" 
@@ -103,6 +96,8 @@ export default {
 <style lang="scss" scoped>
 @import '~@/styles/theme-vars.scss';
 .index-content-wrap{
+    display: flex;
+    flex-direction: column;
     .top-box{
         background: #e6eefb;
         padding: 15px 30px;
@@ -111,10 +106,14 @@ export default {
         }
     }
     .list-wrap{
-        padding: 30px 0;
+        flex: 1;
+        padding: 30px;
+        /* height: 958px; */
+        box-sizing: border-box;
+        overflow-y: auto;
         .item{
             margin-bottom: 40px;
-            display: flex;
+            /* display: flex; */
 
             .label{
                 color: #666;

+ 9 - 1
src/views/positionAnalysis_manage/detail.vue

@@ -184,6 +184,9 @@ export default {
                     flex: 1;
                     padding:0;
                 }
+                .el-tabs__header{
+                    margin-bottom: 0;
+                }
             }
             
         }
@@ -202,7 +205,9 @@ export default {
       background: #fff;
       border: 1px solid #ececec;
       border-radius: 4px;
-      box-shadow: 0 3px 6px rgba(0,0,0,.05);
+      /* box-shadow: 0 3px 6px rgba(0,0,0,.05); */
+      display: flex;
+      flex-direction: column;
       .header{
           padding:30px;
           display: flex;
@@ -213,6 +218,9 @@ export default {
               font-weight: 500;
           }
       }
+      .tabs-wrap{
+          flex: 1;
+      }
   }
   .detail{
       flex:1;