Commit Graph

1224 Commits

Author SHA1 Message Date
zyy
5c6d3695cb 调整国赛运行图轨迹流程 2020-10-29 10:20:52 +08:00
zyy
4d283fab04 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-28 18:35:08 +08:00
zyy
b76f963a7b 调整国赛运行图流程 2020-10-28 18:34:53 +08:00
lVAL
48d53ad9a5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-28 18:18:29 +08:00
lVAL
fe64262a67 修改AUSTool导出显示运行图错误 2020-10-28 18:18:22 +08:00
fan
3dcf6edde0 国赛皮肤调整 2020-10-28 16:32:45 +08:00
fan
ddf336579b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-28 15:19:17 +08:00
fan
45d8df8897 调整设置备用车位置 2020-10-28 15:18:57 +08:00
lVAL
7fe5e4992b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/api/rpTools.js
#	src/views/planMonitor/editToolAUS/tool/index.vue
2020-10-28 15:04:51 +08:00
lVAL
5f48a7743e 增加AUS线路编辑功能,以及调整增加运行图组后的接口 2020-10-28 15:01:14 +08:00
fan
d6aa7b0c1d 哈尔滨加载备用车 2020-10-28 13:46:20 +08:00
fan
0e2f67e6aa 加载备用车 2020-10-28 13:39:45 +08:00
fan
c660931d92 注释 2020-10-28 11:27:17 +08:00
fan
eb35221c99 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-28 11:11:48 +08:00
fan
e3689773b2 供电线调整 2020-10-28 11:11:37 +08:00
joylink_cuiweidong
433e839e75 Merge remote-tracking branch 'remotes/origin/master' into test 2020-10-28 10:36:18 +08:00
zyy
791e02aaf7 调整接口删除多余配置 2020-10-28 10:22:46 +08:00
fan
9dc3a4528d merge 2020-10-28 10:00:48 +08:00
fan
2509d11baf 代码调整 2020-10-28 10:00:04 +08:00
joylink_cuiweidong
e59ff1f39e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-28 09:35:19 +08:00
joylink_cuiweidong
3d18dbe9ca 删除暂时没用到的文件
解决设置计划车 弹出的对话框 没有初始化的问题
2020-10-28 09:35:02 +08:00
fan
1f955a2190 注释 2020-10-27 18:47:58 +08:00
fan
76bbc56825 哈尔滨报警 2020-10-27 18:43:04 +08:00
fan
85216079e4 理论调整 2020-10-27 17:00:00 +08:00
zyy
fdcbc79e34 成都一号线避免加载错误 2020-10-27 11:22:11 +08:00
joylink_cuiweidong
da1b5f27d1 代码调整 2020-10-26 13:59:17 +08:00
joylink_cuiweidong
f34092741b 竞赛 添加 道岔钩锁指令(非语音指令)
删除不必要文件
2020-10-26 13:51:53 +08:00
lVAL
fa8126ec34 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-26 11:17:53 +08:00
joylink_cuiweidong
4842dca6f4 代码调整 2020-10-26 11:13:37 +08:00
joylink_cuiweidong
b1c2d74d29 代码调整 2020-10-26 11:08:16 +08:00
lVAL
773522b8f0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-26 10:54:00 +08:00
lVAL
6111f07118 优化代码 2020-10-26 10:53:48 +08:00
joylink_cuiweidong
7cccb83a08 竞赛道岔区段添加取消临时限速操作 2020-10-26 10:39:44 +08:00
joylink_cuiweidong
f456e71a95 竞赛操作方式 由北京线路转换为宁波线路 2020-10-26 10:21:11 +08:00
fan
e2dbbb5f0b 删除旧版仿真 2020-10-23 18:05:55 +08:00
fan
c5a4dd68f3 添加设置计划车、设置头码车、设置人工车 2020-10-23 17:23:09 +08:00
lVAL
a32030695a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-23 16:15:51 +08:00
lVAL
5bc8be961d 优化代码 2020-10-23 16:15:39 +08:00
fan
a952ebeafe Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-23 15:13:32 +08:00
fan
2e0c08089c 理论题导入调整&&福州一新版调整&&国赛添加取消限速操作 2020-10-23 15:13:18 +08:00
lVAL
b34e347ab1 修改代码 2020-10-23 09:21:42 +08:00
joylink_cuiweidong
f8e1c29642 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-22 18:30:51 +08:00
joylink_cuiweidong
683f73c005 运行图 展示界面 车次号调整 2020-10-22 18:30:02 +08:00
lVAL
439e9194c6 修改AUSTool功能 2020-10-22 18:20:29 +08:00
lVAL
08e3d6aa90 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-22 16:34:27 +08:00
lVAL
77d83cfaf7 增加,AUSTool施工区域编辑功能 2020-10-22 16:34:15 +08:00
joylink_cuiweidong
7352193df1 代码调整 2020-10-22 14:29:55 +08:00
lVAL
457dd7381a 修改AUSTool 2020-10-22 10:28:38 +08:00
lVAL
c1050d16ab 修改AUSTool 功能 2020-10-21 18:36:52 +08:00
lVAL
50426cbb7a 修改AUSTool的功能 2020-10-20 17:47:47 +08:00
lVAL
c37bec7fa4 修改AUSTool 拖动车次的问题 2020-10-20 17:33:43 +08:00
lVAL
2fadaade87 增加车次号标签 2020-10-20 17:22:15 +08:00
lVAL
d3ea1cd22e 增加AUSTool绘制区域功能 2020-10-20 15:38:26 +08:00
lVAL
ef7a30fe3c 修改AUS运行图编辑工具 2020-10-20 11:12:48 +08:00
lVAL
dc7a5ab749 增加运行图编辑的功能 2020-10-19 18:39:19 +08:00
lVAL
58c7914e8b 修改激活不灵活的问题 2020-10-16 13:57:33 +08:00
lVAL
541a1cabe4 增加绘图新建功能 2020-10-16 13:07:31 +08:00
fan
330ae450f9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-16 11:25:19 +08:00
fan
ed6651cc4c 触发故障菜单 2020-10-16 11:25:07 +08:00
lVAL
bbe9ca1e28 修改运行图操作 2020-10-16 10:50:07 +08:00
ival
891ff8362a AUS运行编辑功能完善 2020-10-15 22:57:06 +08:00
lVAL
df1fcc8f82 修改代码 2020-10-15 18:53:45 +08:00
lVAL
80fb7641ae 增加AUS运行图工具的代码 2020-10-15 16:05:30 +08:00
lVAL
0010d78570 增加澳大利亚运行图编辑功能 2020-10-14 18:50:03 +08:00
fan
b7a423fe4f baseUrl 2020-10-13 13:07:25 +08:00
fan
05740d7d57 方向杆问题调整 2020-10-13 09:36:48 +08:00
fan
fd00154f0c 宁波一取消临时限速 2020-10-12 18:53:04 +08:00
fan
44d1a8459b 触发故障调整 2020-10-12 17:55:57 +08:00
fan
d99738c85e 方向杆调整 2020-10-12 17:23:49 +08:00
fan
a790971fb3 故障触发问题调整 2020-10-12 16:47:43 +08:00
fan
f1106541ae 故障触发问题调整&方向杆 2020-10-12 16:21:24 +08:00
fan
4882234ccd 触发故障调整 2020-10-12 14:25:33 +08:00
fan
e2d27b49c7 方向杆问题调整 2020-10-10 17:58:14 +08:00
joylink_cuiweidong
c701ca11b2 哈尔滨一号线 行调仿真添加道岔的解封和单解操作 2020-10-09 11:30:57 +08:00
joylink_cuiweidong
fc00a6c56f 哈尔滨线路 引导进路命令代码调整 2020-09-30 10:16:15 +08:00
zyy
118f95efc4 调整ibp 触摸板 2020-09-27 13:41:25 +08:00
joylink_cuiweidong
c1e1409119 宁波一号线 实训操作定义调整 2020-09-25 16:03:43 +08:00
joylink_cuiweidong
69e935f559 宁波线进路 实训定义代码调整 2020-09-25 15:23:23 +08:00
zyy
fdaf3eaa1e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-15 17:41:10 +08:00
zyy
4b2939ff0a 调整区段配置 2020-09-15 17:40:57 +08:00
fan
b7a02f45c1 宁波三菜单 2020-09-14 18:34:56 +08:00
fan
40b12de294 会话调整 2020-09-11 17:57:48 +08:00
fan
2875444ed7 会话调整 2020-09-11 15:52:15 +08:00
fan
03d4a28ab6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-09 17:42:10 +08:00
fan
281bbc32f8 宁波三菜单调整&表单记录页数 2020-09-09 17:41:51 +08:00
fan
06ecb8dd1a 宁波三菜单调整 2020-09-09 14:45:38 +08:00
zyy
d6fba202b4 字段调整 2020-09-09 14:35:48 +08:00
zyy
d01f367e73 调整右键操作显示 2020-09-09 13:25:34 +08:00
zyy
83b1d16773 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-09 09:40:01 +08:00
zyy
fa70285ef9 调整西安二号线列车右键操作栏 2020-09-09 09:39:23 +08:00
fan
5ceaaed517 调整加载动画 2020-09-08 16:57:48 +08:00
fan
9d42aac8fa 调整宁波三菜单&调整加载动画 2020-09-08 16:41:38 +08:00
fan
cbb00efdcb 一键生成课程、试卷响应调整 2020-09-08 15:29:45 +08:00
fan
ebcc73cb2d 宁波三号线菜单调整&增加一键生成课程、试卷 2020-09-08 14:14:20 +08:00
fan
fadcb630ab 宁波三号线菜单调整&宁波分割符调整&教学系统班级显示调整 2020-09-08 09:49:49 +08:00
zyy
7f07fe898b 调整发送指令参数 2020-09-07 14:17:41 +08:00
zyy
7f434b2828 调整西安二号线列车右键显示 2020-09-07 14:04:44 +08:00
zyy
518bf2eeac 调整西安二号线右键操作 2020-09-07 13:17:11 +08:00
zyy
18c74bb3ca Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-07 11:28:25 +08:00
zyy
bb3b202eb1 调整西安二号线列车操作 2020-09-07 11:28:12 +08:00
fan
4f1a2f03cb 哈尔滨盈达科技项目页添加 2020-09-07 11:08:26 +08:00
fan
5af9956f5b 佛山修改列车识别好调整 2020-09-04 17:57:37 +08:00
fan
dc085df977 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-04 17:21:46 +08:00
fan
f33fb7ee91 绘图数据处理调整&佛山修改列车识别好调整 2020-09-04 17:21:34 +08:00
joylink_cuiweidong
d328a11569 西安三号线 福州一号线新版 地图配置文件调整 2020-09-04 10:38:36 +08:00
joylink_cuiweidong
b6c39918e0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-03 18:17:40 +08:00
joylink_cuiweidong
679d714b29 道岔绘图代码调整 2020-09-03 18:17:15 +08:00
fan
890fc5f851 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-03 14:44:28 +08:00
fan
5f0b8a05ac 运行图流程调整 2020-09-03 14:44:16 +08:00
zyy
ab538b9bb2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/jmapNew/theme/ningbo_03/menus/menuBar.vue
2020-09-03 14:22:44 +08:00
zyy
31eb1f8446 调整目的码接口 2020-09-03 14:17:52 +08:00
joylink_cuiweidong
9a2e007d3f 福州一号线新版 扣车样式调整 站台操作调整 2020-09-03 11:14:51 +08:00
joylink_cuiweidong
7044642105 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-02 18:41:09 +08:00
joylink_cuiweidong
2ed40ee117 宁波一号线实训操作代码调整 2020-09-02 18:40:51 +08:00
fan
d40491fb41 merge 2020-09-02 18:06:48 +08:00
fan
3445f98618 宁波三号线菜单调整 2020-09-02 18:02:50 +08:00
zyy
69388e4f91 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-02 17:11:23 +08:00
zyy
efcd46cf37 增加宁波三区段样式,增加目的码表单 2020-09-02 17:11:06 +08:00
joylink_cuiweidong
647897b2c4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-02 14:33:58 +08:00
joylink_cuiweidong
2010edad72 宁波一号线站台设置停站时间操作代码调整 2020-09-02 14:33:41 +08:00
fan
910517e076 剧本调整 2020-09-02 10:59:04 +08:00
fan
5f04b0e25b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-02 10:18:28 +08:00
fan
dda0a719ba 宁波三菜单调整 2020-09-02 10:17:58 +08:00
joylink_cuiweidong
61d9f294d8 哈尔滨线路代码调整 2020-09-02 10:15:50 +08:00
fan
86c1dff4be Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-02 09:17:50 +08:00
fan
ecbb6a964f 接收重置仿真信息时清除活动列车 2020-09-02 09:17:27 +08:00
zyy
c93cff772d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-01 18:09:38 +08:00
zyy
a3489f0942 调整区段显示及优化 2020-09-01 18:09:25 +08:00
fan
a5cbbcb3af Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-01 17:11:24 +08:00
fan
fcd2c41517 成员司机排序&福州新版折返策略教学调整 2020-09-01 17:11:09 +08:00
joylink_cuiweidong
bcc92b6672 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-01 16:45:39 +08:00
joylink_cuiweidong
8a4d98612e 哈尔滨线路实训代码调整 2020-09-01 16:45:23 +08:00
zyy
57cb96eb48 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/views/newMap/mapsystemNew/common/index.vue
2020-09-01 15:11:59 +08:00
zyy
5590e43bd5 调整代码 2020-09-01 15:10:35 +08:00
joylink_cuiweidong
c76205790a 宁波一号线实训操作代码调整 2020-08-31 15:58:55 +08:00
fan
246568175f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-31 13:28:32 +08:00
fan
c44a081afa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-31 13:27:38 +08:00
fan
8c07cf764a 代码调整 2020-08-31 13:27:27 +08:00
zyy
41fe728af4 调整运行图显示 2020-08-31 13:25:26 +08:00
joylink_cuiweidong
2637b952f3 代码调整 2020-08-31 10:31:36 +08:00
joylink_cuiweidong
b98039d5fd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-31 10:13:39 +08:00
joylink_cuiweidong
8027bc90ae 宁波福州佛山默认不显示道岔区段的名称调整 2020-08-31 10:13:26 +08:00
zyy
778387a0e9 调整扣车流程, 状态 2020-08-31 10:11:02 +08:00
zyy
ae02d527c9 调整福州线路新版操作 2020-08-28 17:47:17 +08:00
zyy
5dcfee72d6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-28 17:22:26 +08:00
zyy
adb62a3209 增加列车右键操作,调整配置 2020-08-28 17:22:12 +08:00
fan
ba505a899e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-28 16:58:33 +08:00
fan
a28f7a3975 调度大赛调整 2020-08-28 16:58:17 +08:00
joylink_cuiweidong
d5dabca2c6 代码调整
区段(parentCode)字段处理
2020-08-28 16:52:19 +08:00
joylink_cuiweidong
b4c5a29026 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-28 14:43:47 +08:00