Browse Source

修正因添加底部快捷菜单引起的首页滚动

liangyan0105 3 years ago
parent
commit
9baaa114f4

+ 1 - 1
src/assets/less/drawer.less

@@ -74,7 +74,7 @@
 .searchLine {
   margin-top: 100px; //不遮挡 二级菜单
   /deep/ .ant-row {
-    margin: 10px 0; //二级菜单的间距
+    margin: 10px 0; //菜单的间距
   }
 
   //选中的样式

+ 3 - 0
src/assets/less/mytodo.css

@@ -110,3 +110,6 @@
   font-size: 16px;
   letter-spacing: 1px;
 }
+#home .dataStyle /deep/ .ant-card-body {
+  padding: 12px 10px;
+}

+ 5 - 0
src/assets/less/mytodo.less

@@ -137,4 +137,9 @@
       letter-spacing: 1px;
     }
   }
+  .dataStyle {
+    /deep/ .ant-card-body {
+      padding: 12px 10px;
+    }
+  }
 }

+ 1 - 1
src/components/page/GlobalFooter.vue

@@ -26,7 +26,7 @@ export default {
 <style lang="less" scoped>
 .footer {
   padding: 0 16px;
-  margin: 24px 0 60px;
+  margin-bottom: 50px;
   text-align: center;
 
   .links {

+ 74 - 71
src/views/dashboard/MyToDo.vue

@@ -5,7 +5,7 @@
       <!-- 我的 -->
       <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-card title="我的" style="width: 100%;" :bordered="false" :style="{ marginBottom: '8px', height: '250px' }">
           <a-row :gutter="24">
             <!-- 头像 -->
             <a-col :xs="24" :sm="24" :md="12" :lg="14">
@@ -44,7 +44,7 @@
       <!-- 按钮 -->
       <a-col :xs="24" :sm="24" :md="24" :lg="6" :style="{ marginBottom: '8px' }">
         <!-- 等高设置 -->
-        <a-card title="常用流程" :bordered="false" style="height: 264px;">
+        <a-card title="常用流程" :bordered="false" style="height: 250px;">
           <div v-for="(item, index) in activeKeyAll.slice(5, 10)" :key="index" class="oaBig">
             <a @click.prevent="aClick(item)" class="oaItem fl">
               <!-- 图标 -->
@@ -57,95 +57,98 @@
     </a-row>
 
     <!-- 第二行-->
-    <a-row :gutter="24" class="secondLine">
+    <a-row :gutter="24" class="secondLine" style="height:360px;">
       <!-- 公告 -->
       <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="9" :style="{ marginBottom: '8px', paddingRight: 0 }">
-        <a-card title="企业公告" :bordered="false" style="height:400px;">
+        <a-card title="企业公告" :bordered="false" style="height:370px;">
           <template #extra>
             <a href="javascript:void(0);" @click="openEnterAnn">更多</a>
           </template>
 
           <div class="dataV">
-            <dv-scroll-board class="board" :config="config" style="height:300px;" @click="getMethod" />
+            <dv-scroll-board class="board" :config="config" style="height:280px;" @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="24" :style="{ marginBottom: '8px', paddingRight: 0 }">
-            <a-card title="我的计划" :bordered="false" style="width:100%;height:196px;">
-              <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 style="height:350">
+        <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="24" :style="{ marginBottom: '8px', paddingRight: 0 }">
+              <!-- height:196px; -->
+              <a-card title="我的计划" :bordered="false" style="width:100%;">
+                <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>
 
-              <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="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>
+<!-- height:196px; -->
+            <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%;" 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>
+                <button>
+                  <a href="https://www.dingtalk.com/" target="_blank">钉钉</a>
+                </button>
+                <button><a href="https://www.11467.com" target="_blank">品医</a></button>
+                <button><a href="https://www.antgroup.com/" target="_blank">蚂蚁集团</a></button>
+                <button><a href="https://www.yonyou.com/" target="_blank">用友</a></button>
+                <button>
+                  <a href="https://www.dingtalk.com/" target="_blank">钉钉</a>
+                </button>
+              </a-card>
+            </a-col>
+          </a-row>
+        </a-col>
 
-          <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>
-              <button>
-                <a href="https://www.dingtalk.com/" target="_blank">钉钉</a>
-              </button>
-              <button><a href="https://www.11467.com" target="_blank">品医</a></button>
-              <button><a href="https://www.antgroup.com/" target="_blank">蚂蚁集团</a></button>
-              <button><a href="https://www.yonyou.com/" target="_blank">用友</a></button>
-              <button>
-                <a href="https://www.dingtalk.com/" target="_blank">钉钉</a>
-              </button>
-            </a-card>
-          </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" style="height:370px;" class="dataStyle">
+            <template #extra>
+              <a href="javascript:void(0);" @click="openCalTab">详情</a>
+            </template>
 
-      <!-- 日历 -->
-      <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="8" :style="{ marginBottom: '8px' }">
-        <a-card title="日程" :bordered="false" style="height:400px;">
-          <template #extra>
-            <a href="javascript:void(0);" @click="openCalTab">详情</a>
-          </template>
-
-          <a-row :gutter="24">
-            <!-- 图片 -->
-            <!-- <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+            <a-row :gutter="24">
+              <!-- 图片 -->
+              <!-- <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
               <div style="height:186px;">
                 <div class="tips"> -->
-            <!-- <img src="../../assets/date.jpg" alt="" height="186px;" width="100%" /> -->
-            <!-- <i id="showTime"></i> -->
-            <!-- </div>
+              <!-- <img src="../../assets/date.jpg" alt="" height="186px;" width="100%" /> -->
+              <!-- <i id="showTime"></i> -->
+              <!-- </div>
               </div>
             </a-col> -->
 
-            <!-- 小日历 -->
-            <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-              <div class="ccfullCalendar">
-                <FullCalendar :options="calendarOptions" class="eventDeal-wrap" />
-              </div>
-            </a-col>
-          </a-row>
-        </a-card>
-      </a-col>
+              <!-- 小日历 -->
+              <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+                <div class="ccfullCalendar">
+                  <FullCalendar :options="calendarOptions" class="eventDeal-wrap" />
+                </div>
+              </a-col>
+            </a-row>
+          </a-card>
+        </a-col>
+      </div>
     </a-row>
 
     <!-- 按钮弹框 -->

+ 3 - 3
src/views/dashboard/MyoaTabs.vue

@@ -6,7 +6,7 @@
           <dv-scroll-board
             class="board"
             :config="todoConfig"
-            style="width:100%;height:160px;color:#333;"
+            style="width:100%;height:148px;color:#333;"
             @click="todoClick"
           />
         </div>
@@ -17,7 +17,7 @@
           <dv-scroll-board
             class="board"
             :config="applyConfig"
-            style="width:100%;height:180px;color:#333;"
+            style="width:100%;height:166px;color:#333;"
             @click="applyClick"
           />
         </div>
@@ -28,7 +28,7 @@
           <dv-scroll-board
             class="board"
             :config="doneConfig"
-            style="width:100%;height:180px;color:#333;"
+            style="width:100%;height:166px;color:#333;"
             @click="doneClick"
           />
         </div>