首页一屏显示、日历位置调换

src/assets/less/common.css

@@ -1,3 +1,6 @@
+.fl {
+  float: left;
+}
 /*列表上方操作按钮区域*/
 .ant-card-body .table-operator {
   margin-bottom: 18px;
@@ -38,7 +41,7 @@
   width: calc(50% - 10px);
 }
 .query-group-split-cust:before {
-  content: "~";
+  content: '~';
   width: 20px;
   display: inline-block;
   text-align: center;

src/assets/less/common.less

@@ -1,4 +1,6 @@
-
+.fl {
+  float: left;
+}
 /*列表上方操作按钮区域*/
 .ant-card-body .table-operator {
   margin-bottom: 18px;
@@ -15,19 +17,19 @@
 
 /*列表页面弹出modal*/
 .ant-modal-cust-warp {
-  height: 100%
+  height: 100%;
 }
 
 /*弹出modal Y轴滚动条*/
 .ant-modal-cust-warp .ant-modal-body {
   height: calc(100% - 110px) !important;
-  overflow-y: auto
+  overflow-y: auto;
 }
 
 /*弹出modal 先有content后有body 故滚动条控制在body上*/
 .ant-modal-cust-warp .ant-modal-content {
   height: 90% !important;
-  overflow-y: hidden
+  overflow-y: hidden;
 }
 /*列表中有图片的加这个样式 参考用户管理*/
 .anty-img-wrap {
@@ -38,12 +40,20 @@
   max-height: 100%;
 }
 /*列表中范围查询样式*/
-.query-group-cust{width: calc(50% - 10px)}
-.query-group-split-cust:before{content:"~";width: 20px;display: inline-block;text-align: center}
-
+.query-group-cust {
+  width: calc(50% - 10px);
+}
+.query-group-split-cust:before {
+  content: '~';
+  width: 20px;
+  display: inline-block;
+  text-align: center;
+}
 
 /*erp风格子表外框padding设置*/
-.ant-card-wider-padding.cust-erp-sub-tab>.ant-card-body{padding:5px 12px}
+.ant-card-wider-padding.cust-erp-sub-tab > .ant-card-body {
+  padding: 5px 12px;
+}
 
 .delRed {
   color: red;
@@ -53,4 +63,4 @@
 }
 a {
   text-decoration: none;
-}
+}

src/assets/less/mytodo.css

@@ -1,168 +1,102 @@
-ul li {
-  list-style: none;
+.topCard .userImg {
+  width: 50px;
+  height: 50px;
 }
-a {
-  text-decoration: none;
+.topCard .userImg img {
+  border-radius: 50%;
+  width: 100%;
 }
-.fl {
-  float: left;
+.topCard .userInfo {
+  line-height: 20px;
+  color: #333;
 }
-.fr {
-  float: right;
+.topCard .userInfo p {
+  margin-top: 20px;
 }
-.clearfix:before,
-.clearfix:after {
-  content: '';
-  display: table;
+.topCard .userInfo em {
+  font-style: normal;
 }
-.clearfix:after {
-  clear: both;
-  overflow: hidden;
+.topCard .msgBox {
+  text-align: center;
+  background-color: rgba(236, 232, 232, 0.4);
+  border-radius: 2px;
 }
-.clearfix {
-  *zoom: 1;
+.topCard .msgBox span {
+  font-size: 28px;
+  color: orangered;
 }
- /deep/ .ant-card-head-title {
-  color: #1890ff;
+.topCard .msgBox p {
+  color: gray;
 }
-.fullCard {
-  height: 380px;
+.topCard .oaBig {
+  background-color: #61bea7;
+  text-align: center;
+  justify-content: space-between;
 }
-.fullCard /deep/ .ant-card-body {
-  padding: 0 4px;
+.topCard .oaBig .oaItem {
+  margin-bottom: 20px;
+  width: calc((100% - 10px) / 3);
 }
-.ccfullCalendar {
-  height: 274px !important;
+.topCard .oaBig .oaItem h4 {
+  margin-top: 4px;
 }
-.ccfullCalendar /deep/ .ant-fullcalendar-header {
+.news .links button {
+  border-radius: 2px;
+  border: none;
+  margin-right: 10px;
+  background-color: rgba(102, 155, 188, 0.7);
+  margin-bottom: 10px;
+}
+.news .links button a {
+  color: white;
+  font-size: 18px;
+  padding: 10px 14px;
+}
+.news .links button:hover {
+  background-color: #003049;
+  color: white;
+  box-shadow: 1px 1px 3px #333;
+}
+.news .fullCard {
+  height: 400px;
+}
+.news .fullCard /deep/ .ant-card-body {
+  padding: 2px;
+}
+.news .ccfullCalendar /deep/ .ant-fullcalendar-header {
   display: none;
 }
-.ccfullCalendar /deep/ .ant-fullcalendar {
+ /deep/ .ant-card-head-title {
+  color: #1890ff;
+}
+ /deep/ .ant-fullcalendar {
   border-top: none;
 }
-.ccfullCalendar /deep/ .ant-fullcalendar-calendar-body {
+ /deep/ .ant-fullcalendar-calendar-body {
   padding: 0;
 }
-.ccfullCalendar /deep/ .fc .fc-toolbar.fc-header-toolbar {
+ /deep/ .fc .fc-toolbar.fc-header-toolbar {
   margin-bottom: 6px;
 }
-.ccfullCalendar /deep/ .fc .fc-scrollgrid-liquid {
+ /deep/ .fc .fc-scrollgrid-liquid {
   height: 274px !important;
 }
-.ccfullCalendar /deep/ .fc .fc-toolbar-title {
+ /deep/ .fc .fc-toolbar-title {
   font-size: 14px;
   letter-spacing: 1px;
 }
-.ccfullCalendar /deep/ .fc-scrollgrid-sync-table {
+ /deep/ .fc-scrollgrid-sync-table {
   height: 274px !important;
 }
-.ccfullCalendar /deep/ .fc-daygrid-day-bottom {
+ /deep/ .fc-daygrid-day-bottom {
   margin-top: -10px !important;
 }
-.ccfullCalendar /deep/ .fc .fc-button-primary {
+ /deep/ .fc .fc-button-primary {
   background-color: #1890ff;
   margin-top: 4px;
   border: none;
 }
-.ccfullCalendar /deep/ .fc .fc-toolbar-title {
+ /deep/ .fc .fc-toolbar-title {
   color: #333;
   font-size: 16px;
 }
-#home .topCard .userImg {
-  width: 80px;
-  height: 80px;
-  line-height: 30px;
-  margin-right: 20px;
-}
-#home .topCard .userImg img {
-  border-radius: 6px;
-  width: 100%;
-}
-#home .topCard .userInfo span {
-  margin-left: 40px;
-  display: block;
-  line-height: 26px;
-}
-#home .topCard .userInfo span .department {
-  font-size: 14px;
-  color: #474646;
-}
-#home .topCard .msgBox {
-  text-align: center;
-  background-color: rgba(236, 232, 232, 0.4);
-  border-radius: 10px;
-}
-#home .topCard .msgBox em {
-  margin: 0 10px;
-  font-style: normal;
-  margin-right: 50px;
-}
-#home .topCard .msgBox em span {
-  font-size: 30px;
-  color: #fa6b5c;
-  font-weight: 700;
-}
-#home .topCard .msgBox em p {
-  font-size: 16px;
-}
-#home .oaIcon {
-  text-align: center;
-  margin-right: 30px;
-  float: left;
-}
-#home .oaIcon h4 {
-  margin-top: 10px;
-}
-.news .notice ul {
-  margin: 0;
-  padding: 0;
-}
-.news .notice ul li {
-  line-height: 30px;
-}
-.news .notice ul li a {
-  font-size: 14px;
-  color: #444;
-}
-.news .notice ul li a .department {
-  margin-right: 10px;
-}
-.news .notice ul li a .createBy {
-  color: #333;
-}
-.news .notice ul li a .createTime {
-  color: #a4a4a4;
-  margin: 0 4px 0 20px;
-}
-.news .notice ul li a:hover {
-  color: #1890ff;
-}
-.news .total span {
-  display: block;
-  line-height: 40px;
-}
-.news .total span strong {
-  color: #fa6b5c;
-  text-decoration: underline;
-  margin-right: 4px;
-}
-.news .links /deep/ .ant-card-body {
-  padding: 20px;
-}
-.news .links button {
-  border-radius: 2px;
-  border: none;
-  margin-right: 4px;
-  background-color: rgba(102, 155, 188, 0.7);
-  margin-bottom: 10px;
-}
-.news .links button a {
-  color: white;
-  font-size: 18px;
-  padding: 10px 14px;
-}
-.news .links button:hover {
-  background-color: #003049;
-  color: white;
-  box-shadow: 1px 1px 3px #333;
-}

src/assets/less/mytodo.less

@@ -1,197 +1,61 @@
 // mytodo页面专用样式
-ul li {
-  list-style: none;
-}
-a {
-  text-decoration: none;
-}
-.fl {
-  float: left;
-}
-.fr {
-  float: right;
-}
-
-.clearfix:before,
-.clearfix:after {
-  content: '';
-  display: table;
-}
-
-.clearfix:after {
-  clear: both;
-  overflow: hidden;
-}
-
-.clearfix {
-  *zoom: 1;
-}
-
-/deep/ .ant-card-head-title {
-  color: #1890ff;
-}
-
-//包着card
-.fullCard {
-  height: 380px;
-  /deep/ .ant-card-body {
-    padding: 0 4px;
-  }
-}
-// 日历
-.ccfullCalendar {
-  height: 274px !important;
-  // 年月选择消失
-  /deep/ .ant-fullcalendar-header {
-    display: none;
-  }
-  // 线消息
-  /deep/ .ant-fullcalendar {
-    border-top: none;
-  }
 
-  /deep/ .ant-fullcalendar-calendar-body {
-    padding: 0;
-  }
-
-  /deep/ .fc .fc-toolbar.fc-header-toolbar {
-    margin-bottom: 6px;
-  }
-  /deep/ .fc .fc-scrollgrid-liquid {
-    height: 274px !important;
-  }
-  /deep/ .fc .fc-toolbar-title {
-    font-size: 14px;
-    letter-spacing: 1px;
-  }
-  /deep/ .fc-scrollgrid-sync-table {
-    height: 274px !important;
-  }
-  /deep/ .fc-daygrid-day-bottom {
-    margin-top: -10px !important;
-  }
-  /deep/ .fc .fc-button-primary {
-    background-color: #1890ff;
-    margin-top: 4px;
-    border: none;
+// 第一行
+.topCard {
+  .userImg {
+    width: 50px;
+    height: 50px;
+    img {
+      border-radius: 50%;
+      width: 100%;
+    }
   }
-  /deep/ .fc .fc-toolbar-title {
+  .userInfo {
+    line-height: 20px;
     color: #333;
-    font-size: 16px;
-  }
-}
-#home {
-  // 第一行
-  .topCard {
-    // 等高设置
-    .topColItem {
-      // height: 380px;
+    p {
+      margin-top: 20px;
     }
-    .userImg {
-      width: 80px;
-      height: 80px;
-      line-height: 30px;
-      margin-right: 20px;
-      img {
-        border-radius: 6px;
-        width: 100%;
-      }
+    em {
+      font-style: normal;
     }
-    .userInfo {
-      span {
-        margin-left: 40px;
-        display: block;
-        line-height: 26px;
-        .department {
-          font-size: 14px;
-          color: rgb(71, 70, 70);
-        }
-      }
+  }
+  // 消息
+  .msgBox {
+    text-align: center;
+    background-color: rgba(236, 232, 232, 0.4);
+    border-radius: 2px;
+    span {
+      font-size: 28px;
+      color: orangered;
     }
-
-    // 消息
-    .msgBox {
-      text-align: center;
-      background-color: rgba(236, 232, 232, 0.4);
-      border-radius: 10px;
-  
-      em {
-        margin: 0 10px;
-        font-style: normal;
-        margin-right: 50px;
-        span {
-          font-size: 30px;
-          color: #fa6b5c;
-          font-weight: 700;
-        }
-        p {
-          font-size: 16px;
-        }
-      }
+    p {
+      color: gray;
     }
   }
-
   // OA工作台
-  .oaIcon {
+  .oaBig {
+    background-color: rgb(97, 190, 167);
     text-align: center;
-    margin-right: 30px;
-    float: left;
-    h4 {
-      margin-top: 10px;
+    justify-content: space-between;
+    .oaItem {
+      margin-bottom: 20px;
+      width: calc((100% - 10px) / 3);
+      h4 {
+        margin-top: 4px;
+      }
     }
   }
 }
 
-// 公告
+// 第二行
 .news {
-  .notice {
-    ul {
-      margin: 0;
-      padding: 0;
-      li {
-        line-height: 30px;
-        a {
-          font-size: 14px;
-          color: #444;
-          .department {
-            margin-right: 10px;
-          }
-          .createBy {
-            color: #333;
-          }
-          .createTime {
-            color: rgb(164, 164, 164);
-            margin: 0 4px 0 20px;
-          }
-        }
-        a:hover {
-          color: #1890ff;
-        }
-      }
-    }
-  }
-  // 我的计划
-  .total {
-    span {
-      display: block;
-      line-height: 40px;
-      strong {
-        color: #fa6b5c;
-        text-decoration: underline;
-        margin-right: 4px;
-      }
-    }
-  }
-
   // 友情链接
   .links {
-    /deep/ .ant-card-body {
-      padding: 20px;
-    }
     button {
       border-radius: 2px;
       border: none;
-      margin-right: 4px;
+      margin-right: 10px;
       background-color: rgba(102, 155, 188, 0.7);
       margin-bottom: 10px;
       a {
@@ -206,4 +70,56 @@ a {
       box-shadow: 1px 1px 3px #333;
     }
   }
+  //包着card
+  .fullCard {
+    height: 400px;
+    /deep/ .ant-card-body {
+      padding: 2px;
+    }
+  }
+  // 日历
+  .ccfullCalendar {
+    // 年月选择消失
+    /deep/ .ant-fullcalendar-header {
+      display: none;
+    }
+  }
+}
+
+/deep/ .ant-card-head-title {
+  color: #1890ff;
+}
+// 线消息
+/deep/ .ant-fullcalendar {
+  border-top: none;
+}
+
+/deep/ .ant-fullcalendar-calendar-body {
+  padding: 0;
+}
+
+/deep/ .fc .fc-toolbar.fc-header-toolbar {
+  margin-bottom: 6px;
+}
+/deep/ .fc .fc-scrollgrid-liquid {
+  height: 274px !important;
+}
+/deep/ .fc .fc-toolbar-title {
+  font-size: 14px;
+  letter-spacing: 1px;
+}
+/deep/ .fc-scrollgrid-sync-table {
+  height: 274px !important;
+}
+/deep/ .fc-daygrid-day-bottom {
+  margin-top: -10px !important;
+}
+/deep/ .fc .fc-button-primary {
+  background-color: #1890ff;
+  margin-top: 4px;
+  border: none;
+}
+/deep/ .fc .fc-toolbar-title {
+  color: #333;
+  font-size: 16px;
 }

src/views/dashboard/MyToDo.vue

@@ -1,105 +1,112 @@
 <template>
   <div id="home">
-    <!-- 我的  OA工作台  日历  -->
+    <!-- 第一行 -->
     <a-row :gutter="24" class="topCard">
-      <a-col :xs="24" :sm="24" :md="24" :lg="24" :style="{ marginBottom: '8px' }">
-        <a-row :gutter="24">
-          <!-- 大 -->
-          <a-col :xs="24" :sm="24" :md="24" :lg="12" :style="{ marginBottom: '8px' }">
-            <a-card title="我的" style="width: 100%;height:200px;" :style="{ marginBottom: '8px' }" class="clearfix">
+      <!-- 我的 -->
+      <a-col :xs="24" :sm="24" :md="24" :lg="7" :style="{ marginBottom: '8px', paddingRight: 0 }">
+        <!-- 等高设置 -->
+        <a-card title="我的" style="width: 100%;" :bordered="false" :style="{ marginBottom: '8px', height: '264px' }">
+          <a-row :gutter="24">
+            <!-- 头像 -->
+            <a-col :xs="24" :sm="24" :md="12" :lg="14">
               <a-row :gutter="24">
-                <!--  -->
-                <a-col :xs="24" :sm="24" :md="12" :lg="12" style="">
-                  <div class="userImg fl">
-                    <img src="../../assets/user.jpg" width="50px" />
-                  </div>
-                  <div class="userInfo ">
-                    <span class="department">{{ userInfo.realname }}</span>
-                    <span>账号：{{ userInfo.username }}</span>
-                    <span class="telphone">Tel：{{ userInfo.telphone }}</span>
+                <a-col :xs="24" :sm="24" :md="12" :lg="8">
+                  <div class="userImg">
+                    <img src="../../assets/user.jpg" width="50px;" />
                   </div>
                 </a-col>
-                <!--  -->
-                <a-col :xs="24" :sm="24" :md="12" :lg="12" class="msgBox  clearfix">
-                  <div >
-                    <em class="fl" >
-                      <span> {{ todoList.length }}</span>
-                      <p>我的待办</p>
-                    </em>
-                    <em class="fl">
-                      <span>{{ msgTotal }}</span>
-                      <p>系统消息</p></em>
+                <a-col :xs="24" :sm="24" :md="12" :lg="16">
+                  <div class="userInfo">
+                    <span>{{ userInfo.realname }}</span>
+                    <p>账号：{{ userInfo.username }}</p>
+                    <em>Tel：{{ userInfo.telphone }}</em>
                   </div>
                 </a-col>
               </a-row>
+            </a-col>
 
-              <!-- <a-divider type="vertical" style="height:110px;width:1px;margin:0 20px;" class="fl" /> -->
-            </a-card>
+            <!-- 数量 -->
+            <a-col :xs="24" :sm="24" :md="12" :lg="10" class="msgBox">
+              <span> {{ todoList.length }}</span>
+              <p>我的待办</p>
+              <span>{{ msgTotal }}</span>
+              <p>系统消息</p>
+            </a-col>
+          </a-row>
+        </a-card>
+      </a-col>
 
-            <!-- 下 -->
-            <a-card title="OA工作台" style="width:100%;height:172px;">
-              <div v-for="(item, index) in activeKeyAll" :key="index">
-                <a @click.prevent="aClick(item)" class="oaIcon">
-                  <a-avatar shape="square" :size="30" :src="item.iconAddress" />
-                  <h4>{{ item.name }}</h4>
-                </a>
-              </div>
-            </a-card>
-          </a-col>
+      <!--  待办 -->
+      <a-col :xs="24" :sm="24" :md="24" :lg="11" :style="{ marginBottom: '8px', paddingRight: 0 }">
+        <MyoaTabs />
+      </a-col>
 
-          <!-- 日历 -->
-          <a-col :xs="24" :sm="24" :md="24" :lg="12" style="paddingLeft:0;">
-            <a-card title="日历" :bordered="false" class="fullCard">
-              <template #extra>
-                <a href="javascript:void(0);" @click="openCalTab">更多</a>
-              </template>
-              <div class="ccfullCalendar">
-                <FullCalendar :options="calendarOptions" style="height:300px;" class="eventDeal-wrap" />
-              </div>
-            </a-card>
-          </a-col>
-        </a-row>
+      <!-- 按钮 -->
+      <a-col :xs="24" :sm="24" :md="24" :lg="6" :style="{ marginBottom: '8px' }">
+        <!-- 等高设置 -->
+        <a-card title="OA工作台" :bordered="false" style="height: 264px;">
+          <div v-for="(item, index) in activeKeyAll" :key="index" class="oaBig">
+            <a @click.prevent="aClick(item)" class="oaItem fl" >
+              <!-- 图标 -->
+              <a-avatar shape="square" :size="36" :src="item.iconAddress" />
+              <h4>{{ item.name }}</h4>
+            </a>
+          </div>
+        </a-card>
       </a-col>
     </a-row>
 
-    <!-- 公告  计划  友情链接 -->
+    <!-- 第二行-->
     <a-row :gutter="24" class="news">
-      <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" :style="{ marginBottom: '8px' }">
+      <!-- 公告 -->
+      <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="9" :style="{ marginBottom: '8px', paddingRight: 0 }">
+        <a-card title="企业公告" :bordered="false" class="notice">
+          <template #extra>
+            <a href="javascript:void(0);" @click="openEnterAnn">更多</a>
+          </template>
+
+          <div class="dataV">
+            <dv-scroll-board
+              class="board"
+              :config="config"
+              style="width:100%;height:300px;color:#333;paddinLeft:40px;"
+              @click="getMethod"
+            />
+          </div>
+        </a-card>
+      </a-col>
+
+      <!-- 计划  友情链接 -->
+      <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="7" :style="{ marginBottom: '8px' }">
         <a-row :gutter="24">
-          <!-- 企业公告 -->
-          <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="8" :style="{ marginBottom: '8px', paddingRight: 0 }">
-            <a-card title="企业公告" :bordered="false" class="notice" style=" height: 400px;">
-              <template #extra>
-                <a href="javascript:void(0);" @click="openEnterAnn">更多</a>
-              </template>
+          <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" :style="{ marginBottom: '8px', paddingRight: 0 }">
+            <a-card title="我的计划" :bordered="false" style="width:100%;height:200px;">
+              <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12" :style="{ marginBottom: '8px', paddingRight: 0 }">
+                <p>
+                  上月我的计划：
+                  <strong style="color:#fa6b5c;marginRight:4px;textDecoration: underline;"> 0 </strong>份
+                </p>
+                <p>
+                  本月我的计划：
+                  <strong style="color:#fa6b5c;marginRight:4px;textDecoration: underline;"> 1 </strong>份
+                </p>
+              </a-col>
 
-              <div class="dataV">
-                <dv-scroll-board
-                  class="board"
-                  :config="config"
-                  style="width:100%;height:300px;color:#333;paddinLeft:40px;"
-                  @click="getMethod"
-                />
-              </div>
+              <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12">
+                <p>
+                  上月他人计划：
+                  <strong style="color:#fa6b5c;marginRight:4px;textDecoration: underline;"> 0 </strong>份
+                </p>
+                <p>
+                  本月他人计划：
+                  <strong style="color:#fa6b5c;marginRight:4px;textDecoration: underline;"> 2 </strong>份
+                </p>
+              </a-col>
             </a-card>
           </a-col>
 
-          <!-- 我的计划    友情链接 -->
-          <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="6" :style="{ marginBottom: '8px', paddingRight: 0 }">
-            <a-card title="我的计划" style="width:100%;height:196px;marginBottom:8px">
-              <div class="total clearfix">
-                <div class="left fl">
-                  <span>上月我的计划：<strong>0</strong>份</span>
-                  <span>本月我的计划<strong>1</strong>份</span>
-                </div>
-                <div class="right fr">
-                  <span>上月他人计划：<strong>0</strong>份</span>
-                  <span>本月他人计划<strong>2</strong>份</span>
-                </div>
-              </div>
-            </a-card>
-
-            <a-card title="友情链接" style="width:100%;height:196px;" class="links">
+          <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" :style="{ marginBottom: '8px', paddingRight: 0 }">
+            <a-card title="友情链接" :bordered="false" style="width:100%;height:196px;" class="links">
               <template #extra><a href="javascript:void(0);" @click="openMyLinks">更多</a></template>
               <button><a href="https://www.yonyou.com/" target="_blank">用友</a></button>
               <button><a href="http://www.dakabg.com/" target="_blank">哒咔办公</a></button>
@@ -114,13 +121,20 @@
               </button>
             </a-card>
           </a-col>
-
-          <!-- 我的事项  待办 已办 申请    -->
-          <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="10" :style="{ marginBottom: '8px', paddingRight: 0 }">
-            <MyoaTabs />
-          </a-col>
         </a-row>
       </a-col>
+
+      <!-- 日历 -->
+      <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="8" :style="{ marginBottom: '8px' }">
+        <a-card title="日程" :bordered="false" class="fullCard">
+          <template #extra>
+            <a href="javascript:void(0);" @click="openCalTab">更多</a>
+          </template>
+          <div class="ccfullCalendar">
+            <FullCalendar :options="calendarOptions" style="height:300px;" class="eventDeal-wrap" />
+          </div>
+        </a-card>
+      </a-col>
     </a-row>
 
     <!-- 按钮弹框 -->
@@ -321,9 +335,9 @@ export default {
           this.config = {
             oddRowBGC: 'white',
             evenRowBGC: 'white',
-            columnWidth: [10, 100, 460, 200, 400],
+            columnWidth: [50, 200, 600, 300, 400],
             align: ['center'],
-            rowNum: 6,
+            rowNum: 7,
             waitTime: 2000,
             data: scrollData //双向绑定(轮播表数据 绑定到配置的 data数据中)
           }

src/views/dashboard/MyoaTabs.vue

@@ -1,12 +1,12 @@
 <template>
   <div id="MyoaTbas">
-    <a-tabs default-active-key="1" @change="callback" style="background:white;height:400px;padding:8px;">
+    <a-tabs default-active-key="1" @change="callback" style="background:white;;padding:8px;">
       <a-tab-pane key="1" tab="我的待办" style="margin:10px;">
         <div class="dataV">
           <dv-scroll-board
             class="board"
             :config="todoConfig"
-            style="width:100%;height:300px;color:#333;"
+            style="width:100%;height:160px;color:#333;"
             @click="todoClick"
           />
         </div>
@@ -17,18 +17,18 @@
           <dv-scroll-board
             class="board"
             :config="applyConfig"
-            style="width:100%;height:300px;color:#333;"
+            style="width:100%;height:180px;color:#333;"
             @click="applyClick"
           />
         </div>
       </a-tab-pane>
 
-      <a-tab-pane key="3" tab="我的已办">
+      <a-tab-pane key="3" tab="已办事项">
         <div class="dataV">
           <dv-scroll-board
             class="board"
             :config="doneConfig"
-            style="width:100%;height:300px;color:#333;"
+            style="width:100%;height:180px;color:#333;"
             @click="doneClick"
           />
         </div>
@@ -192,11 +192,10 @@ export default {
 @import '~@assets/less/common.less';
 
 /deep/ .ant-tabs-nav .ant-tabs-tab {
-  color: #ccc;
+  font-size: 16px;
 }
 /deep/ .ant-tabs-tab-active {
-  color: #1890ff !important;
+  // color: #1890ff !important;
   font-size: 16px;
 }
-
 </style>