潘钊 / bsth_control · Commits

Commit a5753f0b8efd38c4ad633fd2a769673ee32ba515

Authored by 徐烜
1 parent 1c2df4a3
build: skipped

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

Inline Side-by-side
Showing 5 changed files with 211 additions and 111 deletions
src/main/resources/datatools/ktrs/planWithScheduleTypeOutput.ktr
  View file @a5753f0
... ... @@ -860,90 +860,6 @@
860 860 </step>
861 861  
862 862 <step>
863   - <name>&#x6392;&#x73ed;&#x660e;&#x7ec6;&#x8f93;&#x5165;</name>
864   - <type>TableInput</type>
865   - <description/>
866   - <distribute>Y</distribute>
867   - <custom_distribution/>
868   - <copies>1</copies>
869   - <partitioning>
870   - <method>none</method>
871   - <schema_name/>
872   - </partitioning>
873   - <connection>control_jndi</connection>
874   - <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>
875   - <limit>0</limit>
876   - <lookup/>
877   - <execute_each_row>N</execute_each_row>
878   - <variables_active>Y</variables_active>
879   - <lazy_conversion_active>N</lazy_conversion_active>
880   - <cluster_schema/>
881   - <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI>
882   - <xloc>121</xloc>
883   - <yloc>134</yloc>
884   - <draw>Y</draw>
885   - </GUI>
886   - </step>
887   -
888   - <step>
889   - <name>&#x6392;&#x5e8f;&#x8bb0;&#x5f55;</name>
890   - <type>SortRows</type>
891   - <description/>
892   - <distribute>Y</distribute>
893   - <custom_distribution/>
894   - <copies>1</copies>
895   - <partitioning>
896   - <method>none</method>
897   - <schema_name/>
898   - </partitioning>
899   - <directory>&#x25;&#x25;java.io.tmpdir&#x25;&#x25;</directory>
900   - <prefix>out</prefix>
901   - <sort_size>1000000</sort_size>
902   - <free_memory/>
903   - <compress>N</compress>
904   - <compress_variable/>
905   - <unique_rows>N</unique_rows>
906   - <fields>
907   - <field>
908   - <name>lp</name>
909   - <ascending>Y</ascending>
910   - <case_sensitive>N</case_sensitive>
911   - <presorted>N</presorted>
912   - </field>
913   - <field>
914   - <name>j</name>
915   - <ascending>Y</ascending>
916   - <case_sensitive>N</case_sensitive>
917   - <presorted>N</presorted>
918   - </field>
919   - <field>
920   - <name>j_name</name>
921   - <ascending>Y</ascending>
922   - <case_sensitive>N</case_sensitive>
923   - <presorted>N</presorted>
924   - </field>
925   - <field>
926   - <name>car_plate</name>
927   - <ascending>Y</ascending>
928   - <case_sensitive>N</case_sensitive>
929   - <presorted>N</presorted>
930   - </field>
931   - <field>
932   - <name>fcno</name>
933   - <ascending>Y</ascending>
934   - <case_sensitive>N</case_sensitive>
935   - <presorted>N</presorted>
936   - </field>
937   - </fields>
938   - <cluster_schema/>
939   - <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI>
940   - <xloc>355</xloc>
941   - <yloc>130</yloc>
942   - <draw>Y</draw>
943   - </GUI>
944   - </step>
945   -
946   - <step>
947 863 <name>&#x5217;&#x8f6c;&#x884c;</name>
948 864 <type>Denormaliser</type>
949 865 <description/>
... ... @@ -966,6 +882,9 @@
966 882 <name>j_name</name>
967 883 </field>
968 884 <field>
  885 + <name>cl_zbh</name>
  886 + </field>
  887 + <field>
969 888 <name>car_plate</name>
970 889 </field>
971 890 </group>
... ... @@ -1096,6 +1015,10 @@
1096 1015 <rename>&#x9a7e;&#x9a76;&#x5458;</rename>
1097 1016 <length>-2</length>
1098 1017 <precision>-2</precision>
  1018 + </field> <field> <name>cl_zbh</name>
  1019 + <rename>&#x81ea;&#x7f16;&#x53f7;</rename>
  1020 + <length>-2</length>
  1021 + <precision>-2</precision>
1099 1022 </field> <field> <name>car_plate</name>
1100 1023 <rename>&#x8f66;&#x724c;&#x53f7;</rename>
1101 1024 <length>-2</length>
... ... @@ -1110,6 +1033,96 @@
1110 1033 </step>
1111 1034  
1112 1035 <step>
  1036 + <name>&#x6392;&#x5e8f;&#x8bb0;&#x5f55;</name>
  1037 + <type>SortRows</type>
  1038 + <description/>
  1039 + <distribute>Y</distribute>
  1040 + <custom_distribution/>
  1041 + <copies>1</copies>
  1042 + <partitioning>
  1043 + <method>none</method>
  1044 + <schema_name/>
  1045 + </partitioning>
  1046 + <directory>&#x25;&#x25;java.io.tmpdir&#x25;&#x25;</directory>
  1047 + <prefix>out</prefix>
  1048 + <sort_size>1000000</sort_size>
  1049 + <free_memory/>
  1050 + <compress>N</compress>
  1051 + <compress_variable/>
  1052 + <unique_rows>N</unique_rows>
  1053 + <fields>
  1054 + <field>
  1055 + <name>lp</name>
  1056 + <ascending>Y</ascending>
  1057 + <case_sensitive>N</case_sensitive>
  1058 + <presorted>N</presorted>
  1059 + </field>
  1060 + <field>
  1061 + <name>j</name>
  1062 + <ascending>Y</ascending>
  1063 + <case_sensitive>N</case_sensitive>
  1064 + <presorted>N</presorted>
  1065 + </field>
  1066 + <field>
  1067 + <name>j_name</name>
  1068 + <ascending>Y</ascending>
  1069 + <case_sensitive>N</case_sensitive>
  1070 + <presorted>N</presorted>
  1071 + </field>
  1072 + <field>
  1073 + <name>cl_zbh</name>
  1074 + <ascending>Y</ascending>
  1075 + <case_sensitive>N</case_sensitive>
  1076 + <presorted>N</presorted>
  1077 + </field>
  1078 + <field>
  1079 + <name>car_plate</name>
  1080 + <ascending>Y</ascending>
  1081 + <case_sensitive>N</case_sensitive>
  1082 + <presorted>N</presorted>
  1083 + </field>
  1084 + <field>
  1085 + <name>fcno</name>
  1086 + <ascending>Y</ascending>
  1087 + <case_sensitive>N</case_sensitive>
  1088 + <presorted>N</presorted>
  1089 + </field>
  1090 + </fields>
  1091 + <cluster_schema/>
  1092 + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI>
  1093 + <xloc>355</xloc>
  1094 + <yloc>130</yloc>
  1095 + <draw>Y</draw>
  1096 + </GUI>
  1097 + </step>
  1098 +
  1099 + <step>
  1100 + <name>&#x6392;&#x73ed;&#x660e;&#x7ec6;&#x8f93;&#x5165;</name>
  1101 + <type>TableInput</type>
  1102 + <description/>
  1103 + <distribute>Y</distribute>
  1104 + <custom_distribution/>
  1105 + <copies>1</copies>
  1106 + <partitioning>
  1107 + <method>none</method>
  1108 + <schema_name/>
  1109 + </partitioning>
  1110 + <connection>control_jndi</connection>
  1111 + <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>
  1112 + <limit>0</limit>
  1113 + <lookup/>
  1114 + <execute_each_row>N</execute_each_row>
  1115 + <variables_active>Y</variables_active>
  1116 + <lazy_conversion_active>N</lazy_conversion_active>
  1117 + <cluster_schema/>
  1118 + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI>
  1119 + <xloc>121</xloc>
  1120 + <yloc>134</yloc>
  1121 + <draw>Y</draw>
  1122 + </GUI>
  1123 + </step>
  1124 +
  1125 + <step>
1113 1126 <name>&#x8f66;&#x724c;&#x53f7;&#x67e5;&#x8be2;</name>
1114 1127 <type>DBLookup</type>
1115 1128 <description/>
... ...
src/main/resources/datatools/ktrs/planWithScheduleTypeOutputMetaData.ktr
  View file @a5753f0
... ... @@ -810,7 +810,7 @@
810 810 <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>
811 811 <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>
812 812 <hop> <from>&#x5b57;&#x6bb5;&#x9009;&#x62e9;</from><to>&#x6392;&#x5e8f;&#x8bb0;&#x5f55;</to><enabled>Y</enabled> </hop>
813   - <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>
  813 + <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>
814 814 <hop> <from>&#x6392;&#x5e8f;&#x8bb0;&#x5f55;</from><to>ETL&#x5143;&#x6570;&#x636e;&#x6ce8;&#x5165;</to><enabled>Y</enabled> </hop>
815 815 <hop> <from>&#x8ba1;&#x7b97;&#x7ad9;&#x70b9;&#x540d;</from><to>&#x8ba1;&#x7b97;&#x884c;&#x8f6c;&#x5217;&#x5143;&#x6570;&#x636e;</to><enabled>Y</enabled> </hop>
816 816 <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 @@
967 967 </step>
968 968  
969 969 <step>
970   - <name>&#x751f;&#x6210;excel&#x8def;&#x724c;,&#x9a7e;&#x9a76;&#x5458;,&#x8f66;&#x724c;&#x53f7;&#x8f93;&#x51fa;&#x5143;&#x6570;&#x636e;</name>
  970 + <name>&#x751f;&#x6210;excel&#x8def;&#x724c;,&#x9a7e;&#x9a76;&#x5458;,&#x81ea;&#x7f16;&#x53f7;,&#x8f66;&#x724c;&#x53f7;&#x8f93;&#x51fa;&#x5143;&#x6570;&#x636e;</name>
971 971 <type>DataGrid</type>
972 972 <description/>
973 973 <distribute>Y</distribute>
... ... @@ -1013,9 +1013,10 @@
1013 1013 </field>
1014 1014 </fields>
1015 1015 <data>
1016   - <line> <item>&#x8def;&#x724c;</item><item>String</item><item>0</item> </line>
1017   - <line> <item>&#x9a7e;&#x9a76;&#x5458;</item><item>String</item><item>1000</item> </line>
1018   - <line> <item>&#x8f66;&#x724c;&#x53f7;</item><item>String</item><item>1001</item> </line>
  1016 + <line> <item>&#x8def;&#x724c;</item><item>String</item><item>-3</item> </line>
  1017 + <line> <item>&#x9a7e;&#x9a76;&#x5458;</item><item>String</item><item>-2</item> </line>
  1018 + <line> <item>&#x81ea;&#x7f16;&#x53f7;</item><item>String</item><item>-1</item> </line>
  1019 + <line> <item>&#x8f66;&#x724c;&#x53f7;</item><item>String</item><item>0</item> </line>
1019 1020 </data>
1020 1021 <cluster_schema/>
1021 1022 <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI>
... ...
src/main/resources/static/pages/scheduleApp/module/common/dts2/scheduleplan/saPlanInfoViewTemplate.html
  View file @a5753f0
... ... @@ -103,15 +103,31 @@
103 103 width: 50px;
104 104 text-align: center;
105 105 }
106   - .tt_table dl dt:nth-last-child(1), .tt_table dl dd:nth-last-child(1) {
107   - width: 130px;
  106 +
  107 + .tt_table dl dt:nth-of-type(3), .tt_table dl dd:nth-of-type(3) {
  108 + width: 80px;
  109 + text-align: center;
  110 + }
  111 + .tt_table dl dt:nth-of-type(4), .tt_table dl dd:nth-of-type(4) {
  112 + width: 80px;
108 113 text-align: center;
109 114 }
110   - .tt_table dl dt:nth-last-child(2), .tt_table dl dd:nth-last-child(2) {
111   - width: 130px;
  115 + .tt_table dl dt:nth-of-type(5), .tt_table dl dd:nth-of-type(5) {
  116 + width: 100px;
112 117 text-align: center;
113 118 }
114 119  
  120 +
  121 +
  122 + /*.tt_table dl dt:nth-last-child(2), .tt_table dl dd:nth-last-child(2) {*/
  123 + /*width: 130px;*/
  124 + /*text-align: center;*/
  125 + /*}*/
  126 + /*.tt_table dl dt:nth-last-child(3), .tt_table dl dd:nth-last-child(1) {*/
  127 + /*width: 130px;*/
  128 + /*text-align: center;*/
  129 + /*}*/
  130 +
115 131 </style>
116 132  
117 133 <style>
... ... @@ -233,6 +249,17 @@
233 249 color: #501a1a;
234 250 }
235 251  
  252 + .tt_table dd.outbc {
  253 + background: #337ab7 !important;
  254 + color: white;
  255 + }
  256 +
  257 + .tt_table dd.inbc {
  258 + background: #4e6477 !important;
  259 + color: white;
  260 + }
  261 +
  262 +
236 263 .tt_table_no_border .tt_table>.tt_table_head dl dt {
237 264 font-weight: 600;
238 265 font-size: 13px;
... ... @@ -295,16 +322,21 @@
295 322 width: 55px;
296 323 text-align: center;
297 324 }
298   - /*!** 班型1 *!*/
299   - /*.tt_table_head dl dt:nth-of-type(3) {*/
300   - /*width: 60px;*/
301   - /*text-align: center;*/
302   - /*}*/
303   - /*!** 班型2 *!*/
304   - /*.tt_table_head dl dt:nth-of-type(4) {*/
305   - /*width: 60px;*/
306   - /*text-align: center;*/
307   - /*}*/
  325 + /** 驾驶员 */
  326 + .tt_table_head dl dt:nth-of-type(3) {
  327 + width: 80px;
  328 + text-align: center;
  329 + }
  330 + /** 自编号 */
  331 + .tt_table_head dl dt:nth-of-type(4) {
  332 + width: 80px;
  333 + text-align: center;
  334 + }
  335 + /** 车牌号 */
  336 + .tt_table_head dl dt:nth-of-type(5) {
  337 + width: 100px;
  338 + text-align: center;
  339 + }
308 340 </style>
309 341  
310 342  
... ... @@ -324,14 +356,26 @@
324 356  
325 357 <div class="tt_table_head" style="z-index: 120; top: 0;">
326 358 <dl style="height: 36px; border-bottom: 2px solid #96b9d7;">
327   - <dt style="width: 50px; text-align: center;">
  359 + <dt>
328 360 序号
329 361 </dt>
330 362  
331   - <dt style="width: 55px; border-right: 2px solid #96b9d7;">
  363 + <dt>
332 364 路牌
333 365 </dt>
334 366  
  367 + <dt>
  368 + 驾驶员
  369 + </dt>
  370 +
  371 + <dt>
  372 + 自编号
  373 + </dt>
  374 +
  375 + <dt style="border-right: 2px solid #96b9d7;">
  376 + 车牌号
  377 + </dt>
  378 +
335 379 </dl>
336 380 </div>
337 381  
... ... @@ -343,7 +387,7 @@
343 387 </dt>
344 388  
345 389 <dt ng-repeat="head in $saPlanInfoViewCtrl.ds.header track by $index">
346   - {{(head != '路牌' && head != '驾驶员' && head != '车牌号') ? (head.substr(0, 1) + ($index)): head}}
  390 + {{(head != '路牌' && head != '驾驶员' && head != '自编号' && head != '车牌号') ? (head.substr(0, 1) + ($index)): head}}
347 391 </dt>
348 392 </dl>
349 393 </div>
... ... @@ -352,13 +396,19 @@
352 396 <dl ng-repeat="info in $saPlanInfoViewCtrl.ds.contents track by $index"
353 397 ng-init="rowIndex = $index">
354 398  
355   - <dd style="width: 50px;">
  399 + <dd>
356 400 {{rowIndex + 1}}
357 401 </dd>
358 402  
359 403 <dd ng-repeat="cell in info track by $index"
360 404 ng-init="colIndex = $index"
361   - ng-if="$index == 0" style="width: 55px; border-right: 2px solid #96b9d7;">
  405 + ng-if="$index <= 2" >
  406 + {{cell.fcsj}}
  407 + </dd>
  408 +
  409 + <dd ng-repeat="cell in info track by $index"
  410 + ng-init="colIndex = $index"
  411 + ng-if="$index == 3" style="border-right: 2px solid #96b9d7;">
362 412 {{cell.fcsj}}
363 413 </dd>
364 414  
... ... @@ -376,17 +426,28 @@
376 426 <dd>
377 427 路牌
378 428 </dd>
  429 + <dd>
  430 + 驾驶员
  431 + </dd>
  432 + <dd>
  433 + 自编号
  434 + </dd>
  435 + <dd>
  436 + 车牌号
  437 + </dd>
379 438  
380 439 <dd ng-repeat="cell in info track by $index"
381 440 ng-init="colIndex = $index"
382   - ng-if="$index > 0"
  441 + ng-if="$index > 3"
383 442 ng-class="{
384 443 lpName: true,
385 444 error: false,
386 445 active: false,
387 446 ists: false,
388 447 region: false,
389   - isfb: false
  448 + isfb: false,
  449 + outbc: cell.bc_type == 'out',
  450 + inbc: cell.bc_type == 'in'
390 451 }">
391 452 {{cell.fcsj}}
392 453 </dd>
... ...
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/report/ext/list.html
  View file @a5753f0
... ... @@ -25,6 +25,13 @@
25 25 </div>
26 26  
27 27 <div ng-if="ctrl.viewId == 1" style="height: {{ctrl.ttHeight}}px;">
  28 + <div style="padding-bottom: 10px; height: 20px;">
  29 + <div style="float: right;">
  30 + <span style="padding-right: 10px;background: #337ab7;color: white;text-align: center;">出场班次</span>
  31 + <span style="padding-right: 10px;background: #4e6477;color: white;text-align: center;">进场班次</span>
  32 + </div>
  33 + </div>
  34 +
28 35 <sa-Planinfoview name="saPlanView" ng-model="ctrl.saPlanInfoViewData.infos" ng-model-options="{ getterSetter: true }" >
29 36 </sa-Planinfoview>
30 37 </div>
... ...
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/report/ext/module.js
  View file @a5753f0
... ... @@ -298,7 +298,25 @@ angular.module(&#39;ScheduleApp&#39;).controller(
298 298 service.getSaPlanInfoViewData().then(
299 299 function(rst) {
300 300 self.saPlanInfoViewData.infos = rst;
301   - console.log(rst);
  301 +
  302 + /*
  303 + 注意：后台是没有传过来班次类型，这里通过head来判定是否进出场班次
  304 + TODO：如果以后要标识新的班次类型，甚至要修改班次内容，后台可能要大改（可能要改回时刻表编辑的做法）
  305 + TODO：注意，调度执勤日报时刻表视图后台etl用的是导出的etl，所以要加复杂功能的话可能还得拆成2个etl
  306 + */
  307 + var _headers = rst.header;
  308 + for (var i = 0; i < rst.contents.length; i++) {
  309 + for (var j = 0; j < rst.contents[i].length; j++) {
  310 + if (_headers[j].indexOf("出场") >= 0) {
  311 + self.saPlanInfoViewData.infos.contents[i][j].bc_type = "out";
  312 + }
  313 + if (_headers[j].indexOf("进场") >= 0) {
  314 + self.saPlanInfoViewData.infos.contents[i][j].bc_type = "in";
  315 + }
  316 + }
  317 + }
  318 +
  319 + console.log(self.saPlanInfoViewData.infos);
302 320 },
303 321 function(err) {
304 322  
... ...