iss提交3<--->iss提交2之间漏掉的提交

1、添加dubbo配置（pom配置，相关dubbo消费者配置） 2、修改安全配置（开放health接口访问） 3、添加时刻表明细controller_facade，TTInfoDetailController_facade 4、添加时刻表班型明细controller_facade，TTInfoBxDetailController_facade 5、添加排班明细controller_facade，SchedulePlanInfoController_facade 6、添加日志服务controller_facade，LogController_facde 7、添加logManage相关页面 8、修改时刻表明细编辑页面，添加班型编辑列，修改相关指令

iss提交3<--->iss提交2之间漏掉的提交
1、添加dubbo配置（pom配置，相关dubbo消费者配置） 2、修改安全配置（开放health接口访问） 3、添加时刻表明细controller_facade，TTInfoDetailController_facade 4、添加时刻表班型明细controller_facade，TTInfoBxDetailController_facade 5、添加排班明细controller_facade，SchedulePlanInfoController_facade 6、添加日志服务controller_facade，LogController_facde 7、添加logManage相关页面 8、修改时刻表明细编辑页面，添加班型编辑列，修改相关指令
徐烜
1 parent 0bea80cf
Showing 30 changed files with 1668 additions and 33 deletions
pom.xml
src/main/java/com/bsth/common/Constants.java
src/main/java/com/bsth/controller/schedule/BController_facade.java
src/main/java/com/bsth/controller/schedule/core/TTInfoDetailController_facade.java
src/main/java/com/bsth/controller/schedule/core/legacy/SchedulePlanInfoController.java
src/main/java/com/bsth/controller/schedule/core/legacy/TTInfoDetailController.java
src/main/java/com/bsth/entity/schedule/TTInfoDetail.java
src/main/java/com/bsth/filter/BaseFilter.java
src/main/resources/META-INF/drools.packagebuilder.conf
src/main/resources/application-dev.properties
src/main/resources/application-prod.properties
src/main/resources/application.properties
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/saTimeTableTemplate.html
src/main/resources/static/pages/scheduleApp/module/common/prj-common-directive.js
src/main/resources/static/pages/scheduleApp/module/common/prj-common-globalservice.js
src/main/resources/static/pages/scheduleApp/module/common/prj-common-ui-route-state.js
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/detailedit/edit-bx-detail.html
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/detailedit/edit-detail.html
@@ -296,12 +296,70 @@
 			<version>1.1.8</version>
 		</dependency>
  
+        <!-- dubbo 需要的jar start -->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>dubbo</artifactId>
+            <!--<version>2.6.3</version>-->
+            <version>2.5.3</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.zookeeper</groupId>
+            <artifactId>zookeeper</artifactId>
+            <version>3.4.5</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>com.101tec</groupId>
+            <artifactId>zkclient</artifactId>
+            <version>0.3</version>
+        </dependency>
+
         <!-- plan common工程依赖 -->
         <dependency>
             <groupId>com.bsth.control_v2</groupId>
             <artifactId>plan_module-common</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <!-- plan common config 工程依赖 -->
+        <dependency>
+            <groupId>com.bsth.control_v2</groupId>
+            <artifactId>plan_module-common-config</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.7</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.1.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>log4j-over-slf4j</artifactId>
+            <version>1.7.7</version>
+        </dependency>
+
 	</dependencies>
  
 	<dependencyManagement>
@@ -323,8 +381,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>2.3.2</version><!--$NO-MVN-MAN-VER$ -->
 				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
+					<source>1.8</source>
+					<target>1.8</target>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -21,6 +21,9 @@ public class Constants {
 	public static final String LOGIN_FAILURE = "/user/loginFailure";
 	public static final String CAPTCHA = "/captcha.jpg";
  
+    // springboot manage health的检测url
+    public static final String ACTUATOR_MANAGEMENT_HEALTH = "/manage/health";
+
 	//对外的营运数据接口
 	public static final String SERVICE_INTERFACE = "/companyService/**";
  
+package com.bsth.controller.schedule;
+
+import com.bsth.common.Constants;
+import com.bsth.common.ResponseCode;
+import com.bsth.control_v2.plan_module.common.dto.PageRequestDto;
+import com.bsth.control_v2.plan_module.common.exception.PlanModuleException;
+import com.bsth.control_v2.plan_module.common.service.BServiceFacade;
+import com.bsth.entity.sys.SysUser;
+import com.bsth.service.sys.SysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpSession;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public abstract class BController_facade<Id extends Serializable, DTO> {
+    protected abstract BServiceFacade<Id, DTO> getBServiceFacade();
+
+    @Autowired
+    private SysUserService sysUserService;
+
+    //---------------- 设置操作用户 ----------------//
+    public void setCreateUserInfo(DTO dto, Integer userId, Date createDate) {
+        throw new PlanModuleException("子类必须override setCUserInfo方法！");
+    }
+    public void setUpdateUserInfo(DTO dto, Integer userId, Date updateDate) {
+        throw new PlanModuleException("子类必须override setUpdateUserInfo方法！");
+    }
+
+    //---------------- 扩展的save，update，delete操作 --------------------//
+    protected boolean isSaveExtend() {
+        return false;
+    }
+    protected DTO saveExtend(DTO dto) {
+        throw new PlanModuleException("子类如果isSaveExtend()==true，必须覆写saveExtend！");
+    }
+    protected boolean isUpdateExtend() {
+        return false;
+    }
+    protected DTO updateExtend(DTO dto) {
+        throw new PlanModuleException("子类如果isUpdateExtend()==true，必须覆写updateExtend！");
+    }
+    protected boolean isDeleteExtend() {
+        return false;
+    }
+    protected void deleteExtend(Id id) {
+        throw new PlanModuleException("子类如果isDeleteExtend()==true，必须覆写deleteExtend！");
+    }
+
+    //---------------- CRUD 操作 ----------------//
+    // Create操作
+    @RequestMapping(method = RequestMethod.POST)
+    public Map<String, Object> save(@RequestBody DTO dto, HttpSession httpSession) {
+        String userName = String.valueOf(httpSession.getAttribute(Constants.SESSION_USERNAME));
+        SysUser sysUser = sysUserService.findByUserName(userName);
+        setCreateUserInfo(dto, sysUser.getId(), new Date());
+        setUpdateUserInfo(dto, sysUser.getId(), new Date());
+
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            DTO dto_saved;
+            if (isSaveExtend()) {
+                dto_saved = saveExtend(dto);
+            } else {
+                dto_saved = getBServiceFacade().save(dto);
+            }
+            rtn.put("status", ResponseCode.SUCCESS);
+            rtn.put("data", dto_saved);
+        } catch (Exception exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
+
+    // Update操作
+    @RequestMapping(value="/{id}", method = RequestMethod.POST)
+    public Map<String, Object> update(@RequestBody DTO dto, HttpSession httpSession) {
+        String userName = String.valueOf(httpSession.getAttribute(Constants.SESSION_USERNAME));
+        SysUser sysUser = sysUserService.findByUserName(userName);
+        setUpdateUserInfo(dto, sysUser.getId(), new Date());
+
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            DTO dto_updated;
+            if (isUpdateExtend()) {
+                dto_updated = updateExtend(dto);
+            } else {
+                dto_updated = getBServiceFacade().save(dto);
+            }
+            rtn.put("status", ResponseCode.SUCCESS);
+            rtn.put("data", dto_updated);
+        } catch (Exception exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
+
+    // Research操作
+    @RequestMapping(value = "/{id}", method = RequestMethod.GET)
+    public Map<String, Object> findById(@PathVariable("id") Id id) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            DTO dto = getBServiceFacade().findById(id);
+            rtn.put("status", ResponseCode.SUCCESS);
+            rtn.put("data", dto);
+        } catch (Exception exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
+
+    // 查询所有操作
+    @RequestMapping(value = "/all", method = RequestMethod.GET)
+    public Map<String, Object> list(@RequestParam Map<String, Object> param) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            List<DTO> tList = getBServiceFacade().list(param);
+            rtn.put("status", ResponseCode.SUCCESS);
+            rtn.put("data", tList);
+        } catch (Exception exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+        return rtn;
+    }
+
+    // 分页查询操作
+    @RequestMapping(method = RequestMethod.GET)
+    public Map<String, Object> list(
+            @RequestParam Map<String, Object> map,
+            @RequestParam(defaultValue = "0") int page,
+            @RequestParam(defaultValue = "10") int size,
+            @RequestParam(defaultValue = "id") String order,
+            @RequestParam(defaultValue = "DESC") String direction) {
+        PageRequestDto pageRequestDto = PageRequestDto.getBuilder()
+                .setPage(page)
+                .setSize(size)
+                .setOrder(order)
+                .setDirection(direction)
+                .build();
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            rtn.put("data", getBServiceFacade().list(map, pageRequestDto));
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (Exception exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+        return rtn;
+    }
+
+    // Delete操作
+    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
+    public Map<String, Object> delete(@PathVariable("id") Id id, HttpSession httpSession) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            // 由于种种原因，这里不保存用户和操作时间了
+            if (isDeleteExtend()) {
+                deleteExtend(id);
+            } else {
+                getBServiceFacade().delete(id);
+            }
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (Exception exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+        return rtn;
+    }
+}
@@ -120,7 +120,6 @@ public class TTInfoDetailController_facade extends BController_facade&lt;Long, TTIn
         return rtn;
     }
  
-
     //--------------- TODO：以下操作不属于BController_facade，暂时没用定义在TTInfoDetailServiceFacade中 ----------//
     @Autowired
     private TTInfoDetailService ttInfoDetailService;
@@ -323,5 +322,4 @@ public class TTInfoDetailController_facade extends BController_facade&lt;Long, TTIn
         is.close();
     }
  
-
 }
@@ -18,10 +18,7 @@ import java.util.Map;
  * Created by xu on 17/5/1.
  */
 @RestController
-<<<<<<< HEAD
-=======
 @ConditionalOnMissingBean(SchedulePlanInfoController_facade.class)
->>>>>>> b165084... iss提交16；
 @RequestMapping("spic")
 public class SchedulePlanInfoController extends BController<SchedulePlanInfo, Long> {
     @Autowired
@@ -24,10 +24,7 @@ import java.util.Map;
  * Created by xu on 17/1/4.
  */
 @RestController
-<<<<<<< HEAD
-=======
 @ConditionalOnMissingBean(TTInfoDetailController_facade.class)
->>>>>>> b165084... iss提交16；
 @RequestMapping("tidc")
 public class TTInfoDetailController extends BController<TTInfoDetail, Long> {
     @Autowired
@@ -80,6 +80,8 @@ public class TTInfoDetail extends BEntity {
     private Double jhlc;
     /** 班次历时 */
     private Integer bcsj;
+    /** 例保时间（主要是进出场班次使用） */
+    private Integer lbsj;
  
     /** 班次类型 字典type=ScheduleType */
     @Column(nullable = false)
@@ -230,6 +232,14 @@ public class TTInfoDetail extends BEntity {
         this.bcsj = bcsj;
     }
  
+    public Integer getLbsj() {
+        return lbsj;
+    }
+
+    public void setLbsj(Integer lbsj) {
+        this.lbsj = lbsj;
+    }
+
     public String getBcType() {
         return bcType;
     }
@@ -17,7 +17,7 @@ public abstract class BaseFilter implements Filter {
 	 * 白名单
 	 */
 	private String[] whiteListURLs = { Constants.LOGIN_PAGE,Constants.CAPTCHA, Constants.SERVICE_INTERFACE,
-			Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL, Constants.LOGIN, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.XD_REAL_GPS, Constants.UP_RFID_URL, Constants.STATION_AND_SECTION_COUNT };
+			Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL, Constants.LOGIN, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.XD_REAL_GPS, Constants.UP_RFID_URL, Constants.STATION_AND_SECTION_COUNT, Constants.ACTUATOR_MANAGEMENT_HEALTH };
  
 	@Override
 	public void destroy() {
+# 貌似用import accumulate报错，使用配置文件方式
+
+drools.accumulate.function.gidscount = com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop.GidsCountFunction
+drools.accumulate.function.gidfbtime = com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop.GidFbTimeFunction
+drools.accumulate.function.gidfbfcno = com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop.GidFbFcnoFunction
+
+drools.accumulate.function.lpinforesult = com.bsth.service.schedule.impl.plan.kBase1.core.ttinfo.LpInfoResultsFunction
+drools.accumulate.function.minruleqyrq = com.bsth.service.schedule.impl.plan.kBase1.core.ttinfo.MinRuleQyrqFunction
+
+drools.accumulate.function.vrb = com.bsth.service.schedule.impl.plan.kBase1.core.validate.ValidRepeatBcFunction
+drools.accumulate.function.vwrb = com.bsth.service.schedule.impl.plan.kBase1.core.validate.ValidWholeRerunBcFunction
+drools.accumulate.function.vwlp = com.bsth.service.schedule.impl.plan.kBase1.core.validate.ValidWantLpFunction
@@ -5,7 +5,7 @@ management.security.enabled=false
 management.context-path=/manage
  
 # dubbo服务化使用开关flag
-dubbo.use=true
+dubbo.use=false
  
 spring.jpa.hibernate.ddl-auto= update
 spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
@@ -16,7 +16,7 @@ spring.datasource.driver-class-name= com.mysql.jdbc.Driver
 spring.datasource.url= jdbc:mysql://127.0.0.1/test_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 #spring.datasource.url= jdbc:mysql://192.168.168.222/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username= root
-spring.datasource.password= root
+spring.datasource.password=
 #spring.datasource.url= jdbc:mysql://192.168.168.117/pd_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 #spring.datasource.username= root
 #spring.datasource.password= root
 server.port=9088
-management.port= 9001
-management.address= 127.0.0.1
+#management.port= 9001
+#management.address= 127.0.0.1
+management.security.enabled=false
+management.context-path=/manage
+dubbo.use=true
  
 spring.jpa.hibernate.ddl-auto= update
 spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
 spring.profiles: dev,prod
-spring.profiles.active: prod
+spring.profiles.active: dev
  
 spring.view.suffix=.html
 server.session-timeout=-1
@@ -119,7 +119,8 @@ module.exports = function (grunt) {
                     'module/core/scheduleRuleManage/route.js', // 排班规则管理模块
                     'module/core/ttInfoManage/route.js', // 时刻表管理模块
                     'module/core/ttInfoManage/detailedit/route.js', // 时刻表明细管理模块
-                    'module/core/ttInfoManage2/route.js' // 智能时刻表管理模块
+                    'module/core/ttInfoManage2/route.js', // 智能时刻表管理模块
+                    'module/sys/logManage/route.js' // 日志管理模块
                 ],
                 dest: 'module/common/prj-common-ui-route-state.js'
             },
@@ -139,6 +140,7 @@ module.exports = function (grunt) {
                     'module/core/schedulePlanManage/service.js', // 排班计划管理service
                     'module/core/scheduleRuleManage/service.js', // 排班规则管理service
                     'module/core/ttInfoManage/service.js', // 时刻表管理service
+                    'module/sys/logManage/service.js', // 日志管理service
                     'module/common/prj-common-globalservice-legacy.js' // 其他用service
                 ],
                 dest: 'module/common/prj-common-globalservice.js'
@@ -2,6 +2,7 @@
  * saTimeTable指令，时刻表显示指令，excel表格形式，支持菜单，事件处理。
  * name（必须），控件的名字
  * celldbclickFn，单元格双击事件
+ * lpbxdbclickFn，路牌班型单元双击事件
  * ds，外部数据源
  *
  * TODO：优化开发中
@@ -175,6 +176,24 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                     return bcInfo;
                 },
  
+                /**
+                 * 创建班型信息。
+                 * @param bcInfo new BcInfo
+                 */
+                createBxInfo: function(bcInfo) {
+                    var bxInfo = {};
+                    bxInfo.xl = {};
+                    bxInfo.ttinfo = {};
+                    bxInfo.lp = {};
+                    bxInfo.lp.id = bcInfo && bcInfo.lpId;
+                    bxInfo.lp.lpName = bcInfo && bcInfo.lpName;
+                    bxInfo.bxType1 = "_null_";
+                    bxInfo.bxType2 = "_null_";
+                    bxInfo.bxPds = "0";
+
+                    return bxInfo;
+                },
+
                 // TODO：
                 initTTInfoDetail: function(formobj, cellinfo, colinfo, xlid, xlname, ttid, ttname) {
                     formobj.xl = {};
@@ -216,7 +235,8 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                 scope: { // 独立作用域
                     // 注意：数据暂时从外部ngModel里获取，以后内部自己处理
                     ds: "=ngModel",
-                    celldbclickFn: "&celldbclick"
+                    celldbclickFn: "&celldbclick",
+                    lpbxdbclickFn: "&lpbxdbclick"
  
                     // TODO：
  
@@ -293,6 +313,9 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                     }
                                 }
                             };
+                            scope[ctrlAs].$$bx_cell_dbclick = function(rowindex) {
+                                scope[ctrlAs].lpbxdbclickFn()(rowindex);
+                            };
  
                             // ------------------- 监控function ------------------//
                             // 监控明细数据，生成表头的tooltip
@@ -312,12 +312,23 @@
  
                                     <div class="tt_table_head" style="z-index: 120; top: 0;">
                                         <dl style="height: 36px; border-bottom: 2px solid #96b9d7;">
-                                            <dt style="width: 50px;">
+                                            <dt style="width: 50px; text-align: center;">
                                                 序号
                                             </dt>
+
                                             <dt style="width: 55px; border-right: 2px solid #96b9d7;">
                                                 路牌
                                             </dt>
+
+                                            <dt style="width: 50px;">
+                                                班型1
+                                            </dt>
+                                            <dt style="width: 50px;">
+                                                班型2
+                                            </dt>
+                                            <dt style="width: 50px; border-right: 2px solid #96b9d7;">
+                                                配档数
+                                            </dt>
                                         </dl>
                                     </div>
  
@@ -327,8 +338,9 @@
                                             <dt>
                                                 序号
                                             </dt>
+
                                             <dt ng-repeat="head in $saTimeTableCtrl.ds.detailHeads track by $index">
-                                                {{(head != '路牌' && head != '空驶班次/空驶里程' && head != '运营班次/运营里程') ? (head.substr(0, 1) + $index): head}}
+                                                {{(head != '路牌' && head != '班型1' && head != '班型2' && head != '配档数' && head != '空驶班次/空驶里程' && head != '运营班次/运营里程') ? (head.substr(0, 1) + ($index - 3)): head}}
                                             </dt>
                                         </dl>
                                     </div>
@@ -336,30 +348,80 @@
                                     <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-dblclick="$saTimeTableCtrl.$$bx_cell_dbclick(rowIndex)"
                                                 ng-if="$index == 0" style="width: 55px; border-right: 2px solid #96b9d7;">
                                                 {{cell.fcsj}}
                                             </dd>
  
+                                            <dd style="width: 50px;"
+                                                ng-if="$saTimeTableCtrl.ds.rowBxInfo.length > rowIndex"
+                                                ng-dblclick="$saTimeTableCtrl.$$bx_cell_dbclick(rowIndex)">
+                                                {{$saTimeTableCtrl.ds.rowBxInfo[rowIndex].bxType1 | dict:'ScheduleBxType':'未知'}}
+                                            </dd>
+                                            <dd style="width: 50px;"
+                                                ng-if="$saTimeTableCtrl.ds.rowBxInfo.length > rowIndex"
+                                                ng-dblclick="$saTimeTableCtrl.$$bx_cell_dbclick(rowIndex)">
+                                                {{$saTimeTableCtrl.ds.rowBxInfo[rowIndex].bxType2 | dict:'ScheduleBxType':'未知'}}
+                                            </dd>
+                                            <dd style="width: 50px; border-right: 2px solid #96b9d7;"
+                                                ng-if="$saTimeTableCtrl.ds.rowBxInfo.length > rowIndex"
+                                                ng-dblclick="$saTimeTableCtrl.$$bx_cell_dbclick(rowIndex)">
+                                                {{$saTimeTableCtrl.ds.rowBxInfo[rowIndex].bxPds}}
+                                            </dd>
+
+                                            <dd style="width: 50px;"
+                                                ng-if="$saTimeTableCtrl.ds.rowBxInfo.length <= rowIndex"
+                                                ng-dblclick="$saTimeTableCtrl.$$bx_cell_dbclick(rowIndex)">
+                                                _null_
+                                            </dd>
+                                            <dd style="width: 50px;"
+                                                ng-if="$saTimeTableCtrl.ds.rowBxInfo.length <= rowIndex"
+                                                ng-dblclick="$saTimeTableCtrl.$$bx_cell_dbclick(rowIndex)">
+                                                _null_
+                                            </dd>
+                                            <dd style="width: 50px; border-right: 2px solid #96b9d7;"
+                                                ng-if="$saTimeTableCtrl.ds.rowBxInfo.length <= rowIndex"
+                                                ng-dblclick="$saTimeTableCtrl.$$bx_cell_dbclick(rowIndex)">
+                                                0
+                                            </dd>
+
                                         </dl>
                                     </div>
  
                                     <div class="tt_table_body">
                                         <dl ng-repeat="info in $saTimeTableCtrl.ds.detailInfos track by $index"
                                             ng-init="rowIndex = $index">
+
                                             <dd>
                                                 {{rowIndex + 1}}
                                             </dd>
+
+                                            <dd>
+                                                路牌
+                                            </dd>
+
+                                            <dd style="width: 50px;">
+                                                班型1
+                                            </dd>
+                                            <dd style="width: 50px;">
+                                                班型2
+                                            </dd>
+                                            <dd style="width: 50px; border-right: 2px solid #96b9d7;">
+                                                配档数
+                                            </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"
                                                 ng-class="{
                                                     lpName: !cell.ttdid,
                                                     error: cell.isValidInfo,
@@ -4066,6 +4066,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saBcgroup&#39;, [
  * saTimeTable指令，时刻表显示指令，excel表格形式，支持菜单，事件处理。
  * name（必须），控件的名字
  * celldbclickFn，单元格双击事件
+ * lpbxdbclickFn，路牌班型单元双击事件
  * ds，外部数据源
  *
  * TODO：优化开发中
@@ -4239,6 +4240,24 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                     return bcInfo;
                 },
  
+                /**
+                 * 创建班型信息。
+                 * @param bcInfo new BcInfo
+                 */
+                createBxInfo: function(bcInfo) {
+                    var bxInfo = {};
+                    bxInfo.xl = {};
+                    bxInfo.ttinfo = {};
+                    bxInfo.lp = {};
+                    bxInfo.lp.id = bcInfo && bcInfo.lpId;
+                    bxInfo.lp.lpName = bcInfo && bcInfo.lpName;
+                    bxInfo.bxType1 = "_null_";
+                    bxInfo.bxType2 = "_null_";
+                    bxInfo.bxPds = "0";
+
+                    return bxInfo;
+                },
+
                 // TODO：
                 initTTInfoDetail: function(formobj, cellinfo, colinfo, xlid, xlname, ttid, ttname) {
                     formobj.xl = {};
@@ -4280,7 +4299,8 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                 scope: { // 独立作用域
                     // 注意：数据暂时从外部ngModel里获取，以后内部自己处理
                     ds: "=ngModel",
-                    celldbclickFn: "&celldbclick"
+                    celldbclickFn: "&celldbclick",
+                    lpbxdbclickFn: "&lpbxdbclick"
  
                     // TODO：
  
@@ -4357,6 +4377,9 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                     }
                                 }
                             };
+                            scope[ctrlAs].$$bx_cell_dbclick = function(rowindex) {
+                                scope[ctrlAs].lpbxdbclickFn()(rowindex);
+                            };
  
                             // ------------------- 监控function ------------------//
                             // 监控明细数据，生成表头的tooltip
@@ -829,6 +829,48 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                         }
                     }
                 ),
+                rest_bx: $resource(
+                    '/tibxdc/:id',
+                    {order: 'createDate', direction: 'DESC', id: '@id'},
+                    {
+                        list: {
+                            method: 'GET',
+                            params: {
+                                page: 0
+                            },
+                            transformResponse: function(rs) {
+                                var dst = angular.fromJson(rs);
+                                if (dst.status == 'SUCCESS') {
+                                    return dst.data;
+                                } else {
+                                    return dst; // 业务错误留给控制器处理
+                                }
+                            }
+                        },
+                        get: {
+                            method: 'GET',
+                            transformResponse: function(rs) {
+                                var dst = angular.fromJson(rs);
+                                if (dst.status == 'SUCCESS') {
+                                    return dst.data;
+                                } else {
+                                    return dst; // 业务错误留给控制器处理
+                                }
+                            }
+                        },
+                        save: {
+                            method: 'POST',
+                            transformResponse: function(rs) {
+                                var dst = angular.fromJson(rs);
+                                if (dst.status == 'SUCCESS') {
+                                    return dst.data;
+                                } else {
+                                    return dst; // 业务错误留给控制器处理
+                                }
+                            }
+                        }
+                    }
+                ),
                 import: $resource(
                     '/tidc/importFile',
                     {},
@@ -899,6 +941,50 @@ angular.module(&#39;ScheduleApp&#39;).factory(
  
     ]
 );
+// 时刻表日志管理service
+angular.module('ScheduleApp').factory(
+    'TimetableLogManageService_g',
+    [
+        '$resource',
+        function($resource) {
+            return {
+                rest: $resource(
+                    '/s_log/:id',
+                    {order: 'opEndTime', direction: 'DESC', id: '@id'},
+                    {
+                        list: {
+                            method: 'GET',
+                            params: {
+                                page: 0
+                            },
+                            transformResponse: function(rs) {
+                                var dst = angular.fromJson(rs);
+                                if (dst.status == 'SUCCESS') {
+                                    return dst.data;
+                                } else {
+                                    return dst; // 业务错误留给控制器处理
+                                }
+                            }
+                        },
+                        get: {
+                            method: 'GET',
+                            transformResponse: function(rs) {
+                                var dst = angular.fromJson(rs);
+                                if (dst.status == 'SUCCESS') {
+                                    return dst.data;
+                                } else {
+                                    return dst;
+                                }
+                            }
+                        }
+                    }
+                )
+
+
+            };
+        }
+    ]
+);
 // 项目通用的全局service服务，供不同的controller使用，自定义指令不使用
  
 // 文件下载服务
@@ -1224,6 +1224,25 @@ ScheduleApp.config([
                     }]
                 }
             })
+            .state("ttInfoDetailManage_bx_detail_edit", { // 时刻表详细信息班型单元格编辑
+                url: '/ttInfoDetailManage_bx_detail_edit/:xlid/:ttid/:xlname/:ttname/:rowindex/:lineversion',
+                views: {
+                    "": {templateUrl: 'pages/scheduleApp/module/core/ttInfoManage/detailedit/edit-bx-detail.html'}
+                },
+                resolve: {
+                    deps: ['$ocLazyLoad', function($ocLazyLoad) {
+                        return $ocLazyLoad.load({
+                            name: 'ttInfoDetailManage_bx_detail_edit_module',
+                            insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
+                            files: [
+                                "assets/bower_components/angular-ui-select/dist/select.min.css",
+                                "assets/bower_components/angular-ui-select/dist/select.min.js",
+                                "pages/scheduleApp/module/core/ttInfoManage/detailedit/timeTableDetailManage_old.js"
+                            ]
+                        });
+                    }]
+                }
+            })
             .state("ttInfoDetailManage_detail_edit", { // 时刻表详细信息单元格编辑
                 url: '/ttInfoDetailManage_detail_edit/:id/:xlid/:ttid/:xlname/:ttname/:rowindex/:colindex/:lineversion',
                 views: {
@@ -1382,4 +1401,62 @@ ScheduleApp.config([
  
  
     }
+]);
+// ui route 配置
+
+/** 日志管理配置route */
+ScheduleApp.config([
+    '$stateProvider',
+    function($stateProvider) {
+        $stateProvider
+            .state('logManage', { // index页面
+                url: '/logManage',
+                views: {
+                    "": {
+                        templateUrl: 'pages/scheduleApp/module/sys/logManage/index.html'
+                    },
+                    "logManage_list@logManage": {
+                        templateUrl: 'pages/scheduleApp/module/sys/logManage/list.html'
+                    }
+                },
+
+                resolve: {
+                    deps: ['$ocLazyLoad', function($ocLazyLoad) {
+                        return $ocLazyLoad.load({
+                            name: 'logManage_module',
+                            insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
+                            files: [
+                                "assets/bower_components/angular-ui-select/dist/select.min.css",
+                                "assets/bower_components/angular-ui-select/dist/select.min.js",
+                                "pages/scheduleApp/module/sys/logManage/module.js"
+                            ]
+                        });
+                    }]
+                }
+            })
+            .state('logManage_detail', { // detail.html页面
+                url: 'logManage_detail/:id',
+                views: {
+                    "": {templateUrl: 'pages/scheduleApp/module/sys/logManage/detail.html'}
+                },
+                resolve: {
+                    deps: ['$ocLazyLoad', function($ocLazyLoad) {
+                        return $ocLazyLoad.load({
+                            name: 'logManage_detail_module',
+                            insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
+                            files: [
+                                "pages/scheduleApp/module/sys/logManage/module.js"
+                            ]
+                        });
+                    }]
+                }
+            })
+
+
+
+
+
+
+
+    }
 ]);
 \ No newline at end of file
+<div ng-controller="TimeTableBxDetailManageFormCtrl_old as ctrl">
+    <div class="page-head">
+        <div class="page-title">
+            <h1>修改班型信息</h1>
+        </div>
+    </div>
+
+    <ul class="page-breadcrumb breadcrumb">
+        <li>
+            <a href="/pages/home.html" data-pjax>首页</a>
+            <i class="fa fa-circle"></i>
+        </li>
+        <li>
+            <span class="active">运营计划管理</span>
+            <i class="fa fa-circle"></i>
+        </li>
+        <li>
+            <a ui-sref="ttInfoManage">时刻表管理</a>
+            <i class="fa fa-circle"></i>
+        </li>
+        <li>
+            <a ui-sref="ttInfoDetailManage_edit3({xlid: ctrl.xlid, ttid: ctrl.ttid, xlname: ctrl.xlname, ttname: ctrl.ttname, lineversion: ctrl.lineversion})"><span ng-bind="ctrl.title1"></span></a>
+            <i class="fa fa-circle"></i>
+        </li>
+        <li>
+            <span class="active">修改班型信息</span>
+        </li>
+    </ul>
+
+    <div class="portlet light bordered">
+        <div class="portlet-title">
+            <div class="caption">
+                <div>
+                    <i class="icon-equalizer font-red-sunglo"></i>
+                    <span class="caption-subject font-red-sunglo bold uppercase" ng-bind="ctrl.title2"></span>
+                </div>
+                <div style="padding-top: 10px;">
+                    <i class="icon-equalizer font-red-sunglo"></i>
+                    <span class="caption-subject font-red-sunglo bold uppercase" ng-bind="ctrl.title_tip"></span>
+                </div>
+            </div>
+        </div>
+
+        <div class="portlet-body form">
+            <form ng-submit="ctrl.submit()" class="form-horizontal" novalidate name="myForm">
+                <div class="form-body">
+                    <div class="form-group has-success has-feedback">
+                        <label class="col-md-2 control-label">线路*：</label>
+                        <div class="col-md-3">
+                            <input type="text" class="form-control" name="xl"
+                                   ng-model="ctrl.xlname"
+                                   readonly required/>
+                        </div>
+                        <!-- 隐藏块，显示验证信息 -->
+                        <div class="alert alert-danger well-sm" ng-show="myForm.xl.$error.required">
+                            线路必须存在
+                        </div>
+                    </div>
+
+                    <div class="form-group has-success has-feedback">
+                        <label class="col-md-2 control-label">时刻表名称*：</label>
+                        <div class="col-md-3">
+                            <input type="text" class="form-control" name="ttinfo"
+                                   ng-model="ctrl.ttname"
+                                   readonly required/>
+                        </div>
+                        <!-- 隐藏块，显示验证信息 -->
+                        <div class="alert alert-danger well-sm" ng-show="myForm.ttinfo.$error.required">
+                            时刻表必须存在
+                        </div>
+                    </div>
+
+                    <div class="form-group has-success has-feedback">
+                        <label class="col-md-2 control-label">路牌*：</label>
+                        <div class="col-md-3">
+                            <input type="text" class="form-control" name="lp"
+                                   ng-model="ctrl.bxInfo.lp.lpName"
+                                   readonly required/>
+                        </div>
+                        <!-- 隐藏块，显示验证信息 -->
+                        <div class="alert alert-danger well-sm" ng-show="myForm.lp.$error.required">
+                            路牌必须存在
+                        </div>
+                    </div>
+
+                    <div class="form-group has-success has-feedback">
+                        <label class="col-md-2 control-label">班型1*：</label>
+                        <div class="col-md-3">
+                            <sa-Select5 name="bxType1"
+                                        model="ctrl.bxInfo"
+                                        cmaps="{'bxType1': 'code'}"
+                                        dcname="bxType1"
+                                        icname="code"
+                                        dsparams="{{ {type: 'dic', param: 'ScheduleBxType' } | json }}"
+                                        iterobjname="item"
+                                        iterobjexp="item.name"
+                                        searchph="请选择班型类型..."
+                                        searchexp="this.name"
+                                        required
+                            >
+                            </sa-Select5>
+                        </div>
+                        <!-- 隐藏块，显示验证信息 -->
+                        <div class="alert alert-danger well-sm" ng-show="myForm.bxType1.$error.required">
+                            班型类型必须选择
+                        </div>
+
+                    </div>
+
+                    <div class="form-group has-success has-feedback">
+                        <label class="col-md-2 control-label">班型2*：</label>
+                        <div class="col-md-3">
+                            <sa-Select5 name="bxType2"
+                                        model="ctrl.bxInfo"
+                                        cmaps="{'bxType2': 'code'}"
+                                        dcname="bxType2"
+                                        icname="code"
+                                        dsparams="{{ {type: 'dic', param: 'ScheduleBxType' } | json }}"
+                                        iterobjname="item"
+                                        iterobjexp="item.name"
+                                        searchph="请选择班型类型..."
+                                        searchexp="this.name"
+                                        required
+                            >
+                            </sa-Select5>
+                        </div>
+                        <!-- 隐藏块，显示验证信息 -->
+                        <div class="alert alert-danger well-sm" ng-show="myForm.bxType2.$error.required">
+                            班型类型必须选择
+                        </div>
+
+                    </div>
+
+                    <div class="form-group">
+                        <label class="col-md-2 control-label">配档数*：</label>
+                        <div class="col-md-3">
+                            <input type="text" class="form-control" name="bxPds"
+                                   ng-model="ctrl.bxInfo.bxPds" required
+                            />
+                        </div>
+                        <!-- 隐藏块，显示验证信息 -->
+                        <div class="alert alert-danger well-sm" ng-show="myForm.bxPds.$error.required">
+                            人员配档数必须填写
+                        </div>
+
+                    </div>
+
+                </div>
+
+                <div class="form-actions">
+                    <div class="row">
+                        <div class="col-md-offset-3 col-md-4">
+                            <button type="submit" class="btn green"
+                                    ng-disabled="!myForm.$valid"><i class="fa fa-check"></i> 提交</button>
+                            <a type="button" class="btn default"
+                               ui-sref="ttInfoDetailManage_edit3({xlid: ctrl.xlid, ttid : ctrl.ttid, xlname: ctrl.xlname, ttname : ctrl.ttname, lineversion : ctrl.lineversion})" ><i class="fa fa-times"></i> 取消</a>
+                        </div>
+                    </div>
+                </div>
+
+            </form>
+
+        </div>
+
+
+    </div>
+
+</div>
 \ No newline at end of file
@@ -160,8 +160,8 @@
                         </div>
  
                     </div>
-                    <div class="form-group">
-                        <label class="col-md-2 control-label">计划里程：</label>
+                    <div class="form-group has-success has-feedback">
+                        <label class="col-md-2 control-label">计划里程*：</label>
                         <div class="col-md-3">
                             <input type="text" class="form-control" name="jhlc"
                                    ng-model="ctrl.TimeTableDetailForSave.jhlc" required ng-pattern="ctrl.float_regex"
@@ -176,8 +176,8 @@
                         </div>
  
                     </div>
-                    <div class="form-group">
-                        <label class="col-md-2 control-label">班次历时：</label>
+                    <div class="form-group has-success has-feedback">
+                        <label class="col-md-2 control-label">班次历时*：</label>
                         <div class="col-md-3">
                             <input type="text" class="form-control" name="bcsj"
                                    ng-model="ctrl.TimeTableDetailForSave.bcsj" required ng-pattern="ctrl.number_regex"
@@ -192,6 +192,20 @@
                         </div>
  
                     </div>
+
+                    <div class="form-group">
+                        <label class="col-md-2 control-label">例保时间：</label>
+                        <div class="col-md-3">
+                            <input type="text" class="form-control" name="lbsj"
+                                   ng-model="ctrl.TimeTableDetailForSave.lbsj" ng-pattern="ctrl.number_regex"
+                            />
+                        </div>
+                        <!-- 隐藏块，显示验证信息 -->
+                        <div class="alert alert-danger well-sm" ng-show="myForm.lbsj.$error.pattern">
+                            输入整数
+                        </div>
+                    </div>
+
                     <div class="form-group has-success has-feedback">
                         <label class="col-md-2 control-label">班次类型*：</label>
                         <div class="col-md-3">
@@ -139,14 +139,14 @@
  
                 <!--<div ng-view></div>-->
                 <div style="height: {{ctrl.ttHeight}}px;"
-                     ng-show="ctrl.currentView.viewId == 1">
-                    <sa-Timetable name="tt" ng-model="ctrl.editInfo" ng-model-options="{ getterSetter: true }" celldbclick="ctrl.singleEditBcDetail">
+                     ng-if="ctrl.currentView.viewId == 1">
+                    <sa-Timetable name="tt" ng-model="ctrl.editInfo" ng-model-options="{ getterSetter: true }" celldbclick="ctrl.singleEditBcDetail" lpbxdbclick="ctrl.lpbxEditDetail">
  
                     </sa-Timetable>
                 </div>
  
                 <div style="height: {{ctrl.ttHeight}}px;"
-                     ng-show="ctrl.currentView.viewId == 2">
+                     ng-if="ctrl.currentView.viewId == 2">
                     <sa-Timetable2 name="tt2" ng-model="ctrl.pvInfo" ng-model-options="{ getterSetter: true }" >
  
                     </sa-Timetable2>
@@ -81,6 +81,25 @@ ScheduleApp.config([
                     }]
                 }
             })
+            .state("ttInfoDetailManage_bx_detail_edit", { // 时刻表详细信息班型单元格编辑
+                url: '/ttInfoDetailManage_bx_detail_edit/:xlid/:ttid/:xlname/:ttname/:rowindex/:lineversion',
+                views: {
+                    "": {templateUrl: 'pages/scheduleApp/module/core/ttInfoManage/detailedit/edit-bx-detail.html'}
+                },
+                resolve: {
+                    deps: ['$ocLazyLoad', function($ocLazyLoad) {
+                        return $ocLazyLoad.load({
+                            name: 'ttInfoDetailManage_bx_detail_edit_module',
+                            insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
+                            files: [
+                                "assets/bower_components/angular-ui-select/dist/select.min.css",
+                                "assets/bower_components/angular-ui-select/dist/select.min.js",
+                                "pages/scheduleApp/module/core/ttInfoManage/detailedit/timeTableDetailManage_old.js"
+                            ]
+                        });
+                    }]
+                }
+            })
             .state("ttInfoDetailManage_detail_edit", { // 时刻表详细信息单元格编辑
                 url: '/ttInfoDetailManage_detail_edit/:id/:xlid/:ttid/:xlname/:ttname/:rowindex/:colindex/:lineversion',
                 views: {
@@ -9,7 +9,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(
         'SaTimeTableUtils',
         function(service, service2, $state, $q, SaTimeTableUtils) {
  
-            // 查询对象类
+            // 班次查询对象类
             var queryClass = service.rest;
  
             // 时刻表信息（编辑视图使用）
@@ -17,6 +17,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                 detailHeads: [], // 时刻表头信息
                 detailInfos: [], // 时刻表明细信息
                 columnBcInfo: [], // 每列班次的信息
+                rowBxInfo: [], // 每行路牌班型相关信息
                 yydesc: "" // 营运汇总描述
             };
  
@@ -69,6 +70,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                         detailHeads: [], // 时刻表头信息
                         detailInfos: [], // 时刻表明细信息
                         columnBcInfo: [], // 每列班次的信息（保存每列的站点信息）
+                        rowBxInfo: [], // 每行路牌班型相关信息
                         yydesc: "" // 营运汇总描述
                     };
  
@@ -107,6 +109,79 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                             }
  
                             console.log(editInfo.columnBcInfo);
+
+                            //--------------- 获取班型信息 ----------------//
+
+                            // 1、在detailHeads第一个位置后插入（班型1，班型2，配档数）列
+                            if (editInfo.detailHeads && editInfo.detailHeads.length > 0) {
+                                editInfo.detailHeads.shift();
+                                editInfo.detailHeads.unshift("路牌", "班型1", "班型2", "配档数");
+                            }
+                            // 2、构造班型数据（TODO：这里模拟entity dto）
+                            editInfo.rowBxInfo = [];
+                            var olp_index = {}; // key为路牌id，value为rowBxInfo的下标
+                            // 2-1、从detailInfos中构造初始班型数据（模拟创建TTInfoBxDetailDto）
+                            var bxInfo_temp = {};
+                            for (i = 0; i < editInfo.detailInfos.length; i++) {
+                                for (j = 0; j < editInfo.detailInfos[i].length; j++) {
+                                    bxInfo_temp = SaTimeTableUtils.createBxInfo(
+                                        editInfo.detailInfos[i][j]);
+                                    if (bxInfo_temp.lp && bxInfo_temp.lp.id) {
+                                        // 覆值线路id和时刻表id
+                                        bxInfo_temp.xl.id = xlid;
+                                        bxInfo_temp.ttinfo.id = ttid;
+                                        editInfo.rowBxInfo.push(bxInfo_temp);
+
+                                        // 路牌索引
+                                        olp_index[bxInfo_temp.lp.id] = i;
+                                        break;
+                                    }
+                                }
+                            }
+
+                            // 2-2：TODO：从后台获取班型数据（TTInfoBxDetailDto格式），并更新editInfo.rowBxInfo中的对应路牌班型值
+                            var lp_bx_index;
+                            service.rest_bx.list(
+                                {page : 0, size : 1000, "xl.id_eq" : xlid, "ttinfo.id_eq" : ttid},
+                                function(result) {
+                                    if (result && result.content) {
+                                        for (i = 0; i < result.content.length; i++) {
+                                            bxInfo_temp = result.content[i];
+                                            if (olp_index[bxInfo_temp.lp.id] >= 0) {
+                                                lp_bx_index = olp_index[bxInfo_temp.lp.id];
+                                                // assign id
+                                                editInfo.rowBxInfo[lp_bx_index].id = bxInfo_temp.id;
+                                                // assign班型
+                                                editInfo.rowBxInfo[lp_bx_index].bxType1 = bxInfo_temp.bxType1;
+                                                editInfo.rowBxInfo[lp_bx_index].bxType2 = bxInfo_temp.bxType2;
+                                                // assign配挡数
+                                                editInfo.rowBxInfo[lp_bx_index].bxPds = bxInfo_temp.bxPds;
+                                                // assign创建人时间
+                                                editInfo.rowBxInfo[lp_bx_index].createBy = bxInfo_temp.createBy;
+                                                editInfo.rowBxInfo[lp_bx_index].createDate = bxInfo_temp.createDate;
+                                            }
+                                        }
+                                    }
+                                });
+
+
+                            // if (editInfo.detailInfos && editInfo.detailInfos.length > 0) {
+                            //     for (var i = 0; i < editInfo.detailInfos.length; i++) {
+                            //         editInfo.rowBxInfo.push(
+                            //             {
+                            //                 id: 1,
+                            //                 xl: {id: 10066},
+                            //                 lineVersion: 0,
+                            //                 ttinfo: {id: 855},
+                            //                 lp: {id: 1438, lpName: "1"},
+                            //                 "bxType1" : "bx1",
+                            //                 "bxType2" : "bx2",
+                            //                 "bxPds" : "pds"
+                            //             }
+                            //         );
+                            //     }
+                            // }
+
                         } else {
                             alert(result.msg);
                         }
@@ -251,6 +326,16 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                     param.lineId = lineId;
                     param.version = version;
                     return service2.versiondesc.do(param).$promise;
+                },
+
+                /**
+                 * 更新班型信息。
+                 * @param lineId
+                 * @param version
+                 * @returns {*|Function|promise|n}
+                 */
+                updateBXInfo: function(bxInfo) {
+                    return service.rest_bx.save(bxInfo).$promise;
                 }
  
             };
@@ -406,6 +491,23 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                     }
                 );
             };
+            /**
+             * 路牌行点击编辑明细。
+             * @param rowIndex
+             */
+            self.lpbxEditDetail = function(rowIndex) {
+                $state.go('ttInfoDetailManage_bx_detail_edit',
+                    {
+                        xlid: self.xlid,
+                        ttid: self.ttid,
+                        xlname: self.xlname,
+                        ttname: self.ttname,
+                        rowindex: rowIndex,
+                        lineversion: self.lineversion
+                    }
+                );
+
+            };
  
             // 批量修改
             self.editInfos = function() {
@@ -539,6 +641,62 @@ angular.module(&#39;ScheduleApp&#39;).controller(
     ]
 );
  
+// edit-bx-detail.html 班型信息修改页面
+angular.module('ScheduleApp').controller(
+    'TimeTableBxDetailManageFormCtrl_old',
+    [
+        'TimeTableDetailManageService_old',
+        '$stateParams',
+        '$state',
+        function(service, $stateParams, $state) {
+            var self = this;
+
+            // 获取传过来的id，有的话就是修改，获取一遍数据
+            self.xlid = $stateParams.xlid; // 获取传过来的线路id
+            self.ttid = $stateParams.ttid; // 获取传过来的时刻表id
+            self.xlname = $stateParams.xlname; // 获取传过来的线路名字
+            self.ttname = $stateParams.ttname; // 获取传过来的时刻表名字
+            self.rowindex = $stateParams.rowindex; // 修改的第几行
+            self.lineversion = $stateParams.lineversion; // 线路版本
+
+            self.title1 = self.xlname + "（" + self.ttname + "）" + "时刻表明细信息";
+            self.title_tip = "版本加载中...";
+            service.versiondesc(self.xlid, self.lineversion).then(
+                function(result) {
+                    self.title_tip = "线路版本（" + result.desc + "）";
+                }
+            );
+
+            // 获取班型信息
+            self.bxInfo = {};
+            if (service.getEditInfo().rowBxInfo && service.getEditInfo().rowBxInfo.length > self.rowindex) {
+                self.bxInfo = service.getEditInfo().rowBxInfo[self.rowindex];
+                self.title2 = self.xlname + "（" + self.ttname + "）" + "时刻表明细信息";
+                self.title2 += "->路牌" + self.bxInfo.lp.lpName;
+                self.title2 += "->班型信息";
+            }
+            // 更新班型信息
+            self.submit = function() {
+                // assign线路版本
+                self.bxInfo.lineVersion = self.lineversion;
+                service.updateBXInfo(self.bxInfo).then(
+                    function(result) {
+                        // 跳转
+                        $state.go("ttInfoDetailManage_edit3", {
+                            xlid: self.xlid,
+                            ttid: self.ttid,
+                            xlname: self.xlname,
+                            ttname: self.ttname,
+                            lineversion: self.lineversion
+                        });
+                    }
+                );
+            };
+
+        }
+    ]
+);
+
 // edit-detail.html 具体班次明细修改页面
 angular.module('ScheduleApp').controller(
     'TimeTableDetailManageFormCtrl_old',
@@ -661,7 +819,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
     ]
 );
  
-// edit-detail2.html 具体班次明细修改页面
+// edit-detail2.html 具体班次明细修改页面（批量修改）
 angular.module('ScheduleApp').controller(
     'TimeTableDetailManageFormCtrl_old2',
     [
@@ -810,7 +968,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
     ]
 );
  
-// edit-mulselect.html 班次批量选择页面
+// edit-mulselect.html 班次批量选择页面（批量选择）
 angular.module('ScheduleApp').controller(
     'TimeTableDetailManageFormCtrl_mulselect',
     [
@@ -146,6 +146,48 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                         }
                     }
                 ),
+                rest_bx: $resource(
+                    '/tibxdc/:id',
+                    {order: 'createDate', direction: 'DESC', id: '@id'},
+                    {
+                        list: {
+                            method: 'GET',
+                            params: {
+                                page: 0
+                            },
+                            transformResponse: function(rs) {
+                                var dst = angular.fromJson(rs);
+                                if (dst.status == 'SUCCESS') {
+                                    return dst.data;
+                                } else {
+                                    return dst; // 业务错误留给控制器处理
+                                }
+                            }
+                        },
+                        get: {
+                            method: 'GET',
+                            transformResponse: function(rs) {
+                                var dst = angular.fromJson(rs);
+                                if (dst.status == 'SUCCESS') {
+                                    return dst.data;
+                                } else {
+                                    return dst; // 业务错误留给控制器处理
+                                }
+                            }
+                        },
+                        save: {
+                            method: 'POST',
+                            transformResponse: function(rs) {
+                                var dst = angular.fromJson(rs);
+                                if (dst.status == 'SUCCESS') {
+                                    return dst.data;
+                                } else {
+                                    return dst; // 业务错误留给控制器处理
+                                }
+                            }
+                        }
+                    }
+                ),
                 import: $resource(
                     '/tidc/importFile',
                     {},
+<div class="page-head">
+    <div class="page-title">
+        <h1>日志管理</h1>
+    </div>
+</div>
+
+<ul class="page-breadcrumb breadcrumb">
+    <li>
+        <a href="/pages/home.html" data-pjax>首页</a>
+        <i class="fa fa-circle"></i>
+    </li>
+    <li>
+        <span class="active">运营计划管理</span>
+        <i class="fa fa-circle"></i>
+    </li>
+    <li>
+        <span class="active">日志管理</span>
+    </li>
+</ul>
+
+<div class="row">
+    <div class="col-md-12" ng-controller="LogManageIndexCtrl as ctrl">
+        <style>
+            .dropdown-menu {
+                border-color: #32c5d2;
+            }
+            .btn-group > .dropdown-menu:before {
+                border-bottom-color: #32c5d2;
+            }
+        </style>
+
+        <div class="portlet light bordered">
+            <div class="portlet-title">
+                <div class="caption font-dark">
+                    <i class="fa fa-database font-dark"></i>
+                    <span class="caption-subject bold uppercase">时刻表日志</span>
+                </div>
+            </div>
+
+            <div class="portlet-body">
+                <div ui-view="logManage_list"></div>
+            </div>
+        </div>
+    </div>
+</div>
 \ No newline at end of file
+<div ng-controller="LogManageListCtrl as ctrl">
+    <div class="fixDiv">
+        <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column">
+            <thead>
+            <tr role="row" class="heading">
+                <th style="width: 70px;">序号</th>
+                <th style="width: 150px;">线路</th>
+                <th style="width: 180px;">业务操作类型</th>
+                <th style="width: 220px;">操作人/操作时间/耗时</th>
+                <th style="width: 420px;">数据对比</th>
+                <th style="width: 40%">操作</th>
+            </tr>
+            <tr role="row" class="filter">
+                <td></td>
+                <td>
+                    <sa-Select5 name="xl"
+                                model="ctrl.searchCondition()"
+                                cmaps="{'qXlId_eq' : 'id'}"
+                                dcname="qXlId_eq"
+                                icname="id"
+                                dsparams="{{ {type: 'ajax', param:{type: 'all', 'destroy_eq': 0}, atype:'xl' } | json }}"
+                                iterobjname="item"
+                                iterobjexp="item.name"
+                                searchph="请输拼音..."
+                                searchexp="this.name"
+                                required >
+                    </sa-Select5>
+                </td>
+                <td>
+                    <sa-Select5 name="logType"
+                                model="ctrl.searchCondition()"
+                                cmaps="{'moduleOperatorType_eeq': 'name'}"
+                                dcname="moduleOperatorType_eeq"
+                                icname="name"
+                                dsparams="{{ {type: 'dic', param: 'tt_log_m_o_type' } | json }}"
+                                iterobjname="item"
+                                iterobjexp="item.name"
+                                searchph="请选择..."
+                                searchexp="this.name"
+                    >
+                    </sa-Select5>
+                </td>
+                <td></td>
+                <td></td>
+                <td>
+                    <button class="btn btn-sm green btn-outline filter-submit margin-bottom" style="margin-right: 0;"
+                            ng-click="ctrl.doPage()">
+                        <i class="fa fa-search"></i> 搜索</button>
+                    <button class="btn btn-sm red btn-outline filter-cancel"
+                            ng-click="ctrl.reset()">
+                        <i class="fa fa-times"></i> 重置</button>
+                </td>
+            </tr>
+
+            </thead>
+            <tbody>
+            <tr ng-repeat="info in ctrl.page()['content']" >
+                <td>
+                    <div>
+                        <a href="#">
+                            <i class="fa fa-list-ol" aria-hidden="true"></i>
+                            {{$index + ctrl.page().number * 10 + 1}}
+                        </a>
+                    </div>
+                </td>
+                <td>
+                    <div>
+                        <a href="#">
+                            <span ng-bind="info.qXlName"></span>
+                        </a>
+                    </div>
+
+                </td>
+                <td>
+                    <span ng-bind="info.moduleOperatorType"></span>
+                </td>
+                <td>
+                    <div>
+                        <a href="#">
+                            <i class="fa fa-user"></i>
+                            <span ng-bind="info.opUserName"></span>
+                        </a>
+                    </div>
+                    <div>
+                        <a href="#"
+                           tooltip-animation="false"
+                           tooltip-placement="top"
+                           uib-tooltip="开始时间：{{info.opStartTime | date: 'yyyy-MM-dd HH:mm:ss' }}"
+                           tooltip-class="headClass">
+                            操作时间
+                            <span ng-bind="(info.opStartTime | date: 'yyyy-MM-dd HH:mm:ss')"></span>
+                        </a>
+                    </div>
+                    <div>
+                        <a href="#">
+                            <span>{{"耗时：" + (info.opEndTime - info.opStartTime) / 1000 + "秒"}}</span>
+                        </a>
+                    </div>
+                </td>
+                <td>
+                    <div ng-if="info.moduleOperatorType=='时刻表明细-新增'">
+                        <div style="text-align: center;">
+                            <a href="#"
+                               tooltip-animation="false"
+                               tooltip-placement="top"
+                               uib-tooltip="{{info.obj_after.ttinfo.name}}"
+                               tooltip-class="headClass">
+                                {{"时刻表：" + info.obj_after.ttinfo.name}}
+                            </a>
+                        </div>
+                        <div style="text-align: center;">
+                            <div class="col-md-12">
+                                <h4>新增后数据</h4>
+                                <div>
+                                    <a href="#">
+                                        <span>{{"路牌：" + info.obj_after.lp.lpName}}</span>
+                                    </a>
+                                </div>
+                                <div>
+                                    <a href="#">
+                                        <span>{{"发车顺序号：" + info.obj_after.fcno}}</span>
+                                    </a>
+                                </div>
+                                <div>
+                                    <a href="#">
+                                        <span>{{"发车时间：" + info.obj_after.fcsj}}</span>
+                                    </a>
+                                </div>
+                            </div>
+                        </div>
+
+                    </div>
+                    <div ng-if="info.moduleOperatorType=='时刻表明细-删除'">
+                        <div style="text-align: center;">
+                            <a href="#"
+                               tooltip-animation="false"
+                               tooltip-placement="top"
+                               uib-tooltip="{{info.obj_after.ttinfo.name}}"
+                               tooltip-class="headClass">
+                                {{"时刻表：" + info.obj_after.ttinfo.name}}
+                            </a>
+                        </div>
+                        <div style="text-align: center;">
+                            <div class="col-md-12">
+                                <h4>删除前数据</h4>
+                                <div>
+                                    <a href="#">
+                                        <span>{{"路牌：" + info.obj_before.lp.lpName}}</span>
+                                    </a>
+                                </div>
+                                <div>
+                                    <a href="#">
+                                        <span>{{"发车顺序号：" + info.obj_before.fcno}}</span>
+                                    </a>
+                                </div>
+                                <div>
+                                    <a href="#">
+                                        <span>{{"发车时间：" + info.obj_before.fcsj}}</span>
+                                    </a>
+                                </div>
+                            </div>
+                        </div>
+
+                    </div>
+                    <div ng-if="info.moduleOperatorType=='时刻表明细-修改'" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
+                        <div style="text-align: center;">
+                            <a href="#"
+                               tooltip-animation="false"
+                               tooltip-placement="top"
+                               uib-tooltip="{{info.obj_after.ttinfo.name}}"
+                               tooltip-class="headClass">
+                                {{"时刻表：" + info.obj_after.ttinfo.name}}
+                            </a>
+                        </div>
+                        <div>
+                            <div class="col-md-6">
+                                <h4>修改前数据</h4>
+                                <div ng-repeat="diff in info.diff_before" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
+                                    <a href="#"
+                                       tooltip-animation="false"
+                                       tooltip-placement="top"
+                                       uib-tooltip="{{diff}}"
+                                       tooltip-class="headClass">
+                                        {{diff}}
+                                    </a>
+                                </div>
+                            </div>
+                            <div class="col-md-6">
+                                <h4>修改后数据</h4>
+                                <div ng-repeat="diff in info.diff_after" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
+                                    <a href="#"
+                                       tooltip-animation="false"
+                                       tooltip-placement="top"
+                                       uib-tooltip="{{diff}}"
+                                       tooltip-class="headClass">
+                                        {{diff}}
+                                    </a>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div ng-if="info.moduleOperatorType=='排班计划明细-修改'" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
+
+                        <div style="text-align: center;">
+                            <a href="#">
+                                {{"排班日期："}}{{info.obj_after.scheduleDate | date: 'yyyy-MM-dd'}}
+                                {{" 路牌：" + info.obj_after.lpName}}
+                                {{" 发车时间：" + info.obj_after.fcsj}}
+                            </a>
+                        </div>
+
+                        <div>
+                            <div class="col-md-6">
+                                <h4>修改前数据</h4>
+                                <div ng-repeat="diff in info.p_diff_before" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
+                                    <a href="#"
+                                       tooltip-animation="false"
+                                       tooltip-placement="top"
+                                       uib-tooltip="{{diff}}"
+                                       tooltip-class="headClass">
+                                        {{diff}}
+                                    </a>
+                                </div>
+                            </div>
+                            <div class="col-md-6">
+                                <h4>修改后数据</h4>
+                                <div ng-repeat="diff in info.p_diff_after" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
+                                    <a href="#"
+                                       tooltip-animation="false"
+                                       tooltip-placement="top"
+                                       uib-tooltip="{{diff}}"
+                                       tooltip-class="headClass">
+                                        {{diff}}
+                                    </a>
+                                </div>
+                            </div>
+                        </div>
+
+                    </div>
+
+                </td>
+                <td>
+                    <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
+                    <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->
+                    <a ui-sref="logManage_detail({id: info.id})" class="btn btn-info btn-sm"> 详细数据 </a>
+                </td>
+            </tr>
+            </tbody>
+        </table>
+    </div>
+
+    <div class="pageBar">
+        <div class="pageBarLeft">
+            {{'显示从' + ctrl.page()['uiFromRecord'] + '到' + ctrl.page()['uiToRecord'] + ' 共' + ctrl.page()['totalElements'] + '条' + ' 每页显示10条'}}
+        </div>
+
+        <div class="pageBarRight">
+            <uib-pagination total-items="ctrl.page()['totalElements']"
+                            ng-model="ctrl.page()['uiNumber']"
+                            ng-change="ctrl.doPage()"
+                            rotate="false"
+                            max-size="10"
+                            boundary-links="true"
+                            first-text="首页"
+                            previous-text="上一页"
+                            next-text="下一页"
+                            last-text="尾页">
+            </uib-pagination>
+        </div>
+    </div>
+
+</div>
 \ No newline at end of file
+// 日志管理service，包装外部定义的globalservice，并保存一定的操作状态
+angular.module('ScheduleApp').factory(
+    'LogManageService',
+    [
+        'TimetableLogManageService_g',
+        'TTInfoManageService_g',
+        function(service, tservice) {
+            // 当前查询的内容条件搜索对象
+            var currentSearchCondition = {page: 0};
+            // 当前查询返回的信息
+            var currentPage = { // 后台spring data返回的格式
+                totalElements: 0,
+                number: 0, // 后台返回的页码，spring返回从0开始
+                content: [],
+
+                uiNumber: 1, // 页面绑定的页码
+                uiFromRecord: 0, // 页面绑定，当前页第几条记录
+                uiToRecord: 0 // 页面绑定，当前页到第几条记录
+            };
+
+            var calcuDiff_internal = function(
+                info, property, diff_before, diff_after, desc) {
+                var before_value;
+                var after_value;
+                before_value = info.obj_before && info.obj_before[property];
+                after_value = info.obj_after && info.obj_after[property];
+                if (before_value !== undefined && before_value !== after_value) {
+                    diff_before.push(desc + "：" + (before_value == null ? "" : before_value));
+                    diff_after.push(desc + "：" + (after_value == null ? "" : after_value));
+                }
+            };
+
+            var calcuPlanInfoModifyDiff = function(info) { // 计算排班明细修改描述
+                var diff_before = [];
+                var diff_after = [];
+                var rtn = [diff_before, diff_after];
+
+                // 车辆
+                calcuDiff_internal(info, "clZbh", diff_before, diff_after, "车辆");
+                // 驾驶员
+                calcuDiff_internal(info, "jName", diff_before, diff_after, "驾驶员");
+                // 驾驶员工号
+                calcuDiff_internal(info, "jGh", diff_before, diff_after, "驾驶员工号");
+                // 售票员
+                calcuDiff_internal(info, "sName", diff_before, diff_after, "售票员");
+                // 售票员工号
+                calcuDiff_internal(info, "sGh", diff_before, diff_after, "售票员工号");
+                // 起点站
+                calcuDiff_internal(info, "qdzName", diff_before, diff_after, "起点站");
+                // 起点站code
+                calcuDiff_internal(info, "qdzCode", diff_before, diff_after, "起点站code");
+                // 终点站
+                calcuDiff_internal(info, "zdzName", diff_before, diff_after, "终点站");
+                // 终点站code
+                calcuDiff_internal(info, "zdzCode", diff_before, diff_after, "终点站code");
+
+                return rtn;
+            };
+
+            var calcuTimeTableModifyDiff = function(info) { // 计算时刻表明细修改描述
+                var diff_before = [];
+                var diff_after = [];
+                var rtn = [diff_before, diff_after];
+                // 方向
+                calcuDiff_internal(info, "xlDir", diff_before, diff_after, "方向");
+                // 起点站名字
+                calcuDiff_internal(info, "qdzName", diff_before, diff_after, "起点站");
+                // 起点站编码
+                calcuDiff_internal(info, "qdzCode", diff_before, diff_after, "起点站code");
+                // 终点站名字
+                calcuDiff_internal(info, "zdzName", diff_before, diff_after, "终点站");
+                // 终点站编码
+                calcuDiff_internal(info, "zdzCode", diff_before, diff_after, "终点站code");
+                // 发车时间
+                calcuDiff_internal(info, "fcsj", diff_before, diff_after, "发车时间");
+                // 计划里程
+                calcuDiff_internal(info, "jhlc", diff_before, diff_after, "计划里程");
+                // 班次历时
+                calcuDiff_internal(info, "bcsj", diff_before, diff_after, "班次历时");
+                // 例保时间
+                calcuDiff_internal(info, "lbsj", diff_before, diff_after, "例保时间");
+                // 班次类型
+                calcuDiff_internal(info, "bcType", diff_before, diff_after, "班次类型");
+                // 是否分班
+                calcuDiff_internal(info, "isFB", diff_before, diff_after, "是否分班");
+                // 是否停驶
+                calcuDiff_internal(info, "isTS", diff_before, diff_after, "是否停驶");
+                // 备注
+                calcuDiff_internal(info, "remark", diff_before, diff_after, "备注");
+
+                return rtn;
+            };
+
+            // 查询对象类
+            var queryClass = service.rest;
+
+            return {
+                getTimetableLogQueryClass: function() {
+                    return queryClass;
+                },
+                getSearchCondition: function() {
+                    currentSearchCondition.page = currentPage.uiNumber - 1;
+
+                    return currentSearchCondition;
+                },
+                getPage: function(page) {
+                    if (page) {
+                        currentPage.totalElements = page.totalElements;
+                        currentPage.number = page.number;
+                        currentPage.content = page.content;
+
+                        // 计算当前页开始记录，结束记录
+                        if (page.numberOfElements && page.numberOfElements > 0) {
+                            currentPage.uiFromRecord = page.number * 10 + 1;
+                            currentPage.uiToRecord = page.number * 10 + page.numberOfElements;
+                        }
+
+                        // 解析op_before和op_after字符串对象
+                        angular.forEach(page.content, function(obj) {
+                            obj.obj_before = (!obj.opBeforeJson ? {} : angular.fromJson(obj.opBeforeJson));
+                            obj.obj_after = (!obj.opAfterJson ? {} : angular.fromJson(obj.opAfterJson));
+                        });
+
+                        // 计算时刻表明细修改描述
+                        angular.forEach(page.content, function(obj) {
+                            var diff = calcuTimeTableModifyDiff(obj);
+                            obj.diff_before = diff[0];
+                            obj.diff_after = diff[1];
+                        });
+                        // 计算排班明细修改描述
+                        angular.forEach(page.content, function(obj) {
+                            var diff = calcuPlanInfoModifyDiff(obj);
+                            obj.p_diff_before = diff[0];
+                            obj.p_diff_after = diff[1];
+                        });
+                    }
+                    return currentPage;
+                },
+                resetStatus: function() {
+                    currentSearchCondition = {page: 0};
+                    currentPage = {
+                        totalElements: 0,
+                        number: 0,
+                        content: [],
+                        uiNumber: 1,
+                        uiFromRecord: 0,
+                        uiToRecord: 0
+                    };
+                },
+
+                /**
+                 * 获取线路版本描述。
+                 * @param lineId
+                 * @param version
+                 * @returns {*|Function|promise|n}
+                 */
+                versiondesc: function(lineId, version) {
+                    var param = {};
+                    param.lineId = lineId;
+                    param.version = version;
+                    return tservice.versiondesc.do(param).$promise;
+                }
+            };
+        }
+    ]
+);
+
+// index.html控制器
+angular.module('ScheduleApp').controller(
+    'LogManageIndexCtrl',
+    [
+        '$state',
+        function($state) {
+            var self = this;
+
+            // TODO：
+        }
+    ]
+);
+
+// list.html控制器
+angular.module('ScheduleApp').controller(
+    'LogManageListCtrl',
+    [
+        'LogManageService',
+        function(service) {
+            var self = this;
+            var TimetableLog = service.getTimetableLogQueryClass();
+
+            self.page = function() {
+                return service.getPage();
+            };
+
+            self.searchCondition = function() {
+                return service.getSearchCondition();
+            };
+
+            self.doPage = function() {
+                var page = TimetableLog.list(self.searchCondition(), function() {
+                    service.getPage(page);
+                });
+            };
+
+            self.reset = function() {
+                service.resetStatus();
+                var page = TimetableLog.list(self.searchCondition(), function() {
+                    service.getPage(page);
+                });
+            };
+
+            self.doPage();
+
+            self.lineVersionTip = "载入中...";
+            var currentTTInfoForLineVersion;
+            self.getLineVersion = function(info) {
+                var lineVersion;
+                // 1、时刻表，时刻表明细
+                if (info.moduleType == '时刻表明细' || info.moduleType == '时刻表') {
+                    lineVersion = info.obj_after && info.obj_after.lineVersion;
+                    if (!lineVersion) {
+                        lineVersion = info.obj_before && info.obj_before.lineVersion;
+                    }
+                }
+                // 2、排班明细
+                if (info.moduleType == '排班计划明细') {
+                    lineVersion = info.obj_after && info.obj_after.ttInfo && info.obj_after.ttInfo.lineVersion;
+                    if (!lineVersion) {
+                        lineVersion = info.obj_before && info.obj_before.ttInfo && info.obj_before.ttInfo.lineVersion;
+                    }
+                }
+
+                return lineVersion;
+            };
+            self.getLineVersionTip = function(info) {
+                if (currentTTInfoForLineVersion != info) {
+                    service.versiondesc(info.qXlId, self.getLineVersion(info)).then(
+                        function(result) {
+                            self.lineVersionTip = result.desc;
+                            currentTTInfoForLineVersion = info;
+                        }
+                    );
+                }
+
+            };
+
+        }
+    ]
+);
+
+// detail.html控制器
+angular.module('ScheduleApp').controller(
+    'LogManageDetailCtrl',
+    [
+        'LogManageService',
+        '$stateParams',
+        function(service, $stateParams) {
+            var self = this;
+            var TimetableLog = service.getTimetableLogQueryClass();
+            var id = $stateParams.id;
+
+            self.title = "";
+            self.timetableManageForDetail = {};
+
+            TimetableLog.get({id: id}, function(value) {
+                self.timetableManageForDetail = value;
+
+                // TODO：标题
+                self.title = "修改内容比较";
+
+            });
+        }
+    ]
+);
+
+
+
+
+
+
+
+
+
+
+// ui route 配置
+
+/** 日志管理配置route */
+ScheduleApp.config([
+    '$stateProvider',
+    function($stateProvider) {
+        $stateProvider
+            .state('logManage', { // index页面
+                url: '/logManage',
+                views: {
+                    "": {
+                        templateUrl: 'pages/scheduleApp/module/sys/logManage/index.html'
+                    },
+                    "logManage_list@logManage": {
+                        templateUrl: 'pages/scheduleApp/module/sys/logManage/list.html'
+                    }
+                },
+
+                resolve: {
+                    deps: ['$ocLazyLoad', function($ocLazyLoad) {
+                        return $ocLazyLoad.load({
+                            name: 'logManage_module',
+                            insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
+                            files: [
+                                "assets/bower_components/angular-ui-select/dist/select.min.css",
+                                "assets/bower_components/angular-ui-select/dist/select.min.js",
+                                "pages/scheduleApp/module/sys/logManage/module.js"
+                            ]
+                        });
+                    }]
+                }
+            })
+            .state('logManage_detail', { // detail.html页面
+                url: 'logManage_detail/:id',
+                views: {
+                    "": {templateUrl: 'pages/scheduleApp/module/sys/logManage/detail.html'}
+                },
+                resolve: {
+                    deps: ['$ocLazyLoad', function($ocLazyLoad) {
+                        return $ocLazyLoad.load({
+                            name: 'logManage_detail_module',
+                            insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
+                            files: [
+                                "pages/scheduleApp/module/sys/logManage/module.js"
+                            ]
+                        });
+                    }]
+                }
+            })
+
+
+
+
+
+
+
+    }
+]);
 \ No newline at end of file
+// 时刻表日志管理service
+angular.module('ScheduleApp').factory(
+    'TimetableLogManageService_g',
+    [
+        '$resource',
+        function($resource) {
+            return {
+                rest: $resource(
+                    '/s_log/:id',
+                    {order: 'opEndTime', direction: 'DESC', id: '@id'},
+                    {
+                        list: {
+                            method: 'GET',
+                            params: {
+                                page: 0
+                            },
+                            transformResponse: function(rs) {
+                                var dst = angular.fromJson(rs);
+                                if (dst.status == 'SUCCESS') {
+                                    return dst.data;
+                                } else {
+                                    return dst; // 业务错误留给控制器处理
+                                }
+                            }
+                        },
+                        get: {
+                            method: 'GET',
+                            transformResponse: function(rs) {
+                                var dst = angular.fromJson(rs);
+                                if (dst.status == 'SUCCESS') {
+                                    return dst.data;
+                                } else {
+                                    return dst;
+                                }
+                            }
+                        }
+                    }
+                )
+
+
+            };
+        }
+    ]
+);
 \ No newline at end of file