joylink_cuiweidong
|
5874d8f665
|
北京一号线操作步骤调整
|
2020-04-02 16:16:45 +08:00 |
|
zyy
|
8fdd0d27bb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/scripts/cmdPlugin/ValidateHandler.js
|
2020-04-02 15:01:18 +08:00 |
|
zyy
|
dd26f5fd96
|
调整宁波一号线实训步骤定义
|
2020-04-02 15:00:28 +08:00 |
|
fan
|
75df1f7d2d
|
宁波考试&教学添加切换集中站
|
2020-04-02 14:46:21 +08:00 |
|
zyy
|
8117a31c80
|
调整代码
|
2020-04-02 10:51:47 +08:00 |
|
zyy
|
a17a02519d
|
调整宁波线路实训生成
|
2020-04-02 09:07:50 +08:00 |
|
zyy
|
c7f7f0bc6f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-01 15:45:31 +08:00 |
|
zyy
|
02583b96e4
|
调整代码
|
2020-04-01 15:44:54 +08:00 |
|
fan
|
ebd90d2485
|
本地项目调整&elementUI升版本至2.12.0
|
2020-04-01 15:32:06 +08:00 |
|
joylink_cuiweidong
|
5d10d40ea3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-01 14:15:09 +08:00 |
|
joylink_cuiweidong
|
f64c7d5317
|
代码调整
|
2020-04-01 14:14:55 +08:00 |
|
fan
|
225a739f60
|
打包本地项目不进行cdn加载
|
2020-04-01 13:47:29 +08:00 |
|
joylink_cuiweidong
|
955ddacbe0
|
Merge branch 'dev' into test
|
2020-03-31 19:09:06 +08:00 |
|
joylink_cuiweidong
|
bc6940f80b
|
仿真界面添加列车详情(未完成)
|
2020-03-31 19:06:23 +08:00 |
|
zyy
|
4ef3c69f9f
|
调整显示内容 判断
|
2020-03-31 15:34:55 +08:00 |
|
fan
|
9a57ab9aa3
|
哈尔滨调整
|
2020-03-31 10:45:04 +08:00 |
|
zyy
|
38ada8ccb2
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-30 17:54:01 +08:00 |
|
zyy
|
919639ad03
|
调整哈尔滨现地操作步骤流程完善
|
2020-03-30 17:53:44 +08:00 |
|
joylink_cuiweidong
|
8c2f1cf729
|
新剧本 仿真类型切换代码调整
|
2020-03-30 17:39:00 +08:00 |
|
zyy
|
af6eb5917f
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-30 16:15:50 +08:00 |
|
zyy
|
0c56d049ec
|
调整哈尔滨现地实训操作步骤
|
2020-03-30 16:15:35 +08:00 |
|
joylink_cuiweidong
|
fba96dcaaa
|
佛山有轨线路 步骤操作代码调整
|
2020-03-30 14:34:19 +08:00 |
|
joylink_cuiweidong
|
fa3400790b
|
宁波一号线步骤操作代码调整
|
2020-03-30 14:18:07 +08:00 |
|
joylink_cuiweidong
|
3a383793f8
|
北京一号线 步骤操作代码调整
|
2020-03-30 13:33:53 +08:00 |
|
joylink_cuiweidong
|
17c26e26a2
|
佛山一号线 宁波一号线 步骤操作代码调整
|
2020-03-30 11:27:34 +08:00 |
|
joylink_cuiweidong
|
08dc9befc4
|
北京一号线 宁波一号线 步骤操作调整
|
2020-03-30 11:03:35 +08:00 |
|
zyy
|
72f121b7a5
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-30 10:28:22 +08:00 |
|
zyy
|
0321340863
|
调整步骤运行数据
|
2020-03-30 10:28:08 +08:00 |
|
joylink_cuiweidong
|
1a998f405a
|
佛山一号线 操作代码调整
|
2020-03-30 09:45:23 +08:00 |
|
joylink_cuiweidong
|
f51bad9c3a
|
代码调整
|
2020-03-27 18:45:48 +08:00 |
|
joylink_cuiweidong
|
93dc9a6983
|
新版剧本编制接口调整
|
2020-03-27 17:29:01 +08:00 |
|
zyy
|
7380953642
|
增加宁波线路实训操作
|
2020-03-27 13:45:36 +08:00 |
|
fan
|
8a90e2389b
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-26 10:42:20 +08:00 |
|
joylink_cuiweidong
|
9a9716e5a9
|
佛山有轨电车操作代码调整
|
2020-03-26 09:56:46 +08:00 |
|
fan
|
5bcb42e0f2
|
宁波调整
|
2020-03-25 17:32:57 +08:00 |
|
fan
|
1210496ecb
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-25 15:24:08 +08:00 |
|
fan
|
9d38968751
|
佛山样式调整&&宁波显示调整
|
2020-03-25 15:22:52 +08:00 |
|
joylink_cuiweidong
|
81b2e420d8
|
宁波线
添加信号机人解进路功能
信号机右键菜单 设置进路改为排列进路
列车鼠标悬停显示信息去掉
佛山线 现地
信号机操作调整
|
2020-03-25 15:19:39 +08:00 |
|
joylink_cuiweidong
|
d3b4c090a9
|
佛山有轨电车 现地操作调整
|
2020-03-25 13:20:31 +08:00 |
|
joylink_cuiweidong
|
c31c09e88b
|
佛山有轨电车 现地操作调整
|
2020-03-24 18:18:01 +08:00 |
|
joylink_cuiweidong
|
089b8960b9
|
佛山线路现地界面调整
|
2020-03-24 18:01:10 +08:00 |
|
joylink_cuiweidong
|
f83753102e
|
北京线宁波线操作代码调整
|
2020-03-24 16:40:17 +08:00 |
|
joylink_cuiweidong
|
be03a9e623
|
宁波线操作代码调整
|
2020-03-24 14:43:58 +08:00 |
|
joylink_cuiweidong
|
21ac6c0ac4
|
北京一号线宁波一号线控制权转换代码调整
|
2020-03-24 13:43:30 +08:00 |
|
joylink_cuiweidong
|
22330bf756
|
宁波一号线自动折返操作代码调整
|
2020-03-24 11:09:10 +08:00 |
|
joylink_cuiweidong
|
4e38516efb
|
宁波一号线操作代码调整
|
2020-03-24 10:12:21 +08:00 |
|
joylink_cuiweidong
|
91e2c81c6f
|
佛山有轨电车 操作代码调整
|
2020-03-23 18:12:37 +08:00 |
|
joylink_cuiweidong
|
93fd139b6e
|
佛山有轨电车 信号机站台操作代码调整
|
2020-03-23 17:43:37 +08:00 |
|
joylink_cuiweidong
|
3d6f5a2537
|
佛山有轨电车 区段道岔操作代码调整
|
2020-03-23 17:25:18 +08:00 |
|
fan
|
d82a2cf297
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-23 16:01:45 +08:00 |
|
fan
|
2501a1a70a
|
综合演练问题调整
|
2020-03-23 16:00:28 +08:00 |
|
joylink_cuiweidong
|
0412a6b1a3
|
宁波一号线 站台信号机区段操作代码调整
|
2020-03-23 14:48:26 +08:00 |
|
zyy
|
688aa7310b
|
增加佛山有轨线路文件，调整区段显示状态
|
2020-03-23 14:27:57 +08:00 |
|
joylink_cuiweidong
|
fd302bbbdd
|
北京一号线控制权操作代码调整
|
2020-03-23 11:09:40 +08:00 |
|
joylink_cuiweidong
|
dd9080c0d0
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-20 18:51:40 +08:00 |
|
joylink_cuiweidong
|
c3e48fe107
|
北京一号线控制权转换代码调整
|
2020-03-20 18:51:26 +08:00 |
|
zyy
|
788737369a
|
调整哈尔滨线路 现地 行调 菜单高度
|
2020-03-20 17:56:20 +08:00 |
|
fan
|
cc6af4f056
|
综合演练调整
|
2020-03-20 17:36:07 +08:00 |
|
fan
|
1e8d304249
|
Merge remote-tracking branch 'origin/dev_dukang' into dev
# Conflicts:
# src/scripts/cmdPlugin/CommandEnum.js
# src/utils/baseUrl.js
|
2020-03-20 15:16:08 +08:00 |
|
fan
|
471fac0499
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-20 15:01:22 +08:00 |
|
fan
|
457b78bd7e
|
操作调整
|
2020-03-20 15:00:31 +08:00 |
|
joylink_cuiweidong
|
2c4848f4db
|
北京一号线指令操作调整
|
2020-03-20 14:48:22 +08:00 |
|
fan
|
80fda91dba
|
自动折返&引导总锁调整
|
2020-03-20 14:12:02 +08:00 |
|
joylink_cuiweidong
|
d50f096b0a
|
北京一号线站台操作代码调整
|
2020-03-20 13:30:57 +08:00 |
|
joylink_cuiweidong
|
61d54b2209
|
北京一号线道岔操作代码调整
|
2020-03-20 11:23:46 +08:00 |
|
fan
|
cc21437843
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-20 11:09:16 +08:00 |
|
fan
|
404d867767
|
绘图&成三现地调整
|
2020-03-20 11:09:06 +08:00 |
|
joylink_cuiweidong
|
59f5336f8a
|
北京一号线信号机区段操作代码调整
|
2020-03-20 10:31:19 +08:00 |
|
fan
|
361f28c905
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-19 18:43:43 +08:00 |
|
fan
|
352215f142
|
代码调整
|
2020-03-19 18:43:31 +08:00 |
|
zyy
|
912f0f206f
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-19 18:39:32 +08:00 |
|
zyy
|
2f654975d5
|
调整哈尔滨信号机状态
|
2020-03-19 18:39:20 +08:00 |
|
fan
|
85e7fea0ae
|
代码调整
|
2020-03-19 18:13:26 +08:00 |
|
zyy
|
67f0712eaa
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-19 17:19:01 +08:00 |
|
zyy
|
f78d9e80fe
|
调整哈尔滨道岔现地操作
|
2020-03-19 17:18:46 +08:00 |
|
fan
|
5173c4e8d9
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-19 17:11:46 +08:00 |
|
fan
|
5e2beb6d05
|
代码调整
|
2020-03-19 17:11:35 +08:00 |
|
joylink_cuiweidong
|
753534c42a
|
北京一号线区段操作代码封装
|
2020-03-19 17:04:53 +08:00 |
|
zyy
|
e4c2cf03b1
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-19 14:04:11 +08:00 |
|
zyy
|
1d46deb12a
|
调整区段绘画逻辑
|
2020-03-19 14:03:54 +08:00 |
|
joylink_cuiweidong
|
65566a1438
|
添加 贵州装备制造职业学院 案例展示
北京一号线操作代码调整
|
2020-03-19 13:06:48 +08:00 |
|
zyy
|
6570028b95
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-19 10:52:54 +08:00 |
|
zyy
|
6e3dcf6b65
|
调整哈尔滨线路 区段，信号机操作 处理信号机点击高亮
|
2020-03-19 10:52:42 +08:00 |
|
joylink_cuiweidong
|
e1b411965b
|
北京一号线操作代码调整
|
2020-03-19 10:49:21 +08:00 |
|
joylink_cuiweidong
|
85e587f844
|
北京一号线操作代码调整
|
2020-03-19 10:02:25 +08:00 |
|
fan
|
8ba124ab6f
|
参数调整
|
2020-03-19 09:25:51 +08:00 |
|
zyy
|
4243d62ab1
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-18 19:08:12 +08:00 |
|
zyy
|
2ffdf1de32
|
调整代码
|
2020-03-18 19:07:58 +08:00 |
|
fan
|
838f2311f8
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-18 19:05:12 +08:00 |
|
fan
|
a9c19cf1ea
|
现地操作调整
|
2020-03-18 19:05:02 +08:00 |
|
zyy
|
4537080346
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-18 18:47:48 +08:00 |
|
zyy
|
3afa12711e
|
新增哈尔滨线路底部栏 操作
|
2020-03-18 18:47:37 +08:00 |
|
joylink_cuiweidong
|
7c02daebeb
|
代码调整
|
2020-03-18 18:45:27 +08:00 |
|
joylink_cuiweidong
|
d0107db4f1
|
北京一号线 现地操作总取消操作代码调整
|
2020-03-18 17:18:43 +08:00 |
|
joylink_cuiweidong
|
07af51b757
|
对返回的信号机接近区段数据处理
|
2020-03-18 17:02:07 +08:00 |
|
joylink_cuiweidong
|
68571fff18
|
北京一号线现地 自动折返设置和取消操作代码添加
|
2020-03-18 15:31:59 +08:00 |
|
joylink_cuiweidong
|
a126ddad02
|
北京一号线现地区故解操作代码调整
|
2020-03-18 14:09:38 +08:00 |
|
joylink_cuiweidong
|
96b5cfa3a9
|
北京一号线现地引导总锁操作代码修改
|
2020-03-18 13:34:13 +08:00 |
|
zyy
|
4203c30e30
|
调整宁波线路自动折返 计轴复位操作
|
2020-03-18 11:18:52 +08:00 |
|
zyy
|
11b2ee8130
|
调整代码
|
2020-03-18 10:20:49 +08:00 |
|
zyy
|
0ceb0c2c65
|
调整自动折返 type 类型 增加自动折返菜单流程
|
2020-03-18 09:10:57 +08:00 |
|
joylink_cuiweidong
|
d8d143ae38
|
删除地图绘制中，车站里面的引导总锁
|
2020-03-17 17:59:47 +08:00 |
|
joylink_cuiweidong
|
03d85d705c
|
哈尔滨一号线现地界面样式调整
|
2020-03-17 17:05:43 +08:00 |
|
fan
|
b94c2b47de
|
综合演练调整
|
2020-03-17 14:54:03 +08:00 |
|
joylink_cuiweidong
|
9dc0124da2
|
哈尔滨线路 现地行调切换代码调整
|
2020-03-17 14:28:23 +08:00 |
|
zyy
|
d3b9b718b3
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-17 11:29:47 +08:00 |
|
zyy
|
96ed68cf65
|
调整宁波线路现地操作
|
2020-03-17 11:29:34 +08:00 |
|
joylink_cuiweidong
|
09e452143d
|
北京一号线 现地 道岔操作代码调整
|
2020-03-17 11:09:09 +08:00 |
|
joylink_cuiweidong
|
81c88dd63c
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-17 09:55:04 +08:00 |
|
joylink_cuiweidong
|
b088287b6c
|
北京一号线 现地 站台总取消 站台扣车操作代码操作
|
2020-03-17 09:54:49 +08:00 |
|
fan
|
36026fc4ed
|
删除日志
|
2020-03-17 09:29:41 +08:00 |
|
fan
|
1598e77215
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-17 09:26:02 +08:00 |
|
fan
|
b06b2b58e2
|
调整现地操作
|
2020-03-17 09:25:40 +08:00 |
|
zyy
|
154b252fd6
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-16 19:08:31 +08:00 |
|
zyy
|
9e150eed8d
|
调整控制权转移请求参数，调整宁波区段显示逻辑
|
2020-03-16 19:08:18 +08:00 |
|
joylink_cuiweidong
|
f437f18f63
|
北京线现地进路建立代码调整
|
2020-03-16 18:53:36 +08:00 |
|
fan
|
7fce0afd5a
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-16 17:57:53 +08:00 |
|
joylink_cuiweidong
|
c695309b9f
|
代码修改
|
2020-03-16 17:56:10 +08:00 |
|
fan
|
18f69e3429
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-16 17:54:42 +08:00 |
|
fan
|
aa93cfc250
|
调整现地操作
|
2020-03-16 17:54:30 +08:00 |
|
joylink_cuiweidong
|
9bac0200be
|
代码调整
|
2020-03-16 17:46:34 +08:00 |
|
fan
|
9c3a61a747
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-16 17:17:18 +08:00 |
|
fan
|
0377ef014b
|
合并代码
|
2020-03-16 17:16:59 +08:00 |
|
joylink_cuiweidong
|
1a8b37f2b4
|
北京一号线 现地 排列进路操作代码调整
|
2020-03-16 16:28:53 +08:00 |
|
zyy
|
933f0c1bba
|
调整综合演练ibp获取数据
|
2020-03-16 16:06:50 +08:00 |
|
fan
|
00b1b13542
|
调整哈尔滨显示
|
2020-03-16 10:16:17 +08:00 |
|
fan
|
6a77d68c8d
|
调整哈尔滨显示
|
2020-03-16 10:15:58 +08:00 |
|
zyy
|
19f64034fb
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/jmapNew/theme/chengdu_01/model.js
# src/utils/baseUrl.js
|
2020-03-13 18:20:02 +08:00 |
|
fan
|
553900df47
|
调整成都三操作
|
2020-03-13 18:19:27 +08:00 |
|
zyy
|
e156bac9ca
|
增加公共地图ibp配置绘图 逻辑
|
2020-03-13 18:19:04 +08:00 |
|
fan
|
5733101b2b
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-13 16:35:13 +08:00 |
|
fan
|
a7b81a3383
|
调整车次窗初始显示
|
2020-03-13 16:35:03 +08:00 |
|
joylink_cuiweidong
|
494e1fc815
|
北京一号线 现地 设置进路操作代码调整
|
2020-03-13 15:36:26 +08:00 |
|
fan
|
264310f28e
|
调整成都三显示
|
2020-03-13 15:06:14 +08:00 |
|
fan
|
7753c53ee0
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/jmapNew/shape/Train/index.js
|
2020-03-13 13:08:18 +08:00 |
|
fan
|
4a2c539553
|
哈尔滨现地显示
|
2020-03-13 13:01:58 +08:00 |
|
joylink_cuiweidong
|
2ea2c297a3
|
北京一号线 现地 信号重开(进路锁闭情况) 区故解 操作代码调整
|
2020-03-12 17:15:18 +08:00 |
|
joylink_cuiweidong
|
6031ca59eb
|
代码调整
|
2020-03-12 15:54:30 +08:00 |
|
joylink_cuiweidong
|
56126bdbf3
|
列车精确定位代码调整
列车的状态信息调整
去掉仿真里的拖动鼠标生成包围框
|
2020-03-12 14:41:53 +08:00 |
|
zyy
|
6045f6dba6
|
删除多余log
|
2020-03-12 10:33:10 +08:00 |
|
zyy
|
0cc556fa8d
|
调整成都一号线信号机排列进路
|
2020-03-12 10:32:30 +08:00 |
|
joylink_cuiweidong
|
4ceaba9c59
|
北京一号线新版指令代码调整
|
2020-03-11 10:52:36 +08:00 |
|
joylink_cuiweidong
|
c0819a4745
|
北京一号线新版指令操作代码调整
|
2020-03-11 10:36:45 +08:00 |
|
joylink_cuiweidong
|
27c8b0204e
|
成都一号线 列车精确位置三角代码修改
|
2020-03-10 20:15:47 +08:00 |
|
fan
|
36ae4e001e
|
成都三现地调整
|
2020-03-10 13:22:41 +08:00 |
|
fan
|
394b80e0e9
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-10 13:05:36 +08:00 |
|
fan
|
ee53da67bc
|
调整点击设备中组成元素的数据处理
|
2020-03-10 13:05:20 +08:00 |
|
joylink_cuiweidong
|
ed3adcab6b
|
北京一号线 现地 自动进路操作代码调整
|
2020-03-10 11:11:18 +08:00 |
|
fan
|
f6a43ed6aa
|
宁波一调整道岔正反操为联动操作
|
2020-03-10 10:08:28 +08:00 |
|
joylink_fanyuhong
|
2ca260d502
|
哈尔滨创建计划车
|
2020-03-07 18:32:51 +08:00 |
|
joylink_fanyuhong
|
f685279c6d
|
代码调整
(cherry picked from commit 709b9ec)
|
2020-03-06 20:42:29 +08:00 |
|
joylink_cuiweidong
|
4c02e416bc
|
成都一号线 列车所在区段位置代码调整（部分）
|
2020-03-06 15:27:31 +08:00 |
|
joylink_cuiweidong
|
02a2336731
|
宁波一号线行调操作调整
|
2020-03-05 20:36:27 +08:00 |
|
joylink_cuiweidong
|
420c97f88e
|
宁波一号线信号机站台操作代码调整（行调）
|
2020-03-05 16:28:08 +08:00 |
|
zyy
|
2df1803ca5
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-05 14:33:20 +08:00 |
|
zyy
|
3510548b7b
|
调整集中站指示灯状态，绘图显示
|
2020-03-05 14:33:08 +08:00 |
|
joylink_cuiweidong
|
dc12bd3f88
|
成都一号线 信号机 信号自动通过 代码调整
自动通过模式，自动触发模式 状态参数调整
|
2020-03-05 13:40:50 +08:00 |
|
joylink_cuiweidong
|
8d022403c3
|
北京一号现地道岔 单锁解封操作代码调整
|
2020-03-05 09:53:42 +08:00 |
|
joylink_cuiweidong
|
e6eb7994fb
|
北京一号线 现地道岔操作代码调整
|
2020-03-04 19:53:50 +08:00 |
|
zyy
|
d342c249ab
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-04 14:15:17 +08:00 |
|
zyy
|
467a9cf982
|
调整宁波线路现地操作
|
2020-03-04 14:14:59 +08:00 |
|
joylink_cuiweidong
|
78939de116
|
成都三号线 行调信号机站台代码调整
|
2020-03-04 11:29:57 +08:00 |
|
joylink_cuiweidong
|
33d711cf49
|
北京一号线 信号机站台代码调整
|
2020-03-04 09:17:06 +08:00 |
|
joylink_cuiweidong
|
9c1c48b968
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-03 21:01:44 +08:00 |
|
joylink_cuiweidong
|
d4f3f42cdf
|
成都一号线 信号机代码调整
|
2020-03-03 21:00:10 +08:00 |
|
zyy
|
af960cc011
|
调整状态
|
2020-03-03 18:09:05 +08:00 |
|
joylink_cuiweidong
|
88a4b01802
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-03 18:01:43 +08:00 |
|
joylink_cuiweidong
|
231c6fda52
|
代码调整
|
2020-03-03 17:54:08 +08:00 |
|
zyy
|
c90a37f10d
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-03 17:53:04 +08:00 |
|
zyy
|
aa80b8e74f
|
调整宁波一信号机现地操作
|
2020-03-03 17:52:37 +08:00 |
|
joylink_fanyuhong
|
28db37a54f
|
成都三现地操作调整
|
2020-03-03 17:34:50 +08:00 |
|
joylink_cuiweidong
|
030470eec4
|
代码调整
|
2020-03-03 14:09:27 +08:00 |
|
zyy
|
8729905299
|
调整临时限速绘图逻辑，调整宁波线车次窗流程操作
|
2020-03-03 12:57:26 +08:00 |
|
zyy
|
79734147e8
|
调整错误信息返回
|
2020-03-02 21:49:19 +08:00 |
|
zyy
|
6a306af8c4
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-02 19:42:29 +08:00 |
|
zyy
|
4f1a72bb76
|
调整宁波菜单显示，错误提示
|
2020-03-02 19:42:10 +08:00 |
|
joylink_cuiweidong
|
9ae9688868
|
北京一号线 成都三号线 宁波一号线 站台跳停取消跳停代码调整
|
2020-03-02 19:07:28 +08:00 |
|
joylink_cuiweidong
|
cd970436f9
|
北京一号线成都三号线站台操作代码调整
|
2020-03-02 17:16:59 +08:00 |
|
joylink_cuiweidong
|
c1e39574c8
|
成都三号线 站台操作代码调整
|
2020-03-02 15:37:02 +08:00 |
|
joylink_fanyuhong
|
c1c624dfff
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-02 14:47:08 +08:00 |
|
joylink_fanyuhong
|
692f30fd9f
|
运行图导入和列车调整
|
2020-03-02 14:46:59 +08:00 |
|
joylink_cuiweidong
|
ab89966902
|
北京一号线哈尔滨 站台操作代码调整
|
2020-03-02 09:21:29 +08:00 |
|
joylink_cuiweidong
|
167ca0e2a9
|
北京一号线信号机操作代码调整
|
2020-02-28 20:30:46 +08:00 |
|
joylink_cuiweidong
|
4ee98785c4
|
宁波一号线 成都三号线站台信号机操作代码调整
|
2020-02-28 18:50:03 +08:00 |
|
joylink_fanyuhong
|
d73f084fd5
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-28 16:47:35 +08:00 |
|
joylink_fanyuhong
|
92f4f2f1ca
|
按计划行车接口报错提示
|
2020-02-28 16:47:26 +08:00 |
|
joylink_cuiweidong
|
d5ac3f37a2
|
成都三号线 信号机 操作代码调整
|
2020-02-28 15:50:20 +08:00 |
|
joylink_cuiweidong
|
32b16077f3
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-28 13:10:48 +08:00 |
|
joylink_cuiweidong
|
7038ec12a8
|
哈尔滨线路信号机操作代码调整
|
2020-02-28 13:07:49 +08:00 |
|
joylink_fanyuhong
|
d5539a986b
|
按计划行车接口报错提示
(cherry picked from commit 1abad25)
|
2020-02-28 11:28:13 +08:00 |
|
joylink_cuiweidong
|
04878f54ba
|
哈尔滨线路 信号机操作代码调整
|
2020-02-28 10:41:36 +08:00 |
|
joylink_fanyuhong
|
b880101a46
|
运行图预览
|
2020-02-27 22:17:33 +08:00 |
|
joylink_fanyuhong
|
543b3c1259
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-27 22:10:08 +08:00 |
|
joylink_fanyuhong
|
41bc739eab
|
运行图预览
|
2020-02-27 22:09:51 +08:00 |
|
zyy
|
c7ece4aa60
|
调整速度
|
2020-02-27 21:37:58 +08:00 |
|
joylink_cuiweidong
|
4d4c10f2d5
|
哈尔滨线路 信号机操作代码调整
|
2020-02-27 20:37:35 +08:00 |
|
zyy
|
632a3275e4
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-27 18:22:11 +08:00 |
|
zyy
|
07330bf054
|
调整道岔，区段操作
|
2020-02-27 18:21:39 +08:00 |
|
joylink_cuiweidong
|
4dab35a61e
|
哈尔滨线路 右键操作 代码调整
|
2020-02-27 17:31:29 +08:00 |
|
zyy
|
4e6f107896
|
调整宁波一道岔操作
|
2020-02-27 15:44:51 +08:00 |
|
joylink_cuiweidong
|
9f5f30cd14
|
成都一号线 北京一号线 新建计划车代码调整
|
2020-02-27 13:05:02 +08:00 |
|
joylink_zyy
|
aa1de4372f
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-27 11:35:45 +08:00 |
|
joylink_zyy
|
05abf3049a
|
增加宁波线新建列车查询
|
2020-02-27 11:35:41 +08:00 |
|
joylink_fanyuhong
|
1948083c42
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-27 11:30:30 +08:00 |
|
joylink_fanyuhong
|
56d32ca088
|
仿真调整
|
2020-02-27 11:30:22 +08:00 |
|
joylink_cuiweidong
|
5e3d3d86f6
|
宁波一号线 站台操作调整 （北京一号线，成都一号线站台参数修改）
|
2020-02-26 18:59:19 +08:00 |
|
joylink_cuiweidong
|
d17195e524
|
北京一号线 宁波一号线 信号机 操作代码调整
|
2020-02-26 14:37:52 +08:00 |
|
joylink_cuiweidong
|
076cbeb23b
|
北京一号线 成都三号线 信号机操作代码调整
|
2020-02-25 19:39:30 +08:00 |
|
joylink_cuiweidong
|
2978438390
|
北京一号线 信号机操作代码调整
|
2020-02-25 15:08:48 +08:00 |
|
joylink_cuiweidong
|
b221e8e6b9
|
车站添加 是否车辆段／停车场 是否折返车站字段
|
2020-02-25 10:52:13 +08:00 |
|
joylink_fanyuhong
|
e17569978f
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-25 10:36:25 +08:00 |
|
joylink_fanyuhong
|
3197641b97
|
仿真调整
|
2020-02-25 10:36:18 +08:00 |
|
zyy
|
b5c8a1f2af
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-24 18:12:41 +08:00 |
|
zyy
|
12e708028e
|
区段道岔操作调整
|
2020-02-24 18:12:05 +08:00 |
|
joylink_fanyuhong
|
03843cf217
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-24 17:06:58 +08:00 |
|
joylink_fanyuhong
|
aa0f770630
|
仿真调整
|
2020-02-24 17:04:39 +08:00 |
|
joylink_cuiweidong
|
56e49f0561
|
成都一号线 道岔操作代码调整
|
2020-02-24 15:59:51 +08:00 |
|
joylink_cuiweidong
|
a177ce9d0d
|
成都一号线 信号机 站台操作代码调整
|
2020-02-24 15:48:37 +08:00 |
|
zyy
|
92ce8c08be
|
调整成都一操作
|
2020-02-24 14:03:07 +08:00 |
|
joylink_cuiweidong
|
ae1eeb5ef3
|
成都一号线 区段操作代码调整
|
2020-02-24 11:38:23 +08:00 |
|
zyy
|
bd03e773c7
|
调整区段，道岔操作菜单
|
2020-02-24 11:32:24 +08:00 |
|
joylink_cuiweidong
|
3362c906cc
|
成都一号线 新建列车代码调整
|
2020-02-20 14:19:44 +08:00 |
|
joylink_cuiweidong
|
70f95654b9
|
北京一号线 新建列车代码修改
|
2020-02-20 14:01:12 +08:00 |
|
zyy
|
a225253d25
|
调整列车操作
|
2020-02-20 12:24:37 +08:00 |
|
joylink_fanyuhong
|
10d3bb3e49
|
新建列车调整
|
2020-02-20 10:19:49 +08:00 |
|
joylink_fanyuhong
|
00dd268918
|
列车调整
|
2020-02-19 11:47:38 +08:00 |
|
zyy
|
79140c7e42
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-18 17:49:51 +08:00 |
|
zyy
|
0a5c2e7a5b
|
修改代码
|
2020-02-18 17:49:35 +08:00 |
|
joylink_cuiweidong
|
12198f0c35
|
北京线 指令代码调整
|
2020-02-18 16:55:30 +08:00 |
|
joylink_cuiweidong
|
50de519124
|
北京线 指令operation 代码调整
|
2020-02-18 14:26:16 +08:00 |
|
joylink_cuiweidong
|
f27c3ce3f4
|
宁波线 北京一号线新版 信号机状态调整 人工控 自动控代码调整
|
2020-02-17 19:23:26 +08:00 |
|
joylink_cuiweidong
|
9b8079a7ea
|
北京一号线 新版 指令调整
|
2020-02-17 10:55:44 +08:00 |
|
joylink_cuiweidong
|
2b5ac01556
|
北京一号线新版 人工控 自动控 代码调整
|
2020-02-14 18:51:02 +08:00 |
|
joylink_fanyuhong
|
5451cdce48
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-14 18:38:09 +08:00 |
|
joylink_fanyuhong
|
c6a69e9009
|
状态调整
|
2020-02-14 18:37:48 +08:00 |
|
joylink_cuiweidong
|
36c775dacb
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/jmapNew/theme/beijing_01/menus/dialog/routeHandControl.vue
|
2020-02-14 18:17:06 +08:00 |
|
joylink_cuiweidong
|
5191a122d1
|
北京一号线新版 人工控 自动控代码调整
|
2020-02-14 18:14:57 +08:00 |
|
joylink_fanyuhong
|
a42f1368ae
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-14 18:08:10 +08:00 |
|
joylink_fanyuhong
|
2cd2f93c20
|
状态调整
|
2020-02-14 18:07:54 +08:00 |
|
joylink_cuiweidong
|
9b24a72858
|
北京一号线新版 进路交人工控 进路交自动控代码调整
|
2020-02-14 15:58:43 +08:00 |
|
joylink_cuiweidong
|
7af244dcda
|
北京一号线新版指令调整
|
2020-02-14 10:58:00 +08:00 |
|
joylink_cuiweidong
|
2d73e96da7
|
成都一号线 新建列车代码修改
|
2020-02-13 16:47:10 +08:00 |
|
joylink_cuiweidong
|
42668b6086
|
宁波一号线 新建列车代码调整
|
2020-02-13 14:14:21 +08:00 |
|
joylink_cuiweidong
|
9115155865
|
新版北京一号线 新建计划车指令代码修改
|
2020-02-13 12:33:54 +08:00 |
|
joylink_fanyuhong
|
a9c16c3c74
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-13 11:19:17 +08:00 |
|
joylink_fanyuhong
|
147796dca1
|
操作调整
|
2020-02-13 11:19:06 +08:00 |
|
joylink_cuiweidong
|
5721f17cf9
|
北京线 车次窗 新建列车代码调整
|
2020-02-12 18:57:02 +08:00 |
|
joylink_fanyuhong
|
fa233a7031
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-12 18:37:32 +08:00 |
|
joylink_fanyuhong
|
4c1b03e3d7
|
操作调整
|
2020-02-12 18:37:24 +08:00 |
|
joylink_cuiweidong
|
926f82b04c
|
北京一号线车次窗新建计划车
|
2020-02-12 18:19:21 +08:00 |
|