Commit Graph

75 Commits

Author SHA1 Message Date
zyy
83faa429fe 修改列车详情显示问题 2019-08-07 11:22:33 +08:00
ival
a02a948f17 修改bug 2019-08-06 18:42:18 +08:00
ival
b6baa2e420 修改 设置设备名称的设置方法 2019-08-06 17:46:41 +08:00
ival
f85139b4ae 修改鼠标关联操作 2019-08-06 17:00:24 +08:00
ival
5270c0bc2a 删除无用代码,增加信号机和站台鼠标代码 2019-07-31 11:06:14 +08:00
zyy
deccfc537a Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-07-30 18:03:04 +08:00
zyy
09285fb326 修改代码 2019-07-30 18:02:58 +08:00
fan
2919ae5a15 Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient 2019-07-30 17:27:39 +08:00
fan
dd4d83f02b 调整:代码调整 2019-07-30 17:27:29 +08:00
ival
7a71fc42ae Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-07-30 16:47:22 +08:00
ival
276f68e7bc 修改优化代码 2019-07-30 16:47:11 +08:00
zyy
82c49c97e2 调整代码 2019-07-30 15:52:30 +08:00
ival
9152b6a55e 增加 Line 和 Text 设备移植,以及调试代码 2019-07-30 12:37:31 +08:00
ival
ca433c2eb6 修改设备结构 2019-07-30 09:18:24 +08:00
ival
05c90f1079 修改代码 2019-07-29 16:03:14 +08:00
ival
69ed6c5eea 处理菜单 2019-07-29 13:45:38 +08:00
ival
33442905be 修改道岔状态变化 2019-07-29 11:18:50 +08:00
ival
21fd4ec516 修改区段状态变化 2019-07-29 09:27:33 +08:00
ival
02bd1e9d40 调试跑车 2019-07-26 18:54:42 +08:00
ival
c161f19b1b 修改跑车 2019-07-26 17:13:03 +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
2a0aea6bfe 修改页面点击事件 2019-07-26 10:38:57 +08:00
ival
58911eef1a 修改代码 2019-07-25 18:25:04 +08:00
ival
f28f5fc1cd 修改代码 2019-07-25 15:44:23 +08:00
zyy
3afd5f8e61 修改代码 2019-07-25 14:03:26 +08:00
ival
a95bf7c338 修改代码 2019-07-25 13:24:40 +08:00
ival
8b46424116 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
#	src/router/index.js
#	src/store/index.js
#	src/store/modules/config.js
#	src/views/components/progressBar/index.vue
#	src/views/jlmap/index.vue
#	src/views/jlmap/zoom/zoom.vue
#	src/views/mapsystem/common/index.vue
#	src/views/mapsystem/index.vue
2019-07-25 10:35:10 +08:00
ival
b11ba5369e 移植jlmap 2019-07-25 10:32:29 +08:00
zyy
75e3162d68 修改代码 2019-07-25 10:30:30 +08:00
ival
2ca2c0f193 修改代码 2019-07-22 15:43:42 +08:00
ival
7848448a95 修正代码 2019-07-21 20:20:41 +08:00
ival
a1a2b1d21e 修改代码 2019-07-19 18:01:42 +08:00
zyy
046e603fe7 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-07-19 15:18:05 +08:00
zyy
058e688602 修改代码 2019-07-19 15:17:58 +08:00
ival
561ab7521b 修改代码 2019-07-19 15:15:51 +08:00
ival
452c9fe7d7 修改代码 2019-07-19 13:54:23 +08:00
ival
9bdd8e15c5 修改代码 2019-07-19 11:11:34 +08:00
ival
fcd9f7dad4 修改代码 2019-07-19 09:40:22 +08:00
zyy
d8f0c74cbf Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
#	src/jmap/map.js
2019-07-18 18:27:10 +08:00
zyy
a72feee896 修改代码 2019-07-18 18:25:57 +08:00
ival
ed840d2359 修改代码 2019-07-18 18:24:40 +08:00
ival
3a0e467221 修改代码 2019-07-18 17:21:18 +08:00
zyy
4d9884f425 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
#	src/jmap/config/deviceStyle.js
#	src/jmap/shape/factory.js
2019-07-16 13:34:46 +08:00
zyy
301e0f7245 no message 2019-07-16 13:34:03 +08:00
ival
27fc58a23e 修改代码 2019-07-16 12:01:43 +08:00
ival
14d84a29c4 修改代码 2019-07-16 09:44:31 +08:00
ival
88e69b6093 修改代码 2019-07-15 18:31:13 +08:00
zyy
46b3b843cd Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
#	src/jmap/config/deviceRender.js
#	src/jmap/config/deviceType.js
#	src/jmap/shape/Signal.js
#	src/jmap/shape/factory.js
#	src/jmap/shape/section.js
#	src/jmap/utils/parser.js
2019-07-15 15:32:32 +08:00