update

潘钊
1 parent 2c729139
Showing 12 changed files with 197 additions and 46 deletions
src/main/java/com/bsth/entity/realcontrol/LineConfig.java
src/main/java/com/bsth/repository/sys/DutyEmployeeRepository.java
src/main/java/com/bsth/service/realcontrol/impl/LineConfigServiceImpl.java
src/main/java/com/bsth/service/sys/impl/DutyEmployeeServiceImpl.java
src/main/resources/static/real_control_v2/css/line_schedule.css
src/main/resources/static/real_control_v2/css/modal_extend.css
src/main/resources/static/real_control_v2/fragments/north/nav/line_config/buffer_config.html
src/main/resources/static/real_control_v2/fragments/north/nav/line_config/line_config.html
src/main/resources/static/real_control_v2/fragments/north/nav/line_config/line_config_entity.html
src/main/resources/static/real_control_v2/js/main.js
src/main/resources/static/real_control_v2/js/modal_extend.js
src/main/resources/static/real_control_v2/main.html
@@ -75,6 +75,15 @@ public class LineConfig {
 	//下行出站
 	private int downOutDiff;
+	/**
+	 * 应急停靠
+	 */
+	private boolean enableYjtk;
+	private String yjtkStart;
+	private String yjtkEnd;
+	private int upStopMinute;
+	private int downStopMinute;
+
 	@OneToMany(cascade = CascadeType.ALL)
 	private Set<D80ReplyTemp> d80Temps = new HashSet<>();
@@ -219,4 +228,44 @@ public class LineConfig {
 	public void setTwinsPark(String twinsPark) {
 		this.twinsPark = twinsPark;
 	}
+
+	public String getYjtkStart() {
+		return yjtkStart;
+	}
+
+	public void setYjtkStart(String yjtkStart) {
+		this.yjtkStart = yjtkStart;
+	}
+
+	public String getYjtkEnd() {
+		return yjtkEnd;
+	}
+
+	public void setYjtkEnd(String yjtkEnd) {
+		this.yjtkEnd = yjtkEnd;
+	}
+
+	public int getUpStopMinute() {
+		return upStopMinute;
+	}
+
+	public void setUpStopMinute(int upStopMinute) {
+		this.upStopMinute = upStopMinute;
+	}
+
+	public int getDownStopMinute() {
+		return downStopMinute;
+	}
+
+	public void setDownStopMinute(int downStopMinute) {
+		this.downStopMinute = downStopMinute;
+	}
+
+	public boolean isEnableYjtk() {
+		return enableYjtk;
+	}
+
+	public void setEnableYjtk(boolean enableYjtk) {
+		this.enableYjtk = enableYjtk;
+	}
 }
@@ -13,7 +13,7 @@ import java.util.List;
 @Repository
 public interface DutyEmployeeRepository extends BaseRepository<DutyEmployee, Long>{
-    //@Query("select t from DutyEmployee t where t.codeIdx like %?1% and t.ts > ?2 and t.ts < ?3")
-    @Query("select t from DutyEmployee t where t.codeIdx like %?1% and t.ts < ?2")
-    List<DutyEmployee> findByLineAndTime(String lineCode, long et);
+    @Query("select t from DutyEmployee t where t.codeIdx like %?1% and t.ts > ?2 and t.ts < ?3")
+    //@Query("select t from DutyEmployee t where t.codeIdx like %?1% and t.ts < ?2")
+    List<DutyEmployee> findByLineAndTime(String lineCode, long st,  long et);
 }
@@ -11,6 +11,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -104,7 +105,7 @@ public class LineConfigServiceImpl extends BaseServiceImpl&lt;LineConfig, Integer&gt; 
         try {
             LineConfig conf = lineConfigData.get(lineCode);
-            conf.setInParkForSource(enable==1);
+            conf.setInParkForSource(enable == 1);
             lineConfigData.set(conf);
             rs.put("status", ResponseCode.SUCCESS);
@@ -123,8 +124,10 @@ public class LineConfigServiceImpl extends BaseServiceImpl&lt;LineConfig, Integer&gt; 
         Map<String, Object> rs = new HashMap<>();
         try {
             LineConfig conf = lineConfigData.get(lineCode);
+            Field f = conf.getClass().getDeclaredField(field);
+            f.setAccessible(true);
+            f.setInt(conf, Integer.parseInt(value));
-            conf.getClass().getField(field).set(conf, value);
             lineConfigData.set(conf);
             rs.put("status", ResponseCode.SUCCESS);
@@ -39,6 +39,7 @@ public class DutyEmployeeServiceImpl extends BaseServiceImpl&lt;DutyEmployee, Long&gt;
      */
     public List<DutyEmployee> getDutyEmployee(String lineCode, String startTime, String endTime) {
         DateTimeFormatter fmtyyyyMMddHHmm = DateTimeFormat.forPattern("yyyy-MM-ddHH:mm");
-        return dutyEmployeeRepository.findByLineAndTime(lineCode + ",",  fmtyyyyMMddHHmm.parseMillis(endTime));
+        return dutyEmployeeRepository.findByLineAndTime(lineCode + ",", fmtyyyyMMddHHmm.parseMillis(startTime)
+                , fmtyyyyMMddHHmm.parseMillis(endTime));
     }
 }
@@ -923,7 +923,7 @@ input.i-cbox[type=checkbox]{
 #add-sub-task-inpark-modal .uk-modal-dialog{
     width: 755px;
-    transition: all .3s ease;
+    /*transition: all .3s ease;*/
 }
 #add-sub-task-inpark-modal .uk-modal-dialog.three-children{
+.uk-modal{
+    background: rgba(0,0,0,.4) !important;
+}
+
+.uk-modal-dialog{
+    border: 1px solid #dd6952;
+
+    position: absolute !important;
+    margin: 0 !important;
+}
+
+.uk-modal-dialog.uk-modal-dialog-blank{
+    border: none !important;
+}
+
+.uk-modal-header{
+    cursor: move;
+    user-select: none;
+}
 \ No newline at end of file
@@ -48,7 +48,7 @@
                         <tr>
                             <td colspan="2" style="padding-left: 30px;">
                                 是否启用
-                                <select class="z-depth-input">
+                                <select class="z-depth-input" name="enableYjtk">
                                     <option>禁用</option>
                                     <option>启用</option>
                                 </select>
@@ -57,20 +57,20 @@
                         <tr>
                             <td colspan="2" style="padding-left: 58px;">
                                 时间
-                                <input type="time" disabled>至
-                                <input type="time" disabled>
+                                <input type="time" value="{{yjtkStart}}" name="yjtkStart" {{if !enableYjtk}}disabled{{/if}}>至
+                                <input type="time" value="{{yjtkEnd}}" name="yjtkEnd" {{if !enableYjtk}}disabled{{/if}}>
                             </td>
                         </tr>
                         <tr>
                             <td>
                                 上行停靠时间
-                                <input type="number" disabled>分钟
+                                <input type="number" value="{{upStopMinute}}" name="upStopMinute" {{if !enableYjtk}}disabled{{/if}}>分钟
                             </td>
                         </tr>
                         <tr>
                             <td>
                                 下行停靠时间
-                                <input type="number" disabled>分钟
+                                <input type="number" value="{{downStopMinute}}" name="downStopMinute" {{if !enableYjtk}}disabled{{/if}}>分钟
                             </td>
                         </tr>
                     </table>
@@ -108,11 +108,15 @@
                             value: val
                         }, function (rs) {
                             conf[rs.field] = rs.value;
-                            console.log('rs', rs);
                             notify_succ(textMap[field] + val + '秒');
                         });
                     }
                 });
+
+                //应急停靠
+                $('[name=enableYjtk]', wrap).on('change', function () {
+
+                });
             });
         })();
@@ -63,6 +63,16 @@
                 }
             });
+            /**
+             * 手风琴拨动
+             */
+            $('.uk-accordion').on('toggle.uk.accordion', function (e, active, toggle, content) {
+                if(active){
+                    activeCode = $(toggle).data('id');
+                    load();
+                }
+            });
+
             var load = function () {
                 //获取线路配置信息
                 $.get('/lineConfig/getByLineCode', {lineCode: activeCode}, function (conf) {
@@ -9,7 +9,7 @@
             </h2>
             <div>
                 <div>
-                    闵行11路每天
+                    <span class="line_name"></span>每天
                     <div class="uk-form-icon" style="margin: 0 5px;">
                         <i class="uk-icon-clock-o"></i>
                         <input name="startOptInput" readonly type="text" class="z-depth-input" value="{{startOpt}}"
@@ -23,8 +23,8 @@
                         <small><i class="uk-icon-question-circle"></i> 所有发车时间小于该时间的班次都默认跨过24点，手动调整的实发实达均应用此规则。</small>
                     </li>
                 </ul>
-                <a class="uk-button uk-button-mini">删除班次</a>
-                <a class="uk-button uk-button-mini">重新加载计划排班</a>
+                <a class="uk-button uk-button-mini">删除实际排班</a>
+                <a class="uk-button uk-button-mini">重新加载实际排班</a>
                 <a class="uk-button uk-button-mini">加载历史GPS恢复到离站</a>
             </div>
         </div>
@@ -60,7 +60,7 @@
             </h2>
             <div>
                 是否启用
-                <select name="inParkForSourceSelect" class="z-depth-input">
+                <select name="inParkForSourceSelect" class="z-depth-input" disabled>
                     <option value="0">禁用</option>
                     <option value="1">启用</option>
                 </select>
@@ -87,7 +87,7 @@
                 var htmlStr = template('line_config_entity_form-temp', conf);
                 $('form', wrap).html(htmlStr);
-                console.log('confconf', conf);
+                $('.line_name', '#line_config_entity_wrap').text(conf.line.name);
                 //更新排班时间
                 $('input[name=startOptInput]', wrap).on('change', updateStartTime);
                 //出场时间类型
@@ -61,10 +61,7 @@ var gb_main_ep = new EventProxy(),
         }
     });
-//modal hide remove dom
-$(document).on('hide.uk.modal', '.uk-modal', function () {
-    $(this).remove();
-});
+
 $(document).on('click', '.ct-bottom-drawer-close', function () {
     $(this).parents('.ct-bottom-drawer').removeClass('open');
@@ -150,30 +147,6 @@ var disabled_submit_btn = function (form) {
     }
 };
-var show_modal = function (id, dom) {
-    $(document.body).append(dom);
-    return UIkit.modal(id, {
-        bgclose: false
-    }).show();
-};
-
-var open_modal = function (pageUrl, data, opt) {
-    $.get(pageUrl, function (dom) {
-        if (!$(dom).hasClass('uk-modal')) {
-            alert('无效的dom片段！');
-            return;
-        }
-        var id = '#' + $(dom).attr('id');
-
-        $(document.body).append(dom);
-
-        UIkit.modal(id, opt).show();
-
-        if (data)
-            $(id).trigger('init', data);
-    });
-};
-
 function showUpdateDescription() {
     //更新说明
+
+//modal hide remove dom
+$(document).on('hide.uk.modal', '.uk-modal', function () {
+    $(this).remove();
+});
+
+$(document).on('show.uk.modal', '.uk-modal', function () {
+    if($('.uk-modal-dialog', this).hasClass('uk-modal-dialog-blank'))
+        return;
+    //计算居中位置
+    var win = $('body');
+    var Y = (win.width() - $('.uk-modal-dialog', this).width()) / 2 - 10;
+    $('.uk-modal-dialog', this).css('top', '50px').css('left', Y + 'px');
+});
+
+var show_modal = function (id, dom) {
+    $(document.body).append(dom);
+    return UIkit.modal(id, {
+        bgclose: false
+    }).show();
+};
+
+var open_modal = function (pageUrl, data, opt) {
+    $.get(pageUrl, function (dom) {
+        if (!$(dom).hasClass('uk-modal')) {
+            alert('无效的dom片段！');
+            return;
+        }
+        var id = '#' + $(dom).attr('id');
+
+        $(document.body).append(dom);
+        UIkit.modal(id, opt).show();
+        //move
+        modal_move($('.uk-modal-header',id));
+
+        if (data)
+            $(id).trigger('init', data);
+    });
+};
+
+
+var modal_move = function (m_header) {
+    var _moveFlag;
+    var _moveObj;
+    var _offset;
+    var dict= {};
+    var win = $('body');
+
+    $(m_header).on('mousedown', function (e) {
+        console.log('mousedown');
+        e.preventDefault();
+        _moveFlag = true;
+        _moveObj = $(this).parent();
+        _offset = [
+            e.clientX - parseFloat(_moveObj.css('left'))  - 1,
+            e.clientY - parseFloat(_moveObj.css('top')) - 1
+        ];
+    });
+
+    $(m_header).parents('.uk-modal').mousemove(function (e) {
+        e.preventDefault();
+        if(!_moveFlag || !_moveObj)
+            return;
+
+        var X = e.clientX - _offset[0]
+            ,Y = e.clientY - _offset[1];
+
+        dict.stX = win.scrollLeft();
+        dict.stY = win.scrollTop();
+
+        //控制元素不被拖出窗口外
+        var setRig = win.width() - _moveObj.outerWidth() + dict.stX
+            ,setBot = win.height() - _moveObj.outerHeight() + dict.stY;
+        X < dict.stX && (X = dict.stX);
+        X > setRig && (X = setRig);
+        Y < dict.stY && (Y = dict.stY);
+        Y > setBot && (Y = setBot);
+
+        _moveObj.css({
+            left: X
+            ,top: Y
+        });
+    });
+    $(window).on('mouseup', function () {
+        _moveFlag = false;
+        _moveObj = null;
+    });
+
+};
@@ -33,6 +33,7 @@
     <link rel="stylesheet" href="/real_control_v2/assets/plugins/qtip/jquery.qtip.min.css"/>
     <link rel="stylesheet" href="/real_control_v2/css/pace.css"/>
+    <link rel="stylesheet" href="/real_control_v2/css/modal_extend.css"/>
 </head>
 <body>
@@ -181,6 +182,8 @@
 <!-- 处理表单片段嵌入问题 -->
 <script src="/real_control_v2/js/forms/form_embed.js"></script>
+
+<script src="/real_control_v2/js/modal_extend.js"></script>
 </body>
 </html>