sync

src/components/HeaderSearch/index.vue

@@ -149,6 +149,8 @@ export default {
         border: 2px solid #ffffff;
         color: #ffffff;
         font-size: 14px;
+        height: 28px;
+        line-height: 28px;
       }
 
       .el-input__icon {

src/views/application/index.vue

@@ -164,7 +164,6 @@ export default {
   },
   created() {
     this.getTypeData()
-    this.searchTable()
   },
   methods: {
     // 改变每页显示条数
@@ -203,8 +202,11 @@ export default {
       this.loading = true
       fetchFileList(params).then(response => {
         if (hasValidRecords(response)) {
+          console.log(response.data)
           this.tableData = response.data.records
+          console.log(this.tableData)
           this.total = response.data.total
+          console.log(this.total)
         } else {
           this.tableData = []
           this.total = 0

src/views/home/Business.vue

@@ -3,7 +3,7 @@
     <el-card>
       <div slot="header" class="clearfix">
         <span>我的业务</span>
-        <el-button style="float: right; padding: 3px 0;" type="text" @click="showEdit">编辑</el-button>
+        <el-button class="header-more-btn" type="text" @click="showEdit">编辑</el-button>
       </div>
 
       <el-scrollbar class="business-content">
@@ -149,10 +149,28 @@ export default {
   ::v-deep {
     .el-tabs__header {
       height: 40px;
+      margin-top: 10px;
       margin-right: 20px;
     }
+    .el-tabs__active-bar {
+      background-color: transparent !important;
+    }
+
     .el-tabs__item {
       font-size: 16px !important;
+      border: 1px solid rgba(0,0,0,0.09);
+      padding: 0 20px !important;
+
+      &.is-active{
+      background-color: #1890ff;
+      color: #FFFFFF;
+      }
+      &:nth-child(2) {
+        border-radius: 10px 0 0 5px;
+      }
+      &:last-child {
+        border-radius: 0 10px 5px 0;
+      }
     }
     .el-tabs__content {
       height: calc(100% - 55px);

src/views/home/Link.vue

@@ -3,7 +3,7 @@
     <el-card>
       <div slot="header" class="clearfix">
         <span>外部应用导航</span>
-        <el-button style="float: right; padding: 3px 0" type="text">更多<i class="el-icon-arrow-right" /></el-button>
+        <el-button class="header-more-btn" type="text">更多<i class="el-icon-arrow-right" /></el-button>
       </div>
       <div class="link-content">
         <div class="link-box">

src/views/home/Message.vue

@@ -3,7 +3,7 @@
     <el-card>
       <div slot="header" class="clearfix">
         <span>消息提醒</span>
-        <el-button style="float: right; padding: 3px 0" type="text" @click="showList">更多<i class="el-icon-arrow-right" /></el-button>
+        <el-button class="header-more-btn" type="text" @click="showList">更多<i class="el-icon-arrow-right" /></el-button>
       </div>
       <el-tabs v-model="curTab" class="message-content" @tab-click="getTablelist">
         <el-tab-pane :label="'待办（'+ messageCount.todo + '）'" name="Todo">
@@ -23,7 +23,7 @@
             <el-table-column show-overflow-tooltip>
               <template slot-scope="scope">
                 <div>{{ scope.row.title }} <span v-if="scope.row.messageLevel + '' === '1'" class="priority-box priority-level1">{{ formatDictData('', scope.row.messageLevel) }}</span> </div>
-                <div>{{ scope.row.createOrgName }}</div>
+                <div class="message-system">{{ scope.row.createOrgName }}</div>
               </template>
             </el-table-column>
             <el-table-column prop="createTime" width="150" />
@@ -104,10 +104,10 @@ export default {
   watch: {
     newMessage(message) {
       if (this.curTab === 'Todo') {
-        // this.getTablelist()
-        if (this.todoType === '' || (message.messageType + '') === this.todoType) {
-          this.todoData.unshift(message)
-        }
+        this.getTablelist()
+        // if (this.todoType === '' || (message.messageType + '') === this.todoType) {
+        //   this.todoData.unshift(message)
+        // }
       }
     }
   },
@@ -223,7 +223,11 @@ export default {
 
   .msg-icon {
     color: #0056dd;
-    background: rgba(0,86,221,0.1);
+    background: rgba(0,86,221,0.15);
+  }
+
+  .message-system {
+    font-size: 12px;
   }
 
   ::v-deep {
@@ -240,8 +244,16 @@ export default {
         height: 100%;
       }
     }
-    .el-table .cell {
+    .el-table {
+      &::before {
+        background-color: transparent !important;
+      }
+      td {
+        border-bottom: none;
+      }
+     .cell {
       padding-left: 0 !important;
+      }
     }
   }
 }

src/views/home/Specification.vue

@@ -3,7 +3,7 @@
     <el-card>
       <div slot="header" class="clearfix">
         <span>标准规范</span>
-        <el-button style="float: right; padding: 3px 0" type="text" @click="showMore">更多<i class="el-icon-arrow-right" /></el-button>
+        <el-button class="header-more-btn" type="text" @click="showMore">更多<i class="el-icon-arrow-right" /></el-button>
       </div>
       <el-scrollbar class="spec-content">
         <el-table v-loading="loading" :data="tableData" :show-header="false">
@@ -84,4 +84,16 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.spec-content{
+  ::v-deep {
+    .el-table {
+      &::before {
+        background-color: transparent !important;
+      }
+      td {
+        border-bottom: none;
+      }
+    }
+  }
+}
 </style>

src/views/home/System.vue

@@ -3,7 +3,7 @@
     <el-card>
       <div slot="header" class="clearfix">
         <span>{{ title }}</span>
-        <el-button style="float: right; padding: 3px 0" type="text" @click="showEdit">编辑</el-button>
+        <el-button class="header-more-btn" type="text" @click="showEdit">编辑</el-button>
       </div>
       <el-carousel v-loading="loading" class="system-content" :autoplay="false" arrow="never" trigger="click">
         <el-carousel-item v-for="(page, index) in carouselData" :key="'carousel_' + index">

src/views/home/index.vue

@@ -102,6 +102,15 @@ $msgCardHeaderHeight: 43px;
           }
         }
 
+        .header-more-btn  {
+          float: right;
+          padding: 3px 0;
+          color: rgba(0,0,0,0.65);
+          &>span {
+            font-size: 15px !important;
+          }
+        }
+
         .el-card__body {
           height: calc(100% - #{$msgCardHeaderHeight});
           padding: 0 10px 10px 10px;

src/views/info/components/DeptTree.vue

@@ -9,18 +9,20 @@
       title="接收单位"
     >
       <el-input v-model="treeFilter" placeholder="输入关键字进行过滤" />
-      <el-tree
-        ref="tree"
-        class="filter-tree"
-        :data="treeData"
-        :props="treeProps"
-        :node-key="nodeKey"
-        :default-expanded-keys="defaultExpandedKeys"
-        show-checkbox
-        :expand-on-click-node="false"
-        check-on-click-node
-        :filter-node-method="filterNode"
-      />
+      <el-scrollbar class="tree-scrollbar">
+        <el-tree
+          ref="tree"
+          class="filter-tree"
+          :data="treeData"
+          :props="treeProps"
+          :node-key="nodeKey"
+          :default-expanded-keys="defaultExpandedKeys"
+          show-checkbox
+          :expand-on-click-node="false"
+          check-on-click-node
+          :filter-node-method="filterNode"
+        />
+      </el-scrollbar>
       <div slot="footer">
         <el-button @click="visible = false">取消</el-button>
         <el-button type="primary" @click="save">确定</el-button>
@@ -100,10 +102,26 @@ export default {
 
 <style lang="scss" scoped>
 .dialog-container {
+  .tree-scrollbar {
+    height: calc(100% - 40px);
+  }
   ::v-deep {
     .custom-dialog {
       width: 500px !important;
+      height: 75vh;
+    }
+
+    .el-dialog__body {
+      height: calc(100% - 55px - 71px);
     }
+
+    .el-scrollbar__wrap{
+      overflow-x: hidden;
+    }
+    .el-scrollbar__bar.is-horizontal {
+      display: none;
+    }
+
   }
 }
 </style>