1、修正修改车辆信息报错bug，修正是否报废信息设定

2、调度执勤日报修正： 1）、修改班次中取消售票员选项 2）、新视图中，图例文字居中，烂班班次颜色改成红色，单个路牌全部烂班时，整行路牌（包括驾驶员信息）全部改成红色 3）、新视图中，上行班次加底色，下行班次用白色，并添加对应图例，图例文字中包含上行/下行起点站名 4）、新视图中，标题栏的站点后面的数字使用圈组数字，一圈报行一个上行一个下行，从1开始计数 5）、新视图中，不要有下拉框，指令内部自动计算整个高度，方便整个截图

1、修正修改车辆信息报错bug，修正是否报废信息设定
2、调度执勤日报修正： 1）、修改班次中取消售票员选项 2）、新视图中，图例文字居中，烂班班次颜色改成红色，单个路牌全部烂班时，整行路牌（包括驾驶员信息）全部改成红色 3）、新视图中，上行班次加底色，下行班次用白色，并添加对应图例，图例文字中包含上行/下行起点站名 4）、新视图中，标题栏的站点后面的数字使用圈组数字，一圈报行一个上行一个下行，从1开始计数 5）、新视图中，不要有下拉框，指令内部自动计算整个高度，方便整个截图
徐烜
1 parent cc455696
Showing 8 changed files with 417 additions and 146 deletions
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/edit.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/module.js
src/main/resources/static/pages/scheduleApp/module/common/dts2/scheduleplan/saPlanInfoView.js
src/main/resources/static/pages/scheduleApp/module/common/dts2/scheduleplan/saPlanInfoViewTemplate.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
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
@@ -244,15 +244,20 @@
                     </div>
                 </div>
-                <div class="form-group" ng-if="ctrl.busInfoForSave.scrapState == 1">
+                <div class="form-group" ng-if="ctrl.busInfoForSave.scrapState">
                     <label class="col-md-2 control-label">报废号：</label>
                     <div class="col-md-4">
-                        <input type="text" class="form-control" ng-model="ctrl.busInfoForSave.scrapCode"
-                               placeholder="请输入报废号"/>
+                        <input type="text" name="scrapCode" class="form-control" ng-model="ctrl.busInfoForSave.scrapCode"
+                               required placeholder="请输入报废号"/>
+                    </div>
+
+                    <!-- 隐藏块，显示验证信息 -->
+                    <div class="alert alert-danger well-sm" ng-show="myForm.scrapCode.$error.required">
+                        报废号必须填写
                     </div>
                 </div>
-                <div class="form-group" ng-if="ctrl.busInfoForSave.scrapState == 1">
+                <div class="form-group" ng-if="ctrl.busInfoForSave.scrapState">
                     <label class="col-md-2 control-label">报废日期：</label>
                     <div class="col-md-4">
                         <div class="input-group">
@@ -260,7 +265,7 @@
                                    name="scrapDate" placeholder="请选择报废日期..."
                                    uib-datepicker-popup="yyyy年MM月dd日"
                                    is-open="ctrl.scrapDateOpen"
-                                   ng-model="ctrl.busInfoForSave.scrapDate" readonly/>
+                                   ng-model="ctrl.busInfoForSave.scrapDate" readonly required/>
                             <span class="input-group-btn">
                                 <button type="button" class="btn btn-default" ng-click="ctrl.scrapDate_open()">
                                     <i class="glyphicon glyphicon-calendar"></i>
@@ -268,6 +273,11 @@
                             </span>
                         </div>
                     </div>
+
+                    <!-- 隐藏块，显示验证信息 -->
+                    <div class="alert alert-danger well-sm" ng-show="myForm.scrapDate.$error.required">
+                        报废日期必须填写
+                    </div>
                 </div>
                 <div class="form-group">
                     <label class="col-md-2 control-label">厂牌型号1：</label>
@@ -361,7 +361,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(
         '$stateParams',
         '$state',
         'DataStore',
-        function(service, $stateParams, $state, DataStore) {
+        '$scope',
+        function(service, $stateParams, $state, DataStore, $scope) {
             var self = this;
             var Cars = service.getQueryClass();
@@ -387,19 +388,26 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             // 获取传过来的id，有的话就是修改，获取一遍数据
             var id = $stateParams.id;
+            var _equipmentCode_temp;
             if (id) {
-                self.busInfoForSave  = Cars.get({id: id}, function() {});
+                self.busInfoForSave = Cars.get({id: id}, function(obj) {
+                    if (!obj.scrapState) { // 防止null值
+                        obj.scrapState = false;
+                    }
+                    _equipmentCode_temp = obj.equipmentCode;
+                });
+            } else {
+                self.busInfoForSave.scrapState = false;
             }
             // 提交方法
             self.submit = function() {
                 console.log(self.busInfoForSave);
-                // // 报废的车辆，修改原来的车辆终端号
-                // if (self.busInfoForSave.scrapState == true) {
-                //     self.busInfoForSave.equipmentCode = "BF-" + self.busInfoForSave.equipmentCode;
-                //     self.busInfoForSave.scrapCode = "BF-" + self.busInfoForSave.equipmentCode;
-                // }
+                // 报废的车辆，修改原来的车辆终端号
+                if (self.busInfoForSave.scrapState) {
+                    self.busInfoForSave.equipmentCode = "BF-" + _equipmentCode_temp;
+                }
                 // 保存或者更新
@@ -408,6 +416,17 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                     $state.go("busInfoManage");
                 });
             };
+
+            $scope.$watch(
+                function() {
+                    return self.busInfoForSave.scrapState;
+                },
+                function(n) {
+                    if (!n) {
+                        self.busInfoForSave.scrapCode = "BF-" + _equipmentCode_temp;
+                    }
+                }
+            );
         }
     ]
 );
@@ -20,7 +20,19 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                 bindToController: true,
                 controller: function() {
                     var self = this;
-                    // TODO：
+                    // .ttInfo_detail高度
+                    self.ttInfo_detail_height = 800;
+                    // ds绑定的数据-路牌扩展数据
+                    self.ds_ext_lp_info = {"路牌名字" : {allLb : "关联的班次是否全部烂班(true/false)"}};
+                    // ds绑定的数据-线路扩展数据
+                    self.ds_ext_xl_info = {"dir0_qdzName" : "上线起点站名字", "dir0_tip_width" : "上行图标宽度",
+                        "dir1_qdzName" : "下行起点站名字", "dir1_tip_width" : "下行图标宽度"};
+                    // ds绑定的数据-标题扩展数据1
+                    self.ds_head_info1 = ["路牌", "驾驶员", "自编号", "车牌号"];
+                    // ds绑定的数据-标题扩展数据2
+                    self.ds_head_info2 = [];
+
+                    // TODO：后面可能还有其他扩展信息
                 },
                 /**
@@ -73,6 +85,105 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                 }
                             };
+
+                            // ------------------- 监控function ------------------//
+                            // 监控 ds: "=ngModel" 数据
+                            scope.$watch(
+                                function() {
+                                    return scope[ctrlAs].ds;
+                                },
+                                function(newValue) {
+                                    // 创建ds绑定的数据-路牌扩展数据
+                                    if (newValue["contents"]) {
+                                        angular.forEach(newValue["contents"], function(value) {
+                                            var _lpName = value[0]["lpName"];
+                                            scope[ctrlAs]["ds_ext_lp_info"][_lpName] = {allLb : false};
+                                            var _bcCounts = 0; // 班次总数
+                                            var _lbBcCounts = 0; // 烂班班次总数
+                                            angular.forEach(value, function(bc) {
+                                                if (bc.id) {
+                                                    _bcCounts ++;
+                                                    if (bc.status == -1) {
+                                                        _lbBcCounts ++;
+                                                    }
+                                                }
+                                            });
+                                            if (_bcCounts > 0 && _bcCounts == _lbBcCounts) {
+                                                scope[ctrlAs]["ds_ext_lp_info"][_lpName].allLb = true;
+                                            }
+                                        });
+                                    }
+
+                                    // 创建ds绑定数据-线路扩展数据
+                                    scope[ctrlAs]["ds_ext_xl_info"] = {};
+                                    scope[ctrlAs]["ds_ext_xl_info"].dir0_qdzName = "";
+                                    scope[ctrlAs]["ds_ext_xl_info"].dir1_qdzName = "";
+                                    scope[ctrlAs]["ds_ext_xl_info"].dir0_tip_width = 50;
+                                    scope[ctrlAs]["ds_ext_xl_info"].dir1_tip_width = 50;
+                                    if (newValue["contents"]) {
+                                        angular.forEach(newValue["contents"], function(value) {
+                                            if (scope[ctrlAs]["ds_ext_xl_info"].dir0_qdzName
+                                                && scope[ctrlAs]["ds_ext_xl_info"].dir1_qdzName) {
+                                                return;
+                                            }
+                                            angular.forEach(value, function (bc) {
+                                                if (bc.id && bc.bcType == 'normal') {
+                                                    if (bc.xlDir == '0' && bc.qdzName && !scope[ctrlAs]["ds_ext_xl_info"].dir0_qdzName) {
+                                                        scope[ctrlAs]["ds_ext_xl_info"].dir0_qdzName = bc.qdzName;
+                                                        scope[ctrlAs]["ds_ext_xl_info"].dir0_tip_width += bc.qdzName.length * 15;
+                                                    } else if (bc.xlDir == '1' && bc.qdzName && !scope[ctrlAs]["ds_ext_xl_info"].dir1_qdzName) {
+                                                        scope[ctrlAs]["ds_ext_xl_info"].dir1_qdzName = bc.qdzName;
+                                                        scope[ctrlAs]["ds_ext_xl_info"].dir1_tip_width += bc.qdzName.length * 15;
+                                                    }
+                                                }
+
+                                            })
+                                        });
+                                    }
+
+                                    // 计算 .ttInfo_detail高度
+                                    scope[ctrlAs]["ttInfo_detail_height"] = 0;
+                                    var toolbar_height = 31; // 工具栏高度（参见template css）
+                                    var tt_table_head_height = 36; // 表格标题高度（参见template css）
+                                    var table_info_height = 30; // 表格行高度（参见template css）
+                                    var table_extra_height = 30; // 表格修正高度
+                                    if (newValue["contents"]) {
+                                        scope[ctrlAs]["ttInfo_detail_height"] =
+                                            toolbar_height +
+                                            tt_table_head_height +
+                                            table_info_height * newValue["contents"].length +
+                                            table_extra_height;
+                                    }
+
+                                    // 创建ds绑定的数据-标题扩展数据2
+                                    scope[ctrlAs]["ds_head_info2"] = [];
+                                    angular.forEach(newValue["header"], function(head) {
+                                        if (head != '路牌' && head != '驾驶员' && head != '自编号' && head != '车牌号') {
+                                            scope[ctrlAs]["ds_head_info2"].push(head);
+                                        }
+                                    });
+                                    // 2个班次一组 [上行group_no，下行group_no]，从1开始
+                                    var group_num = 1;
+                                    var group_num_array = [1, 1];
+                                    for (var i = 0; i < scope[ctrlAs]["ds_head_info2"].length; i++) {
+                                        var head = scope[ctrlAs]["ds_head_info2"][i];
+                                        if (head == scope[ctrlAs]["ds_ext_xl_info"].dir0_qdzName) {
+                                            scope[ctrlAs]["ds_head_info2"][i] = head.substr(0, 1) + group_num_array[0];
+                                        } else {
+                                            scope[ctrlAs]["ds_head_info2"][i] = head.substr(0, 1) + group_num_array[1];
+                                            group_num ++ ;
+                                            group_num_array = [group_num, group_num];
+                                        }
+
+                                        // TODO：如果是环线的话，目前group_num都是1，后面如果有变化再修正
+                                    }
+
+                                    // TODO：
+
+                                },
+                                true
+                            );
+
                         }
                     };
@@ -236,6 +236,14 @@
         background: #e43a45 !important;
         color: white;
     }
+    .tt_table dd.isDir_0 {
+        background: #81b9e9 !important;
+        color: white;
+    }
+    .tt_table dd.isDir_1 {
+        background: white !important;
+        color: black;
+    }
     .tt_table dd.ists {
         background: #105383 !important;
         color: white;
@@ -260,8 +268,8 @@
     }
     .tt_table dd.islb {
-        background: #53ff34 !important;
-        color: #501a1a;
+        background: #df0808 !important;
+        color: white;
     }
     .tt_table dd.isModify {
@@ -362,7 +370,7 @@
 </style>
-<div class="ttInfo_detail">
+<div class="ttInfo_detail" style="height: {{$saPlanInfoViewCtrl.ttInfo_detail_height}}px;">
     <div class="container-fluid top-container">
         <div class="col-md-12 container-fluid schedule-wrap">
             <div class="col-md-12" style="height: 100%">
@@ -378,10 +386,12 @@
                             </div>
                             <div style="float: right; padding-right: 10px;">
-                                <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>
-                                <span style="padding-right: 10px;background: #53ff34;color: #501a1a;text-align: center;">烂班班次</span>
-                                <span style="padding-right: 10px;outline: 2px solid #541aff; outline-offset: -3px; text-align: center;">班次修改过</span>
+                                <div style="display: inline-block;background: #81b9e9;color: white;text-align: center;height: 25px;line-height: 25px;width: {{$saPlanInfoViewCtrl.ds_ext_xl_info.dir0_tip_width}}px;">上行-{{$saPlanInfoViewCtrl.ds_ext_xl_info.dir0_qdzName}}</div>
+                                <div style="display: inline-block;background: white;color: black;text-align: center;height: 25px;line-height: 25px;width: {{$saPlanInfoViewCtrl.ds_ext_xl_info.dir1_tip_width}}px;">下行-{{$saPlanInfoViewCtrl.ds_ext_xl_info.dir1_qdzName}}</div>
+                                <div style="display: inline-block;background: #337ab7;color: white;text-align: center;height: 25px;line-height: 25px;width: 90px;">出场班次</div>
+                                <div style="display: inline-block;background: #4e6477;color: white;text-align: center;height: 25px;line-height: 25px;width: 90px;">进场班次</div>
+                                <div style="display: inline-block;background: #df0808;color: white;text-align: center;height: 25px;line-height: 25px;width: 90px;">烂班班次</div>
+                                <div style="display: inline-block;outline: 2px solid #541aff;outline-offset: -3px;text-align: center;height: 25px;line-height: 25px;width: 90px;">班次修改过</div>
                             </div>
                         </div>
@@ -421,9 +431,13 @@
                                                 序号
                                             </dt>
-                                            <dt ng-repeat="head in $saPlanInfoViewCtrl.ds.header track by $index">
-                                                {{(head != '路牌' && head != '驾驶员' && head != '自编号' && head != '车牌号') ? (head.substr(0, 1) + ($index)): head}}
+                                            <dt ng-repeat="head1 in $saPlanInfoViewCtrl.ds_head_info1 track by $index">
+                                                {{head1}}
+                                            </dt>
+                                            <dt ng-repeat="head2 in $saPlanInfoViewCtrl.ds_head_info2 track by $index">
+                                                {{head2}}
                                             </dt>
+
                                         </dl>
                                     </div>
@@ -437,23 +451,27 @@
                                             <dd ng-repeat="cell in info track by $index"
                                                 ng-init="colIndex = $index"
-                                                ng-if="$index == 0" >
+                                                ng-if="$index == 0"
+                                                ng-class="{islb : $saPlanInfoViewCtrl.ds_ext_lp_info[info[0].lpName].allLb}">
                                                 {{cell.lpName}}
                                             </dd>
                                             <dd ng-repeat="cell in info track by $index"
                                                 ng-init="colIndex = $index"
-                                                ng-if="$index == 1" >
+                                                ng-if="$index == 1"
+                                                ng-class="{islb : $saPlanInfoViewCtrl.ds_ext_lp_info[info[0].lpName].allLb}">
                                                 {{cell.jName}}
                                             </dd>
                                             <dd ng-repeat="cell in info track by $index"
                                                 ng-init="colIndex = $index"
-                                                ng-if="$index == 2" >
+                                                ng-if="$index == 2"
+                                                ng-class="{islb : $saPlanInfoViewCtrl.ds_ext_lp_info[info[0].lpName].allLb}">
                                                 {{cell.clZbh}}
                                             </dd>
                                             <dd ng-repeat="cell in info track by $index"
                                                 ng-init="colIndex = $index"
-                                                ng-if="$index == 3" style="border-right: 2px solid #96b9d7;">
+                                                ng-if="$index == 3" style="border-right: 2px solid #96b9d7;"
+                                                ng-class="{islb : $saPlanInfoViewCtrl.ds_ext_lp_info[info[0].lpName].allLb}">
                                                 {{cell.clZbh}}
                                             </dd>
@@ -490,6 +508,8 @@
                                                     lpName: true,
                                                     error: false,
                                                     active: cell.sel,
+                                                    isDir_0: cell.xlDir == '0',
+                                                    isDir_1: cell.xlDir == '1',
                                                     ists: false,
                                                     region: false,
                                                     isfb: false,
@@ -6630,7 +6630,19 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                 bindToController: true,
                 controller: function() {
                     var self = this;
-                    // TODO：
+                    // .ttInfo_detail高度
+                    self.ttInfo_detail_height = 800;
+                    // ds绑定的数据-路牌扩展数据
+                    self.ds_ext_lp_info = {"路牌名字" : {allLb : "关联的班次是否全部烂班(true/false)"}};
+                    // ds绑定的数据-线路扩展数据
+                    self.ds_ext_xl_info = {"dir0_qdzName" : "上线起点站名字", "dir0_tip_width" : "上行图标宽度",
+                        "dir1_qdzName" : "下行起点站名字", "dir1_tip_width" : "下行图标宽度"};
+                    // ds绑定的数据-标题扩展数据1
+                    self.ds_head_info1 = ["路牌", "驾驶员", "自编号", "车牌号"];
+                    // ds绑定的数据-标题扩展数据2
+                    self.ds_head_info2 = [];
+
+                    // TODO：后面可能还有其他扩展信息
                 },
                 /**
@@ -6683,6 +6695,105 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                 }
                             };
+
+                            // ------------------- 监控function ------------------//
+                            // 监控 ds: "=ngModel" 数据
+                            scope.$watch(
+                                function() {
+                                    return scope[ctrlAs].ds;
+                                },
+                                function(newValue) {
+                                    // 创建ds绑定的数据-路牌扩展数据
+                                    if (newValue["contents"]) {
+                                        angular.forEach(newValue["contents"], function(value) {
+                                            var _lpName = value[0]["lpName"];
+                                            scope[ctrlAs]["ds_ext_lp_info"][_lpName] = {allLb : false};
+                                            var _bcCounts = 0; // 班次总数
+                                            var _lbBcCounts = 0; // 烂班班次总数
+                                            angular.forEach(value, function(bc) {
+                                                if (bc.id) {
+                                                    _bcCounts ++;
+                                                    if (bc.status == -1) {
+                                                        _lbBcCounts ++;
+                                                    }
+                                                }
+                                            });
+                                            if (_bcCounts > 0 && _bcCounts == _lbBcCounts) {
+                                                scope[ctrlAs]["ds_ext_lp_info"][_lpName].allLb = true;
+                                            }
+                                        });
+                                    }
+
+                                    // 创建ds绑定数据-线路扩展数据
+                                    scope[ctrlAs]["ds_ext_xl_info"] = {};
+                                    scope[ctrlAs]["ds_ext_xl_info"].dir0_qdzName = "";
+                                    scope[ctrlAs]["ds_ext_xl_info"].dir1_qdzName = "";
+                                    scope[ctrlAs]["ds_ext_xl_info"].dir0_tip_width = 50;
+                                    scope[ctrlAs]["ds_ext_xl_info"].dir1_tip_width = 50;
+                                    if (newValue["contents"]) {
+                                        angular.forEach(newValue["contents"], function(value) {
+                                            if (scope[ctrlAs]["ds_ext_xl_info"].dir0_qdzName
+                                                && scope[ctrlAs]["ds_ext_xl_info"].dir1_qdzName) {
+                                                return;
+                                            }
+                                            angular.forEach(value, function (bc) {
+                                                if (bc.id && bc.bcType == 'normal') {
+                                                    if (bc.xlDir == '0' && bc.qdzName && !scope[ctrlAs]["ds_ext_xl_info"].dir0_qdzName) {
+                                                        scope[ctrlAs]["ds_ext_xl_info"].dir0_qdzName = bc.qdzName;
+                                                        scope[ctrlAs]["ds_ext_xl_info"].dir0_tip_width += bc.qdzName.length * 15;
+                                                    } else if (bc.xlDir == '1' && bc.qdzName && !scope[ctrlAs]["ds_ext_xl_info"].dir1_qdzName) {
+                                                        scope[ctrlAs]["ds_ext_xl_info"].dir1_qdzName = bc.qdzName;
+                                                        scope[ctrlAs]["ds_ext_xl_info"].dir1_tip_width += bc.qdzName.length * 15;
+                                                    }
+                                                }
+
+                                            })
+                                        });
+                                    }
+
+                                    // 计算 .ttInfo_detail高度
+                                    scope[ctrlAs]["ttInfo_detail_height"] = 0;
+                                    var toolbar_height = 31; // 工具栏高度（参见template css）
+                                    var tt_table_head_height = 36; // 表格标题高度（参见template css）
+                                    var table_info_height = 30; // 表格行高度（参见template css）
+                                    var table_extra_height = 30; // 表格修正高度
+                                    if (newValue["contents"]) {
+                                        scope[ctrlAs]["ttInfo_detail_height"] =
+                                            toolbar_height +
+                                            tt_table_head_height +
+                                            table_info_height * newValue["contents"].length +
+                                            table_extra_height;
+                                    }
+
+                                    // 创建ds绑定的数据-标题扩展数据2
+                                    scope[ctrlAs]["ds_head_info2"] = [];
+                                    angular.forEach(newValue["header"], function(head) {
+                                        if (head != '路牌' && head != '驾驶员' && head != '自编号' && head != '车牌号') {
+                                            scope[ctrlAs]["ds_head_info2"].push(head);
+                                        }
+                                    });
+                                    // 2个班次一组 [上行group_no，下行group_no]，从1开始
+                                    var group_num = 1;
+                                    var group_num_array = [1, 1];
+                                    for (var i = 0; i < scope[ctrlAs]["ds_head_info2"].length; i++) {
+                                        var head = scope[ctrlAs]["ds_head_info2"][i];
+                                        if (head == scope[ctrlAs]["ds_ext_xl_info"].dir0_qdzName) {
+                                            scope[ctrlAs]["ds_head_info2"][i] = head.substr(0, 1) + group_num_array[0];
+                                        } else {
+                                            scope[ctrlAs]["ds_head_info2"][i] = head.substr(0, 1) + group_num_array[1];
+                                            group_num ++ ;
+                                            group_num_array = [group_num, group_num];
+                                        }
+
+                                        // TODO：如果是环线的话，目前group_num都是1，后面如果有变化再修正
+                                    }
+
+                                    // TODO：
+
+                                },
+                                true
+                            );
+
                         }
                     };
@@ -222,44 +222,44 @@
                         </div>
-                        <div class="form-group">
-                            <label class="col-md-5 control-label">售票员1：</label>
-                            <div class="col-md-7">
-                                <sa-Select5 name="s1"
-                                            model="ctrl.formData"
-                                            cmaps="{'s1.id' : 'id', 's1.jobCode': 'workId', 's1.name': 'name'}"
-                                            dcname="s1.id"
-                                            icname="id"
-                                            dsparams="{{ {type: 'local', param: 'ry' } | json }}"
-                                            iterobjname="item"
-                                            iterobjexp="item.name + '（' + item.workId + '）'"
-                                            searchph="请输拼音..."
-                                            searchexp="this.name"
-                                        >
-                                </sa-Select5>
-                            </div>
-
-                            <!-- 公司权限 -->
-                            <input type="hidden" name="s1_h_gs" ng-model="ctrl.formData.s1.id"
-                                   remote-Validation
-                                   remotevtype="ec_spy_gs"
-                                   remotevparam="{{ {'xl.id_eq': ctrl.xlId, 'xl.name_eq': ctrl.xlName, 'spy.id_eq': ctrl.formData.s1.id} | json}}" />
-                            <div class="alert alert-danger well-sm" ng-show="myForm.s1_h_gs.$error.remote">
-                                <i class="fa fa-times-circle" aria-hidden="true"></i>
-                                {{$remote_msg}}
-                            </div>
-                            <!-- 分公司权限 -->
-                            <input type="hidden" name="s1_h_fgs" ng-model="ctrl.formData.s1.id"
-                                   remote-Warn
-                                   remotewtype="ec_spy_fgs"
-                                   remotewparam="{{ {'xl.id_eq': ctrl.xlId, 'xl.name_eq': ctrl.xlName, 'spy.id_eq': ctrl.formData.s1.id} | json}}"
-                                   remotewmsgprop="ec_spy1_fgs_warn"
-                            />
-                            <div class="alert alert-warning well-sm" ng-show="ctrl.ec_spy1_fgs_warn">
-                                <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
-                                {{ctrl.ec_spy1_fgs_warn}}
-                            </div>
-                        </div>
+                        <!--<div class="form-group">-->
+                            <!--<label class="col-md-5 control-label">售票员1：</label>-->
+                            <!--<div class="col-md-7">-->
+                                <!--<sa-Select5 name="s1"-->
+                                            <!--model="ctrl.formData"-->
+                                            <!--cmaps="{'s1.id' : 'id', 's1.jobCode': 'workId', 's1.name': 'name'}"-->
+                                            <!--dcname="s1.id"-->
+                                            <!--icname="id"-->
+                                            <!--dsparams="{{ {type: 'local', param: 'ry' } | json }}"-->
+                                            <!--iterobjname="item"-->
+                                            <!--iterobjexp="item.name + '（' + item.workId + '）'"-->
+                                            <!--searchph="请输拼音..."-->
+                                            <!--searchexp="this.name"-->
+                                        <!--&gt;-->
+                                <!--</sa-Select5>-->
+                            <!--</div>-->
+
+                            <!--&lt;!&ndash; 公司权限 &ndash;&gt;-->
+                            <!--<input type="hidden" name="s1_h_gs" ng-model="ctrl.formData.s1.id"-->
+                                   <!--remote-Validation-->
+                                   <!--remotevtype="ec_spy_gs"-->
+                                   <!--remotevparam="{{ {'xl.id_eq': ctrl.xlId, 'xl.name_eq': ctrl.xlName, 'spy.id_eq': ctrl.formData.s1.id} | json}}" />-->
+                            <!--<div class="alert alert-danger well-sm" ng-show="myForm.s1_h_gs.$error.remote">-->
+                                <!--<i class="fa fa-times-circle" aria-hidden="true"></i>-->
+                                <!--{{$remote_msg}}-->
+                            <!--</div>-->
+                            <!--&lt;!&ndash; 分公司权限 &ndash;&gt;-->
+                            <!--<input type="hidden" name="s1_h_fgs" ng-model="ctrl.formData.s1.id"-->
+                                   <!--remote-Warn-->
+                                   <!--remotewtype="ec_spy_fgs"-->
+                                   <!--remotewparam="{{ {'xl.id_eq': ctrl.xlId, 'xl.name_eq': ctrl.xlName, 'spy.id_eq': ctrl.formData.s1.id} | json}}"-->
+                                   <!--remotewmsgprop="ec_spy1_fgs_warn"-->
+                            <!--/>-->
+                            <!--<div class="alert alert-warning well-sm" ng-show="ctrl.ec_spy1_fgs_warn">-->
+                                <!--<i class="fa fa-exclamation-triangle" aria-hidden="true"></i>-->
+                                <!--{{ctrl.ec_spy1_fgs_warn}}-->
+                            <!--</div>-->
+                        <!--</div>-->
                         <div class="form-group">
                             <label class="col-md-5 control-label">驾驶员2：</label>
@@ -301,45 +301,45 @@
                         </div>
-                        <div class="form-group">
-                            <label class="col-md-5 control-label">售票员2：</label>
-                            <div class="col-md-7">
-                                <sa-Select5 name="s2"
-                                            model="ctrl.formData"
-                                            cmaps="{'s2.id' : 'id', 's2.jobCode': 'workId', 's2.name': 'name'}"
-                                            dcname="s2.id"
-                                            icname="id"
-                                            dsparams="{{ {type: 'local', param: 'ry' } | json }}"
-                                            iterobjname="item"
-                                            iterobjexp="item.name + '（' + item.workId + '）'"
-                                            searchph="请输拼音..."
-                                            searchexp="this.name"
-                                        >
-                                </sa-Select5>
-                            </div>
-
-                            <!-- 公司权限 -->
-                            <input type="hidden" name="s2_h_gs" ng-model="ctrl.formData.s2.id"
-                                   remote-Validation
-                                   remotevtype="ec_spy_gs"
-                                   remotevparam="{{ {'xl.id_eq': ctrl.xlId, 'xl.name_eq': ctrl.xlName, 'spy.id_eq': ctrl.formData.s2.id} | json}}" />
-                            <div class="alert alert-danger well-sm" ng-show="myForm.s2_h_gs.$error.remote">
-                                <i class="fa fa-times-circle" aria-hidden="true"></i>
-                                {{$remote_msg}}
-                            </div>
-                            <!-- 分公司权限 -->
-                            <input type="hidden" name="s2_h_fgs" ng-model="ctrl.formData.s2.id"
-                                   remote-Warn
-                                   remotewtype="ec_spy_fgs"
-                                   remotewparam="{{ {'xl.id_eq': ctrl.xlId, 'xl.name_eq': ctrl.xlName, 'spy.id_eq': ctrl.formData.s2.id} | json}}"
-                                   remotewmsgprop="ec_spy2_fgs_warn"
-                            />
-                            <div class="alert alert-warning well-sm" ng-show="ctrl.ec_spy2_fgs_warn">
-                                <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
-                                {{ctrl.ec_spy2_fgs_warn}}
-                            </div>
-
-                        </div>
+                        <!--<div class="form-group">-->
+                            <!--<label class="col-md-5 control-label">售票员2：</label>-->
+                            <!--<div class="col-md-7">-->
+                                <!--<sa-Select5 name="s2"-->
+                                            <!--model="ctrl.formData"-->
+                                            <!--cmaps="{'s2.id' : 'id', 's2.jobCode': 'workId', 's2.name': 'name'}"-->
+                                            <!--dcname="s2.id"-->
+                                            <!--icname="id"-->
+                                            <!--dsparams="{{ {type: 'local', param: 'ry' } | json }}"-->
+                                            <!--iterobjname="item"-->
+                                            <!--iterobjexp="item.name + '（' + item.workId + '）'"-->
+                                            <!--searchph="请输拼音..."-->
+                                            <!--searchexp="this.name"-->
+                                        <!--&gt;-->
+                                <!--</sa-Select5>-->
+                            <!--</div>-->
+
+                            <!--&lt;!&ndash; 公司权限 &ndash;&gt;-->
+                            <!--<input type="hidden" name="s2_h_gs" ng-model="ctrl.formData.s2.id"-->
+                                   <!--remote-Validation-->
+                                   <!--remotevtype="ec_spy_gs"-->
+                                   <!--remotevparam="{{ {'xl.id_eq': ctrl.xlId, 'xl.name_eq': ctrl.xlName, 'spy.id_eq': ctrl.formData.s2.id} | json}}" />-->
+                            <!--<div class="alert alert-danger well-sm" ng-show="myForm.s2_h_gs.$error.remote">-->
+                                <!--<i class="fa fa-times-circle" aria-hidden="true"></i>-->
+                                <!--{{$remote_msg}}-->
+                            <!--</div>-->
+                            <!--&lt;!&ndash; 分公司权限 &ndash;&gt;-->
+                            <!--<input type="hidden" name="s2_h_fgs" ng-model="ctrl.formData.s2.id"-->
+                                   <!--remote-Warn-->
+                                   <!--remotewtype="ec_spy_fgs"-->
+                                   <!--remotewparam="{{ {'xl.id_eq': ctrl.xlId, 'xl.name_eq': ctrl.xlName, 'spy.id_eq': ctrl.formData.s2.id} | json}}"-->
+                                   <!--remotewmsgprop="ec_spy2_fgs_warn"-->
+                            <!--/>-->
+                            <!--<div class="alert alert-warning well-sm" ng-show="ctrl.ec_spy2_fgs_warn">-->
+                                <!--<i class="fa fa-exclamation-triangle" aria-hidden="true"></i>-->
+                                <!--{{ctrl.ec_spy2_fgs_warn}}-->
+                            <!--</div>-->
+
+                        <!--</div>-->
                         <div class="form-group">
                             <label class="col-md-5 control-label">驾驶员3：</label>
@@ -381,45 +381,45 @@
                         </div>
-                        <div class="form-group">
-                            <label class="col-md-5 control-label">售票员3：</label>
-                            <div class="col-md-7">
-                                <sa-Select5 name="s3"
-                                            model="ctrl.formData"
-                                            cmaps="{'s3.id' : 'id', 's3.jobCode': 'workId', 's3.name': 'name'}"
-                                            dcname="s3.id"
-                                            icname="id"
-                                            dsparams="{{ {type: 'local', param: 'ry' } | json }}"
-                                            iterobjname="item"
-                                            iterobjexp="item.name + '（' + item.workId + '）'"
-                                            searchph="请输拼音..."
-                                            searchexp="this.name"
-                                        >
-                                </sa-Select5>
-                            </div>
-
-                            <!-- 公司权限 -->
-                            <input type="hidden" name="s3_h_gs" ng-model="ctrl.formData.s3.id"
-                                   remote-Validation
-                                   remotevtype="ec_spy_gs"
-                                   remotevparam="{{ {'xl.id_eq': ctrl.xlId, 'xl.name_eq': ctrl.xlName, 'spy.id_eq': ctrl.formData.s3.id} | json}}" />
-                            <div class="alert alert-danger well-sm" ng-show="myForm.s3_h_gs.$error.remote">
-                                <i class="fa fa-times-circle" aria-hidden="true"></i>
-                                {{$remote_msg}}
-                            </div>
-                            <!-- 分公司权限 -->
-                            <input type="hidden" name="s3_h_fgs" ng-model="ctrl.formData.s3.id"
-                                   remote-Warn
-                                   remotewtype="ec_spy_fgs"
-                                   remotewparam="{{ {'xl.id_eq': ctrl.xlId, 'xl.name_eq': ctrl.xlName, 'spy.id_eq': ctrl.formData.s3.id} | json}}"
-                                   remotewmsgprop="ec_spy3_fgs_warn"
-                            />
-                            <div class="alert alert-warning well-sm" ng-show="ctrl.ec_spy3_fgs_warn">
-                                <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
-                                {{ctrl.ec_spy3_fgs_warn}}
-                            </div>
-
-                        </div>
+                        <!--<div class="form-group">-->
+                            <!--<label class="col-md-5 control-label">售票员3：</label>-->
+                            <!--<div class="col-md-7">-->
+                                <!--<sa-Select5 name="s3"-->
+                                            <!--model="ctrl.formData"-->
+                                            <!--cmaps="{'s3.id' : 'id', 's3.jobCode': 'workId', 's3.name': 'name'}"-->
+                                            <!--dcname="s3.id"-->
+                                            <!--icname="id"-->
+                                            <!--dsparams="{{ {type: 'local', param: 'ry' } | json }}"-->
+                                            <!--iterobjname="item"-->
+                                            <!--iterobjexp="item.name + '（' + item.workId + '）'"-->
+                                            <!--searchph="请输拼音..."-->
+                                            <!--searchexp="this.name"-->
+                                        <!--&gt;-->
+                                <!--</sa-Select5>-->
+                            <!--</div>-->
+
+                            <!--&lt;!&ndash; 公司权限 &ndash;&gt;-->
+                            <!--<input type="hidden" name="s3_h_gs" ng-model="ctrl.formData.s3.id"-->
+                                   <!--remote-Validation-->
+                                   <!--remotevtype="ec_spy_gs"-->
+                                   <!--remotevparam="{{ {'xl.id_eq': ctrl.xlId, 'xl.name_eq': ctrl.xlName, 'spy.id_eq': ctrl.formData.s3.id} | json}}" />-->
+                            <!--<div class="alert alert-danger well-sm" ng-show="myForm.s3_h_gs.$error.remote">-->
+                                <!--<i class="fa fa-times-circle" aria-hidden="true"></i>-->
+                                <!--{{$remote_msg}}-->
+                            <!--</div>-->
+                            <!--&lt;!&ndash; 分公司权限 &ndash;&gt;-->
+                            <!--<input type="hidden" name="s3_h_fgs" ng-model="ctrl.formData.s3.id"-->
+                                   <!--remote-Warn-->
+                                   <!--remotewtype="ec_spy_fgs"-->
+                                   <!--remotewparam="{{ {'xl.id_eq': ctrl.xlId, 'xl.name_eq': ctrl.xlName, 'spy.id_eq': ctrl.formData.s3.id} | json}}"-->
+                                   <!--remotewmsgprop="ec_spy3_fgs_warn"-->
+                            <!--/>-->
+                            <!--<div class="alert alert-warning well-sm" ng-show="ctrl.ec_spy3_fgs_warn">-->
+                                <!--<i class="fa fa-exclamation-triangle" aria-hidden="true"></i>-->
+                                <!--{{ctrl.ec_spy3_fgs_warn}}-->
+                            <!--</div>-->
+
+                        <!--</div>-->
                         <div class="form-group">
                             <label class="col-md-5 control-label">备注：</label>
@@ -488,4 +488,4 @@
     </div>
-</div>
 \ No newline at end of file
+</div>
@@ -24,7 +24,7 @@
         </div>
     </div>
-    <div ng-if="ctrl.viewId == 1" style="height: {{ctrl.ttHeight}}px;">
+    <div class="fixDiv" ng-if="ctrl.viewId == 1">
         <sa-Planinfoview name="saPlanView" ng-model="ctrl.saPlanInfoViewData.infos" ng-model-options="{ getterSetter: true }"
                          celldbclick="ctrl.singleEditBcDetail" toolbarlplbclick="ctrl.routeToLpLbView">
         </sa-Planinfoview>
@@ -345,7 +345,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                 });
             };
-            self.ttHeight = 350; // sa-Planinfoview组件的高度
+            self.ttHeight = 800; // sa-Planinfoview组件的高度