潘钊 / bsth_control · Commits

Commit 273680905d8cc904e39bc98bb36dc5008b9fbdda

Authored by ljq
1 parent ca9af102
build: skipped

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

Inline Side-by-side
Showing 50 changed files with 524 additions and 273 deletions
src/main/java/com/bsth/XDApplication.java
  View file @2736809
... ... @@ -145,7 +145,7 @@ public class XDApplication implements CommandLineRunner {
145 145 //dayOfSchedule.dataRecovery();
146 146  
147 147 //智能调度
148   - sexec.scheduleWithFixedDelay(znddThread, 15, 30, TimeUnit.SECONDS);
  148 + sexec.scheduleWithFixedDelay(znddThread, 15, 25, TimeUnit.SECONDS);
149 149  
150 150 //安全驾驶
151 151 sexec.scheduleWithFixedDelay(safeDrivDataLoadThread, 180, 10, TimeUnit.SECONDS);
... ... @@ -193,7 +193,7 @@ public class XDApplication implements CommandLineRunner {
193 193 //安全驾驶
194 194 sexec.scheduleWithFixedDelay(safeDrivDataLoadThread, 180, 10, TimeUnit.SECONDS);
195 195 //智能调度
196   - sexec.scheduleWithFixedDelay(znddThread, 15, 30, TimeUnit.SECONDS);
  196 + sexec.scheduleWithFixedDelay(znddThread, 15, 25, TimeUnit.SECONDS);
197 197 GpsDataLoaderThread.setFlag(-1);
198 198 /** 线调业务 */
199 199 sexec.scheduleWithFixedDelay(scheduleRefreshThread, 10, 120, TimeUnit.SECONDS);//班次更新线程
... ... @@ -238,7 +238,7 @@ public class XDApplication implements CommandLineRunner {
238 238 //安全驾驶
239 239 sexec.scheduleWithFixedDelay(safeDrivDataLoadThread, 180, 10, TimeUnit.SECONDS);
240 240 //智能调度
241   - sexec.scheduleWithFixedDelay(znddThread, 15, 30, TimeUnit.SECONDS);
  241 + sexec.scheduleWithFixedDelay(znddThread, 15, 25, TimeUnit.SECONDS);
242 242 GpsDataLoaderThread.setFlag(-1);
243 243 //dayOfSchedule.dataRecovery();
244 244 /** 线调业务 */
... ...
src/main/java/com/bsth/controller/zndd/ZnddStatusController.java 0 → 100644
  View file @2736809
  1 +package com.bsth.controller.zndd;
  2 +
  3 +import com.bsth.common.ResponseCode;
  4 +import com.bsth.controller.BaseController;
  5 +import com.bsth.entity.zndd.znddStatus;
  6 +import com.bsth.service.zndd.ZnddStatusService;
  7 +import org.springframework.beans.factory.annotation.Autowired;
  8 +import org.springframework.web.bind.annotation.RequestMapping;
  9 +import org.springframework.web.bind.annotation.RequestMethod;
  10 +import org.springframework.web.bind.annotation.RestController;
  11 +
  12 +import java.util.HashMap;
  13 +import java.util.Map;
  14 +
  15 +@RestController
  16 +@RequestMapping("znnd_status")
  17 +public class ZnddStatusController extends BaseController<znddStatus, Integer> {
  18 +
  19 + @Autowired
  20 + ZnddStatusService znddStatusService;
  21 + /**
  22 + *新增类型
  23 + * */
  24 + @RequestMapping(value = "/add", method = RequestMethod.POST)
  25 + public Map<String, Object> add(znddStatus zs) {
  26 + Map<String, Object> result = new HashMap<>();
  27 + try {
  28 + znddStatusService.add(zs);
  29 + result.put("status", ResponseCode.SUCCESS);
  30 + } catch (Exception e) {
  31 + result.put("status", ResponseCode.ERROR);
  32 + result.put("msg", e.getMessage());
  33 + }
  34 + return result;
  35 + }
  36 +
  37 +}
... ...
src/main/java/com/bsth/controller/zndd/ZnddYuAnTypeConroller.java 0 → 100644
  View file @2736809
  1 +package com.bsth.controller.zndd;
  2 +
  3 +public class ZnddYuAnTypeConroller {
  4 +}
... ...
src/main/java/com/bsth/data/pilot80/PilotReport.java
  View file @2736809
1 1 package com.bsth.data.pilot80;
2 2  
  3 +import com.alibaba.fastjson.JSONObject;
3 4 import com.bsth.data.BasicData;
4 5 import com.bsth.data.LineConfigData;
5 6 import com.bsth.data.gpsdata_v2.GpsRealData;
... ... @@ -13,6 +14,7 @@ import com.bsth.entity.realcontrol.ScheduleRealInfo;
13 14 import com.bsth.repository.directive.D80Repository;
14 15 import com.bsth.repository.directive.DC0A4Repository;
15 16 import com.bsth.service.directive.DirectiveService;
  17 +import com.bsth.util.HttpClientUtils;
16 18 import com.bsth.websocket.handler.SendUtils;
17 19 import org.apache.commons.lang3.StringUtils;
18 20 import org.slf4j.Logger;
... ... @@ -96,6 +98,23 @@ public class PilotReport {
96 98 DirectivePushQueue.put60_002(outSch, dayOfSchedule.doneSum(nbbm), "请出@系统", "同意出场;");
97 99 }
98 100 break;
  101 + //报警请求
  102 + case 0x10:
  103 + try {
  104 + String url = "http://61.169.120.202:13333/prod-api/dataDockingApi/accident/saveAccident?";
  105 + url = url + "accidentTime=" + new Date().getTime() + "&nbbm=" + "W1F-024";
  106 + logger.info("url===="+url);
  107 + String res = HttpClientUtils.get(url).toString();
  108 + JSONObject jsonObject = JSONObject.parseObject(res);
  109 + if ((int) jsonObject.get("code") == 200) {
  110 + logger.info("报警请求成功");
  111 + }else {
  112 + logger.info("报警请求失败");
  113 + }
  114 + }catch (Exception e){
  115 + logger.info("报警请求异常");
  116 + }
  117 + break;
99 118 }
100 119  
101 120 //反射搜索用 瞬时字段
... ...
src/main/java/com/bsth/data/zndd/AutomaticSch.java
  View file @2736809
... ... @@ -133,19 +133,6 @@ public class AutomaticSch {
133 133  
134 134 }
135 135  
136   -
137   -
138   - //撤销班次 检测人员或者车辆故障 --//换人换车或烂班 //路牌对调
139   - public void cxJC(){
140   -
141   -
142   - }
143   -
144   - //撤销撤销班次 检测人员或者车辆故障 --//换人换车或烂班 //路牌对调
145   - public void cxJCX(){
146   -
147   - }
148   -
149 136 //实发未发检测 -- 车辆GPS掉线的情况下，车辆该出站了
150 137 /**
151 138 * 1。已过待发时间还没发车的
... ... @@ -240,23 +227,24 @@ public class AutomaticSch {
240 227 }
241 228  
242 229 public Boolean isLines(String line) {
243   - //新临专线，新芦专线，临港5路，浦东7路，浦东91路
244   - if (line.equals("10636") || line.equals("200828") || line.equals("211208") || line.equals("230226") || line.equals("201012"))
  230 + //新临专线，新芦专线，临港5路，浦东7路，浦东91路,医疗线
  231 + //线路书院2路、万祥2路、泥城1路、泥城2路、芦潮港1路、浦东56路、临港8路、1077路、申港1路、1043路
  232 + if (line.equals("10636") || line.equals("200828") || line.equals("211208") || line.equals("230226") || line.equals("201012") ||
  233 + line.equals("11077") ||
  234 + line.equals("11078") ||
  235 + line.equals("12101") ||
  236 + line.equals("12103") ||
  237 + line.equals("12106") ||
  238 + line.equals("12153") ||
  239 + line.equals("60041") ||
  240 + line.equals("88813") ||
  241 + line.equals("181221") ||
  242 + line.equals("220825") ||
  243 + line.equals("240829"))
245 244 return Boolean.valueOf(true);
246 245 return Boolean.valueOf(false);
247 246 }
248 247  
249   - //发车信息微调检测 -- 车辆掉线后实发检测，重新计算时间发车时间
250   - public void updatesf(){
251   -
252   - }
253   -
254   - //临加班次 -- 检测到大客流 //走落地屏客流接口
255   - public void ljbc(){
256   -
257   -
258   - }
259   -
260 248 /**
261 249 * 指令重发 -- 芦潮港1路
262 250 * 指令下发后设备未响应后 5分钟后重新发送一次 还未响应的话 未来一小时不自动发送该设备
... ...
src/main/java/com/bsth/entity/zndd/znddStatus.java
  View file @2736809
... ... @@ -21,6 +21,8 @@ public class znddStatus {
21 21  
22 22 private String remark;
23 23  
  24 + private String name;
  25 +
24 26  
25 27 public String getType() {
26 28 return type;
... ... @@ -45,4 +47,12 @@ public class znddStatus {
45 47 public void setRemark(String remark) {
46 48 this.remark = remark;
47 49 }
  50 +
  51 + public String getName() {
  52 + return name;
  53 + }
  54 +
  55 + public void setName(String name) {
  56 + this.name = name;
  57 + }
48 58 }
... ...
src/main/java/com/bsth/service/zndd/ZnddStatusService.java 0 → 100644
  View file @2736809
  1 +package com.bsth.service.zndd;
  2 +
  3 +import com.bsth.entity.zndd.znddStatus;
  4 +import com.bsth.service.BaseService;
  5 +
  6 +public interface ZnddStatusService extends BaseService<znddStatus, Integer> {
  7 +
  8 +
  9 + void add(znddStatus zs);
  10 +}
... ...
src/main/java/com/bsth/service/zndd/impl/ZnddStatusServiceImpl.java 0 → 100644
  View file @2736809
  1 +package com.bsth.service.zndd.impl;
  2 +
  3 +import com.bsth.entity.zndd.znddStatus;
  4 +import com.bsth.repository.zndd.ZnddStatusRepository;
  5 +import com.bsth.service.impl.BaseServiceImpl;
  6 +import com.bsth.service.zndd.ZnddStatusService;
  7 +import org.springframework.beans.factory.annotation.Autowired;
  8 +import org.springframework.stereotype.Service;
  9 +
  10 +@Service
  11 +public class ZnddStatusServiceImpl extends BaseServiceImpl<znddStatus, Integer> implements ZnddStatusService {
  12 +
  13 + @Autowired
  14 + ZnddStatusRepository znddStatusRepository;
  15 +
  16 +
  17 + public void add(znddStatus zs){
  18 + znddStatusRepository.save(zs);
  19 + }
  20 +}
... ...
src/main/resources/fatso/start.js
  View file @2736809
... ... @@ -16,7 +16,7 @@ var platform = process.platform;
16 16 var iswin = platform == 'win32';
17 17 var sp = platform == 'win32' ? '\\' : '/';
18 18 //不参与的目录
19   -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']
  19 +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']
20 20 , ep = new EventProxy()
21 21 , pName = 'bsth_control'
22 22 , path = process.cwd()
... ...
src/main/resources/static/pages/base/timesmodel/js/echartsDrawGanTT.js
  View file @2736809
... ... @@ -35,8 +35,6 @@ var echartsDrawGTT = function () {
35 35 bcType["major"] = '站';
36 36 bcType["venting"] = '直';
37 37 bcType["region"] = '区';
38   - bcType["ldks"] = '空';
39   -
40 38  
41 39 // 处理后班次数据
42 40 var data = [];
... ... @@ -81,8 +79,8 @@ var echartsDrawGTT = function () {
81 79 data = [];
82 80 bcData = newData;
83 81 echarts.util.each(bcData, function (bcObj, index) {
84   - var fcsj = Date.parse(DateTimeTool.getDateTime2(bcObj.fcsj,bcObj.fcno)),
85   - ARRIVALTIME = Date.parse(DateTimeTool.getDateTime2(bcObj.ARRIVALTIME,bcObj.fcno)),
  82 + var fcsj = Date.parse(DateTimeTool.getDateTime(bcObj.fcsj)),
  83 + ARRIVALTIME = Date.parse(DateTimeTool.getDateTime(bcObj.ARRIVALTIME)),
86 84 colorStr = bcObj.xlDir,
87 85 xlDir;
88 86 if(bcObj.xlDir == 'relationshipGraph-up')
... ... @@ -148,45 +146,18 @@ var echartsDrawGTT = function () {
148 146 for(var j = 0,len=lpData.length; j < len; j++) {
149 147 var type = true;
150 148 var name = lpData[j];
151   - let _datast = [];
152   - var dataSize = data.length;
153   - //把当前路牌的班次摘出来 重新计算
154   - for (var t = 0 ; t < dataSize ; t++){
155   - if(data[t].value[0] == name) {
156   - _datast.push({
157   - value: data[t].value,
158   - itemStyle: data[t].itemStyle
159   - })
160   - }
161   - }
162   - //根据发车时间排序
163   - _datast.sort(function(a,b){
164   - return a.value[1]-b.value[1];
165   - });
166   - //计算停站时间
167   - for(var i = 0; i < _datast.length -1; i++) {
168   - //最后一个为0
169   - if (i ==_datast.length -1){
170   - _datast[i].value[15] = 0;
171   - continue;
172   - }
173   - //出场班次空闲班次不算工时
174   - if(_datast[i].value[6] == 'in' || _datast[i].value[16] == 1) {
175   - _datast[i].value[15] = 0;
176   - continue;
177   - }
178   - //同一路牌下的下一个班次的发车时间 - 本班次的到站时间 = 停车时间
179   - _datast[i].value[15] = (_datast[i+1].value[1] - _datast[i].value[2])/60000;
180   - }
181   - //统计计算总计工时。
182   - for (let n in _datast){
183   - let das = _datast[n];
184   - if(type){
185   - lpDataCount[name] = [das.value[3]/60000+das.value[15],1,das.value[4]];
186   - type = false;
187   - } else {
188   - lpDataCount[name][0] += (das.value[3]/60000+das.value[15]);
189   - lpDataCount[name][1] += 1;
  149 + for(var i = 0,len2=data.length; i < len2; i++) {
  150 + if(name == data[i].value[0]) {
  151 + if(type){
  152 + lpDataCount[name] = [data[i].value[3]/60000+data[i].value[15],1,data[i].value[4]];
  153 + type = false;
  154 + } else if(data[i].value[6] == 'in' || data[i].value[16] == 1){
  155 + lpDataCount[name][0] += data[i].value[3]/60000;
  156 + lpDataCount[name][1] += 1;
  157 + } else {
  158 + lpDataCount[name][0] += (data[i].value[3]/60000+data[i].value[15]);
  159 + lpDataCount[name][1] += 1;
  160 + }
190 161 }
191 162 }
192 163 }
... ... @@ -233,7 +204,7 @@ var echartsDrawGTT = function () {
233 204 +'<br>发车时间：' + getHoursAndMinutes(params.value[1])
234 205 +'<br>到站时间：' + getHoursAndMinutes(params.value[2])
235 206 +'<br>行驶时间：' + params.value[3]/60000 +'分钟'
236   - +'<br>停休时间：' + Math.round(params.value[15]) +'分钟'
  207 + +'<br>停休时间：' + params.value[15] +'分钟'
237 208 +'<br>班次类型：' + bcTypeStr ;
238 209 return str;
239 210 }
... ... @@ -350,7 +321,7 @@ var echartsDrawGTT = function () {
350 321 // 除了早晚例保，和进出场班次其余类型班次有停站时间
351 322 if(type!='bd' && type!='lc' && type!='out' && type!='in') {
352 323 //if(params.data.value[15]>=0)
353   - stayStr = "停: " + params.data.value[15];
  324 + stayStr = "停:" + params.data.value[15];
354 325 }
355 326 // 分班显示‘分’
356 327 if(params.data.value[16] == 1)
... ... @@ -638,7 +609,7 @@ var echartsDrawGTT = function () {
638 609 bcTypeStr = bcType[type];
639 610  
640 611 if(type == 'normal') {
641   - stayStr = "停:" + Math.round(params.data.value[15]);
  612 + stayStr = "停:" + params.data.value[15];
642 613 }
643 614 var arr = [
644 615 '{left|' + timeStr + '}{type|'+ ((dataZoomEnd - dataZoomStart) <= 70 ? bcType[type] : '') +'}',
... ... @@ -693,55 +664,22 @@ var echartsDrawGTT = function () {
693 664 var p2 = [item.value[2],item.value[0]];
694 665 var pp= chart.convertToPixel({xAxisIndex: 0, yAxisIndex:0},p);
695 666 var pp2= chart.convertToPixel({xAxisIndex: 0, yAxisIndex:0},p2);
696   - let _datast = [];
  667 +
697 668 var dataSize = data.length;
698   - //把当前路牌的班次摘出来 重新计算
699   - for (var t = 0 ; t < dataSize ; t++){
700   - if(data[t].value[0] == item.value[0]) {
701   - _datast.push({
702   - value: data[t].value,
703   - itemStyle: data[t].itemStyle
704   - })
705   - }
706   - }
707   -
708   - //根据发车时间排序
709   - _datast.sort(function(a,b){
710   - return a.value[1]-b.value[1];
711   - });
712   -
713   - for(var i = 0; i < _datast.length -1; i++) {
714   - //最后一个为0
715   - if (i ==_datast.length -1){
716   - _datast[i].value[15] = 0;
717   - continue;
718   - }
719   - if(_datast[i].value[6] == 'in' || _datast[i].value[16] == 1) {
720   - _datast[i].value[15] = 0;
721   - continue
  669 + if(dataIndex<dataSize-1) {
  670 + for(var i=0;i<dataSize;i++) {
  671 + if(i==dataIndex)
  672 + continue;
  673 + if(data[dataIndex].value[6] == 'in' || data[dataIndex].value[16] == 1) {
  674 + data[dataIndex].value[15] = 0;
  675 + break;
  676 + }
  677 + if(data[dataIndex].value[4] == data[i].value[4] && data[dataIndex].value[7] == (data[i].value[7]-1)) {//同一路牌下的下一个班次的发车时间 - 本班次的到站时间 = 停车时间
  678 + data[dataIndex].value[15] = (data[dataIndex+1].value[1] - data[dataIndex].value[2])/60000;
  679 + break;
  680 + }
722 681 }
723   - //同一路牌下的下一个班次的发车时间 - 本班次的到站时间 = 停车时间
724   - _datast[i].value[15] = (_datast[i+1].value[1] - _datast[i].value[2])/60000;
725 682 }
726   -
727   -
728   -
729   - // rsultA = rsultA.concat(lpbc);
730   - /* if(dataIndex<dataSize-1) { //点击阴影班次的总工时变化的罪魁祸首
731   - for(var i=0;i<dataSize;i++) {
732   - if(i==dataIndex)
733   - continue;
734   - if(data[dataIndex].value[6] == 'in' || data[dataIndex].value[16] == 1) {
735   - data[dataIndex].value[15] = 0;
736   - break;
737   - }
738   - //同一路牌下的下一个班次的发车时间 - 本班次的到站时间 = 停车时间
739   - if(data[dataIndex].value[4] == data[i].value[4] && data[dataIndex].value[7] == (data[i].value[7]-1)) {
740   - data[dataIndex].value[15] = (data[dataIndex+1].value[1] - data[dataIndex].value[2])/60000;
741   - break;
742   - }
743   - }
744   - }*/
745 683 return {
746 684 type: 'rect',
747 685 borderWidth: 4,
... ... @@ -769,7 +707,7 @@ var echartsDrawGTT = function () {
769 707 })
770 708 });
771 709 };
772   - // 刷新上下行发车时刻表数据 正常和区间的
  710 + // 刷新上下行发车时刻表数据
773 711 var refreshUpDownData = function () {
774 712 // 清空数据
775 713 dataUp=[];
... ... @@ -779,7 +717,7 @@ var echartsDrawGTT = function () {
779 717 for(var i = 0,len=data.length; i < len; i++) {
780 718 var type = [];
781 719 type = $.extend(true, [], type, data[i].value);
782   - if(data[i].value[6] == 'normal' || data[i].value[6] == 'region') {
  720 + if(data[i].value[6] == 'normal') {
783 721 if (data[i].value[8] == 0) {
784 722 dataUp.push(type);
785 723 } else if (data[i].value[8] == 1) {
... ...
src/main/resources/static/pages/zndd_yuan/DKL.html
  View file @2736809
... ... @@ -12,14 +12,34 @@
12 12 <ul id="card-type-list"></ul>
13 13 </div>
14 14 <div>
15   - <button id="saves">保存</button>
16 15  
17   - </div>
18   - <div>
19   - <select name="destroy" class="form-control" id="destroySelect">
  16 +
  17 + 添加预案：
  18 + <input type="text" class="form-control" style="width: 15%;display: inline;" name ="types" id="dNameInput" placeholder="请输入名称">
  19 + <input type="text" class="form-control" style="width: 15%;display: inline;" name ="types" id="dCodeInput" placeholder="请输入代码">
  20 + <button type="button" class="btn btn-circle blue" id="saveButton"><i class="fa fa-minus-square"></i> 添加</button>
  21 +
  22 +
  23 +
  24 + <select name="destroy" class="form-control" style="width: 15%;display: inline; margin-left: 15%" id="destroySelect">
20 25 <option value="DKL">-- 大客流 --</option>
21 26 <option value="WD">-- 误点 --</option>
  27 + <option value="FCJG">-- 发车间隔 --</option>
  28 + <option value="MZ">-- 满载 --</option>
  29 + <option value="DJG">-- 大间隔 --</option>
  30 + <option value="YCFC">-- 异常发车 --</option>
  31 + <option value="YFWF">-- 应发未发 --</option>
  32 + <option value="ZLCF">-- 指令重发 --</option>
  33 + <option value="dj">-- 待添加 --</option>
22 34 </select>
  35 +
  36 +
  37 + <button class="btn btn-primary" id="saves">保存</button>
  38 + </div>
  39 + <div>
  40 +
  41 +
  42 +
23 43 </div>
24 44 <div style="height: 80%">
25 45 <svg style="width: 100%;height: 100%;" id="svgContainer" class="grid-background">
... ... @@ -29,6 +49,21 @@
29 49 </div>
30 50  
31 51 <script>
  52 +
  53 + //输入名称，自动生成代码
  54 + $('#dNameInput').on('keyup', setPinYin);
  55 +
  56 + function setPinYin(){
  57 + var val = $('#dNameInput').val();
  58 + if($('#dGroupSelect').val() == 0)
  59 + $('#dCodeInput').val(pinyin.getFullChars(val));
  60 + else
  61 + $('#dCodeInput').val(pinyin.getCamelChars(val));
  62 + }
  63 +
  64 +</script>
  65 +
  66 +<script>
32 67 var cards = [
33 68 {
34 69 id: 'card0',
... ... @@ -45,42 +80,24 @@
45 80 }
46 81 ],
47 82 titleBarColor: ['#84fab0', '#8fd3f4']
48   - },{
49   - id: 'card1',
50   - x: 100,
51   - y: 220,
52   - label: '流程',
53   - type: "流程",
54   - nodes: [{
55   - type: "in",
56   - level: 0,
57   - enumType: 'call',
58   - color: '#fff'
59   - },
60   - {
61   - type: "out",
62   - level: 0,
63   - enumType: 'call',
64   - color: '#3C8CE7',
65   - slot: 'input',
66   - },
67   - ],
68   - titleBarColor: ['#fccb90', '#d57eeb']
69   - },{
70   - id: 'card2',
71   - x: 100,
72   - y: 300,
73   - label: '结束',
74   - type: "流程y",
75   - nodes: [{
76   - type: "in",
  83 + }
  84 + ];
  85 + var cards2 = [
  86 + {
  87 + id: 'card0',
  88 + x: 0,
  89 + y: 0,
  90 + label: '开始类型',
  91 + type: "开始类型",
  92 + nodes: [ {
  93 + type: "out",
77 94 level: 0,
78 95 enumType: 'call',
79   - color: '#fff',
  96 + color: '#3C8CE7',
80 97 slot: 'input',
81 98 }
82 99 ],
83   - titleBarColor: ['#f6d365', '#fda085']
  100 + titleBarColor: ['#84fab0', '#8fd3f4']
84 101 }
85 102 ];
86 103  
... ... @@ -100,7 +117,8 @@
100 117 }
101 118 ],
102 119 titleBarColor: ['#84fab0', '#8fd3f4']
103   - },{
  120 + },
  121 + {
104 122 id: 'cardc',
105 123 x: 100,
106 124 y: 220,
... ... @@ -121,7 +139,30 @@
121 139 },
122 140 ],
123 141 titleBarColor: ['#fccb90', '#d57eeb']
124   - },{
  142 + },
  143 + {
  144 + id: 'cardX',
  145 + x: 100,
  146 + y: 220,
  147 + label: '配置',
  148 + type: "pz",
  149 + nodes: [{
  150 + type: "in",
  151 + level: 0,
  152 + enumType: 'call',
  153 + color: '#fff'
  154 + },
  155 + {
  156 + type: "out",
  157 + level: 0,
  158 + enumType: 'call',
  159 + color: '#3C8CE7',
  160 + slot: 'input',
  161 + },
  162 + ],
  163 + titleBarColor: ['#c7e754', '#8352d7']
  164 + },
  165 + {
125 166 id: 'card3',
126 167 x: 100,
127 168 y: 300,
... ... @@ -136,8 +177,206 @@
136 177 }
137 178 ],
138 179 titleBarColor: ['#f6d365', '#fda085']
139   - }
140   - ];
  180 + },
  181 + {
  182 + id: 'card4',
  183 + x: 100,
  184 + y: 400,
  185 + label: '待发调整',
  186 + type: "待发调整",
  187 + nodes: [{
  188 + type: "in",
  189 + level: 0,
  190 + enumType: 'call',
  191 + color: '#fff',
  192 +
  193 + },
  194 + {
  195 + type: "out",
  196 + level: 0,
  197 + enumType: 'call',
  198 + color: '#3C8CE7',
  199 + }
  200 + ],
  201 + titleBarColor: ['#3950e8', '#25f6d0']
  202 + },
  203 + {
  204 + id: 'card5',
  205 + x: 100,
  206 + y: 400,
  207 + label: '班次取消（烂班）',
  208 + type: "班次取消（烂班）",
  209 + nodes: [{
  210 + type: "in",
  211 + level: 0,
  212 + enumType: 'call',
  213 + color: '#fff',
  214 +
  215 + },
  216 + {
  217 + type: "out",
  218 + level: 0,
  219 + enumType: 'call',
  220 + color: '#3C8CE7',
  221 + }
  222 + ],
  223 + titleBarColor: ['#3950e8', '#25f6d0']
  224 + },
  225 + {
  226 + id: 'card6',
  227 + x: 100,
  228 + y: 400,
  229 + label: '实发调整',
  230 + type: "实发调整",
  231 + nodes: [{
  232 + type: "in",
  233 + level: 0,
  234 + enumType: 'call',
  235 + color: '#fff',
  236 +
  237 + },
  238 + {
  239 + type: "out",
  240 + level: 0,
  241 + enumType: 'call',
  242 + color: '#3C8CE7',
  243 + }
  244 + ],
  245 + titleBarColor: ['#3950e8', '#25f6d0']
  246 + },
  247 + {
  248 + id: 'card7',
  249 + x: 100,
  250 + y: 400,
  251 + label: '实发撤销',
  252 + type: "实发撤销",
  253 + nodes: [{
  254 + type: "in",
  255 + level: 0,
  256 + enumType: 'call',
  257 + color: '#fff',
  258 +
  259 + },
  260 + {
  261 + type: "out",
  262 + level: 0,
  263 + enumType: 'call',
  264 + color: '#3C8CE7',
  265 + }
  266 + ],
  267 + titleBarColor: ['#3950e8', '#25f6d0']
  268 + },
  269 + {
  270 + id: 'card8',
  271 + x: 100,
  272 + y: 400,
  273 + label: '新增临加班次',
  274 + type: "新增临加班次",
  275 + nodes: [{
  276 + type: "in",
  277 + level: 0,
  278 + enumType: 'call',
  279 + color: '#fff',
  280 +
  281 + },
  282 + {
  283 + type: "out",
  284 + level: 0,
  285 + enumType: 'call',
  286 + color: '#3C8CE7',
  287 + }
  288 + ],
  289 + titleBarColor: ['#3950e8', '#25f6d0']
  290 + },
  291 + {
  292 + id: 'card9',
  293 + x: 100,
  294 + y: 400,
  295 + label: '调整人车',
  296 + type: "调整人车",
  297 + nodes: [{
  298 + type: "in",
  299 + level: 0,
  300 + enumType: 'call',
  301 + color: '#fff',
  302 +
  303 + },
  304 + {
  305 + type: "out",
  306 + level: 0,
  307 + enumType: 'call',
  308 + color: '#3C8CE7',
  309 + }
  310 + ],
  311 + titleBarColor: ['#3950e8', '#25f6d0']
  312 + },
  313 + {
  314 + id: 'card10',
  315 + x: 100,
  316 + y: 400,
  317 + label: '指令重发',
  318 + type: "指令重发",
  319 + nodes: [{
  320 + type: "in",
  321 + level: 0,
  322 + enumType: 'call',
  323 + color: '#fff',
  324 +
  325 + },
  326 + {
  327 + type: "out",
  328 + level: 0,
  329 + enumType: 'call',
  330 + color: '#3C8CE7',
  331 + }
  332 + ],
  333 + titleBarColor: ['#3950e8', '#25f6d0']
  334 + },
  335 + {
  336 + id: 'card11',
  337 + x: 100,
  338 + y: 400,
  339 + label: '路牌对调',
  340 + type: "路牌对调",
  341 + nodes: [{
  342 + type: "in",
  343 + level: 0,
  344 + enumType: 'call',
  345 + color: '#fff',
  346 +
  347 + },
  348 + {
  349 + type: "out",
  350 + level: 0,
  351 + enumType: 'call',
  352 + color: '#3C8CE7',
  353 + }
  354 + ],
  355 + titleBarColor: ['#3950e8', '#25f6d0']
  356 + },
  357 + {
  358 + id: 'card12',
  359 + x: 100,
  360 + y: 400,
  361 + label: '误点调整',
  362 + type: "误点调整",
  363 + nodes: [{
  364 + type: "in",
  365 + level: 0,
  366 + enumType: 'call',
  367 + color: '#fff',
  368 +
  369 + },
  370 + {
  371 + type: "out",
  372 + level: 0,
  373 + enumType: 'call',
  374 + color: '#3C8CE7',
  375 + }
  376 + ],
  377 + titleBarColor: ['#3950e8', '#25f6d0']
  378 + },
  379 + ]
141 380 var links = [];
142 381 var currentLink = null;
143 382 var isDragging = false;
... ... @@ -146,39 +385,51 @@
146 385 var currentCard;
147 386  
148 387  
149   - $("#destroySelect").on('change',function(){
150   - var fn = $('#destroySelect').val();
151 388  
152   - $.get('/zndya/all',{type_eq: fn},function(datas){
153   - var ts = [];
154   - var link = [];
155   - for (var c in datas){
156   - if(datas[c].types == 0){
157   - ts.push(JSON.parse(datas[c].jsonDate));
158   - }else {
159   - link.push(JSON.parse(datas[c].jsonDate));
160   - }
  389 + selectall();
  390 + function selectall(){
  391 + $.get('/znnd_status/all',{},function(datas){
161 392  
162   - }
163   - debugger
164   - if (ts.length > 0) {
165   - cards = ts;
166   - links = link;
167   - }else {
168   - cards = cardsbei;
169   - links = [];
170   - }
  393 + var opts = '';
  394 + $.each(datas, function () {
  395 + opts += '<option value="' + this.type + '">-- ' + this.name + '-- </option>';
  396 + });
  397 + $("#destroySelect").html(opts);
  398 + $("#destroySelect").val("dkl");
  399 + init("dkl")
  400 + });
  401 +
  402 + }
  403 +
  404 +
  405 + //保存
  406 + $("#saveButton").on('click',function() {
  407 + debugger
  408 + var name = $("#dNameInput").val();
  409 + var type = $("#dCodeInput").val();
  410 + if (type == "" || name == ""){
  411 + return;
  412 + }
  413 + var datau = {
  414 + type:type,
  415 + name:name,
  416 + }
  417 + $post('/znnd_status/add',datau,function(datan){
  418 + layer.msg('添加成功...');
  419 + selectall();
  420 + })
171 421  
172 422  
173   - drawLinks();
174   - drawCards();
175   - attachEventListeners();
176   - });
177   - })
178 423  
179   - function init() {
  424 + });
  425 +
  426 + $("#destroySelect").on('change',function(){
  427 + var fn = $('#destroySelect').val();
  428 + init(fn);
  429 + })
180 430  
181   - $.get('/zndya/all',{type_eq: 'DKL'},function(datas){
  431 + function init(fn) {
  432 + $.get('/zndya/all',{type_eq: fn},function(datas){
182 433 var ts = [];
183 434 var link = [];
184 435 for (var c in datas){
... ... @@ -193,11 +444,10 @@
193 444 cards = ts;
194 445 links = link;
195 446 }else {
196   - cards = cardsbei;
  447 + cards = cards2;
197 448 links = [];
198 449 }
199 450  
200   -
201 451 drawLinks();
202 452 drawCards();
203 453 attachEventListeners();
... ... @@ -460,6 +710,7 @@
460 710  
461 711  
462 712 function drawLinks() {
  713 + debugger
463 714 const linksContainer = document.getElementById('linksContainer');
464 715 linksContainer.innerHTML = ''; // 清除现有的线条
465 716 // 清除旧的删除图标
... ... @@ -501,7 +752,8 @@
501 752 `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}`;
502 753 path.setAttribute('d', d);
503 754 linksContainer.appendChild(path);
504   - } else {
  755 + }
  756 + else {
505 757 if (link.target.x - link.source.x > 0) {
506 758 dist = 200; // 如果终点在源点的右侧，控制点距离更远
507 759 } else {
... ... @@ -638,7 +890,6 @@
638 890 );
639 891 svgContainer.style.backgroundPosition = `${currentPan.x % 100}px ${currentPan.y % 100}px`;
640 892 } else if (isDragging) {
641   - debugger
642 893 moveCard(e);
643 894 } else if (isLinking && currentLink) {
644 895 updateLink(e);
... ... @@ -671,10 +922,10 @@
671 922 const svgRect = svgContainer.getBoundingClientRect();
672 923 currentCard.x = e.clientX - svgRect.left - dragOffsetX;
673 924 currentCard.y = e.clientY - svgRect.top - dragOffsetY;
674   -
  925 + debugger
675 926 // Update link positions associated with the currentCard
676 927 links.forEach(link => {
677   - if (link.source.node.startsWith(currentCard.id)) {
  928 + if (link.source.node.split('-node')[0] == currentCard.id) {
678 929 // 根据节点ID更新链接的源位置
679 930 const nodeIndex = parseInt(link.source.node.split('-node')[1]) - 1;
680 931 const nodeConfig = currentCard.nodes[nodeIndex]; // 获取当前节点的配置
... ... @@ -684,7 +935,7 @@
684 935 link.source.y = 30 + currentCard.y + topBottomPadding + (nodeConfig.level + 1) * nodeSpacing - (
685 936 nodeSpacing / 2); // 根据节点的index调整y坐标
686 937 }
687   - if (link.target && link.target.node.startsWith(currentCard.id)) {
  938 + if (link.target && link.target.node.split('-node')[0] == currentCard.id) {
688 939 // 根据节点ID更新链接的目标位置
689 940 const nodeIndex = parseInt(link.target.node.split('-node')[1]) - 1;
690 941 const nodeConfig = currentCard.nodes[nodeIndex]; // 获取当前节点的配置
... ... @@ -825,6 +1076,7 @@
825 1076 });
826 1077 }
827 1078 } else {
  1079 + debugger
828 1080 const sourceNodeId = currentLink.source.node;
829 1081 const sourceNodeParts = sourceNodeId.split('-node');
830 1082 const sourceCard = cards.find(card => card.id === sourceNodeParts[0]);
... ... @@ -935,7 +1187,6 @@
935 1187 }
936 1188  
937 1189 function createNewCard(cardTemplate, mouseX, mouseY, sourceNode) {
938   - debugger
939 1190 var carrdid = [];
940 1191 cards.forEach(card => {
941 1192 carrdid.push(card.id.replace('card',''));
... ... @@ -985,10 +1236,13 @@
985 1236 modal.style.display = 'none'; // 隐藏弹窗
986 1237 }
987 1238  
988   - init();
  1239 +
989 1240  
990 1241 $("#saves").on('click', function() {
991 1242 var s = cards;
  1243 + if (cards.length == 0)
  1244 + return
  1245 +
992 1246 var type = $('#destroySelect').val();
993 1247 var datas = {
994 1248 type : type,
... ... @@ -1004,6 +1258,7 @@
1004 1258 if(result.status != null) {
1005 1259 // 弹出添加成功提示消息
1006 1260 layer.msg('添加成功...');
  1261 + init(type);
1007 1262 } else {
1008 1263 // 弹出添加失败提示消息
1009 1264 layer.msg(result.ERROR);
... ...
src/main/resources/static/real_control_v2/call/assets/css/bootstrap.min.css renamed to src/main/resources/static/pages/zndd_yuan/call/assets/css/bootstrap.min.css
  View file @2736809
src/main/resources/static/real_control_v2/call/assets/css/index.css renamed to src/main/resources/static/pages/zndd_yuan/call/assets/css/index.css
  View file @2736809
src/main/resources/static/real_control_v2/call/assets/font/iconfont.css renamed to src/main/resources/static/pages/zndd_yuan/call/assets/font/iconfont.css
  View file @2736809
src/main/resources/static/real_control_v2/call/assets/font/iconfont.eot renamed to src/main/resources/static/pages/zndd_yuan/call/assets/font/iconfont.eot
View file @2736809
No preview for this file type
src/main/resources/static/real_control_v2/call/assets/font/iconfont.svg renamed to src/main/resources/static/pages/zndd_yuan/call/assets/font/iconfont.svg
  View file @2736809
src/main/resources/static/real_control_v2/call/assets/font/iconfont.ttf renamed to src/main/resources/static/pages/zndd_yuan/call/assets/font/iconfont.ttf
View file @2736809
No preview for this file type
src/main/resources/static/real_control_v2/call/assets/font/iconfont.woff renamed to src/main/resources/static/pages/zndd_yuan/call/assets/font/iconfont.woff
View file @2736809
No preview for this file type
src/main/resources/static/real_control_v2/call/assets/font/iconfont.woff2 renamed to src/main/resources/static/pages/zndd_yuan/call/assets/font/iconfont.woff2
View file @2736809
No preview for this file type
src/main/resources/static/real_control_v2/call/assets/images/BG.png renamed to src/main/resources/static/pages/zndd_yuan/call/assets/images/BG.png
View file @2736809

87 KB
src/main/resources/static/real_control_v2/call/assets/images/Dcall.png renamed to src/main/resources/static/pages/zndd_yuan/call/assets/images/Dcall.png
View file @2736809

3.09 KB
src/main/resources/static/real_control_v2/call/assets/images/Mcalls.png renamed to src/main/resources/static/pages/zndd_yuan/call/assets/images/Mcalls.png
View file @2736809

2.55 KB
src/main/resources/static/real_control_v2/call/assets/images/answer.png renamed to src/main/resources/static/pages/zndd_yuan/call/assets/images/answer.png
View file @2736809

4.07 KB
src/main/resources/static/real_control_v2/call/assets/images/audio_bg.png renamed to src/main/resources/static/pages/zndd_yuan/call/assets/images/audio_bg.png
View file @2736809

101 KB
src/main/resources/static/real_control_v2/call/assets/images/call_bg.png renamed to src/main/resources/static/pages/zndd_yuan/call/assets/images/call_bg.png
View file @2736809

82.3 KB
src/main/resources/static/real_control_v2/call/assets/images/changaudio-hover.png renamed to src/main/resources/static/pages/zndd_yuan/call/assets/images/changaudio-hover.png
View file @2736809

4.07 KB
src/main/resources/static/real_control_v2/call/assets/images/chart.png renamed to src/main/resources/static/pages/zndd_yuan/call/assets/images/chart.png
View file @2736809

6.5 KB
src/main/resources/static/real_control_v2/call/assets/images/favicon.ico renamed to src/main/resources/static/pages/zndd_yuan/call/assets/images/favicon.ico
View file @2736809
No preview for this file type
src/main/resources/static/real_control_v2/call/assets/images/hangup.png renamed to src/main/resources/static/pages/zndd_yuan/call/assets/images/hangup.png
View file @2736809

3.87 KB
src/main/resources/static/real_control_v2/call/assets/images/head.png renamed to src/main/resources/static/pages/zndd_yuan/call/assets/images/head.png
View file @2736809

9.69 KB
src/main/resources/static/real_control_v2/call/assets/images/logo_big.png renamed to src/main/resources/static/pages/zndd_yuan/call/assets/images/logo_big.png
View file @2736809

6.14 KB
src/main/resources/static/real_control_v2/call/assets/images/logo_title.png renamed to src/main/resources/static/pages/zndd_yuan/call/assets/images/logo_title.png
View file @2736809

2.37 KB
src/main/resources/static/real_control_v2/call/assets/images/video.png renamed to src/main/resources/static/pages/zndd_yuan/call/assets/images/video.png
View file @2736809

2.33 KB
src/main/resources/static/real_control_v2/call/assets/images/video_close.png renamed to src/main/resources/static/pages/zndd_yuan/call/assets/images/video_close.png
View file @2736809

2.76 KB
src/main/resources/static/real_control_v2/call/assets/images/video_hangup.png renamed to src/main/resources/static/pages/zndd_yuan/call/assets/images/video_hangup.png
View file @2736809

2.59 KB
src/main/resources/static/real_control_v2/call/assets/images/voice.png renamed to src/main/resources/static/pages/zndd_yuan/call/assets/images/voice.png
View file @2736809

2.57 KB
src/main/resources/static/real_control_v2/call/assets/images/voice_close.png renamed to src/main/resources/static/pages/zndd_yuan/call/assets/images/voice_close.png
View file @2736809

2.89 KB
src/main/resources/static/real_control_v2/call/assets/images/yimg.jpg renamed to src/main/resources/static/pages/zndd_yuan/call/assets/images/yimg.jpg
View file @2736809

60.9 KB
src/main/resources/static/real_control_v2/call/assets/js/ArRTM@latest.js renamed to src/main/resources/static/pages/zndd_yuan/call/assets/js/ArRTM@latest.js
  View file @2736809
src/main/resources/static/real_control_v2/call/assets/js/bootstrap.min.js renamed to src/main/resources/static/pages/zndd_yuan/call/assets/js/bootstrap.min.js
  View file @2736809
src/main/resources/static/real_control_v2/call/assets/js/index.js renamed to src/main/resources/static/pages/zndd_yuan/call/assets/js/index.js
  View file @2736809
src/main/resources/static/real_control_v2/call/assets/js/jquery-3.5.1.min.js renamed to src/main/resources/static/pages/zndd_yuan/call/assets/js/jquery-3.5.1.min.js
  View file @2736809
src/main/resources/static/real_control_v2/call/assets/js/latest.js renamed to src/main/resources/static/pages/zndd_yuan/call/assets/js/latest.js
  View file @2736809
src/main/resources/static/real_control_v2/call/index.html renamed to src/main/resources/static/pages/zndd_yuan/call/index.html
  View file @2736809
... ... @@ -6,19 +6,19 @@
6 6 <meta name="google" content="notranslate" />
7 7 <title>anyrtc 呼叫邀请DEMO - anyRTC</title>
8 8 <!-- icon -->
9   - <link rel="icon" href="/real_control_v2/call/assets/images/favicon.ico" />
  9 + <link rel="icon" href="/pages/zndd_yuan/call/assets/images/favicon.ico" />
10 10 <!-- CSS only -->
11   - <link rel="stylesheet" href="/real_control_v2/call/assets/css/bootstrap.min.css"/>
12   - <link rel="stylesheet" type="text/css" href="/real_control_v2/call/assets/font/iconfont.css" />
  11 + <link rel="stylesheet" href="/pages/zndd_yuan/call/assets/css/bootstrap.min.css"/>
  12 + <link rel="stylesheet" type="text/css" href="/pages/zndd_yuan/call/assets/font/iconfont.css" />
13 13 <!-- JS, Popper.js, and jQuery -->
14   - <script src="/real_control_v2/call/assets/js/jquery-3.5.1.min.js"></script>
15   - <script src="/real_control_v2/call/assets/js/bootstrap.min.js"></script>
  14 + <script src="/pages/zndd_yuan/call/assets/js/jquery-3.5.1.min.js"></script>
  15 + <script src="/pages/zndd_yuan/call/assets/js/bootstrap.min.js"></script>
16 16 <!-- JS, RTC and RTM -->
17   - <script src="/real_control_v2/call/assets/js/latest.js"></script>
18   - <script src="/real_control_v2/call/assets/js/ArRTM@latest.js"></script>
  17 + <script src="/pages/zndd_yuan/call/assets/js/latest.js"></script>
  18 + <script src="/pages/zndd_yuan/call/assets/js/ArRTM@latest.js"></script>
19 19  
20 20 <!-- 覆盖bootstrap样式 -->
21   - <link rel="stylesheet" href="/real_control_v2/call/assets/css/index.css" />
  21 + <link rel="stylesheet" href="/pages/zndd_yuan/call/assets/css/index.css" />
22 22 </head>
23 23  
24 24 <body class="notranslate">
... ... @@ -28,7 +28,7 @@
28 28 <!-- 首页 -->
29 29 <div
30 30 class="page d-flex flex-col justify-content-center align-items-center"
31   - id="homePage" style="background-image:url('/real_control_v2/call/assets/images/yimg.jpg')"
  31 + id="homePage" style="background-image:url('/pages/zndd_yuan/call/assets/images/yimg.jpg')"
32 32  
33 33 >
34 34 <!-- -->
... ... @@ -133,7 +133,7 @@
133 133 <img
134 134 draggable="false"
135 135 class="img-responsive setting-video_preview_bg"
136   - src="/real_control_v2/call/assets/images/chart.png"
  136 + src="/pages/zndd_yuan/call/assets/images/chart.png"
137 137 />
138 138 <div
139 139 id="settingVideoPreview"
... ... @@ -332,7 +332,7 @@
332 332 <div class="invitation bd-highlight">
333 333 <div class="d-flex justify-content-center">
334 334 <div class="head_portrait">
335   - <img draggable="false" src="/real_control_v2/call/assets/images/head.png" />
  335 + <img draggable="false" src="/pages/zndd_yuan/call/assets/images/head.png" />
336 336 </div>
337 337 </div>
338 338 <div
... ... @@ -357,7 +357,7 @@
357 357 draggable="false"
358 358 class="img-responsive"
359 359 style="cursor: pointer"
360   - src="/real_control_v2/call/assets/images/hangup.png"
  360 + src="/pages/zndd_yuan/call/assets/images/hangup.png"
361 361 id="cancelCallBtn"
362 362 />
363 363 <!-- <button type="button" class="btn btn-danger" >取消</button> -->
... ... @@ -372,7 +372,7 @@
372 372 <div class="invitation bd-highlight">
373 373 <div class="d-flex justify-content-center">
374 374 <div class="head_portrait">
375   - <img draggable="false" src="/real_control_v2/call/assets/images/head.png" />
  375 + <img draggable="false" src="/pages/zndd_yuan/call/assets/images/head.png" />
376 376 </div>
377 377 </div>
378 378 <div
... ... @@ -398,21 +398,21 @@
398 398 draggable="false"
399 399 class="img-responsive"
400 400 style="cursor: pointer"
401   - src="/real_control_v2/call/assets/images/changaudio-hover.png"
  401 + src="/pages/zndd_yuan/call/assets/images/changaudio-hover.png"
402 402 id="changAudioBtn"
403 403 />
404 404 <img
405 405 draggable="false"
406 406 class="img-responsive"
407 407 style="cursor: pointer"
408   - src="/real_control_v2/call/assets/images/answer.png"
  408 + src="/pages/zndd_yuan/call/assets/images/answer.png"
409 409 id="acceptCallBtn"
410 410 />
411 411 <img
412 412 draggable="false"
413 413 class="img-responsive"
414 414 style="cursor: pointer"
415   - src="/real_control_v2/call/assets/images/hangup.png"
  415 + src="/pages/zndd_yuan/call/assets/images/hangup.png"
416 416 id="refuseCallBtn"
417 417 />
418 418 <!-- 多人 -->
... ... @@ -437,7 +437,7 @@
437 437 <img
438 438 draggable="false"
439 439 class="img-responsive"
440   - src="/real_control_v2/call/assets/images/head.png"
  440 + src="/pages/zndd_yuan/call/assets/images/head.png"
441 441 />
442 442 </div>
443 443 <div class="">
... ... @@ -469,7 +469,7 @@
469 469 draggable="false"
470 470 style="width: 100%"
471 471 class="img-responsive"
472   - src="/real_control_v2/call/assets/images/audio_bg.png"
  472 + src="/pages/zndd_yuan/call/assets/images/audio_bg.png"
473 473 />
474 474 </div>
475 475 </div>
... ... @@ -492,7 +492,7 @@
492 492 draggable="false"
493 493 style="position: absolute; width: 50%"
494 494 class="img-responsive"
495   - src="/real_control_v2/call/assets/images/logo_title.png"
  495 + src="/pages/zndd_yuan/call/assets/images/logo_title.png"
496 496 />
497 497 </div>
498 498 <div class="prompt_little d-flex">
... ... @@ -515,7 +515,7 @@
515 515 draggable="false"
516 516 style="position: absolute; width: 40%"
517 517 class="img-responsive"
518   - src="/real_control_v2/call/assets/images/logo_big.png"
  518 + src="/pages/zndd_yuan/call/assets/images/logo_big.png"
519 519 />
520 520 </div>
521 521 <div class="prompt_big meet-control_icon m-3" id="videoDuration">
... ... @@ -587,7 +587,7 @@
587 587 <img
588 588 draggable="false"
589 589 class="img-responsive"
590   - src="/real_control_v2/call/assets/images/logo_big.png"
  590 + src="/pages/zndd_yuan/call/assets/images/logo_big.png"
591 591 />
592 592 </div>
593 593  
... ... @@ -724,7 +724,7 @@
724 724 </div>
725 725 <!-- /.modal -->
726 726 </div>
727   - <script src="/real_control_v2/call/assets/js/index.js"></script>
  727 + <script src="/pages/zndd_yuan/call/assets/js/index.js"></script>
728 728 </body>
729 729 <script>
730 730 (function() {
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/temp_sch/add_normal.html
  View file @2736809
... ... @@ -15,7 +15,7 @@
15 15 <div class="uk-form-row">
16 16 <label class="uk-form-label">上下行</label>
17 17 <div class="uk-form-controls">
18   - <select name="xlDir" id="xlDir">
  18 + <select name="xlDir">
19 19 <option value="0">上行</option>
20 20 <option value="1">下行</option>
21 21 </select>
... ... @@ -28,7 +28,7 @@
28 28 <div class="uk-form-row">
29 29 <label class="uk-form-label">起点站</label>
30 30 <div class="uk-form-controls">
31   - <select name="qdzCode" id="qdzCode">
  31 + <select name="qdzCode">
32 32 </select>
33 33 </div>
34 34 </div>
... ... @@ -37,7 +37,7 @@
37 37 <div class="uk-form-row">
38 38 <label class="uk-form-label">终点站</label>
39 39 <div class="uk-form-controls">
40   - <select name="zdzCode" id="zdzCode">
  40 + <select name="zdzCode">
41 41 </select>
42 42 </div>
43 43 </div>
... ... @@ -158,7 +158,7 @@
158 158 });
159 159 $('.ct_line_lp_badge', nf).html(sch.xlName + '，&nbsp;'+sch.lpName);
160 160 });
161   -
  161 +
162 162 function addForm() {
163 163 var htmlStr = template('add_normal_sch-form-temp', sch);
164 164 var f = $(htmlStr);
... ... @@ -166,16 +166,11 @@
166 166 //字典转换
167 167 dictionaryUtils.transformDom($('.nt-dictionary', f));
168 168 //validation
169   -
170 169 f.formValidation({framework: 'uikit', locale: 'zh_CN'});
171 170 //autocomp
172 171 f.trigger('init-autoCom');
173 172  
174   - $("#xlDir").val(sch.xlDir);
175 173 $f('bcType', f).trigger('change');
176   - $("#qdzCode").val(sch.qdzCode);
177   - $("#zdzCode").val(sch.zdzCode);
178   - $f('zdzCode', f).trigger('change');
179 174 return f;
180 175 }
181 176  
... ...
src/main/resources/static/real_control_v2/js/stationcf/stationcf.js
  View file @2736809
... ... @@ -12,7 +12,7 @@ var gb_stationcf = (function () {
12 12 data.type = 'cp';
13 13  
14 14  
15   - let stopNo =data.station +"_"+ data.dir;
  15 + var stopNo =data.station +"_"+ data.dir;
16 16 /* gb_svg_chart.people(data.lineCode,stopNo,data.num,data.image);*/
17 17  
18 18 var htmlStr = template('cf_plat_msg_template', data);
... ... @@ -27,7 +27,7 @@ var gb_stationcf = (function () {
27 27 $wrap.on('click', '.all', function () {
28 28 var type = $(this).data('ip');
29 29 var calleeId = $(this).data('call')
30   - let pageUrl ="/real_control_v2/call/index.html?calleeId="+calleeId;
  30 + var pageUrl ="/pages/zndd_yuan/call/index.html?calleeId="+calleeId;
31 31 //将片段路径写入 localStorage
32 32 window.localStorage.setItem('real_control_form_embed_pageUrl', pageUrl);
33 33 var index = layer.open({
... ... @@ -53,24 +53,7 @@ var gb_stationcf = (function () {
53 53 $(this).parent().parent().remove();
54 54 /*if (close) close = false*/
55 55 });
56   - $wrap.on('click', '.images', function () {
57   - debugger
58   - var image = $(this).data('image');
59   - var imgHtml = "<img src='" + image + "' style='width: " + 600 + "px;height:" + 300 + "px'/>";
60   - layer.open({
61   - type: 1,
62   - offset: 'auto',
63   - area: [600 + 'px', 300 + 'px'],
64   - shadeClose: true,//点击外围关闭弹窗
65   - scrollbar: true,//不现实滚动条
66   - title: false, //不显示标题
67   - content: imgHtml, //捕获的元素，注意：最好该指定的元素要存放在body最外层，否则可能被其它的相对元素所影响
68   - cancel: function () {
69 56  
70   - }
71   - })
72   -
73   - });
74 57  
75 58 return {
76 59 popcf: popcf
... ...
src/main/resources/static/real_control_v2/js/zndd/data_zndd.js
  View file @2736809
1 1 var gb_dataZndd = (function (){
2 2  
3   - var max = 3;
  3 + var max = 1;
4 4 var $pop =$('.multi_plat_msg_pop_zndd');
5 5  
6 6 var codes = {
... ... @@ -22,9 +22,7 @@ var gb_dataZndd = (function (){
22 22 //时间格式化
23 23 data.types = codes[data.type];
24 24  
25   - if (data.type == 'YCSF' && ycsf_sx(data.lineCode) == false){
26   - return
27   - }
  25 +
28 26 if (data.type == 'SFTZ_1' && sf_tz(data.lineCode) == false){
29 27 return
30 28 }
... ... @@ -123,6 +121,7 @@ var gb_dataZndd = (function (){
123 121 alt_confirm(content, function () {
124 122 gb_common.$post('/realSchedule/revokeRealOutgo_zndd', {
125 123 id: that.data('id'),
  124 + remarks :'',
126 125 }, function (rs) {
127 126 gb_schedule_table.updateSchedule(rs.ts);
128 127 notify_succ('撤销实发操作成功！');
... ...
src/main/resources/static/real_control_v2/mapmonitor/fragments/map_infowindow.html
  View file @2736809
... ... @@ -33,6 +33,8 @@
33 33 <p>经度：{{lon}}</p>
34 34 <p>纬度：{{lat}}</p>
35 35  
  36 + <p class="date-str">{{dateStr}}</p>
  37 + <hr>
36 38 {{if kl !=null}}
37 39 <p>人数：{{kl.num}}</p>
38 40 {{/if}}
... ...
src/main/resources/static/real_control_v2/zndd/qjgz/list.html
  View file @2736809
... ... @@ -54,10 +54,10 @@
54 54 <td>{{obj.rq}}</td>
55 55 <td >
56 56 {{if obj.qjType == 0}}
57   - <button class="uk-button" id = "pllbon" data-id="{{obj.id}}"> 批量烂班</button>
58   - <button class="uk-button" id = "hrhc" data-id="{{obj.id}}"> 批量换人换车</button>
59   - <button class="uk-button" id ="lp_change" data-id="{{obj.id}}"> 路牌对调</button>
60   - <button class="uk-button" id ="cxlb" data-id="{{obj.id}}"> 恢复烂班</button>
  57 + <button class="uk-button pllbon" data-id="{{obj.id}}"> 批量烂班</button>
  58 + <button class="uk-button hrhc" data-id="{{obj.id}}"> 批量换人换车</button>
  59 + <button class="uk-button lp_change" data-id="{{obj.id}}"> 路牌对调</button>
  60 + <button class="uk-button cxlb" data-id="{{obj.id}}"> 恢复烂班</button>
61 61 {{else}}
62 62 计划调度 -> 调度执勤日报
63 63 {{/if}}
... ... @@ -117,7 +117,7 @@
117 117 if (resetPagination)
118 118 pagination(rs.totalPages, rs.page);
119 119 //烂班
120   - $("#pllbon").on('click',function(e){
  120 + $(".pllbon").on('click',function(e){
121 121 debugger
122 122 var id = $(this).data('id');
123 123 let datans = returndatas(id,datas);
... ... @@ -130,7 +130,7 @@
130 130  
131 131  
132 132 //换人换车
133   - $("#hrhc").on('click',function(e){
  133 + $(".hrhc").on('click',function(e){
134 134 var id = $(this).data('id');
135 135 let datans = returndatas(id,datas);
136 136 debugger
... ... @@ -142,7 +142,7 @@
142 142  
143 143 })
144 144 //路牌对调
145   - $("#lp_change").on('click',function(e){
  145 + $(".lp_change").on('click',function(e){
146 146 var id = $(this).data('id');
147 147 let datans = returndatas(id,datas);
148 148  
... ... @@ -154,7 +154,7 @@
154 154 });
155 155  
156 156  
157   - $("#cxlb").on('click',function(e){
  157 + $(".cxlb").on('click',function(e){
158 158  
159 159 var id = $(this).data('id');
160 160 let datans = returndatas(id,datas);
... ...
src/main/resources/static/real_control_v2/zndd/type/mz.html
  View file @2736809
... ... @@ -417,7 +417,7 @@
417 417 <div class="uk-form-row">
418 418 <label class="uk-form-label">车辆所在站点</label>
419 419 <div class="uk-form-controls">
420   - <input value="环湖西三路杞青路" disabled>
  420 + <input value="临港大道沪城环路" disabled>
421 421 </div>
422 422 </div>
423 423 </div>
... ... @@ -455,10 +455,10 @@
455 455 <div class="uk-grid">
456 456 <div class="uk-width-4-2">
457 457 <div class="uk-form-row video_1">
458   - <video id="myVideo" style="width: 100%" src="/real_control_v2/zndd/video/a.mp4" controls></video>
  458 + <img id="myVideo" style="width: 100%" src="/real_control_v2/zndd/video/k1.png" controls></img>
459 459 </div>
460 460 <div class="uk-form-row video_2" style="display: none">
461   - <video id="myVideos" style="width: 100%" src="/real_control_v2/zndd/video/b.mp4" controls></video>
  461 + <img id="myVideos" style="width: 100%" src="/real_control_v2/zndd/video/k2.png" controls></img>
462 462 </div>
463 463 </div>
464 464 </div>
... ... @@ -512,15 +512,6 @@
512 512 </div>
513 513 </div>
514 514  
515   - <!-- 表单按钮组件 START -->
516   - <div class="form-actions">
517   - <div class="row">
518   - <div class="col-md-offset-5 col-md-7">
519   - <button type="submit" class="btn green" id="submintBtn"><i class="fa fa-check"></i> 提交</button>
520   - <a type="button" class="btn default" href="list.html" data-pjax><i class="fa fa-times"></i> 取消</a>
521   - </div>
522   - </div>
523   - </div>
524 515 </script>
525 516 <style>
526 517 .fanganys input{
... ...