钞小赢 4 years ago
parent
commit
574db0807c

+ 3 - 3
src/main/resources/static/app/dashboard/dashboard.html

@@ -17,7 +17,7 @@
17 17
                     <div class="row" style="height: 100%;">
18 18
                         <div class="home-search-wrap row" style="height:15%;">
19 19
                             <div class="col-md-12 col-sm-12 weather-bor"
20
-                                style="background-image: url(styles/img/home-1/welcome.png);background-size: 100% 100%;">
20
+                                style="background: #fff;border-radius: 5px;">
21 21
                                 <!--查询-->
22 22
                                 <!--
23 23
                         <div class="input-group home-search">
@@ -48,9 +48,9 @@
48 48
                         </div>
49 49
                         -->
50 50
                                 <div class="weather-box">
51
-                                    <span class="date-box" style="color:#447ee9"> {{depotInfo.orgName}}欢迎您</span>
51
+                                    <span class="date-box" style="color:#333;font-size:16px"> {{depotInfo.orgName}}欢迎您</span>
52 52
                                     <span id="dateInfo" class="date-box"
53
-                                        style="color:#447ee9">{{now | date:'yyyy-MM-dd'}}</span>
53
+                                        style="color:#333;font-size:16px">{{now | date:'yyyy-MM-dd'}}</span>
54 54
                                     <!--<iframe src="http://tianqi.5ikfc.com:90/plugin-code/?style=1&dy=1&cl=ffffff&tl=ffffff&th=ffffff" allowTransparency="true" frameborder="0" scrolling="no" width="280" height="50" id="weather_frame" style="background: black;"></iframe>-->
55 55
                                 </div>
56 56
                             </div>

+ 1 - 1
src/main/resources/static/app/home/views/chuldj.html

@@ -1,7 +1,7 @@
1 1
 <div class="col-sm-12 home-module mar-top2" ng-controller="chuldjCtrl" style="height:32.5%;margin-top:8px;">
2 2
 
3 3
     <div class="col-center col-center-5" style="height:100%">
4
-        <h3>储粮等级(单位:吨)</h3>
4
+        <h3 style="color:#333">储粮等级(单位:吨)</h3>
5 5
         <div class="home-module-content" id="cldj" style="position: absolute; top:3px;"></div>
6 6
             <!-- <div class="liangspz-charts" id="cldj" style="height: 120px" >
7 7
         	</div> -->

+ 10 - 10
src/main/resources/static/app/home/views/daibsx.html

@@ -1,45 +1,45 @@
1 1
 <div class="col-sm-12 home-module" ng-controller="daibsxCtrl" style="margin-top:8px;height:20%">
2 2
 
3 3
     <div class="col-center col-center-1" style="height:100%">
4
-        <h3>待办事项</h3>
4
+        <h3 style="color:#333">待办事项</h3>
5 5
         <div class="home-module-content">
6 6
             <ul class="list-group" style="max-height:70px;overflow: auto;">
7 7
                 <!--智能粮库待办事项-->
8 8
                 <li class="list-group-item daib-li" style="text-align: center;">
9
-                    <img alt="!" src="styles/img/home-1/icon1.png"/>&nbsp;
9
+                    <img alt="!" src="styles/img/home-1/icon1_new.png"/>&nbsp;
10 10
                     <a href-void ng-click="moreTodo()">
11
-                      <span style='color:#447ee9;'>智能粮库待办事项&nbsp;
12
-                          <span style='color:red;'>&nbsp;{{TodoSize==null?0:TodoSize}}</span>&nbsp;&nbsp;条
11
+                      <span style='color:#444;'>智能粮库待办事项&nbsp;
12
+                          <span style='color:#fff;background:url("styles/img/home-1/number_bg.png") no-repeat 100% 100%;display:inline-block;width:20px;height:20px'>{{TodoSize==null?0:TodoSize}}</span>&nbsp;&nbsp;条
13 13
                       </span>
14 14
                     </a>
15 15
                     <div class="daib-line"></div>
16 16
                 </li>
17 17
                 <!--安全生产通知事项-->
18 18
                 <li class="list-group-item daib-li" style="text-align: center;" ng-hide="safeProduce">
19
-                    <img alt="!" src="styles/img/home-1/icon2.png"/>&nbsp;
19
+                    <img alt="!" src="styles/img/home-1/icon2_new.png"/>&nbsp;
20 20
                     <a href-void ng-click="safeProduceNotifyTodo()">
21 21
                       <span style='color:#447ee9;'>安全生产通知事项&nbsp;
22
-                          <span style='color:red;'>&nbsp;{{totalSize==null?0:totalSize}}</span>&nbsp;&nbsp;条
22
+                          <span style='color:#fff;'>&nbsp;{{totalSize==null?0:totalSize}}</span>&nbsp;&nbsp;条
23 23
                       </span>
24 24
                     </a>
25 25
                     <div class="daib-line"></div>
26 26
                 </li>
27 27
                 <!--药剂采购审批-->
28 28
                 <li class="list-group-item daib-li" style="text-align: center;" ng-hide="drugPurchase">
29
-                    <img alt="!" src="styles/img/home-1/icon2.png"/>&nbsp;
29
+                    <img alt="!" src="styles/img/home-1/icon2_new.png"/>&nbsp;
30 30
                     <a href-void ng-click="drugPurchaseAuditNotifyTodo()">
31 31
                       <span style='color:#447ee9;'>药剂采购审批事项&nbsp;
32
-                          <span style='color:red;'>&nbsp;{{drugPurchaseAuditSize==null?0:drugPurchaseAuditSize}}</span>&nbsp;&nbsp;条
32
+                          <span style='color:#fff;;'>&nbsp;{{drugPurchaseAuditSize==null?0:drugPurchaseAuditSize}}</span>&nbsp;&nbsp;条
33 33
                       </span>
34 34
                     </a>
35 35
                     <div class="daib-line"></div>
36 36
                 </li>
37 37
                 <!--药剂领用审批-->
38 38
                 <li class="list-group-item daib-li" style="text-align: center;" ng-hide="drugUseAudit">
39
-                    <img alt="!" src="styles/img/home-1/icon2.png"/>&nbsp;
39
+                    <img alt="!" src="styles/img/home-1/icon2_new.png"/>&nbsp;
40 40
                     <a href-void ng-click="drugUseAuditNotifyTodo()">
41 41
                       <span style='color:#447ee9;'>药剂领用审批事项&nbsp;
42
-                          <span style='color:red;'>&nbsp;{{drugUseAuditSize==null?0:drugUseAuditSize}}</span>&nbsp;&nbsp;条
42
+                          <span style='color:#fff;;'>&nbsp;{{drugUseAuditSize==null?0:drugUseAuditSize}}</span>&nbsp;&nbsp;条
43 43
                       </span>
44 44
                     </a>
45 45
                     <div class="daib-line"></div>

+ 9 - 5
src/main/resources/static/app/home/views/dangqzy.html

@@ -2,14 +2,18 @@
2 2
 
3 3
     <div class="col-center col-center-5" style="height: 100%;">
4 4
         <div>
5
-            <h3>当前作业</h3>
5
+            <h3 style="color:#333">当前作业</h3>
6 6
         </div>
7 7
         <div class="home-module-content">
8 8
             <ul class="list-group" style="height:80%;overflow:auto; margin:30px 1px 0px 6px; padding-top: 0px;">
9
-                <li class="list-group-item" ng-repeat="tf in tfData" ng-click="getJobDate('3.1',tf.houseId)" style="cursor:pointer;"><img src="styles/img/home-1/text-icon2.png"/>&nbsp;{{tf.storehouseName}}正在通风作业</li>
10
-                <li class="list-group-item" ng-repeat="xz in xzData" ng-click="getJobDate('3.2',xz.houseId)" style="cursor:pointer;"><img src="styles/img/home-1/text-icon2.png"/>&nbsp;{{xz.storehouseName}}正在熏蒸作业</li>
11
-                <li class="list-group-item" ng-repeat="rk in rkData" ng-click="getJobDate('3.3',rk.houseId)" style="cursor:pointer;"><img src="styles/img/home-1/text-icon2.png"/>&nbsp;{{rk.storehouseName}}正在入库作业</li>
12
-                <li class="list-group-item" ng-repeat="ck in ckData" ng-click="getJobDate('3.4',ck.houseId)" style="cursor:pointer;"><img src="styles/img/home-1/text-icon2.png"/>&nbsp;{{ck.storehouseName}}正在出库作业</li>
9
+                
10
+
11
+
12
+
13
+                <li class="list-group-item" ng-repeat="tf in tfData" ng-click="getJobDate('3.1',tf.houseId)" style="cursor:pointer;"><img src="styles/img/home-1/text-icon2_new.png"/>&nbsp;{{tf.storehouseName}}正在通风作业</li>
14
+                <li class="list-group-item" ng-repeat="xz in xzData" ng-click="getJobDate('3.2',xz.houseId)" style="cursor:pointer;"><img src="styles/img/home-1/text-icon2_new.png"/>&nbsp;{{xz.storehouseName}}正在熏蒸作业</li>
15
+                <li class="list-group-item" ng-repeat="rk in rkData" ng-click="getJobDate('3.3',rk.houseId)" style="cursor:pointer;"><img src="styles/img/home-1/text-icon2_new.png"/>&nbsp;{{rk.storehouseName}}正在入库作业</li>
16
+                <li class="list-group-item" ng-repeat="ck in ckData" ng-click="getJobDate('3.4',ck.houseId)" style="cursor:pointer;"><img src="styles/img/home-1/text-icon2_new.png"/>&nbsp;{{ck.storehouseName}}正在出库作业</li>
13 17
             </ul>
14 18
         </div>
15 19
     </div>

+ 1 - 1
src/main/resources/static/app/home/views/kuczb.html

@@ -1,7 +1,7 @@
1 1
 <div class="col-sm-12 home-module mar-top2" ng-controller="kuczbCtrl" style="height:32.5%;margin-top:5px;">
2 2
 
3 3
     <div class="col-center col-center-5" style="height:100%">
4
-        <h3>库存/库容比</h3>
4
+        <h3 style="color:#333">库存/库容比</h3>
5 5
         <div class="home-module-content" id="kuczb"></div>
6 6
             <!-- <div class="kuczb-charts" id="kuczb" style="height: 140px" >
7 7
         	</div> -->

+ 2 - 2
src/main/resources/static/app/home/views/liangkjbzk.html

@@ -1,7 +1,7 @@
1 1
 <div class="col-sm-12 home-module mar-top2" ng-controller="depotProfileCtrl" style="height:79%;margin-top:7px;">
2 2
 	
3 3
     <div class="col-center col-center-6" style="height:100%;">
4
-        <h3>粮库基本状况</h3>
4
+        <h3 style="color:#333;">粮库基本状况</h3>
5 5
         <div class="home-module-content">
6 6
             <div class="video-mon">
7 7
                 <div class="product-image" style="padding:3px;">
@@ -36,7 +36,7 @@
36 36
                 
37 37
                 <div class="liangkjbzk-line"></div>
38 38
                 <div class="liangkjbzk-con">
39
-                    <p ng-bind="depotInfo.briefIntroduction" style="color:#447ee9"></p>
39
+                    <p ng-bind="depotInfo.briefIntroduction" style="color:#555;font-size:14px"></p>
40 40
                 </div>
41 41
             </div>
42 42
         </div>

+ 1 - 1
src/main/resources/static/app/home/views/liangspz.html

@@ -1,7 +1,7 @@
1 1
 <div class="col-md-6 col-sm-6 mar-top2 home-module" ng-controller="liangspzCtrl" style="height:100%">
2 2
 
3 3
     <div class="col-center col-center-3">
4
-        <h3>粮食品种(单位:吨)</h3>
4
+        <h3 style="color:#333">粮食品种(单位:吨)</h3>
5 5
         <div class="home-module-content" id="lspz"></div>
6 6
             <!-- <div class="liangspz-charts" id="lspz" style="height: 180px" >
7 7
         	</div> -->

+ 1 - 1
src/main/resources/static/app/home/views/quxt.html

@@ -1,6 +1,6 @@
1 1
 <div class="col-md-6 col-sm-6 picture-mar1 mar-top2 home-module" ng-controller="quxtCtrl" id="quxtDiv" style="padding: 0px;height:100%">
2 2
     <div class="col-center col-center-3" style="margin-left:0px;">
3
-        <h3>五温曲线图</h3>
3
+        <h3 style="color:#333">五温曲线图</h3>
4 4
         <div class="home-module-content" id="showChartsTemp"></div>
5 5
     </div>
6 6
 </div>

+ 9 - 9
src/main/resources/static/app/layout/partials/header.tpl.html

@@ -1,7 +1,7 @@
1 1
 <header id="header"> 
2 2
 	<div id="logo-group">
3 3
 		<!-- PLACE YOUR LOGO HERE -->
4
-		<span id="logo"> <img src="styles/img/home-1/logo.png"
4
+		<span id="logo" style="line-height: 42px;"> <img src="styles/img/home-1/logo_new.png"
5 5
 			alt="天津智能粮库管理平台">
6 6
 		</span>
7 7
 		<!-- END LOGO PLACEHOLDER -->
@@ -11,7 +11,7 @@
11 11
 	<div class="pull-right user-right-bg" ng-controller="headerCtrl">
12 12
 
13 13
 		<div class="btn-group dropdown user-btn-group" style="width: 100%;" data-dropdown>
14
-			<div class="drop-div" data-toggle="dropdown" style="float:right;color:#447ee9">
14
+			<div class="drop-div" data-toggle="dropdown" style="float:right;">
15 15
 				<img src="styles/img/home/user.png" alt="user" />&nbsp;
16 16
 				{{userInfo.realName}} <span class="caret"></span>
17 17
 			</div>
@@ -48,25 +48,25 @@
48 48
 						</div>
49 49
 						<div has-func="124" class="nav-li" role="presentation">
50 50
 							<a href="javaScript:void(0)" ng-click="crk()">
51
-								<i class="nav-icon"><img src="styles/img/home-1/nav-icon/churk-icon.png" /></i>
51
+								<i class="nav-icon" style='position: relative;top:6px'><img src="styles/img/home-1/nav-icon/churk-icon.png" /></i>
52 52
 								出入库</a>
53 53
 							<i class="nav-feng-line"></i>
54 54
 						</div>
55 55
 						<div has-func="19" ng-hide="isEmergency" class="nav-li" role="presentation" ng-class="{true:'active'}[childSysId==19]">
56 56
 							<a href-void ng-click="switchTopMenu(19,'app.storage.index')">
57
-								<i class="nav-icon"><img src="styles/img/home-1/nav-icon/cangcyw.png" /></i>
57
+								<i class="nav-icon" style='position: relative;top:7px'><img src="styles/img/home-1/nav-icon/cangcyw.png" /></i>
58 58
 								仓储业务</a>
59 59
 							<i class="nav-feng-line"></i>
60 60
 						</div>
61 61
 						<div has-func="17" ng-hide="isEmergency" class="nav-li" role="presentation" ng-class="{true:'active'}[childSysId==17]">
62 62
 							<a href-void ng-click="switchTopMenu(17,'app.camera.index')">
63
-								<i class="nav-icon"><img src="styles/img/home-1/nav-icon/zhinaf-icon.png" /></i>
63
+								<i class="nav-icon" style='position: relative;top:7px'><img src="styles/img/home-1/nav-icon/zhinaf-icon.png" /></i>
64 64
 								智能安防</a>
65 65
 							<i class="nav-feng-line"></i>
66 66
 						</div>
67 67
 						<div has-func="18" ng-hide="isEmergency" class="nav-li" role="presentation" ng-class="{true:'active'}[childSysId==18]">
68 68
 							<a href-void ng-click="switchTopMenu(18,'app.supervise.cameraPT')">
69
-								<i class="nav-icon"><img src="styles/img/home-1/nav-icon/yuancjg-icon.png" /></i>
69
+								<i class="nav-icon" style='position: relative;top:7px'><img src="styles/img/home-1/nav-icon/yuancjg-icon.png" /></i>
70 70
 								粮库决策</a>
71 71
 							<i class="nav-feng-line"></i>
72 72
 						</div>
@@ -78,13 +78,13 @@
78 78
 						</div> -->
79 79
 						<div has-func="23" ng-hide="isEmergency" class="nav-li" role="presentation" ng-class="{true:'active'}[childSysId==23]">
80 80
 							<a href-void ng-click="switchTopMenu(23,'app.synth.warehouseSource')">
81
-								<i class="nav-icon"><img alt="查询追溯" src="styles/img/home-1/nav-icon/chaxzs-icon.png" /></i>
81
+								<i class="nav-icon" style='position: relative;top:7px'><img alt="查询追溯" src="styles/img/home-1/nav-icon/chaxzs-icon.png" /></i>
82 82
 								查询追溯</a>
83 83
                             <i class="nav-feng-line"></i>
84 84
 						</div>
85 85
 						<div has-func="218" class="nav-li" role="presentation" ng-class="{true:'active'}[childSysId==218]">
86 86
 							<a href-void ng-click="switchTopMenu(218,'app.intelligent.index')">
87
-								<i class="nav-icon"><img src="styles/img/home-1/nav-icon/yuancjg-icon.png" /></i>
87
+								<i class="nav-icon" style='position: relative;top:7px'><img src="styles/img/home-1/nav-icon/yuancjg-icon.png" /></i>
88 88
 								智能仓房</a>
89 89
 							<i class="nav-feng-line"></i>
90 90
 						</div>
@@ -102,7 +102,7 @@
102 102
 						</div>
103 103
 						<div has-func="1" ng-hide="isEmergency" class="nav-li" role="presentation" ng-class="{true:'active'}[childSysId==1]">
104 104
 							<a href-void ng-click="switchTopMenu(1,'app.system.user')">
105
-								<i class="nav-icon"><img src="styles/img/home-1/nav-icon/xitgl-icon.png" /></i>
105
+								<i class="nav-icon" style='position: relative;top:6px'><img src="styles/img/home-1/nav-icon/xitgl-icon.png" /></i>
106 106
 								系统管理</a>
107 107
                             <i class="nav-feng-line"></i>
108 108
 						</div>