钞小赢 3 years ago
parent
commit
7261078dbf

+ 38 - 0
src/App.vue

@@ -25,10 +25,48 @@ export default {
25
 
25
 
26
 <style lang="scss">
26
 <style lang="scss">
27
 @import '~@/assets/style/public-class.scss';
27
 @import '~@/assets/style/public-class.scss';
28
+//分页整体样式
28
 .el-pagination{
29
 .el-pagination{
29
   margin-top: 20px;
30
   margin-top: 20px;
30
   display:flex;
31
   display:flex;
31
 justify-content: flex-end;
32
 justify-content: flex-end;
32
 }
33
 }
34
+//分页总共几页样式
35
+.el-pagination__total {
36
+  color:#FFF !important
37
+}
38
+//label样式
39
+.el-form-item__label{
40
+  color:#fff !important
41
+}
42
+//树形节点选中后的颜色
43
+ .el-tree-node:focus>.el-tree-node__content {
44
+    background-color:#0064b9 !important;
45
+    border-radius:20px;
46
+}
47
+//树形节点鼠标移上去的颜色
48
+.el-tree-node__content:hover {
49
+     background-color:#91a8bc !important;
50
+}
51
+//table border
33
 
52
 
53
+.el-table td,.el-table th.is-leaf,.el-table-border,.el-table--group{
54
+  border-color:#67a7df !important
55
+}
56
+.el-table th.el-table_cell.is-leaf{
57
+ border:#67a7df !important
58
+}
59
+.el-table tr{
60
+  background:#00375e !important;
61
+}
62
+.el-table--border{
63
+  border-color:#67a7df !important
64
+}
65
+//鼠标移到每行时的背景色
66
+.el-table__body tr.hover-row.current-row>td.el-table__cell,
67
+.el-table__body tr.hover-row.el-table__row--striped.current-row>td.el-table__cell,
68
+.el-table__body tr.hover-row.el-table__row--striped>td.el-table__cell,
69
+.el-table__body tr.hover-row>td.el-table__cell{
70
+  background:#00375b !important;
71
+}
34
 </style>
72
 </style>

+ 6 - 1
src/assets/style/public-class.scss

@@ -68,8 +68,13 @@ $sizes: (0, 5, 10, 15, 20);
68
 
68
 
69
 //树形菜单
69
 //树形菜单
70
 .el-tree{
70
 .el-tree{
71
-  // background:#163d79 !important;
71
+ 
72
 }
72
 }
73
 .el-tree-node{
73
 .el-tree-node{
74
   background: #163d79;
74
   background: #163d79;
75
+  color:#fff;
76
+  font-size:12px;
77
+}
78
+.el-tree-node:focus{
79
+  background:#0064b9 !important;
75
 }
80
 }

File diff suppressed because it is too large
+ 3042 - 1
src/components/d2-icon/font-awesome-4.7.0/css/font-awesome.min.css


+ 1 - 1
src/layout/header-aside/components/header-user/index.vue

@@ -1,6 +1,6 @@
1
 <template>
1
 <template>
2
   <el-dropdown size="small" class="d2-mr">
2
   <el-dropdown size="small" class="d2-mr">
3
-    <span class="btn-text">{{info.name ? `${info.name}` : '未登录'}}</span>
3
+    <span class="btn-text"><i class="fa fa-user" aria-hidden="true" style="padding-right:5px;"></i>{{info.name ? `${info.name}` : '未登录'}}</span>
4
     <el-dropdown-menu slot="dropdown">
4
     <el-dropdown-menu slot="dropdown">
5
       <el-dropdown-item @click.native="logOff">
5
       <el-dropdown-item @click.native="logOff">
6
         <d2-icon name="power-off" class="d2-mr-5"/>
6
         <d2-icon name="power-off" class="d2-mr-5"/>

+ 5 - 5
src/menu/index.js

@@ -21,18 +21,18 @@ export const menuHeader = supplementPath([
21
  
21
  
22
   {
22
   {
23
     title: '仓房展示',
23
     title: '仓房展示',
24
-    icon: 'folder-o',
24
+    icon: 'university',
25
     children: [
25
     children: [
26
       { path: '/warehouseTravel', title: '仓内遨游' },
26
       { path: '/warehouseTravel', title: '仓内遨游' },
27
       { path: '/warehouseInfo', title: '仓房信息' },
27
       { path: '/warehouseInfo', title: '仓房信息' },
28
      
28
      
29
     ]
29
     ]
30
   },
30
   },
31
-  { path: '/alarmRecord', title: '报警记录', icon: 'folder-o' },
32
-  { path: '/dataQuery', title: '数据查询', icon: 'folder-o' },
31
+  { path: '/alarmRecord', title: '报警记录', icon: 'lightbulb-o' },
32
+  { path: '/dataQuery', title: '数据查询', icon: 'bar-chart' },
33
   {
33
   {
34
     title: '系统管理',
34
     title: '系统管理',
35
-    icon: 'folder-o',
35
+    icon: 'file-text-o',
36
     children: [
36
     children: [
37
       { path: '/organization', title: '组织机构' },
37
       { path: '/organization', title: '组织机构' },
38
       { path: '/userManagement', title: '用户管理' },
38
       { path: '/userManagement', title: '用户管理' },
@@ -44,7 +44,7 @@ export const menuHeader = supplementPath([
44
   },
44
   },
45
   {
45
   {
46
     title: '参数设置',
46
     title: '参数设置',
47
-    icon: '',
47
+    icon: 'cog',
48
     children: [
48
     children: [
49
       { path: '/hardwareParame', title: '硬件参数' },
49
       { path: '/hardwareParame', title: '硬件参数' },
50
       { path: '/scanParame', title: '扫描参数' },
50
       { path: '/scanParame', title: '扫描参数' },

+ 10 - 5
src/views/demo/dataQuery/index.vue

@@ -17,13 +17,16 @@
17
             ref="tree"
17
             ref="tree"
18
           >
18
           >
19
             <span class="custom-tree-node" slot-scope="{ node, data }">
19
             <span class="custom-tree-node" slot-scope="{ node, data }">
20
-              <span> <i :class="node.icon"></i>{{ node.label }} </span>
20
+              <span v-if="node.level==1"> <i :class="node.icon"></i>{{ node.label }} </span>
21
+               <span v-if="node.level==2"> <i :class="node.icon"></i>{{ node.label }} </span>
22
+                <span v-if="node.level==3"> <i :class="node.icon"></i>{{ node.label }} </span>
23
+                 <span v-if="node.level==4"> <i></i>{{ node.label }} </span>
21
             </span>
24
             </span>
22
           </el-tree>
25
           </el-tree>
23
         </div>
26
         </div>
24
         <div class="right">
27
         <div class="right">
25
           <!-- <template slot="header">首页/数据查询</template> -->
28
           <!-- <template slot="header">首页/数据查询</template> -->
26
-          <div class="nav">首页/数据查询</div>
29
+          <div class="nav">当前所在位置:首页>数据查询</div>
27
           <div class="right_main">
30
           <div class="right_main">
28
             <div class="right_title">数据查询</div>
31
             <div class="right_title">数据查询</div>
29
             <div class="right_table">
32
             <div class="right_table">
@@ -56,7 +59,7 @@
56
               >
59
               >
57
             </el-form-item>
60
             </el-form-item>
58
           </el-form>
61
           </el-form>
59
-          <el-table :data="dataSearchList" border style="width: 100%">
62
+          <el-table :data="dataSearchList" border style="width: 100%" :header-cell-style="{background:'#0064b9',color:'#c9f5fa'}">
60
             <el-table-column
63
             <el-table-column
61
               prop="directLibrary"
64
               prop="directLibrary"
62
               label="所属直属库"
65
               label="所属直属库"
@@ -275,16 +278,18 @@ export default {
275
     .nav {
278
     .nav {
276
       padding: 10px 0 10px 10px;
279
       padding: 10px 0 10px 10px;
277
       color:#FFF;
280
       color:#FFF;
281
+      font-size:14px;
278
   
282
   
279
       background: #004a93;
283
       background: #004a93;
280
     }
284
     }
281
     .right_main{
285
     .right_main{
282
-      border:1px solid #0a3e6b;
286
+      border:1px solid #67a7df;
283
       background:#112f5d;
287
       background:#112f5d;
288
+    
284
       margin-top:10px;
289
       margin-top:10px;
285
       .right_title{
290
       .right_title{
286
         color:#FFF;
291
         color:#FFF;
287
-        border-bottom:1px solid #0a3e6b;
292
+        border-bottom:1px solid #67a7df;
288
         padding:10px;
293
         padding:10px;
289
     }
294
     }
290
     .right_table{
295
     .right_table{

+ 1 - 1
src/views/demo/warehouseShow/warehouseInfo/index.vue

@@ -34,7 +34,7 @@
34
         </el-form-item>
34
         </el-form-item>
35
       </el-form>
35
       </el-form>
36
 
36
 
37
-      <el-table :data="cfInfoList" border style="width: 100%">
37
+      <el-table :data="cfInfoList" border style="width: 100%" :header-cell-style="{background:'#0064b9',color:'#fff'}">
38
         <el-table-column prop="branchOffice" label="所属分公司" align="center">
38
         <el-table-column prop="branchOffice" label="所属分公司" align="center">
39
         </el-table-column>
39
         </el-table-column>
40
         <el-table-column prop="directLibrary" label="所属直属库" align="center">
40
         <el-table-column prop="directLibrary" label="所属直属库" align="center">