zyy
|
4068555199
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-08 15:57:42 +08:00 |
|
zyy
|
c3f600b015
|
优化代码
|
2019-08-08 15:57:36 +08:00 |
|
joylink_cuiweidong
|
66c0939e6c
|
代码调整
|
2019-08-08 15:48:43 +08:00 |
|
zyy
|
b67a37bc33
|
desc: 修改查询问题
|
2019-08-08 15:27:30 +08:00 |
|
zyy
|
837ba489b6
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-08 14:47:39 +08:00 |
|
zyy
|
2443fd102c
|
desc: 调整站台字段
|
2019-08-08 14:47:34 +08:00 |
|
fan
|
33844220d3
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient
|
2019-08-08 14:37:39 +08:00 |
|
fan
|
289bffb435
|
调整：代码迁移(暂时注释掉位置跳转)
|
2019-08-08 14:36:57 +08:00 |
|
ival
|
842c7f9df2
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-08 14:32:47 +08:00 |
|
ival
|
66c599c0da
|
修改格式问题
|
2019-08-08 14:32:32 +08:00 |
|
sunzhenyu
|
f95b9eb1b7
|
merge
|
2019-08-08 14:20:00 +08:00 |
|
sunzhenyu
|
2aa7bfd759
|
修改js挂载
|
2019-08-08 14:19:03 +08:00 |
|
zyy
|
debecfba5a
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-08 14:08:09 +08:00 |
|
zyy
|
ea67901aa1
|
修改格式
|
2019-08-08 14:08:02 +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
|
dbc3cbf482
|
修改运行图编辑工具报错bug
|
2019-08-08 13:36:53 +08:00 |
|
ival
|
45295404c3
|
1. 修改福州线，取消扣车被禁用的问题
2. 修改i18n的获取当前语言的函数
|
2019-08-08 13:23:54 +08:00 |
|
ival
|
7a41260bae
|
增加国际化配置
|
2019-08-08 11:33:06 +08:00 |
|
ival
|
b15a7feb23
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/main.js
|
2019-08-08 11:31:36 +08:00 |
|
ival
|
c66d72a049
|
增加i18n国际化配置
|
2019-08-08 11:29:03 +08:00 |
|
zyy
|
577aaab9b9
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-08 11:11:38 +08:00 |
|
zyy
|
0a010eca04
|
修改格式
|
2019-08-08 11:11:32 +08:00 |
|
sunzhenyu
|
b326cbf73f
|
push
|
2019-08-08 10:53:19 +08:00 |
|
sunzhenyu
|
6da9552dc7
|
pull
|
2019-08-08 10:52:43 +08:00 |
|
sunzhenyu
|
9f9236361a
|
修改threejs挂载
|
2019-08-08 10:52:06 +08:00 |
|
joylink_cuiweidong
|
b166dbd769
|
剧本 任务录制模块提交
|
2019-08-08 10:31:46 +08:00 |
|
zyy
|
d014007d25
|
desc: 修改仿真系统，教学系统，考试系统默认首页设置
|
2019-08-08 10:16:14 +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 |
|
program-walker
|
db37f69619
|
readme修改
|
2019-08-07 17:07:54 +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
|
0cbe7901c7
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-07 15:32:50 +08:00 |
|
ival
|
7feea79e44
|
成都三号线运行图解析
|
2019-08-07 15:32:35 +08:00 |
|
sunzhenyu
|
e86be938f3
|
Merge branch 'master' of git.cloud.tencent.com:joylink/jl-nclient
|
2019-08-07 11:29:03 +08:00 |
|
sunzhenyu
|
5899fe1347
|
修改界面自适应
|
2019-08-07 11:28:46 +08:00 |
|
zyy
|
83faa429fe
|
修改列车详情显示问题
|
2019-08-07 11:22:33 +08:00 |
|
zyy
|
f492d38c47
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-07 10:24:21 +08:00 |
|
zyy
|
e3a8d5c525
|
desc: 修改代码
|
2019-08-07 10:24:13 +08:00 |
|
ival
|
3751748979
|
修改lz zc 等鼠标事件统一接口处理
|
2019-08-07 09:16:55 +08:00 |
|
ival
|
a02a948f17
|
修改bug
|
2019-08-06 18:42:18 +08:00 |
|
ival
|
165362dfcb
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-06 17:46:55 +08:00 |
|
ival
|
b6baa2e420
|
修改 设置设备名称的设置方法
|
2019-08-06 17:46:41 +08:00 |
|
sunzhenyu
|
7edaf938c7
|
Merge branch 'master' of git.cloud.tencent.com:joylink/jl-nclient
|
2019-08-06 17:28:17 +08:00 |
|
sunzhenyu
|
c6aa275868
|
删除不用依赖
|
2019-08-06 17:28:11 +08:00 |
|
zyy
|
888756dc35
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/shape/Section/EMouse.js
|
2019-08-06 17:02:32 +08:00 |
|