fan
|
240268a65f
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
# src/ibp/shape/button.js
|
2019-08-30 10:34:25 +08:00 |
|
fan
|
5350e6ad39
|
ibp盘提交
|
2019-08-30 10:31:56 +08:00 |
|
joylink_cuiweidong
|
1a479b0ed7
|
电梯组件调整
|
2019-08-30 10:14:49 +08:00 |
|
joylink_cuiweidong
|
45e626d53b
|
钥匙组件添加
|
2019-08-30 09:38:19 +08:00 |
|
joylink_cuiweidong
|
c9937ffc48
|
电梯组件添加到页面中
|
2019-08-29 18:45:20 +08:00 |
|
joylink_cuiweidong
|
225747ac57
|
电梯组件调整
|
2019-08-29 13:25:02 +08:00 |
|
fan
|
094476bdb5
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-29 09:26:27 +08:00 |
|
fan
|
453a909f01
|
ibp盘
|
2019-08-29 09:26:14 +08:00 |
|
fan
|
94f803072f
|
ibp盘提交
|
2019-08-29 09:25:06 +08:00 |
|
joylink_cuiweidong
|
73e9e0985e
|
电梯模块封装
|
2019-08-29 09:02:55 +08:00 |
|
joylink_cuiweidong
|
9de6b0ff12
|
扶梯子模块封装
|
2019-08-28 16:58:53 +08:00 |
|
joylink_cuiweidong
|
0e569358b0
|
电话端子模块提交
|
2019-08-28 13:36:46 +08:00 |
|
joylink_cuiweidong
|
a960fcd1a8
|
允许联动 提示 图片调整
|
2019-08-28 13:27:42 +08:00 |
|
fan
|
3393a65f0d
|
代码调整：ibp盘
|
2019-08-28 13:22:17 +08:00 |
|
joylink_cuiweidong
|
446f8d684a
|
按钮组件调整 图片调整
|
2019-08-28 13:19:45 +08:00 |
|
fan
|
f0f7ac1111
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/ibp/ibpDraft/ibpEdit/ibpOperate/index.vue
# src/views/ibp/ibpDraft/ibpEdit/index.vue
|
2019-08-28 10:02:42 +08:00 |
|
fan
|
6a0d41f09a
|
调整代码： ibp
|
2019-08-28 09:57:32 +08:00 |
|
ival
|
0fa4d4c204
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-28 09:55:55 +08:00 |
|
ival
|
a3b43e1e43
|
限制平局拖动范围
|
2019-08-28 09:55:40 +08:00 |
|
joylink_cuiweidong
|
feac5e0e79
|
联动允许禁止提示 组件
|
2019-08-27 18:35:10 +08:00 |
|
joylink_cuiweidong
|
8997d318f1
|
修改 箭头组件 调整其他组件的拖拽
|
2019-08-27 17:59:03 +08:00 |
|
fan
|
8b67b34df8
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-27 16:37:41 +08:00 |
|
fan
|
044f66d9d9
|
调整代码： ibp盘
|
2019-08-27 16:37:33 +08:00 |
|
joylink_cuiweidong
|
dc80bec6d8
|
报警按钮封装 以及按钮组件代码调整
|
2019-08-27 16:17:55 +08:00 |
|
fan
|
5f5e701074
|
合并代码
|
2019-08-27 15:23:14 +08:00 |
|
fan
|
75a6b2ee58
|
合并
|
2019-08-27 15:22:55 +08:00 |
|
fan
|
68898a3861
|
ibp盘
|
2019-08-27 15:19:50 +08:00 |
|
joylink_cuiweidong
|
95353c7c31
|
ibp 盘 button组件 代码优化
|
2019-08-27 14:56:07 +08:00 |
|
fan
|
7eafd16896
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-27 14:18:22 +08:00 |
|
fan
|
b2eb2076b0
|
ibp
|
2019-08-27 14:17:36 +08:00 |
|
joylink_cuiweidong
|
aeb424514f
|
ibp盘 按钮组件封装调整
|
2019-08-27 13:55:48 +08:00 |
|
joylink_cuiweidong
|
4235afd00f
|
ibp盘按钮组件封装
|
2019-08-26 19:18:03 +08:00 |
|
fan
|
7fd73dbf37
|
ibp盘
|
2019-08-26 11:15:40 +08:00 |
|
fan
|
bc9180d814
|
ibp盘
|
2019-08-26 10:28:28 +08:00 |
|
fan
|
4b7873c2d7
|
ibp盘
|
2019-08-26 10:12:39 +08:00 |
|