Merge branch 'master' of http://101.36.160.140:21044/numberPro/numberWeb

src/App.vue

@@ -23,7 +23,7 @@ export default {
 }
 </script>
 
-<style lang="scss">
+<style lang="scss" >
 @import '~@/assets/style/public-class.scss';
 //分页整体样式
 .el-pagination{
@@ -62,11 +62,20 @@ justify-content: flex-end;
 .el-table--border{
   border-color:#67a7df !important
 }
-//鼠标移到每行时的背景色
-.el-table__body tr.hover-row.current-row>td.el-table__cell,
-.el-table__body tr.hover-row.el-table__row--striped.current-row>td.el-table__cell,
-.el-table__body tr.hover-row.el-table__row--striped>td.el-table__cell,
-.el-table__body tr.hover-row>td.el-table__cell{
-  background:#00375b !important;
-}
+    .right_main{
+      border:1px solid #67a7df;
+      background:#112f5d;
+    
+      margin-top:10px;
+      .right_title{
+        color:#FFF;
+        border-bottom:1px solid #67a7df;
+        padding:10px;
+         font-size:14px;
+    }
+    .right_table{
+       padding:20px;
+    
+    }
+    }
 </style>

src/assets/style/public-class.scss

@@ -66,15 +66,27 @@ $sizes: (0, 5, 10, 15, 20);
 .#{$prefix}-pb { padding-bottom: 20px !important; }
 .#{$prefix}-pl { padding-left: 20px !important; }
 
-//树形菜单
-.el-tree{
- 
-}
+
 .el-tree-node{
   background: #163d79;
   color:#fff;
   font-size:12px;
 }
-.el-tree-node:focus{
-  background:#0064b9 !important;
+
+//鼠标移到每行时的背景色
+.el-table__body tr.hover-row.current-row>td.el-table__cell,
+.el-table__body tr.hover-row.el-table__row--striped.current-row>td.el-table__cell,
+.el-table__body tr.hover-row.el-table__row--striped>td.el-table__cell,
+.el-table__body tr.hover-row>td.el-table__cell{
+  background:#00375b;
+}
+//头部导航一级菜单选中后的样式
+.theme-d2 .d2-theme-header .el-menu .el-menu-item.is-active{
+  background: #0068a0 !important;
+  color:#fff !important;
+}
+//头部导航二级菜单选中后的样式
+.theme-d2 .d2-theme-header .el-menu .el-submenu.is-active .el-submenu__title{
+  background: #0068a0 !important;
+  color:#fff !important;
 }

src/views/demo/warehouseShow/warehouseInfo/index.vue

@@ -1,8 +1,11 @@
 <template>
   <div>
     <d2-container>
-      <template slot="header">仓房展示/仓房信息</template>
+      <template slot="header"><div class="nav">当前所在位置:首页>仓房信息</div></template>
         <div>
+          <div class="right_main">
+            <div class="right_title"><i class="fa fa-university" aria-hidden="true" style="padding-right:5px"></i>仓房信息</div>
+            <div class="right_table">
       <el-form :inline="true" :model="formInline" class="demo-form-inline">
         <el-form-item label="仓房名称:">
           <el-input v-model="formInline.cfName" placeholder="请选择"></el-input>
@@ -34,7 +37,7 @@
         </el-form-item>
       </el-form>
 
-      <el-table :data="cfInfoList" border style="width: 100%" :header-cell-style="{background:'#0064b9',color:'#fff'}">
+      <el-table :data="cfInfoList" border style="width: 100%" :header-cell-style="{background:'#0064b9',color:'#c9f5fa'}">
         <el-table-column prop="branchOffice" label="所属分公司" align="center">
         </el-table-column>
         <el-table-column prop="directLibrary" label="所属直属库" align="center">
@@ -82,6 +85,8 @@
           :limit.sync="listQuery.limit"
           @pagination="getList"
         /> -->
+        </div>
+        </div>
     </div>
     </d2-container>
  
@@ -175,4 +180,14 @@ export default {
     
   },
 };
-</script>
+</script>
+<style lang="scss" scoped>
+     .nav {
+    
+      color:#FFF;
+      font-size:14px;
+  
+      background: #004a93;
+    }
+  
+</style>