zyy
|
9b68feaba5
|
调整区段字段显隐判断
|
2020-04-09 18:39:27 +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
|
289f1dbff0
|
调整现地列车显示
|
2020-04-09 17:37:27 +08:00 |
|
fan
|
47e692d3a4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-09 16:52:19 +08:00 |
|
fan
|
5036229c47
|
操作定义老地图处理
|
2020-04-09 16:51:17 +08:00 |
|
joylink_cuiweidong
|
3db904a75e
|
代码调整
|
2020-04-09 16:45:34 +08:00 |
|
fan
|
0adcf6dac1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-09 16:14:29 +08:00 |
|
fan
|
79f473ad8b
|
实训管理老地图处理（未完）
|
2020-04-09 16:11:36 +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
|
f2ba430cc5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-09 14:49:06 +08:00 |
|
fan
|
50579656eb
|
进路控制信号机按消息批次处理&西安二计轴调整&&实训管理老地图处理（未完）
|
2020-04-09 14:47:44 +08:00 |
|
zyy
|
15df2687c3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-09 13:45:18 +08:00 |
|
zyy
|
b6d03d24a8
|
调整区段绘制方式
|
2020-04-09 13:45:01 +08:00 |
|
joylink_cuiweidong
|
bcca3c5858
|
一键生成实训代码调整
|
2020-04-09 09:42:35 +08:00 |
|
zyy
|
78995be06f
|
调整右键点击道岔区段获取道岔菜单列表
|
2020-04-09 09:39:14 +08:00 |
|
joylink_cuiweidong
|
2ddd132327
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-09 09:23:25 +08:00 |
|
joylink_cuiweidong
|
c942d4e840
|
实训一键生成代码调整
|
2020-04-09 09:23:09 +08:00 |
|
fan
|
88bb30c413
|
实训管理调整（tabel 实训类型和操作不显示）
|
2020-04-08 18:47:48 +08:00 |
|
joylink_cuiweidong
|
4154b4ce20
|
系统指令字典添加 产品类型 参数
|
2020-04-08 15:59:49 +08:00 |
|
fan
|
b723628d80
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-08 15:33:45 +08:00 |
|
fan
|
5bd90ea0d1
|
实训操作类型筛选调整
|
2020-04-08 15:32:35 +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
|
1554803dd4
|
代码调整
|
2020-04-08 15:27:55 +08:00 |
|
zyy
|
14e4c2c785
|
调整 框选设置元素 设备集中站流程
|
2020-04-08 15:20:29 +08:00 |
|
fan
|
df0d560df8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-08 14:25:27 +08:00 |
|
fan
|
02d4b8f71f
|
进路复制
|
2020-04-08 14:24:11 +08:00 |
|
zyy
|
425b7d3869
|
Merge branch 'master' into test
|
2020-04-08 14:12:58 +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 |
|
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 |
|
zyy
|
a27ee1e859
|
调整一键生成实训延迟显示
|
2020-04-08 10:42:06 +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 |
|
fan
|
0079b698e3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-07 16:45:48 +08:00 |
|
fan
|
88b4bcf2bb
|
指令接口调整
|
2020-04-07 16:44:36 +08:00 |
|
fan
|
d3bd167c70
|
实训管理调整
|
2020-04-07 16:41:08 +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 |
|
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 |
|
joylink_cuiweidong
|
38a05e530d
|
北京一号线现地操作步骤代码调整
|
2020-04-03 16:31:57 +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 |
|
fan
|
ba759b1d77
|
哈尔滨本地项目调整
|
2020-04-03 13:33:33 +08:00 |
|
zyy
|
6fd9276fe8
|
调整实训步骤，及地图加载状态
|
2020-04-03 13:30:04 +08:00 |
|
zyy
|
e1d0aa6af5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-02 17:16:12 +08:00 |
|
zyy
|
34c7ad0fba
|
调整实训查询表头逻辑
|
2020-04-02 17:15:55 +08:00 |
|
fan
|
e45ec364a5
|
宁波实训跳转集中站
|
2020-04-02 16:52:59 +08:00 |
|
fan
|
e49f32d6b2
|
宁波实训跳转集中站
|
2020-04-02 16:28:07 +08:00 |
|
fan
|
a9294357b5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-02 16:24:04 +08:00 |
|
fan
|
523a1f9cd6
|
宁波实训跳转集中站
|
2020-04-02 16:22:53 +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 |
|
zyy
|
8117a31c80
|
调整代码
|
2020-04-02 10:51:47 +08:00 |
|
sunzhenyu
|
bbd3a078c5
|
修改jl3dpassflow文件冲突
|
2020-04-01 18:46:58 +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 |
|
sunzhenyu
|
f31f048846
|
merge
|
2020-04-01 16:54:01 +08:00 |
|
fan
|
8f30d436ee
|
调整绘图&三维跳转页面icon
|
2020-04-01 16:24:03 +08:00 |
|
sunzhenyu
|
fba612403a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-01 16:03:16 +08:00 |
|
sunzhenyu
|
d7fd261c07
|
修改三维客流视图画面
|
2020-04-01 16:03:09 +08:00 |
|
fan
|
ebd90d2485
|
本地项目调整&elementUI升版本至2.12.0
|
2020-04-01 15:32:06 +08:00 |
|
fan
|
c1abbaed49
|
关闭gzip
|
2020-04-01 15:01:08 +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
|
2a59c51b00
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-01 13:49:18 +08:00 |
|
joylink_cuiweidong
|
995460afdf
|
仿真界面添加列车详情
|
2020-04-01 12:53:58 +08:00 |
|
fan
|
b778621329
|
Merge branch 'dev_pack' into test
# Conflicts:
# package.json
# vue.config.js
|
2020-04-01 10:33:26 +08:00 |
|
fan
|
7df417424e
|
调整本地项目快速入口
|
2020-04-01 09:07:42 +08:00 |
|
joylink_cuiweidong
|
046cfe8318
|
Merge branch 'dev' into test
|
2020-03-31 19:13:42 +08:00 |
|
joylink_cuiweidong
|
06a6087f0c
|
代码调整
|
2020-03-31 19:12:30 +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 |
|
fan
|
eddca622df
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-03-31 18:51:02 +08:00 |
|
fan
|
bfd5b07145
|
调整本地项目综合演练
|
2020-03-31 18:50:16 +08:00 |
|
sunzhenyu
|
ec0f59682b
|
merge
|
2020-03-31 18:45:00 +08:00 |
|
sunzhenyu
|
3bbd28c17b
|
限制只有新数据有驾驶面板
|
2020-03-31 18:42:38 +08:00 |
|
sunzhenyu
|
d4f7da9c8b
|
添加驾驶操作面板，三维模型资源改本地
|
2020-03-31 18:30:15 +08:00 |
|
zyy
|
3ab182f3c4
|
调整逻辑区段显示，过滤框选逻辑区段
|
2020-03-31 17:52:53 +08:00 |
|
fan
|
335132c9b9
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-03-31 16:55:58 +08:00 |
|
fan
|
007c3658c6
|
调整本地项目
|
2020-03-31 16:54:04 +08:00 |
|
fan
|
e35149248d
|
调整本地项目
|
2020-03-31 15:11:20 +08:00 |
|
joylink_cuiweidong
|
3472860fbd
|
新版 剧本编制 添加动作指令操作添加 以及 动作指令展示
|
2020-03-31 14:52:19 +08:00 |
|
zyy
|
900489638c
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-31 14:41:30 +08:00 |
|
zyy
|
1873898adc
|
调整回车内容不修改
|
2020-03-31 14:41:17 +08:00 |
|
fan
|
724e198f79
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-03-31 13:47:25 +08:00 |
|
fan
|
5563212ec0
|
调整哈尔滨项目
|
2020-03-31 13:45:45 +08:00 |
|
fan
|
28e8cf53af
|
调整icon图标
|
2020-03-31 13:33:09 +08:00 |
|
fan
|
437491c9e7
|
调整
|
2020-03-31 13:13:21 +08:00 |
|
fan
|
63c73ab78c
|
Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
# src/views/jlmap3d/simulation/jl3dsimulation.vue
|
2020-03-31 11:14:33 +08:00 |
|
fan
|
c7bd705726
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-31 10:06:56 +08:00 |
|
fan
|
d6e883e167
|
考试调整
|
2020-03-31 10:06:41 +08:00 |
|
zyy
|
1ad7265f58
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-31 09:43:01 +08:00 |
|
zyy
|
aaefa200c4
|
调整实训定义，调整提示逻辑
|
2020-03-31 09:42:46 +08:00 |
|
fan
|
e43ad1fa99
|
调整哈尔滨显示
|
2020-03-31 09:27:02 +08:00 |
|
fan
|
a3b6c3b59c
|
创建线下用户
|
2020-03-30 20:28:20 +08:00 |
|
fan
|
38bed2b045
|
Merge branches 'dev' and 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-30 19:59:00 +08:00 |
|
fan
|
19d5f71596
|
调整哈尔滨打包设计平台
|
2020-03-30 19:58:37 +08:00 |
|
zyy
|
9412fd0740
|
计算区段实际长度保留小数点3位
|
2020-03-30 17:59:23 +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
|
d4f3a4afa2
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-30 17:39:16 +08:00 |
|
joylink_cuiweidong
|
8c2f1cf729
|
新剧本 仿真类型切换代码调整
|
2020-03-30 17:39:00 +08:00 |
|
fan
|
2de6c8c787
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-30 17:16:16 +08:00 |
|
fan
|
9c18770137
|
生成线下用户
|
2020-03-30 17:15:45 +08:00 |
|
zyy
|
1e2a015955
|
调整区段实际长度逻辑
|
2020-03-30 17:07:51 +08:00 |
|
joylink_cuiweidong
|
0d5645a027
|
新版剧本接口代码调整
|
2020-03-30 16:56:38 +08:00 |
|
fan
|
5d21051eaa
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-30 16:53:09 +08:00 |
|
fan
|
338a9e9683
|
生成线下用户
|
2020-03-30 16:52:53 +08:00 |
|
joylink_cuiweidong
|
68f77a25b6
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-30 16:16:29 +08:00 |
|
joylink_cuiweidong
|
8f6f033870
|
剧本仿真切换仿真类型代码调整
|
2020-03-30 16:16:11 +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 |
|
fan
|
238f8a3d88
|
生成线下用户
|
2020-03-30 15:29:07 +08:00 |
|
fan
|
343b8fd55e
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-30 15:28:28 +08:00 |
|
fan
|
b229e9c08a
|
生成线下用户
|
2020-03-30 15:28:13 +08:00 |
|
joylink_cuiweidong
|
52dd666430
|
新版公共地图预览代码调整
|
2020-03-30 15:26:47 +08:00 |
|
fan
|
dee1efe00f
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-30 13:07:32 +08:00 |
|
fan
|
ab4928d924
|
差异化打包调整&哈尔滨登录页
|
2020-03-30 13:07:11 +08:00 |
|
zyy
|
c5dbd2b141
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/utils/baseUrl.js
|
2020-03-27 18:20:28 +08:00 |
|
zyy
|
47519b7040
|
调整道岔生成默认状态，调整道岔皮肤配置
|
2020-03-27 18:19:40 +08:00 |
|
fan
|
a8d9aa001c
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-27 18:15:02 +08:00 |
|
fan
|
6ef1fc2013
|
实训调整
|
2020-03-27 18:14:46 +08:00 |
|
joylink_cuiweidong
|
93dc9a6983
|
新版剧本编制接口调整
|
2020-03-27 17:29:01 +08:00 |
|
zyy
|
a95e940255
|
调整实训步骤校验
|
2020-03-27 14:37:28 +08:00 |
|
fan
|
3a8a3b87d8
|
调整左边弹框显示
|
2020-03-27 14:01:57 +08:00 |
|
fan
|
fb8d0b6615
|
Merge remote-tracking branch 'origin/dev_training' into dev_n
# Conflicts:
# src/views/designPlatform/demonList.vue
|
2020-03-27 13:55:00 +08:00 |
|
fan
|
a697ab21d5
|
调整实训
|
2020-03-27 13:52:14 +08:00 |
|
joylink_cuiweidong
|
d4279dd03a
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-27 11:31:53 +08:00 |
|
joylink_cuiweidong
|
966bed109b
|
新版剧本代码调整
|
2020-03-27 11:31:40 +08:00 |
|
zyy
|
faf772712c
|
调整增加自动生成实训操作步骤
|
2020-03-27 11:24:47 +08:00 |
|
sunzhenyu
|
b8d4cbcaba
|
将三维沙盘中设备信息按钮隐藏
|
2020-03-27 11:04:25 +08:00 |
|
fan
|
3c1d038a81
|
实训仿真调整
|
2020-03-27 10:51:49 +08:00 |
|
fan
|
f34de4f001
|
实训调整
|
2020-03-26 18:42:01 +08:00 |
|
zyy
|
aba49d9ee4
|
增加联锁表配置查询条件
|
2020-03-26 17:23:19 +08:00 |
|
fan
|
aadbe543a5
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-26 09:44:27 +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 |
|
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 |
|
zyy
|
f96c8a11ef
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-25 13:46:14 +08:00 |
|
zyy
|
d5c9799189
|
删除路径单元模块 新增设置站间运行等级
|
2020-03-25 13:45:58 +08:00 |
|
fan
|
df70024740
|
代码调整
|
2020-03-24 18:42:18 +08:00 |
|
fan
|
1e72a8cff3
|
状态灯调整
|
2020-03-24 16:35:09 +08:00 |
|
fan
|
5c7c27d2f3
|
状态灯调整
|
2020-03-24 15:02:14 +08:00 |
|
fan
|
9ff1d7e30c
|
Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
# src/store/modules/socket.js
|
2020-03-24 10:13:01 +08:00 |
|
fan
|
e9aad944ae
|
绘图线条调整
|
2020-03-24 10:05:51 +08:00 |
|
fan
|
39420c1432
|
存在仿真管理调整
|
2020-03-24 09:23:24 +08:00 |
|
fan
|
2501a1a70a
|
综合演练问题调整
|
2020-03-23 16:00:28 +08:00 |
|
fan
|
03df0aee07
|
登录页调整
|
2020-03-23 14:15:27 +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 |
|
fan
|
a85f1d8f5e
|
代码调整
|
2020-03-23 13:52:50 +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 |
|
fan
|
3b16939d1c
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-03-23 10:35:18 +08:00 |
|
fan
|
a435040ef1
|
综合演练调整
|
2020-03-23 10:30:23 +08:00 |
|
fan
|
88ca3a568e
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-03-20 18:51:36 +08:00 |
|
zyy
|
788737369a
|
调整哈尔滨线路 现地 行调 菜单高度
|
2020-03-20 17:56:20 +08:00 |
|
fan
|
cc6af4f056
|
综合演练调整
|
2020-03-20 17:36:07 +08:00 |
|
sunzhenyu
|
d55ca741dc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-03-20 17:00:46 +08:00 |
|
sunzhenyu
|
0b6415b162
|
修改三维设备视图，修改站台模型贴图，修改客流量加载页面
|
2020-03-20 17:00:12 +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
|
80fda91dba
|
自动折返&引导总锁调整
|
2020-03-20 14:12:02 +08:00 |
|
zyy
|
473d60ca0c
|
Merge branch 'dev' into test
|
2020-03-20 13:08:35 +08:00 |
|
zyy
|
7f419b5bac
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/views/iscs/iscsSystem/config/broadcast/centerHome.vue
|
2020-03-20 11:24:00 +08:00 |
|
zyy
|
3e14220cfc
|
调整综合监控站台数据，及样式
|
2020-03-20 11:20:13 +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 |
|
sunzhenyu
|
3abc9fad16
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-03-20 09:55:23 +08:00 |
|
sunzhenyu
|
2760a4a678
|
修改三维客流视图加载界面，修改仿真站台模型
|
2020-03-20 09:55:13 +08:00 |
|
zyy
|
3b645724cc
|
Merge branch 'dev' into test
|
2020-03-19 18:40:12 +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 |
|
joylink_cuiweidong
|
bd046abd8b
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2020-03-19 13:08:34 +08:00 |
|
joylink_cuiweidong
|
65566a1438
|
添加 贵州装备制造职业学院 案例展示
北京一号线操作代码调整
|
2020-03-19 13:06:48 +08:00 |
|
fan
|
73d763b700
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-03-18 19:06:23 +08:00 |
|
zyy
|
3afa12711e
|
新增哈尔滨线路底部栏 操作
|
2020-03-18 18:47:37 +08:00 |
|
joylink_cuiweidong
|
0bba854e15
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-18 10:53:56 +08:00 |
|
joylink_cuiweidong
|
ce02703a5a
|
自动折返和自动进路按钮绘图代码调整
|
2020-03-18 10:53:42 +08:00 |
|
fan
|
aa97a242b1
|
绘图问题调整
|
2020-03-18 10:31:23 +08:00 |
|
zyy
|
11b2ee8130
|
调整代码
|
2020-03-18 10:20:49 +08:00 |
|
fan
|
43ffec406d
|
综合演练调整
|
2020-03-18 09:59:54 +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 |
|
fan
|
71d328296f
|
综合演练调整
|
2020-03-17 18:44:49 +08:00 |
|
joylink_cuiweidong
|
d8d143ae38
|
删除地图绘制中，车站里面的引导总锁
|
2020-03-17 17:59:47 +08:00 |
|
zyy
|
2e7e25dd06
|
增加功能按钮绘图方式
|
2020-03-17 16:12:15 +08:00 |
|
fan
|
b94c2b47de
|
综合演练调整
|
2020-03-17 14:54:03 +08:00 |
|
fan
|
022cf8c6ac
|
代码调整
|
2020-03-17 10:07:02 +08:00 |
|
sunzhenyu
|
2e0b0913d6
|
修改设计平台三维数据发布
|
2020-03-16 18:47:55 +08:00 |
|
zyy
|
933f0c1bba
|
调整综合演练ibp获取数据
|
2020-03-16 16:06:50 +08:00 |
|
fan
|
4ab462ed5d
|
合并代码
|
2020-03-16 15:32:00 +08:00 |
|
fan
|
cd9915668b
|
综合演练接口修改
|
2020-03-16 15:29:26 +08:00 |
|
zyy
|
1745bfbcf1
|
ibp盘绘制更新保存流程调整完成
|
2020-03-16 14:47:59 +08:00 |
|
zyy
|
1c78d52fed
|
调整ibp文件配置路径
|
2020-03-16 11:02:33 +08:00 |
|
joylink_zyy
|
0e570584bc
|
调整ibp绘制地图
|
2020-03-13 21:17:20 +08:00 |
|
zyy
|
5dbd676ccf
|
调整代码
|
2020-03-13 19:04:28 +08:00 |
|
zyy
|
ce21ff9d91
|
调整接口
|
2020-03-13 19:01:59 +08:00 |
|
fan
|
47a856e0c1
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-03-13 18:24:11 +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
|
a7b81a3383
|
调整车次窗初始显示
|
2020-03-13 16:35:03 +08:00 |
|
fan
|
6c52c3b56f
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-13 13:25:54 +08:00 |
|
zyy
|
31d50d95e2
|
增加仿真系统 iscs工作站
|
2020-03-13 13:23:04 +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 |
|
zyy
|
cb4c615345
|
调整哈尔滨综合监控绘图宽度，高度显示， 综合监控名称动态显示
|
2020-03-12 18:36:05 +08:00 |
|
joylink_cuiweidong
|
a124110a86
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2020-03-12 15:13:56 +08:00 |
|
joylink_cuiweidong
|
56126bdbf3
|
列车精确定位代码调整
列车的状态信息调整
去掉仿真里的拖动鼠标生成包围框
|
2020-03-12 14:41:53 +08:00 |
|
zyy
|
b7ee3e5f6e
|
增加批量调整区段名称位置
|
2020-03-12 13:13:00 +08:00 |
|
joylink_cuiweidong
|
42010f4d8d
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2020-03-11 18:24:16 +08:00 |
|
fan
|
8ad0544dc2
|
创建小站台时，不设置区段为站台轨
|
2020-03-11 18:00:45 +08:00 |
|
fan
|
bd2938173a
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-03-11 16:59:47 +08:00 |
|
fan
|
939360917e
|
调整信号机接近区段颜色变化
|
2020-03-11 16:58:14 +08:00 |
|
fan
|
3273724484
|
调整自动折返非空校验
|
2020-03-11 15:50:47 +08:00 |
|
fan
|
ef60af34c0
|
绘图预览切换现地行调显示
|
2020-03-11 15:10:08 +08:00 |
|
sunzhenyu
|
b4d5363559
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-03-11 14:33:54 +08:00 |
|
fan
|
0aac76bb0e
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-03-11 10:54:08 +08:00 |
|
fan
|
5d39b8e84e
|
绘图显示调整
|
2020-03-11 10:53:09 +08:00 |
|
sunzhenyu
|
d3d1909a82
|
新数据三维仿真优化
|
2020-03-10 18:57:13 +08:00 |
|
fan
|
50bb1ad59e
|
绘图高级数据调整
|
2020-03-10 18:56:03 +08:00 |
|
fan
|
ee53da67bc
|
调整点击设备中组成元素的数据处理
|
2020-03-10 13:05:20 +08:00 |
|
fan
|
a4e5bf3d81
|
现地行调显示区分
|
2020-03-10 09:49:05 +08:00 |
|
fan
|
2a61f97663
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-03-09 18:39:30 +08:00 |
|
fan
|
d45950fa68
|
自动折返调整
|
2020-03-09 18:35:01 +08:00 |
|
fan
|
7f4e6fb13c
|
初始化按计划行车状态and其他调整
|
2020-03-09 17:38:15 +08:00 |
|
zyy
|
e59fe1cae5
|
Merge branch 'dev' into test
|
2020-03-09 17:05:43 +08:00 |
|
fan
|
2b971cdf12
|
初始化按计划行车状态and其他调整
|
2020-03-09 14:23:44 +08:00 |
|
zyy
|
4eff0fc013
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# src/jmapNew/shape/Station/index.js
|
2020-03-07 11:08:57 +08:00 |
|
joylink_fanyuhong
|
7f53be45b1
|
进路调整，绘图相关调整
(cherry picked from commit e9749da)
|
2020-03-06 20:42:04 +08:00 |
|
joylink_fanyuhong
|
e9749daddb
|
进路调整，绘图相关调整
|
2020-03-06 18:25:05 +08:00 |
|
zyy
|
93be0b7ff6
|
调整车站引导总锁在地图绘制中不显示，增加字体的默认状态
|
2020-03-06 12:18:04 +08:00 |
|
zyy
|
b2a154a3a4
|
增加车站 站台 屏蔽门批量设置功能
|
2020-03-06 12:04:00 +08:00 |
|
joylink_fanyuhong
|
e966312a03
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-03-06 11:31:42 +08:00 |
|
zyy
|
6d0849f5b3
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/jmapNew/utils/parser.js
|
2020-03-06 10:23:14 +08:00 |
|
zyy
|
a1f752fe59
|
调整地图绘制矩形框保存字段
|
2020-03-06 10:21:41 +08:00 |
|
joylink_fanyuhong
|
99532acc8a
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-03-06 10:20:51 +08:00 |
|