joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity
8,144 Commits 20 Branches 0 Tags 448 MiB
a52c9786c1
Commit Graph

5244 Commits

Author SHA1 Message Date
lVAL
f492750443 修改 替换背景 屏蔽范围 2020-11-04 16:17:01 +08:00
joylink_cuiweidong
d7c8619243 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-04 16:14:58 +08:00
joylink_cuiweidong
8ff03944ce 哈尔滨教学实训代码调整 2020-11-04 16:14:41 +08:00
zyy
94c141dbbc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-04 15:32:41 +08:00
zyy
096b681c35 调整剧本内容样式 2020-11-04 15:32:28 +08:00
fan
62dddae1e5 剧本条件调整 2020-11-04 14:54:12 +08:00
fan
06c252cd58 merge 2020-11-04 14:51:54 +08:00
fan
6993ad8d8e 剧本条件 2020-11-04 14:48:36 +08:00
lVAL
872a71c7b5 增加 替换背景的操作 2020-11-04 14:42:48 +08:00
joylink_cuiweidong
ad572fdcc9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-04 10:47:15 +08:00
joylink_cuiweidong
0f3c1e9ab8 运行图代码调整 2020-11-04 10:46:55 +08:00
sunzhenyu
2c1b9fcc45 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-04 10:34:43 +08:00
sunzhenyu
23b98c7c46 增加客流规划界面 2020-11-04 10:34:33 +08:00
fan
8158eb7773 剧本条件暂提 2020-11-04 10:18:29 +08:00
zyy
109511d02b 调整报警窗口样式逻辑 2020-11-04 10:14:54 +08:00
fan
09e5cac7b0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-04 09:26:39 +08:00
fan
55dda9ca10 添加停车场信号楼角色 2020-11-04 09:26:22 +08:00
joylink_cuiweidong
b312371a64 绘图---车站---按图折返字段删除 
绘图---区段---公里标字段删除
 2020-11-04 09:19:13 +08:00
joylink_cuiweidong
e8ee2efc50 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-03 19:02:18 +08:00
joylink_cuiweidong
9aeb3d295c 剧本代码调整 2020-11-03 19:02:02 +08:00
fan
a1be6dbfb9 暂提 2020-11-03 18:52:33 +08:00
zyy
76bb7b1e65 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-03 18:48:11 +08:00
zyy
6684ffd729 调整综合监控故障流程显示 2020-11-03 18:48:02 +08:00
fan
13913841de Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-03 18:24:00 +08:00
fan
0603e45a07 设置头码车调整参数 2020-11-03 18:23:30 +08:00
joylink_cuiweidong
5bf5c3bac3 代码调整 2020-11-03 17:13:49 +08:00
joylink_cuiweidong
b9f71f75d9 添加剧本删除动作接口 
修改剧本编制样式
 2020-11-03 16:37:47 +08:00
joylink_cuiweidong
8ad829cf24 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-03 16:06:50 +08:00
joylink_cuiweidong
6fbfa0dc1a 各线路站台配置文件扣车参数调整 
哈尔滨线路 站台 添加 扣车/越站 设置按钮
竞赛实操 场景排序
竞赛页面 添加场景11 操作按钮
 2020-11-03 16:06:11 +08:00
fan
ffbd8a06f8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-03 14:06:41 +08:00
fan
4e0b6dc7e6 取消实训考试重置默认状态 2020-11-03 14:06:30 +08:00
zyy
f08640c546 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-03 13:54:37 +08:00
zyy
85fee71570 删除打印 2020-11-03 13:54:26 +08:00
fan
a30f73a0ec Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-03 13:39:36 +08:00
fan
dcd0607973 北交大项目登录 2020-11-03 13:39:14 +08:00
zyy
5c6ce655d6 增加了报警声音 2020-11-03 13:21:56 +08:00
zyy
6eefe21444 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-03 10:30:43 +08:00
zyy
333c8b2c86 调整福州综合监控故障设置 2020-11-03 10:30:26 +08:00
fan
ccabd4a729 实训问题调整 2020-11-02 19:08:04 +08:00
fan
6ba55206cb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-02 16:32:19 +08:00
fan
96ecadce56 实训问题调整 2020-11-02 16:32:08 +08:00
joylink_cuiweidong
50ffb22566 考试系统 教学系统 试题提示栏 拖拽样式调整 2020-11-02 16:12:10 +08:00
joylink_cuiweidong
9f95af633a 代码调整 2020-11-02 10:01:24 +08:00
zyy
eddaf7635a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-30 18:17:12 +08:00
zyy
be8a5f7768 推出场景清空信息 2020-10-30 18:16:40 +08:00
sunzhenyu
744a990097 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-30 18:09:32 +08:00
sunzhenyu
6ca823e7e8 增加三维编辑器区段修改功能，增加三维代码注释，剔除旧数据相关三维内容 2020-10-30 18:09:24 +08:00
joylink_cuiweidong
f749e4fc2a 竞赛代码调整 2020-10-30 16:04:32 +08:00
joylink_cuiweidong
0bac44bba7 竞赛代码调整 2020-10-30 15:52:23 +08:00
joylink_cuiweidong
7dbe32237d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-30 15:36:53 +08:00
joylink_cuiweidong
12f08768da 代码调整 2020-10-30 15:36:39 +08:00
zyy
dfbca08c80 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-30 15:26:54 +08:00
zyy
04ec59780b 增加语音聊天当前播放提示 2020-10-30 15:26:31 +08:00
joylink_cuiweidong
06b0360aa1 剧本编制代码调整 2020-10-30 15:06:05 +08:00
joylink_cuiweidong
c8493d3833 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-30 11:25:02 +08:00
joylink_cuiweidong
7665c3a97d 剧本编制代码调整 
仿真 剧本 会话 综合演练 添加 电力调度角色
 2020-10-30 11:24:42 +08:00
lVAL
1adc1101fe Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-30 11:13:24 +08:00
lVAL
1af1e3bd6f 修改AUSTool 编辑区域后，删除bug。 
修改AUSTool 删除计划组，没有group的错误
 2020-10-30 11:12:06 +08:00
zyy
62d8e4d4d6 删除延续保护生成code 2020-10-30 10:59:11 +08:00
zyy
80574fe22e 调整地图延续保护 2020-10-30 10:37:53 +08:00
zyy
b8c320fa5a Merge branch 'test-runPlan' into test 
# Conflicts:
#	src/jmapNew/theme/fuzhou_01/planConvert.js
 2020-10-30 10:30:30 +08:00
fan
3341f5475c 问题调整 2020-10-30 10:23:11 +08:00
fan
a2c93dfd54 问题调整 2020-10-30 10:09:19 +08:00
fan
a402b72bb3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-30 09:56:32 +08:00
fan
05a56d395b 个人信息展示单位&其他问题修复 2020-10-30 09:56:19 +08:00
joylink_cuiweidong
0cee63e90e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-29 18:49:29 +08:00
joylink_cuiweidong
7c865e969b 场景编制代码调整 2020-10-29 18:48:59 +08:00
zyy
860b00e9b3 调整地图绘制流程 2020-10-29 18:33:35 +08:00
zyy
d5230997cc Merge branch 'test' into test-runPlan 2020-10-29 18:22:13 +08:00
joylink_cuiweidong
08b9f2bde0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-29 18:13:33 +08:00
joylink_cuiweidong
286f0b314e 场景编制代码调整 2020-10-29 18:12:42 +08:00
fan
44075c2aa6 添加出题规则调整 2020-10-29 17:42:18 +08:00
fan
2cdf993df4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-29 17:35:04 +08:00
fan
15bd1d0255 添加出题规则调整 2020-10-29 17:34:56 +08:00
lVAL
40bf0d2d89 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-29 17:13:49 +08:00
lVAL
0e0f76e8cb 修改x轴移动时不流畅的问题 2020-10-29 17:13:37 +08:00
fan
5135b8aee1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-29 17:09:13 +08:00
fan
78ef4a7b8d 理论调整 2020-10-29 17:09:03 +08:00
lVAL
2723ea6bd7 修改字母大小写 2020-10-29 16:59:32 +08:00
lVAL
8b582e2a71 修改AUSTool默认时间范围 2020-10-29 16:54:07 +08:00
lVAL
fcdf632123 修改AUSTool边缘移动Area的bug 2020-10-29 16:22:20 +08:00
lVAL
2109641365 优化拖动的问题 2020-10-29 15:49:01 +08:00
lVAL
6071649e9b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-29 14:38:04 +08:00
lVAL
be9c54ee34 修改AUSTool的bug 2020-10-29 14:37:51 +08:00
joylink_cuiweidong
5496a66694 线路配置 添加 ATS是否自动处理人工设置的站前折返自动更新车次 参数 2020-10-29 14:25:54 +08:00
joylink_cuiweidong
f99e1d6c51 代码调整 2020-10-29 13:08:11 +08:00
zyy
959d2ba999 调整剧本编制选中样式 2020-10-29 11:18:47 +08:00
zyy
74be1ba604 调整运行图加载 2020-10-29 11:07:55 +08:00
joylink_cuiweidong
acedcb1676 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-29 10:45:52 +08:00
joylink_cuiweidong
01045f914e 代码调整 2020-10-29 10:45:35 +08:00
fan
237b8ef4d8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-29 10:02:31 +08:00
fan
4709074825 调整供电线 2020-10-29 10:02:21 +08:00
joylink_cuiweidong
859ffdaaff Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-29 09:42:14 +08:00
joylink_cuiweidong
54b6095b5a 代码调整 2020-10-29 09:41:56 +08:00
lVAL
6b688c4dc3 优化代码 2020-10-29 09:06:58 +08:00
lVAL
13416a06a1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-29 09:02:16 +08:00
lVAL
9f9ba1d554 优化代码样式 2020-10-29 09:02:07 +08:00
fan
a89891d274 理论调整 2020-10-28 18:43:49 +08:00
fan
36d6a7d81c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-28 18:19:46 +08:00
fan
583af97620 供电线添加元素 2020-10-28 18:18:34 +08:00
lVAL
0d673deab1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-28 18:04:48 +08:00
lVAL
11b23996eb 修改样式 2020-10-28 18:04:38 +08:00
joylink_cuiweidong
a60a2461d5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-28 17:54:43 +08:00
joylink_cuiweidong
897e434201 代码调整 2020-10-28 17:54:06 +08:00
lVAL
367d447d8e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-28 17:43:53 +08:00
lVAL
57c5862ab0 增加AUSTool 只读和编辑功能，以及修改部分操作BUG 2020-10-28 17:43:44 +08:00
zyy
0084c4687e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-28 16:15:08 +08:00
zyy
6124f6c38a 删除多余配置 2020-10-28 16:14:57 +08:00
joylink_cuiweidong
cdb56ef33b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/api/competition.js
 2020-10-28 15:56:23 +08:00
joylink_cuiweidong
2cdcdae4d9 剧本导入 场景导入代码调整 2020-10-28 15:53: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
1f4d592b9f merge 2020-10-28 14:41:47 +08:00
fan
e3b4c65811 问题调整 2020-10-28 14:38:37 +08:00
zyy
12e84a6a49 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/api/project.js
 2020-10-28 13:52:36 +08:00
zyy
316249fbd6 调整多余配置路径 2020-10-28 13:51:26 +08:00
fan
6e6fe4af49 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-28 13:39:55 +08:00
fan
0e2f67e6aa 加载备用车 2020-10-28 13:39:45 +08:00
joylink_cuiweidong
3003a5eb2a 代码调整 2020-10-28 13:05:13 +08:00
fan
93e927c39f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-28 11:14:55 +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
zyy
fff4a5fd69 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-28 11:09:24 +08:00
zyy
081f5a6566 调整综合监控问题 2020-10-28 11:09:12 +08:00
joylink_cuiweidong
433e839e75 Merge remote-tracking branch 'remotes/origin/master' into test 2020-10-28 10:36:18 +08:00
joylink_cuiweidong
6451eb7815 代码调整 2020-10-28 10:33:23 +08:00
zyy
791e02aaf7 调整接口删除多余配置 2020-10-28 10:22:46 +08:00
joylink_cuiweidong
0577561295 代码调整 2020-10-28 10:10:46 +08:00
joylink_cuiweidong
3d0acacdd8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-28 10:08:34 +08:00
joylink_cuiweidong
437a6600cd 删除无用的接口 2020-10-28 10:08:18 +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
509d43c834 竞赛 运营统计数据弹窗 初始化问题调整 2020-10-28 09:45: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
zyy
2babec750f 调整综合监控故障流程 2020-10-28 09:18:46 +08:00
zyy
e025087171 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-27 18:42:31 +08:00
zyy
7882c1ed7f 删除多余接口 2020-10-27 18:42:18 +08:00
joylink_cuiweidong
940c4cb2e3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-27 18:37:44 +08:00
joylink_cuiweidong
cc9ab37dd0 竞赛场景导入功能添加 2020-10-27 18:37:28 +08:00
lVAL
1efa433841 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/permission.js
 2020-10-27 18:34:05 +08:00
lVAL
f9bab3da35 增加AUSline页面 2020-10-27 18:32:54 +08:00
zyy
285f2e2807 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-27 18:04:35 +08:00
zyy
aebf120bd8 调整状态删除无用接口 2020-10-27 18:04:19 +08:00
joylink_cuiweidong
d9415d81be Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-27 17:59:32 +08:00
joylink_cuiweidong
9b988f318f 草稿剧本 导入导出功能添加 
竞赛场景导出功能添加
 2020-10-27 17:57:59 +08:00
lVAL
469c99320e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-27 17:00:40 +08:00
fan
23a92119bc merge 2020-10-27 17:01:19 +08:00
lVAL
519b7903ee 调整 导出的时间间隔 2020-10-27 17:00:30 +08:00
fan
85216079e4 理论调整 2020-10-27 17:00:00 +08:00
zyy
03845f3ed8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/utils/baseUrl.js
 2020-10-27 16:52:51 +08:00
zyy
e9e0d39bfc 调整状态多余代码 2020-10-27 16:51:57 +08:00
lVAL
68ae07676c 修改代码 2020-10-27 16:36:09 +08:00
lVAL
b55e6e6d76 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/utils/baseUrl.js
 2020-10-27 16:33:17 +08:00
lVAL
7e438dbf1f 增加运行图导出功能 2020-10-27 16:31:58 +08:00
joylink_cuiweidong
405915c56f 接口文件整理 2020-10-27 16:23:37 +08:00
fan
e0ab1506da 处理数据调整 2020-10-27 13:19:31 +08:00
fan
66aaa9f201 理论题管理调整 2020-10-27 12:14:17 +08:00
fan
02f5652141 理论题管理调整 2020-10-27 11:01:22 +08:00
fan
92eaa499ba Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-27 10:44:06 +08:00
fan
0a6852fb27 理论题管理调整 2020-10-27 10:43:55 +08:00
joylink_cuiweidong
3ac4945d71 代码调整 2020-10-26 18:41:10 +08:00
joylink_cuiweidong
36b8dbbdb8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-26 17:50:53 +08:00
joylink_cuiweidong
4c185346cd 代码调整 2020-10-26 17:50:35 +08:00
lVAL
480f4daa1c 修改AUSTool删除提示为英文 2020-10-26 17:14:32 +08:00
lVAL
f505de9795 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-26 17:11:24 +08:00
lVAL
baea2091ed 恢复AUSTool坐标转换限制 2020-10-26 17:11:17 +08:00
zyy
432c0d5206 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-26 17:05:30 +08:00
zyy
a55c67c721 调整国赛菜单 2020-10-26 17:05:04 +08:00
lVAL
ffab228863 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-26 17:04:29 +08:00
lVAL
17ec2297a9 优化 施工区域拖动 跳动的问题 2020-10-26 17:04:19 +08:00
zyy
bdb8e5d854 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-26 16:03:18 +08:00
zyy
ed32515215 调整综合监控流程 2020-10-26 16:03:06 +08:00
joylink_cuiweidong
b0eefffae0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-26 15:54:27 +08:00
joylink_cuiweidong
14b78b57d6 竞赛会话代码调整 2020-10-26 15:54:08 +08:00
sunzhenyu
d0e495bdad merge 2020-10-26 15:29:16 +08:00
sunzhenyu
65d5aaf3aa 修复三维通号图片资源bug，剔除旧仿真相关三维内容，剔除无用三维资源 2020-10-26 15:26:51 +08:00
zyy
cc76f4aaa6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/map.js
 2020-10-26 15:25:59 +08:00
zyy
cdf91f98d2 调整综合监控流程 2020-10-26 15:24:08 +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
lVAL
1bea58747a 优化代码 2020-10-26 11:17:45 +08:00
fan
e5b79263bf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-26 11:10:08 +08:00
fan
1a6835c3cf merge 2020-10-26 11:09:48 +08:00
fan
7e91cb2b3c 删除旧版地图drawWay参数使用 2020-10-26 11:07:49 +08:00
zyy
9cbb5246d2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-26 11:06:13 +08:00
zyy
98c4d1e2b8 调整国赛列车显示 2020-10-26 11:05:36 +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
45190c3b6f 删除无用的文件 2020-10-26 10:51:14 +08:00
joylink_cuiweidong
620d73bf54 删除旧版个人地图文件 2020-10-26 10:00:35 +08:00
sunzhenyu
9c5cc2e9ac Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-26 09:15:28 +08:00
joylink_cuiweidong
c14814890f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-23 18:41:56 +08:00
joylink_cuiweidong
4fa37b7c60 竞赛场景列表代码调整 2020-10-23 18:40:24 +08:00
lVAL
74ebd8153e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-23 18:11:30 +08:00
lVAL
8869608082 修改配置参数 2020-10-23 18:11:19 +08:00
sunzhenyu
85a1546535 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-23 18:07:26 +08:00
sunzhenyu
83e99df71e 修改三维cctv注释 2020-10-23 18:06:24 +08:00
fan
4f0f85c60c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-23 18:06:05 +08:00
fan
e2dbbb5f0b 删除旧版仿真 2020-10-23 18:05:55 +08:00
lVAL
d345e5dcc2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-23 17:54:32 +08:00
lVAL
a7764ce7c4 修改代码 2020-10-23 17:54:16 +08:00
joylink_cuiweidong
dbf50b4324 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-23 17:49:24 +08:00
joylink_cuiweidong
35df9b43ec 剧本编制代码调整 
会话代码调整
 2020-10-23 17:48:40 +08:00
lVAL
0516f856ef 优化代码 2020-10-23 17:48:31 +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
zyy
e9a5039c43 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-23 15:09:33 +08:00
zyy
c3d3adbc3e 调整福州综合监控逻辑 2020-10-23 15:09:20 +08:00
lVAL
a870debe70 优化拖动的问题 2020-10-23 10:15:36 +08:00
lVAL
b34e347ab1 修改代码 2020-10-23 09:21:42 +08:00
lVAL
6489d67e67 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-23 09:03:14 +08:00
lVAL
b49c1c29d1 修改运行时间校验错误的问题 2020-10-23 09:03:05 +08:00
zyy
f9d38a4efc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-22 18:33:51 +08:00
zyy
1163d9def9 调整新建地图流程 2020-10-22 18:33:28 +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
fdeaabb699 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-22 18:20:40 +08:00
lVAL
439e9194c6 修改AUSTool功能 2020-10-22 18:20:29 +08:00
joylink_cuiweidong
50620f9447 代码调整 2020-10-22 17:34:49 +08:00
joylink_cuiweidong
9af669f708 运行图绘制代码调整 2020-10-22 17:30:56 +08:00
lVAL
a7011888b4 修改文件大小写 2020-10-22 16:49:58 +08:00
lVAL
5184721b62 删除错误带小写文件 2020-10-22 16:49: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
fan
90390462a2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-22 16:26:15 +08:00
fan
700a37d312 国赛皮肤调整&接触网调整 2020-10-22 16:26:03 +08:00
sunzhenyu
9e93958224 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-22 15:22:53 +08:00
sunzhenyu
5e4f341ff9 修改三维cctv代码结构，剔除不必要代码，优化判断 2020-10-22 15:22:40 +08:00
joylink_cuiweidong
6c32b53fb4 Merge remote-tracking branch 'remotes/origin/test_runplan' into test 
# Conflicts:
#	src/router/index_Common.js
 2020-10-22 13:49:35 +08:00
joylink_cuiweidong
c7d99e7913 运行图编辑代码调整 2020-10-22 13:34:08 +08:00
zyy
415486c815 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-22 13:03:40 +08:00
zyy
8053b51e24 增加iscs事件弹窗 2020-10-22 13:03:26 +08:00
lVAL
ba6e29943b 增加修改折返时间的功能 2020-10-22 11:13:29 +08:00
lVAL
f749a9bfdb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-22 10:28:50 +08:00
lVAL
457dd7381a 修改AUSTool 2020-10-22 10:28:38 +08:00
joylink_cuiweidong
3d1c5dacd4 运行图 增加任务 添加了 起始终到车站的筛选 2020-10-22 09:53:29 +08:00
fan
883a6b88df Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-22 09:45:57 +08:00
fan
94e626ce49 理论题调整 2020-10-22 09:45:33 +08:00
joylink_cuiweidong
4eb69d03a6 运行图代码调整 2020-10-21 18:40:02 +08:00
lVAL
c1050d16ab 修改AUSTool 功能 2020-10-21 18:36:52 +08:00
joylink_cuiweidong
c684dd5149 运行图代码调整 2020-10-21 17:39:52 +08:00
joylink_cuiweidong
8fd587ac13 运行图代码调整 2020-10-21 17:19:47 +08:00
joylink_cuiweidong
14f54eeb85 运行图代码调整 2020-10-21 16:12:19 +08:00
joylink_cuiweidong
103c306313 运行图代码调整 2020-10-21 15:16:30 +08:00
joylink_cuiweidong
cc196d9696 运行图添加 修改计划号 和 修改任务车次号 2020-10-21 14:03:25 +08:00
joylink_cuiweidong
181a1491da 运行图代码调整 2020-10-21 11:07:10 +08:00
lVAL
599e092c57 提交代码 2020-10-21 09:17:28 +08:00
joylink_cuiweidong
ab4f13d5f0 运行图代码调整 2020-10-20 20:25:45 +08:00
lVAL
703d637126 增加点击空白取消选中状态 2020-10-20 18:41:27 +08:00
lVAL
306af6fb6d 删除创建车次时间小于2min不让创建的代码 2020-10-20 18:31:21 +08:00
lVAL
c66ec45d9b 修改数据点选中状态的尺寸 2020-10-20 18:21:28 +08:00
lVAL
4ea3b3b9e4 修改“取消删除”为英文 2020-10-20 18:16:30 +08:00
joylink_cuiweidong
9783691cf2 代码调整 2020-10-20 18:10:26 +08:00
lVAL
16c443eb0c 优化标记不准的问题 2020-10-20 18:05:06 +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
a1604ed5a2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-20 17:22:27 +08:00
lVAL
2fadaade87 增加车次号标签 2020-10-20 17:22:15 +08:00
joylink_cuiweidong
fe0e1c3e32 运行图编制工具代码调整 2020-10-20 17:21:02 +08:00
fan
4265ed0092 设备管理配置调整 2020-10-20 17:16:41 +08:00
fan
d74575bfb9 设备管理配置调整 2020-10-20 16:57:41 +08:00
fan
06a06a26d9 merge 2020-10-20 16:49:35 +08:00
fan
ceef20681f 理论题调整&设备管理调整&聊天室问题调整 2020-10-20 16:48:28 +08:00
lVAL
d3ea1cd22e 增加AUSTool绘制区域功能 2020-10-20 15:38:26 +08:00
lVAL
bdeb030276 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-20 11:13:03 +08:00
lVAL
ef7a30fe3c 修改AUS运行图编辑工具 2020-10-20 11:12:48 +08:00
joylink_cuiweidong
0af48e7887 竞赛 实操 自动播放代码调整 2020-10-20 11:06:41 +08:00
joylink_cuiweidong
5ff38125a2 代码调整 2020-10-20 09:10:53 +08:00
joylink_cuiweidong
2f3be6bb18 运行图 服务号两位校验变成2~3位 
运行图 增加任务 停战时间事件代码调整
修改任务代码调整
 2020-10-19 18:41:15 +08:00
lVAL
8858cac72a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-19 18:39:45 +08:00
lVAL
dc7a5ab749 增加运行图编辑的功能 2020-10-19 18:39:19 +08:00
joylink_cuiweidong
7e94880364 运行图代码调整 2020-10-19 15:08:30 +08:00
joylink_cuiweidong
6b65c641a7 运行图代码调整 2020-10-19 10:25:36 +08:00
joylink_cuiweidong
9f7e37393b 新版运行图代码调整 2020-10-19 10:10:29 +08:00
zyy
12006ca195 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-16 19:06:36 +08:00
fan
528fda2c15 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test11 2020-10-16 19:08:01 +08:00
fan
faa66eac29 修改剧本提示位置 2020-10-16 19:07:44 +08:00
zyy
f161c32156 增加license验证 2020-10-16 19:06:24 +08:00
joylink_cuiweidong
913b1c9b71 新版运行图代码调整（未完成） 2020-10-16 19:04:44 +08:00
lVAL
d52be005fb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-16 17:41:38 +08:00
lVAL
4330fa46b3 增加停站时间，以及运行时间校验 2020-10-16 17:41:20 +08:00
joylink_cuiweidong
cbb43ad06a 竞赛实操结果页面代码调整 2020-10-16 17:38:03 +08:00
joylink_cuiweidong
343d68ce29 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-16 17:28:39 +08:00
joylink_cuiweidong
ed46bb20a6 竞赛实操结果页面代码调整 2020-10-16 17:28:06 +08:00
lVAL
7d7240e511 修改项目名称 2020-10-16 15:40:04 +08:00
lVAL
eb9778e4f8 优化AUS 平移问题 2020-10-16 15:08:41 +08:00
lVAL
15f6a3a9b6 优化代码 2020-10-16 14:54:55 +08:00
lVAL
e1b00802f3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-16 14:47:23 +08:00
lVAL
ba3104d9e9 优化 平移状态下 可以tips 2020-10-16 14:47:14 +08:00
sunzhenyu
989a3ee791 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-16 14:13:35 +08:00
sunzhenyu
b8559195d2 修改三维cctv选择车站样式 2020-10-16 14:13:24 +08:00
joylink_cuiweidong
b79c68139b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-16 14:10:39 +08:00
joylink_cuiweidong
f4790fedd5 竞赛实操结果页面代码调整 2020-10-16 14:10:20 +08:00
lVAL
58c7914e8b 修改激活不灵活的问题 2020-10-16 13:57:33 +08:00
lVAL
3122c680e4 修改函数名称 2020-10-16 13:10:04 +08:00
lVAL
541a1cabe4 增加绘图新建功能 2020-10-16 13:07:31 +08:00
lVAL
3210c0feb6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-16 11:26:22 +08:00
lVAL
b4f0dd90cf 修改AUS运行图bug 2020-10-16 11:26:09 +08:00
zyy
297bb88d91 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-16 11:07:59 +08:00
zyy
a5d3b9b008 调整综合监控流程 2020-10-16 11:07:44 +08:00
joylink_cuiweidong
f25c52b36d 竞赛实操结果页面代码调整 2020-10-16 10:57:33 +08:00
lVAL
4aec3917de 修改页面 Plan为Add 计划为Plan 2020-10-16 10:54:47 +08:00
joylink_cuiweidong
f9356747b6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-16 10:52:08 +08:00
joylink_cuiweidong
dad592e155 竞赛实操结果页面代码调整 2020-10-16 10:51:45 +08:00
lVAL
56482db23f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-16 10:50:24 +08:00
lVAL
bbe9ca1e28 修改运行图操作 2020-10-16 10:50:07 +08:00
joylink_cuiweidong
edcb1a4ab7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-16 09:51:40 +08:00
joylink_cuiweidong
68dd6923e3 竞赛场景结束页面代码调整 2020-10-16 09:51:22 +08:00
lVAL
4bff618aee 增加AUS运行图平移的功能 2020-10-16 09:21:00 +08:00
ival
891ff8362a AUS运行编辑功能完善 2020-10-15 22:57:06 +08:00
joylink_cuiweidong
5651075342 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-15 19:01:27 +08:00
joylink_cuiweidong
b55f8d00b5 竞赛代码调整 2020-10-15 19:01:09 +08:00
lVAL
4e6d4e6a73 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/router/index_Common.js
修改冲突
 2020-10-15 18:55:07 +08:00
lVAL
df1fcc8f82 修改代码 2020-10-15 18:53:45 +08:00
fan
54cde2a1da Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-15 18:33:47 +08:00
fan
63ad2d4e48 添加公司单位管理 2020-10-15 18:33:36 +08:00
joylink_cuiweidong
09eb9e2a00 竞赛 实操结果弹窗代码调整 2020-10-15 18:21:02 +08:00
joylink_cuiweidong
dbfbf19c0f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-15 17:47:36 +08:00
joylink_cuiweidong
653c01cec2 竞赛结果弹窗代码调整 2020-10-15 17:47:13 +08:00
zyy
26b0b146de 调整页面逻辑 2020-10-15 17:06:55 +08:00
zyy
c000d35911 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-15 17:02:46 +08:00
zyy
83f696cb25 调整综合监控页面展示 2020-10-15 17:02:34 +08:00
lVAL
fe93ecebe2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-15 16:06:06 +08:00
lVAL
c2b87acfe3 增加AUS运行图编辑工具代码 2020-10-15 16:05:55 +08:00
joylink_cuiweidong
cd55c5b269 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-15 15:39:50 +08:00
joylink_cuiweidong
45932bb10a 代码调整 2020-10-15 15:39:33 +08:00
zyy
89958942de Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-15 15:28:36 +08:00
zyy
114516abb8 调整综合监控 2020-10-15 15:28:23 +08:00
fan
41f70aadd8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-15 14:18:11 +08:00
fan
a0ac1a58e7 方向杆调整数据 2020-10-15 14:17:55 +08:00
zyy
78dd2f3d26 调整综合监控开关状态 2020-10-15 10:30:30 +08:00
zyy
3770b4a153 保存状态 2020-10-15 09:38:36 +08:00
zyy
f28262bb72 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-14 19:10:10 +08:00
zyy
4b9a98c35a 调整综合监控流程 2020-10-14 19:09:53 +08:00
lVAL
d68824b79a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-14 18:50:17 +08:00
lVAL
0010d78570 增加澳大利亚运行图编辑功能 2020-10-14 18:50:03 +08:00
joylink_cuiweidong
f91dd07cab 竞赛 场景代码调整 2020-10-14 18:10:32 +08:00
joylink_cuiweidong
17a18eb328 竞赛 实操 场景调整 2020-10-14 17:10:25 +08:00
joylink_cuiweidong
f02a55724b 代码调整 2020-10-14 16:19:52 +08:00
joylink_cuiweidong
5f921b7430 代码调整 2020-10-14 13:35:40 +08:00
joylink_cuiweidong
ce505f915b 竞赛平台代码调整 2020-10-14 09:47:19 +08:00
joylink_cuiweidong
a5025eda1c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-13 18:42:18 +08:00
joylink_cuiweidong
cafa638438 竞赛代码调整 2020-10-13 18:41:55 +08:00
lVAL
7f4f0d661f 修改代码 2020-10-13 18:38:43 +08:00
lVAL
9bcb18baae Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-13 18:36:03 +08:00