fan
|
b24e59bc9a
|
代码调整
|
2020-12-28 16:41:37 +08:00 |
|
joylink_cuiweidong
|
0b606fbc56
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-28 16:25:49 +08:00 |
|
joylink_cuiweidong
|
dbbd817aad
|
哈尔滨仿真线路里的交出控制功能逻辑问题 （bug12）代码调整
|
2020-12-28 16:25:29 +08:00 |
|
fan
|
908aa12c21
|
bug: 11 设置运行等级显示问题
|
2020-12-28 16:00:55 +08:00 |
|
fan
|
e9a0359b1f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-28 15:01:35 +08:00 |
|
fan
|
16206cd003
|
bug: 1 & 紧急停车调整 & bug: 10
|
2020-12-28 15:01:25 +08:00 |
|
joylink_cuiweidong
|
cdb3ab25c0
|
发布内容管理添加 发布ibp盘管理
|
2020-12-28 14:27:38 +08:00 |
|
joylink_cuiweidong
|
906e12d508
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-28 13:03:18 +08:00 |
|
joylink_cuiweidong
|
fc4d130675
|
宁波三号线 站台操作调整
|
2020-12-28 13:02:33 +08:00 |
|
fan
|
614f835701
|
成都一号线两个确认运行至前方站
|
2020-12-28 11:24:25 +08:00 |
|
fan
|
8028103feb
|
综合演练行调添加ISCS&ISCS列车时刻表&ISCS信号系统
|
2020-12-28 11:20:36 +08:00 |
|
fan
|
0401569ef7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-28 09:36:34 +08:00 |
|
fan
|
2c724cd7cd
|
ibp开门允许禁止问题调整
|
2020-12-28 09:35:56 +08:00 |
|
fan
|
8b23f8aecc
|
课程设计 提到实训平台
|
2020-12-25 18:07:15 +08:00 |
|
joylink_cuiweidong
|
940f01a89e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-25 18:07:15 +08:00 |
|
joylink_cuiweidong
|
418e8b86a4
|
宁波三号线 行调操作代码调整
|
2020-12-25 18:06:08 +08:00 |
|
lVAL
|
d229e5ca59
|
调试 宁波3号线 指令
|
2020-12-25 18:05:49 +08:00 |
|
lVAL
|
ac3ee7cf7e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-25 14:24:59 +08:00 |
|
lVAL
|
d5315ef81b
|
增阿基指令分页的功能
|
2020-12-25 14:24:47 +08:00 |
|
joylink_cuiweidong
|
18a8b75a98
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-25 14:02:33 +08:00 |
|
joylink_cuiweidong
|
9dfc64ea0a
|
宁波三号线 真实运行图 导入代码调整
|
2020-12-25 14:02:03 +08:00 |
|
fan
|
ada7d199c8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-25 11:18:09 +08:00 |
|
fan
|
2aa6cb1f8f
|
哈尔滨操作调整&ibp调整
|
2020-12-25 11:17:56 +08:00 |
|
joylink_cuiweidong
|
1a7b0b0301
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-25 09:08:47 +08:00 |
|
joylink_cuiweidong
|
d74564f9b1
|
宁波三号线运行图导入代码调整
|
2020-12-25 09:08:31 +08:00 |
|
fan
|
bef7ccdbb3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-24 18:38:49 +08:00 |
|
fan
|
e32a527b91
|
indexedDb操作调整
|
2020-12-24 18:38:38 +08:00 |
|
lVAL
|
c4aba14e1f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-24 18:35:45 +08:00 |
|
lVAL
|
0d8ff932a0
|
修改组件操作报错的问题
|
2020-12-24 18:35:26 +08:00 |
|
fan
|
8e058cd4e5
|
代码调整
|
2020-12-24 17:49:55 +08:00 |
|
fan
|
4611c4b74b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-24 15:33:17 +08:00 |
|
fan
|
48e37e44f8
|
indexedDb调整
|
2020-12-24 15:33:06 +08:00 |
|
zyy
|
ff3857eceb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-24 11:30:42 +08:00 |
|
zyy
|
a415d2e25c
|
调整格式
|
2020-12-24 11:30:29 +08:00 |
|
joylink_cuiweidong
|
d9b7c7871d
|
实训平台 地图列表 tree 展开 收起代码调整
|
2020-12-24 09:35:47 +08:00 |
|
joylink_cuiweidong
|
c65d02bbd1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-23 18:58:12 +08:00 |
|
joylink_cuiweidong
|
7705afc316
|
运行图绘制代码调整
|
2020-12-23 18:57:49 +08:00 |
|
sunzhenyu
|
d3d7b0d330
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-23 18:04:04 +08:00 |
|
sunzhenyu
|
f3e235f783
|
增加三维特别数据存储和读取，修改沙盘和驾驶读取特定数据模型，修改tdt设备位置
|
2020-12-23 18:02:41 +08:00 |
|
joylink_cuiweidong
|
0e340e53f3
|
运行图编制代码调整
|
2020-12-23 17:49:51 +08:00 |
|
joylink_cuiweidong
|
6525099b5d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-23 16:40:43 +08:00 |
|
joylink_cuiweidong
|
31605db52e
|
成都三号线 实训定义调整
|
2020-12-23 16:39:53 +08:00 |
|
fan
|
a27b361dc8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-23 16:08:44 +08:00 |
|
fan
|
ff8811cd75
|
新建运行图报错调整
|
2020-12-23 16:08:35 +08:00 |
|
joylink_cuiweidong
|
217c956bae
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-23 10:23:59 +08:00 |
|
joylink_cuiweidong
|
8b04f92d7a
|
成都的三号线 信号封锁状态 绘图代码调整
|
2020-12-23 10:23:29 +08:00 |
|
fan
|
63917fd931
|
运行图调整
|
2020-12-23 09:40:57 +08:00 |
|
joylink_cuiweidong
|
bfeed11be8
|
运行图 编制代码调整
|
2020-12-22 18:50:47 +08:00 |
|
joylink_cuiweidong
|
623cbd2143
|
北交大 客流 代码调整
|
2020-12-22 18:42:27 +08:00 |
|
joylink_cuiweidong
|
d5fcc4bd36
|
北交大 客流数据 代码调整
|
2020-12-22 18:26:31 +08:00 |
|
joylink_cuiweidong
|
7f23431ebd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-22 18:16:22 +08:00 |
|
joylink_cuiweidong
|
b5ebe1599d
|
成都三号线 现地工作站 指令操作代码调整
|
2020-12-22 18:16:06 +08:00 |
|
fan
|
e38833b119
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-22 17:27:31 +08:00 |
|
fan
|
8b2cd16fe9
|
运行图调整
|
2020-12-22 17:27:04 +08:00 |
|
zyy
|
8c245127e2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-22 17:08:19 +08:00 |
|
zyy
|
580c24e785
|
调整西安二号线操作
|
2020-12-22 17:08:05 +08:00 |
|
joylink_cuiweidong
|
59371074ca
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-22 15:18:58 +08:00 |
|
joylink_cuiweidong
|
b8fde7dd74
|
地图绘图代码调整
成都三号线 行调工作站 指令代码调整
|
2020-12-22 15:18:10 +08:00 |
|
sunzhenyu
|
af7e9d8dbf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-22 14:08:33 +08:00 |
|
sunzhenyu
|
e3b9c2f682
|
修改北交大客流人数颜色图示
|
2020-12-22 14:08:25 +08:00 |
|
fan
|
fe146045f1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-22 10:48:21 +08:00 |
|
fan
|
da15b45cac
|
留言板修改
|
2020-12-22 10:48:11 +08:00 |
|
zyy
|
3a5eaaa544
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-22 10:27:30 +08:00 |
|
zyy
|
912d80caec
|
调整ibp盘创建 保存
|
2020-12-22 10:27:14 +08:00 |
|
fan
|
bd775d7178
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-22 10:03:30 +08:00 |
|
fan
|
2c23ec76e9
|
ZC故障调整
|
2020-12-22 10:03:17 +08:00 |
|
zyy
|
97636fa64a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-22 09:03:57 +08:00 |
|
zyy
|
0abba7cdbc
|
调整实训操作
|
2020-12-22 09:03:42 +08:00 |
|
fan
|
675bb8e2ab
|
异步登录调整
|
2020-12-21 22:02:49 +08:00 |
|
fan
|
4210e2fba7
|
哈尔滨 重启令解调整
|
2020-12-21 21:55:36 +08:00 |
|
fan
|
a00b5c0581
|
道岔名称 站台E灰显
|
2020-12-21 20:10:48 +08:00 |
|
fan
|
941a127216
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-21 18:33:39 +08:00 |
|
fan
|
01dc500acc
|
道岔名称 站台E灰显
|
2020-12-21 18:33:29 +08:00 |
|
joylink_cuiweidong
|
5d4422ca92
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-21 18:04:34 +08:00 |
|
joylink_cuiweidong
|
2f15b34293
|
代码调整
|
2020-12-21 18:04:21 +08:00 |
|
fan
|
87920cded9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-21 16:28:58 +08:00 |
|
fan
|
83f49ce487
|
道岔灰显
|
2020-12-21 16:28:32 +08:00 |
|
joylink_cuiweidong
|
f244f8696f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-21 16:18:58 +08:00 |
|
joylink_cuiweidong
|
c6293a8020
|
线段 站间分隔 绘图代码调整
|
2020-12-21 16:18:41 +08:00 |
|
fan
|
239da4d74b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-21 16:09:54 +08:00 |
|
fan
|
1bc7da3c53
|
哈尔滨 联锁机故障&重启令解
|
2020-12-21 16:09:43 +08:00 |
|
zyy
|
49a6fffdfc
|
调整宁波线路实操定义
|
2020-12-21 15:18:51 +08:00 |
|
zyy
|
82679405a1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-21 14:09:59 +08:00 |
|
zyy
|
0f6090c576
|
调整操作指令新增字段
|
2020-12-21 14:09:50 +08:00 |
|
joylink_cuiweidong
|
bde24b5190
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-21 13:53:02 +08:00 |
|
fan
|
7f38c06229
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-21 13:52:52 +08:00 |
|
joylink_cuiweidong
|
5f00a98526
|
箭头绘图代码调整
|
2020-12-21 13:52:45 +08:00 |
|
fan
|
01ed2bee99
|
信号机灯柱调整
|
2020-12-21 13:52:36 +08:00 |
|
joylink_cuiweidong
|
76167c0acb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-21 11:01:49 +08:00 |
|
joylink_cuiweidong
|
ffa572eb24
|
南铁院16站线路（西门子） 线路配置与绘图 代码调整
|
2020-12-21 11:01:33 +08:00 |
|
fan
|
b84b8cfd36
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-21 09:25:50 +08:00 |
|
fan
|
9d74937073
|
宁波二号线样式调整
|
2020-12-21 09:25:17 +08:00 |
|
zyy
|
baffbf36c8
|
调整南京二号线线路点击选择
|
2020-12-20 10:55:34 +08:00 |
|
joylink_fanyuhong
|
1915215083
|
取消越战 非安全命令
|
2020-12-18 21:18:57 +08:00 |
|
joylink_cuiweidong
|
4a350e9706
|
代码调整
|
2020-12-18 19:08:34 +08:00 |
|
joylink_cuiweidong
|
1fe1e35c03
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-18 17:52:25 +08:00 |
|
joylink_cuiweidong
|
fa7380f8ad
|
运行图代码调整
|
2020-12-18 17:51:54 +08:00 |
|
fan
|
0cb19a5ee9
|
子系统生成按钮放开限制
|
2020-12-18 17:45:27 +08:00 |
|
fan
|
e809765dd9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-18 17:20:27 +08:00 |
|
fan
|
9ba280bc03
|
南铁院专业版配置调整
|
2020-12-18 17:20:09 +08:00 |
|
joylink_cuiweidong
|
465e6a5d08
|
南京二号线 区段绘图 调整
|
2020-12-18 16:28:42 +08:00 |
|
joylink_cuiweidong
|
c8487b6e60
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-18 16:12:53 +08:00 |
|
joylink_cuiweidong
|
a3e8c7cecc
|
南京一号线 线路 样式调整
|
2020-12-18 16:12:39 +08:00 |
|
zyy
|
2884d0f02c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-18 15:37:53 +08:00 |
|
zyy
|
901fa60bc4
|
调整道岔生成流程
|
2020-12-18 15:37:35 +08:00 |
|
sunzhenyu
|
ad462cfc70
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-18 15:26:12 +08:00 |
|
sunzhenyu
|
6351d966a1
|
修改三维客流车站乘客上错站台bug，修改三维编辑器
|
2020-12-18 15:26:02 +08:00 |
|
fan
|
31954a545d
|
哈尔滨操作调整
|
2020-12-18 14:10:25 +08:00 |
|
fan
|
941e0a791a
|
留言板调整
|
2020-12-18 13:38:13 +08:00 |
|
fan
|
2ddc94f7aa
|
南京二号线皮肤调整
|
2020-12-18 13:10:55 +08:00 |
|
joylink_cuiweidong
|
0594529577
|
代码调整
|
2020-12-18 09:35:43 +08:00 |
|
joylink_cuiweidong
|
213d14b212
|
新增南京二号线 线路配置文件
|
2020-12-18 09:30:18 +08:00 |
|
joylink_fanyuhong
|
e534232f2d
|
留言板调整
(cherry picked from commit 0dbc19027a)
|
2020-12-18 09:18:43 +08:00 |
|
fan
|
8941e18f69
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-18 09:18:11 +08:00 |
|
fan
|
5740b863b3
|
text、line、outFrame添加参数&报错提示调整
|
2020-12-18 09:17:18 +08:00 |
|
sunzhenyu
|
2d52f15296
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-17 17:49:32 +08:00 |
|
sunzhenyu
|
bfa396be54
|
修改三维驾驶根据列车节数动态更新位置
|
2020-12-17 17:49:25 +08:00 |
|
joylink_cuiweidong
|
acd8c46a65
|
代码调整
|
2020-12-17 16:37:10 +08:00 |
|
joylink_cuiweidong
|
dd1783405e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-17 16:25:02 +08:00 |
|
joylink_cuiweidong
|
d6b58f5ffb
|
哈尔滨线路日志功能添加
|
2020-12-17 16:24:29 +08:00 |
|
sunzhenyu
|
3534abb5ff
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-17 15:23:32 +08:00 |
|
sunzhenyu
|
c4d96ec386
|
修改三维驾驶列车号更新和显示，修改佛山加载三维通号设备间贴图问题
|
2020-12-17 15:23:25 +08:00 |
|
zyy
|
f22ee14ab2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-17 13:59:20 +08:00 |
|
zyy
|
54cf4b3f97
|
调整哈尔滨鼠标事件
|
2020-12-17 13:59:08 +08:00 |
|
fan
|
ca8da79986
|
merge
|
2020-12-17 13:20:47 +08:00 |
|
fan
|
855295ca75
|
通用ibp&留言板管理&贵装备课程发布调整
|
2020-12-17 13:19:12 +08:00 |
|
joylink_cuiweidong
|
3b5ed0b399
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-17 10:00:03 +08:00 |
|
joylink_cuiweidong
|
fdfd54f452
|
北交大客流项目 代码调整
|
2020-12-17 09:59:06 +08:00 |
|
joylink_cuiweidong
|
98603f09a8
|
代码调整
|
2020-12-16 18:22:37 +08:00 |
|
zyy
|
3ec50678c5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-16 16:22:38 +08:00 |
|
zyy
|
24b95e3811
|
调整成都一报错
|
2020-12-16 16:22:24 +08:00 |
|
fan
|
68a0eadf9b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-16 16:05:55 +08:00 |
|
fan
|
7eec38fe65
|
车次窗前端状态重建后保留
|
2020-12-16 16:05:33 +08:00 |
|
zyy
|
34bff76eb5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-16 15:37:22 +08:00 |
|
zyy
|
c2f6c3461b
|
调整宁波三，增加字段
|
2020-12-16 15:37:09 +08:00 |
|
joylink_cuiweidong
|
90f0b4e918
|
运行图编制代码调整
|
2020-12-16 14:51:59 +08:00 |
|
fan
|
b604fdbe43
|
暂提
|
2020-12-16 13:59:31 +08:00 |
|
sunzhenyu
|
d08be87108
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-16 13:54:26 +08:00 |
|
sunzhenyu
|
4dfe892f18
|
修改三维客流初始化仿真重置数据
|
2020-12-16 13:54:08 +08:00 |
|
fan
|
c9dbe2701c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-16 13:26:17 +08:00 |
|
fan
|
bd0aac34fe
|
综合演练现地显示调整
|
2020-12-16 13:25:55 +08:00 |
|
joylink_cuiweidong
|
4eb8d4e5be
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-16 11:15:29 +08:00 |
|
joylink_cuiweidong
|
5a5193cde5
|
北交大客流 运行图代码调整
|
2020-12-16 11:14:35 +08:00 |
|
fan
|
d5b0508467
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-16 10:55:25 +08:00 |
|
fan
|
eebb034208
|
现地增加ibp& 现地切换值班员角色调整
|
2020-12-16 10:54:55 +08:00 |
|
joylink_cuiweidong
|
1715dcad32
|
北交大 客流数据代码调整
|
2020-12-16 10:18:58 +08:00 |
|
joylink_cuiweidong
|
525fc25469
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-16 09:42:15 +08:00 |
|
joylink_cuiweidong
|
0a5eb83904
|
代码调整
|
2020-12-16 09:41:53 +08:00 |
|
joylink_cuiweidong
|
3f7d5da3b1
|
代码调整
|
2020-12-16 09:40:37 +08:00 |
|
fan
|
1faa02cffa
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-15 18:16:04 +08:00 |
|