style:整体风格修改

@@ -12,8 +12,8 @@
   <div :class="['lb-table', customClass]">
     <el-table v-if="!heightNumSetting" class="table-fixed" :row-style="{ height: '50px' }" ref="elTable"
       :border='border' :row-class-name="tableRowClassName" :show-header='showHeader' @row-click="singleElection"
-      :header-cell-style="{ background: 'rgb(236, 245, 255)' }" v-bind="$attrs" :height="tableHeight" v-on="$listeners"
-      :data="data" style="width: 100%" :span-method="this.merge ? this.mergeMethod : this.spanMethod">
+      v-bind="$attrs" :height="tableHeight" v-on="$listeners" :data="data" style="width: 100%"
+      :span-method="this.merge ? this.mergeMethod : this.spanMethod">
       <el-table-column width="45" align="center" v-if="isRadio">
         <template slot-scope="scope">
           <el-radio v-model="selected" :label="scope.$index"></el-radio>
@@ -25,8 +25,7 @@
     </el-table>
 
     <el-table v-else ref="elTable" class="table-fixed" :row-style="{ height: '50px' }" :border='border'
-      :row-class-name="tableRowClassName" :show-header='showHeader'
-      :header-cell-style="{ background: 'rgb(236, 245, 255)' }" v-bind="$attrs" :max-height="maxHeight"
+      :row-class-name="tableRowClassName" :show-header='showHeader' v-bind="$attrs" :max-height="maxHeight"
       v-on="$listeners" :data="data" style="width: 100%" :span-method="this.merge ? this.mergeMethod : this.spanMethod">
 
       <el-table-column width="45" align="center" v-if="isRadio">
@@ -63,7 +62,7 @@ export default {
     },
     border: {
       type: Boolean,
-      default: true,
+      default: false,
     },
     showHeader: {
       type: Boolean,
@@ -75,7 +74,7 @@ export default {
     },
     heightNum: {
       type: Number,
-      default: 265,
+      default: 240,
     },
     maxHeight: {
       type: Number,

@@ -16,15 +16,11 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.hasTagsView {
-  .app-main {
-    height: calc(100% - 41px);
-    overflow-x: auto;
-    padding: 5px;
-    box-sizing: border-box;
-    background-color: #EDF1F7;
-    box-sizing: border-box;
-
-  }
+.app-main {
+  height: calc(100vh - 70px);
+  overflow-x: auto;
+  box-sizing: border-box;
+  background-color: #EDF1F7;
+  box-sizing: border-box;
 }
 </style>
\ No newline at end of file

+<!--面包屑 -->
+<template>
+  <el-breadcrumb class="app-breadcrumb" separator="/">
+    <transition-group name="breadcrumb">
+      <el-breadcrumb-item v-for="(item, index) in levelList" :key="item.path">
+        <span class="no-redirect">当前位置></span>
+        <!-- <svg-icon v-if="item.meta.icon" :icon-class="item.meta.icon" class="breadcrumbIcon" /> -->
+        <span v-if="item.redirect === 'noRedirect' || index == levelList.length - 1" class="no-redirect">{{
+    item.meta.title
+}}</span>
+        <a v-else @click.prevent="handleLink(item)">{{ item.meta.title }}</a>
+      </el-breadcrumb-item>
+    </transition-group>
+  </el-breadcrumb>
+</template>
+
+<script>
+import pathToRegexp from 'path-to-regexp'
+
+export default {
+  data () {
+    return {
+      levelList: null
+    }
+  },
+  watch: {
+    $route (route) {
+      // if you go to the redirect page, do not update the breadcrumbs
+      if (route.path.startsWith('/redirect/')) {
+        return
+      }
+      this.getBreadcrumb()
+    }
+  },
+  created () {
+    this.getBreadcrumb()
+  },
+  methods: {
+    getBreadcrumb () {
+      // only show routes with meta.title
+      let matched = this.$route.matched.filter(item => item.meta && item.meta.title)
+      const first = matched[0]
+
+      if (!this.isDashboard(first)) {
+        matched = matched
+      }
+
+      this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false)
+      console.log(this.levelList)
+    },
+    isDashboard (route) {
+      const name = route && route.name
+      if (!name) {
+        return false
+      }
+      return name.trim().toLocaleLowerCase() === 'Dashboard'.toLocaleLowerCase()
+    },
+    pathCompile (path) {
+      const { params } = this.$route
+      var toPath = pathToRegexp.compile(path)
+      return toPath(params)
+    },
+    handleLink (item) {
+      const { redirect, path } = item
+      if (redirect) {
+        this.$router.push(redirect)
+        return
+      }
+      this.$router.push(this.pathCompile(path))
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.app-breadcrumb.el-breadcrumb {
+  display: inline-block;
+  font-size: 14px;
+  line-height: 50px;
+  margin-left: 8px;
+
+  .no-redirect {
+    color: #ffffff;
+    cursor: text;
+    font-size: 16px;
+  }
+
+  .breadcrumbIcon {
+    color: #ffffff;
+    margin-right: 5px;
+    width: 16px;
+    height: 16px;
+  }
+}
+</style>

 <template>
   <div class="navbar-con">
     <div class="navbar">
-      <div class="logo">
-        {{ title }}
-      </div>
       <div class="backdrop">
-        <!-- <theme style="float: right;height: 26px;width: 26px;margin-top: 26px;" @change="themeChange" /> -->
+        <Breadcrumb />
       </div>
       <div class="right-menu">
         <div class="dataView pointer" @click="handleDataView">大屏展示</div>
@@ -25,9 +22,13 @@
   </div>
 </template>
 <script>
-import defaultSettings from '@/settings'
 import { mapGetters } from 'vuex'
+import Breadcrumb from './Breadcrumb'
+import defaultSettings from '@/settings'
 export default {
+  components: {
+    Breadcrumb
+  },
   computed: {
     ...mapGetters(['sidebar', 'avatar', 'name'])
   },
@@ -112,12 +113,14 @@ export default {
   height: $headerHeight;
   overflow: hidden;
   position: relative;
-  background: linear-gradient(270deg, #148CEE 0%, #1870E3 100%); //默认颜色
-  box-shadow: 0 1px 0px rgba(0, 21, 41, 0.08);
+  // background: linear-gradient(270deg, #148CEE 0%, #1870E3 100%); //默认颜色
+  // box-shadow: 0 1px 0px rgba(0, 21, 41, 0.08);
+  background: #0D1230;
   display: flex;
   align-items: center;
   padding: 0 20px;
   justify-content: space-between;
+  margin-bottom: 10px;
 
   .header-logo {
     width: 300px;
@@ -126,9 +129,10 @@ export default {
   .backdrop {
     flex: 1;
     width: 60%;
-    background: url('../../image/backdrop.png');
     background-size: 100% 100%;
     height: $headerHeight;
+    display: flex;
+    align-items: center;
   }
 
   .hamburger-container {

 <template>
   <div>
+    <div class="logo">{{ title }}</div>
     <el-scrollbar wrap-class="scrollbar-wrapper">
       <el-menu router :default-active="activeMenu" :background-color="variables.menuBg" :text-color="variables.menuText"
         :unique-opened="true" :active-text-color="variables.menuActiveText" :collapse-transition="false"
@@ -16,11 +17,17 @@
 <script>
 import { mapGetters } from 'vuex'
 import Logo from './Logo'
+import defaultSettings from '@/settings'
 import SidebarItem from './SidebarItem'
 import variables from '@/styles/variables.scss'
 import { asyncRoutes } from '@/router'
 export default {
   components: { SidebarItem, Logo },
+  data () {
+    return {
+      title: defaultSettings.title
+    }
+  },
   computed: {
     ...mapGetters(['permission_routes', 'sidebar']),
     activeMenu () {
@@ -41,5 +48,13 @@ export default {
 }
 </script>
 <style scoped lang="scss">
-
+.logo {
+  width: 100%;
+  height: 80px;
+  color: #ffffff;
+  font-size: 20px;
+  display: flex;
+  align-items: center;
+  padding-left: 20px;
+}
 </style>
\ No newline at end of file

 <template>
   <div class="app-wrapper">
-    <navbar />
+    <sidebar class="sidebar-container" />
+    <div class="main-container">
+      <navbar />
+      <app-main />
+    </div>
+    <!-- <navbar />
     <div :class="{ hasTagsView: needTagsView }" class="main-container">
       <div :class="{ 'fixed-header': fixedHeader }">
         <sidebar class="sidebar-container" />
         <tags-view v-if="needTagsView" />
       </div>
       <app-main />
-    </div>
+    </div> -->
   </div>
 </template>
 <script>
@@ -40,6 +45,7 @@ export default {
   position: relative;
   height: 100%;
   width: 100%;
+  background-color: #000;
 
   &.mobile.openSidebar {
     position: fixed;

@@ -36,7 +36,7 @@ export default {
   position: relative;
   height: 100%;
   width: 100%;
-  background-color: #F2F6FC;
+
 
   &.mobile.openSidebar {
     position: fixed;

@@ -38,7 +38,6 @@ export const asyncRoutes = [
     path: '/',
     component: Layout,
     redirect: '/home',
-    meta: { title: '首页' },
     children: [
       {
         path: 'home',

@@ -171,18 +171,17 @@
 }
 
 // element table 选中 颜色
-.el-table--enable-row-hover .el-table__body tr:hover>td {
-  background-color: #FCFDFD;
-}
-
-.el-table__body .el-table__row.hover-row td {
-  background-color: #FCFDFD;
-}
+// .el-table--enable-row-hover .el-table__body tr:hover>td {
+  //   background-color: #FCFDFD;
+  // }
 
-.el-table tbody tr:hover>td {
-  background-color: #FCFDFD;
-}
+  // .el-table__body .el-table__row.hover-row td {
+  //   background-color: #FCFDFD;
+  // }
 
+  // .el-table tbody tr:hover>td {
+  //   background-color: #FCFDFD;
+  // }
 // 表格样式
 .el-table th {
   height: 48px !important;

@@ -151,6 +151,7 @@ div:focus {
 .d-flex {
   display: flex;
 }
+
 .d-flex-center {
   display: flex;
   align-items: center;
@@ -338,18 +339,6 @@ aside {
   cursor: not-allowed
 }
 
-.bad {
-  color: #f00;
-  background-color: #fff;
-  cursor: not-allowed
-}
-
-.allow,
-.prohibit .suspend {
-  position: relative;
-  margin: 0 auto;
-  text-align: center;
-}
 
 .allow {
   color: $green;
@@ -363,6 +352,21 @@ aside {
   color: $yellow;
 }
 
+// 通过 入库
+.adopt {
+  color: #00FAA8;
+}
+
+.adopt::before {
+  content: '';
+  display: block;
+  width: 5px;
+  height: 5px;
+  background: #999999;
+  border-radius: 50%;
+  margin-right: 6px;
+}
+
 //错误日志样式 后期超优化
 .item-cwnr {
   white-space: pre-wrap;

@@ -4,14 +4,24 @@
     height: 100%;
     width: 100%;
     box-sizing: border-box;
+    background-color: #000637;
 
     &-header {
         width: 100%;
         padding: 10px;
         box-sizing: border-box;
-        background: #FFFFFF;
-        border-radius: 2px;
-        border: 1px solid #e8edf3;
+        background: #061858;
+        box-shadow: inset 0px 0px 14px 0px #1D66DC;
+        border: 2px solid #1A3F81;
+
+        /deep/.el-form-item__label {
+            color: #E3F1FF;
+        }
+
+        /deep/.el-input__inner {
+            background-color: #04103D !important;
+            border: none;
+        }
     }
 
     .advanced-search {
@@ -52,12 +62,76 @@
 
     &-content {
         width: 100%;
-        padding: 10px;
         box-sizing: border-box;
         background: #FFFFFF;
-        border-radius: 2px;
-        margin-top: 5px;
-        border: 1px solid #e8edf3;
+        margin-top: 10px;
+
+        //去掉表格内的线
+        /deep/ table th {
+            border-bottom: 5px solid #000637 !important;
+        }
+
+        /deep/ table td {
+            border-bottom: 5px solid #000637 !important;
+        }
+
+        //去掉最下面的那一条线
+        /deep/.el-table::before {
+            height: 5px !important;
+            background-color: #000637 !important;
+        }
+
+
+        /deep/.lb-table {
+            background-color: #000637 !important;
+        }
+
+        /deep/.el-table__body-wrapper {
+            background-color: #000637 !important;
+        }
+
+        /deep/.el-table--enable-row-hover .el-table__body tr:hover>td {
+            background-color: #103E99 !important;
+        }
+
+        /deep/.el-table__body .el-table__row.hover-row td {
+            background-color: #103E99 !important;
+        }
+
+        /deep/.el-table tbody tr:hover>td {
+            background-color: #103E99 !important;
+        }
+
+        //修改表头的背景颜色横向渐变色
+
+        /deep/.el-table {
+            border: none !important;
+
+            .cell {
+                color: #FFFFFF !important;
+            }
+
+            .el-table__row {
+                background-color: #00275F !important;
+                margin-top: 5px;
+            }
+
+            thead {
+                background: #103E99 !important;
+
+                & th {
+                    //inherit：规定应该从父元素继承 background-color 属性的设置。
+                    //transparent：默认。背景颜色为透明。
+                    // background-color: inherit !important;
+                    background-color: transparent;
+                }
+
+                & tr {
+                    // background-color: inherit !important;
+                    background-color: transparent;
+                }
+            }
+        }
     }
 
     .el-form--inline .el-form-item {
@@ -76,6 +150,8 @@
     }
 }
 
+
+
 //*****end*通用表单查询条件，列表样式******//
 /deep/.el-range-separator {
     line-height: 28px !important;

 #app {
   .main-container {
-    height: calc(100% - 80px);
+    height: 100%;
     transition: margin-left 0.28s;
-    margin-left: $sideBarWidth;
+    margin-left: 220px;
   }
 
   .sidebar-container {
     transition: width 0.28s;
     width: $sideBarWidth !important;
-    height: calc(100% - #{$headerHeight});
+    height: 100%;
+    // height: calc(100% - #{$headerHeight});
     position: fixed;
     font-size: 0px;
-    top: $headerHeight;
+    // top: $headerHeight;
     bottom: 0;
     left: 0;
     z-index: 80;
@@ -27,7 +28,7 @@
       overflow-x: hidden !important;
       // overflow-y: auto;
       margin-right: 0 !important;
-      height: 90vh;
+      height: calc(100vh - 80px);
 
       &::-webkit-scrollbar {
         display: none;
@@ -84,8 +85,8 @@
     // 没有子级
     .submenu-title-noDropdown {
       color: $menuText;
-      border-radius: 6px;
-      padding-left: 10px !important;
+      // border-radius: 6px;
+      padding-left: 20px !important;
 
       &:hover {
         color: $menuActiveText !important;
@@ -119,9 +120,8 @@
     .el-submenu__title {
       font-weight: 600;
       font-size: $sideBarFontSize;
-      margin: 0 10px;
-      border-radius: 6px;
 
+      // margin: 0 10px;
       >i {
         color: $subMenuActiveText !important;
         transform: rotate(90deg);
@@ -167,7 +167,7 @@
       font-weight: 600;
       font-size: $sideBarFontSize;
       margin: 0 10px;
-      border-radius: 6px;
+      // border-radius: 6px;
     }
   }
 

@@ -9,18 +9,18 @@ $yellow:#FEC171;
 $panGreen: #30B08F;
 
 // header
-$headerHeight: 80px;
+$headerHeight: 60px;
 
 // sidebar
 $menuText:#ffffff;
 $menuActiveText:#ffffff;
 $subMenuActiveText:#ffffff;
 
-$menuBg:#202B3D;
+$menuBg:#0D1230;
 $menuHover:#0794FF;
 
-$subMenuBg:#202B3D;
-$subMenuHover:#0794FF;
+$subMenuBg:#0D1230;
+$subMenuHover:#1D66DC;
 
 $sideBarWidth: 210px;
 $sideBarFontSize:15px;

@@ -4,7 +4,12 @@
         <!-- 头部搜索 -->
         <el-form ref="form" :model="form" :inline="true" class="from-clues-header" label-width="100px">
             <el-row>
-                <el-col :span="6">
+                <el-col :span="8">
+                    <el-date-picker v-model="valueTime" type="datetimerange" range-separator="至"
+                        start-placeholder="开始日期" end-placeholder="结束日期">
+                    </el-date-picker>
+                </el-col>
+                <!-- <el-col :span="6">
                     <el-form-item label="开始时间">
                         <el-date-picker type="date" :picker-options="pickerOptionsStart" clearable
                             v-model="form.startTime" value-format="yyyy-MM-dd"></el-date-picker>
@@ -16,7 +21,7 @@
                             value-format="yyyy-MM-dd">
                         </el-date-picker>
                     </el-form-item>
-                </el-col>
+                </el-col> -->
                 <!-- 按钮操作 -->
                 <el-col :span="12" class="btnColRight">
                     <el-button type="default" @click="resetForm"> 重置 </el-button>
@@ -57,6 +62,7 @@ export default {
                 }
             },
             // 搜索表单
+            valueTime: '',
             form: {
                 startTime: "",
                 endTime: ""

@@ -37,8 +37,8 @@ class data extends filter {
             <div>
               {
                 scope.row.jcjg
-                  ? <el-tag type='success'>通过</el-tag>
-                  : <el-tag type='primary'>通过1</el-tag>
+                  ? <span>通过</span>
+                  : <span>通过1</span>
               }
             </div>
           )

@@ -69,9 +69,9 @@
     </div>
     <!-- 列表区域 -->
     <div class="from-clues-content">
-      <lb-table ref="table" :heightNum="300" :page-size="pageData.size" :current-page.sync="pageData.current"
-        :total="pageData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange"
-        :column="tableData.columns" :data="tableData.data">
+      <lb-table ref="table" :page-size="pageData.size" :current-page.sync="pageData.current" :total="pageData.total"
+        @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
+        :data="tableData.data">
       </lb-table>
     </div>
     <!-- 编辑 -->
@@ -163,20 +163,18 @@ export default {
         }].concat(data.columns()).concat([
           {
             label: "操作",
-            width: '80',
+            width: '160',
             render: (h, scope) => {
               return (
                 <div>
                   <el-button
-                    type="text"
-                    size="mini"
+                    type="primary"
                     onClick={() => { this.handleEdit(scope.row) }}
                   >
                     详情
                   </el-button>
                   <el-button
-                    type="text"
-                    size="mini"
+                    type="primary"
                   >
                     结果
                   </el-button>