joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity
2,727 Commits 20 Branches 0 Tags 448 MiB
766a169282
Commit Graph

1824 Commits

Author SHA1 Message Date
zyy
0bb46ab432 高级数据调整顺序 2019-12-18 13:21:07 +08:00
zyy
0d3ba9d138 Merge branch 'dev' into test 2019-12-18 13:07:54 +08:00
fan
2d068a93ce Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-18 13:06:00 +08:00
fan
7cf546efe6 参数调整 2019-12-18 13:05:29 +08:00
zyy
0a8b0e3264 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-18 11:18:08 +08:00
zyy
436db38200 调整区段字段保存获取 2019-12-18 11:17:57 +08:00
joylink_cuiweidong
cf03ac1e3d 综合演练的分发按钮去掉 
所有的转增按钮去掉
 2019-12-18 11:16:35 +08:00
joylink_cuiweidong
8d44dd0b19 Merge remote-tracking branch 'remotes/origin/dev' into test 2019-12-18 10:20:44 +08:00
joylink_cuiweidong
d196383a06 批量设置集中站 数据过滤 2019-12-18 10:18:55 +08:00
zyy
97dc97d8db Merge branch 'dev' into test 2019-12-18 10:14:33 +08:00
joylink_cuiweidong
9c54da44f3 站台创建关联集中站 2019-12-18 10:01:58 +08:00
joylink_cuiweidong
e3fb06591c 代码修改 2019-12-17 19:22:07 +08:00
joylink_cuiweidong
b864c717fb 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-17 19:05:19 +08:00
joylink_cuiweidong
b4ea83eabc zc 集中站设置 2019-12-17 19:03:38 +08:00
zyy
33f140d71c 修改小站台位置 2019-12-17 18:17:33 +08:00
fan
97202631ea Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-17 17:27:54 +08:00
fan
88eeaff1e2 区段站台问题调整 2019-12-17 17:27:35 +08:00
zyy
ea4de2d11d Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-17 17:09:13 +08:00
zyy
88b1d10430 调整生成道岔 区段修改字段 2019-12-17 17:09:04 +08:00
fan
6195338947 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-17 16:41:40 +08:00
fan
3723c8696e 区段关系校验 2019-12-17 16:41:18 +08:00
joylink_cuiweidong
cd549d57fc 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-17 16:24:24 +08:00
joylink_cuiweidong
b8448aaff8 道岔设置集中站过滤 
区段设置集中站过滤
车站设置集中站和管理车站列表代码调整
 2019-12-17 16:22:07 +08:00
zyy
b05d71667e 调整列车创建 2019-12-17 15:37:11 +08:00
zyy
fce5242e06 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-17 14:34:18 +08:00
zyy
24fd0890dd 调整进路保存 2019-12-17 14:34:09 +08:00
fan
c501445800 折线偏移量调整 2019-12-17 14:26:56 +08:00
fan
e419fd9241 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-17 10:31:24 +08:00
fan
4cecc2d630 逻辑区段增加偏移量参数 2019-12-17 10:31:12 +08:00
zyy
0bb01b4e4c 调整信号机字段 2019-12-17 10:30:27 +08:00
fan
a1be3cf879 逻辑区段增加偏移量参数 2019-12-17 10:26:38 +08:00
zyy
c0e953ceeb Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/views/newMap/newMapdraft/mapoperate/signal/index.vue
#	src/views/newMap/newMapdraft/mapoperate/stationstand.vue
 2019-12-17 09:16:55 +08:00
zyy
9fe6c9739d 调整代码 2019-12-17 09:13:57 +08:00
fan
5dc6f88beb Merge remote-tracking branch 'origin/dev' into test 2019-12-16 19:24:08 +08:00
fan
1877b05cce 信号机方向属性调整 2019-12-16 18:17:43 +08:00
fan
28c57c1228 站台方向属性调整 2019-12-16 14:51:30 +08:00
fan
c79465b31a Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-16 10:57:53 +08:00
fan
7d2d6fb580 站台方向属性调整 2019-12-16 10:57:40 +08:00
zyy
de30f91aed 修改代码 2019-12-13 18:50:01 +08:00
joylink_cuiweidong
61ee6415cf Merge remote-tracking branch 'remotes/origin/dev' into test 2019-12-13 18:31:23 +08:00
zyy
a6e8f1376f 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-13 18:01:48 +08:00
zyy
70ae531eff 增加信号机构建偏移量关联关系逻辑， 调整车次窗批量修改 2019-12-13 18:00:12 +08:00
fan
b2c9e34a25 站台方向属性初始值调整 2019-12-13 17:53:34 +08:00
fan
62300d327f 站台方向属性调整 2019-12-13 17:51:00 +08:00
fan
852ac4e601 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-13 17:12:10 +08:00
fan
ea3217891a 逻辑区段偏移量 2019-12-13 17:06:17 +08:00
fan
bd1cbf4e40 站台调整 2019-12-13 16:28:34 +08:00
joylink_cuiweidong
36c1b6ceec 车站添加副标题 2019-12-13 16:13:10 +08:00
sunzhenyu
23400034c1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2019-12-13 15:57:51 +08:00
sunzhenyu
e8cc316e82 增加继电器部件显示 2019-12-13 15:57:38 +08:00
joylink_cuiweidong
284f7bcc7b 区段删除站台轨对应站台编码 2019-12-13 15:24:51 +08:00
joylink_cuiweidong
6715c48642 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-13 14:58:39 +08:00
joylink_cuiweidong
9123dc050a 车站添加车站编号 2019-12-13 14:58:28 +08:00
fan
13f608a2ff 高级高亮调整 2019-12-13 14:46:38 +08:00
fan
8f6a7c1253 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-13 14:19:49 +08:00
fan
fc3ab4cc21 站台屏蔽门调整 2019-12-13 14:19:38 +08:00
joylink_cuiweidong
eb3b803462 信号机所属集中站数据筛选 
进路所属联锁站数据筛选
 2019-12-13 14:02:15 +08:00
joylink_cuiweidong
0a2e5567a2 代码调整 2019-12-13 13:23:07 +08:00
joylink_cuiweidong
b2b9c5819b 车站增加: 是否连锁站 
区段删除关联站台字段
 2019-12-13 13:19:09 +08:00
fan
083e70dc02 站台屏蔽门调整 2019-12-13 13:10:11 +08:00
zyy
a0899720b6 Merge branch 'dev' into test 2019-12-13 10:19:44 +08:00
sunzhenyu
c89401b58a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2019-12-13 09:14:37 +08:00
sunzhenyu
a9a62b924f 添加继电器界面动画，修改继电器显示模式 2019-12-13 09:14:28 +08:00
zyy
2f639cce5e Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-12 18:15:32 +08:00
zyy
7ef051733a 调整缩放，站台显示，坐标 2019-12-12 18:15:25 +08:00
fan
4af61e8615 drawWay参数调整 2019-12-12 16:10:44 +08:00
fan
811a430ec1 Revert "drawWay参数调整" 
This reverts commit 54be69b
 2019-12-12 16:07:32 +08:00
fan
0ef09ed480 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-12 15:58:39 +08:00
fan
54be69b2e6 drawWay参数调整 2019-12-12 15:58:19 +08:00
zyy
7c9d9c6373 调整站台显示样式问题，修改代码 2019-12-12 15:31:01 +08:00
fan
9a342caad7 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-12 12:23:36 +08:00
fan
80109bb349 区段新建台调整 2019-12-12 12:23:25 +08:00
joylink_cuiweidong
eec32fea2a Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-12 10:41:32 +08:00
joylink_cuiweidong
df31cb9138 代码调整 2019-12-12 10:40:54 +08:00
zyy
e7505d65eb Merge branch 'dev' into test 2019-12-12 10:05:51 +08:00
zyy
6fb6ae9867 调整站台，屏蔽门默认样式 2019-12-12 10:05:28 +08:00
fan
6e50f1eddf Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-11 18:25:22 +08:00
fan
cc014d4ccc 自动折返设置优先级 2019-12-11 18:25:03 +08:00
zyy
23aec2d206 Merge branch 'dev' into test 2019-12-11 17:23:03 +08:00
zyy
159a2b4890 调整点击道岔计轴显示道岔区段 2019-12-11 17:22:01 +08:00
zyy
206496609d Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-11 17:07:39 +08:00
zyy
b2dd3d7285 调整站台生成逻辑，调整uid检测方式 2019-12-11 17:07:29 +08:00
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