Commit Graph

27 Commits

Author SHA1 Message Date
ival
44481b2cbb 修改代码bug 2019-08-05 17:36:16 +08:00
ival
fb33bde94c 设置状态时,无需关注model变化,render时,model已经引用到view上 2019-08-05 17:24:20 +08:00
ival
5e8f1899ff 修改代码 2019-08-05 09:59:08 +08:00
fan
ee16c35aaa 调整:standControl调整 2019-08-05 08:42:45 +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
e385704360 调整:代码修改 2019-08-02 17:41:12 +08:00
fan
ce5600c173 调整:代码修改 2019-08-02 17:22:23 +08:00
fan
af0fd392d1 Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient
# Conflicts:
#	src/jmap/config/skinStyle/chengdu_03.js
2019-08-02 17:14:02 +08:00
fan
44a1d197cb 调整:代码调整 2019-08-02 17:06:37 +08:00
ival
803dd3f823 修改皮肤配置 2019-08-02 17:02:43 +08:00
ival
543b05f848 修改配置 2019-08-02 14:23:37 +08:00
ival
dd5218dae5 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
#	src/views/jlmap/index.vue
#	src/views/map/runplan/manage/operateMenu.vue
2019-08-02 14:19:06 +08:00
ival
60aa181598 修改皮肤配置 2019-08-02 14:17:43 +08:00
fan
7162f5ce42 调整:stationControl调整 2019-08-02 10:39:59 +08:00
fan
0d379faf11 Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient
# Conflicts:
#	src/jmap/shape/LcControl/index.js
#	src/jmap/shape/LimitControl/index.js
#	src/jmap/shape/StationControl/index.js
#	src/jmap/shape/ZcControl/index.js
2019-07-31 18:39:08 +08:00
fan
a03798a748 Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient
# Conflicts:
#	src/jmap/shape/LcControl/index.js
#	src/jmap/shape/LimitControl/index.js
#	src/jmap/shape/StationControl/index.js
#	src/jmap/shape/ZcControl/index.js
2019-07-31 18:38:29 +08:00
fan
0fc306714b 调整:control增加悬浮移出事件 2019-07-31 18:24:28 +08:00
ival
3042cf229d 修改代码 2019-07-31 14:59:38 +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
f28f5fc1cd 修改代码 2019-07-25 15:44:23 +08:00
zyy
75e3162d68 修改代码 2019-07-25 10:30:30 +08:00
ival
dfd337e93f 修改字体设置 2019-07-24 13:50:37 +08:00
ival
1bab212c05 修改代码 2019-07-23 18:21:49 +08:00
zyy
d99d1b9ecc 修改代码 2019-07-19 14:30:26 +08:00
ival
47171b872e 修改代码 2019-07-18 10:05:16 +08:00