潘钊 / bsth_control · Commits

into pudong

临加空驶公里计算

# Conflicts:
#	src/main/resources/static/pages/base/timesmodel/add.html
#	src/main/resources/static/pages/base/timesmodel/fragments/addbc.html
#	src/main/resources/static/pages/base/timesmodel/fragments/deletelp.html
#	src/main/resources/static/pages/base/timesmodel/fragments/editbc.html
#	src/main/resources/static/pages/base/timesmodel/js/add-form-wizard.js
#	src/main/resources/static/pages/base/timesmodel/js/dateTimeTool.js
#	src/main/resources/static/pages/base/timesmodel/js/echartsDrawGanTT.js
#	src/main/resources/static/pages/base/timesmodel/js/gantt.js
#	src/main/resources/static/pages/base/timesmodel/js/systemTools.js
#	src/main/resources/static/pages/base/timesmodel/js/v1/AdjustTrip.js
#	src/main/resources/static/pages/base/timesmodel/js/v1/bcFun.js
#	src/main/resources/static/pages/base/timesmodel/js/v1/lpFun.js
#	src/main/resources/static/pages/base/timesmodel/js/v1/scheduleInitialize.js

路单数据 根据线路编码转名称修正

新增路单数据表 按线路查询
修改了油量、电量查询中的日期查询条件

1、搜索框带箭头，点击弹出排序选项
2、点击排序选项，弹出排序字段选项对话框，对话框内部使用saOrderOption自定义指令

2、治理规则代码，将drl文件以kBase1，kBase2，KBase3前缀命名，将所有drools的java代码移动至com.bsth.service.scedule.impl.plan中
3、drl文件名和com.bsth.service.schedule.impl.plan下的包名一级一级对应，前缀kBase1、kBase2、kBase3和MyDroolsConfiguration中的定义对应