Commit Graph

3444 Commits

Author SHA1 Message Date
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
zyy
37c13f6672 调整代码格式,福州线状态处理 2019-08-06 17:02:04 +08:00
ival
167e483b10 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-06 17:00:36 +08:00
ival
f85139b4ae 修改鼠标关联操作 2019-08-06 17:00:24 +08:00
sunzhenyu
c27aed050f 挂载threejs,添加静态文件插件 2019-08-06 14:10:21 +08:00
zyy
e4364c600e Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-06 13:56:48 +08:00
zyy
8fe358896e desc: 修改车次窗菜单BUG 2019-08-06 13:56:42 +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
zyy
71381ff174 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-06 10:11:43 +08:00
zyy
98a0533b20 修改代码格式 2019-08-06 10:11:32 +08:00
ival
ea0a3b9d16 修改默认选中状态,无未选中 2019-08-06 09:32:55 +08:00
ival
2ee8e24897 增加鼠标操作 2019-08-06 09:27:12 +08:00
ival
3ae415d6e9 修改背景线,鼠标特效 2019-08-05 18:42:37 +08:00
ival
530a1c473e 修改 代码接口名称 2019-08-05 17:46:41 +08:00
ival
3c4fc9ef18 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-05 17:36:25 +08:00
ival
44481b2cbb 修改代码bug 2019-08-05 17:36:16 +08:00