【友情链接】内容布局调整、底部公司名称微调

src/assets/less/mytodo.css

@@ -42,7 +42,6 @@
   margin-top: 4px;
 }
 #home .secondLine .links {
-  background-color: pink;
   flex-flow: row wrap;
   box-sizing: border-box;
 }
@@ -124,6 +123,9 @@
   font-size: 16px;
   letter-spacing: 1px;
 }
+#home .dataStyle {
+  height: 400px;
+}
 #home .dataStyle /deep/ .ant-card-body {
-  padding: 12px 10px;
+  padding: 30px 10px;
 }

src/assets/less/mytodo.less

@@ -54,7 +54,6 @@
     // 友情链接
     .links {
       // display: flex;
-      background-color: pink;
       flex-flow: row wrap;
       // justify-content: space-between;
       box-sizing: border-box;
@@ -129,7 +128,6 @@
     }
     // 今天日历显示
     /deep/ .fc-day-today {
-      // background-color: #bc4749;
       background-color: #70a288;
       border-radius: 2px;
       a {
@@ -153,8 +151,9 @@
     }
   }
   .dataStyle {
+    height:400px;
     /deep/ .ant-card-body {
-      padding: 12px 10px;
+      padding: 30px 10px;
     }
   }
 }

src/components/page/GlobalFooter.vue

@@ -26,19 +26,16 @@ export default {
 <style lang="less" scoped>
 .footer {
   padding: 0 16px;
-  margin-bottom: 50px;
+  margin: 30px 0 80px 0;
   text-align: center;
 
   .links {
     margin-bottom: 8px;
-
     a {
       color: rgba(0, 0, 0, 0.45);
-
       &:hover {
         color: rgba(0, 0, 0, 0.65);
       }
-
       &:not(:last-child) {
         margin-right: 40px;
       }

src/views/activiti/todoManage.vue

@@ -110,10 +110,11 @@
                 <span
                   v-if="Boolean(r.isSuspended)"
                   style="cursor: no-drop;color: #999999;"
-                  title="流程已被挂起，无法操作！"
-                >
-                  通过 <a-divider type="vertical" /> 驳回 <a-divider type="vertical" /> 委托
-                  <a-divider type="vertical" />
+                  title="流程已被挂起，无法操作！">
+                  通过 
+                <a-divider type="vertical" />驳回 
+                <a-divider type="vertical" />委托
+                <a-divider type="vertical" />
                 </span>
                 <span v-else>
                   <a href="javascript:void(0);" @click="passTask(r)" style="color: green">通过</a>
@@ -171,16 +172,14 @@
           <div v-show="form.type == 1">
             <a-form-item label="驳回至">
               <a-select v-model="form.backTaskKey" :loading="backLoading" @change="changeBackTask">
-                <a-select-option v-for="(item, i) in backList" :key="i" :value="item.key">{{
-                  item.name
-                }}</a-select-option>
+                <a-select-option v-for="(item, i) in backList" :key="i" :value="item.key">{{item.name}}
+              </a-select-option>
               </a-select>
             </a-form-item>
             <a-form-item label="指定原节点审批人" prop="assignees" v-show="form.backTaskKey != -1" :error="error">
               <a-select v-model="form.assignees" placeholder="请选择" allowClear mode="multiple" :loading="userLoading">
-                <a-select-option v-for="(item, i) in assigneeList" :key="i" :value="item.username">{{
-                  item.realname
-                }}</a-select-option>
+                <a-select-option v-for="(item, i) in assigneeList" :key="i" :value="item.username">{{item.realname}}
+                </a-select-option>
               </a-select>
             </a-form-item>
           </div>

src/views/dashboard/MyToDo.vue

@@ -57,10 +57,10 @@
     </a-row>
 
     <!-- 第二行-->
-    <a-row :gutter="24" class="secondLine" style="height:360px;">
+    <a-row :gutter="24" class="secondLine">
       <!-- 企业公告 -->
       <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="9" :style="{ marginBottom: '8px', paddingRight: 0 }">
-        <a-card title="企业公告" :bordered="false" style="height:370px;">
+        <a-card title="企业公告" :bordered="false" style="height:400px;">
           <template #extra>
             <a href="javascript:void(0);" @click="openEnterAnn">更多</a>
           </template>
@@ -77,7 +77,7 @@
           <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:175px">
+              <a-card title="我的计划" :bordered="false" style="width:100%;height:176px">
                 <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12" :style="{ marginBottom: '8px', paddingRight: 0 }">
                   <p>
                     上月我的计划：
@@ -103,9 +103,9 @@
             </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:188px">
+              <a-card title="友情链接" :bordered="false" style="width:100%;height:216px">
                 <template #extra><a href="javascript:void(0);" @click="openMyLinks">更多</a></template>
-                <div v-for="item in linksList.slice(0, 8)" :key="item.id" class="links">
+                <div v-for="item in linksList.slice(0, 13)" :key="item.id" class="links">
                   <button class="itemLink">
                     <a href="#" @click="openItemLink(item)">
                       <span width="2em"> {{ item.name }}</span>
@@ -119,22 +119,11 @@
 
         <!-- 日历 -->
         <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">
+          <a-card title="日程" :bordered="false" class="dataStyle">
             <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">
-              <div style="height:186px;">
-                <div class="tips"> -->
-              <!-- <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">
@@ -348,11 +337,13 @@ export default {
     // 上月我计划
     async getMyLastM() {
       //    createBy:'' ,人员账号(不传则查询全部人员)
-      //    whereTimeType:'',时间类型（0无时间筛选1查询上月的2本月）
+      //    whereTimeType:'',时间类型（0无时间筛选 1查询上月 2本月）
       await scheduleGetLastMonth({ createBy: '', whereTimeType: '1' }).then(res => {
         console.log('我的上月计划res', res)
       })
+
     },
+
     // 友情链接跳转
     openItemLink(e) {
       window.open(e.link, '_blank') //新窗口打开
@@ -481,8 +472,8 @@ export default {
     },
 
     // 获取 OA 按钮
-  async  getActiveKeyAll() {
-     await this.postFormAction('/activiti_process/listData', { status: 1, roles: true }).then(res => {
+    async getActiveKeyAll() {
+      await this.postFormAction('/activiti_process/listData', { status: 1, roles: true }).then(res => {
         this.activeKeyAll = []
         if (res.success) {
           var result = res.result || []

src/views/oa/myLinks.vue

@@ -140,12 +140,12 @@ export default {
                     dataIndex: 'link',
                     align: 'center'
                 },
-                {
-                    title: '简要介绍',
-                    dataIndex: 'briefIntroduction',
-                    align: 'center',
-                    width: '30%'
-                },
+                // {
+                //     title: '简要介绍',
+                //     dataIndex: 'briefIntroduction',
+                //     align: 'center',
+                //     width: '30%'
+                // },
                 {
                     title: '创建人',
                     dataIndex: 'createBy',