GaoYuPeng 3 年 前
コミット
ce45bab988

+ 1 - 1
.env.development

@@ -1,5 +1,5 @@
1 1
 # 开发环境
2 2
 
3 3
 # 页面 title 前缀
4
-VUE_APP_TITLE=粮食数量监测
4
+VUE_APP_TITLE=数量监测智能眼系统
5 5
 

+ 38 - 0
src/App.vue

@@ -25,10 +25,48 @@ export default {
25 25
 
26 26
 <style lang="scss">
27 27
 @import '~@/assets/style/public-class.scss';
28
+//分页整体样式
28 29
 .el-pagination{
29 30
   margin-top: 20px;
30 31
   display:flex;
31 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 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 70
 .el-tree{
71
-  // background:#163d79 !important;
71
+ 
72 72
 }
73 73
 .el-tree-node{
74 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 1
 <template>
2 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 4
     <el-dropdown-menu slot="dropdown">
5 5
       <el-dropdown-item @click.native="logOff">
6 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 23
     title: '仓房展示',
24
-    icon: 'folder-o',
24
+    icon: 'university',
25 25
     children: [
26 26
       { path: '/warehouseTravel', title: '仓内遨游' },
27 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 34
     title: '系统管理',
35
-    icon: 'folder-o',
35
+    icon: 'file-text-o',
36 36
     children: [
37 37
       { path: '/organization', title: '组织机构' },
38 38
       { path: '/userManagement', title: '用户管理' },
@@ -44,7 +44,7 @@ export const menuHeader = supplementPath([
44 44
   },
45 45
   {
46 46
     title: '参数设置',
47
-    icon: '',
47
+    icon: 'cog',
48 48
     children: [
49 49
       { path: '/hardwareParame', title: '硬件参数' },
50 50
       { path: '/scanParame', title: '扫描参数' },

+ 14 - 6
src/views/demo/dataQuery/index.vue

@@ -17,15 +17,18 @@
17 17
             ref="tree"
18 18
           >
19 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 24
             </span>
22 25
           </el-tree>
23 26
         </div>
24 27
         <div class="right">
25 28
           <!-- <template slot="header">首页/数据查询</template> -->
26
-          <div class="nav">首页/数据查询</div>
29
+          <div class="nav">当前所在位置:首页>数据查询</div>
27 30
           <div class="right_main">
28
-            <div class="right_title">数据查询</div>
31
+            <div class="right_title"><i class="fa fa-bar-chart" aria-hidden="true" style="padding-right:5px"></i>数据查询</div>
29 32
             <div class="right_table">
30 33
           <el-form :inline="true" :model="formInline" class="demo-form-inline">
31 34
             <el-form-item label="扫描时间">
@@ -56,7 +59,7 @@
56 59
               >
57 60
             </el-form-item>
58 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 63
             <el-table-column
61 64
               prop="directLibrary"
62 65
               label="所属直属库"
@@ -121,6 +124,7 @@ export default {
121 124
       // 默认展开的节点
122 125
       defaultProps: {
123 126
         children: 'children',
127
+        data:'',
124 128
         label: 'label'
125 129
       },
126 130
       // 左侧树数据
@@ -276,16 +280,20 @@ export default {
276 280
       padding: 10px 0 10px 10px;
277 281
       color:#FFF;
278 282
 
283
+      font-size:14px;
284
+  
279 285
       background: #004a93;
280 286
     }
281 287
     .right_main{
282
-      border:1px solid #0a3e6b;
288
+      border:1px solid #67a7df;
283 289
       background:#112f5d;
290
+    
284 291
       margin-top:10px;
285 292
       .right_title{
286 293
         color:#FFF;
287
-        border-bottom:1px solid #0a3e6b;
294
+        border-bottom:1px solid #67a7df;
288 295
         padding:10px;
296
+         font-size:14px;
289 297
     }
290 298
     .right_table{
291 299
        padding:20px;

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

@@ -34,7 +34,7 @@
34 34
         </el-form-item>
35 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 38
         <el-table-column prop="branchOffice" label="所属分公司" align="center">
39 39
         </el-table-column>
40 40
         <el-table-column prop="directLibrary" label="所属直属库" align="center">