弹框修改

yiming
1 parent 05743b50
Showing 6 changed files with 96 additions and 40 deletions
src/main/java/com/bsth/data/zndd/OutEntrance.java
src/main/resources/static/real_control_v2/js/stationcf/klyj.js
src/main/resources/static/real_control_v2/js/stationcf/stationcf.js
src/main/resources/static/real_control_v2/js/zndd/data_zndd.js
src/main/resources/static/real_control_v2/main.html
src/main/resources/static/real_control_v2/zndd/type/dkl.html
@@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 import java.io.*;
 import java.text.SimpleDateFormat;
+import java.time.Duration;
 import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -170,11 +171,15 @@ public class OutEntrance {
                     }
                 });
                 ScheduleRealInfo schedule = null;
+                ScheduleRealInfo schedule2 = null;
                 for (int i1 = 0; i1 < sl.size(); i1++) {//最近的已发车班次
                     ScheduleRealInfo scheduleRealInfo=sl.get(i1);
                     LocalTime fcsj=LocalTime.parse(scheduleRealInfo.getFcsj(),dateTimeFormatter);
-                    if((scheduleRealInfo.getBcType().equals("normal")||scheduleRealInfo.getBcType().equals("region")) &&scheduleRealInfo.getXlDir().equals(dir) && fcsj.isAfter(localTime)){
-                        schedule =sl.get(i1-1);;
+                    if(fcsj.isAfter(localTime)){
+                        schedule =sl.get(i1-1);
+                        if(i1<sl.size()){
+                            schedule2 =sl.get(i1);
+                        }
                         break;
                     }
                 }
@@ -185,6 +190,14 @@ public class OutEntrance {
                     m.put("rq",localTime.format(dateTimeFormatter)); //检测到时间
                     m.put("ids",AutomaticSch.UUID());
                     m.put("type","KLYJ");
+                    LocalTime fcsj = LocalTime.parse(schedule2.getDfsj(),DateTimeFormatter.ofPattern("HH:mm"));
+                    LocalTime now = LocalTime.now();
+                    if(Duration.between(now,fcsj).toMinutes()==0){
+                        m.put("msg","下一个班次即将发车");
+                    }else {
+                        m.put("msg","下一个班次预计还有"+ Duration.between(now,fcsj).toMinutes() +"分钟发车");
+                    }
+
                     sendUtils.klyj(m);
                 }
@@ -2,8 +2,8 @@
  * 站点催发
  */
 var gb_klyj = (function () {
-    var $wrap = $('.multi_plat_msg_pop_klyj');
-    var max = 1;
+    var $wrap = $('.multi_plat_msg_pop_zndd');
+    var max = 3;
     var dataMap = new Map();
     var popcf = function (data) {
         dataMap.set(data.uuid,data);
@@ -12,9 +12,11 @@ var gb_klyj = (function () {
         var stm = moment(data.instructionsTime);
         data.timeStr = stm.format('HH时mm分ss秒');
         var htmlStr = template('klyj_plat_msg_template', data);
-        var items = $wrap.find('.multi_plat_msg_pops'), len = items.length;
-        if (len >= max)
-            return
+        var items = $wrap.find('.multi_plat_config'), len = items.length;
+        if (len >= max){
+            $wrap.find('.multi_plat_config:lt(' + (len - max) + ')').remove();
+        }
+
         var $modal = $('#schedule-addsch-modal');
         if (!$modal.hasClass('uk-open')) {
@@ -37,11 +39,29 @@ var gb_klyj = (function () {
     });
     var close = true; //关闭弹出框的时候不弹出
-    $wrap.on('click', '.multi_plat_msg_pops .msg-times', function () {
+    $wrap.on('click', '.multi_plat_config .msg-times', function () {
         $(this).parent().parent().remove();
         /*if (close)  close = false*/
     });
+    $wrap.on('click', '.images', function () {
+        var image = $(this).data('image');
+        var imgHtml = "<img src='" + image + "' style='width: " + 600 + "px;height:" + 300 + "px'/>";
+        layer.open({
+            type: 1,
+            offset: 'auto',
+            area: [600 + 'px', 300 + 'px'],
+            shadeClose: true,//点击外围关闭弹窗
+            scrollbar: true,//不现实滚动条
+            title: false, //不显示标题
+            content: imgHtml, //捕获的元素，注意：最好该指定的元素要存放在body最外层，否则可能被其它的相对元素所影响
+            cancel: function () {
+
+            }
+        })
+
+    });
+
     return {
         popcf: popcf
     }
@@ -2,8 +2,8 @@
  * 站点催发
  */
 var gb_stationcf = (function () {
-    var $wrap = $('.multi_plat_msg_pop_cf');
-    var max = 5;
+    var $wrap = $('.multi_plat_msg_pop_zndd');
+    var max = 3;
     var popcf = function (data) {
         //时间格式化
@@ -16,9 +16,9 @@ var gb_stationcf = (function () {
        /* gb_svg_chart.people(data.lineCode,stopNo,data.num,data.image);*/
         var htmlStr = template('cf_plat_msg_template', data);
-        var items = $wrap.find('.multi_plat_msg_pops'), len = items.length;
+        var items = $wrap.find('.multi_plat_config'), len = items.length;
         if (len >= max)
-            $wrap.find('.multi_plat_msg_pops:lt(' + (len - max) + ')').remove();
+            $wrap.find('.multi_plat_config:lt(' + (len - max) + ')').remove();
         $wrap.append(htmlStr);
     };
@@ -49,7 +49,7 @@ var gb_stationcf = (function () {
     });
     var close = true; //关闭弹出框的时候不弹出
-    $wrap.on('click', '.multi_plat_msg_pops .msg-times', function () {
+    $wrap.on('click', '.multi_plat_config .msg-times', function () {
         $(this).parent().parent().remove();
         /*if (close)  close = false*/
     });
 var gb_dataZndd = (function (){
-    var max = 1;
+    var max = 3;
     var $pop =$('.multi_plat_msg_pop_zndd'); 
     var codes = {
@@ -356,9 +356,11 @@ var gb_dataZndd = (function (){
                 }
             });*/
         } else if (type == "KLYJ"){
-            open_modal("/real_control_v2/zndd/type/dkl.html", {
-                data: data
-            }, {center: true, bgclose: false, modal: true});
+            if(!$('#schedule-addsch-modal').hasClass('uk-open')){
+                open_modal("/real_control_v2/zndd/type/dkl.html", {
+                    data: data
+                }, {center: true, bgclose: false, modal: true});
+            }
         }
     }
     function checkTime(i){ //将0-9的数字前面加上0，例1变为01
@@ -260,18 +260,25 @@
     </div>
 </script>
 <div class="multi_plat_msg_pop_cf" ></div>
-<script id="cf_plat_msg_template" type="text/html">
-    <div class="multi_plat_msg_pops uk-animation-slide-bottom" data-type="{{type}}" >
-        <div>
-            <div class="msg-times" style="cursor: pointer;" >x</div>
-            <span class="reminder">催发</span>
-            <span class="tests">{{lineName}}</span>
-            <span class="tests">{{stationName}}——{{dir == 0 ? '上行':'下行'}}</span>
-            <span class="tests">站点人数&nbsp;&nbsp;&nbsp;{{num}}</span>
-            <span class="time">催发时间：{{timeStr}}</span>
+
+<script  id="cf_plat_msg_template" type="text/html">
+    <div class="multi_plat_config"  data-type="{{type}}">
+        <div class="msg-popup warning-color">
+            <div class="msg-times" style="cursor: pointer;">×</div>
+            <div class="centerSpace msg-title" style="color: red">
+                催发
+            </div>
+            <div class="popup-msg-content">
+                <span>{{lineName}} {{dir == 0 ? '上行':'下行'}} {{stationName}}</span>
+            </div>
+            <div class="popup-msg-content">
+                <span>站点人数&nbsp;{{num}} &nbsp;&nbsp;催发时间&nbsp;{{timeStr}}</span>
+            </div>
+            <div class="popup-msg-contents" >
+                <button class="uk-button uk-button-primary all"   data-call="{{calleeId}}" data-ip="{{dir}}" value="{{dir}}">拨打站台电话</button>
+                <button class="uk-button uk-button-primary images"  data-image="{{image}}" value="{{dir}}">查看图片</button>
+            </div>
         </div>
-        <button class="all uk-button uk-modal-close" class="title" data-call="{{calleeId}}" data-ip="{{dir}}" value="{{dir}}">拨打站台电话</button>
-        <button class="images uk-button uk-modal-close" data-image="{{image}}" value="{{dir}}">查看图片</button>
     </div>
 </script>
 <!-- #### 智能调度 start ###  -->
@@ -309,19 +316,25 @@
 </div>
 <div class="multi_plat_msg_pop_klyj" ></div>
-<script id="klyj_plat_msg_template" type="text/html">
-    <div class="multi_plat_msg_pops uk-animation-slide-bottom " data-type="{{type}}" data-uuid="{{uuid}}" >
+<script  id="klyj_plat_msg_template" type="text/html">
+    <div class="multi_plat_config"  data-type="{{type}}" data-uuid="{{uuid}}">
         <div id ={{uuid}}  class="timer"></div>
-        <div>
-            <div class="msg-times" style="cursor: pointer;" >x</div>
-            <span class="reminder">大客流预警</span>
-            <span class="tests">{{lineName}}</span>
-            <span class="tests">{{stationName}}——{{dir == 0 ? '上行':'下行'}}</span>
-            <span class="tests">站点人数&nbsp;&nbsp;&nbsp;{{num}}</span>
-            <span class="time">预警时间：{{timeStr}}</span>
+        <div class="msg-popup warning-color">
+            <div class="msg-times" style="cursor: pointer;">×</div>
+            <div class="centerSpace msg-title" style="color: red">
+                大客流预警
+            </div>
+            <div class="popup-msg-content">
+                <span>{{lineName}} {{dir == 0 ? '上行':'下行'}} {{stationName}}</span>
+            </div>
+            <div class="popup-msg-content">
+                <span>站点人数&nbsp;{{num}} &nbsp;&nbsp;预警时间&nbsp;{{timeStr}}</span>
+            </div>
+            <div class="popup-msg-contents" >
+                <button class="uk-button uk-button-primary images"   data-image="{{image}}" value="{{dir}}">查看图片</button>
+                <button class="uk-button uk-button-primary ljbc"  data-uuid="{{uuid}}" data-linecode="{{sch.xlBm}}" data-id="{{sch.id}}">临加班次</button>
+            </div>
         </div>
-        <button class="images uk-button uk-modal-close" data-image="{{image}}" value="{{dir}}">查看图片</button>
-        <button class="ljbc uk-button uk-modal-close"  data-uuid="{{uuid}}" data-linecode="{{sch.xlBm}}" data-id="{{sch.id}}">临加班次</button>
     </div>
 </script>
@@ -118,6 +118,8 @@
                 $.post('/logZndd/thissch/'+sch.sch.id, function(res) {
                     //to and fro
+                    res.zdsjActual = moment(new Date().getTime() +(1000 * 60 *5)).format("HH:mm");
+                    res.zdsj = moment(new Date().getTime() + (1000 * 60 * 5)).format("HH:mm");
                     $('.toAndFroCont', modal).html(st_doms.two_way_dom)
                         .trigger('init', {sch: res, submitFun: submit_temp_schedule_form, stationRoutes: stationRoutes});
@@ -494,7 +496,6 @@
                 </div>
             </div>
         </div>
-
         <div class="uk-grid">
             <div class="uk-width-2-2">
                 <div class="uk-form-row">
@@ -502,6 +503,13 @@
                 </div>
             </div>
         </div>
+        <div class="uk-grid">
+            <div class="uk-width-4-2">
+                <div class="uk-form-row">
+                    <label class="uk-form-labels" ><h3>{{msg}}</h3></label>
+                </div>
+            </div>
+        </div>
     </div>
 </script>