sho ye

src/main/resources/static/app/dashboard/dashboard.html

@@ -17,7 +17,7 @@
                     <div class="row" style="height: 100%;">
                         <div class="home-search-wrap row" style="height:15%;">
                             <div class="col-md-12 col-sm-12 weather-bor"
-                                style="background-image: url(styles/img/home-1/welcome.png);background-size: 100% 100%;">
+                                style="background: #fff;border-radius: 5px;">
                                 <!--查询-->
                                 <!--
                         <div class="input-group home-search">
@@ -48,9 +48,9 @@
                         </div>
                         -->
                                 <div class="weather-box">
-                                    <span class="date-box" style="color:#447ee9"> {{depotInfo.orgName}}欢迎您</span>
+                                    <span class="date-box" style="color:#333;font-size:16px"> {{depotInfo.orgName}}欢迎您</span>
                                     <span id="dateInfo" class="date-box"
-                                        style="color:#447ee9">{{now | date:'yyyy-MM-dd'}}</span>
+                                        style="color:#333;font-size:16px">{{now | date:'yyyy-MM-dd'}}</span>
                                     <!--<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>-->
                                 </div>
                             </div>

src/main/resources/static/app/home/views/chuldj.html

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

src/main/resources/static/app/home/views/daibsx.html

@@ -1,45 +1,45 @@
 <div class="col-sm-12 home-module" ng-controller="daibsxCtrl" style="margin-top:8px;height:20%">
 
     <div class="col-center col-center-1" style="height:100%">
-        <h3>待办事项</h3>
+        <h3 style="color:#333">待办事项</h3>
         <div class="home-module-content">
             <ul class="list-group" style="max-height:70px;overflow: auto;">
                 <!--智能粮库待办事项-->
                 <li class="list-group-item daib-li" style="text-align: center;">
-                    <img alt="!" src="styles/img/home-1/icon1.png"/>&nbsp;
+                    <img alt="!" src="styles/img/home-1/icon1_new.png"/>&nbsp;
                     <a href-void ng-click="moreTodo()">
-                      <span style='color:#447ee9;'>智能粮库待办事项&nbsp;
-                          <span style='color:red;'>&nbsp;{{TodoSize==null?0:TodoSize}}</span>&nbsp;&nbsp;条
+                      <span style='color:#444;'>智能粮库待办事项&nbsp;
+                          <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;条
                       </span>
                     </a>
                     <div class="daib-line"></div>
                 </li>
                 <!--安全生产通知事项-->
                 <li class="list-group-item daib-li" style="text-align: center;" ng-hide="safeProduce">
-                    <img alt="!" src="styles/img/home-1/icon2.png"/>&nbsp;
+                    <img alt="!" src="styles/img/home-1/icon2_new.png"/>&nbsp;
                     <a href-void ng-click="safeProduceNotifyTodo()">
                       <span style='color:#447ee9;'>安全生产通知事项&nbsp;
-                          <span style='color:red;'>&nbsp;{{totalSize==null?0:totalSize}}</span>&nbsp;&nbsp;条
+                          <span style='color:#fff;'>&nbsp;{{totalSize==null?0:totalSize}}</span>&nbsp;&nbsp;条
                       </span>
                     </a>
                     <div class="daib-line"></div>
                 </li>
                 <!--药剂采购审批-->
                 <li class="list-group-item daib-li" style="text-align: center;" ng-hide="drugPurchase">
-                    <img alt="!" src="styles/img/home-1/icon2.png"/>&nbsp;
+                    <img alt="!" src="styles/img/home-1/icon2_new.png"/>&nbsp;
                     <a href-void ng-click="drugPurchaseAuditNotifyTodo()">
                       <span style='color:#447ee9;'>药剂采购审批事项&nbsp;
-                          <span style='color:red;'>&nbsp;{{drugPurchaseAuditSize==null?0:drugPurchaseAuditSize}}</span>&nbsp;&nbsp;条
+                          <span style='color:#fff;;'>&nbsp;{{drugPurchaseAuditSize==null?0:drugPurchaseAuditSize}}</span>&nbsp;&nbsp;条
                       </span>
                     </a>
                     <div class="daib-line"></div>
                 </li>
                 <!--药剂领用审批-->
                 <li class="list-group-item daib-li" style="text-align: center;" ng-hide="drugUseAudit">
-                    <img alt="!" src="styles/img/home-1/icon2.png"/>&nbsp;
+                    <img alt="!" src="styles/img/home-1/icon2_new.png"/>&nbsp;
                     <a href-void ng-click="drugUseAuditNotifyTodo()">
                       <span style='color:#447ee9;'>药剂领用审批事项&nbsp;
-                          <span style='color:red;'>&nbsp;{{drugUseAuditSize==null?0:drugUseAuditSize}}</span>&nbsp;&nbsp;条
+                          <span style='color:#fff;;'>&nbsp;{{drugUseAuditSize==null?0:drugUseAuditSize}}</span>&nbsp;&nbsp;条
                       </span>
                     </a>
                     <div class="daib-line"></div>

src/main/resources/static/app/home/views/dangqzy.html

@@ -2,14 +2,18 @@
 
     <div class="col-center col-center-5" style="height: 100%;">
         <div>
-            <h3>当前作业</h3>
+            <h3 style="color:#333">当前作业</h3>
         </div>
         <div class="home-module-content">
             <ul class="list-group" style="height:80%;overflow:auto; margin:30px 1px 0px 6px; padding-top: 0px;">
-                <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>
-                <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>
-                <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>
-                <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>
+                
+
+
+
+                <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>
+                <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>
+                <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>
+                <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>
             </ul>
         </div>
     </div>

src/main/resources/static/app/home/views/kuczb.html

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

src/main/resources/static/app/home/views/liangkjbzk.html

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

src/main/resources/static/app/home/views/liangspz.html

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

src/main/resources/static/app/home/views/quxt.html

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

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

@@ -1,7 +1,7 @@
 <header id="header"> 
 	<div id="logo-group">
 		<!-- PLACE YOUR LOGO HERE -->
-		<span id="logo"> <img src="styles/img/home-1/logo.png"
+		<span id="logo" style="line-height: 42px;"> <img src="styles/img/home-1/logo_new.png"
 			alt="天津智能粮库管理平台">
 		</span>
 		<!-- END LOGO PLACEHOLDER -->
@@ -11,7 +11,7 @@
 	<div class="pull-right user-right-bg" ng-controller="headerCtrl">
 
 		<div class="btn-group dropdown user-btn-group" style="width: 100%;" data-dropdown>
-			<div class="drop-div" data-toggle="dropdown" style="float:right;color:#447ee9">
+			<div class="drop-div" data-toggle="dropdown" style="float:right;">
 				<img src="styles/img/home/user.png" alt="user" />&nbsp;
 				{{userInfo.realName}} <span class="caret"></span>
 			</div>
@@ -48,25 +48,25 @@
 						</div>
 						<div has-func="124" class="nav-li" role="presentation">
 							<a href="javaScript:void(0)" ng-click="crk()">
-								<i class="nav-icon"><img src="styles/img/home-1/nav-icon/churk-icon.png" /></i>
+								<i class="nav-icon" style='position: relative;top:6px'><img src="styles/img/home-1/nav-icon/churk-icon.png" /></i>
 								出入库</a>
 							<i class="nav-feng-line"></i>
 						</div>
 						<div has-func="19" ng-hide="isEmergency" class="nav-li" role="presentation" ng-class="{true:'active'}[childSysId==19]">
 							<a href-void ng-click="switchTopMenu(19,'app.storage.index')">
-								<i class="nav-icon"><img src="styles/img/home-1/nav-icon/cangcyw.png" /></i>
+								<i class="nav-icon" style='position: relative;top:7px'><img src="styles/img/home-1/nav-icon/cangcyw.png" /></i>
 								仓储业务</a>
 							<i class="nav-feng-line"></i>
 						</div>
 						<div has-func="17" ng-hide="isEmergency" class="nav-li" role="presentation" ng-class="{true:'active'}[childSysId==17]">
 							<a href-void ng-click="switchTopMenu(17,'app.camera.index')">
-								<i class="nav-icon"><img src="styles/img/home-1/nav-icon/zhinaf-icon.png" /></i>
+								<i class="nav-icon" style='position: relative;top:7px'><img src="styles/img/home-1/nav-icon/zhinaf-icon.png" /></i>
 								智能安防</a>
 							<i class="nav-feng-line"></i>
 						</div>
 						<div has-func="18" ng-hide="isEmergency" class="nav-li" role="presentation" ng-class="{true:'active'}[childSysId==18]">
 							<a href-void ng-click="switchTopMenu(18,'app.supervise.cameraPT')">
-								<i class="nav-icon"><img src="styles/img/home-1/nav-icon/yuancjg-icon.png" /></i>
+								<i class="nav-icon" style='position: relative;top:7px'><img src="styles/img/home-1/nav-icon/yuancjg-icon.png" /></i>
 								粮库决策</a>
 							<i class="nav-feng-line"></i>
 						</div>
@@ -78,13 +78,13 @@
 						</div> -->
 						<div has-func="23" ng-hide="isEmergency" class="nav-li" role="presentation" ng-class="{true:'active'}[childSysId==23]">
 							<a href-void ng-click="switchTopMenu(23,'app.synth.warehouseSource')">
-								<i class="nav-icon"><img alt="查询追溯" src="styles/img/home-1/nav-icon/chaxzs-icon.png" /></i>
+								<i class="nav-icon" style='position: relative;top:7px'><img alt="查询追溯" src="styles/img/home-1/nav-icon/chaxzs-icon.png" /></i>
 								查询追溯</a>
                             <i class="nav-feng-line"></i>
 						</div>
 						<div has-func="218" class="nav-li" role="presentation" ng-class="{true:'active'}[childSysId==218]">
 							<a href-void ng-click="switchTopMenu(218,'app.intelligent.index')">
-								<i class="nav-icon"><img src="styles/img/home-1/nav-icon/yuancjg-icon.png" /></i>
+								<i class="nav-icon" style='position: relative;top:7px'><img src="styles/img/home-1/nav-icon/yuancjg-icon.png" /></i>
 								智能仓房</a>
 							<i class="nav-feng-line"></i>
 						</div>
@@ -102,7 +102,7 @@
 						</div>
 						<div has-func="1" ng-hide="isEmergency" class="nav-li" role="presentation" ng-class="{true:'active'}[childSysId==1]">
 							<a href-void ng-click="switchTopMenu(1,'app.system.user')">
-								<i class="nav-icon"><img src="styles/img/home-1/nav-icon/xitgl-icon.png" /></i>
+								<i class="nav-icon" style='position: relative;top:6px'><img src="styles/img/home-1/nav-icon/xitgl-icon.png" /></i>
 								系统管理</a>
                             <i class="nav-feng-line"></i>
 						</div>