线调bug修复1101

潘钊
1 parent dae65f88
Showing 17 changed files with 129 additions and 52 deletions
src/main/java/com/bsth/controller/realcontrol/BasicDataController.java
src/main/java/com/bsth/oplog/db/DBHelper.java
src/main/resources/application-dev.properties
src/main/resources/static/real_control_v2/css/line_schedule.css
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/add_temp_sch.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/fcxxwt.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/jhlb.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sftz.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sub_task/add_sub_task_other.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/tzrc.html
src/main/resources/static/real_control_v2/fragments/line_schedule/sch_table.html
src/main/resources/static/real_control_v2/fragments/north/tabs.html
src/main/resources/static/real_control_v2/js/common.js
src/main/resources/static/real_control_v2/js/line_schedule/context_menu.js
src/main/resources/static/real_control_v2/js/line_schedule/sch_table.js
src/main/resources/static/real_control_v2/js/main.js
src/main/resources/static/real_control_v2/js/websocket/sch_websocket.js
@@ -47,6 +47,15 @@ public class BasicDataController {
 		return rs;
 	}
+	@RequestMapping("/all_personnel")
+	public Map<String, String> all_personnel(){
+		//Map<String, Object> rs = new HashMap<>();
+		//PersonnelFieldFilter filter=new PersonnelFieldFilter();
+		
+		//rs.put("list", JSON.parse(JSON.toJSONString(BasicData.jsyMap.values(), filter)));
+		return BasicData.allPerson;
+	}
+	
 	public class PersonnelFieldFilter implements PropertyFilter{
@@ -37,7 +37,7 @@ public class DBHelper implements CommandLineRunner{
 		@Override
 		public void run() {
-			persistence.batchSave(buffer);
+			//persistence.batchSave(buffer);
 		}
 	}
@@ -8,7 +8,7 @@ spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
 spring.jpa.database= MYSQL
 spring.jpa.show-sql= true
 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.url= jdbc:mysql://192.168.168.201:3306/mh_control
+spring.datasource.url= jdbc:mysql://192.168.168.201:3306/qp_control
 spring.datasource.username= root
 spring.datasource.password= 123456
 #DATASOURCE
@@ -486,31 +486,39 @@ div.drop-rail[data-type=&quot;car&quot;]:before {
 }
 dl.relevance-active dd:nth-child(n+2) {
-    background: #76a6c7 !important;
-    color: white;
+    background: #f1efef !important;
 }
-dl.relevance-active dd.tl-qrlb {
+dl.relevance-active.intimity dd:nth-child(n+2) {
+  background: #76a6c7 !important;
+  color: white;
+}
+
+dl.relevance-active dd.tl-qrlb,
+dl.relevance-active.intimity dd.tl-qrlb{
     background: linear-gradient(to right, #7B6B24, #4992c3) !important;
     color: #f8e9cd;
 }
-dl.relevance-active dd.tl-zzzx {
+dl.relevance-active dd.tl-zzzx,
+dl.relevance-active.intimity dd.tl-zzzx {
     background: linear-gradient(to right, #96F396, #4992c3) !important;
     color: #565252;
 }
-dl.relevance-active dd.tl-zzzx span.fcsj-diff {
+dl.relevance-active dd.tl-zzzx span.fcsj-diff,
+dl.relevance-active.intimity dd.tl-zzzx span.fcsj-diff {
     color: #5e5a5a
 }
-dl.relevance-active dd span.fcsj-diff {
+dl.relevance-active dd span.fcsj-diff,
+dl.relevance-active.intimity dd span.fcsj-diff {
     color: #d7d6d6;
 }
-dl.relevance-active a {
+/*dl.relevance-active a {
     color: #dff0ff;
-}
+}*/
 .right-text-lp {
     position: absolute;
@@ -131,11 +131,11 @@
                     //车辆
                     gb_common.carAutocomplete($('.car-autocom', modal), rs);
                 });
-                $.get('/basic/personnel', function(rs) {
+                $.get('/basic/all_personnel', function(rs) {
                     //驾驶员
-                    gb_common.personAutocomplete($('.jsy-autocom', modal), rs.jsy);
+                    gb_common.personAutocomplete($('.jsy-autocom', modal), rs);
                     //售票员
-                    gb_common.personAutocomplete($('.spy-autocom', modal), rs.spy);
+                    gb_common.personAutocomplete($('.spy-autocom', modal), rs);
                 });
                 //站点路由
@@ -152,6 +152,7 @@
                 //submit
                 var f = $('form', modal).formValidation(gb_form_validation_opts);
                 f.on('success.form.fv', function(e) {
+                    disabled_submit_btn(this);
                     e.preventDefault();
                     var data = $(this).serializeJSON();
                     data.xlBm=sch.xlBm;
@@ -123,7 +123,7 @@
             <div class="uk-width-1-1">
                 <div class="uk-form-row ct-stacked">
                     <div class="uk-form-controls" style="margin-top: 5px;">
-                        <textarea id="form-s-t" cols="30" rows="5" name="remarks" data-fv-stringlength="true" data-fv-stringlength-max="20" placeholder="备注，不超过20个字符"></textarea>
+                        <textarea id="form-s-t" cols="30" rows="5" name="remarks" data-fv-stringlength="true" data-fv-stringlength-max="20" placeholder="备注，不超过20个字符">{{sch.remarks}}</textarea>
                     </div>
                 </div>
             </div>
@@ -157,6 +157,8 @@
         						      gb_schedule_table.updateSchedule(rs.ts);
                           UIkit.modal(modal).hide();
                           notify_succ('操作成功!');
+                          //计算应发未发
+                          gb_schedule_table.calc_yfwf_num(sch.xlBm);
         						});
                 });
@@ -119,6 +119,8 @@
                         gb_schedule_table.updateSchedule(rs.ts);
                         UIkit.modal(modal).hide();
                         notify_succ('烂班操作成功！');
+                        //calc 应发未发
+                        gb_schedule_table.calc_yfwf_num(sch.xlBm);
                     });
                 });
@@ -87,6 +87,9 @@
                             gb_schedule_table.updateSchedule(rs.ts);
                             UIkit.modal(modal).hide();
                             notify_succ('实发调整成功！');
+
+                            if(data.fcsjActual)
+                              gb_schedule_table.calc_yfwf_num(sch.xlBm);
                         }
                     });
                 });
@@ -134,16 +134,16 @@
                 dictionaryUtils.transformDom($('.nt-dictionary', modal));
                 //----------- Autocomplete --------------
-                $.get('/basic/cars', function(rs) {
-                    //车辆
-                    gb_common.carAutocomplete($('.car-autocom', modal), rs);
-                });
-                $.get('/basic/personnel', function(rs) {
-                    //驾驶员
-                    gb_common.personAutocomplete($('.jsy-autocom', modal), rs.jsy);
-                    //售票员
-                    gb_common.personAutocomplete($('.spy-autocom', modal), rs.spy);
-                });
+                // $.get('/basic/cars', function(rs) {
+                //     //车辆
+                //     gb_common.carAutocomplete($('.car-autocom', modal), rs);
+                // });
+                // $.get('/basic/all_personnel', function(rs) {
+                //     //驾驶员
+                //     gb_common.personAutocomplete($('.jsy-autocom', modal), rs);
+                //     //售票员
+                //     gb_common.personAutocomplete($('.spy-autocom', modal), rs);
+                // });
                 //站点路由
                 stationRoutes = gb_common.groupBy(gb_data_basic.stationRoutes(sch.xlBm).sort(function(a, b){
@@ -159,6 +159,7 @@
                 //submit
                 var f = $('form', modal).formValidation(gb_form_validation_opts);
                 f.on('success.form.fv', function(e) {
+                    disabled_submit_btn(this);
                     e.preventDefault();
                     var data = $(this).serializeJSON();
@@ -166,7 +167,6 @@
                         notify_succ('子任务添加成功');
                         gb_schedule_table.updateSchedule(rs.t);
                         $('#schedule-lj_zrw-modal .main-schedule-table').trigger('refresh', {sch: rs.t});
-                        //$('#schedule-lj_zrw-modal .sub-task-table').trigger('refresh');
                         UIkit.modal(modal).hide();
                     });
                 });
@@ -159,11 +159,11 @@
                     //车辆
                     gb_common.carAutocomplete($('.car-autocom', modal), rs);
                 });
-                $.get('/basic/personnel', function(rs) {
+                $.get('/basic/all_personnel', function(rs) {
                     //驾驶员
-                    gb_common.personAutocomplete($('.jsy-autocom', modal), rs.jsy);
+                    gb_common.personAutocomplete($('.jsy-autocom', modal), rs);
                     //售票员
-                    gb_common.personAutocomplete($('.spy-autocom', modal), rs.spy);
+                    gb_common.personAutocomplete($('.spy-autocom', modal), rs);
                 });
                 //默认选中项
@@ -58,7 +58,7 @@
                             {{sch.fcsjActual}}<span class="fcsj-diff">{{sch.fcsj_diff}}</span>
                           </dd>
                           <dd data-uk-observe>
-                            <span title="{{sch.remarks}}" data-uk-tooltip>{{sch.remarks}}</span>
+                            <span title="{{sch.remarks}}" data-uk-tooltip="{pos:'top-left'}" >{{sch.remarks}}</span>
                           </dd>
                         </dl>
                       {{/each}}
@@ -4,7 +4,7 @@
         <li class="uk-active" ><a>主页</a></li>
         <li class=""><a>地图</a></li>
         {{each list as line i}}
-        <li class="tab-line"><a>{{line.name}}（0, 0）</a></li>
+        <li class="tab-line"><a>{{line.name}}（0, <span id="badge_yfwf_num_{{line.lineCode}}">0</span>）</a></li>
         {{/each}}
     </ul>
   </script>
@@ -176,18 +176,26 @@ var gb_common = (function() {
         init_autocom_pinyin(element, data);
     };
-    var personAutocomplete = function(element, personList) {
+    var personAutocomplete = function(element, personMaps) {
         var data = [],name;
-        $.each(personList, function(){
-          name=this.personnelName;
+        // $.each(personList, function(){
+        //   name=this.personnelName;
+        //   data.push({
+        //     value: this.jobCode+'/'+name,
+        //     fullChars: pinyin.getFullChars(name).toUpperCase(),
+        //     camelChars: pinyin.getCamelChars(name),
+        //     brancheCompany: this.brancheCompany
+        //   });
+        // });
+        // console.log('data', data);
+        for(var jobCode in personMaps){
+          name=personMaps[jobCode];
           data.push({
-            value: this.jobCode+'/'+name,
-            fullChars: pinyin.getFullChars(name).toUpperCase(),
-            camelChars: pinyin.getCamelChars(name),
-            brancheCompany: this.brancheCompany
+              value: jobCode+'/'+name,
+              fullChars: pinyin.getFullChars(name).toUpperCase(),
+              camelChars: pinyin.getCamelChars(name)
           });
-        });
-        console.log('data', data);
+        }
         init_autocom_pinyin(element, data);
     };
@@ -39,6 +39,9 @@ var gb_schedule_context_menu = (function() {
                 }, function(rs) {
                     gb_schedule_table.updateSchedule(rs.t);
                     notify_succ('撤销烂班操作成功！');
+
+                    //calc 应发未发
+                    gb_schedule_table.calc_yfwf_num(sch.xlBm);
                 });
             }, '确认撤销');
         },
@@ -58,6 +61,8 @@ var gb_schedule_context_menu = (function() {
                 }, function(rs) {
                     gb_schedule_table.updateSchedule(rs.ts);
                     notify_succ('撤销实发操作成功！');
+                    //calc 应发未发
+                    gb_schedule_table.calc_yfwf_num(sch.xlBm);
                 });
             }, '确认撤销实发');
         },
@@ -24,6 +24,8 @@ var gb_schedule_table = (function() {
                     calc_sch_real_shift(this);
                     line2Schedule[lineCode][this.id] = this;
                 });
+                //计算应发未发
+                calc_yfwf_num(lineCode);
             }
             ep.emit('data', rs);
         });
@@ -110,10 +112,12 @@ var gb_schedule_table = (function() {
       for (var upDown in dirData) {
           htmlStr = temps['line-schedule-table-temp']({
               dir: upDown,
+              line: gb_data_basic.codeToLine[sch.xlBm],
               list: dirData[upDown]
           });
           $('.schedule-wrap .card-panel:eq(' + upDown + ')', tabCont).html(htmlStr);
       }
+      calc_yfwf_num(sch.xlBm);
       //定位到新添加的班次
       scroToDl(sch);
     }
@@ -127,6 +131,7 @@ var gb_schedule_table = (function() {
         delete line2Schedule[sch.xlBm][sch.id];
         dl.remove();
         reset_seq_no(dls);
+        calc_yfwf_num(sch.xlBm);
       }
     }
@@ -150,6 +155,7 @@ var gb_schedule_table = (function() {
         $(dds[2]).data('nbbm', sch.clZbh).text(sch.clZbh);
         if (sch.qdzArrDateJH)
             $(dds[3]).text(sch.qdzArrDateJH);
+
         if (sch.qdzArrDateSJ)
             $(dds[4]).text(sch.qdzArrDateSJ);
@@ -162,7 +168,9 @@ var gb_schedule_table = (function() {
         var sfsjDd = temps['line-schedule-sfsj-temp'](sch);
         $(dds[7]).replaceWith(sfsjDd);
         if(sch.remarks)
-          $(dds[8]).html('<span title="'+sch.remarks+'" data-uk-tooltip>'+sch.remarks+'</span>');
+          $(dds[8]).html('<span title="'+sch.remarks+'" data-uk-tooltip="{pos:\'top-left\'}">'+sch.remarks+'</span>');
+        else
+          $(dds[8]).html('');
     }
     //拖拽选中...
@@ -205,13 +213,17 @@ var gb_schedule_table = (function() {
             schArr = gb_common.get_vals(line2Schedule[lineCode]).filter(function(item) {
                 return item.clZbh == sch.clZbh;
             }).sort(schedule_sort),
-            nextSch;
+            nextSch,tempDL;
         $.each(schArr, function(i) {
-            $('dl[data-id=' + this.id + ']', contWrap).addClass('relevance-active');
-            if (i < schArr.length - 1 && this.id == id)
-                nextSch = schArr[i + 1];
+            tempDL=$('dl[data-id=' + this.id + ']', contWrap);
+            tempDL.addClass('relevance-active');
+            if (i < schArr.length - 1 && this.id == id){
+              nextSch = schArr[i + 1];
+              tempDL.addClass('intimity');
+            }
         });
+        $('dl[data-id=' + nextSch.id + ']', contWrap).addClass('intimity');
         if (nextSch.xlDir == sch.xlDir)
             return;
         //滚动到下一个班次
@@ -230,7 +242,7 @@ var gb_schedule_table = (function() {
                 return item.lpName == sch.lpName;
             }).sort(schedule_sort);
         $.each(schArr, function(i) {
-            $('dl[data-id=' + this.id + ']', contWrap).addClass('relevance-active');
+            $('dl[data-id=' + this.id + ']', contWrap).addClass('relevance-active intimity');
         });
         notify_succ('高亮路牌 ' + sch.lpName);
@@ -258,7 +270,25 @@ var gb_schedule_table = (function() {
     }
     var reset_relevance_active = function(dd) {
-        $(dd).parents('.uk-grid.schedule-wrap').find('.relevance-active').removeClass('relevance-active');
+        $(dd).parents('.uk-grid.schedule-wrap').find('.relevance-active').removeClass('relevance-active intimity');
+    }
+
+    //计算应发未发数量
+    var calc_yfwf_num = function(lineCode){
+      console.log('calc_yfwf_num...', lineCode);
+      var schArr=line2Schedule[lineCode]
+        ,yfwf_num=0
+        ,t = new Date().valueOf();
+
+      $.each(schArr, function(){
+        if(this.fcsjT > t)
+						return false;
+
+        if(this.fcsjActual == null && this.fcsjActualTime == null && this.status != -1)
+  					yfwf_num ++;
+      });
+
+      $('#badge_yfwf_num_'+lineCode).text(yfwf_num);
     }
     return {
@@ -267,6 +297,7 @@ var gb_schedule_table = (function() {
         updateSchedule: updateSchedule,
         deheteSchedule: deheteSchedule,
         insertSchedule: insertSchedule,
-        schedule_sort: schedule_sort
+        schedule_sort: schedule_sort,
+        calc_yfwf_num: calc_yfwf_num
     };
 })();
@@ -128,6 +128,13 @@ var enable_submit_btn = function(form) {
     }
 }
+var disabled_submit_btn = function(form) {
+    var subBtn = $('button[type=submit]', form);
+    if (subBtn) {
+        subBtn.addClass('disabled').attr('disabled','disabled');
+    }
+}
+
 var show_modal = function(id, dom) {
     $(document.body).append(dom);
     return UIkit.modal(id, {
@@ -35,11 +35,10 @@ var gb_sch_websocket = (function() {
     //80协议上报
     var report80 = function(msg) {
-//        console.log('report80...', msg);
-//        msg.dateStr = moment(msg.timestamp).format('HH:mm');
-//        msg.text = gb_common.reqCode80[msg.data.requestCode];
-//
-//        findMailBox(msg.data.lineId).prepend(temps['sys-note-80-temp'](msg));
+       msg.dateStr = moment(msg.timestamp).format('HH:mm');
+       msg.text = gb_common.reqCode80[msg.data.requestCode];
+
+       findMailBox(msg.data.lineId).prepend(temps['sys-note-80-temp'](msg));
     }
     var waitRemoves = [];
@@ -53,6 +52,8 @@ var gb_sch_websocket = (function() {
             t: currentSecond(),
             dom: msg.domId
         });
+
+        gb_schedule_table.calc_yfwf_num(msg.t.xlBm);
     }
     //到达终点