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 |
|