Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

潘钊
2 parents b0ae1cae 4ed5d6c8
Showing 11 changed files with 341 additions and 185 deletions
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/report/impl/CulateMileageServiceImpl.java
src/main/resources/static/pages/base/line/css/bmap_base.css
src/main/resources/static/pages/base/line/map.html
src/main/resources/static/pages/scheduleApp/Gruntfile.js
src/main/resources/static/pages/scheduleApp/module/common/dts2/ttinfotable/saTimeTable.js
src/main/resources/static/pages/scheduleApp/module/common/dts2/ttinfotable/saTimeTableScrolly1.js
src/main/resources/static/pages/scheduleApp/module/common/dts2/ttinfotable/saTimeTableTemplate.html
src/main/resources/static/pages/scheduleApp/module/common/prj-common-directive.js
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/report/ext/edit.html
@@ -58,11 +58,17 @@ public class XDApplication implements CommandLineRunner {
     SeiPstThread seiPstThread;
  
     private static long timeDiff;
+    private static long timeDiffTraffic;
  
     static {
+        // 早上2:20
         timeDiff = (DateUtils.getTimestamp() + 1000 * 60 * 140) - System.currentTimeMillis();
         if (timeDiff < 0)
             timeDiff += (1000 * 60 * 60 * 24);
+        // 早上07:00
+        timeDiffTraffic = (DateUtils.getTimestamp() + 1000 * 60 * 60 * 7) - System.currentTimeMillis();
+        if (timeDiffTraffic < 0)
+            timeDiffTraffic += (1000 * 60 * 60 * 24);
     }
  
     @Override
@@ -129,7 +135,7 @@ public class XDApplication implements CommandLineRunner {
  
         //运管处静态数据提交
         log.info(timeDiff / 1000 / 60 + "分钟之后提交到运管处");
-        sexec.scheduleAtFixedRate(submitToTrafficManage, timeDiff / 1000 + 60 * 60 * 5, 60 * 60 * 24, TimeUnit.SECONDS);
+        sexec.scheduleAtFixedRate(submitToTrafficManage, timeDiffTraffic / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
         //计算油、公里加注
         sexec.scheduleAtFixedRate(calcOilThread, timeDiff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
  
@@ -1639,7 +1639,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         map.put("jhbc", culateService.culateJhbc(list,""));
         map.put("cjbc", culateService.culateLbbc(list));
         map.put("ljbc", culateService.culateLjbc(lists,""));
-        map.put("sjbc", culateService.culateJhbc(lists,"") -  culateService.culateLbbc(lists) + culateService.culateLjbc(lists,""));
+        map.put("sjbc", culateService.culateSjbc(lists,"") + culateService.culateLjbc(lists,""));
         map.put("jcclc", jccgl);
         map.put("zkslc", Arith.add(ksgl,jccgl));
 //         map.put("zkslc", format.format(ksgl + jcclc+addMileageJc));
@@ -448,7 +448,8 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 									}
 								}
  
-							}else{
+							}
+							/*else{
 								if(item.equals("zgf")){
 									if(fcsj>=zgf1 && fcsj<=zgf2){
 										sjbc++;
@@ -460,7 +461,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 								}else{
 									sjbc++;
 								}
-							}
+							}*/
 						}
 					}
 				}
@@ -14,15 +14,24 @@ html,body{
  
 .caption {
     color: #B7B7B7;
-    font-size: 18px;
-  
+    font-size: 18px;  
     position: relative;
-    margin: 15px;
-   
+    margin: 15px;   
     font-family: 微软;
 }
  
-.cut-section{ position:absolute; right:40px; top:50px; background:#12527f; width:320px;max-height: 700px;min-height: 300px;} 
+.cut-section{ 
+	position:absolute;
+	right:40px;
+	top:50px;
+	background:#12527f;
+	width:320px;
+	max-height: 700px;
+	min-height: 300px;
+	border:0px solid;	
+	border-radius: 10px !important;
+    box-shadow: 10px 10px 5px #888888;	
+} 
  
 .rm3_image {
 	width: 120px;
@@ -44,3 +53,38 @@ html,body{
 	box-shadow: 0 12px 15px 0 rgba(204, 204, 204, 0.33),0 17px 50px 0 rgba(204, 204, 204, 0.33)!important;
  
 }
+
+.defeat-scroll {
+width: 98%;
+height:380px;
+/* overflow:auto; */
+overflow:hidden;
+}
+.defeat-scroll::-webkit-scrollbar {
+width:6px;
+height:6px;
+}
+.defeat-scroll::-webkit-scrollbar-button    {
+/* background-color:#FF7677; */
+background:rgba(255, 255, 255, 0);
+}
+.defeat-scroll::-webkit-scrollbar-track     {
+/* background:#FF66D5; */
+background:rgba(255, 255, 255, 0);
+}
+.defeat-scroll::-webkit-scrollbar-track-piece {
+/* background:#ff0000; */
+background:rgba(255, 255, 255, 0);
+}
+.defeat-scroll::-webkit-scrollbar-thumb{
+background:rgba(197, 196, 196, 0.81);
+border-radius:10px !important;
+}
+.defeat-scroll::-webkit-scrollbar-corner {
+/* background:#82AFFF; */
+background:rgba(255, 255, 255, 0);
+}
+.defeat-scroll::-webkit-scrollbar-resizer  {
+/* background:#FF0BEE; */
+background:rgba(255, 255, 255, 0);
+}
@@ -2,8 +2,8 @@
 <div class="portlet-body">
 	<!-- 地图 -->
 	<div  id="bmap_basic" class="bmaps"></div>	
-	
-	<div class="cut-section">
+	<!-- 右边显示栏 -->
+	<div class="cut-section" id="scrllmouseEvent_div">
 		<div class="portlet-title" >
 			<div class="caption" >
 				途径站点 
@@ -31,42 +31,6 @@
            	</div>	           	
 		</div>
 	</div>
-	
-	<div class="portlet box protlet-box" style="top:20px;border-radius: 6px !important;box-shadow: 10px 10px 5px #888888;">
-		左边标题栏
-		<div class="portlet-title" style="background-color:#12527f;">
-			<div class="caption">
-				途径站点 
-			</div>
-			<div class="tools">
-				<a href="javascript:;" class="collapse" data-original-title="" title=""> </a>
-			</div>
-		</div>
-		左边栏
-		<div class="portlet-body" id="scrllmouseEvent"  style="border: 1px solid rgb(255, 255, 255); display: block;min-height: 300px">
-			<div class="row">
-	            <div class="portlet-body">
-	            	<div class="table-toolbar" style="text-align:center;">
-						<button class="btn btn-circle blue" id="uploadRoute" ><i class="fa fa-plus"></i> 生成路线 </button>
-						<button class="btn btn-circle blue hidden" id="cutSection"><i class="fa fa-level-up"></i> 提交路段</button>
-						<button class="btn btn-circle blue hidden" id="Undo"><i class="fa fa-remove"></i> 撤销切点</button>
-	            	</div>
-	            	<div class="portlet-body" >
-	            		<div class="defeat-scroll" style="height: auto;max-height: 400px;overflow-y:auto;">
-							<table class="table table-striped table-bordered table-hover table-checkable " id="section_table">
-								<thead>
-									<tr role="row" class="heading">
-										<th >已截取路段</th>
-									</tr>
-								</thead>
-								<tbody ></tbody>
-							</table>
-						</div>
-	            	</div>				
-				</div>
-			</div>
-		</div>	
-	</div>
 </div>
 <script type="text/html" id="section_list">
 	{{each list as obj i }}
@@ -199,6 +163,12 @@ $(function(){
 			layer.msg("没有截取路段，不可以删除！！！");
 		}
 	});	
+	// 滚动轴监听事件
+	$('#scrllmouseEvent_div').on('mousemove',function() {
+		$('.defeat-scroll').css('overflow','auto');
+	}).on('mouseleave',function() {
+		$('.defeat-scroll').css('overflow','hidden');
+	});	
 });
 </script>
 <!--编辑路线类 -->
@@ -87,6 +87,7 @@ module.exports = function (grunt) {
                     'module/common/dts2/employeeGroup/saEmployeegroup.js', // 人员选饿整合指令
                     'module/common/dts2/bcGroup/saBcgroup.js', // 班次选择整合指令
                     'module/common/dts2/ttinfotable/saTimeTable.js', // 时刻表显示指令
+                    'module/common/dts2/ttinfotable/saTimeTableScrolly1.js', // 时刻表滚动1显示指令
                     'module/common/dts2/scheduleplan/saScpdate.js', // saScpdate指令（非通用指令，只在排版计划form中使用）
                     'module/common/dts2/scheduleplan/saPlaninfoedit.js', // saPlaninfoedit指令（非通用指令，只在调度执勤日报中使用）
                     'module/common/dts2/scheduleplan/saPlaninfoedit2.js' // saPlaninfoedit2指令（非通用指令，只在调度执勤日报中使用）
@@ -206,7 +206,8 @@ angular.module(&#39;ScheduleApp&#39;).directive(
     [
         '$compile',
         '$window',
-        function($compile, $window) {
+        '$timeout',
+        function($compile, $window, $timeout) {
             return {
                 restrict: 'E',
                 templateUrl: '/pages/scheduleApp/module/common/dts2/ttinfotable/saTimeTableTemplate.html',
@@ -254,6 +255,14 @@ angular.module(&#39;ScheduleApp&#39;).directive(
  
                     // TODO：
  
+                    // 监听滚动条事件
+                    //console.log(tElem.find('.tt_table').html());
+                    //tElem.on('scroll', '.tt_table', function() {
+                    //    // 因为在dom事件里修改了model的值，必须写在scope.$apply中，否则页面上绑定效果无
+                    //    // 另一种做法可以写在$watch方法中
+                    //    console.log("ssssssssssss......");
+                    //});
+
                     return {
                         pre: function(scope, element, attr) {
                             // TODO：
@@ -317,7 +326,12 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                     }
                                 },
                                 true
-                            )
+                            );
+
+                            // 5、全部载入后，输入的
+                            $timeout(function() {
+                                console.log("宽度宽度：" + element.find(".tt_table_head").width());
+                            }, 0);
                         }
                     };
                 }
+/**
+ * 滚动事件控制指令。
+ */
+angular.module('ScheduleApp').directive(
+    'saTscrolly1',
+    [
+        function() {
+            return {
+                restrict: 'A',
+
+                compile: function(tElem, tAttrs) {
+
+                    return {
+                        pre: function(scope, element, attr) {
+                            // TODO：
+                            //alert(element.find("#tooltipTest").html());
+                            //$compile(element.find("#tooltipTest"))(scope);
+
+                        },
+
+                        post: function(scope, element, attr) {
+                            //var head = element[0];
+
+                            //console.log("llllllllload");
+                            //console.log(element.name);
+
+                            element.bind('scroll', function() {
+                                //console.log("top=", angular.element(".tt_table_head").css("top"));
+                                //console.log("left=", angular.element(".tt_table_head").css("left"));
+                                //console.log("s top=" + element.scrollTop());
+
+                                angular.element(".tt_table_head").css("top", element.scrollTop());
+                                angular.element(".tt_table_body:eq(0)").css("left", element.scrollLeft());
+
+                            });
+                        }
+
+                    };
+                }
+            }
+        }
+    ]
+);
 \ No newline at end of file
 <style>
     .ttInfo_detail {
         height: 100%;
-        overflow: hidden;
+        /*overflow: hidden;*/
     }
     .ttInfo_detail .container-fluid {
         height: 100%;
@@ -13,7 +13,7 @@
     .ttInfo_detail .container-fluid.top-container {
         margin-top: 5px;
         padding: 0;
-        overflow: hidden;
+        /*overflow: hidden;*/
     }
     .ttInfo_detail .detail-wrap {
         height: calc(100% - 1px);
@@ -134,9 +134,10 @@
         top: 0;
         height: 30px;
         background: #f5f5f5;
-        width: 100%;
+        /*width: 100%;*/
         line-height: 30px;
         z-index: 1;
+
     }
  
     .tt_table>.tt_table_head dl {
@@ -149,13 +150,16 @@
     }
  
     .tt_table>.tt_table_body {
-        width: 100%;
+        /*width: 100%;*/
+
+        position: absolute;
+
         border-bottom: 1px solid #dedede;
     }
  
     .tt_table dl {
         display: block;
-        width: 100%;
+        /*width: 100%;*/
         margin: 0;
         /*border-bottom: 1px solid;*/
         height: 30px;
@@ -184,7 +188,7 @@
     }
  
     .tt_table>.tt_table_head {
-        border-bottom: 1px solid #dedede;
+        border-bottom: 2px solid #96b9d7;
     }
  
     .tt_table dl {
@@ -240,8 +244,8 @@
  
 <style>
     .table_scrollbar::-webkit-scrollbar {
-        width: 15px;
-        height: 16px;
+        width: 18px;
+        height: 18px;
     }
  
     .table_scrollbar::-webkit-scrollbar-track, ::-webkit-scrollbar-thumb {
@@ -299,9 +303,9 @@
                         </h3>
  
                         <div class="detail-body">
-                            <div class="tt_table_wrap table_scrollbar">
+                            <div class="tt_table_wrap table_scrollbar" sa-tscrolly1>
                                 <div class="tt_table">
-                                    <div class="tt_table_head" style="top: 0;">
+                                    <div class="tt_table_head" style="z-index: 110; top: 0;">
                                         <dl>
                                             <dt>
                                                 序号
@@ -311,10 +315,27 @@
                                             </dt>
                                         </dl>
                                     </div>
+
+                                    <div class="tt_table_body" style="z-index: 100; background: white;">
+                                        <dl ng-repeat="info in $saTimeTableCtrl.ds.detailInfos track by $index"
+                                            ng-init="rowIndex = $index">
+                                            <dd style="width: 50px;">
+                                                {{rowIndex + 1}}
+                                            </dd>
+                                            <dd ng-repeat="cell in info track by $index"
+                                                ng-init="colIndex = $index"
+                                                ng-click="$saTimeTableCtrl.$$cell_click(rowIndex, colIndex, cell)"
+                                                ng-dblclick="$saTimeTableCtrl.$$cell_dbclick(rowIndex, colIndex, cell)"
+                                                ng-if="$index == 0" style="width: 55px; border-right: 2px solid #96b9d7;">
+                                                {{cell.fcsj}}
+                                            </dd>
+
+                                        </dl>
+                                    </div>
+
                                     <div class="tt_table_body">
                                         <dl ng-repeat="info in $saTimeTableCtrl.ds.detailInfos track by $index"
-                                            ng-init="rowIndex = $index"
-                                                >
+                                            ng-init="rowIndex = $index">
                                             <dd>
                                                 {{rowIndex + 1}}
                                             </dd>
@@ -328,8 +349,7 @@
                                                     active: cell.sel,
                                                     region: cell.bc_type == 'region',
                                                     isfb: cell.isfb
-                                                    }"
-                                                    >
+                                                    }">
                                                 {{cell.fcsj}}
                                             </dd>
  
@@ -316,120 +316,120 @@ angular.module(&#39;ScheduleApp&#39;).directive(
         }
     ]
 );
-/**
- * remoteWarn指令：远程验证警告，作为属性放在某个指令上。
- *                TODO：暂时没法整合到form上，类似$error这样
- * 属性如下：
- * remotewtype（必须）：验证类型（在service中有对应映射），如rvtype="xl"
- * remotewparam（必须）：后端判定查询参数，如rvparam={{ {'xl.id_eq': '123'} | json }}
- * remotewmsgprop（必须）：警告信息属性名
- */
-angular.module('ScheduleApp').directive('remoteWarn', [
-    '$$SearchInfoService_g',
-    function($$SearchInfoService_g) {
-        return {
-            restrict: "A", // 属性
-            required: "^ngModel", // 依赖所属指令的ngModel
-            compile: function(tElem, tAttrs) {
-                // 验证属性
-                if (!tAttrs["remotewtype"]) { // 验证类型
-                    throw {msg : "remotewtype属性必须填写"};
-                }
-                if (!$$SearchInfoService_g.validate[tAttrs["remotewtype"]]) {
-                    throw {msg : tAttrs["remotevtype"] + "验证类型不存在"};
-                }
-                if (!tAttrs["remotewparam"]) { // 查询参数
-                    throw {msg : "remotevparam属性必须填写"};
-                }
-                if (!tAttrs["remotewmsgprop"]) { // 警告信息属性名
-                    throw {msg : "remotewmsgprop属性必须填写"}
-                }
-
-                // 监听获取的数据
-                var $watch_rvtype = undefined;
-                var $watch_rvparam_obj = undefined;
-                var $remotewmsgprop = undefined;
-
-                // 验证数据
-                var $$internal_validate = function(ngModelCtrl, scope) {
-                    if ($watch_rvtype && $watch_rvparam_obj && $remotewmsgprop) {
-                        // 获取查询参数模版
-                        var paramTemplate = $$SearchInfoService_g.validate[$watch_rvtype].template;
-                        if (!paramTemplate) {
-                            throw {msg : $watch_rvtype + "查询模版不存在"};
-                        }
-
-                        // 判定如果参数对象不全，没有完全和模版参数里对应上，则不验证
-                        var isParamAll = true;
-                        for (var key in paramTemplate) {
-                            if (key != "id" && !$watch_rvparam_obj[key]) { // id去掉
-                                isParamAll = false;
-                                break;
-                            }
-                        }
-
-                        if (!isParamAll) {
-                            scope["ctrl"][$remotewmsgprop] = undefined;
-                        } else { // 开始验证警告
-                            $$SearchInfoService_g.validate[$watch_rvtype].remote.do(
-                                $watch_rvparam_obj,
-                                function(result) {
-                                    if (result.status == "SUCCESS") {
-                                        scope["ctrl"][$remotewmsgprop] = undefined;
-                                    } else {
-                                        scope["ctrl"][$remotewmsgprop] = result.msg;
-                                    }
-                                },
-                                function(result) {
-                                    scope["ctrl"][$remotewmsgprop] = undefined;
-                                }
-                            );
-                        }
-                    }
-
-                };
-
-                return {
-                    pre: function(scope, element, attr) {
-
-                    },
-
-                    post: function(scope, element, attr, ngModelCtrl) {
-                        /**
-                         * 监控验证类型属性变化。
-                         */
-                        attr.$observe("remotewtype", function(value) {
-                            if (value && value != "") {
-                                $watch_rvtype = value;
-                                $$internal_validate(ngModelCtrl, scope);
-                            }
-                        });
-
-                        /**
-                         * 监控查询结果属性变化。
-                         */
-                        attr.$observe("remotewparam", function(value) {
-                            if (value && value != "") {
-                                $watch_rvparam_obj = JSON.parse(value);
-                                $$internal_validate(ngModelCtrl, scope);
-                            }
-                        });
-
-                        /**
-                         * 监控警告信息属性名变化。
-                         */
-                        attr.$observe("remotewmsgprop", function(value) {
-                            if (value && value != "") {
-                                $remotewmsgprop = value;
-                                $$internal_validate(ngModelCtrl, scope);
-                            }
-                        });
-
-                    }
-                };
-            }
-        };
-    }
+/**
+ * remoteWarn指令：远程验证警告，作为属性放在某个指令上。
+ *                TODO：暂时没法整合到form上，类似$error这样
+ * 属性如下：
+ * remotewtype（必须）：验证类型（在service中有对应映射），如rvtype="xl"
+ * remotewparam（必须）：后端判定查询参数，如rvparam={{ {'xl.id_eq': '123'} | json }}
+ * remotewmsgprop（必须）：警告信息属性名
+ */
+angular.module('ScheduleApp').directive('remoteWarn', [
+    '$$SearchInfoService_g',
+    function($$SearchInfoService_g) {
+        return {
+            restrict: "A", // 属性
+            required: "^ngModel", // 依赖所属指令的ngModel
+            compile: function(tElem, tAttrs) {
+                // 验证属性
+                if (!tAttrs["remotewtype"]) { // 验证类型
+                    throw {msg : "remotewtype属性必须填写"};
+                }
+                if (!$$SearchInfoService_g.validate[tAttrs["remotewtype"]]) {
+                    throw {msg : tAttrs["remotevtype"] + "验证类型不存在"};
+                }
+                if (!tAttrs["remotewparam"]) { // 查询参数
+                    throw {msg : "remotevparam属性必须填写"};
+                }
+                if (!tAttrs["remotewmsgprop"]) { // 警告信息属性名
+                    throw {msg : "remotewmsgprop属性必须填写"}
+                }
+
+                // 监听获取的数据
+                var $watch_rvtype = undefined;
+                var $watch_rvparam_obj = undefined;
+                var $remotewmsgprop = undefined;
+
+                // 验证数据
+                var $$internal_validate = function(ngModelCtrl, scope) {
+                    if ($watch_rvtype && $watch_rvparam_obj && $remotewmsgprop) {
+                        // 获取查询参数模版
+                        var paramTemplate = $$SearchInfoService_g.validate[$watch_rvtype].template;
+                        if (!paramTemplate) {
+                            throw {msg : $watch_rvtype + "查询模版不存在"};
+                        }
+
+                        // 判定如果参数对象不全，没有完全和模版参数里对应上，则不验证
+                        var isParamAll = true;
+                        for (var key in paramTemplate) {
+                            if (key != "id" && !$watch_rvparam_obj[key]) { // id去掉
+                                isParamAll = false;
+                                break;
+                            }
+                        }
+
+                        if (!isParamAll) {
+                            scope["ctrl"][$remotewmsgprop] = undefined;
+                        } else { // 开始验证警告
+                            $$SearchInfoService_g.validate[$watch_rvtype].remote.do(
+                                $watch_rvparam_obj,
+                                function(result) {
+                                    if (result.status == "SUCCESS") {
+                                        scope["ctrl"][$remotewmsgprop] = undefined;
+                                    } else {
+                                        scope["ctrl"][$remotewmsgprop] = result.msg;
+                                    }
+                                },
+                                function(result) {
+                                    scope["ctrl"][$remotewmsgprop] = undefined;
+                                }
+                            );
+                        }
+                    }
+
+                };
+
+                return {
+                    pre: function(scope, element, attr) {
+
+                    },
+
+                    post: function(scope, element, attr, ngModelCtrl) {
+                        /**
+                         * 监控验证类型属性变化。
+                         */
+                        attr.$observe("remotewtype", function(value) {
+                            if (value && value != "") {
+                                $watch_rvtype = value;
+                                $$internal_validate(ngModelCtrl, scope);
+                            }
+                        });
+
+                        /**
+                         * 监控查询结果属性变化。
+                         */
+                        attr.$observe("remotewparam", function(value) {
+                            if (value && value != "") {
+                                $watch_rvparam_obj = JSON.parse(value);
+                                $$internal_validate(ngModelCtrl, scope);
+                            }
+                        });
+
+                        /**
+                         * 监控警告信息属性名变化。
+                         */
+                        attr.$observe("remotewmsgprop", function(value) {
+                            if (value && value != "") {
+                                $remotewmsgprop = value;
+                                $$internal_validate(ngModelCtrl, scope);
+                            }
+                        });
+
+                    }
+                };
+            }
+        };
+    }
 ]);
  
 angular.module('ScheduleApp').directive("saSelect", ['$timeout', function($timeout) {
@@ -4101,7 +4101,8 @@ angular.module(&#39;ScheduleApp&#39;).directive(
     [
         '$compile',
         '$window',
-        function($compile, $window) {
+        '$timeout',
+        function($compile, $window, $timeout) {
             return {
                 restrict: 'E',
                 templateUrl: '/pages/scheduleApp/module/common/dts2/ttinfotable/saTimeTableTemplate.html',
@@ -4149,6 +4150,14 @@ angular.module(&#39;ScheduleApp&#39;).directive(
  
                     // TODO：
  
+                    // 监听滚动条事件
+                    //console.log(tElem.find('.tt_table').html());
+                    //tElem.on('scroll', '.tt_table', function() {
+                    //    // 因为在dom事件里修改了model的值，必须写在scope.$apply中，否则页面上绑定效果无
+                    //    // 另一种做法可以写在$watch方法中
+                    //    console.log("ssssssssssss......");
+                    //});
+
                     return {
                         pre: function(scope, element, attr) {
                             // TODO：
@@ -4212,7 +4221,12 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                     }
                                 },
                                 true
-                            )
+                            );
+
+                            // 5、全部载入后，输入的
+                            $timeout(function() {
+                                console.log("宽度宽度：" + element.find(".tt_table_head").width());
+                            }, 0);
                         }
                     };
                 }
@@ -4222,6 +4236,49 @@ angular.module(&#39;ScheduleApp&#39;).directive(
     ]
 );
  
+/**
+ * 滚动事件控制指令。
+ */
+angular.module('ScheduleApp').directive(
+    'saTscrolly1',
+    [
+        function() {
+            return {
+                restrict: 'A',
+
+                compile: function(tElem, tAttrs) {
+
+                    return {
+                        pre: function(scope, element, attr) {
+                            // TODO：
+                            //alert(element.find("#tooltipTest").html());
+                            //$compile(element.find("#tooltipTest"))(scope);
+
+                        },
+
+                        post: function(scope, element, attr) {
+                            //var head = element[0];
+
+                            //console.log("llllllllload");
+                            //console.log(element.name);
+
+                            element.bind('scroll', function() {
+                                //console.log("top=", angular.element(".tt_table_head").css("top"));
+                                //console.log("left=", angular.element(".tt_table_head").css("left"));
+                                //console.log("s top=" + element.scrollTop());
+
+                                angular.element(".tt_table_head").css("top", element.scrollTop());
+                                angular.element(".tt_table_body:eq(0)").css("left", element.scrollLeft());
+
+                            });
+                        }
+
+                    };
+                }
+            }
+        }
+    ]
+);
 /**
  * saScpdate指令（非通用指令，只在排版计划form中使用）。
  * 属性如下：
@@ -91,7 +91,7 @@
                             <div class="col-md-7">
                                 <sa-Select5 name="j1"
                                             model="ctrl.formData"
-                                            cmaps="{'j1.id' : 'id', 'j1.jobCode': 'jobCode', 'j1.name': 'personnelName'}"
+                                            cmaps="{'j1.id' : 'id', 'j1.jobCode': 'workId', 'j1.name': 'name'}"
                                             dcname="j1.id"
                                             icname="id"
                                             dsparams="{{ {type: 'local', param: 'ry' } | json }}"
@@ -114,7 +114,7 @@
                             <div class="col-md-7">
                                 <sa-Select5 name="s1"
                                             model="ctrl.formData"
-                                            cmaps="{'s1.id' : 'id', 's1.jobCode': 'jobCode', 's1.name': 'personnelName'}"
+                                            cmaps="{'s1.id' : 'id', 's1.jobCode': 'workId', 's1.name': 'name'}"
                                             dcname="s1.id"
                                             icname="id"
                                             dsparams="{{ {type: 'local', param: 'ry' } | json }}"
@@ -132,7 +132,7 @@
                             <div class="col-md-7">
                                 <sa-Select5 name="j2"
                                             model="ctrl.formData"
-                                            cmaps="{'j2.id' : 'id', 'j2.jobCode': 'jobCode', 'j2.name': 'personnelName'}"
+                                            cmaps="{'j2.id' : 'id', 'j2.jobCode': 'workId', 'j2.name': 'name'}"
                                             dcname="j2.id"
                                             icname="id"
                                             dsparams="{{ {type: 'local', param: 'ry' } | json }}"
@@ -150,7 +150,7 @@
                             <div class="col-md-7">
                                 <sa-Select5 name="s2"
                                             model="ctrl.formData"
-                                            cmaps="{'s2.id' : 'id', 's2.jobCode': 'jobCode', 's2.name': 'personnelName'}"
+                                            cmaps="{'s2.id' : 'id', 's2.jobCode': 'workId', 's2.name': 'name'}"
                                             dcname="s2.id"
                                             icname="id"
                                             dsparams="{{ {type: 'local', param: 'ry' } | json }}"
@@ -168,7 +168,7 @@
                             <div class="col-md-7">
                                 <sa-Select5 name="j3"
                                             model="ctrl.formData"
-                                            cmaps="{'j3.id' : 'id', 'j3.jobCode': 'jobCode', 'j3.name': 'personnelName'}"
+                                            cmaps="{'j3.id' : 'id', 'j3.jobCode': 'workId', 'j3.name': 'name'}"
                                             dcname="j3.id"
                                             icname="id"
                                             dsparams="{{ {type: 'local', param: 'ry' } | json }}"
@@ -186,7 +186,7 @@
                             <div class="col-md-7">
                                 <sa-Select5 name="s3"
                                             model="ctrl.formData"
-                                            cmaps="{'s3.id' : 'id', 's3.jobCode': 'jobCode', 's3.name': 'personnelName'}"
+                                            cmaps="{'s3.id' : 'id', 's3.jobCode': 'workId', 's3.name': 'name'}"
                                             dcname="s3.id"
                                             icname="id"
                                             dsparams="{{ {type: 'local', param: 'ry' } | json }}"