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

6340 Commits

Author SHA1 Message Date
ival
09ec3247ab Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-23 10:42:01 +08:00
ival
fcc8cbf988 修改iscs 2021-03-23 10:41:47 +08:00
joylink_cuiweidong
393f3fe68a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-23 10:37:14 +08:00
joylink_cuiweidong
43e0379926 运行图编制 生成计划 界面调整 2021-03-23 10:36:56 +08:00
ival
050141025a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-22 18:40:41 +08:00
ival
a63b8e0179 增加iscs图样 2021-03-22 18:40:29 +08:00
joylink_cuiweidong
ba18a549fb 运行图编制 生成计划代码调整 2021-03-22 17:39:12 +08:00
joylink_cuiweidong
b383815100 地图绘制 交路预览 显示代码调整 2021-03-22 16:04:33 +08:00
joylink_cuiweidong
7e80c71fef 代码调整 2021-03-22 15:49:14 +08:00
joylink_cuiweidong
74c5764087 代码调整 2021-03-22 15:30:10 +08:00
joylink_cuiweidong
7ac00f45dc 运行图编制 代码调整 2021-03-22 15:12:34 +08:00
joylink_cuiweidong
42b59cc752 代码调整 2021-03-22 14:51:34 +08:00
joylink_cuiweidong
9b4309d0c1 代码调整 2021-03-22 14:38:19 +08:00
joylink_cuiweidong
2dae1bc8d8 代码调整 2021-03-22 14:30:21 +08:00
joylink_cuiweidong
26b72f9228 代码调整 2021-03-22 13:20:51 +08:00
joylink_cuiweidong
e945d654eb 代码调整 2021-03-22 13:16:07 +08:00
sunzhenyu
2ce3d41cad mergetest 2021-03-19 18:14:58 +08:00
sunzhenyu
d22f9d62de 新三维客流逻辑基本完成(未实装) 2021-03-19 18:14:21 +08:00
fan
82fe1f3dc9 权重藐视调整 2021-03-19 17:34:37 +08:00
fan
f3aed3f16e 评价规则创建调整 2021-03-19 17:20:22 +08:00
fan
268ae6ad88 评价结果展示调整 2021-03-19 16:47:06 +08:00
fan
061df7a389 评价规则管理宽度调整 2021-03-19 16:27:44 +08:00
fan
5732f85453 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach 2021-03-19 16:17:23 +08:00
fan
36e9d7c6bd 课程管理调整 2021-03-19 16:17:01 +08:00
ival
ffb4dbbba3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-19 16:11:55 +08:00
ival
9dabd1604f 注释同济运行图中不用模块 2021-03-19 16:11:45 +08:00
fan
efee6ddfc4 merge 2021-03-19 15:55:05 +08:00
fan
44b2c5d0f8 教学管理调整 2021-03-19 15:49:05 +08:00
joylink_cuiweidong
3230f15415 代码调整 2021-03-19 14:50:52 +08:00
joylink_cuiweidong
5e271d3320 运行图代码调整 2021-03-19 14:49:33 +08:00
joylink_cuiweidong
8acee05b38 运行图代码调整 2021-03-19 13:38:53 +08:00
joylink_cuiweidong
82f8db41d1 运行图 代码调整 2021-03-19 13:23:58 +08:00
joylink_cuiweidong
70260cfbe3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-19 11:19:00 +08:00
joylink_cuiweidong
5fdf48b7ab 运行图 代码调整 2021-03-19 11:18:37 +08:00
ival
d7e068c79d 修改引入文件路径问题 2021-03-19 11:02:40 +08:00
ival
12f6bae8e5 解决冲突 2021-03-19 10:52:57 +08:00
ival
1b2abcffb3 Merge branch 'test-ival' into test 
# Conflicts:
#	src/permission.js
#	src/views/demo/index.vue
#	src/views/newMap/displayNew/demoTraining/index.vue
#	src/views/newMap/displayNew/lesson/index.vue
 2021-03-19 10:15:43 +08:00
ival
d03315f8fd 重构运行图解析代码逻辑 2021-03-19 10:10:51 +08:00
joylink_cuiweidong
1383dfbee3 运行图 代码调整 2021-03-18 18:46:52 +08:00
joylink_cuiweidong
e603837d9c 运行图代码调整 2021-03-18 17:52:19 +08:00
joylink_cuiweidong
e49d7c8ef8 代码调整 2021-03-18 16:30:28 +08:00
joylink_cuiweidong
f8860eba00 demo 代码调整 2021-03-18 15:58:27 +08:00
joylink_cuiweidong
07f477ae54 运行图代码调整 2021-03-18 15:05:56 +08:00
joylink_cuiweidong
b0a04a9dec Merge remote-tracking branch 'remotes/origin/test_newRunplan' into test 2021-03-18 15:02:03 +08:00
joylink_cuiweidong
f3c5feefcf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-18 15:01:30 +08:00
joylink_cuiweidong
d4a6aa1cb2 demo 代码调整 2021-03-18 15:01:13 +08:00
fan
700928ed22 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-18 11:21:17 +08:00
fan
23d8feb8b7 按钮顺序调整 2021-03-18 11:21:00 +08:00
joylink_cuiweidong
816fa77d79 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-18 11:13:01 +08:00
joylink_cuiweidong
5336a1899e demo 修改 2021-03-18 11:12:31 +08:00
fan
12698a808b 设备检测登录调整 2021-03-18 10:25:41 +08:00
fan
52898a24ac 仿真按钮样式调整 2021-03-18 09:35:45 +08:00
fan
e875fa92fc 教学管理暂提 2021-03-18 09:03:15 +08:00
ival
b4bf5114c6 demo 2021-03-17 18:07:49 +08:00
ival
43b6ebaa37 demo 2021-03-17 18:06:45 +08:00
ival
520c95a00c 增加demo 2021-03-17 17:51:22 +08:00
ival
666ad3f7d9 增加demo 2021-03-17 17:50:17 +08:00
ival
e183f40611 提交代码 2021-03-17 13:35:15 +08:00
ival
94bb1a0395 修改运行图代码代码 2021-03-17 10:15:21 +08:00
joylink_cuiweidong
df2ff455d3 运行图代码调整 2021-03-17 09:36:00 +08:00
joylink_cuiweidong
f21d270cf5 地图数据 交路预览页面调整 2021-03-17 09:33:19 +08:00
ival
e38bca7ff8 运行图 任务修改弹窗，显示描述的问题 2021-03-17 09:13:19 +08:00
ival
01d166a9c9 修改定位偏差的问题 2021-03-17 09:05:28 +08:00
fan
7da708858d 教学管理暂提 2021-03-16 19:06:25 +08:00
ival
64f38e7091 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-16 18:24:08 +08:00
ival
2480a8b110 迁移以前的运行图到同济新版 2021-03-16 18:23:56 +08:00
joylink_cuiweidong
e5047e1e16 运行图代码调整 2021-03-16 18:06:31 +08:00
joylink_cuiweidong
553ec75fd8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-16 17:43:44 +08:00
joylink_cuiweidong
76dcd271d9 代码调整 2021-03-16 17:43:22 +08:00
ival
0985a6f1df 修改运行图表单名称 2021-03-16 11:14:52 +08:00
ival
1ad9ea0cb7 修改运行图菜单名称 2021-03-16 09:55:28 +08:00
ival
b678416593 修改 隐藏 2021-03-16 09:52:45 +08:00
ival
72281db3a8 隐藏 生成仅环路计划 2021-03-16 09:28:00 +08:00
ival
c11568348f 优化代码 2021-03-15 21:15:03 +08:00
ival
c44c2a0e0c 暂存文件 2021-03-15 19:23:33 +08:00
ival
d5d9b91cb4 创建运行图 出库数据，环路数据，进库数据页面操作时，过滤显示的问题 2021-03-15 17:31:47 +08:00
ival
1cc4cebb27 任务：运行图编辑工具 
问题：优化生成计划的操作以及menubar的页面描述
 2021-03-15 14:34:24 +08:00
sunzhenyu
ab6acbc7d8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-15 10:56:45 +08:00
sunzhenyu
b2b669df66 修改三维客流 2021-03-15 10:56:37 +08:00
ival
fa73c7c365 修改进路 控制显示的条件 2021-03-15 10:43:08 +08:00
ival
b400f78fe5 线路：新版运行图编辑功能部分接口和界面调整 2021-03-15 09:59:52 +08:00
walker-sheng
37e98a7d57 89版本问题 2021-03-13 00:20:59 +08:00
walker-sheng
b92c8cafdc Revert "清除chrome89版本 windowopen 的noopener参数打不开的问题" 
This reverts commit 2e442e6e8c.

# Conflicts:
#	src/views/newMap/displayNew/menuSchema.vue
#	src/views/newMap/jlmapNew/index.vue
 2021-03-13 00:15:32 +08:00
sunleking
7fa30c1a30 merge 2021-03-13 00:13:08 +08:00
sunleking
2e442e6e8c 清除chrome89版本 windowopen 的noopener参数打不开的问题 2021-03-13 00:10:55 +08:00
fan
e97a5a88a1 教学管理暂提 2021-03-12 18:44:43 +08:00
ival
a2103b0486 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-12 18:23:43 +08:00
ival
fa2c7c8297 线路：同济大学版本运行图功能样式调整 2021-03-12 18:23:32 +08:00
joylink_cuiweidong
80b67e7f94 运行图 代码调整 2021-03-12 17:18:02 +08:00
joylink_cuiweidong
40f6314b85 运行图编制 代码调整 2021-03-12 16:37:32 +08:00
joylink_cuiweidong
c3fec625e2 运行图编制 代码调整 2021-03-12 16:16:51 +08:00
joylink_cuiweidong
905e59c869 运行图编制 生成仅环路计划 代码调整 2021-03-12 16:00:23 +08:00
joylink_cuiweidong
83781ac67d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-12 10:43:17 +08:00
joylink_cuiweidong
6cac5cdf51 运行图编制 导入公共进路代码调整 2021-03-12 10:42:55 +08:00
fan
32e7155fb0 教学管理暂提 2021-03-11 18:09:26 +08:00
sunzhenyu
1de6eda1a6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-11 17:11:03 +08:00
sunzhenyu
9434928436 新版三维车站客流管理代码修改(未实装) 2021-03-11 17:10:50 +08:00
ival
0f0b95cafb 增加 宁波3 menuBar operation定义 
修改加载当日运行图界面没有显示运行图名称的问题
 2021-03-11 15:27:30 +08:00
ival
6c19a3ad2c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-11 13:44:50 +08:00
ival
414bd05d0c 优化实训过程中，点击空白menuBar被关掉的问题 2021-03-11 13:44:40 +08:00
fan
b620e0f3a3 iscs报错修改 2021-03-11 10:58:03 +08:00
ival
dc8c74632d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-11 09:22:41 +08:00
ival
3fff0da60d 修改 数据库名称 为后端baseUrl的域名关键字 2021-03-11 09:22:30 +08:00
fan
659054f1fa 岔芯添加parentCode 2021-03-10 19:03:04 +08:00
fan
661adb9add Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-10 18:14:34 +08:00
fan
605d60b06c 岔芯添加parentCode 2021-03-10 18:14:12 +08:00
ival
81aa4d12c4 修改电子屏样式 2021-03-10 18:06:25 +08:00
fan
b05ab63bc6 关联岔芯参数可删除 2021-03-10 17:28:09 +08:00
fan
56c6cebbfe Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-10 17:18:51 +08:00
fan
d9d2e9b6cd 道岔计轴添加关联岔芯参数&宁波三排列进路到 2021-03-10 17:18:35 +08:00
ival
3759386e1f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-10 15:09:24 +08:00
ival
90bdb12e57 线路：宁波3 
问题：优化初始化操作的事件模型
 2021-03-10 15:09:15 +08:00
fan
0b361fd0fc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-10 13:19:39 +08:00
fan
0bf5e348a0 岔芯不生成车次窗 2021-03-10 13:19:17 +08:00
fan
f9c9e25d08 登录路径错误调整 2021-03-10 10:31:16 +08:00
joylink_cuiweidong
b434824d97 运行图编制 删除重复的页面 2021-03-09 17:11:58 +08:00
joylink_cuiweidong
208041fb24 运行图编制 删除暂时无用的文件 2021-03-09 16:50:38 +08:00
joylink_cuiweidong
e7c89ef4bf 运行图编制 删除暂时无用的文件 2021-03-09 16:35:40 +08:00
joylink_cuiweidong
b7a24387b4 运行图编制 删除无用与重复的文件 2021-03-09 16:11:27 +08:00
joylink_cuiweidong
ae948f80cc 删除多余的 运行图编制文件 2021-03-09 15:57:59 +08:00
joylink_cuiweidong
0e99302cf3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-09 15:41:35 +08:00
joylink_cuiweidong
cb8e07863e 运行图代码调整 2021-03-09 15:41:05 +08:00
ival
c28be4acd7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-09 14:57:24 +08:00
ival
605280e7d5 1.宁波3号线 操作修正 
2.运行图编辑修改数据计算错误的问题
 2021-03-09 14:57:14 +08:00
joylink_cuiweidong
f89d557393 运行图代码调整 2021-03-09 14:55:03 +08:00
joylink_cuiweidong
b3af1646dd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-09 14:46:07 +08:00
joylink_cuiweidong
d4aa841077 运行图代码调整 2021-03-09 14:45:50 +08:00
fan
f2a7955bf3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-09 14:44:16 +08:00
fan
fd49034b57 南京十一站调整&添加线路配置switchTurnOperationCanRecoverSplitFault 2021-03-09 14:43:40 +08:00
joylink_cuiweidong
0ec4a64f5d 运行图编制 代码调整 2021-03-09 14:30:45 +08:00
joylink_cuiweidong
2afd703938 代码调整 2021-03-09 11:04:40 +08:00
joylink_cuiweidong
5352671383 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/views/planMonitor/editTool/menus/addTask.vue
 2021-03-09 10:34:16 +08:00
joylink_cuiweidong
2a74ff0c48 运行图编制代码调整 2021-03-09 10:31:56 +08:00
ival
a62248d4a6 优化运行图代码，防止报错 2021-03-09 10:03:21 +08:00
ival
1a1fbbfd69 优化运行图计算 2021-03-09 09:33:05 +08:00
ival
d993771f72 线路：南京2 
问题：修改岔区设限报错问题，以及点击设置store值得优化
 2021-03-09 09:24:08 +08:00
fan
48e26565df Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-08 16:20:42 +08:00
fan
a6d81b5e3a 实训调整&ibp图片更换 2021-03-08 16:20:29 +08:00
joylink_cuiweidong
c39350daf3 运行图 代码调整 2021-03-08 15:20:47 +08:00
ival
12b804e110 Merge remote-tracking branch 'remotes/origin/test-tj' into test 2021-03-08 13:05:11 +08:00
ival
c8296f27db 同步代码 2021-03-08 13:04:39 +08:00
ival
886bec7aea 问题：运行图设置折返例行取值错误的问题 2021-03-08 11:30:46 +08:00
fan
5614d90776 添加线路配置配置generateDestination: '是否生成目的地码定义（泰雷兹）' 2021-03-08 10:12:01 +08:00
joylink_cuiweidong
4e133ff643 Merge branch 'test-tj' of https://git.code.tencent.com/lian-cbtc/jl-client into test-tj 
# Conflicts:
#	src/views/planMonitor/newEditTool/menus/modifyingStationIntervalTime.vue
 2021-03-05 17:56:54 +08:00
joylink_cuiweidong
43c8c577ae 代码调整 2021-03-05 17:50:22 +08:00
ival
a565e1f204 修改编辑运行图路基问题 2021-03-05 16:44:32 +08:00
ival
b9014f4118 问题：运行图到站停站数据计算 2021-03-05 16:07:51 +08:00
ival
f3532e980d Merge branch 'test-tj' of https://git.code.tencent.com/lian-cbtc/jl-client into test-tj 2021-03-05 15:39:17 +08:00
ival
96ad7becf2 修改 增加任务逻辑 2021-03-05 15:39:08 +08:00
joylink_cuiweidong
c785523699 运行图 代码调整 2021-03-05 13:06:06 +08:00
joylink_cuiweidong
e9997a2f7f Merge branch 'test-tj' of https://git.code.tencent.com/lian-cbtc/jl-client into test-tj 2021-03-05 09:40:33 +08:00
joylink_cuiweidong
f1b72f8103 代码调整 2021-03-05 09:40:14 +08:00
ival
f171db029c 调整：新版TJ 运行图界面样式 2021-03-04 18:31:59 +08:00
ival
6baf23149f Merge branch 'test-tj' of https://git.code.tencent.com/lian-cbtc/jl-client into test-tj 2021-03-04 18:22:42 +08:00
ival
20f3acdc1f 问题：同级编辑工具模板 2021-03-04 18:22:32 +08:00
joylink_cuiweidong
45054de1f9 Merge branch 'test-tj' of https://git.code.tencent.com/lian-cbtc/jl-client into test-tj 2021-03-04 16:36:42 +08:00
joylink_cuiweidong
66af660f18 其他参数的配置页面 折返数据 代码调整 2021-03-04 16:36:18 +08:00
ival
2fe27a3c47 问题：运行图编辑问题 
1：交路设置 ，转换轨<——>折返轨    或者   折返轨 <——>折返轨
2：高亮问题处理
 2021-03-04 13:45:25 +08:00
ival
4c649312c1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-04 09:20:42 +08:00
ival
4e4d602400 修改同济大学运行图bar 2021-03-04 09:20:27 +08:00
fan
345205fcd7 取消quillEditor为全局组件 2021-03-03 15:13:19 +08:00
joylink_cuiweidong
ed791a0a2f 地图绘图 目的地码 添加起始区段的字段 2021-03-03 13:21:41 +08:00
ival
aaae6db62e 任务：同济大学运行图界面 
进路：完成menu的创建
 2021-03-02 18:21:55 +08:00
ival
a75c603f21 线路：成都3 
问题：取消引导或进路没有生成实训的问题
 2021-03-02 15:28:07 +08:00
ival
ab9a11ef60 线路：西安2 
问题：修改优先折法为侧线优先
 2021-03-02 09:17:35 +08:00
ival
f034dcd163 运行图新版代码 2021-03-01 18:40:58 +08:00
ival
e983194879 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-01 18:36:45 +08:00
ival
5278c2308a 线路：宁波1号线 
问题：调试 全线取消限速、设置电灯实训过程
 2021-03-01 18:36:33 +08:00
fan
393064474f 成都工职院调整地图列表顺序调整 2021-03-01 17:51:14 +08:00
fan
d9681d32a5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-01 17:15:36 +08:00
fan
ee60474a40 成都工职院调整&教学管理调整 2021-03-01 17:15:10 +08:00
sunzhenyu
e4e19cd224 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-01 16:42:48 +08:00
sunzhenyu
408ac659ac 修改三维车站管理内容 2021-03-01 16:42:38 +08:00
joylink_cuiweidong
561e6633c0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-01 14:19:33 +08:00
joylink_cuiweidong
92cc3d60c0 地图绘图 信号机添加 不生成进路 字段 2021-03-01 14:18:49 +08:00
lVAL
d908de6d7c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-26 16:23:41 +08:00
lVAL
1580a89770 线路：宁波一，南京2 
问题：
a.南京2现地实训进入后，视图有的站没有拆分成两列
b.修改宁波一，设置通过dialog的title提示
c.恢复showStationContent函数的加入位置
d.删除代码中的一些无用注释代码
 2021-02-26 16:23:16 +08:00
fan
627677db98 教学管理展示判断调整 2021-02-26 14:54:13 +08:00
fan
44d8f5e3b0 成都工业页面注册账号 2021-02-26 13:52:55 +08:00
lVAL
501c79f477 优化代码 2021-02-26 09:33:45 +08:00
joylink_cuiweidong
40b2dceaf9 代码调整 2021-02-25 16:16:43 +08:00
joylink_cuiweidong
279cbc7133 地图绘图数据 目的地码 代码调整 2021-02-25 15:19:22 +08:00
lVAL
52b1a87e9c 线路：成都3 
问题：现地第一次加载，引导按钮没有显示的问题
 2021-02-25 11:18:59 +08:00
sunzhenyu
88194319cd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-24 18:15:17 +08:00
sunzhenyu
6c1fef1bea 三维车站客流管理模块代码修改 2021-02-24 18:15:07 +08:00
fan
4b0320061e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-23 18:17:23 +08:00
fan
f0cd6ff07c 问题调整 2021-02-23 18:17:15 +08:00
joylink_cuiweidong
908cf9dddf 宁波三号线 控制权 状态调整 2021-02-23 18:12:12 +08:00
fan
6068ea00ef 添加线路配置stationPreResetBeforeAxlePreReset 2021-02-23 13:43:09 +08:00
fan
069c1b7203 ibp盘计轴复位 2021-02-23 13:04:29 +08:00
fan
0f5805addc 线路配置添加参数 2021-02-22 17:07:59 +08:00
fan
dc3e3d7b7e 宁波一 计轴复位按钮操作 2021-02-22 10:27:32 +08:00
joylink_cuiweidong
466d57b4be Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-20 15:05:36 +08:00
joylink_cuiweidong
858c7dd7a7 宁波三号线（泰雷兹线路） 系统扣车设置/取消 操作添加 2021-02-20 15:03:44 +08:00
fan
7483b1be46 调整综合演练现地设备显示 2021-02-20 13:28:11 +08:00
fan
37d44bf6d2 现地 设备显示调整 2021-02-20 10:42:25 +08:00
fan
fdeebc9e60 添加线路配置参数 2021-02-19 18:27:26 +08:00
joylink_cuiweidong
7d3dfc2d31 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-19 13:28:53 +08:00
joylink_cuiweidong
414aa1a3ca 地图绘制 列车数据模型更改 2021-02-19 13:28:19 +08:00
lVAL
2aff2be8b4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-19 09:26:36 +08:00
lVAL
1030f13d37 修改宁波3号线，二次确认 锁闭标题问题； 
修改西安2号线，定操、反操实训第一步描述错误。
 2021-02-19 09:26:26 +08:00
fan
3e5f101a3a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-18 15:38:35 +08:00
fan
731c8e7fc3 宁波一 设置/取消强制点灯 2021-02-18 15:38:20 +08:00
lVAL
f482a4cf71 问题：仿真系统添加“运行图编制工作站”的路由和操作 2021-02-18 13:37:54 +08:00
fan
3366718864 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-05 18:11:06 +08:00
fan
510b26c86c 宁波一新指令 2021-02-05 18:10:55 +08:00
joylink_cuiweidong
70556faea6 北交大 客流系统 代码调整 2021-02-05 17:29:25 +08:00
joylink_cuiweidong
7a949cd5e2 北交大 客流系统 大客流策略 代码调整 2021-02-05 17:23:09 +08:00
joylink_cuiweidong
f94f3deadf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-05 17:06:18 +08:00
joylink_cuiweidong
a429f53015 北交大 客流系统 大客流策略 页面代码调整 2021-02-05 17:05:42 +08:00
fan
f3ec3a1476 南京二号线折行显示调整 2021-02-05 15:12:57 +08:00
fan
88683b3763 代码调整 2021-02-05 09:19:18 +08:00
joylink_cuiweidong
3233ce39f0 北交大 客流代码调整 2021-02-04 18:34:31 +08:00
joylink_cuiweidong
e0f2d0a288 北交大 客流 代码调整 2021-02-04 18:30:02 +08:00
joylink_cuiweidong
68d2ecd6db Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-04 17:18:25 +08:00
joylink_cuiweidong
61fb768bdc 北交大客流项目 大客流策略 2021-02-04 17:17:45 +08:00
sunzhenyu
f3e95ffccb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-04 13:28:00 +08:00
sunzhenyu
a96b8be0fa 修改三维客流列车车站订阅消息处理 2021-02-04 13:27:53 +08:00
fan
e8de151360 宁波一操作实训策略调整&线路配置参数 2021-02-04 13:08:59 +08:00
sunzhenyu
8cb4ef4bdc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-04 11:03:57 +08:00
sunzhenyu
67d8c9467c 修改三维客流订阅连接，增加三维车站管理界面 2021-02-04 11:03:48 +08:00
joylink_cuiweidong
2de373dd24 北交大 客流系统 退出系统 关闭其他窗口 2021-02-03 15:44:18 +08:00
joylink_cuiweidong
3a91ccfa0a 北交大 客流策略 代码调整 2021-02-03 14:08:58 +08:00
joylink_cuiweidong
acbbf14d1c 北交大 代码调整 2021-02-03 13:45:11 +08:00
joylink_cuiweidong
2968b1ddfb 北交大客流策略 添加 2021-02-03 13:40:11 +08:00
joylink_cuiweidong
eeb7e3afad Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/theme/ningbo_03/menus/menuDialog/initializeSignalCanBlock.vue
#	src/jmapNew/theme/ningbo_03/menus/menuDialog/signalBlock.vue
#	src/jmapNew/theme/ningbo_03/menus/menuDialog/stationControl.vue
#	src/jmapNew/theme/ningbo_03/menus/menuDialog/switchActive.vue
#	src/jmapNew/theme/ningbo_03/menus/menuDialog/switchBlock.vue
 2021-02-02 18:16:51 +08:00
joylink_cuiweidong
c149f33a99 删除无用的代码 2021-02-02 18:06:02 +08:00
fan
8aaaf9f9df 国赛提交试卷后初始化结果 2021-02-02 17:23:29 +08:00
fan
c7e0bdc1e7 国赛理论测试显示结果调整 2021-02-02 17:03:39 +08:00
fan
7d60412e96 国赛试题调整 2021-02-02 16:34:55 +08:00
fan
d594af49e2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-02 11:03:24 +08:00
fan
f66e3e3cc0 实训代码调整 2021-02-02 11:03:11 +08:00
lVAL
7b11378443 修改 宁波 selected报错问题 2021-02-02 09:41:35 +08:00
lVAL
ef8066f9ef 修改分页查询 表单显示 2021-02-02 09:13:14 +08:00
lVAL
231898af92 增加指令产品类型展示。 2021-02-02 09:04:06 +08:00
lVAL
f0e3ee1f49 线路：南京2 
问题：修改现地 强制站控，交出控制权，接受控制的实训流程。
 2021-02-01 13:43:48 +08:00
fan
22ac51f595 国赛购买调整描述 2021-01-29 16:20:18 +08:00
fan
216e8f0f19 国赛购买调整 2021-01-29 16:15:24 +08:00
fan
c53000186a 调整国赛购买位置 2021-01-29 15:28:51 +08:00
fan
e77ce189d1 放开国赛购买注释 2021-01-29 15:09:12 +08:00
joylink_cuiweidong
fcf3ec5b8e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-29 14:40:27 +08:00
joylink_cuiweidong
f1106b7dc0 运行图编制 菜单顺序 调整 2021-01-29 14:40:09 +08:00
fan
f1822495d2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-29 13:23:41 +08:00
fan
12e16f9a99 BUG 152: 教学系统：在课程中点击实训进入实训后点击返回应退出到课程详情页面，目前退出到教学系统界面了，建议修改 2021-01-29 13:23:29 +08:00
joylink_cuiweidong
3175321085 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-29 11:24:07 +08:00
joylink_cuiweidong
2e3d576614 生成联锁添加配置项：信号机接近区段不跨过前方同向信号机 2021-01-29 11:23:01 +08:00
lVAL
f91f045a1e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-29 11:08:19 +08:00
fan
009f3981ff BUG 153:课程设计实训管理：操作类型查询不可更换，更换后显示无数据 2021-01-29 10:03:49 +08:00
lVAL
4d3d92e18b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-29 09:46:05 +08:00
lVAL
e28047773d 线路：福州1 
问题：设置运行等级实训提示运行时间未提示的问题
 2021-01-29 09:45:43 +08:00
fan
e232c805ed 成都工业登录页面调整 2021-01-29 09:18:37 +08:00
fan
012fdd117f 注释国赛系统购买 2021-01-28 20:05:45 +08:00
fan
80cb675d9d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-28 18:54:57 +08:00
fan
f4e3deaabc 仿真异常不清除订阅 2021-01-28 18:54:48 +08:00
lVAL
d4014b53c4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-28 18:44:21 +08:00
lVAL
31f9e2a4d3 修改生成实训配置 佛山1 2021-01-28 18:44:03 +08:00
fan
5bf8ffe9ac BUG 149:浙大网新：现地仿真系统中车站切换显示有误; 2021-01-28 18:22:13 +08:00
fan
3f70632b84 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-28 17:47:56 +08:00
fan
b1d944c52f 国赛购买成功调整 2021-01-28 17:47:43 +08:00
lVAL
6a033b2a9d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-28 16:28:14 +08:00
lVAL
590fb34edf 修改 宁波线操作 2021-01-28 16:27:44 +08:00
fan
18dee86d9c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-28 16:20:30 +08:00
fan
f07981ce64 国赛购买权限 --暂提 2021-01-28 16:20:18 +08:00
joylink_cuiweidong
b6731bd25a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-28 16:12:37 +08:00
joylink_cuiweidong
694fe461a6 成都1和3，北京1，佛山有轨电车，哈尔滨1，南京2 运行图 折返点计算 代码调整 2021-01-28 16:12:10 +08:00
sunzhenyu
84e77d7fbc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-28 16:10:45 +08:00
sunzhenyu
e45e933436 修改三维驾驶中cctv视角按钮 2021-01-28 16:10:36 +08:00
joylink_cuiweidong
2e50989ac8 运行图添加任务 报错提示调整 
运行图编制 折返时间 最少是2分钟
 2021-01-28 15:21:06 +08:00
fan
bf445ba174 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-28 14:29:08 +08:00
fan
3850bc6e34 BUG 105: 浙大网新线路在设计剧本的时候，两个窗口重叠后无法移动导致无法操作下面的窗口 2021-01-28 14:28:43 +08:00
joylink_cuiweidong
f6d3a6f030 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-28 13:38:29 +08:00
joylink_cuiweidong
c9a8d09e67 福州一号线 运行图绘图 折返点计算调整 2021-01-28 13:38:10 +08:00
fan
87ca64e33b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-28 10:30:08 +08:00
fan
9c341fed70 退出仿真时清除requestList请求栈堆数据 2021-01-28 10:29:38 +08:00
lVAL
369c5446cc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/theme/nanjing_02/menus/menuButton.vue
 2021-01-27 18:39:11 +08:00
lVAL
ba5de90773 配置 南京2实训 2021-01-27 18:32:16 +08:00
joylink_cuiweidong
8f82b0fdd5 北交大客流 车站人数代码调整 
地图绘图代码调整
 2021-01-27 15:39:53 +08:00
fan
c0d1ffffd6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-27 09:47:38 +08:00
fan
ca1b5892af 剧本编辑框和请求栈堆微调 2021-01-27 09:47:26 +08:00
lVAL
ad0590dfe4 修改南京2 登录密码为1 以及限制普通站不能登录 2021-01-27 09:27:44 +08:00
lVAL
be6610a850 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-26 17:45:39 +08:00
lVAL
4efca07ac8 配置 宁波3 设置跳停和取消跳停配置 2021-01-26 17:45:24 +08:00
fan
98488d3095 BUG 106:浙大网新线路点击剧本加载再退出后，车站切换框显示无数据 2021-01-26 17:13:00 +08:00
fan
832e2a0ddd 修改单位调整 2021-01-26 16:22:31 +08:00
fan
abed3ef7c1 BUG108: 浙大网新仿真：道岔单解时出现字母“E”后，右键点击出现“使能”，此时不点击使能，而点击空白处，再点击字母E，没有反应，并且初始化后E还在闪烁 && 南京二排列进路后封锁区段显示调整 2021-01-26 16:19:29 +08:00
joylink_cuiweidong
44cd7b3c01 运行图编制 代码调整 2021-01-26 11:28:29 +08:00
joylink_cuiweidong
c8986b3a4e 运行图 绘图 生成计划 增加计划 代码调整 2021-01-26 11:25:06 +08:00
joylink_cuiweidong
ebcd6b9bd9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-26 11:10:38 +08:00
joylink_cuiweidong
7d0a4269e6 运行图绘制代码调整 
南京二号线 运行图转换函数代码调整
 2021-01-26 11:10:18 +08:00
lVAL
9602cfc27a 修改实训查询 表单联动查询的问题 2021-01-26 11:05:18 +08:00
lVAL
c3553c87f1 修改 南京2现地登录操作问题 2021-01-26 09:35:54 +08:00
joylink_cuiweidong
f118e0ed46 运行图编制 代码调整 2021-01-25 18:06:11 +08:00
joylink_cuiweidong
194b31094d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-25 17:48:00 +08:00
joylink_cuiweidong
db35ba370e 运行图编制代码调整 2021-01-25 17:45:39 +08:00
fan
5bc124fe54 用户管理单位管理页面调整 2021-01-25 17:30:44 +08:00
fan
76f0fa96ab Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-25 17:21:40 +08:00
fan
4fb1cd1bed 南京二号线行值折行显示 2021-01-25 17:21:24 +08:00
joylink_cuiweidong
4da53f69e5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-25 17:05:29 +08:00
joylink_cuiweidong
068c3331e4 运行图绘制代码调整 2021-01-25 17:05:05 +08:00
lVAL
32304d294e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-25 15:46:29 +08:00
lVAL
b5788f01d4 增加 现地车站登录功能 2021-01-25 15:46:18 +08:00
joylink_cuiweidong
ec89eca2ad 运行图编制工具 修改站间运行时间那里加个更新距离的功能 
bug144 运行图设计：生成计划的服务号不能输入0，修改
 2021-01-25 15:31:18 +08:00
joylink_cuiweidong
e49cce6b8a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-25 13:51:23 +08:00
joylink_cuiweidong
d3546c5de2 岔心鼠标事件 绘图代码调整 2021-01-25 13:48:37 +08:00
fan
3b6563351b 运行图层级调整 2021-01-25 10:30:43 +08:00
joylink_cuiweidong
8eee00f454 代码调整 2021-01-22 19:18:16 +08:00
fan
fbbf2be009 BUG: 126 => 在已发布地图列表中的某个城市退出仿真后，重新点击另一个城市，页面显示有误，建议修改 2021-01-22 15:40:16 +08:00
fan
c80e08292c 调整实际长度 小数计算 2021-01-22 14:51:37 +08:00
fan
420163ec07 逻辑区段实际长度设置调整&实训平台二级主页 2021-01-22 14:47:49 +08:00
fan
4a0c7e1e95 逻辑区段实际长度设置调整 2021-01-22 13:59:32 +08:00
fan
258796555e 车队进路调整 2021-01-21 19:11:50 +08:00
lVAL
f0829b768b 增加佛州线实训配置 2021-01-21 10:42:17 +08:00
fan
75e48959ba 调整生成课程和试卷问题&设置运行等级报错调整 2021-01-20 18:29:12 +08:00
fan
295ddee738 调整showMode初始值 2021-01-20 16:47:20 +08:00
fan
287e6251b7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-20 16:26:42 +08:00
fan
5a36ce69fe 添加线路配置项 signalHumanControlBeforeSetAtsControlOrCIAutoTrigger、cancelAtsControlOfAllRoutesWhenCancelRoute 2021-01-20 16:26:32 +08:00
joylink_cuiweidong
88234d9154 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-20 16:20:58 +08:00
joylink_cuiweidong
fe81a31883 佛山有轨电车 线路 暂时隐藏 iscs ibp 数据 2021-01-20 16:20:20 +08:00
fan
25b6ad4ca8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-20 15:53:23 +08:00
fan
34aca8de12 现地行调条件显示调整 2021-01-20 15:53:13 +08:00
joylink_cuiweidong
c8c4264be9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-20 15:32:08 +08:00
joylink_cuiweidong
057d7a7d75 北交大项目 运行图预览打不开 bug 处理 2021-01-20 15:31:41 +08:00
fan
330f58eba4 右键选择 进路快捷操作盘 2021-01-20 13:50:37 +08:00
fan
49405666df 传输信号机参数调整 2021-01-19 11:18:24 +08:00
fan
145259d3b5 传输信号机 && 佛山进路预览调整 2021-01-19 11:09:53 +08:00
sunzhenyu
19cede5338 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-18 17:59:14 +08:00
sunzhenyu
2463d09bcc 修改三维驾驶更新本地客户端驾驶员 2021-01-18 17:59:04 +08:00
lVAL
aed7f034b1 南京2车站操作设备并且状态刷新后，页面操作菜单disabled刷新问题 2021-01-18 17:32:20 +08:00
lVAL
198602923c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-18 15:49:00 +08:00
lVAL
7d61451fa9 修改 应答器 创建的几个优化问题，以及南京线路中心左键弹窗，右键不弹 2021-01-18 15:48:05 +08:00
fan
5f3300e889 信号机添加所属车站&批量设置 2021-01-18 15:41:28 +08:00
fan
f60054ccad 现地切行调后 车站显示问题调整 2021-01-18 11:29:03 +08:00
sunzhenyu
1412834ce5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 18:21:42 +08:00
sunzhenyu
a63060ac2f 修改测试中三维沙盘数据ui 2021-01-15 18:21:36 +08:00
lVAL
dd7f4d2aeb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 17:23:37 +08:00
lVAL
0ee148437b 增加应答器 创建时必须选择信号机以及校验 2021-01-15 17:23:27 +08:00
joylink_cuiweidong
f61df9b1e8 岔心状态 绘图代码调整 2021-01-15 17:17:17 +08:00
joylink_cuiweidong
39da2a712d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 16:44:55 +08:00
joylink_cuiweidong
9aef723b3f bug修改： 
逻辑区段修改 导致逻辑区段起终点坐标出现错误问题
逻辑区段修改坐标 导致相邻物理区段坐标出现问题
功能：
增加线路配置：信号封锁下进路是否可以办理
 2021-01-15 16:44:22 +08:00
lVAL
c63d475d57 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 15:11:24 +08:00
lVAL
3c37037558 增加应答器关联信号机，以及绘图信号机，区段激活选择 2021-01-15 15:11:13 +08:00
joylink_cuiweidong
0f4f6ef5f2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 13:27:09 +08:00
joylink_cuiweidong
53b51a7b63 道岔 生成逻辑代码调整 2021-01-15 13:26:42 +08:00
lVAL
ec30635c02 修改应答器图层以及回车修改属性的问题 2021-01-15 10:59:58 +08:00
joylink_cuiweidong
4e28468ad9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 10:33:15 +08:00
joylink_cuiweidong
a86c76422f 岔心绘图代码调整 
区段绘图（左右关联区段 关系）调整
 2021-01-15 10:32:57 +08:00
lVAL
48955258ea 修改应答器 绘制card css 2021-01-15 09:54:56 +08:00
lVAL
c6c59f48b7 修改代码 2021-01-15 09:53:37 +08:00
sunzhenyu
5bbe37c30b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 09:35:57 +08:00
sunzhenyu
b6ab1b3c6a 测试版本三维沙盘增加镜头控制模型大小，信号机朝向，修改单线路 2021-01-15 09:35:49 +08:00
lVAL
284899599c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/theme/nanjing_02/menus/menuButton.vue
 2021-01-14 18:38:29 +08:00
lVAL
b5c2202114 增加 南京线增加参数选择的步骤功能 2021-01-14 18:37:31 +08:00
joylink_cuiweidong
3dd6696140 代码调整 2021-01-14 16:59:41 +08:00
joylink_cuiweidong
28babc78f9 岔心 绘图调整 2021-01-14 16:03:48 +08:00
joylink_cuiweidong
cadda00719 区段 物理区段 实际长度修改 bug调整 2021-01-14 14:58:42 +08:00
joylink_cuiweidong
845f10caf6 岔心绘图代码调整 
bug调整：新建完一个信号机 三个状态不发生改变
 2021-01-14 13:04:04 +08:00
joylink_cuiweidong
becb6a03df 岔心代码调整 2021-01-13 18:33:07 +08:00
lVAL
9f4155b70d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-13 17:45:49 +08:00
lVAL
15f94a7d1d 优化 应答器创建 选择关联区段类型 以及优化绘制显示位置 2021-01-13 17:45:38 +08:00
joylink_cuiweidong
752b4e9a26 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/config/skinCode/nanjing_02.js
#	src/jmapNew/utils/parser.js
 2021-01-13 17:43:15 +08:00
joylink_cuiweidong
99644039d3 新建车站以后 无法点击其他的东西 bug 调整 2021-01-13 17:34:57 +08:00
sunzhenyu
d3c833a35f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-13 17:11:20 +08:00
sunzhenyu
90fea11aab 临时增加三维数据创建场景时同步站场图内外侧数据 2021-01-13 17:11:07 +08:00
joylink_cuiweidong
ac6f3673d4 Merge branch 'master' of https://git.code.tencent.com/lian-cbtc/jl-client 2021-01-13 17:02:31 +08:00
joylink_cuiweidong
7599458c8f 岔心 元素绘图代码调整 2021-01-13 17:01:53 +08:00
lVAL
006d784178 修改应答器bug 2021-01-13 10:26:52 +08:00
lVAL
47d9e6573d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-13 09:52:24 +08:00
lVAL
ede7335ab1 修改 交路选择起始信号机和终止信号机操作的bug问题 2021-01-13 09:51:59 +08:00
thesai
032ec93af4 Merge remote-tracking branch 'origin/test' 2021-01-12 23:46:38 +08:00
thesai
2d154f1611 设备登录行值显示 2021-01-12 23:46:07 +08:00
thesai
8eb293f074 Merge remote-tracking branch 'origin/test' 2021-01-12 23:14:34 +08:00
thesai
4adc474b54 设备登录行值显示 2021-01-12 23:13:05 +08:00
joylink_cuiweidong
b8c8f773c3 Merge remote-tracking branch 'remotes/origin/test' 2021-01-12 20:22:06 +08:00
joylink_cuiweidong
fbb8157ff1 代码调整 2021-01-12 20:20:56 +08:00
joylink_cuiweidong
b26ec956d0 Merge remote-tracking branch 'remotes/origin/test' 2021-01-12 20:16:07 +08:00
joylink_cuiweidong
5cfef217d0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-12 20:15:28 +08:00
joylink_cuiweidong
0b4636f618 添加 绑定单位 功能 2021-01-12 20:15:14 +08:00
fan
df3c31dd44 Merge remote-tracking branch 'origin/test' into test 2021-01-12 20:06:58 +08:00
fan
67d9af587f 生成组织二维码state修改 2021-01-12 20:06:45 +08:00
joylink_cuiweidong
f9ad56bca6 Merge remote-tracking branch 'remotes/origin/test' 2021-01-12 19:06:59 +08:00
joylink_cuiweidong
b13136df51 代码调整 2021-01-12 19:05:28 +08:00
joylink_cuiweidong
cb35140942 Merge remote-tracking branch 'remotes/origin/test' 2021-01-12 19:01:29 +08:00
joylink_cuiweidong
3a5d5def46 考试系统 添加 修改试卷 代码调整 2021-01-12 18:59:16 +08:00
fan
73f98ce8b4 考试权限调整 2021-01-12 18:51:38 +08:00
fan
378d5430e6 考试权限调整 2021-01-12 18:34:10 +08:00
fan
35790f6693 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-12 18:27:05 +08:00
fan
21e2455472 项目登录行调 运行图预览跳转新页面 2021-01-12 18:26:55 +08:00
sunzhenyu
646836ecb4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-12 17:58:12 +08:00
sunzhenyu
057a6e41f8 删除无用注释 2021-01-12 17:57:59 +08:00
sunzhenyu
d257bf254b 修改sdy行调沙盘，现地cctv 2021-01-12 17:57:04 +08:00
joylink_cuiweidong
b04792f529 运行图编辑 新增计划代码bug 调整 2021-01-12 17:38:30 +08:00
joylink_cuiweidong
1e2e8c2609 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/config/skinCode/nanjing_02.js
#	src/jmapNew/shape/Responder/index.js
 2021-01-12 17:27:25 +08:00
joylink_cuiweidong
85a88a9431 岔心 绘图代码调整 2021-01-12 17:25:32 +08:00
fan
a6481906fb 编辑用户信息强制要有名称=》去掉避免 2021-01-12 16:19:10 +08:00
fan
63e2a57f36 Bug48: 地图列表的位置锁定&仿真权限判断调整 2021-01-12 15:40:05 +08:00
fan
4b95be70dd 单位添加关联项目 2021-01-12 14:34:20 +08:00
fan
affd81e756 试卷创建调整 2021-01-12 14:13:56 +08:00
fan
e4cf9de494 绑定单位调整 2021-01-12 13:22:24 +08:00
fan
de395f9bb4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-12 13:20:12 +08:00
fan
dbc02056fb 绑定单位调整 2021-01-12 13:18:52 +08:00
lVAL
64df012fc3 设置应答器 绘图显示 仿真不显示 2021-01-12 11:32:39 +08:00
fan
0e5ebf2445 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-12 10:20:49 +08:00
fan
097c95beaa 教学管理文字调整 2021-01-12 10:19:43 +08:00
joylink_cuiweidong
54a312c20f 岔心 地图绘图 代码调整 2021-01-12 10:11:16 +08:00
lVAL
7bacd3c49f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-12 10:07:50 +08:00
lVAL
9bd12bb82e 增加应答器配置 2021-01-12 10:07:31 +08:00
fan
c8150bfa32 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-11 17:52:12 +08:00
fan
9a74d3ee39 成绩导出调整 2021-01-11 17:51:54 +08:00
sunzhenyu
96e2179bd7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-11 15:55:57 +08:00
sunzhenyu
b2ab6d4fd1 修改综合演练中三维驾驶不显示选择司机 2021-01-11 15:55:48 +08:00
joylink_cuiweidong
e1af8e878e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-11 15:40:15 +08:00
joylink_cuiweidong
6ef0498ffd 添加 岔心 地图绘制页面 2021-01-11 15:39:06 +08:00
fan
0dca101acd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-11 15:24:10 +08:00
fan
84354dde17 课程迁移问题调整&区段限速取消限速仅逻辑区段显示 2021-01-11 15:23:56 +08:00
sunzhenyu
0dbc481e3f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-11 13:05:39 +08:00
sunzhenyu
857307644f 三维沙盒修改，通号VR内容隐藏 2021-01-11 13:05:30 +08:00
fan
b248e69ffe 导入学生信息添加校验&哈尔滨打包不再区分路由文件 2021-01-11 10:55:07 +08:00
fan
be8821435b 课程迁移调整 2021-01-08 17:55:42 +08:00
fan
c6b81eada0 课程迁移调整 2021-01-08 17:53:04 +08:00
fan
ec5c335d37 课程迁移调整 2021-01-08 17:48:25 +08:00
fan
682a47f730 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-08 17:27:36 +08:00
fan
0051560fff 课程迁移调整 2021-01-08 17:27:25 +08:00
zyy
9e355206c7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-08 16:51:07 +08:00
zyy
bb22ed66ed 调整大屏预览显示流程 2021-01-08 16:50:50 +08:00
joylink_cuiweidong
ae722ee86f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-08 16:43:24 +08:00
joylink_cuiweidong
fd89b426b8 bug16 管理运行图计划中的查询功能缺失 代码调整 2021-01-08 16:42:59 +08:00
fan
6b7acc7f97 课程迁移调整 2021-01-08 11:26:43 +08:00
fan
4d3991f3e9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_lesson 2021-01-08 11:13:16 +08:00
fan
dfa815fe6d 课程创建迁移&调度电话调整 2021-01-08 11:12:58 +08:00
fan
680b043904 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-07 15:15:11 +08:00
fan
38be92528e 组织单位管理 2021-01-07 15:14:58 +08:00
joylink_cuiweidong
4d8932e155 触发故障管理 布局代码调整 2021-01-07 11:13:03 +08:00
joylink_cuiweidong
5469afd2ec 调度电话 代码调整 
（现地工作站去掉 所有车站）
（呼叫 已经通话的人 会话逻辑处理）
 2021-01-07 10:31:26 +08:00
fan
fe71e0b0a2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-06 18:17:54 +08:00
fan
e94ffd235a 故障模式快捷键&ISCS返回（退出）调整 2021-01-06 18:17:40 +08:00
joylink_cuiweidong
85a6b0c617 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-06 16:01:51 +08:00
joylink_cuiweidong
35645688a5 代码调整 2021-01-06 16:01:26 +08:00
fan
554d2e994f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-06 13:23:30 +08:00
fan
26d2556502 单位暂提 2021-01-06 13:23:16 +08:00
lVAL
9993cc3d63 如果检测实训生成，就清空数据。 2021-01-06 11:21:38 +08:00
lVAL
c4e41ccd6a 修改 实训生成过程中，点击限制的问题 2021-01-06 11:18:15 +08:00
joylink_cuiweidong
dd0a0b2fdf bug70（在课程树创建课程章节时，创建二级章节后无法继续创建一级章节）修改 2021-01-05 17:31:03 +08:00
fan
e630f870e2 merge 2021-01-05 16:43:00 +08:00
fan
c352214e89 代码暂提 2021-01-05 16:37:50 +08:00
fan
382336971d BUG 48:地图列表的位置锁定 2021-01-05 15:09:07 +08:00
fan
175d5b1810 代码调整 2021-01-05 13:56:51 +08:00
fan
d31c9c1da3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-04 17:52:52 +08:00
fan
43f039e5c6 浙大网新 发送请求提示调整 2021-01-04 17:52:38 +08:00
sunzhenyu
5751a6bbad Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-04 16:21:43 +08:00
sunzhenyu
2a2dfd4d4e 三维沙盘修改 2021-01-04 16:21:38 +08:00