Commit 4ed5d6c8e71b19e65187aa52cf9ba952e38ed21e
Merge branch 'minhang' of http://222.66.0.204:8090//panzhaov5/bsth_control into minhang
Showing
3 changed files
with
46 additions
and
45 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
| @@ -1639,7 +1639,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | @@ -1639,7 +1639,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | ||
| 1639 | map.put("jhbc", culateService.culateJhbc(list,"")); | 1639 | map.put("jhbc", culateService.culateJhbc(list,"")); |
| 1640 | map.put("cjbc", culateService.culateLbbc(list)); | 1640 | map.put("cjbc", culateService.culateLbbc(list)); |
| 1641 | map.put("ljbc", culateService.culateLjbc(lists,"")); | 1641 | map.put("ljbc", culateService.culateLjbc(lists,"")); |
| 1642 | - map.put("sjbc", culateService.culateJhbc(lists,"") - culateService.culateLbbc(lists) + culateService.culateLjbc(lists,"")); | 1642 | + map.put("sjbc", culateService.culateSjbc(lists,"") + culateService.culateLjbc(lists,"")); |
| 1643 | map.put("jcclc", jccgl); | 1643 | map.put("jcclc", jccgl); |
| 1644 | map.put("zkslc", Arith.add(ksgl,jccgl)); | 1644 | map.put("zkslc", Arith.add(ksgl,jccgl)); |
| 1645 | // map.put("zkslc", format.format(ksgl + jcclc+addMileageJc)); | 1645 | // map.put("zkslc", format.format(ksgl + jcclc+addMileageJc)); |
src/main/java/com/bsth/service/report/impl/CulateMileageServiceImpl.java
| @@ -448,7 +448,8 @@ public class CulateMileageServiceImpl implements CulateMileageService{ | @@ -448,7 +448,8 @@ public class CulateMileageServiceImpl implements CulateMileageService{ | ||
| 448 | } | 448 | } |
| 449 | } | 449 | } |
| 450 | 450 | ||
| 451 | - }else{ | 451 | + } |
| 452 | + /*else{ | ||
| 452 | if(item.equals("zgf")){ | 453 | if(item.equals("zgf")){ |
| 453 | if(fcsj>=zgf1 && fcsj<=zgf2){ | 454 | if(fcsj>=zgf1 && fcsj<=zgf2){ |
| 454 | sjbc++; | 455 | sjbc++; |
| @@ -460,7 +461,7 @@ public class CulateMileageServiceImpl implements CulateMileageService{ | @@ -460,7 +461,7 @@ public class CulateMileageServiceImpl implements CulateMileageService{ | ||
| 460 | }else{ | 461 | }else{ |
| 461 | sjbc++; | 462 | sjbc++; |
| 462 | } | 463 | } |
| 463 | - } | 464 | + }*/ |
| 464 | } | 465 | } |
| 465 | } | 466 | } |
| 466 | } | 467 | } |
src/main/resources/static/pages/scheduleApp/module/common/dts2/ttinfotable/saTimeTableScrolly1.js
| 1 | -/** | ||
| 2 | - * 滚动事件控制指令。 | ||
| 3 | - */ | ||
| 4 | -angular.module('ScheduleApp').directive( | ||
| 5 | - 'saTscrolly1', | ||
| 6 | - [ | ||
| 7 | - function() { | ||
| 8 | - return { | ||
| 9 | - restrict: 'A', | ||
| 10 | - | ||
| 11 | - compile: function(tElem, tAttrs) { | ||
| 12 | - | ||
| 13 | - return { | ||
| 14 | - pre: function(scope, element, attr) { | ||
| 15 | - // TODO： | ||
| 16 | - //alert(element.find("#tooltipTest").html()); | ||
| 17 | - //$compile(element.find("#tooltipTest"))(scope); | ||
| 18 | - | ||
| 19 | - }, | ||
| 20 | - | ||
| 21 | - post: function(scope, element, attr) { | ||
| 22 | - //var head = element[0]; | ||
| 23 | - | ||
| 24 | - //console.log("llllllllload"); | ||
| 25 | - //console.log(element.name); | ||
| 26 | - | ||
| 27 | - element.bind('scroll', function() { | ||
| 28 | - //console.log("top=", angular.element(".tt_table_head").css("top")); | ||
| 29 | - //console.log("left=", angular.element(".tt_table_head").css("left")); | ||
| 30 | - //console.log("s top=" + element.scrollTop()); | ||
| 31 | - | ||
| 32 | - angular.element(".tt_table_head").css("top", element.scrollTop()); | ||
| 33 | - angular.element(".tt_table_body:eq(0)").css("left", element.scrollLeft()); | ||
| 34 | - | ||
| 35 | - }); | ||
| 36 | - } | ||
| 37 | - | ||
| 38 | - }; | ||
| 39 | - } | ||
| 40 | - } | ||
| 41 | - } | ||
| 42 | - ] | 1 | +/** |
| 2 | + * 滚动事件控制指令。 | ||
| 3 | + */ | ||
| 4 | +angular.module('ScheduleApp').directive( | ||
| 5 | + 'saTscrolly1', | ||
| 6 | + [ | ||
| 7 | + function() { | ||
| 8 | + return { | ||
| 9 | + restrict: 'A', | ||
| 10 | + | ||
| 11 | + compile: function(tElem, tAttrs) { | ||
| 12 | + | ||
| 13 | + return { | ||
| 14 | + pre: function(scope, element, attr) { | ||
| 15 | + // TODO： | ||
| 16 | + //alert(element.find("#tooltipTest").html()); | ||
| 17 | + //$compile(element.find("#tooltipTest"))(scope); | ||
| 18 | + | ||
| 19 | + }, | ||
| 20 | + | ||
| 21 | + post: function(scope, element, attr) { | ||
| 22 | + //var head = element[0]; | ||
| 23 | + | ||
| 24 | + //console.log("llllllllload"); | ||
| 25 | + //console.log(element.name); | ||
| 26 | + | ||
| 27 | + element.bind('scroll', function() { | ||
| 28 | + //console.log("top=", angular.element(".tt_table_head").css("top")); | ||
| 29 | + //console.log("left=", angular.element(".tt_table_head").css("left")); | ||
| 30 | + //console.log("s top=" + element.scrollTop()); | ||
| 31 | + | ||
| 32 | + angular.element(".tt_table_head").css("top", element.scrollTop()); | ||
| 33 | + angular.element(".tt_table_body:eq(0)").css("left", element.scrollLeft()); | ||
| 34 | + | ||
| 35 | + }); | ||
| 36 | + } | ||
| 37 | + | ||
| 38 | + }; | ||
| 39 | + } | ||
| 40 | + } | ||
| 41 | + } | ||
| 42 | + ] | ||
| 43 | ); | 43 | ); |
| 44 | \ No newline at end of file | 44 | \ No newline at end of file |