lVAL
|
b7b90fe707
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-02 19:00:15 +08:00 |
|
fan
|
3e50519732
|
宁波一实训折返策略调整
|
2021-02-02 19:00:48 +08:00 |
|
lVAL
|
6dd4e305b3
|
修改实训配置
|
2021-02-02 19:00:03 +08:00 |
|
fan
|
f5e0539e6d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-02 18:55:42 +08:00 |
|
fan
|
83a1eecb40
|
宁波一实训折返策略调整
|
2021-02-02 18:55:33 +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
|
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 |
|