Commit Graph

9350 Commits

Author SHA1 Message Date
ival
0742f9b633 修改操作 2019-07-30 09:35:00 +08:00
ival
a59d579d57 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
#	src/jmap/shape/Signal/index.js
2019-07-30 09:19:18 +08:00
ival
ca433c2eb6 修改设备结构 2019-07-30 09:18:24 +08:00
fan
4b69c12542 Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient 2019-07-29 18:15:11 +08:00
fan
42caa08fc2 调整:跑图调整 2019-07-29 18:11:33 +08:00
ival
33e6b6ab43 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
#	src/store/modules/map.js
2019-07-29 17:57:55 +08:00
ival
c4a6b076da 修改菜单处理 2019-07-29 17:57:00 +08:00
zyy
5517f5a467 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-07-29 17:10:37 +08:00
zyy
264eea1d78 修改 车站 道岔地图绘制 配置 2019-07-29 17:10:30 +08:00
ival
cdccd7b41f Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-07-29 16:03:27 +08:00
ival
05c90f1079 修改代码 2019-07-29 16:03:14 +08:00
zyy
4da098c1fd desc: 调整绘图数据 2019-07-29 15:49:28 +08:00
zyy
c05db4daed 调整格式 2019-07-29 15:30:11 +08:00
zyy
d5e5f3b644 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-07-29 15:24:04 +08:00
zyy
00dc541830 调整配置代码 2019-07-29 15:23:55 +08:00
ival
9693c2a2f9 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-07-29 13:45:53 +08:00
ival
69ed6c5eea 处理菜单 2019-07-29 13:45:38 +08:00
fan
1eb577a2ed 调整:代码修改 2019-07-29 13:38:02 +08:00
fan
b50fd1aae3 调整:代码修改 2019-07-29 13:29:30 +08:00
ival
ca01e0aeb7 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
#	src/jmap/shape/Section/index.js
#	src/jmap/shape/Switch/index.js
2019-07-29 11:20:20 +08:00
ival
33442905be 修改道岔状态变化 2019-07-29 11:18:50 +08:00
zyy
9e8e5afe41 修改配置文件代码 2019-07-29 10:59:02 +08:00
zyy
c2400c07e1 desc: 增加区段配置 2019-07-29 10:20:18 +08:00
ival
10cd98fe6f Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-07-29 09:27:49 +08:00
ival
21fd4ec516 修改区段状态变化 2019-07-29 09:27:33 +08:00
fan
9241e91364 调整:列车问题调整 2019-07-29 08:46:29 +08:00
ival
a74053360d Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-07-26 18:54:52 +08:00
ival
02bd1e9d40 调试跑车 2019-07-26 18:54:42 +08:00
zyy
a9127022fd Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-07-26 18:53:51 +08:00
zyy
06c5c60364 desc: 增加section配置 2019-07-26 18:53:44 +08:00
ival
ed01ac7180 修改代码 2019-07-26 17:39:05 +08:00
ival
8f2712e3d8 修改代码 2019-07-26 17:35:58 +08:00
ival
ab86340524 修改列车跑车计算 2019-07-26 17:18:27 +08:00
ival
c161f19b1b 修改跑车 2019-07-26 17:13:03 +08:00
zyy
7be6ca66fc Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
#	src/views/map/mapdraft/mapedit/mapoperate/link.vue
2019-07-26 16:01:18 +08:00
zyy
1305046304 修改代码 2019-07-26 15:59:31 +08:00
ival
95d944b671 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
#	src/jmap/shape/TrainWindow/index.js
2019-07-26 15:53:57 +08:00
ival
4dec6ac93d 调试仿真 2019-07-26 15:52:50 +08:00
fan
7a4fabcb69 调整:列车调整 2019-07-26 15:45:30 +08:00
ival
2192b1eea4 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-07-26 13:32:56 +08:00
ival
9f5130a4f2 代码移植 2019-07-26 13:32:43 +08:00
zyy
797f31f142 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
#	src/views/jlmap/index.vue
2019-07-26 12:18:40 +08:00
zyy
e04e0f1c67 desc: 修改代码 2019-07-26 12:17:53 +08:00
fan
fd4c9b8b91 调整:修改代码 2019-07-26 10:57:54 +08:00
ival
75be303baf Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-07-26 10:39:06 +08:00
ival
2a0aea6bfe 修改页面点击事件 2019-07-26 10:38:57 +08:00
fan
bca25edfff Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient 2019-07-26 09:49:12 +08:00
fan
c17d600851 调整:修改代码 2019-07-26 09:38:45 +08:00
ival
a6ab80a816 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-07-25 18:25:16 +08:00
ival
58911eef1a 修改代码 2019-07-25 18:25:04 +08:00