Merge branch 'jiading' of http://192.168.168.201:8888/panzhaov5/bsth_control.git into jiading

王通
2 parents 900d5939 cb89a8d2
Showing 32 changed files with 487 additions and 48 deletions
src/main/java/com/bsth/controller/sys/UserController.java
src/main/java/com/bsth/entity/Cars.java
src/main/java/com/bsth/entity/schedule/GuideboardInfo.java
src/main/java/com/bsth/entity/sys/SysUser.java
src/main/java/com/bsth/repository/sys/SysUserRepository.java
src/main/java/com/bsth/service/schedule/impl/CarsServiceImpl.java
src/main/java/com/bsth/service/sys/SysUserService.java
src/main/java/com/bsth/service/sys/impl/SysUserServiceImpl.java
src/main/resources/static/assets/plugins/passwordRulesHelper/passwordRulesHelper.css
src/main/resources/static/assets/plugins/passwordRulesHelper/passwordRulesHelper.js
src/main/resources/static/assets/plugins/passwordRulesHelper/passwordRulesHelper.min.css
src/main/resources/static/assets/plugins/passwordRulesHelper/passwordRulesHelper.min.js
src/main/resources/static/index.html
src/main/resources/static/pages/permission/user/changePWD.html
src/main/resources/static/pages/permission/user/list.html
src/main/resources/static/pages/permission/user/resetPWD.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/module.js
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/module.js
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/module.js
src/main/resources/static/pages/scheduleApp/module/common/main.css
@@ -12,6 +12,9 @@ import com.bsth.service.sys.CompanyAuthorityService;
 import com.bsth.service.sys.SysUserService;
 import com.google.common.collect.ArrayListMultimap;
 import org.apache.commons.lang3.StringUtils;
+import org.joda.time.DateTime;
+import org.joda.time.Period;
+import org.joda.time.PeriodType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -101,6 +104,19 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
                 return rs;
             }
+            // 检验密码有效期
+            Date lastPwdDate = user.getLastPwdDate();
+            if (lastPwdDate != null) {
+                Integer validPeriod = user.getPwdValidPeriod();
+                if (validPeriod == null) {
+                    validPeriod = 180; // 默认180天
+                }
+                Period p = new Period(new DateTime(lastPwdDate), new DateTime(new Date()), PeriodType.days());
+                if (p.getDays() > validPeriod) {
+                    return put(rs, "msg", validPeriod + "天没有修改密码，不能登录，请联系管理员");
+                }
+            }
+
             // 登录
             SecurityUtils.login(user, request);
             //session里写入用户名，webSocket连接时标识身份用
@@ -270,6 +286,16 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
         return msg;
     }
+    @RequestMapping(value = "/resetPWD", method = RequestMethod.POST)
+    public String resetPWD(@RequestParam Integer user_id, @RequestParam Integer reset_day, @RequestParam String reset_passord) {
+        try {
+            sysUserService.resetPWD(user_id, reset_passord, reset_day);
+            return "修改成功！";
+        } catch (Exception exp) {
+            return exp.getMessage();
+        }
+    }
+
     @RequestMapping(value = "/register", method = RequestMethod.POST)
     public Map<String, Object> register(SysUser u) {
         return sysUserService.register(u);
@@ -24,7 +24,7 @@ import java.util.Date;
 @Entity
 @Table(name = "bsth_c_cars")
-@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
+@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"}, ignoreUnknown = true)
 public class Cars extends BEntity implements Serializable {
 	/** 主键Id */
@@ -37,6 +37,9 @@ public class GuideboardInfo extends BEntity {
     @Column(nullable = false)
     private String lpType;
+    /** 加油公里字段 */
+    private Double jygl;
+
     /** 是否删除（标记） */
     @Column(nullable = false)
     private Boolean isCancel = false;
@@ -116,4 +119,12 @@ public class GuideboardInfo extends BEntity {
     public void setIsCancel(Boolean isCancel) {
         this.isCancel = isCancel;
     }
+
+    public Double getJygl() {
+        return jygl;
+    }
+
+    public void setJygl(Double jygl) {
+        this.jygl = jygl;
+    }
 }
@@ -33,6 +33,11 @@ public class SysUser {
 	@Column(name = "last_loginDate", columnDefinition = "timestamp  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
 	private Date lastLoginDate;
+    /** 最近密码更新时间 */
+    private Date lastPwdDate;
+    /** 密码有效期 */
+    private Integer pwdValidPeriod;
+
 	private String agencies;
 	private boolean enabled;
@@ -112,4 +117,20 @@ public class SysUser {
 	public void setRoles(Set<Role> roles) {
 		this.roles = roles;
 	}
+
+    public Date getLastPwdDate() {
+        return lastPwdDate;
+    }
+
+    public void setLastPwdDate(Date lastPwdDate) {
+        this.lastPwdDate = lastPwdDate;
+    }
+
+    public Integer getPwdValidPeriod() {
+        return pwdValidPeriod;
+    }
+
+    public void setPwdValidPeriod(Integer pwdValidPeriod) {
+        this.pwdValidPeriod = pwdValidPeriod;
+    }
 }
@@ -22,7 +22,7 @@ public interface SysUserRepository extends BaseRepository&lt;SysUser, Integer&gt;{
 	@Transactional
 	@Modifying
-	@Query(value="update bsth_c_sys_user set password=?2 where id=?1",nativeQuery=true)
+	@Query(value="update bsth_c_sys_user set password=?2, last_pwd_date = now() where id=?1",nativeQuery=true)
 	int changePWD(int id,String newPWD);
 	@EntityGraph(value = "sysUser_role", type = EntityGraph.EntityGraphType.FETCH)
@@ -39,7 +39,7 @@ public class CarsServiceImpl extends BServiceImpl&lt;Cars, Integer&gt; implements Cars
     @Override
     public Cars save(Cars cars) {
-        if (cars.getId() != null && cars.getScrapState()) { // 更新车辆信息，报废车辆
+        if (cars.getId() != null && cars.getScrapState() != null && cars.getScrapState()) { // 更新车辆信息，报废车辆
             // 1、作废的车辆，修改报废号
             String eCode = cars.getEquipmentCode();
             cars.setEquipmentCode("BF-" + eCode);
@@ -14,6 +14,8 @@ public interface SysUserService extends BaseService&lt;SysUser, Integer&gt;{
 	int changePWD(int id,String newPWD);
+	void resetPWD(int id, String newPWD, int validperiod);
+
 	Map<String,Object> register(SysUser u);
 	List<SysUser> findAll_distinct();
@@ -51,7 +51,14 @@ public class SysUserServiceImpl extends BaseServiceImpl&lt;SysUser, Integer&gt; implem
 		return sysUserRepository.changePWD(id,new BCryptPasswordEncoder(4).encode(newPWD));
 	}
-	@Override
+    @Override
+    public void resetPWD(int id, String newPWD, int validperiod) {
+	    SysUser user = sysUserRepository.findOne(id);
+	    user.setPwdValidPeriod(validperiod);
+	    sysUserRepository.changePWD(id, new BCryptPasswordEncoder(4).encode(newPWD));
+    }
+
+    @Override
 	public Map<String, Object> register(SysUser u) {
 		Map<String, Object> rs = new HashMap();
 		try{
+div.rules-list 
+{
+margin-top:10px;    
+}
+
+div.rules-list .rules
+{
+    list-style-type:none;
+    padding:0;
+}
+	
+div.rules-list li
+ {
+	position:relative;
+ }
+ 
+ div.rules-list li.ko::before
+ {
+	content:'\f00d';
+	font: normal normal normal 14px/1 FontAwesome;
+	width: 32px;
+	font-size: 14px;
+	display: inline-block;
+	text-align: right;
+	margin-right: 10px;
+	color:#F00;
+ }
+ div.rules-list li.ok::before
+ {
+	content:'\f00c';
+	font: normal normal normal 14px/1 FontAwesome;
+	width: 32px;
+	font-size: 14px;
+	display: inline-block;
+	text-align: right;
+	margin-right: 10px;
+	color:#008000;
+ }
+	 
+           
 \ No newline at end of file
+(function ($) {
+
+    $.fn.passwordRulesValidator = function (aOptions) {
+    
+
+        // Define default's parameters
+        var aDefauts =
+                {
+                    'rules' : {
+                        'length' : {
+                            'regex': '.{8,}',
+                            'name': 'length',
+                            'message': '8 characters',
+                            'enable': true
+                        },
+                        'lowercase' :{
+                            'regex': '[a-z]{1,}',
+                            'name': 'lowercase',
+                            'message': '1 lowercase',
+                            'enable': true
+                        },
+                        'uppercase' : {
+                            'regex': '[A-Z]{1,}',
+                            'name': 'uppercase',
+                            'message': '1 uppercase',
+                            'enable': true
+                        },
+                        'number' : {
+                            'regex': '[0-9]{1,}',
+                            'name': 'number',
+                            'message': '1 digit',
+                            'enable': true
+                        },
+                        'specialChar' : {
+                            'regex': '[^a-zA-Z0-9]{1,}',
+                            'name': 'special-char',
+                            'message': '1 special character',
+                            'enable': true
+                        }
+                    },
+                    'msgRules': 'Your password must contain :',
+                    'container': undefined,
+                    'containerClass': null,
+                    'containerId': 'checkRulesList',
+                    'okClass': null,
+                    'koClass': null,
+                    'onLoad': undefined
+        };
+
+        /**
+         * @param {object} oRegex
+         * @param {string} sVal
+         * @param {string} sName
+         * @param {string} sIdContainer
+         */
+        function validateRule(oRegex, sVal, sName, sIdContainer)
+        {
+            if (oRegex.test(sVal)) {
+                $('#' + sIdContainer + ' li.' + sName).removeClass('ko ' + aParameters.koClass).addClass('ok ' + aParameters.okClass);
+            } else {
+                $('#' + sIdContainer + ' li.' + sName).removeClass('ok ' +aParameters.okClass).addClass('ko ' +aParameters.koClass);
+            }
+        }
+        
+        /**
+         * @param {array} aParemeters
+         * @param {string} sVal
+         * @param {string} sIdContainer
+         */
+        function checkRules(aParemeters, sVal, sIdContainer)
+        {
+            $.each(aParameters.rules, function(iKey, aRule) {
+                if(aRule.enable) {
+                    validateRule(new RegExp(aRule.regex, 'g'), sVal, aRule.name, sIdContainer);
+                }
+            });
+            
+        }
+
+        var aParameters = $.extend(true, aDefauts, aOptions);
+        
+        return this.each(function () {
+            
+            // Execute onLoad fonction
+            if ($.isFunction(aParameters.onLoad)) {
+                aParameters.onLoad();
+            }
+
+            // Build rules check list
+            oRulesBuilder = '<span class="rules">' + aParameters.msgRules + '</span>';
+            oRulesBuilder += '<ul class="rules">';
+            
+            // Build lists
+            $.each(aParameters.rules, function(iKey, aRule) {
+                if(aRule.enable) {
+                    oRulesBuilder += '<li class="ko ' + aParameters.koClass + ' '+ aRule.name +'">' + aRule.message + '</li>';
+                }
+            });
+            
+            oRulesBuilder += '</ul>';
+            
+            // Create or populate container
+            if (typeof (aParameters.container) === 'undefined') {
+                $(this).after('<div class="rules-list ' + aParameters.containerClass + '" id="' + aParameters.containerId + '"></div>');
+                $(oRulesBuilder).appendTo('#' + aParameters.containerId);
+            } else {
+                aParameters.container.addClass('rules-list');
+                $(oRulesBuilder).appendTo(aParameters.container);
+            }
+
+            var sIdContainer = typeof (aParameters.container) === 'undefined' ? aParameters.containerId : aParameters.container.attr('id');
+            
+            // Execute checkRules on load
+            checkRules(aParameters, $(this).val(), sIdContainer);
+            
+            // Execute checkRules fonction
+            $(this).keyup(function () {
+                checkRules(aParameters, $(this).val(), sIdContainer);
+            });
+
+            $(this).on('paste', function () {
+                checkRules(aParameters, $(this).val(), sIdContainer);
+            });
+
+            $(this).change(function () {
+                checkRules(aParameters, $(this).val(), sIdContainer);
+            });
+        });
+    };
+})(jQuery);
+
+
+div.rules-list li.ko::before,div.rules-list li.ok::before{width:32px;display:inline-block;text-align:right;margin-right:10px}div.rules-list{margin-top:10px}div.rules-list .rules{list-style-type:none;padding:0}div.rules-list li{position:relative}div.rules-list li.ko::before{content:'\f00d';font:normal normal normal 14px/1 FontAwesome;font-size:14px;color:red}div.rules-list li.ok::before{content:'\f00c';font:normal normal normal 14px/1 FontAwesome;font-size:14px;color:green}
+!function(a){a.fn.passwordRulesValidator=function(b){function d(b,c,d,e){b.test(c)?a("#"+e+" li."+d).removeClass("ko "+f.koClass).addClass("ok "+f.okClass):a("#"+e+" li."+d).removeClass("ok "+f.okClass).addClass("ko "+f.koClass)}function e(b,c,e){a.each(f.rules,function(a,b){b.enable&&d(new RegExp(b.regex,"g"),c,b.name,e)})}var c={rules:{length:{regex:".{8,}",name:"length",message:"8 characters",enable:!0},lowercase:{regex:"[a-z]{1,}",name:"lowercase",message:"1 lowercase",enable:!0},uppercase:{regex:"[A-Z]{1,}",name:"uppercase",message:"1 uppercase",enable:!0},number:{regex:"[0-9]{1,}",name:"number",message:"1 digit",enable:!0},specialChar:{regex:"[^a-zA-Z0-9]{1,}",name:"special-char",message:"1 special character",enable:!0}},msgRules:"Your password must contain :",container:void 0,containerClass:null,containerId:"checkRulesList",okClass:null,koClass:null,onLoad:void 0},f=a.extend(!0,c,b);return this.each(function(){a.isFunction(f.onLoad)&&f.onLoad(),oRulesBuilder='<span class="rules">'+f.msgRules+"</span>",oRulesBuilder+='<ul class="rules">',a.each(f.rules,function(a,b){b.enable&&(oRulesBuilder+='<li class="ko '+f.koClass+" "+b.name+'">'+b.message+"</li>")}),oRulesBuilder+="</ul>","undefined"==typeof f.container?(a(this).after('<div class="rules-list '+f.containerClass+'" id="'+f.containerId+'"></div>'),a(oRulesBuilder).appendTo("#"+f.containerId)):(f.container.addClass("rules-list"),a(oRulesBuilder).appendTo(f.container));var b="undefined"==typeof f.container?f.containerId:f.container.attr("id");e(f,a(this).val(),b),a(this).keyup(function(){e(f,a(this).val(),b)}),a(this).on("paste",function(){e(f,a(this).val(),b)}),a(this).change(function(){e(f,a(this).val(),b)})})}}(jQuery);
 \ No newline at end of file
@@ -71,6 +71,10 @@
 	<!-- sweetalert样式 -->
 	<link rel="stylesheet"
 		  href="/assets/bower_components/sweetalert/dist/sweetalert.css" />
+    <!-- passwordRulesHelper样式 -->
+    <link rel="stylesheet"
+          href="/assets/plugins/passwordRulesHelper/passwordRulesHelper.min.css" />
+
 	<!-- schedule计划调度AngularJS模块主css -->
 	<link rel="stylesheet" href="/pages/scheduleApp/module/common/main.css"
 		  type="text/css" />
@@ -414,6 +418,9 @@
 <script src="/assets/js/dictionary.js"></script>
 <!-- tipso JS -->
 <script src="/metronic_v4.5.4/plugins/tipso/js/tipso.js"></script>
+<!-- passwordRulesHelper插件 -->
+<script src="/assets/plugins/passwordRulesHelper/passwordRulesHelper.min.js"></script>
+
 <script data-exclude=1>
 	//初始打开的片段地址
 	var initFragment = "^_^initFragment^_^";
@@ -5,27 +5,27 @@
 <div class="portlet-body">
 	<form class="form-horizontal" id="changePWDForm">
 		<div class="form-group" style="margin-top: 60px">
-		    <label class="control-label col-md-5">原始密码：
+		    <label class="control-label col-md-4">原始密码：
 		    </label>
-		    <div class="col-md-4">
+		    <div class="col-md-6">
 		        <div class="input-icon right">
 		            <i class="fa"></i>
 		            <input type="password" class="form-control" name="oldPWD" /> </div>
 		    </div>
 		</div>
 		<div class="form-group">
-		    <label class="control-label col-md-5">输入新密码：
+		    <label class="control-label col-md-4">输入新密码：
 		    </label>
-		    <div class="col-md-4">
+		    <div class="col-md-6">
 		        <div class="input-icon right">
 		            <i class="fa"></i>
-		            <input type="password" class="form-control" name="newPWD" /> </div>
+		            <input type="password" class="form-control" name="newPWD" id="newPWD" /> </div>
 		    </div>
 		</div>
 		<div class="form-group">
-		    <label class="control-label col-md-5">确认新密码：
+		    <label class="control-label col-md-4">确认新密码：
 		    </label>
-		    <div class="col-md-4">
+		    <div class="col-md-6">
 		        <div class="input-icon right">
 		            <i class="fa"></i>
 		            <input type="password" class="form-control" name="cnewPWD" /> </div>
@@ -47,6 +47,44 @@
 <script>
 $(function(){
+    // passwordRulesHelper 密码验证
+    $('#newPWD').passwordRulesValidator({
+        'msgRules':'你填写的密码必须符合下面的规则：',
+        'rules' : {
+            'length' : {
+                'regex': '.{8,}',
+                'name': 'length',
+                'message': '密码必须大于8个字符',
+                'enable': true
+            },
+            'lowercase' :{
+                'regex': '[a-z]{1,}',
+                'name': 'lowercase',
+                'message': '至少需要一个小写字母',
+                'enable': true
+            },
+            'uppercase' : {
+                'regex': '[A-Z]{1,}',
+                'name': 'uppercase',
+                'message': '至少需要一个大写字母',
+                'enable': true
+            },
+            'number' : {
+                'regex': '[0-9]{1,}',
+                'name': 'number',
+                'message': '至少需要一个数字',
+                'enable': true
+            },
+            'specialChar' : {
+                'regex': '[^a-zA-Z0-9]{1,}',
+                'name': 'special-char',
+                'message': '至少需要一个特殊字符',
+                'enable': true
+            }
+        }
+    });
+
+
 	$("#confirm").on("click",function(){
 		var data = $('#changePWDForm').serializeJSON();
 		$.post('/user/changePWD',data,function(msg){
@@ -115,6 +115,7 @@
 	<td>
 		<a class="btn btn-sm blue btn-outline" href="edit.html?no={{obj.id}}" data-pjax><i class="fa fa-edit"></i> 编辑</a>
+        <a class="btn btn-sm blue btn-outline resetpwd" style="display: {{obj.showpdc}}" onclick="resetPassword({{obj.id}}, {{obj.lastPwdDate}});"><i class="fa fa-edit"></i> 重置密码</a>
 		<!--<button type="button" class="btn btn-sm line_allot_btn" data-id="{{obj.id}}">线调线路分配</button>-->
 	</td>
 </tr>
@@ -171,23 +172,40 @@ $(function(){
 		params['order'] = 'lastLoginDate';
 		params['page'] = page;
 		var i = layer.load(2);
-		$get('/user' ,params, function(data){
-			$.each(data.content, function(i, obj) {
-                obj.lastLoginDate = moment(obj.lastLoginDate).format("YYYY-MM-DD HH:mm:ss");
+		$get('/user' ,params, function(data) {
+		    // 获取当前登录用户
+            $get('/user/currentUser',{}, function(user) {
+                var b_isAdmin = false; // 是否是管理员用户
+                $.each(user.authorities, function(i, obj) {
+                    if (obj.authority === 'ROLE_ADMIN') {
+                        b_isAdmin = true;
+                    }
+                });
+
+                $.each(data.content, function(i, obj) {
+                    obj.lastLoginDate = moment(obj.lastLoginDate).format("YYYY-MM-DD HH:mm:ss");
+                    if (b_isAdmin) {
+                        obj.showpdc = ''; // 显示重置密码按钮
+                    } else {
+                        obj.showpdc = 'none';
+                    }
+                });
+                var bodyHtm = template('user_list_temp', {list: data.content});
+
+                $('#datatable_user tbody').html(bodyHtm)
+                    .find('.icheck').iCheck(icheckOptions)
+                    .on('ifChanged', iCheckChange);
+                if(pagination && data.content.length > 0){
+                    //重新分页
+                    initPagination = true;
+                    showPagination(data);
+                }
+                layer.close(i);
+
+                $('.line_allot_btn').on('click', openAllotWindow);
+
             });
-			var bodyHtm = template('user_list_temp', {list: data.content});
-			
-			$('#datatable_user tbody').html(bodyHtm)
-					.find('.icheck').iCheck(icheckOptions)
-					.on('ifChanged', iCheckChange);
-			if(pagination && data.content.length > 0){
-				//重新分页
-				initPagination = true;
-				showPagination(data);
-			}
-			layer.close(i);
-			$('.line_allot_btn').on('click', openAllotWindow);
 		});
 	}
@@ -263,4 +281,22 @@ function changeEnabled(id,enabled){
 		jsDoQuery(null, true);
 	})
 }
+// 重置密码
+function resetPassword(userId, ld) {
+    $.get('/pages/permission/user/resetPWD.html', function (content) {
+        layer.open({
+            type: 1,
+            area: ['600px', '360px'],
+            content: content,
+            title: '修改密码',
+            shift: 5,
+            scrollbar: false,
+            success: function (layero, index) {
+                $(layero).find('#user_id').val(userId);
+                $(layero).find('#last_pwd_date').val(ld ? moment(ld).format("YYYY-MM-DD HH:mm:ss") : '');
+            }
+        });
+    });
+
+}
 </script>
 \ No newline at end of file
+<div class="row">
+    <div class="col-md-12">
+        <!-- BEGIN VALIDATION STATES-->
+        <div class="portlet light portlet-fit portlet-form bordered">
+            <div class="portlet-body">
+                <form class="form-horizontal" id="resetPWDForm">
+                    <input type="hidden" id="user_id" name="user_id">
+                    <div class="form-group" style="margin-top: 60px">
+                        <label class="control-label col-md-4">最近密码更新时间：
+                        </label>
+                        <div class="col-md-6">
+                            <div class="input-icon right">
+                                <i class="fa"></i>
+                                <input type="text" readonly class="form-control" name="last_pwd_date" id="last_pwd_date" value="" /> </div>
+                        </div>
+                    </div>
+
+                    <div class="form-group" >
+                        <label class="control-label col-md-4">密码有效期（天）：
+                        </label>
+                        <div class="col-md-6">
+                            <div class="input-icon right">
+                                <i class="fa"></i>
+                                <input type="number" class="form-control" name="reset_day" id="reset_day" value="180" /> </div>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="control-label col-md-4">默认密码：
+                        </label>
+                        <div class="col-md-6">
+                            <div class="input-icon right">
+                                <i class="fa"></i>
+                                <input type="text" class="form-control" name="reset_passord" id="reset_passord" value="123456" /> </div>
+                        </div>
+                    </div>
+                    <div class="form-actions">
+                        <div class="row">
+                            <div class="col-md-offset-5 col-md-7">
+                                <button type="button" id="confirm" class="btn green">确定</button>
+                                <button type="button" class="btn default">取消</button>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+</div>
+
+
+<script>
+    $(function(){
+
+        $("#confirm").on("click",function(){
+            var data = $('#resetPWDForm').serializeJSON();
+            console.log(data);
+            $.post('/user/resetPWD',data,function(msg){
+                layer.alert(msg);
+            });
+        });
+    });
+</script>
 \ No newline at end of file
@@ -308,12 +308,12 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                 // large方式弹出模态对话框
                 var modalInstance = $uibModal.open({
                     templateUrl: '/pages/scheduleApp/module/basicInfo/busInfoManage/orderOptionOpen.html',
-                    size: "sm",
+                    // size: "sm",
                     animation: true,
                     backdrop: 'static',
                     resolve: {
                     },
-                    windowClass: 'center-modal',
+                    windowClass: 'order-option-modal',
                     controller: "BusInfoManageListOrderOptionModalInstanceCtrl",
                     controllerAs: "$ctrl",
                     bindToController: true
@@ -156,12 +156,12 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                 // large方式弹出模态对话框
                 var modalInstance = $uibModal.open({
                     templateUrl: '/pages/scheduleApp/module/basicInfo/deviceInfoManage/orderOptionOpen.html',
-                    size: "sm",
+                    // size: "sm",
                     animation: true,
                     backdrop: 'static',
                     resolve: {
                     },
-                    windowClass: 'center-modal',
+                    windowClass: 'order-option-modal',
                     controller: "DeviceInfoManageListOrderOptionModalInstanceCtrl",
                     controllerAs: "$ctrl",
                     bindToController: true
@@ -284,12 +284,12 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                 // large方式弹出模态对话框
                 var modalInstance = $uibModal.open({
                     templateUrl: '/pages/scheduleApp/module/basicInfo/employeeInfoManage/orderOptionOpen.html',
-                    size: "sm",
+                    // size: "sm",
                     animation: true,
                     backdrop: 'static',
                     resolve: {
                     },
-                    windowClass: 'center-modal',
+                    windowClass: 'order-option-modal',
                     controller: "EmployeeInfoManageListOrderOptionModalInstanceCtrl",
                     controllerAs: "$ctrl",
                     bindToController: true
@@ -19,6 +19,7 @@ form input.ng-valid.ng-dirty.ng-valid-required {
     background-color: #78FA89;
 }
+/** 居中弹出框（如：导入弹出框） */
 .center-modal {
     position: fixed;
     top: 10%;
@@ -29,6 +30,16 @@ form input.ng-valid.ng-dirty.ng-valid-required {
     margin-left: -10%;
 }
+/* 排序选项弹出框 */
+.order-option-modal .modal-dialog {
+    position: fixed;
+    top: 10%;
+    left: 30%;
+    z-index: 1050;
+    width: 40%;
+    height: 80%;
+}
+
 .fixDiv {
     min-height: 200px;
     min-width: 600px;
@@ -259,12 +259,12 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                 // large方式弹出模态对话框
                 var modalInstance = $uibModal.open({
                     templateUrl: '/pages/scheduleApp/module/core/busConfig/orderOptionOpen.html',
-                    size: "sm",
+                    // size: "sm",
                     animation: true,
                     backdrop: 'static',
                     resolve: {
                     },
-                    windowClass: 'center-modal',
+                    windowClass: 'order-option-modal',
                     controller: "BusConfigListOrderOptionModalInstanceCtrl",
                     controllerAs: "$ctrl",
                     bindToController: true
@@ -264,12 +264,12 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                 // large方式弹出模态对话框
                 var modalInstance = $uibModal.open({
                     templateUrl: '/pages/scheduleApp/module/core/employeeConfig/orderOptionOpen.html',
-                    size: "sm",
+                    // size: "sm",
                     animation: true,
                     backdrop: 'static',
                     resolve: {
                     },
-                    windowClass: 'center-modal',
+                    windowClass: 'order-option-modal',
                     controller: "EmployeeConfigListOrderOptionModalInstanceCtrl",
                     controllerAs: "$ctrl",
                     bindToController: true
@@ -72,6 +72,14 @@
                     </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="lpType"
+                               ng-model="ctrl.guideboardForDetail.jygl" readonly/>
+                    </div>
+                </div>
+
                 <!-- 其他form-group -->
             </div>
@@ -99,6 +99,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="jygl"
+                               ng-model="ctrl.guideboardManageForForm.jygl" ng-pattern="ctrl.float_regex"
+                        />
+                    </div>
+                    <!-- 隐藏块，显示验证信息 -->
+                    <div class="alert alert-danger well-sm" ng-show="myForm.jygl.$error.pattern">
+                        输入数字
+                    </div>
+
+                </div>
+
                 <!-- 路牌类型暂时是普通路牌，默认填写了 -->
@@ -99,6 +99,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="jygl"
+                               ng-model="ctrl.guideboardManageForForm.jygl" ng-pattern="ctrl.float_regex"
+                        />
+                    </div>
+                    <!-- 隐藏块，显示验证信息 -->
+                    <div class="alert alert-danger well-sm" ng-show="myForm.jygl.$error.pattern">
+                        输入数字
+                    </div>
+
+                </div>
+
                 <!-- 路牌类型暂时是普通路牌，默认填写了 -->
@@ -8,6 +8,7 @@
                 <th style="width: 150px;">线路</th>
                 <th style="width: 100px;">路牌编号</th>
                 <th >路牌名称</th>
+                <th style="width: 100px;">加油公里</th>
                 <th style="width: 100px;">路牌类型</th>
                 <th style="width: 80px;">状态</th>
                 <th style="width: 20%">操作</th>
@@ -35,6 +36,7 @@
                     <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition()['lpName_like']" placeholder="请输入路牌名字..."/>
                 </td>
                 <td></td>
+                <td></td>
                 <td>
                     <label class="checkbox-inline">
                         <input type="checkbox" ng-model="ctrl.searchCondition()['isCancel_eq']"/>已作废
@@ -86,6 +88,9 @@
                     <span ng-bind="info.lpName"></span>
                 </td>
                 <td>
+                    <span ng-bind="info.jygl"></span>
+                </td>
+                <td>
                     <span ng-bind="info.lpType"></span>
                 </td>
                 <td>
@@ -265,12 +265,12 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                 // large方式弹出模态对话框
                 var modalInstance = $uibModal.open({
                     templateUrl: '/pages/scheduleApp/module/core/guideboardManage/orderOptionOpen.html',
-                    size: "sm",
+                    // size: "lg",
                     animation: true,
                     backdrop: 'static',
                     resolve: {
                     },
-                    windowClass: 'center-modal',
+                    windowClass: 'order-option-modal',
                     controller: "GuideboardManageListOrderOptionModalInstanceCtrl",
                     controllerAs: "$ctrl",
                     bindToController: true
@@ -321,6 +321,9 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             var self = this;
             var Gb = service.getGbQueryClass();
+            // 小数
+            self.float_regex = /^-?(?:\d+|\d{1,3}(?:,\d{3})+)(?:\.\d+)?$/;
+
             // 欲保存的表单信息，双向绑定
             self.guideboardManageForForm = new Gb;
             self.guideboardManageForForm.xl = {};
@@ -156,12 +156,12 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                 // large方式弹出模态对话框
                 var modalInstance = $uibModal.open({
                     templateUrl: '/pages/scheduleApp/module/core/rerunManage/orderOptionOpen.html',
-                    size: "sm",
+                    // size: "sm",
                     animation: true,
                     backdrop: 'static',
                     resolve: {
                     },
-                    windowClass: 'center-modal',
+                    windowClass: 'order-option-modal',
                     controller: "RerunManageListOrderOptionModalInstanceCtrl",
                     controllerAs: "$ctrl",
                     bindToController: true
@@ -222,12 +222,12 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                 // large方式弹出模态对话框
                 var modalInstance = $uibModal.open({
                     templateUrl: '/pages/scheduleApp/module/core/schedulePlanManage/orderOptionOpen.html',
-                    size: "sm",
+                    // size: "sm",
                     animation: true,
                     backdrop: 'static',
                     resolve: {
                     },
-                    windowClass: 'center-modal',
+                    windowClass: 'order-option-modal',
                     controller: "SchedulePlanManageListOrderOptionModalInstanceCtrl",
                     controllerAs: "$ctrl",
                     bindToController: true
@@ -277,12 +277,12 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                 // large方式弹出模态对话框
                 var modalInstance = $uibModal.open({
                     templateUrl: '/pages/scheduleApp/module/core/scheduleRuleManage/orderOptionOpen.html',
-                    size: "sm",
+                    // size: "sm",
                     animation: true,
                     backdrop: 'static',
                     resolve: {
                     },
-                    windowClass: 'center-modal',
+                    windowClass: 'order-option-modal',
                     controller: "ScheduleRuleManageListOrderOptionModalInstanceCtrl",
                     controllerAs: "$ctrl",
                     bindToController: true
@@ -234,12 +234,12 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                 // large方式弹出模态对话框
                 var modalInstance = $uibModal.open({
                     templateUrl: '/pages/scheduleApp/module/core/ttInfoManage/orderOptionOpen.html',
-                    size: "sm",
+                    // size: "sm",
                     animation: true,
                     backdrop: 'static',
                     resolve: {
                     },
-                    windowClass: 'center-modal',
+                    windowClass: 'order-option-modal',
                     controller: "TtInfoManageListOrderOptionModalInstanceCtrl",
                     controllerAs: "$ctrl",
                     bindToController: true
@@ -234,12 +234,12 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                 // large方式弹出模态对话框
                 var modalInstance = $uibModal.open({
                     templateUrl: '/pages/scheduleApp/module/core/ttInfoManage2/orderOptionOpen.html',
-                    size: "sm",
+                    // size: "sm",
                     animation: true,
                     backdrop: 'static',
                     resolve: {
                     },
-                    windowClass: 'center-modal',
+                    windowClass: 'order-option-modal',
                     controller: "TtInfoManage2ListOrderOptionModalInstanceCtrl",
                     controllerAs: "$ctrl",
                     bindToController: true