青浦图例样式

王通
1 parent 78779524
Showing 3 changed files with 32 additions and 71 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/application-prod.properties
src/main/resources/static/real_control_v2/css/line_schedule.css
@@ -4195,7 +4195,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     @Override
     public List<ScheduleRealInfo> queryListWaybillQp(String clZbh, String date, String line) {
         // TODO Auto-generated method stub
-        DecimalFormat format = new DecimalFormat("0.00");
+//        DecimalFormat format = new DecimalFormat("0.00");
         List<ScheduleRealInfo> list = null;
         list = scheduleRealInfoRepository.queryListWaybill2(clZbh, date, line);
         List<ScheduleRealInfo> newList = new ArrayList<ScheduleRealInfo>();
@@ -4220,7 +4220,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
  
                         if (!c.isDestroy()) {
                             if (c.getMileageType().equals("service")) {
-                                sjlc += c.getMileage() == null ? 0 : c.getMileage();
+//                                sjlc += c.getMileage() == null ? 0 : c.getMileage();
+                                sjlc=Arith.add(sjlc, c.getMileage() == null ? 0 : c.getMileage());
                             }
                         }
  
@@ -4232,7 +4233,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     	}
                     }
                 }
-                s.setSjlc(format.format(sjlc));
+                s.setSjlc(String.valueOf(sjlc));
                 s.setRemarks(remarks);
                 newList.add(s);
             }
@@ -2,7 +2,7 @@ server.port=9088
 management.port= 9001
 management.address= 127.0.0.1
  
-spring.jpa.hibernate.ddl-auto= update
+spring.jpa.hibernate.ddl-auto= none
 spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
 #DATABASE
 spring.jpa.database= MYSQL
@@ -13,16 +13,15 @@
  
 .line_schedule div.uk-width-1-6, .line_schedule div.uk-width-1-2 {
     padding: 0 2px 2px 2px;
-    height: 100%;
 }
  
 .line_schedule .footer-chart {
-    height: 233px;
+    height: 243px;
     margin-top: 5px;
 }
  
 .line_schedule .uk-grid.top-container {
-    height: calc(100% - 250px);
+    height: calc(100% - 260px);
     margin-top: 5px;
     overflow: hidden;
 }
@@ -44,7 +43,7 @@
  
 .line_schedule .ct_table {
     padding-top: 36px;
-	color: #000;
+    color: #000;
 }
  
 .line_schedule .ct_table>.ct_table_head {
@@ -80,7 +79,7 @@
 }
  
 .line-schedule-table dl dt:nth-of-type(1), .line-schedule-table dl dd:nth-of-type(1) {
-    width: 30px;
+    width: 50px;
 }
  
 .line-schedule-table dl dd:nth-of-type(1) {
@@ -92,20 +91,12 @@
 }
  
 .line-schedule-table dl dt:nth-of-type(2), .line-schedule-table dl dd:nth-of-type(2) {
-    width: 35px;
+    width: 55px;
     text-align: center;
 }
  
 .line-schedule-table dl dt:nth-of-type(3), .line-schedule-table dl dd:nth-of-type(3) {
-    width: calc(2% + 106px);
-    position: relative;
-}
-.line-schedule-table dl dd:nth-of-type(3)>i{
-    position: absolute;
-    color: #313030;
-    top: 1px;
-    right: 3px;
-    text-shadow: 0 -1px 0 rgba(0,0,0,.2);
+    width: calc(2% + 86px);
 }
  
 .line-schedule-table dl dt:nth-of-type(4), .line-schedule-table dl dd:nth-of-type(4) {
@@ -123,20 +114,20 @@
 }
  
 .line-schedule-table dl dt:nth-of-type(7), .line-schedule-table dl dd:nth-of-type(7) {
-    width: calc(10% + 10px);
+    width: 10%;
 }
  
 .line-schedule-table dl dt:nth-of-type(8), .line-schedule-table dl dd:nth-of-type(8) {
-    width: calc(51% - 233px);
+    width: calc(51% - 238px);
 }
  
 .line-schedule-table dl dt:nth-of-type(9), .line-schedule-table dl dd:nth-of-type(9) {
-    width: 65px;
+    width: 50px;
     border-right: 0;
 }
  
 .schedule-body {
-    height: calc(100% - 31px);
+    height: calc(100% - 37px);
     background: #fff;
 }
  
@@ -247,12 +238,8 @@
     height: 36px;
 }
  
-.schedule-body .ct_table dl:nth-child(even){
-    background: rgba(101, 204, 220, 0.13);
-}
-
 span.fcsj-diff {
-    /*color: gray;*/
+    color: gray;
     margin-left: 3px;
 }
  
@@ -260,14 +247,14 @@ span.fcsj-diff {
 /** 图例 */
  
 .tl-yzx {
-    background: rgb( 192,192,255);
-    border-top: 1px solid #d9d9d9 !important;
+    background: #c1ddf0;
+    border-top: 1px solid #ebebeb !important;
     color: #444;
 }
  
 .tl-xxfc{
-    background: rgb(0,255,255);
-    color: #484747;
+    background: #ff7878;
+    color: #f1f1f1;
 }
  
 .tl-wd{
@@ -276,18 +263,18 @@ span.fcsj-diff {
 }
  
 .tl-xxsd{
-    background: rgb(205,133,63);
-    /*color: #f5f4f4;*/
+    background: #e2de94;
+    color: #444;
 }
  
 .tl-xxrd{
-    background: rgb(255,99,71);
+    background: #c1ddf0;
     border-top: 1px solid #ebebeb !important;
-    /*color: #fff;*/
+    color: #444;
 }
  
 .tl-qrlb {
-    background: rgb( 128,128,0);
+    background: #7B6B24;
     color: #EAEBEC;
     font-size: 13px;
 }
@@ -297,9 +284,8 @@ span.fcsj-diff {
 }
  
 .tl-zzzx {
-    background: rgb(173,255,47);
+    background: #96F396;
     color: #444;
-    border-top: 1px solid #d9d9d9 !important;
 }
  
 .ct_table>.ct_table_body dl:hover dd.tl-yzx, .ct_table>.ct_table_body dl.context-menu-active dd.tl-yzx, .ct_table>.ct_table_body dl:hover dd.tl-zzzx, .ct_table>.ct_table_body dl.context-menu-active dd.tl-zzzx {
@@ -542,11 +528,12 @@ div.drop-rail[data-type=&quot;car&quot;]:before {
 }
  
 dl.relevance-active dd:nth-child(n+2) {
-    background: #d2d2d2 !important;
+    background: #f1efef !important;
+    color: #333;
 }
  
 dl.relevance-active.intimity dd:nth-child(n+2) {
-    background: #8baabf !important;
+    background: #76a6c7 !important;
     color: white;
 }
  
@@ -556,24 +543,13 @@ dl.relevance-active.intimity dd:nth-child(n+2) a {
  
 dl.relevance-active dd.tl-qrlb,
 dl.relevance-active.intimity dd.tl-qrlb{
-    background: linear-gradient(to right, #a9a911, #808000, #8baabf) !important;
+    background: linear-gradient(to right, #7B6B24, #4992c3) !important;
     color: #f8e9cd;
 }
  
-dl.relevance-active dd.tl-wd,
-dl.relevance-active.intimity dd.tl-wd{
-    background: linear-gradient(to right, #ffff00, rgb(226, 226, 168), rgb(139, 170, 191)) !important;
-}
-
-dl.relevance-active dd.tl-qrlb,
-dl.relevance-active.intimity dd.tl-yzx{
-    background: linear-gradient(to right, #dcdcfd, #c0c0ff, #8baabf) !important;
-    color: #272727;
-}
-
 dl.relevance-active dd.tl-zzzx,
 dl.relevance-active.intimity dd.tl-zzzx {
-    background: linear-gradient(to right, #def5bb, #adff2f, #8baabf) !important;
+    background: linear-gradient(to right, #96F396, #4992c3) !important;
     color: #565252;
 }
  
@@ -582,23 +558,8 @@ dl.relevance-active.intimity dd.tl-zzzx span.fcsj-diff {
     color: #5e5a5a
 }
  
-dl.relevance-active dd.tl-xxsd,
-dl.relevance-active.intimity dd.tl-xxsd {
-    background: linear-gradient(to right, #8baabf, #cd853f, #dc9958) !important;
-}
-
-dl.relevance-active dd.tl-xxrd,
-dl.relevance-active.intimity dd.tl-xxrd {
-    background: linear-gradient(to right, #8baabf, #ff6347, #ff8f7b) !important;
-}
-
-dl.relevance-active dd.tl-xxfc,
-dl.relevance-active.intimity dd.tl-xxfc {
-    background: linear-gradient(to right, #8baabf, rgb(43, 185, 185), rgb(0,255,255)) !important;
-}
-
 dl.relevance-active.intimity dd span.fcsj-diff {
-    color: #616060;
+    color: #d7d6d6;
 }
  
 dl.relevance-active dd span.fcsj-diff{
@@ -778,7 +739,6 @@ input.i-cbox[type=checkbox]{
 }
  
  
-
 .sch-tzrc-table dl dt:nth-of-type(1), .sch-tzrc-table dl dd:nth-of-type(1) {
     width: 25%;
 }