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
|
18dcc3b089
|
BUG 160: 宁波一：控制模式（按钮）处缺少紧急站控
|
2021-02-02 17:54:40 +08:00 |
|
fan
|
1729082bac
|
折返策略 宁波一实训
|
2021-02-02 17:28:56 +08:00 |
|
fan
|
8aaaf9f9df
|
国赛提交试卷后初始化结果
|
2021-02-02 17:23:29 +08:00 |
|
fan
|
ec32fb62ff
|
折返策略 宁波一实训
|
2021-02-02 17:13:05 +08:00 |
|
fan
|
264770d316
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-02 17:03:53 +08:00 |
|
fan
|
c7e0bdc1e7
|
国赛理论测试显示结果调整
|
2021-02-02 17:03:39 +08:00 |
|
lVAL
|
a6070c49f2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/ningbo_03/menus/menuDialog/allocateTime.vue
# src/jmapNew/theme/ningbo_03/menus/menuDialog/signalModel.vue
# src/jmapNew/theme/ningbo_03/menus/menuDialog/standControl.vue
|
2021-02-02 16:45:24 +08:00 |
|
lVAL
|
7d9803165c
|
修改，宁波线路，道岔状态更改，操作界面检测，不刷新页面的问题
|
2021-02-02 16:40:58 +08:00 |
|
fan
|
e7b47de9f6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-02 16:35:06 +08:00 |
|
fan
|
7d60412e96
|
国赛试题调整
|
2021-02-02 16:34:55 +08:00 |
|
joylink_cuiweidong
|
efd8c86762
|
宁波一号线，南京二号线，哈尔滨一号线 删除不需要的代码
|
2021-02-02 16:28:03 +08:00 |
|
joylink_cuiweidong
|
e73d5d33d8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-02 15:22:28 +08:00 |
|
joylink_cuiweidong
|
14cd1948b3
|
福州一号线 佛山一号线 删除不需要的代码
|
2021-02-02 15:22:13 +08:00 |
|
fan
|
e4881b4efc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-02 14:53:46 +08:00 |
|
fan
|
a431f17246
|
实训调整
|
2021-02-02 14:53:33 +08:00 |
|
joylink_cuiweidong
|
1abd14d7e9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-02 14:10:06 +08:00 |
|
joylink_cuiweidong
|
2ddd9a0dc8
|
北京一号线/成都1，3号线 删除不需要的代码
|
2021-02-02 14:09:46 +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 |
|
joylink_cuiweidong
|
2ca7c33966
|
宁波三号线 操作调整
|
2021-02-02 10:57:41 +08:00 |
|
lVAL
|
dbdfe26e86
|
修改宁波3 检测selected的方式
|
2021-02-02 10:49:25 +08:00 |
|
lVAL
|
3acdfc95fd
|
修改 action 引入state
|
2021-02-02 10:26:59 +08:00 |
|
lVAL
|
7c80fc77c6
|
修改代码
|
2021-02-02 10:25:21 +08:00 |
|
lVAL
|
7b11378443
|
修改 宁波 selected报错问题
|
2021-02-02 09:41:35 +08:00 |
|
lVAL
|
ef8066f9ef
|
修改分页查询 表单显示
|
2021-02-02 09:13:14 +08:00 |
|
lVAL
|
cb7ae5fe6b
|
线路：宁波3
问题：实训提示描述
|
2021-02-02 09:09:11 +08:00 |
|
lVAL
|
231898af92
|
增加指令产品类型展示。
|
2021-02-02 09:04:06 +08:00 |
|
lVAL
|
6be29c157b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-01 18:36:20 +08:00 |
|
lVAL
|
0a2f2b08b3
|
增加信号机和站台 显示
|
2021-02-01 18:36:07 +08:00 |
|
fan
|
07efc9ae51
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-01 18:31:23 +08:00 |
|
fan
|
fa384b79ee
|
代码调整
|
2021-02-01 18:31:09 +08:00 |
|
joylink_cuiweidong
|
077457a4ac
|
西安二号线 添加帮助 操作定义
|
2021-02-01 18:11:58 +08:00 |
|
lVAL
|
26a82237b1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-01 17:56:15 +08:00 |
|
lVAL
|
7095f145c9
|
增加 西安02 的信号机帮助和站台帮助实训
|
2021-02-01 17:56:03 +08:00 |
|
joylink_cuiweidong
|
def8b44d97
|
佛山 宁波 竞赛 车站操作 调整
|
2021-02-01 15:23:45 +08:00 |
|
joylink_cuiweidong
|
2ad9f691bf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-01 14:38:09 +08:00 |
|
joylink_cuiweidong
|
2aadda7606
|
福州一号线 实训 操作定义 代码调整
|
2021-02-01 14:37:52 +08:00 |
|
fan
|
900a858010
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-01 14:31:28 +08:00 |
|
fan
|
8982177e99
|
代码调整
|
2021-02-01 14:31:16 +08:00 |
|
lVAL
|
811bf75a8e
|
注释掉 实训和指令发送中的log
|
2021-02-01 13:49:48 +08:00 |
|
lVAL
|
9071ce93e9
|
线路：南京2
问题：行调 交出控制、接受控制实训流程问题
|
2021-02-01 13:46:59 +08:00 |
|
lVAL
|
2e890a378c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-01 13:44:14 +08:00 |
|
lVAL
|
f0e3ee1f49
|
线路：南京2
问题：修改现地 强制站控，交出控制权，接受控制的实训流程。
|
2021-02-01 13:43:48 +08:00 |
|
joylink_cuiweidong
|
c4619c0784
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-01 11:24:14 +08:00 |
|
joylink_cuiweidong
|
7818a149c4
|
福州一号线 道岔计轴预复位 操作定义调整
|
2021-02-01 11:23:37 +08:00 |
|
fan
|
e0245e4cbd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-01 10:19:07 +08:00 |
|
fan
|
143f517097
|
卡斯柯 紧急站控实训调整
|
2021-02-01 10:18:54 +08:00 |
|
lVAL
|
ad385fbe97
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-29 18:37:37 +08:00 |
|
lVAL
|
0598e48b42
|
修改宁波线状态刷新
|
2021-01-29 18:37:10 +08:00 |
|
joylink_cuiweidong
|
7e173b4c4c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-29 17:32:09 +08:00 |
|
joylink_cuiweidong
|
8c4f24f9e2
|
bug101 交控仿真路线:控制模式转换的操作与手册不一致 实训 调整
|
2021-01-29 17:31:48 +08:00 |
|
fan
|
96256020c5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-29 17:17:50 +08:00 |
|
fan
|
39e7cb83b9
|
南京二选中区段调整
|
2021-01-29 17:17:41 +08:00 |
|
lVAL
|
8c25f274f5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-29 16:21:35 +08:00 |
|
lVAL
|
fa5b6027d3
|
删除无用打印
|
2021-01-29 16:21:19 +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 |
|
fan
|
84a438a74d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-29 15:01:50 +08:00 |
|
fan
|
318d120db6
|
BUG 107: 浙大网新仿真线路：对立的功能应设置有误
|
2021-01-29 15:01:38 +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 |
|
lVAL
|
20a71051c7
|
线路：佛州
问题：设置限速和取消限速，配置逻辑区段生成实训
|
2021-01-29 11:08:03 +08:00 |
|
fan
|
dadeca50fe
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-29 10:04:07 +08:00 |
|
fan
|
009f3981ff
|
BUG 153:课程设计实训管理：操作类型查询不可更换，更换后显示无数据
|
2021-01-29 10:03:49 +08:00 |
|
joylink_cuiweidong
|
67d7008ec0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-29 09:57:39 +08:00 |
|
joylink_cuiweidong
|
45572a9f2a
|
删除不需要的文件
|
2021-01-29 09:57:22 +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 |
|
joylink_cuiweidong
|
a9f47fdeb2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-28 18:49:59 +08:00 |
|
joylink_cuiweidong
|
381f26b661
|
成都三号线 设置/取消 自动进路/自动折返 实训 操作定义代码调整
|
2021-01-28 18:49:36 +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
|
cc8c3aac36
|
成都工业调整配置
|
2021-01-28 18:03:17 +08:00 |
|
fan
|
370d538345
|
成都工业登录页面调整
|
2021-01-28 17:53:08 +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 |
|
joylink_cuiweidong
|
cea7af664e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-28 14:45:52 +08:00 |
|
joylink_cuiweidong
|
909a5cb7f9
|
宁波一、三号线，西安二号线 运行图 转换函数 调整
|
2021-01-28 14:45:33 +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
|
035ae9d367
|
修改 南京2 实训配置
|
2021-01-28 09:27:32 +08:00 |
|
joylink_cuiweidong
|
a034a9ed91
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-27 18:38:59 +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 |
|
joylink_cuiweidong
|
e39bb88a1d
|
代码调整
|
2021-01-27 18:38:27 +08:00 |
|
lVAL
|
ba5de90773
|
配置 南京2实训
|
2021-01-27 18:32:16 +08:00 |
|
sunzhenyu
|
169bd38449
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-27 18:06:48 +08:00 |
|
sunzhenyu
|
59a785056d
|
更新北交大三维车站模型
|
2021-01-27 18:06:40 +08:00 |
|
fan
|
72e25c49f3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-27 15:54:07 +08:00 |
|
fan
|
3c499369a6
|
meger
|
2021-01-27 15:53:09 +08:00 |
|
joylink_cuiweidong
|
68fc7c255f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-27 15:40:18 +08:00 |
|
joylink_cuiweidong
|
8f82b0fdd5
|
北交大客流 车站人数代码调整
地图绘图代码调整
|
2021-01-27 15:39:53 +08:00 |
|
fan
|
cb894aec34
|
南京二号线操作调整显示
|
2021-01-27 15:37:01 +08:00 |
|
lVAL
|
fbcfca4f9b
|
优化 南京2 提示信息的代码
|
2021-01-27 13:42:33 +08:00 |
|
lVAL
|
89c0b4f693
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-27 13:31:31 +08:00 |
|
lVAL
|
d5dd86be69
|
删除南京2 无用代码
|
2021-01-27 13:31:18 +08:00 |
|
joylink_cuiweidong
|
ccaceffeca
|
删除暂不需要文件
|
2021-01-27 13:13:44 +08:00 |
|
joylink_cuiweidong
|
b2adbb8eda
|
删除不需要的文件
|
2021-01-27 13:06:24 +08:00 |
|
lVAL
|
14e7acd715
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/nanjing_02/menus/menuBar.vue
|
2021-01-27 11:25:23 +08:00 |
|
lVAL
|
62d52fd27f
|
修改南京2错误提示功能
|
2021-01-27 11:24:14 +08:00 |
|
joylink_cuiweidong
|
030a603da4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-27 10:40:50 +08:00 |
|
joylink_cuiweidong
|
c52474b771
|
宁波三号线（泰雷兹）
扣车后没有显示扣车标识修改
|
2021-01-27 10:38:34 +08:00 |
|
fan
|
d562037967
|
调整报警闪烁
|
2021-01-27 10:18:47 +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
|
b237d09402
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-27 09:27:59 +08:00 |
|
lVAL
|
ad0590dfe4
|
修改南京2 登录密码为1 以及限制普通站不能登录
|
2021-01-27 09:27:44 +08:00 |
|
fan
|
86dfe7a5f5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-26 18:19:14 +08:00 |
|
fan
|
f92e017f1b
|
调整南京二号线岔区设限显示
|
2021-01-26 18:19:04 +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
|
de1d8bb0db
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-26 17:13:20 +08:00 |
|
fan
|
98488d3095
|
BUG 106:浙大网新线路点击剧本加载再退出后，车站切换框显示无数据
|
2021-01-26 17:13:00 +08:00 |
|
sunzhenyu
|
1b0fddd2e8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-26 16:51:42 +08:00 |
|
sunzhenyu
|
bb64976818
|
修改三维轨道生成参数，修改tdt生成位置
|
2021-01-26 16:51:32 +08:00 |
|
fan
|
832e2a0ddd
|
修改单位调整
|
2021-01-26 16:22:31 +08:00 |
|
fan
|
aa74b86dbd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-26 16:19:39 +08:00 |
|
fan
|
abed3ef7c1
|
BUG108: 浙大网新仿真：道岔单解时出现字母“E”后，右键点击出现“使能”，此时不点击使能，而点击空白处，再点击字母E，没有反应，并且初始化后E还在闪烁 && 南京二排列进路后封锁区段显示调整
|
2021-01-26 16:19:29 +08:00 |
|
lVAL
|
0c527d8b63
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-26 15:03:00 +08:00 |
|
lVAL
|
5858bb1eb3
|
优化代码
|
2021-01-26 15:02:39 +08:00 |
|
fan
|
324f662c8f
|
BUG109: 浙大网新：站台设置停站时间时有误，详细请看图
|
2021-01-26 14:54:37 +08:00 |
|
joylink_cuiweidong
|
103cecffa1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-26 14:40:41 +08:00 |
|
joylink_cuiweidong
|
519916458f
|
成都三号线 实训操作定义代码调整
|
2021-01-26 14:40:17 +08:00 |
|
fan
|
399e4be4e8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-26 14:35:23 +08:00 |
|
fan
|
b193ef5f7e
|
成都工业职业技术学院 登录页面
|
2021-01-26 14:35:12 +08:00 |
|
joylink_cuiweidong
|
2525d57f8f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-26 14:04:36 +08:00 |
|
joylink_cuiweidong
|
bd9917c0ca
|
道岔区段 切除闪烁绘图代码调整
|
2021-01-26 14:04:17 +08:00 |
|
fan
|
4f911227fe
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-26 13:07:11 +08:00 |
|
fan
|
c32009a9d2
|
南京二号线折行显示列车调整
|
2021-01-26 13:07:02 +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
|
c2ecb60cd7
|
修改 南京2 刚登陆进去执行操作异常的问题
|
2021-01-26 10:42:39 +08:00 |
|
lVAL
|
8d9114cfa7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-26 09:36:04 +08:00 |
|
lVAL
|
c3553c87f1
|
修改 南京2现地登录操作问题
|
2021-01-26 09:35:54 +08:00 |
|
joylink_cuiweidong
|
212b286408
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-25 18:36:38 +08:00 |
|
joylink_cuiweidong
|
da2caf0396
|
运行图 代码调整
|
2021-01-25 18:36:22 +08:00 |
|
lVAL
|
8ecbee01b2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-25 18:23:32 +08:00 |
|
lVAL
|
d325a10c40
|
配置宁波3 线路 实训
|
2021-01-25 18:23:23 +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
|
6b0d8cf772
|
代码调整
|
2021-01-25 17:47:49 +08:00 |
|
joylink_cuiweidong
|
db35ba370e
|
运行图编制代码调整
|
2021-01-25 17:45:39 +08:00 |
|
lVAL
|
388bd1e328
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-25 17:43:46 +08:00 |
|
lVAL
|
1f9ade8ec8
|
修改宁波一 实训代码格式
|
2021-01-25 17:43:38 +08:00 |
|
fan
|
b427f8a8e6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-25 17:42:11 +08:00 |
|
fan
|
f4db53df3f
|
调整南京二号线显示问题
|
2021-01-25 17:42:01 +08:00 |
|
fan
|
5bc124fe54
|
用户管理单位管理页面调整
|
2021-01-25 17:30:44 +08:00 |
|
lVAL
|
78863b868c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-25 17:30:27 +08:00 |
|
lVAL
|
76a7d1fe83
|
修改西安二号线实训折返不发指令的问题
|
2021-01-25 17:30:16 +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
|
6d70fd3fb2
|
成都三号线（交控）现地 人工控/自动控 操作定义代码调整
|
2021-01-25 14:05:51 +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
|
41447e97dc
|
代码调整
|
2021-01-25 13:51:13 +08:00 |
|
joylink_cuiweidong
|
d3546c5de2
|
岔心鼠标事件 绘图代码调整
|
2021-01-25 13:48:37 +08:00 |
|
fan
|
3b6563351b
|
运行图层级调整
|
2021-01-25 10:30:43 +08:00 |
|
fan
|
98342c2423
|
南京二号线遮盖信号机的颜色调整
|
2021-01-25 10:23:13 +08:00 |
|
fan
|
7e026191c9
|
报警和记录框无法拖动，是固定的。
|
2021-01-25 09:57:20 +08:00 |
|
fan
|
a55f69a3cb
|
南京二号线 延时解锁
|
2021-01-22 21:28:30 +08:00 |
|
fan
|
e574bcf2eb
|
南二 挤岔恢复
|
2021-01-22 21:14:20 +08:00 |
|
fan
|
cf871345e3
|
注释南京二列车操作
|
2021-01-22 19:52:08 +08:00 |
|
fan
|
67a061d9da
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-22 19:35:23 +08:00 |
|
fan
|
32f68ed895
|
道岔状态调整
|
2021-01-22 19:35:14 +08:00 |
|
joylink_cuiweidong
|
8373a96229
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-22 19:18:37 +08:00 |
|
joylink_cuiweidong
|
8eee00f454
|
代码调整
|
2021-01-22 19:18:16 +08:00 |
|
lVAL
|
d9de6c2548
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-22 18:58:33 +08:00 |
|
lVAL
|
b5d69120ff
|
增加 宁波三 实训部分配置，以及修改西安控制模式操作提示未知错误的问题
|
2021-01-22 18:58:01 +08:00 |
|
fan
|
0d8a6df9de
|
预复位调整
|
2021-01-22 18:33:21 +08:00 |
|
fan
|
3407d4d13b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-22 17:47:05 +08:00 |
|
fan
|
d2d854b0c0
|
预复位调整
|
2021-01-22 17:46:51 +08:00 |
|
lVAL
|
4211651bcf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-22 17:39:26 +08:00 |
|
lVAL
|
584a30a634
|
增加 区段的新建列车操作，以及菜单实训operate配置
|
2021-01-22 17:39:12 +08:00 |
|
fan
|
97d8a66ccb
|
道岔的故障和预复位的显示
|
2021-01-22 16:55:00 +08:00 |
|
sunzhenyu
|
1ca93b98e5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-22 16:47:36 +08:00 |
|
sunzhenyu
|
4a6b004621
|
注释
|
2021-01-22 16:47:24 +08:00 |
|
fan
|
052b1c3688
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-22 15:40:27 +08:00 |
|
fan
|
fbbf2be009
|
BUG: 126 => 在已发布地图列表中的某个城市退出仿真后，重新点击另一个城市，页面显示有误，建议修改
|
2021-01-22 15:40:16 +08:00 |
|
lVAL
|
527f59cc58
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-22 15:00:50 +08:00 |
|
lVAL
|
2ec8d1686a
|
福州线排查操作和实训情况
|
2021-01-22 15:00:36 +08:00 |
|
fan
|
c80e08292c
|
调整实际长度 小数计算
|
2021-01-22 14:51:37 +08:00 |
|
fan
|
420163ec07
|
逻辑区段实际长度设置调整&实训平台二级主页
|
2021-01-22 14:47:49 +08:00 |
|
fan
|
e0fe554699
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-22 13:59:42 +08:00 |
|
fan
|
4a0c7e1e95
|
逻辑区段实际长度设置调整
|
2021-01-22 13:59:32 +08:00 |
|
lVAL
|
6d443c9bd0
|
增加 案例 https://joylink.club/oss/portal/cases/江苏电子信息职业学院-城市轨道交通行车组织综合实训室.pdf
|
2021-01-22 11:15:13 +08:00 |
|
lVAL
|
277252916c
|
修改成都3操作优化，以及实训配置修正
|
2021-01-22 10:57:27 +08:00 |
|
joylink_cuiweidong
|
5d7810b6f9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-21 19:19:41 +08:00 |
|
joylink_cuiweidong
|
3e6da71787
|
代码调整
|
2021-01-21 19:19:20 +08:00 |
|
fan
|
2cdbc1ee78
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-21 19:12:17 +08:00 |
|
fan
|
258796555e
|
车队进路调整
|
2021-01-21 19:11:50 +08:00 |
|
joylink_cuiweidong
|
2b6e1ca117
|
岔心 代码调整
|
2021-01-21 19:02:28 +08:00 |
|
joylink_cuiweidong
|
a9ea00c0c8
|
南京十一站 代码调整
|
2021-01-21 18:39:00 +08:00 |
|
fan
|
60e82ec34e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-21 17:45:09 +08:00 |
|
fan
|
ff6dac7c60
|
南二强解道岔&强解区段
|
2021-01-21 17:44:57 +08:00 |
|
lVAL
|
49b7de7cae
|
调整西安 开放自动进路和关闭自动进路 实训
|
2021-01-21 17:08:17 +08:00 |
|
lVAL
|
84306b2507
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-21 17:00:22 +08:00 |
|
lVAL
|
1e488cdec6
|
西安2号线，修改开放自动进路和取消自动进路 实训配置
|
2021-01-21 17:00:12 +08:00 |
|
lVAL
|
0b9aeacda3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-21 16:38:52 +08:00 |
|
joylink_cuiweidong
|
5fec6faef3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-21 16:38:49 +08:00 |
|
lVAL
|
2f2316e353
|
增加西安2区故解流程
|
2021-01-21 16:38:44 +08:00 |
|
joylink_cuiweidong
|
21f4b004c9
|
西安二号线 开放自动进路/关闭自动进路 操作添加
|
2021-01-21 16:38:29 +08:00 |
|
fan
|
45fd2d348b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-21 16:32:22 +08:00 |
|
fan
|
5b69262124
|
南京二好像长闪短闪调整
|
2021-01-21 16:32:11 +08:00 |
|
joylink_cuiweidong
|
8e958875f4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-21 15:54:13 +08:00 |
|
joylink_cuiweidong
|
e5069bbe92
|
西安二号线 部分操作 暂时隐藏
|
2021-01-21 15:53:51 +08:00 |
|
lVAL
|
56df3cd81c
|
添加 南京2 道岔 强解道岔配置
|
2021-01-21 15:53:37 +08:00 |
|
lVAL
|
bdbd5b9cc0
|
删除 福州2现地定位反位右键操作
|
2021-01-21 15:49:52 +08:00 |
|
lVAL
|
5bf71f2d7a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-21 15:28:32 +08:00 |
|
lVAL
|
c3c3548574
|
修改，西安2 删除现地 信号机封锁解封配置
|
2021-01-21 15:28:21 +08:00 |
|
joylink_cuiweidong
|
5b1e331d26
|
岔心区段 批量设置集中站 调整
|
2021-01-21 14:49:02 +08:00 |
|
joylink_cuiweidong
|
be9e15567e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-21 14:15:18 +08:00 |
|
joylink_cuiweidong
|
16f255fcae
|
bug136 南铁院11站：现地仿真里岔心设置限速后不显示数字 调整
|
2021-01-21 14:15:00 +08:00 |
|
fan
|
e71fe4cea8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-21 13:45:32 +08:00 |
|
fan
|
6df9350155
|
卡斯柯实训调整&南京二号线封锁调整
|
2021-01-21 13:45:20 +08:00 |
|
sunzhenyu
|
19fb971847
|
修改三维驾驶非驾驶车辆更新逻辑
|
2021-01-21 11:16:19 +08:00 |
|
sunzhenyu
|
f13b062db8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-21 11:14:02 +08:00 |
|
sunzhenyu
|
6647ff9b58
|
修改三维驾驶非驾驶车辆更新逻辑
|
2021-01-21 11:13:53 +08:00 |
|
lVAL
|
eac5a23ddf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/foshan_01/operationConfig.js
|
2021-01-21 11:10:52 +08:00 |
|
lVAL
|
b8a36028fd
|
增加 佛山线全线限速配置注释
|
2021-01-21 11:09:51 +08:00 |
|
joylink_cuiweidong
|
1d32bd66b4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/foshan_01/operationConfig.js
|
2021-01-21 11:04:25 +08:00 |
|
joylink_cuiweidong
|
cd9aa64552
|
佛山线路 实训代码调整
|
2021-01-21 11:02:04 +08:00 |
|
lVAL
|
322f0724c1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-21 10:42:27 +08:00 |
|
lVAL
|
f0829b768b
|
增加佛州线实训配置
|
2021-01-21 10:42:17 +08:00 |
|
fan
|
356ec2db79
|
南京二号线调整
|
2021-01-21 10:13:30 +08:00 |
|
fan
|
ac4580f1b3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-21 10:06:13 +08:00 |
|
fan
|
89700f2245
|
卡斯柯调整
|
2021-01-21 10:05:59 +08:00 |
|
joylink_cuiweidong
|
c5da33da6f
|
代码调整
|
2021-01-20 18:47:19 +08:00 |
|
lVAL
|
8e634b78e9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 18:45:24 +08:00 |
|
lVAL
|
9ed523fb86
|
增加佛州控制模式
|
2021-01-20 18:45:05 +08:00 |
|
fan
|
50321992c0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 18:29:24 +08:00 |
|
fan
|
75e48959ba
|
调整生成课程和试卷问题&设置运行等级报错调整
|
2021-01-20 18:29:12 +08:00 |
|
joylink_cuiweidong
|
ea99e7a9e4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 18:13:58 +08:00 |
|
lVAL
|
2dc837020c
|
增加控制模式实训
|
2021-01-20 18:14:03 +08:00 |
|
joylink_cuiweidong
|
7171601b06
|
佛山线路 实训 代码调整
|
2021-01-20 18:13:42 +08:00 |
|
lVAL
|
2408e28509
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/foshan_01/operationConfig.js
|
2021-01-20 17:53:00 +08:00 |
|
lVAL
|
87f2d274d1
|
修改指令
|
2021-01-20 17:52:34 +08:00 |
|
joylink_cuiweidong
|
913a9229d9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 17:47:22 +08:00 |
|
joylink_cuiweidong
|
cc462621f5
|
佛山线 实训 代码调整
|
2021-01-20 17:47:05 +08:00 |
|
lVAL
|
d2a7098a90
|
删除测试 debugger
|
2021-01-20 17:43:56 +08:00 |
|
lVAL
|
5cacc9b6e6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 17:42:50 +08:00 |
|
lVAL
|
338a7c9cbe
|
增加信号机封锁解封 实训
|
2021-01-20 17:42:42 +08:00 |
|
fan
|
2440e1e280
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 16:47:31 +08:00 |
|
fan
|
295ddee738
|
调整showMode初始值
|
2021-01-20 16:47:20 +08:00 |
|
lVAL
|
8d25d8c1d8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 16:33:31 +08:00 |
|
lVAL
|
711f0bc70a
|
修改 成都3 实训配置情况
|
2021-01-20 16:33:19 +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 |
|
lVAL
|
a4a7494975
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 16:10:25 +08:00 |
|
lVAL
|
78822e9c30
|
成都3 实训引导总锁配置，先注释掉
|
2021-01-20 16:10:14 +08:00 |
|
fan
|
2e4cdc698e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 16:07:37 +08:00 |
|
fan
|
70045c8f87
|
现地行调条件显示调整
|
2021-01-20 16:07:10 +08:00 |
|
lVAL
|
5764a103c8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 15:53:51 +08:00 |
|
lVAL
|
c8e2b30271
|
增加 成都3 中控、站控、紧急站控、扣车、设置跳停、取消跳停实训
|
2021-01-20 15:53:36 +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 |
|
sunzhenyu
|
1286bb79ba
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 15:41:30 +08:00 |
|
sunzhenyu
|
0fb8eeb52b
|
修改三维驾驶和沙盘读取站场图内外侧数据验证
|
2021-01-20 15:41:20 +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
|
a7d4e0c195
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 13:50:57 +08:00 |
|
fan
|
330f58eba4
|
右键选择 进路快捷操作盘
|
2021-01-20 13:50:37 +08:00 |
|
joylink_cuiweidong
|
79f0de576c
|
代码调整
|
2021-01-20 11:16:09 +08:00 |
|
joylink_cuiweidong
|
5cbfa16d6c
|
bug104 交控线行调仿真：站台信息显示的默认停站时间不正确 修改
|
2021-01-20 10:16:15 +08:00 |
|
joylink_cuiweidong
|
3c76a3139c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 09:54:26 +08:00 |
|
joylink_cuiweidong
|
5b5d635f07
|
bug103 设置停站时间范围改为15-300S 修改
|
2021-01-20 09:54:01 +08:00 |
|
fan
|
92929a02fc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-19 19:03:53 +08:00 |
|
fan
|
0126066322
|
调整传输信号机选择
|
2021-01-19 19:03:42 +08:00 |
|
lVAL
|
332aa9b61a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-19 18:22:14 +08:00 |
|
lVAL
|
35a98a6e00
|
修改 nameAlone 报错的优化
|
2021-01-19 18:22:04 +08:00 |
|
joylink_cuiweidong
|
10ed69f5ec
|
代码调整
|
2021-01-19 17:44:18 +08:00 |
|
joylink_cuiweidong
|
745dbd6859
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-19 17:15:07 +08:00 |
|
joylink_cuiweidong
|
df6ede1e4b
|
南京二号线 站台操作调整
|
2021-01-19 17:14:47 +08:00 |
|
sunzhenyu
|
f798de0fcf
|
修改三维沙盘站台提示标位置，去除无用log
|
2021-01-19 16:39:42 +08:00 |
|
sunzhenyu
|
4b09761b01
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-19 16:27:17 +08:00 |
|
sunzhenyu
|
a2bb806b03
|
修改三维铁轨透明贴图渲染，修改佛山线场景漫游轨迹
|
2021-01-19 16:27:09 +08:00 |
|
fan
|
b4059db243
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-19 16:08:04 +08:00 |
|
fan
|
c6e9e1fe38
|
列车状态调整
|
2021-01-19 16:07:32 +08:00 |
|
joylink_cuiweidong
|
9828c65b26
|
代码调整
|
2021-01-19 14:07:57 +08:00 |
|
joylink_cuiweidong
|
be344cf815
|
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-19 14:00:32 +08:00 |
|
joylink_cuiweidong
|
d404ed01dc
|
代码调整
|
2021-01-19 13:57:35 +08:00 |
|
fan
|
606c4ae301
|
menuButton调整
|
2021-01-19 13:56:45 +08:00 |
|
fan
|
12be0c61cb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-19 13:26:05 +08:00 |
|
fan
|
daea6e1760
|
传输信号机选中状态
|
2021-01-19 13:25:53 +08:00 |
|
lVAL
|
5f80334433
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-19 13:04:06 +08:00 |
|
lVAL
|
696af622b7
|
调整南京2岔芯设置限速和设置封锁
|
2021-01-19 13:03:43 +08:00 |
|
fan
|
49405666df
|
传输信号机参数调整
|
2021-01-19 11:18:24 +08:00 |
|
fan
|
732c44fea0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-19 11:10:04 +08:00 |
|
fan
|
145259d3b5
|
传输信号机 && 佛山进路预览调整
|
2021-01-19 11:09:53 +08:00 |
|
lVAL
|
7afd9025b5
|
增加南京2站台取消设置指令
|
2021-01-19 10:39:01 +08:00 |
|
lVAL
|
396d7ec14e
|
修改南京2号线菜单配置方式
|
2021-01-19 10:31:31 +08:00 |
|
lVAL
|
267a815956
|
修改南京2按钮配置
|
2021-01-19 09:54:45 +08:00 |
|
joylink_cuiweidong
|
05a8c85d6b
|
代码调整
|
2021-01-19 09:20:37 +08:00 |
|
joylink_cuiweidong
|
4cbc3de4ea
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-18 18:06:23 +08:00 |
|
joylink_cuiweidong
|
ba80512efa
|
南京二号线 站台添加 月台 按钮
|
2021-01-18 18:06:08 +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 |
|
fan
|
07ad4c85dd
|
被覆盖代码重新提交
|
2021-01-18 17:41:46 +08:00 |
|
lVAL
|
b156097cba
|
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-18 17:35:19 +08:00 |
|
lVAL
|
aed7f034b1
|
南京2车站操作设备并且状态刷新后，页面操作菜单disabled刷新问题
|
2021-01-18 17:32:20 +08:00 |
|
fan
|
f18c48ffa8
|
南京二号线初始获取车站调整&计轴占用状态调整
|
2021-01-18 17:24:00 +08:00 |
|
fan
|
057687a678
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-18 16:57:03 +08:00 |
|
lVAL
|
9617c36d01
|
修改控制模式 disabled 控制
|
2021-01-18 16:53:54 +08:00 |
|
fan
|
1ba5d404b5
|
南京二号线进路锁闭封锁状态调整
|
2021-01-18 16:51:45 +08:00 |
|
fan
|
58f1bc5950
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-18 16:22:38 +08:00 |
|
fan
|
cff6a78d3a
|
南京二号线行调点击空白关闭
|
2021-01-18 16:22:26 +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
|
14091957d7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-18 15:41:43 +08:00 |
|
fan
|
5f3300e889
|
信号机添加所属车站&批量设置
|
2021-01-18 15:41:28 +08:00 |
|
joylink_cuiweidong
|
d322aad5d4
|
南京二号线 站台安全门 通信正常开启状态 调整
|
2021-01-18 15:16:00 +08:00 |
|
fan
|
6aea2334e6
|
南京二号线 控制模式none 车站字体闪烁
|
2021-01-18 14:10:55 +08:00 |
|
joylink_cuiweidong
|
74b9c8cc7e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-18 13:40:29 +08:00 |
|
joylink_cuiweidong
|
5687ffc5a8
|
南京二号线 区段 轨区设限 代码调整
|
2021-01-18 13:37:45 +08:00 |
|
fan
|
f60054ccad
|
现地切行调后 车站显示问题调整
|
2021-01-18 11:29:03 +08:00 |
|
fan
|
4dc2382075
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-18 10:52:19 +08:00 |
|
fan
|
fa412d1079
|
南京二号线 状态调整
|
2021-01-18 10:52:06 +08:00 |
|
lVAL
|
20880fe1fe
|
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-15 18:53:43 +08:00 |
|
lVAL
|
63881d156c
|
修改指令配置
|
2021-01-15 18:52:28 +08:00 |
|
fan
|
e7f2d73857
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 18:42:43 +08:00 |
|
fan
|
649691b1c3
|
操作表盘调整
|
2021-01-15 18:42:17 +08:00 |
|
joylink_cuiweidong
|
3e1696d081
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 18:36:52 +08:00 |
|
joylink_cuiweidong
|
69737a06f0
|
区段 颜色配置文件调整
|
2021-01-15 18:36:13 +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
|
a70de561ba
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 18:10:23 +08:00 |
|
lVAL
|
fd5d8245c7
|
修改代码
|
2021-01-15 18:10:14 +08:00 |
|
fan
|
1c9c8aab8a
|
南京二号线 道岔 侧防 和进路锁闭 优先级调整
|
2021-01-15 18:00:32 +08:00 |
|
fan
|
bacdca5e19
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 17:53:05 +08:00 |
|
fan
|
844b2ee382
|
南京二号线引导进路
|
2021-01-15 17:52:54 +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
|
0eb7ca8a06
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 17:17:33 +08:00 |
|
joylink_cuiweidong
|
f61df9b1e8
|
岔心状态 绘图代码调整
|
2021-01-15 17:17:17 +08:00 |
|
fan
|
087f1123b8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 17:00:10 +08:00 |
|
fan
|
45869c5362
|
信号机状态调整
|
2021-01-15 16:59:58 +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
|
89dacd7deb
|
增加南京2号线 信号机配置
|
2021-01-15 16:40:23 +08:00 |
|
lVAL
|
5b4e15a979
|
修改操作提示
|
2021-01-15 16:12:49 +08:00 |
|
lVAL
|
c06bad3005
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 16:09:35 +08:00 |
|
lVAL
|
cc5ee4661f
|
修改 发送命令后 提示的信息
|
2021-01-15 16:09:26 +08:00 |
|
fan
|
a60209a10f
|
信号机状态调整
|
2021-01-15 16:01:15 +08:00 |
|
lVAL
|
bc8f65c149
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 15:25:49 +08:00 |
|
lVAL
|
57acd71924
|
修改南京2蓝色颜色
|
2021-01-15 15:25:41 +08:00 |
|
fan
|
e5611cebc8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 15:24:30 +08:00 |
|
fan
|
cd5bcfe888
|
信号机&道岔状态调整
|
2021-01-15 15:24:19 +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
|
f21cfd2256
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 13:35:28 +08:00 |
|
fan
|
93eaaacd96
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 13:34:35 +08:00 |
|
fan
|
0caf3d233a
|
排列进路
|
2021-01-15 13:34:25 +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
|
25e89c9b1c
|
配置强解 道岔和区段，（道岔等待后端确定指令）
|
2021-01-15 12:25:25 +08:00 |
|
lVAL
|
2024cef7c9
|
修改南京仿真bar遮挡运行图的问题
|
2021-01-15 12:18:27 +08:00 |
|
fan
|
12925e92bb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 11:21:22 +08:00 |
|
fan
|
29c8e5b4b9
|
暂提
|
2021-01-15 11:21:11 +08:00 |
|
lVAL
|
80f8ecf19f
|
修改南京2号线 tempData 报错问题
|
2021-01-15 11:16:17 +08:00 |
|
lVAL
|
356042f673
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 11:00:05 +08:00 |
|
lVAL
|
ec30635c02
|
修改应答器图层以及回车修改属性的问题
|
2021-01-15 10:59:58 +08:00 |
|
joylink_cuiweidong
|
04e4df6225
|
代码调整
|
2021-01-15 10:38:35 +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
|
4c89a777ba
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 09:53:46 +08:00 |
|
lVAL
|
c6c59f48b7
|
修改代码
|
2021-01-15 09:53:37 +08:00 |
|
fan
|
0671c6e733
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 09:42:36 +08:00 |
|
fan
|
15928a6248
|
道岔封锁状态调整
|
2021-01-15 09:42:19 +08:00 |
|
lVAL
|
1c06c408ff
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 09:39:35 +08:00 |
|
lVAL
|
cb364658fc
|
修改替换错误
|
2021-01-15 09:39:27 +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
|
41f1253746
|
修改 南京2号线 中心操作弹窗为非模式对话框
|
2021-01-15 09:34:16 +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
|
c8d0bf50f5
|
代码调整
|
2021-01-14 17:11:10 +08:00 |
|
joylink_cuiweidong
|
06edd5f531
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-14 17:00:04 +08:00 |
|
joylink_cuiweidong
|
3dd6696140
|
代码调整
|
2021-01-14 16:59:41 +08:00 |
|
fan
|
359e24dfbd
|
merge
|
2021-01-14 16:35:45 +08:00 |
|
fan
|
ab804e3b95
|
南京二号线状态调整 道岔长闪
|
2021-01-14 16:26:04 +08:00 |
|
joylink_cuiweidong
|
c4f6cde2c4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-14 16:04:03 +08:00 |
|
joylink_cuiweidong
|
28babc78f9
|
岔心 绘图调整
|
2021-01-14 16:03:48 +08:00 |
|
lVAL
|
2fc70489eb
|
修改南京2号线菜单皮肤
|
2021-01-14 15:44:56 +08:00 |
|
lVAL
|
51096d5ea1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-14 15:32:33 +08:00 |
|
lVAL
|
eb7fa1f5cb
|
修改实现南京2行调和现地界面操作
|
2021-01-14 15:32:17 +08:00 |
|
joylink_cuiweidong
|
8118b1ffad
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-14 14:59:12 +08:00 |
|
joylink_cuiweidong
|
cadda00719
|
区段 物理区段 实际长度修改 bug调整
|
2021-01-14 14:58:42 +08:00 |
|
fan
|
ec87dc8eaf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-14 14:43:03 +08:00 |
|
fan
|
9c7c0f674e
|
南京二号线状态调整
|
2021-01-14 14:42:53 +08:00 |
|
lVAL
|
44adeaf24a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-14 14:15:18 +08:00 |
|
lVAL
|
22403b198d
|
修改南京2号线菜单，以及样式
|
2021-01-14 14:15:02 +08:00 |
|
joylink_cuiweidong
|
845f10caf6
|
岔心绘图代码调整
bug调整：新建完一个信号机 三个状态不发生改变
|
2021-01-14 13:04:04 +08:00 |
|
joylink_cuiweidong
|
3be5df98e8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-13 18:33:21 +08:00 |
|
joylink_cuiweidong
|
becb6a03df
|
岔心代码调整
|
2021-01-13 18:33:07 +08:00 |
|
lVAL
|
1dfa8f5b19
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-13 18:08:02 +08:00 |
|
lVAL
|
37bc98d706
|
修改应答器 计算方式
|
2021-01-13 18:07:49 +08:00 |
|
joylink_cuiweidong
|
c42a184b7b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-13 17:54:11 +08:00 |
|
joylink_cuiweidong
|
7ac59f6006
|
岔心 绘图代码调整
|
2021-01-13 17:53:51 +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
|
fd3f82e7ba
|
修改炼精二号线 逻辑区段名称大小
|
2021-01-13 14:18:48 +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 |
|
|
|
032ec93af4
|
Merge remote-tracking branch 'origin/test'
|
2021-01-12 23:46:38 +08:00 |
|
|
|
2d154f1611
|
设备登录行值显示
|
2021-01-12 23:46:07 +08:00 |
|
|
|
8eb293f074
|
Merge remote-tracking branch 'origin/test'
|
2021-01-12 23:14:34 +08:00 |
|
|
|
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 |
|
joylink_cuiweidong
|
7378220e85
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-12 18:07:08 +08:00 |
|
joylink_cuiweidong
|
12acee5bc7
|
代码调整
|
2021-01-12 18:06:52 +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 |
|
joylink_cuiweidong
|
b33e4b92ed
|
暂时 注释 西安二号线 未实现的 功能
|
2021-01-12 17:57:44 +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 |
|
lVAL
|
ec5be4bccb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-12 11:00:38 +08:00 |
|
lVAL
|
8c261bb3a6
|
优化应答器 状态处理功能
|
2021-01-12 11:00:16 +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
|
ec5b0e0a1e
|
西门子列车未实现操作注释
|
2021-01-11 11:04:14 +08:00 |
|
fan
|
b248e69ffe
|
导入学生信息添加校验&哈尔滨打包不再区分路由文件
|
2021-01-11 10:55:07 +08:00 |
|
