Commit Graph

374 Commits

Author SHA1 Message Date
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
zyy
d819a27f94 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-05 17:29:33 +08:00
zyy
b0a7294f5b 删除输入 2019-08-05 17:29:25 +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