Commit Graph

44 Commits

Author SHA1 Message Date
ival
77db948f68 修改皮肤配置 2019-08-02 18:05:08 +08:00
ival
803dd3f823 修改皮肤配置 2019-08-02 17:02:43 +08:00
ival
60aa181598 修改皮肤配置 2019-08-02 14:17:43 +08:00
ival
3042cf229d 修改代码 2019-07-31 14:59:38 +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
0742f9b633 修改操作 2019-07-30 09:35:00 +08:00
ival
ca433c2eb6 修改设备结构 2019-07-30 09:18:24 +08:00
ival
33442905be 修改道岔状态变化 2019-07-29 11:18:50 +08:00
ival
4dec6ac93d 调试仿真 2019-07-26 15:52:50 +08:00
ival
f28f5fc1cd 修改代码 2019-07-25 15:44:23 +08:00
ival
dfd337e93f 修改字体设置 2019-07-24 13:50:37 +08:00
ival
e8dad49c5f 修改代码 2019-07-24 11:24:13 +08:00
ival
8a4239a865 修改代码 2019-07-24 10:13:01 +08:00
ival
7609233eb5 修改代码 2019-07-24 10:02:07 +08:00
ival
540dc4e346 修改代码 2019-07-24 09:23:08 +08:00
ival
bdf42ae492 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
#	src/jmap/shape/Signal/ESigLamp.js
#	src/jmap/shape/Signal/index.js
2019-07-24 09:10:45 +08:00
ival
68d83c2a88 修改代码 2019-07-23 18:49:54 +08:00
zyy
d26085b8a5 修改代码 2019-07-23 18:33:30 +08:00
ival
a5528542cc 修改代码 2019-07-23 18:30:08 +08:00
ival
b2da416325 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
#	src/jmap/shape/Signal/ESigAuto.js
#	src/jmap/shape/Signal/ESigButton.js
#	src/jmap/shape/Signal/ESigLmap.js
#	src/jmap/shape/Signal/ESigPost.js
#	src/jmap/shape/Signal/ESigRoute.js
#	src/jmap/shape/Signal/index.js
#	src/jmap/theme/fuzhou.js
2019-07-23 18:24:05 +08:00
ival
b9132cb29f 修改 2019-07-23 18:22:05 +08:00
ival
1bab212c05 修改代码 2019-07-23 18:21:49 +08:00
ival
e334901490 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
#	src/jmap/shape/Signal/index.js
2019-07-23 18:07:18 +08:00
ival
39af264196 修改代码 2019-07-23 18:06:13 +08:00
zyy
b2482467fe 修改代码 2019-07-23 13:40:55 +08:00
ival
2ca2c0f193 修改代码 2019-07-22 15:43:42 +08:00
zyy
274a48c33b Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
#	src/jmap/shape/Switch/index.js
2019-07-22 13:41:12 +08:00
zyy
70599404bd desc: 修改代码 2019-07-22 13:39:33 +08:00
ival
3dd126da3a 修改代码 2019-07-22 13:39:03 +08:00
zyy
4a0363ddc2 调整zlevel canvas 层级 2019-07-22 09:33:11 +08:00
zyy
c912074739 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
#	src/jmap/map.js
#	src/jmap/shape/Signal/index.js
#	src/views/jmap/index.vue
2019-07-19 14:31:45 +08:00
zyy
d99d1b9ecc 修改代码 2019-07-19 14:30:26 +08:00
ival
e3341dcd04 修改代码 2019-07-19 09:23:56 +08:00
ival
ed840d2359 修改代码 2019-07-18 18:24:40 +08:00
ival
892d8a5e9d Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
#	src/views/jmap/index.vue
2019-07-18 17:01:21 +08:00
ival
47171b872e 修改代码 2019-07-18 10:05:16 +08:00