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

287 Commits

Author SHA1 Message Date
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
zyy
f348e05074 desc: 分离区段单个元素 2019-07-16 16:03:56 +08:00
ival
dd21cc3294 修改代码 2019-07-16 13:43:37 +08:00
ival
ab934855d8 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 
# Conflicts:
#	src/jmap/shape/TrainWindow.js
 2019-07-16 13:37:14 +08:00
ival
3f8c852087 修改代码 2019-07-16 13:35:39 +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
7a2cfbf752 修改缩进 2019-07-16 09:12:15 +08:00
ival
d3aed039bc Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-07-15 18:31:25 +08:00
ival
88e69b6093 修改代码 2019-07-15 18:31:13 +08:00
fan
d77ad0cf47 代码调整 2019-07-15 18:06:10 +08:00
fan
29456ac043 暂时注释掉列车鼠标事件 2019-07-15 18:02:10 +08:00
zyy
d50dc24121 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-07-15 16:04:10 +08:00
zyy
f1c1a9f90d 删除注释 2019-07-15 16:03:54 +08:00
fan
1b392a3832 Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient 
# Conflicts:
#	src/jmap/config/deviceStyle.js
#	src/jmap/config/deviceType.js
#	src/jmap/shape/factory.js
#	src/jmap/utils/parser.js
 2019-07-15 16:03:23 +08:00
fan
4bc9a36974 Merge remote-tracking branch 'origin/master' 2019-07-15 16:01:38 +08:00
fan
b35470c513 Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient 
# Conflicts:
#	src/jmap/config/deviceStyle.js
#	src/jmap/config/deviceType.js
#	src/jmap/shape/factory.js
#	src/jmap/utils/parser.js
 2019-07-15 16:01:19 +08:00
ival
5372284ff8 修改代码 2019-07-15 15:58:09 +08:00
ival
d95554b0a8 修改代码 2019-07-15 15:56:41 +08:00
ival
175417026c 1223 2019-07-15 15:56:03 +08:00
ival
0ea864e96d 12312 2019-07-15 15:54:47 +08:00
ival
a2c9c69037 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 
# Conflicts:
#	src/jmap/shape/StationControl.js
#	src/jmap/shape/station.js
 2019-07-15 15:52:34 +08:00
ival
b7c982bad6 修改代码 2019-07-15 15:51:39 +08:00
zyy
493f9da4d1 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 
# Conflicts:
#	src/jmap/shape/factory.js
 2019-07-15 15:47:29 +08:00
zyy
95c5753c5f desc: 增加zcList 2019-07-15 15:47:03 +08:00
ival
d54f3df88c Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-07-15 15:33:28 +08:00
ival
86b35a411e 增加代码 2019-07-15 15:33:18 +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
fan
db47956046 站台、车次窗、列车迁移 2019-07-15 15:30:59 +08:00
zyy
cf389a7381 desc: 增加lc,limiit,image 图层 2019-07-15 15:25:49 +08:00
ival
c89f2dec49 修改代码 2019-07-15 14:45:18 +08:00
ival
ecc5329924 修改代码 2019-07-15 14:14:44 +08:00
ival
10faac5e81 修改代码 2019-07-15 14:01:57 +08:00
ival
6a9939ab6c 增加设备配置 2019-07-15 13:01:03 +08:00
zyy
1a3c9ca500 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 
# Conflicts:
#	src/jmap/config/deviceStyle.js
#	src/jmap/map.js
#	src/jmap/shape/factory.js
#	src/jmap/utils/parser.js
#	src/views/jmap/index.vue
 2019-07-15 10:58:31 +08:00
zyy
fec5d79341 desc: 增加section皮肤，图形渲染 2019-07-15 10:07:04 +08:00
ival
dcdf45f0b3 修改代码 2019-07-15 10:06:07 +08:00
ival
9aa0121c62 修改代码 2019-07-15 09:38:35 +08:00
zyy
ff58614606 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 
# Conflicts:
#	src/jmap/config/deviceStyle.js
#	src/jmap/utils/parser.js
#	src/views/jmap/index.vue
 2019-07-15 09:00:37 +08:00
zyy
18fb4818f0 desc: 增加皮肤配置流程 2019-07-15 08:58:54 +08:00
ival
c67737c5c9 修改代码 2019-07-13 23:45:49 +08:00
zyy
c81094877d desc: 增加注释 2019-07-11 17:58:58 +08:00
ival
d8e5fe8f2b 修改代码 2019-07-10 16:29:07 +08:00
ival
76fef48d87 修改代码 2019-07-10 16:04:17 +08:00
ival
d13bf6876b 修改参数 2019-07-10 13:24:03 +08:00
ival
548714dbca 修改 2019-07-10 13:19:21 +08:00
ival
816c070595 修改变量命名 2019-07-10 13:17:12 +08:00
ival
d5d449c9c5 增加鼠标事件以及回调事件 2019-07-10 12:02:02 +08:00
ival
0360b10a79 增加鼠标处理 2019-07-09 19:04:45 +08:00
ival
7441b41a51 添加操作 2019-07-09 09:24:54 +08:00
ival
2796ef8342 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 
# Conflicts:
#	src/jmap/transformController.js
#	src/views/jmap/index.vue
 2019-07-08 09:40:07 +08:00
ival
266ea1a44a 修正格式 2019-07-08 09:38:39 +08:00
ival
a0dcff598b 修改代理代码 2019-07-07 22:56:09 +08:00
ival
e816f72d83 修改代码 2019-07-05 00:40:53 +08:00
ival
eb305c146b 修改代码 2019-07-04 18:39:30 +08:00
zyy
9fbba9b5a0 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 
# Conflicts:
#	src/jmap/map.js
#	src/jmap/painter.js
#	src/jmap/proxyHandle.js
 2019-07-04 11:00:52 +08:00
zyy
d4191832fb desc: 修改eslint 配置 保存 2019-07-04 10:59:40 +08:00
ival
73278b68d3 修改结构 2019-07-04 09:20:51 +08:00
ival
06003c8068 修改代码 2019-07-03 18:41:00 +08:00
ival
544c9cacef 修改代码 2019-07-03 14:29:09 +08:00