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 |
|
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 |
|