fan
|
eafb83a886
|
自动折返调整
|
2019-12-11 14:10:51 +08:00 |
|
fan
|
5fdbbe9295
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-11 13:57:06 +08:00 |
|
fan
|
cd15b3737c
|
自动折返，进路调整
|
2019-12-11 13:56:46 +08:00 |
|
sunzhenyu
|
57db66b6c2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2019-12-11 10:47:32 +08:00 |
|
sunzhenyu
|
5992e1a0ae
|
修改三维模块名称，升级threejs版本
|
2019-12-11 10:47:24 +08:00 |
|
joylink_cuiweidong
|
a358b9cdd6
|
代码调整
|
2019-12-11 09:42:33 +08:00 |
|
zyy
|
9e50f2eacf
|
Merge branch 'dev' into test
|
2019-12-11 09:08:28 +08:00 |
|
joylink_cuiweidong
|
d5eef0c022
|
信号机接近区段页面调整
|
2019-12-10 18:11:11 +08:00 |
|
joylink_cuiweidong
|
b6e6e72d17
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-10 18:02:08 +08:00 |
|
joylink_cuiweidong
|
98c7e1105f
|
自动信号接口修改
|
2019-12-10 18:01:52 +08:00 |
|
fan
|
214a74a55a
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-10 17:56:08 +08:00 |
|
fan
|
0bde17887f
|
高级延续保护调整
|
2019-12-10 17:55:43 +08:00 |
|
joylink_cuiweidong
|
f6e0221b88
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-10 17:11:54 +08:00 |
|
joylink_cuiweidong
|
424ec26538
|
用户权限统计代码调整
|
2019-12-10 17:11:14 +08:00 |
|
zyy
|
914af945c8
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-10 16:57:37 +08:00 |
|
zyy
|
9aec1ef099
|
调整拖拽逻辑
|
2019-12-10 16:57:31 +08:00 |
|
fan
|
b6719793c9
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-10 16:50:50 +08:00 |
|
fan
|
6afb5f35a8
|
高级延续保护调整
|
2019-12-10 16:50:38 +08:00 |
|
zyy
|
18892bed83
|
移入鼠标显示坐标
|
2019-12-10 16:09:45 +08:00 |
|
zyy
|
640b38285a
|
调整车站默认字体大小，皮肤调整
|
2019-12-10 15:44:46 +08:00 |
|
joylink_cuiweidong
|
00552b6494
|
区段批量创建代码调整
|
2019-12-10 11:02:13 +08:00 |
|
joylink_cuiweidong
|
58b3c182f1
|
代码调整
|
2019-12-10 10:52:58 +08:00 |
|
joylink_cuiweidong
|
fed85fe78e
|
订单列表代码调整
|
2019-12-10 10:44:18 +08:00 |
|
joylink_cuiweidong
|
9199d7bc64
|
权限分发代码调整
|
2019-12-10 10:27:29 +08:00 |
|
fan
|
2c6f19b270
|
合并代码
|
2019-12-10 10:20:32 +08:00 |
|
fan
|
45e4aaca8b
|
延续保护调整
|
2019-12-10 10:18:25 +08:00 |
|
zyy
|
18ebc91da2
|
调整批量创建区段 逻辑
|
2019-12-10 10:12:46 +08:00 |
|
zyy
|
4385e64b03
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-10 09:25:19 +08:00 |
|
zyy
|
ae36dc3542
|
新增区段创建方式
|
2019-12-10 09:25:13 +08:00 |
|
joylink_cuiweidong
|
6d26e8e217
|
进路添加是否先锁闭字段
|
2019-12-09 18:54:11 +08:00 |
|
zyy
|
bdebbed374
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-09 17:48:52 +08:00 |
|
zyy
|
5114f848b3
|
调整道岔计轴区段生成逻辑
|
2019-12-09 17:48:46 +08:00 |
|
joylink_cuiweidong
|
a15cb8d43c
|
获取发布地图接口修改（添加drawWay参数）
|
2019-12-09 17:38:08 +08:00 |
|
joylink_cuiweidong
|
b8563c839b
|
订单列表国际化
|
2019-12-09 17:25:20 +08:00 |
|
joylink_cuiweidong
|
b7fd5b7475
|
订单管理列表页面代码调整
|
2019-12-09 16:52:01 +08:00 |
|
joylink_cuiweidong
|
90c0598af7
|
订单管理创建订单页面代码调整
|
2019-12-09 15:35:57 +08:00 |
|
fan
|
e28595053d
|
Revert "区段列表变更调整"
This reverts commit 95caf15
|
2019-12-09 15:20:59 +08:00 |
|
fan
|
586d7a23e5
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-09 15:05:25 +08:00 |
|
fan
|
95caf1509e
|
区段列表变更调整
|
2019-12-09 15:05:15 +08:00 |
|
joylink_cuiweidong
|
b6bb17f064
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-09 14:51:32 +08:00 |
|
joylink_cuiweidong
|
97eeda5eeb
|
订单创建代码调整
|
2019-12-09 14:51:01 +08:00 |
|
zyy
|
01501ce364
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-09 14:33:30 +08:00 |
|
zyy
|
f596016097
|
增加区段与车次窗关联关系
|
2019-12-09 14:33:23 +08:00 |
|
fan
|
96f237d581
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-09 11:00:42 +08:00 |
|
fan
|
28e9abe13a
|
ibp绘图部分设备添加操作表示关联设备
|
2019-12-09 11:00:25 +08:00 |
|
lVAL
|
0b590e922c
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-09 10:52:19 +08:00 |
|
lVAL
|
eeb69eac26
|
修改，两个房主相互邀请时，跳转房间路径bug的问题
|
2019-12-09 10:52:08 +08:00 |
|
zyy
|
6bd0e07e58
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-09 10:50:28 +08:00 |
|
zyy
|
2bac1022b4
|
修改生成规则，调整新版地图右键操作
|
2019-12-09 10:50:21 +08:00 |
|
fan
|
d8b0577c77
|
删除打印日志
|
2019-12-06 18:13:42 +08:00 |
|
fan
|
e281045268
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-12-06 18:11:05 +08:00 |
|
fan
|
0f56e5b7eb
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-06 18:09:40 +08:00 |
|
fan
|
a6872d7e1e
|
绘图调整-（逻辑区段添加均为0或均不为0校验）
|
2019-12-06 18:09:31 +08:00 |
|
sunzhenyu
|
00d74d6d63
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2019-12-06 18:04:22 +08:00 |
|
sunzhenyu
|
a6c9db1904
|
修改仿真驾驶添加模型错误，修改沙盘漫游动画轨迹，修改沙盘图标显示，清除不使用的天空盒文件
|
2019-12-06 18:04:15 +08:00 |
|
zyy
|
35688adcd0
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-06 18:03:18 +08:00 |
|
zyy
|
dc381e2a63
|
desc: 新增屏蔽门绘制以及紧急停车按钮生成流程
|
2019-12-06 18:03:13 +08:00 |
|
fan
|
eb741b4be3
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-06 17:55:00 +08:00 |
|
fan
|
ac3b2d85fd
|
ibp 添加屏蔽门操作
|
2019-12-06 17:54:38 +08:00 |
|
joylink_cuiweidong
|
53626c8a12
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-12-06 15:54:29 +08:00 |
|
joylink_cuiweidong
|
51498fe4a6
|
代码调整
|
2019-12-06 15:53:09 +08:00 |
|
joylink_cuiweidong
|
c3157a030b
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-06 15:46:33 +08:00 |
|
joylink_cuiweidong
|
43861b0939
|
权限代码调整
|
2019-12-06 15:46:14 +08:00 |
|
fan
|
d09b418bba
|
绘图相关调整_(添加快捷键修改)
|
2019-12-06 15:12:22 +08:00 |
|
fan
|
a4f83d1f38
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-06 14:36:27 +08:00 |
|
fan
|
7cc2b68d13
|
绘图相关调整_(区段快捷删除调整)
|
2019-12-06 14:36:18 +08:00 |
|
joylink_cuiweidong
|
ce50945e01
|
区段代码调整
|
2019-12-06 14:35:23 +08:00 |
|
zyy
|
c0c580ec1d
|
修改生成名字规则
|
2019-12-06 13:56:18 +08:00 |
|
zyy
|
ff177f1f3b
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/views/newMap/newMapdraft/mapoperate/section.vue
|
2019-12-06 13:04:37 +08:00 |
|
zyy
|
824b4ca414
|
修改命名规则
|
2019-12-06 13:03:45 +08:00 |
|
joylink_cuiweidong
|
7deb870fba
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/views/newMap/newMapdraft/mapoperate/section.vue
|
2019-12-06 11:29:05 +08:00 |
|
joylink_cuiweidong
|
4313a027ed
|
逻辑区段代码调整
|
2019-12-06 11:27:30 +08:00 |
|
fan
|
5f132f3951
|
绘图相关调整_(区段删除调整)
|
2019-12-06 11:02:42 +08:00 |
|
zyy
|
3c4f803df2
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-06 10:31:26 +08:00 |
|
zyy
|
c192deb2ca
|
修改代码
|
2019-12-06 10:31:19 +08:00 |
|
fan
|
ab661e0961
|
绘图相关调整_(暂仅绘图注册键盘事件)
|
2019-12-06 10:11:29 +08:00 |
|
fan
|
4f824b83ac
|
绘图相关调整_(调整快捷键代码)
|
2019-12-06 10:05:14 +08:00 |
|
joylink_cuiweidong
|
47c39878b7
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-06 09:01:58 +08:00 |
|
joylink_cuiweidong
|
e87a592b9a
|
代码调整
|
2019-12-06 09:01:05 +08:00 |
|
fan
|
69f531eace
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-05 18:53:24 +08:00 |
|
fan
|
75f400a1c7
|
绘图相关调整_(添加快捷删除)
|
2019-12-05 18:53:06 +08:00 |
|
fan
|
b88693c772
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-05 18:12:46 +08:00 |
|
zyy
|
853e1535a8
|
Merge branch 'dev' into test
|
2019-12-05 18:12:40 +08:00 |
|
fan
|
fe33008621
|
绘图相关调整_(区段问题调整)
|
2019-12-05 18:12:33 +08:00 |
|
zyy
|
89dc506054
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-05 18:12:27 +08:00 |
|
zyy
|
03d766f5ee
|
修改实训平台购买提示
|
2019-12-05 18:12:09 +08:00 |
|
zyy
|
226703b3e1
|
Merge branch 'dev' into test
|
2019-12-05 18:02:05 +08:00 |
|
zyy
|
22825baf03
|
增加车站创建方式
|
2019-12-05 18:01:09 +08:00 |
|
zyy
|
5f591dd0c9
|
Merge branch 'dev' into test
|
2019-12-05 16:44:28 +08:00 |
|
zyy
|
0656f04dd5
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-05 16:43:41 +08:00 |
|
zyy
|
baa7273288
|
修改区段
|
2019-12-05 16:43:35 +08:00 |
|
joylink_cuiweidong
|
7aeed15baa
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-05 16:35:43 +08:00 |
|
joylink_cuiweidong
|
118e825c0f
|
代码调整
|
2019-12-05 16:35:31 +08:00 |
|
zyy
|
f5ae986443
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-05 16:18:02 +08:00 |
|
zyy
|
b66aecff7e
|
调整区段名字生成规则
|
2019-12-05 16:17:54 +08:00 |
|
sunzhenyu
|
edb19dfad6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2019-12-05 16:04:47 +08:00 |
|
sunzhenyu
|
7831bce219
|
添加仿真设备视图
|
2019-12-05 16:04:36 +08:00 |
|
joylink_cuiweidong
|
902e92de1f
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/views/newMap/newMapdraft/mapoperate/section.vue
|
2019-12-05 15:52:29 +08:00 |
|
joylink_cuiweidong
|
2805a4219c
|
区段代码调整
|
2019-12-05 15:48:01 +08:00 |
|
zyy
|
ea5f2a30b2
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-05 15:39:21 +08:00 |
|
zyy
|
a03c797c60
|
修改道岔计轴区段生成逻辑
|
2019-12-05 15:39:15 +08:00 |
|
fan
|
dcdd9aeee0
|
绘图相关调整_(区段问题调整)
|
2019-12-05 15:36:42 +08:00 |
|
fan
|
22f9332ea3
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-05 14:55:33 +08:00 |
|
fan
|
a83b2cd2cd
|
绘图相关调整_(问题调整)
|
2019-12-05 14:54:33 +08:00 |
|
joylink_cuiweidong
|
6f31e57e64
|
代码调整
|
2019-12-05 14:31:39 +08:00 |
|
joylink_cuiweidong
|
2a0702cd61
|
代码调整
|
2019-12-05 13:25:15 +08:00 |
|
joylink_cuiweidong
|
78101563ba
|
信号机代码调整
|
2019-12-05 13:15:19 +08:00 |
|
zyy
|
0a51aa1e23
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/jmapNew/shape/Station/index.js
# src/views/newMap/newMapdraft/mapoperate/station.vue
|
2019-12-05 10:27:06 +08:00 |
|
zyy
|
8bbd5e2600
|
desc: 修改代码
|
2019-12-05 10:25:07 +08:00 |
|
joylink_cuiweidong
|
ba084b23d8
|
代码调整
|
2019-12-05 10:19:41 +08:00 |
|
fan
|
117d3a3d0b
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-04 18:41:55 +08:00 |
|
fan
|
ce0a4f4528
|
绘图相关调整_(延时解锁-未完)
|
2019-12-04 18:41:45 +08:00 |
|
fan
|
60b4d6a060
|
绘图相关调整_(高亮问题调整)
|
2019-12-04 18:40:45 +08:00 |
|
zyy
|
23f93194e6
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/views/newMap/newMapdraft/mapoperate/station.vue
|
2019-12-04 18:40:19 +08:00 |
|
zyy
|
22bc27293f
|
修改代码
|
2019-12-04 18:39:28 +08:00 |
|
joylink_cuiweidong
|
585d403e7d
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-04 15:49:33 +08:00 |
|
joylink_cuiweidong
|
c971cf32f8
|
代码调整
|
2019-12-04 15:49:24 +08:00 |
|
fan
|
cd18f40939
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-04 15:33:18 +08:00 |
|
fan
|
f5a5d20ebb
|
绘图相关调整_(批量创建车站，区段添加激活)
|
2019-12-04 15:33:08 +08:00 |
|
zyy
|
d5bb00b924
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/views/newMap/newMapdraft/mapoperate/station.vue
|
2019-12-04 15:00:46 +08:00 |
|
zyy
|
5b6e30f01b
|
增加按图折返
|
2019-12-04 14:59:04 +08:00 |
|
joylink_cuiweidong
|
aadc6b1856
|
代码调整
|
2019-12-04 14:43:47 +08:00 |
|
joylink_cuiweidong
|
7a9db12402
|
代码调整
|
2019-12-04 14:41:08 +08:00 |
|
joylink_cuiweidong
|
ff26ebfc08
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-12-04 14:10:48 +08:00 |
|
zyy
|
30bab42bbf
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/views/newMap/newMapdraft/mapoperate/index.vue
|
2019-12-04 14:09:29 +08:00 |
|
zyy
|
69e73b2195
|
修改代码
|
2019-12-04 14:08:55 +08:00 |
|
fan
|
98248904e4
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-04 14:02:59 +08:00 |
|
fan
|
1ec864986a
|
绘图相关调整_(设备添加高亮)
|
2019-12-04 14:02:39 +08:00 |
|
joylink_cuiweidong
|
eb9873e6e5
|
代码调整
|
2019-12-04 13:38:32 +08:00 |
|
joylink_cuiweidong
|
f97bd74c39
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-04 13:01:22 +08:00 |
|
joylink_cuiweidong
|
6f58a39b30
|
代码调整
|
2019-12-04 13:01:12 +08:00 |
|
joylink_cuiweidong
|
d94bbff72f
|
代码调整
|
2019-12-04 13:00:24 +08:00 |
|
fan
|
a5e4861895
|
绘图相关调整_(设备添加高亮)
|
2019-12-04 11:32:30 +08:00 |
|
zyy
|
aab4e4ad82
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-04 11:32:20 +08:00 |
|
zyy
|
1f73a54c32
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-04 11:32:06 +08:00 |
|
zyy
|
632d8c5c1b
|
desc: 调整数据保存格式处理逻辑
|
2019-12-04 11:31:59 +08:00 |
|
fan
|
4ef0c259c5
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-04 09:34:05 +08:00 |
|
fan
|
87e2a11011
|
绘图相关调整_(区段添加高亮)
|
2019-12-04 09:33:45 +08:00 |
|
zyy
|
2640a5546f
|
修改区段创建
|
2019-12-03 18:54:20 +08:00 |
|
zyy
|
252b0c4cc6
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-03 18:44:52 +08:00 |
|
zyy
|
4526204f03
|
修改显示层级
|
2019-12-03 18:44:46 +08:00 |
|
fan
|
e6893b8cb7
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-03 18:15:52 +08:00 |
|
fan
|
72746ba261
|
绘图相关调整_(国际化调整&列车所在方向非必传)
|
2019-12-03 18:15:30 +08:00 |
|
zyy
|
4428a968ee
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-03 18:13:49 +08:00 |
|
zyy
|
c99a4dfd3a
|
调整接口字段
|
2019-12-03 18:13:44 +08:00 |
|
joylink_cuiweidong
|
2f33bd79a4
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-03 17:52:51 +08:00 |
|
joylink_cuiweidong
|
c818577e48
|
代码调整
|
2019-12-03 17:52:39 +08:00 |
|
zyy
|
e4aeb547f0
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-03 17:51:45 +08:00 |
|
zyy
|
94f3bce874
|
desc: 修改创建权限逻辑
|
2019-12-03 17:51:39 +08:00 |
|
fan
|
1e7fa5de77
|
Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
# src/utils/baseUrl.js
|
2019-12-03 17:47:27 +08:00 |
|