update...

潘钊
1 parent bbb477d1
Showing 4 changed files with 80 additions and 240 deletions
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/resources/static/real_control_v2/css/line_schedule.css
src/main/resources/static/real_control_v2/js/data/json/north_toolbar.json
src/main/resources/static/real_control_v2/js/north/toolbar.js
 package com.bsth.service.oil.impl;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.text.DecimalFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.transaction.Transactional;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.domain.Sort.Direction;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.stereotype.Service;
-
 import com.bsth.common.ResponseCode;
-import com.bsth.data.BasicData;
 import com.bsth.entity.oil.Cyl;
 import com.bsth.entity.oil.Ylb;
 import com.bsth.entity.oil.Ylxxb;
@@ -36,7 +11,22 @@ import com.bsth.repository.oil.YlxxbRepository;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.oil.YlbService;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
-import com.github.abel533.echarts.code.Y;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Sort.Direction;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.stereotype.Service;
+
+import javax.transaction.Transactional;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 @Service
 public class YlbServiceImpl extends BaseServiceImpl<Ylb,Integer> implements YlbService{
@@ -13,7 +13,6 @@
 .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 {
@@ -247,14 +246,14 @@ span.fcsj-diff {
 /** 图例 */
 .tl-yzx {
-    background: rgb( 192,192,255);
+    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{
@@ -263,18 +262,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;
 }
@@ -284,7 +283,7 @@ span.fcsj-diff {
 }
 .tl-zzzx {
-    background: rgb(173,255,47);
+    background: #96F396;
     color: #444;
 }
@@ -533,7 +532,7 @@ dl.relevance-active dd:nth-child(n+2) {
 }
 dl.relevance-active.intimity dd:nth-child(n+2) {
-    background: #8baabf !important;
+    background: #76a6c7 !important;
     color: white;
 }
@@ -543,24 +542,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;
 }
@@ -569,23 +557,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{
@@ -68,180 +68,54 @@
   {
     "id": 2,
     "text": "报表管理",
-    "clazz": "dropdown-column-2-lg",
-    "columns": true,
-    "cls_class": "uk-width-1-2",
-    "grid": [
-      [
-        {
-          "id": 2.1,
-          "text": "报表管理",
-          "header": 1
-        },
-        {
-          "id": 2.2,
-          "text": "月存油报表",
-          "event": "form_oilListMonth",
-          "icon": "uk-icon-table"
-        },
-        {
-          "id": 2.3,
-          "text": "时刻表分析",
-          "event": "form_scheduleAnaly",
-          "icon": "uk-icon-table"
-        },
-        {
-          "id": 2.4,
-          "text": "调度消息分析",
-          "event": "form_message",
-          "icon": "uk-icon-table"
-        },
-        {
-          "id": 2.5,
-          "text": "指令状态分析",
-          "event": "form_commandState",
-          "icon": "uk-icon-table"
-        },
-        {
-          "id": 2.6,
-          "text": "线路首末班查询",
-          "event": "form_firstAndLastBus",
-          "icon": "uk-icon-table"
-        },
-        {
-          "id": 2.7,
-          "text": "路单数据",
-          "event": "form_singledata",
-          "icon": "uk-icon-table"
-        },
-        {
-          "id": 2.8,
-          "text": "车辆加注",
-          "event": "form_vehicleloading",
-          "icon": "uk-icon-table"
-        },
-        {
-          "id": 2.9,
-          "text": "运营服务阶段报表",
-          "event": "form_operationservice",
-          "icon": "uk-icon-table"
-        },
-        {
-          "id": 3.0,
-          "text": "线路客流量报表",
-          "event": "form_linepassengerflow",
-          "icon": "uk-icon-table"
-        },
-        {
-          "id": 3.1,
-          "text": "换人换车情况统计表",
-          "event": "form_changetochange",
-          "icon": "uk-icon-table"
-        },
-        {
-          "id": 3.2,
-          "text": "营运线路出车率统计表",
-          "event": "form_turnoutrate",
-          "icon": "uk-icon-table"
-        },
-        {
-          "id": 3.3,
-          "text": "班次执行率统计表",
-          "event": "form_executionrate",
-          "icon": "uk-icon-table"
-        },
-        {
-          "id": 3.4,
-          "text": "营运线路名称统计表",
-          "event": "form_allline",
-          "icon": "uk-icon-table"
-        }
-      ],
-      [
-        {
-          "id": 4.1,
-          "text": "报表管理",
-          "header": 1
-        },
-        {
-          "id": 4.2,
-          "text": "行车路单",
-          "event": "form_waybill",
-          "icon": "uk-icon-table"
-        },
-        {
-          "id": 4.3,
-          "text": "调度历史消息",
-          "event": "form_history_message",
-          "icon": "uk-icon-table"
-        },
-        {
-          "id": 4.4,
-          "text": "驾驶员请求台账",
-          "event": "form_account",
-          "icon": "uk-icon-table"
-        },
-        {
-          "id": 4.5,
-          "text": "班次日报表",
-          "event": "form_daily",
-          "icon": "uk-icon-table"
-        },
-        {
-          "id": 4.6,
-          "text": "修正报表",
-          "event": "form_correctForm",
-          "icon": "uk-icon-table"
-        },
-        {
-          "id": 4.7,
-          "text": "统计日报",
-          "event": "form_statisticsDaily",
-          "icon": "uk-icon-table"
-        },
-        {
-          "id": 4.8,
-          "text": "调度日报",
-          "event": "form_scheduleDaily",
-          "icon": "uk-icon-table"
-        },
-        {
-          "id": 4.9,
-          "text": "行车路单日报表",
-          "event": "form_waybillday",
-          "icon": "uk-icon-table"
-        },
-        {
-          "id": 5.0,
-          "text": "班次到离站",
-          "event": "form_inoutstation",
-          "icon": "uk-icon-table"
-        },
-        {
-          "id": 5.1,
-          "text": "班次车辆人员日报表",
-          "event": "form_shifday",
-          "icon": "uk-icon-table"
-        },
-        {
-          "id": 5.2,
-          "text": "班次车辆人员月报表",
-          "event": "form_shiftuehiclemanth",
-          "icon": "uk-icon-table"
-        },
-        {
-          "id": 5.3,
-          "text": "营运服务日报表",
-          "event": "form_workDaily",
-          "icon": "uk-icon-table"
-        },
-        {
-          "id": 5.4,
-          "text": "计划车辆班次人员",
-          "event": "form_peopleCarPlan",
-          "icon": "uk-icon-table"
-        }
-      ]
+    "children": [
+      {
+        "id": 4.2,
+        "text": "行车路单",
+        "event": "form_waybill",
+        "icon": "uk-icon-table"
+      },
+      {
+        "id": 4.3,
+        "text": "调度历史消息",
+        "event": "form_history_message",
+        "icon": "uk-icon-table"
+      },
+      {
+        "id": 4.4,
+        "text": "驾驶员请求台账",
+        "event": "form_account",
+        "icon": "uk-icon-table"
+      },
+      {
+        "id": 4.5,
+        "text": "班次日报表",
+        "event": "form_daily",
+        "icon": "uk-icon-table"
+      },
+      {
+        "id": 4.6,
+        "text": "修正报表",
+        "event": "form_correctForm",
+        "icon": "uk-icon-table"
+      },
+      {
+        "id": 4.7,
+        "text": "统计日报",
+        "event": "form_statisticsDaily",
+        "icon": "uk-icon-table"
+      },
+      {
+        "id": 4.8,
+        "text": "调度日报",
+        "event": "form_scheduleDaily",
+        "icon": "uk-icon-table"
+      },
+      {
+        "id": 4.9,
+        "text": "调度工作日报表",
+        "event": "form_schedule_daily_qp"
+      }
     ]
   },
   {
@@ -179,6 +179,9 @@ var gb_northToolbar = (function () {
         },
         curr_date_schedule: function () {
             open_modal('/real_control_v2/fragments/north/nav/curr_date_schedule.html', {}, modal_opts);
+        },
+        form_schedule_daily_qp: function () {
+            gb_embed_form_hanlde.open_modal_form_fragment('/pages/forms/statement/scheduleDailyQp.html', '调度工作日报表');
         }
     };