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

216 Commits

Author SHA1 Message Date
ival
2b8afd0010 修改代码 2019-07-24 13:02:19 +08:00
ival
2d43350ff6 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-07-24 11:24:30 +08:00
ival
e8dad49c5f 修改代码 2019-07-24 11:24:13 +08:00
zyy
886c51259d Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-07-24 11:12:21 +08:00
zyy
e06411df1c desc: 修改section代码 2019-07-24 11:12:15 +08:00
ival
8a4239a865 修改代码 2019-07-24 10:13:01 +08:00
ival
7609233eb5 修改代码 2019-07-24 10:02:07 +08:00
ival
aa89b91153 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-07-24 09:23:21 +08:00
ival
540dc4e346 修改代码 2019-07-24 09:23:08 +08:00
zyy
627a7d86c8 修改代码 2019-07-24 09:21:10 +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
zyy
b938022cbf Merge branch 'dev' 2019-07-23 18:15:25 +08:00
zyy
2604b12120 修改代码 2019-07-23 18:13:50 +08:00
zyy
9115574bc0 修改代码 2019-07-23 18:10:42 +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
ffe150a351 修改代码 2019-07-23 18:05:26 +08:00
zyy
b2482467fe 修改代码 2019-07-23 13:40:55 +08:00
zyy
af6e9fe3c9 修改代码 2019-07-22 17:27:09 +08:00
zyy
23117a8f1f Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 
# Conflicts:
#	src/jmap/theme/batong.js
 2019-07-22 17:20:31 +08:00
zyy
9c743e8bee desc: 修改代码 2019-07-22 17:20:01 +08:00
ival
ee29e51779 修改代码 2019-07-22 17:16:27 +08:00
ival
bc9f244d5f 增加代码 2019-07-22 15:49:15 +08:00
ival
d7ed4c73ce Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 
# Conflicts:
#	src/jmap/shape/Switch/ESwCore.js
#	src/jmap/shape/Switch/index.js
 2019-07-22 15:46:28 +08:00
ival
2ca2c0f193 修改代码 2019-07-22 15:43:42 +08:00
zyy
dd32206ef0 修改道岔代码 2019-07-22 15:32:25 +08:00
zyy
e9b66e1cea Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-07-22 13:41:34 +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
ival
fdc15d109e 增加文件 2019-07-22 13:40:15 +08:00
zyy
fc75783d94 修改代码 2019-07-22 13:40:14 +08:00
zyy
70599404bd desc: 修改代码 2019-07-22 13:39:33 +08:00
ival
3dd126da3a 修改代码 2019-07-22 13:39:03 +08:00
zyy
e5748b0a6c Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-07-22 09:33:19 +08:00
zyy
4a0363ddc2 调整zlevel canvas 层级 2019-07-22 09:33:11 +08:00
ival
042ad9fe6b 修改代码 2019-07-22 09:14:56 +08:00
ival
62391acfd8 修改事件绑定 2019-07-21 21:22:49 +08:00
ival
7848448a95 修正代码 2019-07-21 20:20:41 +08:00
ival
389b9b13ed 修改代码 2019-07-21 18:59:42 +08:00
ival
23232fcf78 修改代码 2019-07-19 18:32:19 +08:00
ival
15ab35d5b9 修改代码 2019-07-19 18:05:43 +08:00
ival
fa02c97851 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 
# Conflicts:
#	src/jmap/transformHandle.js
 2019-07-19 18:02:22 +08:00
ival
a1a2b1d21e 修改代码 2019-07-19 18:01:42 +08:00
zyy
7e7723e9ef Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-07-19 17:53:15 +08:00
zyy
f42a3e2afc 修改代码 2019-07-19 17:53:06 +08:00
ival
80ef1f9ee3 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-07-19 17:51:50 +08:00
ival
8f3e466cf5 修改代码 2019-07-19 17:51:40 +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
65e93a0a8e Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-07-19 15:16:02 +08:00
ival
561ab7521b 修改代码 2019-07-19 15:15:51 +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
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
ival
e3341dcd04 修改代码 2019-07-19 09:23:56 +08:00
ival
8f534ce10a Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-07-18 18:27:48 +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
ival
c4cad61cb6 修改 2019-07-18 18:26:56 +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
ival
257945d203 修改代码 2019-07-18 17:07:09 +08:00
ival
eb86ca65a5 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-07-18 17:02:07 +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
zyy
2138dab1a6 修改代码 2019-07-18 16:11:48 +08:00
ival
e1219c9908 修改代码 2019-07-18 15:28:19 +08:00
zyy
e82c7fb5af Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-07-18 10:17:49 +08:00
zyy
c51ca002ed desc: 修改代码 2019-07-18 10:17:42 +08:00
ival
4692405b68 修改代码 2019-07-18 10:16:53 +08:00
ival
57dd676c4a 修改代码 2019-07-18 10:08:26 +08:00
ival
47171b872e 修改代码 2019-07-18 10:05:16 +08:00
ival
6774d555bf Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 
# Conflicts:
#	src/jmap/theme/fuzhou.js
 2019-07-18 08:57:09 +08:00
ival
dcd977e161 修改 2019-07-18 08:56:17 +08:00
zyy
02cef2dc8c Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-07-17 18:18:42 +08:00
zyy
bc9e02144e desc: 修改代码 2019-07-17 18:18:28 +08:00
ival
73e847aa55 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-07-17 18:17:02 +08:00
ival
74bc2653d1 修改代码 2019-07-17 18:16:52 +08:00
zyy
ea23e6c817 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 
# Conflicts:
#	src/jmap/theme/bejing.js
 2019-07-17 15:54:31 +08:00
zyy
c5c5a4c9f9 desc: 修改代码 2019-07-17 15:54:01 +08:00
ival
cac49ad418 修改代码 2019-07-17 15:53:13 +08:00
ival
f2651e5844 修改代码 2019-07-17 12:17:41 +08:00
ival
38d5cc1b2e 修改代码 2019-07-17 11:19:08 +08:00
ival
22c1b93a40 111 2019-07-17 09:17:49 +08:00
ival
098b4c860e Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-07-17 09:12:16 +08:00
ival
9b3d3a97c8 修改代码 2019-07-17 09:12:05 +08:00
zyy
f8adc05375 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 
# Conflicts:
#	src/jmap/shape/element/ETextName.js
 2019-07-17 09:09:00 +08:00
zyy
ddbf5edeb2 desc: 增加单个绘图元素 2019-07-17 09:08:23 +08:00
ival
0f669bfcbd 修改 2019-07-16 18:44:40 +08:00
ival
82fbb5240f 修改代码 2019-07-16 18:37:49 +08:00
ival
37310e6a3c Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 
# Conflicts:
#	src/jmap/shape/Section.js
#	src/jmap/shape/factory.js
 2019-07-16 16:31:04 +08:00
ival
25e6c8ceb8 修改代码 2019-07-16 16:29:31 +08:00
zyy
896438f51e desc: 调整道岔显示位置 2019-07-16 16:19:01 +08:00
zyy
cecc0edf27 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-07-16 16:04:02 +08:00