ival
|
01b871fa77
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-08 16:37:31 +08:00 |
|
ival
|
3adc1aafb1
|
修改界面菜单栏加载后出发 缩放按钮重新调整位置
删除代码中的无用代码
|
2019-08-08 16:37:15 +08:00 |
|
fan
|
6b21fefaeb
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient
|
2019-08-08 13:47:39 +08:00 |
|
fan
|
bcf73c78c2
|
调整：代码迁移+列车调整
|
2019-08-08 13:47:30 +08:00 |
|
ival
|
45295404c3
|
1. 修改福州线，取消扣车被禁用的问题
2. 修改i18n的获取当前语言的函数
|
2019-08-08 13:23:54 +08:00 |
|
zyy
|
af61917dbf
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/theme/factory.js
|
2019-08-08 09:48:14 +08:00 |
|
zyy
|
f231ffd6f1
|
desc: 增加成都四号线地图配置
|
2019-08-08 09:47:39 +08:00 |
|
ival
|
9ffce4d702
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-08 09:37:46 +08:00 |
|
ival
|
c855925ae3
|
修改配置
|
2019-08-08 09:37:35 +08:00 |
|
fan
|
05e4fd73bb
|
调整：列车调整
|
2019-08-08 09:35:28 +08:00 |
|
zyy
|
fe9b59e2de
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-07 16:23:11 +08:00 |
|
zyy
|
d70953a130
|
desc: 增加成都四号线模型， 修改地图删除逻辑
|
2019-08-07 16:23:04 +08:00 |
|
ival
|
7feea79e44
|
成都三号线运行图解析
|
2019-08-07 15:32:35 +08:00 |
|
ival
|
a02a948f17
|
修改bug
|
2019-08-06 18:42:18 +08:00 |
|
zyy
|
37c13f6672
|
调整代码格式，福州线状态处理
|
2019-08-06 17:02:04 +08:00 |
|
ival
|
86c5a5f58f
|
抽离车次窗配置
|
2019-08-06 13:19:30 +08:00 |
|
ival
|
7573e30a31
|
修改皮肤配置
|
2019-08-06 13:09:11 +08:00 |
|
ival
|
d4b995675d
|
提出字体粗细配置
|
2019-08-06 13:02:55 +08:00 |
|
zyy
|
e71c68f7bc
|
修改signal 状态管理
|
2019-08-06 10:54:22 +08:00 |
|
ival
|
fb33bde94c
|
设置状态时，无需关注model变化，render时，model已经引用到view上
|
2019-08-05 17:24:20 +08:00 |
|
ival
|
78e7e344aa
|
修改操作问题
|
2019-08-05 17:09:16 +08:00 |
|
ival
|
79bd163d8f
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-05 16:55:47 +08:00 |
|
ival
|
d2887ee34e
|
调整道岔名称的y轴设置
|
2019-08-05 16:55:36 +08:00 |
|
zyy
|
d7a80d3bc3
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-05 16:43:59 +08:00 |
|
zyy
|
87177a347b
|
desc: 修改代码
|
2019-08-05 16:43:52 +08:00 |
|
ival
|
b8fb7fc210
|
修改代码
|
2019-08-05 16:21:43 +08:00 |
|
ival
|
1e5ad7e522
|
修改bug
|
2019-08-05 16:17:46 +08:00 |
|
ival
|
efa91ae5a0
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-05 16:14:53 +08:00 |
|
ival
|
7c526a94c6
|
修改代码
|
2019-08-05 16:14:40 +08:00 |
|
fan
|
6bc62094ba
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient into master_列车配置项结构调整
|
2019-08-05 15:20:04 +08:00 |
|
fan
|
dbc16a1172
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient into master_列车配置项结构调整
# Conflicts:
# src/jmap/config/skinStyle/chengdu_03.js
|
2019-08-05 15:19:32 +08:00 |
|
fan
|
a55ab7b57e
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient into master_列车配置项结构调整
# Conflicts:
# src/jmap/config/skinStyle/chengdu_03.js
|
2019-08-05 15:18:40 +08:00 |
|
fan
|
fd8b2402ad
|
调整：列车成都线调整
|
2019-08-05 15:13:49 +08:00 |
|
ival
|
9792a2547a
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-05 15:13:41 +08:00 |
|
ival
|
6f73920532
|
增加信号机变现变化处理
|
2019-08-05 15:13:31 +08:00 |
|
zyy
|
386f79128a
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-05 15:12:13 +08:00 |
|
zyy
|
d45c154fe0
|
修改代码
|
2019-08-05 15:12:06 +08:00 |
|
ival
|
555664aaeb
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-05 15:01:03 +08:00 |
|
ival
|
042e6c0e59
|
修改区段名称的问题
|
2019-08-05 15:00:51 +08:00 |
|
fan
|
824c6ed834
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient into master_列车配置项结构调整
|
2019-08-05 13:36:14 +08:00 |
|
fan
|
15d0ea03e5
|
调整：列车调整
|
2019-08-05 13:36:00 +08:00 |
|
zyy
|
f37f441d33
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/config/skinStyle/bejing_01.js
# src/jmap/config/skinStyle/fuzhou_01.js
|
2019-08-05 10:36:28 +08:00 |
|
zyy
|
5134feec56
|
desc: 修改代码
|
2019-08-05 10:33:31 +08:00 |
|
ival
|
5e8f1899ff
|
修改代码
|
2019-08-05 09:59:08 +08:00 |
|
fan
|
072495709a
|
调整：列车配置项结构调整
|
2019-08-05 09:36:15 +08:00 |
|
ival
|
1e6a5510ac
|
修改格式
|
2019-08-02 18:09:25 +08:00 |
|
ival
|
ad6e98da39
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-02 18:05:17 +08:00 |
|
ival
|
77db948f68
|
修改皮肤配置
|
2019-08-02 18:05:08 +08:00 |
|
fan
|
9c51e10ec1
|
调整：皮肤调整
|
2019-08-02 17:57:14 +08:00 |
|
fan
|
e385704360
|
调整：代码修改
|
2019-08-02 17:41:12 +08:00 |
|