Commit Graph

61 Commits

Author SHA1 Message Date
ival
00f0fd84a3 修改车站公里表隐藏的问题 2019-08-19 09:38:11 +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
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
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
f85139b4ae 修改鼠标关联操作 2019-08-06 17:00:24 +08:00
ival
7573e30a31 修改皮肤配置 2019-08-06 13:09:11 +08:00
ival
d4b995675d 提出字体粗细配置 2019-08-06 13:02:55 +08:00
ival
530a1c473e 修改 代码接口名称 2019-08-05 17:46:41 +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
1e5ad7e522 修改bug 2019-08-05 16:17:46 +08:00
ival
7c526a94c6 修改代码 2019-08-05 16:14:40 +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
zyy
6b5c1790c6 修改代码 2019-08-05 10:36:41 +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
77db948f68 修改皮肤配置 2019-08-02 18:05:08 +08:00
ival
803dd3f823 修改皮肤配置 2019-08-02 17:02:43 +08:00
zyy
0b93d7ef16 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
#	src/jmap/config/deviceStyle.js
#	src/utils/baseUrl.js
#	src/views/map/runplan/manage/operateMenu.vue
2019-08-02 14:32:42 +08:00
zyy
4cf032df11 desc: 增加区段折返箭头代码 2019-08-02 14:31:29 +08:00
ival
60aa181598 修改皮肤配置 2019-08-02 14:17:43 +08:00
zyy
7bba3d49d6 desc: 修改代码 2019-07-31 19:09:45 +08:00
zyy
99bcfa56ac 修改代码 2019-07-31 18:46:37 +08:00
zyy
cfbb21b9bb Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
#	src/jmap/shape/Section/index.js
#	src/jmap/shape/Switch/index.js
2019-07-31 18:20:39 +08:00
zyy
1a44bfb002 修改代码 2019-07-31 18:19:15 +08:00
ival
871a9fbbe2 修改代码 2019-07-31 15:54:20 +08:00
ival
3042cf229d 修改代码 2019-07-31 14:59:38 +08:00
zyy
82c49c97e2 调整代码 2019-07-30 15:52:30 +08:00
ival
9152b6a55e 增加 Line 和 Text 设备移植,以及调试代码 2019-07-30 12:37:31 +08:00
ival
ca433c2eb6 修改设备结构 2019-07-30 09:18:24 +08:00
ival
33442905be 修改道岔状态变化 2019-07-29 11:18:50 +08:00
ival
21fd4ec516 修改区段状态变化 2019-07-29 09:27:33 +08:00
ival
f28f5fc1cd 修改代码 2019-07-25 15:44:23 +08:00
zyy
42ae0b4a0d Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-07-24 14:33:56 +08:00
zyy
59933cf4b9 修改代码 2019-07-24 14:33:50 +08:00
ival
2d43350ff6 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-07-24 11:24:30 +08:00
ival
e8dad49c5f 修改代码 2019-07-24 11:24:13 +08:00
zyy
886c51259d Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-07-24 11:12:21 +08:00
zyy
e06411df1c desc: 修改section代码 2019-07-24 11:12:15 +08:00