Merge branch 'http_test' of git.xiaojukeji.com:jacklijiajia/thoth-frontend into wangzi_dev

src/views/projectManage/projectList/components/modifySchedule.vue

@@ -646,7 +646,7 @@ article {
 }
 .task-list-show {
   width: 100%;
-  padding: 0 156px 0 160px;
+  padding: 0 60px 0;
   .task-list-item {
     width: 100%;
     display: flex;

src/views/workbench/components/listView.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div :class="{'person': workbenchType === '个人', 'team': workbenchType === '团队'}">
     <div class="team-view">
       <el-radio-group v-model="team_radio1" size="small" @change="radio_aelect">
         <el-radio-button label="忙碌" />
@@ -354,6 +354,12 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.person {
+  min-height: calc(100vh - 358px);
+}
+.team {
+  min-height: calc(100vh - 196px);
+}
 .team-view {
   margin: 5px 30px 20px;
   .team-time {

src/views/workbench/team/components/ganntViews.vue

@@ -307,7 +307,7 @@ export default {
 .table-top {
   margin: 0 30px 20px;
   width: 95%;
-  min-height: calc(100vh - 251px);
+  min-height: calc(100vh - 208px);
   .range-time {
     margin: 5px 30px 20px;
   }