Merge remote-tracking branch 'origin/http_test' into http_test

src/components/newLayout/Main.vue

@@ -190,7 +190,7 @@ export default {
   width: 100%;
   min-width: 890px;
   // padding-left: 10px;
-  overflow-y: scroll;
+  overflow-y: auto;
   background-color: rgb(242, 243, 246);
 }
 </style>

src/styles/detail-pages.less

@@ -33,7 +33,7 @@
   z-index: 99;
   left: 225px;
   top: 0;
-  width: calc(100% - 290px);
+  width: calc(100% - 275px);
   border-radius: 5px;
 }
 .top-main-header {

src/views/projectManage/requirement/requirementDetail.vue

@@ -129,14 +129,14 @@
               </div>
             </div><br>
           </div>
-          <section class="main-section">
+          <section class="">
             <div class="required-tips">
               <span class="tipName"><i class="el-icon-question icon-sty" /> 帮助提示</span><br>
               <ul style="padding:0 18px">
                 <li v-for="(item, index) in textTips" :key="index">{{ item }}</li>
               </ul>
             </div>
-            <div class="allTips" style="margin: 0 0 20px 20px">
+            <div class="allTips" style="margin: 0 10px 20px 30px">
               <el-radio-group v-model="listOrGannt" size="small">
                 <el-radio-button label="列表" />
                 <el-radio-button label="甘特图" />
@@ -754,7 +754,7 @@ export default {
   border: 1px solid #e0eefd;
   border-radius: 4px;
   background: #edf5fe;
-  margin: 0 20px 10px;
+  margin: 0 30px 10px;
   padding: 10px;
 }
 .tipName {

src/views/projectManage/taskList/taskViewDetail.vue

@@ -205,7 +205,7 @@
               </div>
             </div>
           </div>
-          <section class="main-section">
+          <section>
             <div class="task-help-tips">
               <div class="tips-icon">
                 <i class="el-icon-question" />
@@ -234,7 +234,7 @@
             </div>
           </section>
           <el-container>
-            <el-main style="padding: 0;">
+            <el-main style="padding: 0 10px;">
               <schedule-list :id="taskId" ref="taskSchedule" :showunlock="showunlock" :type-list="taskScheduleEvent" class-name="white" @updataData="getSchedule" />
               <div v-if="form_query.status >= 70" class="border-top">
                 <el-divider />
@@ -1056,7 +1056,7 @@ export default {
   .task-help-tips {
     display: flex;
     flex-direction: column;
-    margin: 0 10px;
+    margin: 0 30px;
     padding: 15px 13px 5px;
     border-radius: 4px;
     background-color: rgba(64, 158, 255,0.1);
@@ -1083,6 +1083,7 @@ export default {
   .schedule-control {
     display: flex;
     justify-content: flex-end;
+    margin: 5px 10px;
   }
   .detail-info {
     padding: 0 34px 20px 34px;