Browse Source

导航条

安生 4 years ago
parent
commit
98540e4055

+ 0 - 1
src/layout/components/AppMain.vue

@@ -29,7 +29,6 @@ export default {
   width: 100%;
   position: relative;
   overflow: hidden;
-
   background: #f0f2f5;
 }
 

+ 2 - 1
src/layout/components/TagsView/ScrollPane.vue

@@ -87,7 +87,8 @@ export default {
       bottom: 0px;
     }
     .el-scrollbar__wrap {
-      height: 49px;
+      /*height: 49px;*/
+      height: 60px;
     }
   }
 }

+ 12 - 6
src/layout/components/TagsView/index.vue

@@ -210,7 +210,8 @@ export default {
 
 <style lang="scss" scoped>
 .tags-view-container {
-  height: 34px;
+  /*height: 34px;*/
+  height: 45px;
   width: 100%;
   background: #fff;
   border-bottom: 1px solid #d8dce5;
@@ -220,15 +221,19 @@ export default {
       display: inline-block;
       position: relative;
       cursor: pointer;
-      height: 26px;
-      line-height: 26px;
+      /*height: 26px;*/
+      height: 30px;
+      /*line-height: 26px;*/
+      line-height: 30px;
       border: 1px solid #d8dce5;
       color: #495060;
       background: #fff;
       padding: 0 8px;
-      font-size: 12px;
+      /*font-size: 12px;*/
+      font-size: 14px;
       margin-left: 5px;
-      margin-top: 4px;
+      /*margin-top: 4px;*/
+      margin-top: 7px;
       &:first-of-type {
         margin-left: 15px;
       }
@@ -283,7 +288,8 @@ export default {
     .el-icon-close {
       width: 16px;
       height: 16px;
-      vertical-align: 2px;
+      /*vertical-align: 2px;*/
+      vertical-align: 3px;
       border-radius: 50%;
       text-align: center;
       transition: all .3s cubic-bezier(.645, .045, .355, 1);

+ 15 - 4
src/views/dashboard/BarChart.vue

@@ -2,21 +2,32 @@
   <el-card class="box-card">
     <div slot="header" class="clearfix">
       <span>公示公告</span>
-      <el-button style="float: right; padding: 3px 0;color: #FFFFFF;" type="text">更多</el-button>
+      <el-button style="float: right; padding: 3px 0;color: #202020;" type="text">更多</el-button>
     </div>
-    <div v-for="o in 7" :key="o" class="text item">
+    <div v-for="o in 5" :key="o" class="text item">
       {{'列表内容 '+ o}}
     </div>
   </el-card>
 </template>
 
-<style>
+<style lang="less" scoped>
+  .clearfix{
+    color:#1890ff;
+  }
+  .el-card__header{
+    background: #f5f5f5;
+  }
+  .box-card{
+    margin-left: 16px;
+    height: 400px;
+  }
   .text {
     font-size: 14px;
   }
 
   .item {
-    margin-bottom: 18px;
+    height: 44px;
+    line-height: 44px;
   }
 
   .clearfix:before,

+ 31 - 1
src/views/dashboard/LineChart.vue

@@ -1,4 +1,9 @@
 <template>
+  <el-card >
+  <div slot="header" class="clearfix">
+    <span>我的事项</span>
+    <el-button style="float: right; padding: 3px 0;color: #202020;" type="text">更多</el-button>
+  </div>
   <el-tabs v-model="activeName" @tab-click="handleClick">
     <el-tab-pane label="已办事项" name="first">
       <el-table :data="tableData":header-cell-style="{background:'#eee',width:'100%'}">
@@ -13,9 +18,9 @@
              <el-table-column prop="name" label="业务名称"  width='300'min-width="60%" align="center"></el-table-column>
              <el-table-column prop="date"label="完成时间"align="center"></el-table-column>
       </el-table>
-
     </el-tab-pane>
   </el-tabs>
+  </el-card>
 </template>
 <script>
   export default {
@@ -47,3 +52,28 @@
     }
   };
 </script>
+
+<style lang="less" scoped>
+  .clearfix{
+    color:#1890ff;
+  }
+  /*.clearfix:before,*/
+  /*.clearfix:after {*/
+    /*display: table;*/
+    /*content: "";*/
+  /*}*/
+  /*.clearfix:after {*/
+    /*clear: both*/
+  /*}*/
+  .el-card__header{
+    background: #f5f5f5;
+    color:#1890ff;
+  }
+  .el-card__body {
+    padding: 15px 20px 20px 20px;
+    height: 354px;
+  }
+ .el-card__header{
+   background: #f5f5f5;
+ }
+</style>

+ 12 - 4
src/views/dashboard/PieChart.vue

@@ -2,21 +2,29 @@
   <el-card class="box-card">
     <div slot="header" class="clearfix">
       <span>公示公告</span>
-      <el-button style="float: right; padding: 3px 0;color: #FFFFFF;" type="text">更多</el-button>
+      <el-button style="float: right; padding: 3px 0;color: #202020;" type="text">更多</el-button>
     </div>
-    <div v-for="o in 8" :key="o" class="text item">
+    <div v-for="o in 5" :key="o" class="text item">
       {{'列表内容 '+ o}}
     </div>
   </el-card>
 </template>
 
-<style>
+<style lang="less" scoped>
+  .box-card{
+    margin-left: 16px;
+    height: 400px;
+  }
+  .clearfix{
+    color:#1890ff;
+  }
   .text {
     font-size: 14px;
   }
 
   .item {
-    margin-bottom: 18px;
+    height: 44px;
+    line-height: 44px;
   }
 
   .clearfix:before,

+ 18 - 5
src/views/dashboard/RaddarChart.vue

@@ -1,10 +1,10 @@
 <template>
-  <el-card class="box-card">
+  <el-card class="box-card" style="margin-left: 0px">
     <div slot="header" class="clearfix">
-      <span>办业务</span>
-      <el-button style="float: right; padding: 3px 0;color: #FFFFFF;" type="text">更多</el-button>
+      <span>办业务</span>
+      <el-button style="float: right; padding: 3px 0;color: #202020;" type="text">更多</el-button>
     </div>
-  <el-table :data="tableData":header-cell-style="{background:'#eee',width:'100%'}">
+  <el-table class="body" :data="tableData" :header-cell-style="{background:'#eee',width:'100%'}">
         <el-table-column type="index"width="50" align="center"></el-table-column>
         <el-table-column prop="name" label="业务名称"  width='300'min-width="60%" align="center"></el-table-column>
         <el-table-column prop="date"label="完成时间"align="center"></el-table-column>
@@ -36,6 +36,19 @@
       }
     }
 </script>
-<style>
+<style lang="less" scoped>
+  .clearfix{
+    color:#1890ff;
+  }
+  .el-card__header{
+    background: #f5f5f5;
+  }
+  .body{
+    height: 319px;
+  }
+  .el-card__body {
+    padding: 15px 20px 20px 20px;
+    height: 354px;
+  }
 
 </style>

+ 4 - 4
src/views/index.vue

@@ -3,7 +3,7 @@
    <panel-group/>
    <el-row>
      <el-col :xs="24" :sm="24" :lg="16">
-       <LineChart :chart-data="lineChartData" style="padding:16px 16px 0;background-color: #fff;" />
+       <LineChart :chart-data="lineChartData" style="padding:0;background-color: #fff;" />
      </el-col>
       <el-col :xs="24" :sm="24" :lg="8">
         <div class="chart-wrapper">
@@ -76,9 +76,9 @@ export default {
   position: relative;
 
   .chart-wrapper {
-    background: #fff;
-    padding: 16px 16px 0;
-    margin-bottom: 32px;
+    /*background: #fff;*/
+    /*padding: 16px 16px 0;*/
+    margin-bottom: 12px;
   }
 }