fan
|
2100144656
|
西安二号线调整&宁波一号线vue告警调整&仿真鼠标样式调整
|
2020-04-17 15:02:35 +08:00 |
|
fan
|
07711a5bda
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-17 13:32:18 +08:00 |
|
fan
|
a4097e1f32
|
西安二号线调整
|
2020-04-17 13:30:59 +08:00 |
|
joylink_cuiweidong
|
467e8671fd
|
西安二号线屏蔽门绘图调整
|
2020-04-17 13:30:18 +08:00 |
|
fan
|
c268ee7d3c
|
项目获取房间列表添加项目code参数
|
2020-04-17 09:56:41 +08:00 |
|
fan
|
46d95bf715
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-16 17:30:07 +08:00 |
|
joylink_cuiweidong
|
5fe37ec4e2
|
北京一号线 区段实训操作代码调整
|
2020-04-16 17:26:07 +08:00 |
|
fan
|
de84df1cf2
|
菜单操作切换
|
2020-04-16 17:26:01 +08:00 |
|
joylink_cuiweidong
|
1c7a0461fe
|
北京一号线 站台实训操作代码调整
|
2020-04-16 15:50:04 +08:00 |
|
joylink_cuiweidong
|
e88bdf8e0f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-16 14:51:52 +08:00 |
|
joylink_cuiweidong
|
fc2d9c1ff7
|
草稿地图的导入和导出代码调整
北京一号线站台实训操作代码调整
|
2020-04-16 14:50:40 +08:00 |
|
fan
|
1bfe76c291
|
添加西安地铁页面&&项目配置规整（未完）
|
2020-04-16 13:47:40 +08:00 |
|
fan
|
aae2a734ed
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-16 09:03:22 +08:00 |
|
fan
|
8e5a79626a
|
西安二号线调整
|
2020-04-16 09:01:52 +08:00 |
|
joylink_cuiweidong
|
fec4e33719
|
实训平台和设计平台 地图列表代码调整
|
2020-04-15 15:06:51 +08:00 |
|
zyy
|
6826089595
|
调整新版地图字段显示
|
2020-04-15 14:27:39 +08:00 |
|
zyy
|
83f63b5c70
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-15 14:19:37 +08:00 |
|
zyy
|
0091a593e5
|
调整福州线路顶部栏显示名称字段
|
2020-04-15 14:19:22 +08:00 |
|
fan
|
8cd740402f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-15 14:14:32 +08:00 |
|
fan
|
a1869a531f
|
集中站分隔调整&线路管理配置调整
|
2020-04-15 14:13:08 +08:00 |
|
joylink_cuiweidong
|
9ddafdedf5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-15 13:07:34 +08:00 |
|
joylink_cuiweidong
|
47e2ca8d76
|
北京一号线 地图配置文件调整
|
2020-04-15 13:06:58 +08:00 |
|
zyy
|
c2f8eeb250
|
调整佛山线路站台方向显示
|
2020-04-15 13:06:32 +08:00 |
|
zyy
|
25272e4fdd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-15 11:17:33 +08:00 |
|
zyy
|
6cb2939631
|
调整西安二号线道岔状态显示
|
2020-04-15 11:17:19 +08:00 |
|
joylink_cuiweidong
|
2a50ce7287
|
设计平台 加载计划运行图管理 创建通用运行图 地图过滤
|
2020-04-15 10:34:33 +08:00 |
|
zyy
|
87ca3e5556
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/config/deviceStyle.js
# src/jmapNew/theme/factory.js
|
2020-04-15 10:08:47 +08:00 |
|
zyy
|
7ea8fd7add
|
调整佛山线路全线取消扣车操作， 增加西安二号线皮肤
|
2020-04-15 10:06:26 +08:00 |
|
fan
|
8a7de3c22c
|
佛山皮肤调整
|
2020-04-15 09:44:44 +08:00 |
|
fan
|
e9ee5112d4
|
佛山皮肤调整
|
2020-04-15 09:33:21 +08:00 |
|
fan
|
b833ac1acd
|
佛山皮肤调整
|
2020-04-15 09:19:47 +08:00 |
|
fan
|
09f3c4b969
|
调整西安二号线配置
|
2020-04-15 09:07:23 +08:00 |
|
fan
|
2613b68413
|
佛山列车显示调整&西安二号线集中站分割符
|
2020-04-14 18:51:09 +08:00 |
|
fan
|
61c2260d93
|
西安二号线调整
|
2020-04-14 15:45:13 +08:00 |
|
fan
|
c8a500c5dd
|
佛山运行图添加目的地码
|
2020-04-14 11:34:13 +08:00 |
|
zyy
|
cc984c8eb0
|
调整佛山线路，成都一号线运行图 方向信息
|
2020-04-14 10:27:33 +08:00 |
|
zyy
|
feca56f94b
|
调整字段名称显示，调整佛山线路标注字段
|
2020-04-14 09:48:54 +08:00 |
|
joylink_cuiweidong
|
7f7318814c
|
北京一号线 现地 取消进路 信号重开步骤代码调整
|
2020-04-13 18:43:50 +08:00 |
|
fan
|
319d458ca0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-13 18:31:38 +08:00 |
|
fan
|
b7e6b9a8c1
|
佛山运行图导入上行时间调整&西安二号线车站调整
|
2020-04-13 18:30:21 +08:00 |
|
joylink_cuiweidong
|
be187cf1b3
|
北京一号线 操作定义 代码调整
|
2020-04-13 17:57:10 +08:00 |
|
fan
|
20491dac81
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-13 17:13:52 +08:00 |
|
fan
|
f91c8e37d2
|
佛山运行图导入参数调整&西安二号线车站调整
|
2020-04-13 17:12:33 +08:00 |
|
zyy
|
2dc975ef7a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-13 17:04:01 +08:00 |
|
zyy
|
df92090509
|
增加配置中侧防数据，调整接口
|
2020-04-13 17:03:48 +08:00 |
|
joylink_cuiweidong
|
db93886f7e
|
哈尔滨线路 实训操作代码调整
|
2020-04-13 16:29:39 +08:00 |
|
joylink_cuiweidong
|
8475870cf8
|
哈尔滨/宁波 现地 实训设置当前所在集中站 代码调整
|
2020-04-13 14:54:35 +08:00 |
|
joylink_cuiweidong
|
ccf028e5bb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-13 13:08:30 +08:00 |
|
joylink_cuiweidong
|
e083015580
|
西安二号线 屏蔽门和站台的状态代码调整
|
2020-04-13 13:08:17 +08:00 |
|
fan
|
472dd1b62a
|
佛山运行图导入校验调整&西安二号线车站调整
|
2020-04-13 10:43:02 +08:00 |
|
joylink_cuiweidong
|
98c6736c17
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-10 19:14:36 +08:00 |
|
joylink_cuiweidong
|
43c7f2c094
|
哈尔滨一号线 现地 自排开关 信号重开 信号关灯操作处理
|
2020-04-10 18:59:50 +08:00 |
|
fan
|
08d02e9563
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-10 17:51:36 +08:00 |
|
fan
|
b0797644f9
|
实训课程编辑调整&线二号线调整
|
2020-04-10 17:50:26 +08:00 |
|
zyy
|
2d70c294f8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-10 17:24:12 +08:00 |
|
zyy
|
3bfb74d55b
|
调整绘图隐藏元素
|
2020-04-10 17:23:53 +08:00 |
|
fan
|
26e9c33736
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-10 16:47:20 +08:00 |
|
fan
|
11586aef30
|
哈尔滨现地显示BUG调整&西安二号线皮肤调整
|
2020-04-10 16:45:41 +08:00 |
|
joylink_cuiweidong
|
22d587a7a8
|
哈尔滨 行调 道岔操作 实训操作定义修改
|
2020-04-10 16:44:07 +08:00 |
|
joylink_cuiweidong
|
4be8b2dd87
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-10 15:22:08 +08:00 |
|
joylink_cuiweidong
|
0133b3b5d9
|
代码调整
|
2020-04-10 15:21:46 +08:00 |
|
fan
|
165bde34ef
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-10 14:08:26 +08:00 |
|
fan
|
bb69f81e99
|
哈尔滨指令调整
|
2020-04-10 14:07:05 +08:00 |
|
joylink_cuiweidong
|
f0a4491cb8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-10 14:05:37 +08:00 |
|
joylink_cuiweidong
|
e05057bf3f
|
宁波一号线 自动折返代码调整
|
2020-04-10 14:05:20 +08:00 |
|
fan
|
c294e00d46
|
实训定义调整
|
2020-04-10 13:26:37 +08:00 |
|
joylink_cuiweidong
|
9e45a0d342
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-10 10:42:19 +08:00 |
|
joylink_cuiweidong
|
888ae6e936
|
宁波一号线 自动折返按钮实训操作代码调整
|
2020-04-10 10:41:41 +08:00 |
|
fan
|
162bd4c9f2
|
宁波一号线:实训问题调整
|
2020-04-10 10:16:58 +08:00 |
|
fan
|
e6ad580824
|
宁波一号线： 查看站台信息=》站台详细信息，道岔单解/解封
|
2020-04-10 09:24:21 +08:00 |
|
joylink_cuiweidong
|
4e9ccad9e5
|
代码调整
|
2020-04-09 18:51:51 +08:00 |
|
fan
|
991fa86ede
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-09 18:23:35 +08:00 |
|
fan
|
7e0834b13a
|
代码哈尔滨实训数据&本地导入导出
|
2020-04-09 18:22:10 +08:00 |
|
zyy
|
ced7cb91b6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-09 17:37:41 +08:00 |
|
zyy
|
289f1dbff0
|
调整现地列车显示
|
2020-04-09 17:37:27 +08:00 |
|
joylink_cuiweidong
|
1897a79a72
|
西安二号线 屏蔽门绘图代码调整
|
2020-04-09 17:27:10 +08:00 |
|
zyy
|
da62178c72
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-09 17:03:35 +08:00 |
|
zyy
|
8026e14da8
|
调整道岔重置，调整宁波定义
|
2020-04-09 17:03:22 +08:00 |
|
joylink_cuiweidong
|
45e6a12825
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-09 16:32:15 +08:00 |
|
joylink_cuiweidong
|
5a8f4e0fe6
|
西安二号线 屏蔽门绘图代码调整
|
2020-04-09 16:31:53 +08:00 |
|
zyy
|
184ff9d1e2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-09 15:21:57 +08:00 |
|
zyy
|
ee10377b04
|
调整区段字段显示逻辑，道岔计轴区段显示道岔菜单
|
2020-04-09 15:21:44 +08:00 |
|
fan
|
bcb9251f9e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-09 14:51:25 +08:00 |
|
fan
|
f2ba430cc5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-09 14:49:06 +08:00 |
|
joylink_cuiweidong
|
52e26e4d30
|
宁波一号线 查询进路状态步骤操作调整
|
2020-04-09 14:48:25 +08:00 |
|
fan
|
50579656eb
|
进路控制信号机按消息批次处理&西安二计轴调整&&实训管理老地图处理（未完）
|
2020-04-09 14:47:44 +08:00 |
|
joylink_cuiweidong
|
4f416e355d
|
宁波一号线现地 请求站控代码调整
|
2020-04-09 14:37:37 +08:00 |
|
joylink_cuiweidong
|
1f4d8ae061
|
西安二号线 站台绘图调整
|
2020-04-09 13:01:48 +08:00 |
|
zyy
|
78995be06f
|
调整右键点击道岔区段获取道岔菜单列表
|
2020-04-09 09:39:14 +08:00 |
|
fan
|
9ea9d56309
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-08 18:39:31 +08:00 |
|
fan
|
630ccfd016
|
信号机调整
|
2020-04-08 18:38:08 +08:00 |
|
joylink_cuiweidong
|
c736edf9cc
|
代码调整
|
2020-04-08 16:45:51 +08:00 |
|
joylink_cuiweidong
|
132f7bad3c
|
代码调整
|
2020-04-08 16:27:55 +08:00 |
|
joylink_cuiweidong
|
78a8581152
|
宁波一号线 实训请求站控 操作调整
|
2020-04-08 16:24:44 +08:00 |
|
fan
|
2e1b356da9
|
调整区段限速判断
|
2020-04-08 16:21:08 +08:00 |
|
joylink_cuiweidong
|
dd2d572409
|
道岔的 确认计轴有效的指令参数修改
|
2020-04-08 15:43:09 +08:00 |
|
joylink_cuiweidong
|
9c4c447dee
|
宁波一号线操作代码调整
|
2020-04-08 15:37:05 +08:00 |
|
joylink_cuiweidong
|
053648e0a3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-08 15:29:16 +08:00 |
|
joylink_cuiweidong
|
4c2ef28572
|
西安二号线 线路配置文件调整
|
2020-04-08 15:29:03 +08:00 |
|
joylink_cuiweidong
|
1554803dd4
|
代码调整
|
2020-04-08 15:27:55 +08:00 |
|
zyy
|
85eef4b8f9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-08 14:14:04 +08:00 |
|
zyy
|
425b7d3869
|
Merge branch 'master' into test
|
2020-04-08 14:12:58 +08:00 |
|
fan
|
f495a2d560
|
实训占位符调整&皮肤调整
|
2020-04-08 14:06:45 +08:00 |
|
fan
|
013360534b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-08 13:29:30 +08:00 |
|
fan
|
507e28adde
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-08 13:25:45 +08:00 |
|
joylink_cuiweidong
|
23aa213778
|
指令字典参数调整
|
2020-04-08 13:25:10 +08:00 |
|
fan
|
b089aa6651
|
实训占位符调整&皮肤调整
|
2020-04-08 13:23:19 +08:00 |
|
joylink_cuiweidong
|
08a3480dad
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/scripts/OperationConfig.js
|
2020-04-08 13:10:31 +08:00 |
|
joylink_cuiweidong
|
613a88ca90
|
实训操作步骤文件拆分
|
2020-04-08 11:26:55 +08:00 |
|
fan
|
d82b89b57e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-07 18:32:00 +08:00 |
|
fan
|
a1c4a901af
|
实训步骤生成
|
2020-04-07 18:30:46 +08:00 |
|
zyy
|
635b593b56
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-07 18:23:48 +08:00 |
|
zyy
|
f12f84f97b
|
调整实训一键生成，调整宁波线路实训定义
|
2020-04-07 18:22:26 +08:00 |
|
joylink_cuiweidong
|
778d74ecd5
|
北京一号线现地 道岔 站台实训操作步骤代码调整
|
2020-04-07 17:19:28 +08:00 |
|
zyy
|
f26eea8f4b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-07 16:19:34 +08:00 |
|
zyy
|
402a383bf6
|
删除多余打印，调整名称
|
2020-04-07 16:19:24 +08:00 |
|
joylink_cuiweidong
|
2853eb04fd
|
宁波线路实训操作代码调整
|
2020-04-07 15:25:33 +08:00 |
|
fan
|
87ddad535b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-07 14:41:38 +08:00 |
|
fan
|
6667adca07
|
实训调整
|
2020-04-07 14:40:24 +08:00 |
|
zyy
|
1f6b627768
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-07 13:38:28 +08:00 |
|
zyy
|
aa06844b18
|
地图绘制信号机增加偏移量字段
|
2020-04-07 13:37:17 +08:00 |
|
fan
|
6498f68295
|
宁波实训调整
|
2020-04-07 13:09:34 +08:00 |
|
zyy
|
d3f28ff338
|
Merge branch 'test'
|
2020-04-03 18:34:04 +08:00 |
|
fan
|
75bb1f315e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-03 18:32:49 +08:00 |
|
fan
|
64401f7085
|
宁波设置通过模式时为止偏移
|
2020-04-03 18:31:38 +08:00 |
|
zyy
|
0a6f32d6b2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-03 18:09:23 +08:00 |
|
zyy
|
da896de45b
|
调整进路流程，定义
|
2020-04-03 18:09:07 +08:00 |
|
fan
|
1e19840405
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-03 17:45:44 +08:00 |
|
fan
|
5f7804f090
|
佛山运行图导入
|
2020-04-03 17:44:17 +08:00 |
|
fan
|
255ab83233
|
佛山运行图导入
|
2020-04-03 17:40:18 +08:00 |
|
joylink_cuiweidong
|
bab89c4bae
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-03 14:44:08 +08:00 |
|
joylink_cuiweidong
|
f323651087
|
北京一号线现地行调操作步骤调整
|
2020-04-03 14:43:54 +08:00 |
|
fan
|
19900d9816
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-03 13:36:59 +08:00 |
|
zyy
|
6fd9276fe8
|
调整实训步骤，及地图加载状态
|
2020-04-03 13:30:04 +08:00 |
|
fan
|
62131c2166
|
成都三实训调整
|
2020-04-03 13:08:06 +08:00 |
|
joylink_cuiweidong
|
e5067edcce
|
北京一号线区段操作步骤代码调整
|
2020-04-02 18:57:04 +08:00 |
|
fan
|
97eca75407
|
哈尔滨实训
|
2020-04-02 17:51:59 +08:00 |
|
joylink_cuiweidong
|
e273b1be18
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-02 16:16:56 +08:00 |
|
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
|
747595e8e8
|
Merge branch 'test'
|
2020-04-02 11:25:57 +08:00 |
|
fan
|
4bce310d4f
|
福州皮肤调整
|
2020-04-02 11:10:27 +08:00 |
|
zyy
|
1599b82719
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-02 10:52:17 +08:00 |
|
zyy
|
8117a31c80
|
调整代码
|
2020-04-02 10:51:47 +08:00 |
|
fan
|
ef08c5085e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-02 09:50:30 +08:00 |
|
fan
|
1017058855
|
站台状态显示位置调整
|
2020-04-02 09:48:55 +08:00 |
|
zyy
|
a17a02519d
|
调整宁波线路实训生成
|
2020-04-02 09:07:50 +08:00 |
|
fan
|
9d02306fda
|
Merge remote-tracking branch 'origin/test'
# Conflicts:
# src/views/newMap/newMapdraft/mapoperate/section/index.vue
|
2020-04-01 18:00:58 +08:00 |
|