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 |
|
fan
|
19e9cb7948
|
缓存运行图数据
|
2020-12-15 18:15:48 +08:00 |
|
joylink_cuiweidong
|
ce363e9528
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-15 18:10:37 +08:00 |
|
joylink_cuiweidong
|
1453d5538a
|
北交大客流仿真代码调整
|
2020-12-15 18:09:10 +08:00 |
|
zyy
|
74f67768ea
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-15 17:00:07 +08:00 |
|
zyy
|
0c936bb0ce
|
调整宁波三控制权操作
|
2020-12-15 16:59:51 +08:00 |
|
joylink_cuiweidong
|
845b620e65
|
北交大仿真 切换客流数据调整
|
2020-12-15 16:20:11 +08:00 |
|
zyy
|
9e48ca39a8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-15 14:41:36 +08:00 |
|
zyy
|
249bef4802
|
调整道岔生成逻辑
|
2020-12-15 14:41:23 +08:00 |
|
joylink_cuiweidong
|
a45374acc3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-15 13:36:05 +08:00 |
|
joylink_cuiweidong
|
da59fdbed6
|
代码调整
|
2020-12-15 13:35:38 +08:00 |
|
fan
|
3c6047d4ad
|
打包调整
|
2020-12-15 11:18:15 +08:00 |
|
zyy
|
7ec4a2db59
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-15 11:10:19 +08:00 |
|
zyy
|
b85dcb41dc
|
调整道岔生成逻辑
|
2020-12-15 11:10:05 +08:00 |
|
sunzhenyu
|
fb8c985113
|
剔除无用三维客流代码
|
2020-12-15 11:00:15 +08:00 |
|
sunzhenyu
|
e9ca305560
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-15 10:58:49 +08:00 |
|
sunzhenyu
|
5dfded5bf1
|
修复三维客流车站先下后上，修复上行站台下车不均匀分布bug
|
2020-12-15 10:58:41 +08:00 |
|
fan
|
dff745b94a
|
南铁院本地打包
|
2020-12-15 09:54:54 +08:00 |
|
fan
|
76e487b774
|
南铁院本地打包
|
2020-12-14 19:43:40 +08:00 |
|
fan
|
3c8fa57b09
|
南铁院本地打包
|
2020-12-14 18:10:37 +08:00 |
|
fan
|
081bebf16d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-14 17:55:08 +08:00 |
|
fan
|
8ab05255ab
|
南铁院本地调整
|
2020-12-14 17:54:45 +08:00 |
|
joylink_cuiweidong
|
c437ac62c1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-14 17:19:31 +08:00 |
|
joylink_cuiweidong
|
0ecea0aabc
|
地图绘制代码调整
|
2020-12-14 17:18:57 +08:00 |
|
fan
|
44fb0805bc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-14 17:13:06 +08:00 |
|
zyy
|
e5a51e0d90
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/utils/baseUrl.js
|
2020-12-14 17:07:15 +08:00 |
|
zyy
|
40687fcd5b
|
调整信号机批量设置偏移量
|
2020-12-14 17:06:23 +08:00 |
|
fan
|
fd7418e4a3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-14 17:00:29 +08:00 |
|
fan
|
aceee45c47
|
提示调整
|
2020-12-14 17:00:15 +08:00 |
|
joylink_cuiweidong
|
1deaf4defc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-14 16:54:31 +08:00 |
|
joylink_cuiweidong
|
89b635e24a
|
地图绘制代码调整
|
2020-12-14 16:53:43 +08:00 |
|
fan
|
8dc4e2572b
|
创建项目权限包
|
2020-12-14 16:28:55 +08:00 |
|
fan
|
0364fa0f2d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-14 15:51:29 +08:00 |
|
fan
|
383287fe56
|
新窗口ibp展示添加退出按钮
|
2020-12-14 15:51:14 +08:00 |
|
fan
|
62cba757e6
|
绘图预览界面 现地行调显示调整 & ibp从发布地图创建调整 & 贵装备信息导入调整
|
2020-12-14 15:22:47 +08:00 |
|
sunzhenyu
|
2d0c0c475b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-14 14:43:51 +08:00 |
|
sunzhenyu
|
83a01ddf8c
|
增加三维沙盘和驾驶中停站倒计时TDT
|
2020-12-14 14:43:43 +08:00 |
|
zyy
|
02a6293d5d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-14 11:29:43 +08:00 |
|
zyy
|
0310ee6c57
|
调整地图流程
|
2020-12-14 11:29:26 +08:00 |
|
fan
|
ef8cedb389
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-11 21:41:15 +08:00 |
|
fan
|
be20a39021
|
项目登录调整
|
2020-12-11 21:40:52 +08:00 |
|
joylink_cuiweidong
|
1fe7518ddf
|
代码调整
|
2020-12-11 21:20:54 +08:00 |
|
joylink_cuiweidong
|
328805ba80
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-11 20:17:41 +08:00 |
|
joylink_cuiweidong
|
d8c6a8657b
|
哈尔滨运行图编制代码调整
|
2020-12-11 20:17:18 +08:00 |
|
fan
|
a410832030
|
哈尔滨屏蔽门调整
|
2020-12-11 20:16:56 +08:00 |
|
fan
|
70e260cc4f
|
哈尔滨屏蔽门调整
|
2020-12-11 19:49:48 +08:00 |
|
fan
|
35d760b0f1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-11 19:28:56 +08:00 |
|
fan
|
a80b6c7fb0
|
一键领取权限
|
2020-12-11 19:28:38 +08:00 |
|
sunzhenyu
|
dcc1bb4506
|
综合演练三维驾驶返回bug
|
2020-12-11 18:11:20 +08:00 |
|
sunzhenyu
|
8287e984da
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-11 18:03:05 +08:00 |
|
sunzhenyu
|
caeea6d9d6
|
修改综合演练三维驾驶返回未destory
|
2020-12-11 18:02:56 +08:00 |
|
fan
|
97241040f6
|
调整宁波三号线站台样式
|
2020-12-11 16:38:13 +08:00 |
|
fan
|
f8876c452e
|
Text调整
|
2020-12-11 16:33:51 +08:00 |
|
fan
|
0d8f0f021a
|
添加通用配置项
|
2020-12-11 14:51:04 +08:00 |
|
fan
|
772c611704
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-11 13:20:01 +08:00 |
|
fan
|
f9d8bda8b0
|
宁波三号线延续保护添加箭头
|
2020-12-11 13:19:34 +08:00 |
|
joylink_cuiweidong
|
0c970e24ca
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-11 13:15:23 +08:00 |
|
joylink_cuiweidong
|
afa359d22a
|
运行图绘制代码调整
|
2020-12-11 13:15:07 +08:00 |
|
fan
|
2a0efafc1a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-11 10:01:00 +08:00 |
|
fan
|
05958bb619
|
添加南铁院登录页
|
2020-12-11 10:00:38 +08:00 |
|
fan
|
2fdfaa2561
|
添加南铁院登录页
|
2020-12-11 09:59:27 +08:00 |
|
joylink_cuiweidong
|
082f18e5eb
|
运行图编制代码调整
|
2020-12-10 18:43:17 +08:00 |
|
joylink_cuiweidong
|
1b0ab87020
|
车站绘图代码调整（去除公里标名称必填）
文字绘图代码调整（调整文字字体，与车站名称字体一致）
|
2020-12-10 18:33:18 +08:00 |
|
joylink_cuiweidong
|
9a7a69201a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-10 18:03:19 +08:00 |
|
joylink_cuiweidong
|
fd267160b1
|
信号机绘图代码调整（解决设置信号机归属联锁站bug）
运行图编制代码调整
|
2020-12-10 18:02:59 +08:00 |
|
fan
|
f97f2fc4a2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-10 17:34:46 +08:00 |
|
fan
|
80ebd84062
|
宁波三号线调整
|
2020-12-10 17:34:13 +08:00 |
|
joylink_cuiweidong
|
6e3b07edac
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-10 17:26:38 +08:00 |
|
joylink_cuiweidong
|
acf23ef747
|
运行图编制代码调整
|
2020-12-10 17:26:18 +08:00 |
|
fan
|
aa4012b08f
|
宁波三号线操作
|
2020-12-10 14:50:43 +08:00 |
|
fan
|
c75b6f2119
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-10 14:40:59 +08:00 |
|
fan
|
9114578e22
|
宁波三号线操作
|
2020-12-10 14:40:41 +08:00 |
|
joylink_cuiweidong
|
a22445552a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-10 13:54:13 +08:00 |
|
joylink_cuiweidong
|
3f7eccdc2f
|
运行图编制代码调整
|
2020-12-10 13:53:34 +08:00 |
|
sunzhenyu
|
72abaf9643
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-10 11:29:23 +08:00 |
|
sunzhenyu
|
dae99ee4ad
|
修改综合演练三维驾驶初始样式
|
2020-12-10 11:29:12 +08:00 |
|
fan
|
c297594128
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-10 10:33:02 +08:00 |
|
fan
|
5fb24707ee
|
江苏的爱脑子信息职业学院登录页
|
2020-12-10 10:32:48 +08:00 |
|
fan
|
c118fccd3f
|
宁波三号线操作调整
|
2020-12-10 10:01:51 +08:00 |
|
joylink_cuiweidong
|
0bfc5cb330
|
运行图编制代码调整
|
2020-12-09 18:28:25 +08:00 |
|
joylink_cuiweidong
|
5bc8ec230c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-09 17:13:57 +08:00 |
|
joylink_cuiweidong
|
c16e9a528f
|
运行图编制代码调整
|
2020-12-09 17:13:35 +08:00 |
|
zyy
|
1bd1af2df3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-09 17:08:52 +08:00 |
|
zyy
|
1a093e6594
|
调整交控皮肤显示条件，增加自动折返进路显示
|
2020-12-09 17:08:36 +08:00 |
|
joylink_cuiweidong
|
dab2a00313
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-09 17:03:39 +08:00 |
|
joylink_cuiweidong
|
5e78f3ac64
|
运行图编制代码调整
|
2020-12-09 17:03:22 +08:00 |
|
zyy
|
a984e6b4ed
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-09 15:03:59 +08:00 |
|
zyy
|
4361d503f3
|
调整信号机联锁站设置搜索
|
2020-12-09 15:03:46 +08:00 |
|
joylink_cuiweidong
|
1389c3dfb9
|
代码调整
|
2020-12-09 11:21:30 +08:00 |
|
joylink_cuiweidong
|
5287652d90
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-09 10:56:42 +08:00 |
|
joylink_cuiweidong
|
108ec9ef83
|
西安二号线列车 三角形位置绘图调整
|
2020-12-09 10:56:24 +08:00 |
|
zyy
|
e7d5a85b4f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-09 10:38:58 +08:00 |
|
zyy
|
a71217220a
|
调整mapDevice数据
|
2020-12-09 10:38:46 +08:00 |
|
fan
|
06dbabf05a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-08 18:44:47 +08:00 |
|
fan
|
8f7caf199c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-08 18:44:06 +08:00 |
|
fan
|
a9b94c8e5d
|
国赛界面去掉截止日期&拦截器提示登出修复&宁波三号线
|
2020-12-08 18:43:55 +08:00 |
|
zyy
|
d5925c305b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-08 18:41:30 +08:00 |
|
zyy
|
7ce6cf6e8a
|
调整修改区段bug
|
2020-12-08 18:41:18 +08:00 |
|
sunzhenyu
|
ed5f1dd7eb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-08 16:43:20 +08:00 |
|
sunzhenyu
|
e656be567d
|
三维客流，修复列车人数显示，增加列车进站语音，修改列车pis显示，更新客流站台贴图，修改编辑器车站name。code校对
|
2020-12-08 16:43:12 +08:00 |
|
zyy
|
5feb81e1c1
|
调整计轴区段显示
|
2020-12-08 15:42:35 +08:00 |
|
zyy
|
9ede8ad97d
|
增加删除范围，调整退出仿真发送取消订阅
|
2020-12-08 13:56:36 +08:00 |
|
sunzhenyu
|
5ead363453
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-08 11:28:46 +08:00 |
|
sunzhenyu
|
7a607d308d
|
修改三维客流pis
|
2020-12-08 11:28:34 +08:00 |
|
zyy
|
407d1d421b
|
调整新建地图列表获取
|
2020-12-08 11:26:45 +08:00 |
|
zyy
|
085990f755
|
增加站台紧急按钮批量删除，增加区段批量删除范围
|
2020-12-08 11:09:02 +08:00 |
|
zyy
|
5088838db6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-08 09:52:15 +08:00 |
|
zyy
|
d6dccd10d7
|
调整车站隐藏流程
|
2020-12-08 09:52:07 +08:00 |
|
joylink_cuiweidong
|
4edd31f699
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-08 09:42:56 +08:00 |
|
joylink_cuiweidong
|
40141c7428
|
剧本编制代码调整
|
2020-12-08 09:42:38 +08:00 |
|
fan
|
49968e00ec
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-08 09:02:20 +08:00 |
|
fan
|
fd92d2bb63
|
国赛title调整
|
2020-12-08 09:02:06 +08:00 |
|
zyy
|
4362eef88b
|
增加删除范围
|
2020-12-07 18:36:53 +08:00 |
|
zyy
|
ed93c3159e
|
删除元素补充
|
2020-12-07 18:19:31 +08:00 |
|
zyy
|
c97074f585
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-07 18:00:42 +08:00 |
|
zyy
|
b0234db4a2
|
调整道岔生成逻辑
|
2020-12-07 18:00:26 +08:00 |
|
sunzhenyu
|
ce7a3de96f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-07 17:14:15 +08:00 |
|
sunzhenyu
|
d973dbc46e
|
修改三维设备界面隐藏显示
|
2020-12-07 17:14:06 +08:00 |
|
zyy
|
84d140b639
|
调整车站绘制流程
|
2020-12-07 16:34:57 +08:00 |
|
zyy
|
6b53bc55d6
|
调整删除区段关联车次窗
|
2020-12-07 16:10:03 +08:00 |
|
zyy
|
a797f63e93
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-07 15:10:07 +08:00 |
|
zyy
|
6995a8a962
|
增加以区段为目标删除左右所有元素
|
2020-12-07 15:09:53 +08:00 |
|
sunzhenyu
|
357862d2d4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-07 09:46:17 +08:00 |
|
sunzhenyu
|
d52fe18281
|
修改三维客流上下车参数
|
2020-12-07 09:46:00 +08:00 |
|
fan
|
0294839530
|
国赛界面调整
|
2020-12-07 09:13:03 +08:00 |
|
zyy
|
9f0465beac
|
增加过滤条件
|
2020-12-06 21:56:00 +08:00 |
|
joylink_cuiweidong
|
a1a17b0192
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-04 18:44:49 +08:00 |
|
joylink_cuiweidong
|
6ceddeda92
|
代码调整
|
2020-12-04 18:44:33 +08:00 |
|
fan
|
049ab8aa4c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-04 18:35:11 +08:00 |
|
fan
|
e2e9978cbd
|
大赛信息添加
|
2020-12-04 18:34:58 +08:00 |
|
joylink_cuiweidong
|
cd39147257
|
实训平台代码调整
|
2020-12-04 18:10:07 +08:00 |
|
zyy
|
85cc4ee3d5
|
过滤报错提示
|
2020-12-04 17:22:58 +08:00 |
|
zyy
|
f466ec6fee
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-04 17:10:14 +08:00 |
|
zyy
|
7054f6c1e6
|
增加运行图编辑
|
2020-12-04 17:10:03 +08:00 |
|
joylink_cuiweidong
|
a0e3875e69
|
实训平台样式调整
|
2020-12-04 15:46:45 +08:00 |
|
joylink_cuiweidong
|
e36e9e84e3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-04 13:21:59 +08:00 |
|
joylink_cuiweidong
|
0884f6d227
|
实训平台 样式调整
|
2020-12-04 13:21:41 +08:00 |
|
fan
|
2c9225e939
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-04 10:08:07 +08:00 |
|
fan
|
ac8f9bc978
|
哈尔滨限速调整
|
2020-12-04 10:07:55 +08:00 |
|
joylink_cuiweidong
|
c6f58607be
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-04 09:32:20 +08:00 |
|
joylink_cuiweidong
|
666ff5afbb
|
实训平台样式调整
代码调整
|
2020-12-04 09:31:45 +08:00 |
|
fan
|
1b6d212e7d
|
试题定义 placeholder 调整
|
2020-12-04 09:17:34 +08:00 |
|
fan
|
915cd1963c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-03 18:45:13 +08:00 |
|
fan
|
386e742a31
|
注释单位
|
2020-12-03 18:44:51 +08:00 |
|
joylink_cuiweidong
|
8a81682170
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-03 18:40:13 +08:00 |
|
joylink_cuiweidong
|
ce001395ff
|
代码调整
|
2020-12-03 18:39:57 +08:00 |
|
fan
|
817c5bdb9b
|
哈尔滨限速调整
|
2020-12-03 18:39:27 +08:00 |
|
fan
|
8accd0c664
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-03 18:22:24 +08:00 |
|
fan
|
05f6324413
|
company update
|
2020-12-03 18:22:04 +08:00 |
|
sunzhenyu
|
5a8025b7ef
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-03 16:49:46 +08:00 |
|
sunzhenyu
|
a61bba357a
|
修改三维编辑器剔除文件bug
|
2020-12-03 16:49:38 +08:00 |
|
joylink_cuiweidong
|
fa7eefbeba
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-03 16:36:39 +08:00 |
|
joylink_cuiweidong
|
ddd6905a0c
|
代码调整
|
2020-12-03 16:36:21 +08:00 |
|
sunzhenyu
|
ce48a13715
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-03 16:23:23 +08:00 |
|
sunzhenyu
|
66c8fd8de9
|
剔除三维编辑器中旧的模块
|
2020-12-03 16:23:14 +08:00 |
|
joylink_cuiweidong
|
0933930011
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-03 15:30:03 +08:00 |
|
joylink_cuiweidong
|
a52c9786c1
|
发布地图 导出地图 代码调整
|
2020-12-03 15:29:45 +08:00 |
|
zyy
|
704356cec9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-03 14:01:27 +08:00 |
|
zyy
|
dfbeb6b604
|
删除多余配置
|
2020-12-03 14:01:15 +08:00 |
|
joylink_cuiweidong
|
7dc23a645d
|
代码调整
|
2020-12-03 13:52:51 +08:00 |
|
joylink_cuiweidong
|
3c004ab7a5
|
实训代码调整
|
2020-12-03 13:45:18 +08:00 |
|
joylink_cuiweidong
|
646d585ecf
|
实训/设计平台 左侧地图列表样式调整
|
2020-12-03 11:00:50 +08:00 |
|
fan
|
111f117ff8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-03 09:23:48 +08:00 |
|
fan
|
338743036e
|
注释用户信息 公司
|
2020-12-03 09:23:31 +08:00 |
|
fan
|
cdbd7a0d5c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-02 18:38:40 +08:00 |
|
fan
|
6cc64d7cfc
|
导入学生信息添加loading&哈尔滨日志
|
2020-12-02 18:38:28 +08:00 |
|
joylink_cuiweidong
|
23cbc94c78
|
代码调整
|
2020-12-02 18:37:32 +08:00 |
|
joylink_cuiweidong
|
95c685bfab
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/newMap/displayNew/demonMenu.vue
|
2020-12-02 17:49:08 +08:00 |
|
joylink_cuiweidong
|
b51ebde280
|
北交大客流仿真系统代码调整
|
2020-12-02 17:45:19 +08:00 |
|
fan
|
c2cb4ce764
|
展示绑定单位管理人员
|
2020-12-02 16:27:44 +08:00 |
|
fan
|
3d672ce15b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-02 15:23:34 +08:00 |
|
fan
|
d96df1ce68
|
个人信息关闭后终止状态&贵装备展示留言板
|
2020-12-02 15:23:23 +08:00 |
|