ival
|
33c4a3afc2
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-04 19:00:38 +08:00 |
|
ival
|
02fc21e544
|
增加仿真的大屏角色以及IBP角色
|
2019-09-04 19:00:22 +08:00 |
|
joylink_cuiweidong
|
e537726127
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-04 18:49:29 +08:00 |
|
fan
|
fefe8bd104
|
ibp盘数据调整
|
2019-09-04 18:49:09 +08:00 |
|
joylink_cuiweidong
|
19870bb7c4
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-04 18:49:04 +08:00 |
|
joylink_cuiweidong
|
38f7b1a6e2
|
修复 时间组件拖拽 位置数据不更新的问题
|
2019-09-04 18:48:53 +08:00 |
|
fan
|
e24a0e1b4d
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-04 18:48:10 +08:00 |
|
fan
|
8df4cfd6e1
|
ibp代码调整
|
2019-09-04 18:47:49 +08:00 |
|
zyy
|
0f9b0f84a5
|
desc: 删除多余打印
|
2019-09-04 18:29:47 +08:00 |
|
zyy
|
1d7809bc33
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-04 17:58:56 +08:00 |
|
zyy
|
509e5218a7
|
desc: 调整引用问题
|
2019-09-04 17:58:22 +08:00 |
|
sunzhenyu
|
ebd1b211d1
|
Merge branch 'dev' of git.cloud.tencent.com:joylink/jl-nclient into dev
|
2019-09-04 17:36:15 +08:00 |
|
joylink_cuiweidong
|
24fae2c33c
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-04 17:26:34 +08:00 |
|
joylink_cuiweidong
|
53e3bf3899
|
解决 拖拽电梯 位置数据不更新的问题
|
2019-09-04 17:26:20 +08:00 |
|
ival
|
ba5de09724
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-09-04 17:20:18 +08:00 |
|
ival
|
8b56d035eb
|
修改按钮顺序
|
2019-09-04 17:19:26 +08:00 |
|
ival
|
4e7db47748
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# src/utils/baseUrl.js
|
2019-09-04 17:16:00 +08:00 |
|
ival
|
92531836fe
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-04 16:58:25 +08:00 |
|
ival
|
f925043e41
|
增加大屏角色
|
2019-09-04 16:58:13 +08:00 |
|
zyy
|
118ed1296c
|
desc: 增加琏计划运行图修改
|
2019-09-04 16:32:41 +08:00 |
|
zyy
|
6b9047c919
|
desc: 调整请求位置
|
2019-09-04 15:06:26 +08:00 |
|
zyy
|
949d51923e
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-04 14:47:58 +08:00 |
|
zyy
|
a037937627
|
desc: 调整运行图生成逻辑
|
2019-09-04 14:47:52 +08:00 |
|
fan
|
f065661cd4
|
ibp代码调整
|
2019-09-04 14:42:04 +08:00 |
|
joylink_cuiweidong
|
a169ed0e81
|
ibp电梯拖拽事件调整 touch事件添加
|
2019-09-04 13:18:16 +08:00 |
|
fan
|
2d0c7a547b
|
ibp代码调整
|
2019-09-04 13:14:37 +08:00 |
|
fan
|
4cbdf38845
|
代码调整
|
2019-09-04 13:08:51 +08:00 |
|
fan
|
d303ca087e
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-04 13:07:09 +08:00 |
|
fan
|
8a9092b2b4
|
ibp代码调整
|
2019-09-04 13:06:15 +08:00 |
|
ival
|
ec51f2de2c
|
修改代码
|
2019-09-04 13:04:56 +08:00 |
|
ival
|
eb7dafd1b2
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-04 13:02:43 +08:00 |
|
ival
|
89fc3c0547
|
增加角色分配统计
|
2019-09-04 13:02:28 +08:00 |
|
zyy
|
8e06abcad9
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-04 11:28:36 +08:00 |
|
zyy
|
b96701aceb
|
desc: 调整运行图加载
|
2019-09-04 11:28:24 +08:00 |
|
joylink_cuiweidong
|
67f925ef7f
|
代码调整
|
2019-09-04 11:05:57 +08:00 |
|
joylink_cuiweidong
|
969fe6ac5a
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/ibp/shape/background.js
|
2019-09-04 11:02:02 +08:00 |
|
joylink_cuiweidong
|
3a196ffac4
|
ibp 拖拽事件处理
|
2019-09-04 11:00:01 +08:00 |
|
fan
|
eb26f87560
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-04 10:57:14 +08:00 |
|
fan
|
743fa388c4
|
代码调整
|
2019-09-04 10:56:44 +08:00 |
|
ival
|
d7fb121c2b
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-04 10:13:42 +08:00 |
|
ival
|
df839856d9
|
修改IBP盘角色修改
|
2019-09-04 10:13:26 +08:00 |
|
zyy
|
51274a044b
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-03 18:59:52 +08:00 |
|
zyy
|
abec58b726
|
desc: 修改弹窗点击蒙层不取消
|
2019-09-03 18:59:46 +08:00 |
|
fan
|
cb7d08bc93
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-03 18:45:39 +08:00 |
|
fan
|
ce5d0424d5
|
ibp代码调整
|
2019-09-03 18:45:02 +08:00 |
|
sunzhenyu
|
b7bffeb467
|
Merge branch 'test' of git.cloud.tencent.com:joylink/jl-nclient into test
|
2019-09-03 18:40:37 +08:00 |
|
sunzhenyu
|
58541f0654
|
mmi显示补漏
|
2019-09-03 18:40:24 +08:00 |
|
ival
|
f12b521da4
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-09-03 18:38:15 +08:00 |
|
ival
|
0879aef961
|
增加派班计划loading
|
2019-09-03 18:37:00 +08:00 |
|
ival
|
790ce4551a
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# src/utils/baseUrl.js
|
2019-09-03 17:58:43 +08:00 |
|