报警请求、调度预案配置添加、打包目录dkl、地图时间问题等

ljq
1 parent ca9af102
Showing 50 changed files with 524 additions and 273 deletions
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/controller/zndd/ZnddStatusController.java
src/main/java/com/bsth/controller/zndd/ZnddYuAnTypeConroller.java
src/main/java/com/bsth/data/pilot80/PilotReport.java
src/main/java/com/bsth/data/zndd/AutomaticSch.java
src/main/java/com/bsth/entity/zndd/znddStatus.java
src/main/java/com/bsth/service/zndd/ZnddStatusService.java
src/main/java/com/bsth/service/zndd/impl/ZnddStatusServiceImpl.java
src/main/resources/fatso/start.js
src/main/resources/static/pages/base/timesmodel/js/echartsDrawGanTT.js
src/main/resources/static/pages/zndd_yuan/DKL.html
src/main/resources/static/real_control_v2/call/assets/css/bootstrap.min.css → src/main/resources/static/pages/zndd_yuan/call/assets/css/bootstrap.min.css
src/main/resources/static/real_control_v2/call/assets/css/index.css → src/main/resources/static/pages/zndd_yuan/call/assets/css/index.css
src/main/resources/static/real_control_v2/call/assets/font/iconfont.css → src/main/resources/static/pages/zndd_yuan/call/assets/font/iconfont.css
src/main/resources/static/real_control_v2/call/assets/font/iconfont.eot → src/main/resources/static/pages/zndd_yuan/call/assets/font/iconfont.eot
src/main/resources/static/real_control_v2/call/assets/font/iconfont.svg → src/main/resources/static/pages/zndd_yuan/call/assets/font/iconfont.svg
src/main/resources/static/real_control_v2/call/assets/font/iconfont.ttf → src/main/resources/static/pages/zndd_yuan/call/assets/font/iconfont.ttf
src/main/resources/static/real_control_v2/call/assets/font/iconfont.woff → src/main/resources/static/pages/zndd_yuan/call/assets/font/iconfont.woff
src/main/resources/static/real_control_v2/call/assets/font/iconfont.woff2 → src/main/resources/static/pages/zndd_yuan/call/assets/font/iconfont.woff2
src/main/resources/static/real_control_v2/call/assets/images/BG.png → src/main/resources/static/pages/zndd_yuan/call/assets/images/BG.png
@@ -145,7 +145,7 @@ public class XDApplication implements CommandLineRunner {
         //dayOfSchedule.dataRecovery();
         //智能调度
-        sexec.scheduleWithFixedDelay(znddThread, 15, 30, TimeUnit.SECONDS);
+        sexec.scheduleWithFixedDelay(znddThread, 15, 25, TimeUnit.SECONDS);
         //安全驾驶
         sexec.scheduleWithFixedDelay(safeDrivDataLoadThread, 180, 10, TimeUnit.SECONDS);
@@ -193,7 +193,7 @@ public class XDApplication implements CommandLineRunner {
         //安全驾驶
         sexec.scheduleWithFixedDelay(safeDrivDataLoadThread, 180, 10, TimeUnit.SECONDS);
         //智能调度
-        sexec.scheduleWithFixedDelay(znddThread, 15, 30, TimeUnit.SECONDS);
+        sexec.scheduleWithFixedDelay(znddThread, 15, 25, TimeUnit.SECONDS);
         GpsDataLoaderThread.setFlag(-1);
         /** 线调业务 */
         sexec.scheduleWithFixedDelay(scheduleRefreshThread, 10, 120, TimeUnit.SECONDS);//班次更新线程
@@ -238,7 +238,7 @@ public class XDApplication implements CommandLineRunner {
         //安全驾驶
         sexec.scheduleWithFixedDelay(safeDrivDataLoadThread, 180, 10, TimeUnit.SECONDS);
         //智能调度
-        sexec.scheduleWithFixedDelay(znddThread, 15, 30, TimeUnit.SECONDS);
+        sexec.scheduleWithFixedDelay(znddThread, 15, 25, TimeUnit.SECONDS);
         GpsDataLoaderThread.setFlag(-1);
         //dayOfSchedule.dataRecovery();
         /** 线调业务 */
+package com.bsth.controller.zndd;
+
+import com.bsth.common.ResponseCode;
+import com.bsth.controller.BaseController;
+import com.bsth.entity.zndd.znddStatus;
+import com.bsth.service.zndd.ZnddStatusService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@RestController
+@RequestMapping("znnd_status")
+public class ZnddStatusController extends BaseController<znddStatus, Integer> {
+
+    @Autowired
+    ZnddStatusService znddStatusService;
+    /**
+     *新增类型
+     * */
+    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    public Map<String, Object> add(znddStatus zs) {
+        Map<String, Object> result = new HashMap<>();
+        try {
+            znddStatusService.add(zs);
+            result.put("status", ResponseCode.SUCCESS);
+        } catch (Exception e) {
+            result.put("status", ResponseCode.ERROR);
+            result.put("msg", e.getMessage());
+        }
+        return result;
+    }
+
+}
+package com.bsth.controller.zndd;
+
+public class ZnddYuAnTypeConroller {
+}
 package com.bsth.data.pilot80;
+import com.alibaba.fastjson.JSONObject;
 import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
 import com.bsth.data.gpsdata_v2.GpsRealData;
@@ -13,6 +14,7 @@ import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.repository.directive.D80Repository;
 import com.bsth.repository.directive.DC0A4Repository;
 import com.bsth.service.directive.DirectiveService;
+import com.bsth.util.HttpClientUtils;
 import com.bsth.websocket.handler.SendUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -96,6 +98,23 @@ public class PilotReport {
                         DirectivePushQueue.put60_002(outSch, dayOfSchedule.doneSum(nbbm), "请出@系统", "同意出场;");
                     }
                     break;
+                //报警请求
+                case 0x10:
+                    try {
+                        String url = "http://61.169.120.202:13333/prod-api/dataDockingApi/accident/saveAccident?";
+                        url = url + "accidentTime=" + new Date().getTime() + "&nbbm=" + "W1F-024";
+                        logger.info("url===="+url);
+                        String res = HttpClientUtils.get(url).toString();
+                        JSONObject jsonObject = JSONObject.parseObject(res);
+                        if ((int) jsonObject.get("code") == 200) {
+                            logger.info("报警请求成功");
+                        }else {
+                            logger.info("报警请求失败");
+                        }
+                    }catch (Exception e){
+                        logger.info("报警请求异常");
+                    }
+                    break;
             }
             //反射搜索用 瞬时字段
@@ -133,19 +133,6 @@ public class AutomaticSch {
     }
-
-
-    //撤销班次  检测人员或者车辆故障  --//换人换车或烂班 //路牌对调
-    public void cxJC(){
-
-
-    }
-
-    //撤销撤销班次  检测人员或者车辆故障  --//换人换车或烂班 //路牌对调
-    public void cxJCX(){
-
-    }
-
     //实发未发检测 -- 车辆GPS掉线的情况下，车辆该出站了
     /**
      * 1。已过待发时间还没发车的
@@ -240,23 +227,24 @@ public class AutomaticSch {
     }
     public Boolean isLines(String line) {
-        //新临专线，新芦专线，临港5路，浦东7路，浦东91路
-        if (line.equals("10636") || line.equals("200828") || line.equals("211208") || line.equals("230226") || line.equals("201012"))
+        //新临专线，新芦专线，临港5路，浦东7路，浦东91路,医疗线
+        //线路书院2路、万祥2路、泥城1路、泥城2路、芦潮港1路、浦东56路、临港8路、1077路、申港1路、1043路
+        if (line.equals("10636") || line.equals("200828") || line.equals("211208") || line.equals("230226") || line.equals("201012") ||
+                line.equals("11077") ||
+                line.equals("11078") ||
+                line.equals("12101") ||
+                line.equals("12103") ||
+                line.equals("12106") ||
+                line.equals("12153") ||
+                line.equals("60041") ||
+                line.equals("88813") ||
+                line.equals("181221") ||
+                line.equals("220825") ||
+                line.equals("240829"))
             return Boolean.valueOf(true);
         return Boolean.valueOf(false);
     }
-    //发车信息微调检测  -- 车辆掉线后实发检测，重新计算时间发车时间
-    public  void updatesf(){
-
-    }
-
-    //临加班次 -- 检测到大客流  //走落地屏客流接口
-    public void ljbc(){
-
-
-    }
-
     /**
      * 指令重发 -- 芦潮港1路
      * 指令下发后设备未响应后  5分钟后重新发送一次 还未响应的话 未来一小时不自动发送该设备
@@ -21,6 +21,8 @@ public class znddStatus {
     private String remark;
+    private String name;
+
     public String getType() {
         return type;
@@ -45,4 +47,12 @@ public class znddStatus {
     public void setRemark(String remark) {
         this.remark = remark;
     }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
 }
+package com.bsth.service.zndd;
+
+import com.bsth.entity.zndd.znddStatus;
+import com.bsth.service.BaseService;
+
+public interface ZnddStatusService extends BaseService<znddStatus, Integer> {
+
+
+    void add(znddStatus zs);
+}
+package com.bsth.service.zndd.impl;
+
+import com.bsth.entity.zndd.znddStatus;
+import com.bsth.repository.zndd.ZnddStatusRepository;
+import com.bsth.service.impl.BaseServiceImpl;
+import com.bsth.service.zndd.ZnddStatusService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ZnddStatusServiceImpl extends BaseServiceImpl<znddStatus, Integer> implements ZnddStatusService {
+
+    @Autowired
+    ZnddStatusRepository znddStatusRepository;
+
+
+    public void add(znddStatus zs){
+        znddStatusRepository.save(zs);
+    }
+}
@@ -16,7 +16,7 @@ var platform = process.platform;
 var iswin = platform == 'win32';
 var sp = platform == 'win32' ? '\\' : '/';
 //不参与的目录
-var excludes = ['scheduleApp', 'trafficManage', 'control', 'permission' + sp + 'authorize_all','permission' + sp + 'user', 'summary', 'history_sch', 'report' + sp + 'oil', 'base' + sp + 'geo_data_edit', 'base' + sp + 'carpark', 'forms', 'mforms', 'report', 'punctual', 'base' + sp + 'timesmodel', 'base' + sp + 'stationroute']
+var excludes = ['scheduleApp', 'trafficManage', 'control', 'permission' + sp + 'authorize_all','permission' + sp + 'user', 'summary', 'history_sch', 'report' + sp + 'oil', 'base' + sp + 'geo_data_edit', 'base' + sp + 'carpark', 'forms', 'mforms', 'report', 'punctual', 'base' + sp + 'timesmodel', 'base' + sp + 'stationroute','zndd_yuan','zndd_yuan' + sp + 'call']
     , ep = new EventProxy()
     , pName = 'bsth_control'
     , path = process.cwd()
@@ -35,8 +35,6 @@ var echartsDrawGTT = function () {
     bcType["major"] = '站';
     bcType["venting"] = '直';
     bcType["region"] = '区';
-    bcType["ldks"] = '空';
-    
     // 处理后班次数据
     var data = [];
@@ -81,8 +79,8 @@ var echartsDrawGTT = function () {
             data = [];
             bcData = newData;
             echarts.util.each(bcData, function (bcObj, index) {
-                var fcsj = Date.parse(DateTimeTool.getDateTime2(bcObj.fcsj,bcObj.fcno)),
-                    ARRIVALTIME = Date.parse(DateTimeTool.getDateTime2(bcObj.ARRIVALTIME,bcObj.fcno)),
+                var fcsj = Date.parse(DateTimeTool.getDateTime(bcObj.fcsj)),
+                    ARRIVALTIME = Date.parse(DateTimeTool.getDateTime(bcObj.ARRIVALTIME)),
                     colorStr = bcObj.xlDir,
                     xlDir;
                 if(bcObj.xlDir == 'relationshipGraph-up')
@@ -148,45 +146,18 @@ var echartsDrawGTT = function () {
             for(var j = 0,len=lpData.length; j < len; j++) {
                 var type = true;
                 var name = lpData[j];
-                let _datast = [];
-                var dataSize = data.length;
-                //把当前路牌的班次摘出来 重新计算
-                for (var t = 0 ; t < dataSize ; t++){
-                    if(data[t].value[0] == name) {
-                        _datast.push({
-                            value: data[t].value,
-                            itemStyle: data[t].itemStyle
-                        })
-                    }
-                }
-                //根据发车时间排序
-                _datast.sort(function(a,b){
-                    return a.value[1]-b.value[1];
-                });
-                //计算停站时间
-                for(var i = 0; i < _datast.length -1; i++) {
-                    //最后一个为0
-                    if (i ==_datast.length -1){
-                        _datast[i].value[15] = 0;
-                        continue;
-                    }
-                    //出场班次空闲班次不算工时
-                    if(_datast[i].value[6] == 'in' || _datast[i].value[16] == 1) {
-                        _datast[i].value[15] = 0;
-                        continue;
-                    }
-                    //同一路牌下的下一个班次的发车时间 - 本班次的到站时间 = 停车时间
-                    _datast[i].value[15] =  (_datast[i+1].value[1] - _datast[i].value[2])/60000;
-                }
-                //统计计算总计工时。
-                for (let n in _datast){
-                    let das = _datast[n];
-                    if(type){
-                        lpDataCount[name] = [das.value[3]/60000+das.value[15],1,das.value[4]];
-                        type = false;
-                    }  else {
-                        lpDataCount[name][0] += (das.value[3]/60000+das.value[15]);
-                        lpDataCount[name][1] += 1;
+                for(var i = 0,len2=data.length; i < len2; i++) {
+                    if(name == data[i].value[0]) {
+                        if(type){
+                            lpDataCount[name] = [data[i].value[3]/60000+data[i].value[15],1,data[i].value[4]];
+                            type = false;
+                        } else if(data[i].value[6] == 'in' || data[i].value[16] == 1){
+                            lpDataCount[name][0] += data[i].value[3]/60000;
+                            lpDataCount[name][1] += 1;
+                        } else {
+                            lpDataCount[name][0] += (data[i].value[3]/60000+data[i].value[15]);
+                            lpDataCount[name][1] += 1;
+                        }
                     }
                 }
             }
@@ -233,7 +204,7 @@ var echartsDrawGTT = function () {
                         +'<br>发车时间：' + getHoursAndMinutes(params.value[1])
                         +'<br>到站时间：' + getHoursAndMinutes(params.value[2])
                         +'<br>行驶时间：' + params.value[3]/60000 +'分钟'
-                        +'<br>停休时间：' + Math.round(params.value[15]) +'分钟'
+                        +'<br>停休时间：' + params.value[15] +'分钟'
                         +'<br>班次类型：' + bcTypeStr ;
                     return str;
                 }
@@ -350,7 +321,7 @@ var echartsDrawGTT = function () {
                         // 除了早晚例保，和进出场班次其余类型班次有停站时间
                         if(type!='bd' && type!='lc' && type!='out' && type!='in') {
                             //if(params.data.value[15]>=0)
-                            stayStr = "停: " + params.data.value[15];
+                            stayStr = "停:" + params.data.value[15];
                         }
                         // 分班显示‘分’
                         if(params.data.value[16] == 1)
@@ -638,7 +609,7 @@ var echartsDrawGTT = function () {
                                 bcTypeStr = bcType[type];
                             if(type == 'normal') {
-                                stayStr = "停:" + Math.round(params.data.value[15]);
+                                stayStr = "停:" + params.data.value[15];
                             }
                             var arr = [
                                 '{left|' + timeStr + '}{type|'+ ((dataZoomEnd - dataZoomStart) <= 70 ? bcType[type] : '') +'}',
@@ -693,55 +664,22 @@ var echartsDrawGTT = function () {
                 var p2 = [item.value[2],item.value[0]];
                 var pp= chart.convertToPixel({xAxisIndex: 0, yAxisIndex:0},p);
                 var pp2= chart.convertToPixel({xAxisIndex: 0, yAxisIndex:0},p2);
-                let _datast = [];
+
                 var dataSize = data.length;
-                //把当前路牌的班次摘出来 重新计算
-                for (var t = 0 ; t < dataSize ; t++){
-                    if(data[t].value[0] == item.value[0]) {
-                        _datast.push({
-                            value: data[t].value,
-                            itemStyle: data[t].itemStyle
-                        })
-                    }
-                }
-                
-                //根据发车时间排序
-                _datast.sort(function(a,b){
-                    return a.value[1]-b.value[1];
-                });
-                
-                for(var i = 0; i < _datast.length -1; i++) {
-                    //最后一个为0
-                    if (i ==_datast.length -1){
-                        _datast[i].value[15] = 0;
-                        continue;
-                    }
-                    if(_datast[i].value[6] == 'in' || _datast[i].value[16] == 1) {
-                        _datast[i].value[15] = 0;
-                        continue
+                if(dataIndex<dataSize-1) {
+                    for(var i=0;i<dataSize;i++) {
+                        if(i==dataIndex)
+                            continue;
+                        if(data[dataIndex].value[6] == 'in' || data[dataIndex].value[16] == 1) {
+                            data[dataIndex].value[15] = 0;
+                            break;
+                        }
+                        if(data[dataIndex].value[4] == data[i].value[4] && data[dataIndex].value[7] == (data[i].value[7]-1)) {//同一路牌下的下一个班次的发车时间 - 本班次的到站时间 = 停车时间
+                            data[dataIndex].value[15] =  (data[dataIndex+1].value[1] - data[dataIndex].value[2])/60000;
+                            break;
+                        }
                     }
-                    //同一路牌下的下一个班次的发车时间 - 本班次的到站时间 = 停车时间
-                    _datast[i].value[15] =  (_datast[i+1].value[1] - _datast[i].value[2])/60000;
                 }
-                
-
-
-                   // rsultA = rsultA.concat(lpbc);
-               /*  if(dataIndex<dataSize-1) { //点击阴影班次的总工时变化的罪魁祸首
-                     for(var i=0;i<dataSize;i++) {
-                         if(i==dataIndex)
-                             continue;
-                         if(data[dataIndex].value[6] == 'in' || data[dataIndex].value[16] == 1) {
-                             data[dataIndex].value[15] = 0;
-                             break;
-                         }
-                         //同一路牌下的下一个班次的发车时间 - 本班次的到站时间 = 停车时间
-                         if(data[dataIndex].value[4] == data[i].value[4] && data[dataIndex].value[7] == (data[i].value[7]-1)) {
-                             data[dataIndex].value[15] =  (data[dataIndex+1].value[1] - data[dataIndex].value[2])/60000;
-                             break;
-                         }
-                     }
-                 }*/
                 return {
                     type: 'rect',
                     borderWidth: 4,
@@ -769,7 +707,7 @@ var echartsDrawGTT = function () {
             })
         });
     };
-    // 刷新上下行发车时刻表数据 正常和区间的
+    // 刷新上下行发车时刻表数据
     var refreshUpDownData = function () {
         // 清空数据
         dataUp=[];
@@ -779,7 +717,7 @@ var echartsDrawGTT = function () {
         for(var i = 0,len=data.length; i < len; i++) {
             var type = [];
             type = $.extend(true, [], type, data[i].value);
-            if(data[i].value[6] == 'normal' || data[i].value[6] == 'region') {
+            if(data[i].value[6] == 'normal') {
                 if (data[i].value[8] == 0) {
                     dataUp.push(type);
                 } else if (data[i].value[8] == 1) {
@@ -12,14 +12,34 @@
         <ul id="card-type-list"></ul>
     </div>
     <div>
-        <button id="saves">保存</button>
-    </div>
-    <div>
-        <select name="destroy" class="form-control" id="destroySelect">
+
+        添加预案：
+        <input type="text" class="form-control" style="width: 15%;display: inline;" name ="types" id="dNameInput" placeholder="请输入名称">
+        <input type="text" class="form-control" style="width: 15%;display: inline;" name ="types" id="dCodeInput" placeholder="请输入代码">
+        <button type="button" class="btn btn-circle blue"  id="saveButton"><i class="fa fa-minus-square"></i> 添加</button>
+
+
+
+        <select name="destroy" class="form-control" style="width: 15%;display: inline; margin-left: 15%"  id="destroySelect">
             <option value="DKL">-- 大客流 --</option>
             <option value="WD">-- 误点 --</option>
+            <option value="FCJG">-- 发车间隔 --</option>
+            <option value="MZ">-- 满载 --</option>
+            <option value="DJG">-- 大间隔 --</option>
+            <option value="YCFC">-- 异常发车 --</option>
+            <option value="YFWF">-- 应发未发 --</option>
+            <option value="ZLCF">-- 指令重发 --</option>
+            <option value="dj">-- 待添加 --</option>
         </select>
+
+
+        <button class="btn btn-primary" id="saves">保存</button>
+    </div>
+    <div>
+
+
+
     </div>
     <div style="height: 80%">
     <svg style="width: 100%;height: 100%;" id="svgContainer" class="grid-background">
@@ -29,6 +49,21 @@
     </div>
 <script>
+
+    //输入名称，自动生成代码
+    $('#dNameInput').on('keyup', setPinYin);
+
+    function setPinYin(){
+        var val = $('#dNameInput').val();
+        if($('#dGroupSelect').val() == 0)
+            $('#dCodeInput').val(pinyin.getFullChars(val));
+        else
+            $('#dCodeInput').val(pinyin.getCamelChars(val));
+    }
+
+</script>
+
+<script>
     var cards = [
         {
         id: 'card0',
@@ -45,42 +80,24 @@
         }
         ],
         titleBarColor: ['#84fab0', '#8fd3f4']
-    },{
-            id: 'card1',
-            x: 100,
-            y: 220,
-            label: '流程',
-            type: "流程",
-            nodes: [{
-                type: "in",
-                level: 0,
-                enumType: 'call',
-                color: '#fff'
-            },
-                {
-                    type: "out",
-                    level: 0,
-                    enumType: 'call',
-                    color: '#3C8CE7',
-                    slot: 'input',
-                },
-            ],
-            titleBarColor: ['#fccb90', '#d57eeb']
-        },{
-            id: 'card2',
-            x: 100,
-            y: 300,
-            label: '结束',
-            type: "流程y",
-            nodes: [{
-                type: "in",
+    }
+    ];
+    var cards2 = [
+        {
+            id: 'card0',
+            x: 0,
+            y: 0,
+            label: '开始类型',
+            type: "开始类型",
+            nodes: [ {
+                type: "out",
                 level: 0,
                 enumType: 'call',
-                color: '#fff',
+                color: '#3C8CE7',
                 slot: 'input',
             }
             ],
-            titleBarColor: ['#f6d365', '#fda085']
+            titleBarColor: ['#84fab0', '#8fd3f4']
         }
     ];
@@ -100,7 +117,8 @@
             }
             ],
             titleBarColor: ['#84fab0', '#8fd3f4']
-        },{
+        },
+        {
             id: 'cardc',
             x: 100,
             y: 220,
@@ -121,7 +139,30 @@
                 },
             ],
             titleBarColor: ['#fccb90', '#d57eeb']
-        },{
+        },
+        {
+            id: 'cardX',
+            x: 100,
+            y: 220,
+            label: '配置',
+            type: "pz",
+            nodes: [{
+                type: "in",
+                level: 0,
+                enumType: 'call',
+                color: '#fff'
+            },
+                {
+                    type: "out",
+                    level: 0,
+                    enumType: 'call',
+                    color: '#3C8CE7',
+                    slot: 'input',
+                },
+            ],
+            titleBarColor: ['#c7e754', '#8352d7']
+        },
+        {
             id: 'card3',
             x: 100,
             y: 300,
@@ -136,8 +177,206 @@
             }
             ],
             titleBarColor: ['#f6d365', '#fda085']
-        }
-    ];
+        },
+        {
+             id: 'card4',
+             x: 100,
+             y: 400,
+             label: '待发调整',
+             type: "待发调整",
+             nodes: [{
+                 type: "in",
+                 level: 0,
+                 enumType: 'call',
+                 color: '#fff',
+
+             },
+             {
+                 type: "out",
+                 level: 0,
+                 enumType: 'call',
+                 color: '#3C8CE7',
+             }
+             ],
+             titleBarColor: ['#3950e8', '#25f6d0']
+            },
+        {
+            id: 'card5',
+            x: 100,
+            y: 400,
+            label: '班次取消（烂班）',
+            type: "班次取消（烂班）",
+            nodes: [{
+                type: "in",
+                level: 0,
+                enumType: 'call',
+                color: '#fff',
+
+            },
+                {
+                    type: "out",
+                    level: 0,
+                    enumType: 'call',
+                    color: '#3C8CE7',
+                }
+            ],
+            titleBarColor: ['#3950e8', '#25f6d0']
+        },
+        {
+            id: 'card6',
+            x: 100,
+            y: 400,
+            label: '实发调整',
+            type: "实发调整",
+            nodes: [{
+                type: "in",
+                level: 0,
+                enumType: 'call',
+                color: '#fff',
+
+            },
+                {
+                    type: "out",
+                    level: 0,
+                    enumType: 'call',
+                    color: '#3C8CE7',
+                }
+            ],
+            titleBarColor: ['#3950e8', '#25f6d0']
+        },
+        {
+            id: 'card7',
+            x: 100,
+            y: 400,
+            label: '实发撤销',
+            type: "实发撤销",
+            nodes: [{
+                type: "in",
+                level: 0,
+                enumType: 'call',
+                color: '#fff',
+
+            },
+                {
+                    type: "out",
+                    level: 0,
+                    enumType: 'call',
+                    color: '#3C8CE7',
+                }
+            ],
+            titleBarColor: ['#3950e8', '#25f6d0']
+        },
+        {
+            id: 'card8',
+            x: 100,
+            y: 400,
+            label: '新增临加班次',
+            type: "新增临加班次",
+            nodes: [{
+                type: "in",
+                level: 0,
+                enumType: 'call',
+                color: '#fff',
+
+            },
+                {
+                    type: "out",
+                    level: 0,
+                    enumType: 'call',
+                    color: '#3C8CE7',
+                }
+            ],
+            titleBarColor: ['#3950e8', '#25f6d0']
+        },
+        {
+            id: 'card9',
+            x: 100,
+            y: 400,
+            label: '调整人车',
+            type: "调整人车",
+            nodes: [{
+                type: "in",
+                level: 0,
+                enumType: 'call',
+                color: '#fff',
+
+            },
+                {
+                    type: "out",
+                    level: 0,
+                    enumType: 'call',
+                    color: '#3C8CE7',
+                }
+            ],
+            titleBarColor: ['#3950e8', '#25f6d0']
+        },
+        {
+            id: 'card10',
+            x: 100,
+            y: 400,
+            label: '指令重发',
+            type: "指令重发",
+            nodes: [{
+                type: "in",
+                level: 0,
+                enumType: 'call',
+                color: '#fff',
+
+            },
+                {
+                    type: "out",
+                    level: 0,
+                    enumType: 'call',
+                    color: '#3C8CE7',
+                }
+            ],
+            titleBarColor: ['#3950e8', '#25f6d0']
+        },
+        {
+            id: 'card11',
+            x: 100,
+            y: 400,
+            label: '路牌对调',
+            type: "路牌对调",
+            nodes: [{
+                type: "in",
+                level: 0,
+                enumType: 'call',
+                color: '#fff',
+
+            },
+                {
+                    type: "out",
+                    level: 0,
+                    enumType: 'call',
+                    color: '#3C8CE7',
+                }
+            ],
+            titleBarColor: ['#3950e8', '#25f6d0']
+        },
+        {
+            id: 'card12',
+            x: 100,
+            y: 400,
+            label: '误点调整',
+            type: "误点调整",
+            nodes: [{
+                type: "in",
+                level: 0,
+                enumType: 'call',
+                color: '#fff',
+
+            },
+                {
+                    type: "out",
+                    level: 0,
+                    enumType: 'call',
+                    color: '#3C8CE7',
+                }
+            ],
+            titleBarColor: ['#3950e8', '#25f6d0']
+        },
+    ]
     var links = [];
     var currentLink = null;
     var isDragging = false;
@@ -146,39 +385,51 @@
     var currentCard;
-    $("#destroySelect").on('change',function(){
-        var fn = $('#destroySelect').val();
-        $.get('/zndya/all',{type_eq: fn},function(datas){
-            var ts = [];
-            var link = [];
-            for (var c in datas){
-                if(datas[c].types == 0){
-                    ts.push(JSON.parse(datas[c].jsonDate));
-                }else {
-                    link.push(JSON.parse(datas[c].jsonDate));
-                }
+    selectall();
+    function selectall(){
+        $.get('/znnd_status/all',{},function(datas){
-            }
-            debugger
-            if (ts.length >  0) {
-                cards = ts;
-                links = link;
-            }else {
-                cards = cardsbei;
-                links = [];
-            }
+            var opts = '';
+            $.each(datas, function () {
+                opts += '<option value="' + this.type + '">-- ' + this.name + '-- </option>';
+            });
+            $("#destroySelect").html(opts);
+            $("#destroySelect").val("dkl");
+            init("dkl")
+        });
+
+    }
+
+
+    //保存
+    $("#saveButton").on('click',function() {
+        debugger
+       var name = $("#dNameInput").val();
+       var type = $("#dCodeInput").val();
+       if (type == "" || name == ""){
+           return;
+       }
+       var datau = {
+           type:type,
+           name:name,
+       }
+        $post('/znnd_status/add',datau,function(datan){
+            layer.msg('添加成功...');
+            selectall();
+        })
-            drawLinks();
-            drawCards();
-            attachEventListeners();
-        });
-    })
-    function init() {
+    });
+
+    $("#destroySelect").on('change',function(){
+        var fn = $('#destroySelect').val();
+        init(fn);
+    })
-        $.get('/zndya/all',{type_eq: 'DKL'},function(datas){
+    function init(fn) {
+        $.get('/zndya/all',{type_eq: fn},function(datas){
             var ts = [];
             var link = [];
             for (var c in datas){
@@ -193,11 +444,10 @@
                 cards = ts;
                 links = link;
             }else {
-                cards = cardsbei;
+                cards = cards2;
                 links = [];
             }
-
             drawLinks();
             drawCards();
             attachEventListeners();
@@ -460,6 +710,7 @@
     function drawLinks() {
+        debugger
         const linksContainer = document.getElementById('linksContainer');
         linksContainer.innerHTML = ''; // 清除现有的线条
         // 清除旧的删除图标
@@ -501,7 +752,8 @@
                     `M${link.source.x} ${link.source.y} C${link.source.x + dist} ${link.source.y} ${link.target.x - dist} ${link.target.y} ${link.target.x} ${link.target.y}`;
                 path.setAttribute('d', d);
                 linksContainer.appendChild(path);
-            } else {
+            }
+            else {
                 if (link.target.x - link.source.x > 0) {
                     dist = 200; // 如果终点在源点的右侧，控制点距离更远
                 } else {
@@ -638,7 +890,6 @@
                 );
                 svgContainer.style.backgroundPosition = `${currentPan.x % 100}px ${currentPan.y % 100}px`;
             } else if (isDragging) {
-                debugger
                 moveCard(e);
             } else if (isLinking && currentLink) {
                 updateLink(e);
@@ -671,10 +922,10 @@
         const svgRect = svgContainer.getBoundingClientRect();
         currentCard.x = e.clientX - svgRect.left - dragOffsetX;
         currentCard.y = e.clientY - svgRect.top - dragOffsetY;
-
+        debugger
         // Update link positions associated with the currentCard
         links.forEach(link => {
-            if (link.source.node.startsWith(currentCard.id)) {
+            if (link.source.node.split('-node')[0] == currentCard.id) {
                 // 根据节点ID更新链接的源位置
                 const nodeIndex = parseInt(link.source.node.split('-node')[1]) - 1;
                 const nodeConfig = currentCard.nodes[nodeIndex]; // 获取当前节点的配置
@@ -684,7 +935,7 @@
                 link.source.y = 30 + currentCard.y + topBottomPadding + (nodeConfig.level + 1) * nodeSpacing - (
                     nodeSpacing / 2); // 根据节点的index调整y坐标
             }
-            if (link.target && link.target.node.startsWith(currentCard.id)) {
+            if (link.target && link.target.node.split('-node')[0] == currentCard.id) {
                 // 根据节点ID更新链接的目标位置
                 const nodeIndex = parseInt(link.target.node.split('-node')[1]) - 1;
                 const nodeConfig = currentCard.nodes[nodeIndex]; // 获取当前节点的配置
@@ -825,6 +1076,7 @@
                 });
             }
         } else {
+            debugger
             const sourceNodeId = currentLink.source.node;
             const sourceNodeParts = sourceNodeId.split('-node');
             const sourceCard = cards.find(card => card.id === sourceNodeParts[0]);
@@ -935,7 +1187,6 @@
     }
     function createNewCard(cardTemplate, mouseX, mouseY, sourceNode) {
-        debugger
         var carrdid = [];
         cards.forEach(card => {
             carrdid.push(card.id.replace('card',''));
@@ -985,10 +1236,13 @@
         modal.style.display = 'none'; // 隐藏弹窗
     }
-    init();
+
     $("#saves").on('click', function() {
        var s = cards;
+       if (cards.length == 0)
+           return
+
        var type = $('#destroySelect').val();
         var datas = {
             type : type,
@@ -1004,6 +1258,7 @@
                 if(result.status != null) {
                     // 弹出添加成功提示消息
                     layer.msg('添加成功...');
+                    init(type);
                 } else {
                     // 弹出添加失败提示消息
                     layer.msg(result.ERROR);
@@ -6,19 +6,19 @@
     <meta name="google" content="notranslate" />
     <title>anyrtc 呼叫邀请DEMO - anyRTC</title>
     <!-- icon -->
-    <link rel="icon" href="/real_control_v2/call/assets/images/favicon.ico" />
+    <link rel="icon" href="/pages/zndd_yuan/call/assets/images/favicon.ico" />
     <!-- CSS only -->
-    <link rel="stylesheet" href="/real_control_v2/call/assets/css/bootstrap.min.css"/>
-    <link rel="stylesheet" type="text/css" href="/real_control_v2/call/assets/font/iconfont.css" />
+    <link rel="stylesheet" href="/pages/zndd_yuan/call/assets/css/bootstrap.min.css"/>
+    <link rel="stylesheet" type="text/css" href="/pages/zndd_yuan/call/assets/font/iconfont.css" />
     <!-- JS, Popper.js, and jQuery -->
-    <script src="/real_control_v2/call/assets/js/jquery-3.5.1.min.js"></script>
-    <script src="/real_control_v2/call/assets/js/bootstrap.min.js"></script>
+    <script src="/pages/zndd_yuan/call/assets/js/jquery-3.5.1.min.js"></script>
+    <script src="/pages/zndd_yuan/call/assets/js/bootstrap.min.js"></script>
     <!-- JS, RTC and RTM -->
-    <script src="/real_control_v2/call/assets/js/latest.js"></script>
-    <script src="/real_control_v2/call/assets/js/ArRTM@latest.js"></script>
+    <script src="/pages/zndd_yuan/call/assets/js/latest.js"></script>
+    <script src="/pages/zndd_yuan/call/assets/js/ArRTM@latest.js"></script>
     <!-- 覆盖bootstrap样式 -->
-    <link rel="stylesheet" href="/real_control_v2/call/assets/css/index.css" />
+    <link rel="stylesheet" href="/pages/zndd_yuan/call/assets/css/index.css" />
   </head>
   <body class="notranslate">
@@ -28,7 +28,7 @@
     <!-- 首页 -->
     <div
       class="page d-flex flex-col justify-content-center align-items-center"
-      id="homePage" style="background-image:url('/real_control_v2/call/assets/images/yimg.jpg')"
+      id="homePage" style="background-image:url('/pages/zndd_yuan/call/assets/images/yimg.jpg')"
     >
       <!--  -->
@@ -133,7 +133,7 @@
                   <img
                     draggable="false"
                     class="img-responsive setting-video_preview_bg"
-                    src="/real_control_v2/call/assets/images/chart.png"
+                    src="/pages/zndd_yuan/call/assets/images/chart.png"
                   />
                   <div
                     id="settingVideoPreview"
@@ -332,7 +332,7 @@
       <div class="invitation bd-highlight">
         <div class="d-flex justify-content-center">
           <div class="head_portrait">
-            <img draggable="false" src="/real_control_v2/call/assets/images/head.png" />
+            <img draggable="false" src="/pages/zndd_yuan/call/assets/images/head.png" />
           </div>
         </div>
         <div
@@ -357,7 +357,7 @@
             draggable="false"
             class="img-responsive"
             style="cursor: pointer"
-            src="/real_control_v2/call/assets/images/hangup.png"
+            src="/pages/zndd_yuan/call/assets/images/hangup.png"
             id="cancelCallBtn"
           />
           <!-- <button type="button" class="btn btn-danger" >取消</button> -->
@@ -372,7 +372,7 @@
       <div class="invitation bd-highlight">
         <div class="d-flex justify-content-center">
           <div class="head_portrait">
-            <img draggable="false" src="/real_control_v2/call/assets/images/head.png" />
+            <img draggable="false" src="/pages/zndd_yuan/call/assets/images/head.png" />
           </div>
         </div>
         <div
@@ -398,21 +398,21 @@
             draggable="false"
             class="img-responsive"
             style="cursor: pointer"
-            src="/real_control_v2/call/assets/images/changaudio-hover.png"
+            src="/pages/zndd_yuan/call/assets/images/changaudio-hover.png"
             id="changAudioBtn"
           />
           <img
             draggable="false"
             class="img-responsive"
             style="cursor: pointer"
-            src="/real_control_v2/call/assets/images/answer.png"
+            src="/pages/zndd_yuan/call/assets/images/answer.png"
             id="acceptCallBtn"
           />
           <img
             draggable="false"
             class="img-responsive"
             style="cursor: pointer"
-            src="/real_control_v2/call/assets/images/hangup.png"
+            src="/pages/zndd_yuan/call/assets/images/hangup.png"
             id="refuseCallBtn"
           />
           <!-- 多人 -->
@@ -437,7 +437,7 @@
             <img
               draggable="false"
               class="img-responsive"
-              src="/real_control_v2/call/assets/images/head.png"
+              src="/pages/zndd_yuan/call/assets/images/head.png"
             />
           </div>
           <div class="">
@@ -469,7 +469,7 @@
             draggable="false"
             style="width: 100%"
             class="img-responsive"
-            src="/real_control_v2/call/assets/images/audio_bg.png"
+            src="/pages/zndd_yuan/call/assets/images/audio_bg.png"
           />
         </div>
       </div>
@@ -492,7 +492,7 @@
               draggable="false"
               style="position: absolute; width: 50%"
               class="img-responsive"
-              src="/real_control_v2/call/assets/images/logo_title.png"
+              src="/pages/zndd_yuan/call/assets/images/logo_title.png"
             />
           </div>
           <div class="prompt_little d-flex">
@@ -515,7 +515,7 @@
               draggable="false"
               style="position: absolute; width: 40%"
               class="img-responsive"
-              src="/real_control_v2/call/assets/images/logo_big.png"
+              src="/pages/zndd_yuan/call/assets/images/logo_big.png"
             />
           </div>
           <div class="prompt_big meet-control_icon m-3" id="videoDuration">
@@ -587,7 +587,7 @@
             <img
             draggable="false"
             class="img-responsive"
-            src="/real_control_v2/call/assets/images/logo_big.png"
+            src="/pages/zndd_yuan/call/assets/images/logo_big.png"
           />
           </div>
@@ -724,7 +724,7 @@
       </div>
       <!-- /.modal -->
     </div>
-    <script src="/real_control_v2/call/assets/js/index.js"></script>
+    <script src="/pages/zndd_yuan/call/assets/js/index.js"></script>
   </body>
 <script>
   (function() {
@@ -15,7 +15,7 @@
                 <div class="uk-form-row">
                     <label class="uk-form-label">上下行</label>
                     <div class="uk-form-controls">
-                        <select name="xlDir" id="xlDir">
+                        <select name="xlDir">
                             <option value="0">上行</option>
                             <option value="1">下行</option>
                         </select>
@@ -28,7 +28,7 @@
                 <div class="uk-form-row">
                     <label class="uk-form-label">起点站</label>
                     <div class="uk-form-controls">
-                        <select name="qdzCode" id="qdzCode">
+                        <select name="qdzCode">
                         </select>
                     </div>
                 </div>
@@ -37,7 +37,7 @@
                 <div class="uk-form-row">
                     <label class="uk-form-label">终点站</label>
                     <div class="uk-form-controls">
-                        <select name="zdzCode" id="zdzCode">
+                        <select name="zdzCode">
                         </select>
                     </div>
                 </div>
@@ -158,7 +158,7 @@
             });
             $('.ct_line_lp_badge', nf).html(sch.xlName + '，&nbsp;'+sch.lpName);
         });
-        
+
         function addForm() {
             var htmlStr = template('add_normal_sch-form-temp', sch);
             var f = $(htmlStr);
@@ -166,16 +166,11 @@
             //字典转换
             dictionaryUtils.transformDom($('.nt-dictionary', f));
             //validation
-
             f.formValidation({framework: 'uikit', locale: 'zh_CN'});
             //autocomp
             f.trigger('init-autoCom');
-            $("#xlDir").val(sch.xlDir);
             $f('bcType', f).trigger('change');
-            $("#qdzCode").val(sch.qdzCode);
-            $("#zdzCode").val(sch.zdzCode);
-            $f('zdzCode', f).trigger('change');
             return f;
         }
@@ -12,7 +12,7 @@ var gb_stationcf = (function () {
         data.type = 'cp';
-        let stopNo =data.station +"_"+ data.dir;
+        var stopNo =data.station +"_"+ data.dir;
        /* gb_svg_chart.people(data.lineCode,stopNo,data.num,data.image);*/
         var htmlStr = template('cf_plat_msg_template', data);
@@ -27,7 +27,7 @@ var gb_stationcf = (function () {
     $wrap.on('click', '.all', function () {
         var type = $(this).data('ip');
         var calleeId = $(this).data('call')
-        let pageUrl ="/real_control_v2/call/index.html?calleeId="+calleeId;
+        var pageUrl ="/pages/zndd_yuan/call/index.html?calleeId="+calleeId;
         //将片段路径写入 localStorage
         window.localStorage.setItem('real_control_form_embed_pageUrl', pageUrl);
         var index = layer.open({
@@ -53,24 +53,7 @@ var gb_stationcf = (function () {
         $(this).parent().parent().remove();
         /*if (close)  close = false*/
     });
-    $wrap.on('click', '.images', function () {
-        debugger
-        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
 var gb_dataZndd = (function (){
-    var max = 3;
+    var max = 1;
     var $pop =$('.multi_plat_msg_pop_zndd'); 
     var codes = {
@@ -22,9 +22,7 @@ var gb_dataZndd = (function (){
         //时间格式化
         data.types = codes[data.type];
-        if (data.type == 'YCSF' &&  ycsf_sx(data.lineCode) == false){
-            return
-        }
+
         if (data.type == 'SFTZ_1' && sf_tz(data.lineCode) == false){
             return
         }
@@ -123,6 +121,7 @@ var gb_dataZndd = (function (){
         alt_confirm(content, function () {
             gb_common.$post('/realSchedule/revokeRealOutgo_zndd', {
                 id: that.data('id'),
+                remarks :'',
             }, function (rs) {
                 gb_schedule_table.updateSchedule(rs.ts);
                 notify_succ('撤销实发操作成功！');
@@ -33,6 +33,8 @@
             <p>经度：{{lon}}</p>
             <p>纬度：{{lat}}</p>
+            <p class="date-str">{{dateStr}}</p>
+            <hr>
             {{if kl !=null}}
             <p>人数：{{kl.num}}</p>
             {{/if}}
@@ -54,10 +54,10 @@
             <td>{{obj.rq}}</td>
             <td >
                 {{if obj.qjType == 0}}
-                    <button class="uk-button" id = "pllbon" data-id="{{obj.id}}"> 批量烂班</button>
-                    <button class="uk-button" id = "hrhc" data-id="{{obj.id}}"> 批量换人换车</button>
-                    <button class="uk-button" id ="lp_change" data-id="{{obj.id}}"> 路牌对调</button>
-                    <button class="uk-button"  id ="cxlb" data-id="{{obj.id}}"> 恢复烂班</button>
+                    <button class="uk-button pllbon"  data-id="{{obj.id}}"> 批量烂班</button>
+                    <button class="uk-button hrhc" data-id="{{obj.id}}"> 批量换人换车</button>
+                    <button class="uk-button lp_change"  data-id="{{obj.id}}"> 路牌对调</button>
+                    <button class="uk-button cxlb"   data-id="{{obj.id}}"> 恢复烂班</button>
                 {{else}}
                     计划调度 -> 调度执勤日报
                 {{/if}}
@@ -117,7 +117,7 @@
                     if (resetPagination)
                         pagination(rs.totalPages, rs.page);
                     //烂班
-                    $("#pllbon").on('click',function(e){
+                    $(".pllbon").on('click',function(e){
                         debugger
                         var id = $(this).data('id');
                         let datans = returndatas(id,datas);
@@ -130,7 +130,7 @@
                     //换人换车
-                    $("#hrhc").on('click',function(e){
+                    $(".hrhc").on('click',function(e){
                         var id = $(this).data('id');
                         let datans = returndatas(id,datas);
                         debugger
@@ -142,7 +142,7 @@
                     })
                     //路牌对调
-                    $("#lp_change").on('click',function(e){
+                    $(".lp_change").on('click',function(e){
                         var id = $(this).data('id');
                         let datans = returndatas(id,datas);
@@ -154,7 +154,7 @@
                     });
-                    $("#cxlb").on('click',function(e){
+                    $(".cxlb").on('click',function(e){
                         var id = $(this).data('id');
                         let datans = returndatas(id,datas);
@@ -417,7 +417,7 @@
             <div class="uk-form-row">
                 <label class="uk-form-label">车辆所在站点</label>
                 <div class="uk-form-controls">
-                    <input value="环湖西三路杞青路"  disabled>
+                    <input value="临港大道沪城环路"  disabled>
                 </div>
             </div>
         </div>
@@ -455,10 +455,10 @@
     <div class="uk-grid">
         <div class="uk-width-4-2">
             <div class="uk-form-row video_1">
-                <video id="myVideo" style="width: 100%" src="/real_control_v2/zndd/video/a.mp4" controls></video>
+                <img id="myVideo" style="width: 100%" src="/real_control_v2/zndd/video/k1.png" controls></img>
             </div>
             <div class="uk-form-row video_2" style="display: none">
-                <video id="myVideos" style="width: 100%" src="/real_control_v2/zndd/video/b.mp4" controls></video>
+                <img id="myVideos" style="width: 100%" src="/real_control_v2/zndd/video/k2.png" controls></img>
             </div>
         </div>
     </div>
@@ -512,15 +512,6 @@
         </div>
     </div>
-    <!-- 表单按钮组件 START -->
-    <div class="form-actions">
-        <div class="row">
-            <div class="col-md-offset-5 col-md-7">
-                <button type="submit" class="btn green" id="submintBtn"><i class="fa fa-check"></i> 提交</button>
-                <a type="button" class="btn default" href="list.html" data-pjax><i class="fa fa-times"></i> 取消</a>
-            </div>
-        </div>
-    </div>
 </script>
 <style>
     .fanganys input{