1、修改调度执勤日报，添加自编号字段，并移动到路牌后面，颜色区分进出场班次类型

徐烜
1 parent 1c2df4a3
Showing 5 changed files with 211 additions and 111 deletions
src/main/resources/datatools/ktrs/planWithScheduleTypeOutput.ktr
src/main/resources/datatools/ktrs/planWithScheduleTypeOutputMetaData.ktr
src/main/resources/static/pages/scheduleApp/module/common/dts2/scheduleplan/saPlanInfoViewTemplate.html
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/report/ext/list.html
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/report/ext/module.js
@@ -860,90 +860,6 @@
     </step>
   <step>
-    <name>&#x6392;&#x73ed;&#x660e;&#x7ec6;&#x8f93;&#x5165;</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-         <partitioning>
-           <method>none</method>
-           <schema_name/>
-           </partitioning>
-    <connection>control_jndi</connection>
-    <sql>select &#x2a;&#xa;from bsth_c_s_sp_info&#xa;where xl &#x3d; &#x24;&#x7b;xlid&#x7d;&#xa;and date_format&#x28;schedule_date, &#x27;&#x25;Y-&#x25;m-&#x25;d&#x27;&#x29; &#x3d; &#x27;&#x24;&#x7b;sdate&#x7d;&#x27;</sql>
-    <limit>0</limit>
-    <lookup/>
-    <execute_each_row>N</execute_each_row>
-    <variables_active>Y</variables_active>
-    <lazy_conversion_active>N</lazy_conversion_active>
-     <cluster_schema/>
- <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>121</xloc>
-      <yloc>134</yloc>
-      <draw>Y</draw>
-      </GUI>
-    </step>
-
-  <step>
-    <name>&#x6392;&#x5e8f;&#x8bb0;&#x5f55;</name>
-    <type>SortRows</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-         <partitioning>
-           <method>none</method>
-           <schema_name/>
-           </partitioning>
-      <directory>&#x25;&#x25;java.io.tmpdir&#x25;&#x25;</directory>
-      <prefix>out</prefix>
-      <sort_size>1000000</sort_size>
-      <free_memory/>
-      <compress>N</compress>
-      <compress_variable/>
-      <unique_rows>N</unique_rows>
-    <fields>
-      <field>
-        <name>lp</name>
-        <ascending>Y</ascending>
-        <case_sensitive>N</case_sensitive>
-        <presorted>N</presorted>
-      </field>
-      <field>
-        <name>j</name>
-        <ascending>Y</ascending>
-        <case_sensitive>N</case_sensitive>
-        <presorted>N</presorted>
-      </field>
-      <field>
-        <name>j_name</name>
-        <ascending>Y</ascending>
-        <case_sensitive>N</case_sensitive>
-        <presorted>N</presorted>
-      </field>
-      <field>
-        <name>car_plate</name>
-        <ascending>Y</ascending>
-        <case_sensitive>N</case_sensitive>
-        <presorted>N</presorted>
-      </field>
-      <field>
-        <name>fcno</name>
-        <ascending>Y</ascending>
-        <case_sensitive>N</case_sensitive>
-        <presorted>N</presorted>
-      </field>
-    </fields>
-     <cluster_schema/>
- <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>355</xloc>
-      <yloc>130</yloc>
-      <draw>Y</draw>
-      </GUI>
-    </step>
-
-  <step>
     <name>&#x5217;&#x8f6c;&#x884c;</name>
     <type>Denormaliser</type>
     <description/>
@@ -966,6 +882,9 @@
           <name>j_name</name>
           </field>
         <field>
+          <name>cl_zbh</name>
+          </field>
+        <field>
           <name>car_plate</name>
           </field>
         </group>
@@ -1096,6 +1015,10 @@
         <rename>&#x9a7e;&#x9a76;&#x5458;</rename>
         <length>-2</length>
         <precision>-2</precision>
+      </field>      <field>        <name>cl_zbh</name>
+        <rename>&#x81ea;&#x7f16;&#x53f7;</rename>
+        <length>-2</length>
+        <precision>-2</precision>
       </field>      <field>        <name>car_plate</name>
         <rename>&#x8f66;&#x724c;&#x53f7;</rename>
         <length>-2</length>
@@ -1110,6 +1033,96 @@
     </step>
   <step>
+    <name>&#x6392;&#x5e8f;&#x8bb0;&#x5f55;</name>
+    <type>SortRows</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+      <directory>&#x25;&#x25;java.io.tmpdir&#x25;&#x25;</directory>
+      <prefix>out</prefix>
+      <sort_size>1000000</sort_size>
+      <free_memory/>
+      <compress>N</compress>
+      <compress_variable/>
+      <unique_rows>N</unique_rows>
+    <fields>
+      <field>
+        <name>lp</name>
+        <ascending>Y</ascending>
+        <case_sensitive>N</case_sensitive>
+        <presorted>N</presorted>
+      </field>
+      <field>
+        <name>j</name>
+        <ascending>Y</ascending>
+        <case_sensitive>N</case_sensitive>
+        <presorted>N</presorted>
+      </field>
+      <field>
+        <name>j_name</name>
+        <ascending>Y</ascending>
+        <case_sensitive>N</case_sensitive>
+        <presorted>N</presorted>
+      </field>
+      <field>
+        <name>cl_zbh</name>
+        <ascending>Y</ascending>
+        <case_sensitive>N</case_sensitive>
+        <presorted>N</presorted>
+      </field>
+      <field>
+        <name>car_plate</name>
+        <ascending>Y</ascending>
+        <case_sensitive>N</case_sensitive>
+        <presorted>N</presorted>
+      </field>
+      <field>
+        <name>fcno</name>
+        <ascending>Y</ascending>
+        <case_sensitive>N</case_sensitive>
+        <presorted>N</presorted>
+      </field>
+    </fields>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>355</xloc>
+      <yloc>130</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x6392;&#x73ed;&#x660e;&#x7ec6;&#x8f93;&#x5165;</name>
+    <type>TableInput</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <connection>control_jndi</connection>
+    <sql>select &#x2a;&#xa;from bsth_c_s_sp_info&#xa;where xl &#x3d; &#x24;&#x7b;xlid&#x7d;&#xa;and date_format&#x28;schedule_date, &#x27;&#x25;Y-&#x25;m-&#x25;d&#x27;&#x29; &#x3d; &#x27;&#x24;&#x7b;sdate&#x7d;&#x27;</sql>
+    <limit>0</limit>
+    <lookup/>
+    <execute_each_row>N</execute_each_row>
+    <variables_active>Y</variables_active>
+    <lazy_conversion_active>N</lazy_conversion_active>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>121</xloc>
+      <yloc>134</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
     <name>&#x8f66;&#x724c;&#x53f7;&#x67e5;&#x8be2;</name>
     <type>DBLookup</type>
     <description/>
@@ -810,7 +810,7 @@
   <hop> <from>&#x8ba1;&#x7b97;&#x7ad9;&#x70b9;&#x540d;</from><to>&#x8ba1;&#x7b97;excel&#x73ed;&#x6b21;&#x7ad9;&#x540d;&#x8f93;&#x51fa;&#x5143;&#x6570;&#x636e;</to><enabled>Y</enabled> </hop>
   <hop> <from>&#x8ba1;&#x7b97;excel&#x73ed;&#x6b21;&#x7ad9;&#x540d;&#x8f93;&#x51fa;&#x5143;&#x6570;&#x636e;</from><to>&#x5b57;&#x6bb5;&#x9009;&#x62e9;</to><enabled>Y</enabled> </hop>
   <hop> <from>&#x5b57;&#x6bb5;&#x9009;&#x62e9;</from><to>&#x6392;&#x5e8f;&#x8bb0;&#x5f55;</to><enabled>Y</enabled> </hop>
-  <hop> <from>&#x751f;&#x6210;excel&#x8def;&#x724c;,&#x9a7e;&#x9a76;&#x5458;,&#x8f66;&#x724c;&#x53f7;&#x8f93;&#x51fa;&#x5143;&#x6570;&#x636e;</from><to>&#x6392;&#x5e8f;&#x8bb0;&#x5f55;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x751f;&#x6210;excel&#x8def;&#x724c;,&#x9a7e;&#x9a76;&#x5458;,&#x81ea;&#x7f16;&#x53f7;,&#x8f66;&#x724c;&#x53f7;&#x8f93;&#x51fa;&#x5143;&#x6570;&#x636e;</from><to>&#x6392;&#x5e8f;&#x8bb0;&#x5f55;</to><enabled>Y</enabled> </hop>
   <hop> <from>&#x6392;&#x5e8f;&#x8bb0;&#x5f55;</from><to>ETL&#x5143;&#x6570;&#x636e;&#x6ce8;&#x5165;</to><enabled>Y</enabled> </hop>
   <hop> <from>&#x8ba1;&#x7b97;&#x7ad9;&#x70b9;&#x540d;</from><to>&#x8ba1;&#x7b97;&#x884c;&#x8f6c;&#x5217;&#x5143;&#x6570;&#x636e;</to><enabled>Y</enabled> </hop>
   <hop> <from>&#x8ba1;&#x7b97;&#x884c;&#x8f6c;&#x5217;&#x5143;&#x6570;&#x636e;</from><to>ETL&#x5143;&#x6570;&#x636e;&#x6ce8;&#x5165;</to><enabled>Y</enabled> </hop>
@@ -967,7 +967,7 @@
     </step>
   <step>
-    <name>&#x751f;&#x6210;excel&#x8def;&#x724c;,&#x9a7e;&#x9a76;&#x5458;,&#x8f66;&#x724c;&#x53f7;&#x8f93;&#x51fa;&#x5143;&#x6570;&#x636e;</name>
+    <name>&#x751f;&#x6210;excel&#x8def;&#x724c;,&#x9a7e;&#x9a76;&#x5458;,&#x81ea;&#x7f16;&#x53f7;,&#x8f66;&#x724c;&#x53f7;&#x8f93;&#x51fa;&#x5143;&#x6570;&#x636e;</name>
     <type>DataGrid</type>
     <description/>
     <distribute>Y</distribute>
@@ -1013,9 +1013,10 @@
       </field>
     </fields>
     <data>
-      <line> <item>&#x8def;&#x724c;</item><item>String</item><item>0</item> </line>
-      <line> <item>&#x9a7e;&#x9a76;&#x5458;</item><item>String</item><item>1000</item> </line>
-      <line> <item>&#x8f66;&#x724c;&#x53f7;</item><item>String</item><item>1001</item> </line>
+      <line> <item>&#x8def;&#x724c;</item><item>String</item><item>-3</item> </line>
+      <line> <item>&#x9a7e;&#x9a76;&#x5458;</item><item>String</item><item>-2</item> </line>
+      <line> <item>&#x81ea;&#x7f16;&#x53f7;</item><item>String</item><item>-1</item> </line>
+      <line> <item>&#x8f66;&#x724c;&#x53f7;</item><item>String</item><item>0</item> </line>
     </data>
      <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
@@ -103,15 +103,31 @@
         width: 50px;
         text-align: center;
     }
-    .tt_table dl dt:nth-last-child(1), .tt_table dl dd:nth-last-child(1) {
-        width: 130px;
+
+    .tt_table dl dt:nth-of-type(3), .tt_table dl dd:nth-of-type(3) {
+        width: 80px;
+        text-align: center;
+    }
+    .tt_table dl dt:nth-of-type(4), .tt_table dl dd:nth-of-type(4) {
+        width: 80px;
         text-align: center;
     }
-    .tt_table dl dt:nth-last-child(2), .tt_table dl dd:nth-last-child(2) {
-        width: 130px;
+    .tt_table dl dt:nth-of-type(5), .tt_table dl dd:nth-of-type(5) {
+        width: 100px;
         text-align: center;
     }
+
+
+    /*.tt_table dl dt:nth-last-child(2), .tt_table dl dd:nth-last-child(2) {*/
+        /*width: 130px;*/
+        /*text-align: center;*/
+    /*}*/
+    /*.tt_table dl dt:nth-last-child(3), .tt_table dl dd:nth-last-child(1) {*/
+        /*width: 130px;*/
+        /*text-align: center;*/
+    /*}*/
+
 </style>
 <style>
@@ -233,6 +249,17 @@
         color: #501a1a;
     }
+    .tt_table dd.outbc {
+        background: #337ab7 !important;
+        color: white;
+    }
+
+    .tt_table dd.inbc {
+        background: #4e6477 !important;
+        color: white;
+    }
+
+
     .tt_table_no_border .tt_table>.tt_table_head dl dt {
         font-weight: 600;
         font-size: 13px;
@@ -295,16 +322,21 @@
         width: 55px;
         text-align: center;
     }
-    /*!** 班型1 *!*/
-    /*.tt_table_head dl dt:nth-of-type(3) {*/
-    /*width: 60px;*/
-    /*text-align: center;*/
-    /*}*/
-    /*!** 班型2 *!*/
-    /*.tt_table_head dl dt:nth-of-type(4) {*/
-    /*width: 60px;*/
-    /*text-align: center;*/
-    /*}*/
+    /** 驾驶员 */
+    .tt_table_head dl dt:nth-of-type(3) {
+        width: 80px;
+        text-align: center;
+    }
+    /** 自编号 */
+    .tt_table_head dl dt:nth-of-type(4) {
+        width: 80px;
+        text-align: center;
+    }
+    /** 车牌号 */
+    .tt_table_head dl dt:nth-of-type(5) {
+        width: 100px;
+        text-align: center;
+    }
 </style>
@@ -324,14 +356,26 @@
                                     <div class="tt_table_head" style="z-index: 120; top: 0;">
                                         <dl style="height: 36px; border-bottom: 2px solid #96b9d7;">
-                                            <dt style="width: 50px; text-align: center;">
+                                            <dt>
                                                 序号
                                             </dt>
-                                            <dt style="width: 55px; border-right: 2px solid #96b9d7;">
+                                            <dt>
                                                 路牌
                                             </dt>
+                                            <dt>
+                                                驾驶员
+                                            </dt>
+
+                                            <dt>
+                                                自编号
+                                            </dt>
+
+                                            <dt style="border-right: 2px solid #96b9d7;">
+                                                车牌号
+                                            </dt>
+
                                         </dl>
                                     </div>
@@ -343,7 +387,7 @@
                                             </dt>
                                             <dt ng-repeat="head in $saPlanInfoViewCtrl.ds.header track by $index">
-                                                {{(head != '路牌' && head != '驾驶员' && head != '车牌号') ? (head.substr(0, 1) + ($index)): head}}
+                                                {{(head != '路牌' && head != '驾驶员' && head != '自编号' && head != '车牌号') ? (head.substr(0, 1) + ($index)): head}}
                                             </dt>
                                         </dl>
                                     </div>
@@ -352,13 +396,19 @@
                                         <dl ng-repeat="info in $saPlanInfoViewCtrl.ds.contents track by $index"
                                             ng-init="rowIndex = $index">
-                                            <dd style="width: 50px;">
+                                            <dd>
                                                 {{rowIndex + 1}}
                                             </dd>
                                             <dd ng-repeat="cell in info track by $index"
                                                 ng-init="colIndex = $index"
-                                                ng-if="$index == 0" style="width: 55px; border-right: 2px solid #96b9d7;">
+                                                ng-if="$index <= 2" >
+                                                {{cell.fcsj}}
+                                            </dd>
+
+                                            <dd ng-repeat="cell in info track by $index"
+                                                ng-init="colIndex = $index"
+                                                ng-if="$index == 3" style="border-right: 2px solid #96b9d7;">
                                                 {{cell.fcsj}}
                                             </dd>
@@ -376,17 +426,28 @@
                                             <dd>
                                                 路牌
                                             </dd>
+                                            <dd>
+                                                驾驶员
+                                            </dd>
+                                            <dd>
+                                                自编号
+                                            </dd>
+                                            <dd>
+                                                车牌号
+                                            </dd>
                                             <dd ng-repeat="cell in info track by $index"
                                                 ng-init="colIndex = $index"
-                                                ng-if="$index > 0"
+                                                ng-if="$index > 3"
                                                 ng-class="{
                                                     lpName: true,
                                                     error: false,
                                                     active: false,
                                                     ists: false,
                                                     region: false,
-                                                    isfb: false
+                                                    isfb: false,
+                                                    outbc: cell.bc_type == 'out',
+                                                    inbc: cell.bc_type == 'in'
                                                     }">
                                                 {{cell.fcsj}}
                                             </dd>
@@ -25,6 +25,13 @@
     </div>
     <div ng-if="ctrl.viewId == 1" style="height: {{ctrl.ttHeight}}px;">
+        <div style="padding-bottom: 10px; height: 20px;">
+            <div style="float: right;">
+                <span style="padding-right: 10px;background: #337ab7;color: white;text-align: center;">出场班次</span>
+                <span style="padding-right: 10px;background: #4e6477;color: white;text-align: center;">进场班次</span>
+            </div>
+        </div>
+
         <sa-Planinfoview name="saPlanView" ng-model="ctrl.saPlanInfoViewData.infos" ng-model-options="{ getterSetter: true }" >
         </sa-Planinfoview>
     </div>
@@ -298,7 +298,25 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                         service.getSaPlanInfoViewData().then(
                             function(rst) {
                                 self.saPlanInfoViewData.infos = rst;
-                                console.log(rst);
+
+                                /*
+                                    注意：后台是没有传过来班次类型，这里通过head来判定是否进出场班次
+                                    TODO：如果以后要标识新的班次类型，甚至要修改班次内容，后台可能要大改（可能要改回时刻表编辑的做法）
+                                    TODO：注意，调度执勤日报时刻表视图后台etl用的是导出的etl，所以要加复杂功能的话可能还得拆成2个etl
+                                 */
+                                var _headers = rst.header;
+                                for (var i = 0; i < rst.contents.length; i++) {
+                                    for (var j = 0; j < rst.contents[i].length; j++) {
+                                        if (_headers[j].indexOf("出场") >= 0) {
+                                            self.saPlanInfoViewData.infos.contents[i][j].bc_type = "out";
+                                        }
+                                        if (_headers[j].indexOf("进场") >= 0) {
+                                            self.saPlanInfoViewData.infos.contents[i][j].bc_type = "in";
+                                        }
+                                    }
+                                }
+
+                                console.log(self.saPlanInfoViewData.infos);
                             },
                             function(err) {