joylink_cuiweidong
|
8c01b4129f
|
列车绘图代码调整
|
2020-03-25 18:34:43 +08:00 |
|
zyy
|
a2875baa19
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-25 18:26:30 +08:00 |
|
zyy
|
41100ac9bf
|
调整宁波线路 道岔 封锁 单锁状态
|
2020-03-25 18:26:19 +08:00 |
|
fan
|
5bcb42e0f2
|
宁波调整
|
2020-03-25 17:32:57 +08:00 |
|
joylink_cuiweidong
|
ad4de2cd45
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-25 17:16:16 +08:00 |
|
joylink_cuiweidong
|
ef33f0f628
|
宁波一号线 增加列车移入显示边框
|
2020-03-25 17:15:16 +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
|
7604e276e1
|
宁波一号线 列车样式调整
|
2020-03-25 10:43:32 +08:00 |
|
joylink_cuiweidong
|
c31c09e88b
|
佛山有轨电车 现地操作调整
|
2020-03-24 18:18:01 +08:00 |
|
joylink_cuiweidong
|
089b8960b9
|
佛山线路现地界面调整
|
2020-03-24 18:01:10 +08:00 |
|
fan
|
a0b9974040
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-24 16:51:16 +08:00 |
|
fan
|
70b75e354c
|
状态灯调整
|
2020-03-24 16:50:09 +08:00 |
|
joylink_cuiweidong
|
fabd5f1025
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-24 16:40:37 +08:00 |
|
joylink_cuiweidong
|
f83753102e
|
北京线宁波线操作代码调整
|
2020-03-24 16:40:17 +08:00 |
|
fan
|
652aa43a2a
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-24 16:37:26 +08:00 |
|
fan
|
1e72a8cff3
|
状态灯调整
|
2020-03-24 16:35:09 +08:00 |
|
zyy
|
98158fdb86
|
删除默认状态
|
2020-03-24 15:10:31 +08:00 |
|
zyy
|
92adfa396a
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-24 15:09:42 +08:00 |
|
zyy
|
a22ec53e39
|
调整佛山线路信号机，站台状态
|
2020-03-24 15:09:25 +08:00 |
|
fan
|
5c7c27d2f3
|
状态灯调整
|
2020-03-24 15:02:14 +08:00 |
|
joylink_cuiweidong
|
be03a9e623
|
宁波线操作代码调整
|
2020-03-24 14:43:58 +08:00 |
|
joylink_cuiweidong
|
21ac6c0ac4
|
北京一号线宁波一号线控制权转换代码调整
|
2020-03-24 13:43:30 +08:00 |
|
zyy
|
6abb83f838
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-24 13:39:35 +08:00 |
|
zyy
|
bd48b2844c
|
佛山线路道岔状态调整，修改道岔绘图元素逻辑
|
2020-03-24 13:39:20 +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
|
a6543ca2b4
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-23 14:28:11 +08:00 |
|
zyy
|
688aa7310b
|
增加佛山有轨线路文件，调整区段显示状态
|
2020-03-23 14:27:57 +08:00 |
|
fan
|
f574279afe
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-23 13:59:51 +08:00 |
|
zyy
|
72d27264f4
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-23 13:48:56 +08:00 |
|
zyy
|
ad6b8f8dba
|
调整区段流程逻辑，站台流程
|
2020-03-23 13:48:35 +08:00 |
|
joylink_cuiweidong
|
fd302bbbdd
|
北京一号线控制权操作代码调整
|
2020-03-23 11:09:40 +08:00 |
|
fan
|
0e23e9f6a9
|
调整代码
|
2020-03-23 10:47:16 +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
|
9280651ed4
|
删除信号机多余元素
|
2020-03-20 18:14:42 +08:00 |
|
zyy
|
788737369a
|
调整哈尔滨线路 现地 行调 菜单高度
|
2020-03-20 17:56:20 +08:00 |
|
fan
|
cc6af4f056
|
综合演练调整
|
2020-03-20 17:36:07 +08:00 |
|
zyy
|
21c453f68d
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-20 17:17:32 +08:00 |
|
zyy
|
7a15c07782
|
调整哈尔滨信号机状态
|
2020-03-20 17:17:23 +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 |
|
zyy
|
402d161e73
|
调整格式
|
2020-03-20 13:07:31 +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 |
|
fan
|
7de2c38af4
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-19 16:17:53 +08:00 |
|
fan
|
36b7d7309a
|
增加绘图表示灯&&线条颜色
|
2020-03-19 16:17:34 +08:00 |
|
zyy
|
056076c682
|
调整宁波线 引导办理 引导取消
|
2020-03-19 14:43:27 +08:00 |
|
zyy
|
1a20248a0d
|
调整区段逻辑
|
2020-03-19 14:09:50 +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 |
|
fan
|
ad858543d8
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-19 10:23:43 +08:00 |
|
fan
|
acc05f770e
|
调整进路状态影响自动进路功能按钮
|
2020-03-19 10:23:24 +08:00 |
|
joylink_cuiweidong
|
85e587f844
|
北京一号线操作代码调整
|
2020-03-19 10:02:25 +08:00 |
|
fan
|
8ba124ab6f
|
参数调整
|
2020-03-19 09:25:51 +08:00 |
|
fan
|
aa7b0071ca
|
现地操作调整
|
2020-03-19 09:12:46 +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
|
a925c568e5
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-18 11:19:10 +08:00 |
|
zyy
|
4203c30e30
|
调整宁波线路自动折返 计轴复位操作
|
2020-03-18 11:18:52 +08:00 |
|
fan
|
aa97a242b1
|
绘图问题调整
|
2020-03-18 10:31:23 +08:00 |
|
zyy
|
11b2ee8130
|
调整代码
|
2020-03-18 10:20:49 +08:00 |
|
zyy
|
12f283cbae
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/views/newMap/newMapdraft/mapoperate/ControlDraft.vue
# src/views/newMap/newMapdraft/mapoperate/index.vue
|
2020-03-18 09:12:18 +08:00 |
|
zyy
|
0ceb0c2c65
|
调整自动折返 type 类型 增加自动折返菜单流程
|
2020-03-18 09:10:57 +08:00 |
|
joylink_cuiweidong
|
3beb346ce1
|
功能按钮代码调整
|
2020-03-17 18:59:51 +08:00 |
|
joylink_cuiweidong
|
c01b261638
|
引导总锁绘制代码调整
|
2020-03-17 18:25:03 +08:00 |
|
zyy
|
2fb74f520d
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-17 18:02:16 +08:00 |
|
zyy
|
e2930da073
|
调整信号机状态
|
2020-03-17 18:02:02 +08:00 |
|
joylink_cuiweidong
|
d8d143ae38
|
删除地图绘制中，车站里面的引导总锁
|
2020-03-17 17:59:47 +08:00 |
|
joylink_cuiweidong
|
03d85d705c
|
哈尔滨一号线现地界面样式调整
|
2020-03-17 17:05:43 +08:00 |
|
zyy
|
a89b4d5f1d
|
调整宁波线路引导信号显示
|
2020-03-17 16:57:09 +08:00 |
|
zyy
|
a7baf76513
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-17 16:12:26 +08:00 |
|
zyy
|
2e7e25dd06
|
增加功能按钮绘图方式
|
2020-03-17 16:12:15 +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 |
|
zyy
|
c39ec3301b
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-16 11:02:46 +08:00 |
|
zyy
|
1c78d52fed
|
调整ibp文件配置路径
|
2020-03-16 11:02:33 +08:00 |
|
joylink_cuiweidong
|
a7193c5424
|
代码调整
|
2020-03-16 10:36:01 +08:00 |
|
fan
|
a29b0360d5
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-16 10:16:29 +08:00 |
|
fan
|
00b1b13542
|
调整哈尔滨显示
|
2020-03-16 10:16:17 +08:00 |
|
fan
|
6a77d68c8d
|
调整哈尔滨显示
|
2020-03-16 10:15:58 +08:00 |
|
joylink_cuiweidong
|
fb9fcc30a3
|
代码调整
|
2020-03-13 20:02:40 +08:00 |
|
joylink_cuiweidong
|
6576f3c559
|
代码调整
|
2020-03-13 19:39:36 +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 |
|