zyy
|
6c617d3e4a
|
desc: 修改获取商品字段
|
2019-08-30 19:19:48 +08:00 |
|
zyy
|
d8dc80a001
|
desc: 修改权限字段显示
|
2019-08-30 19:14:10 +08:00 |
|
zyy
|
37a76de058
|
Merge branch 'test'
|
2019-08-30 19:11:02 +08:00 |
|
zyy
|
abd338fefc
|
Merge branch 'dev' into test
|
2019-08-30 19:10:34 +08:00 |
|
zyy
|
5d1c9d02bf
|
desc: 修改琏计划
|
2019-08-30 19:10:08 +08:00 |
|
ival
|
1f82f68cd1
|
Merge remote-tracking branch 'remotes/origin/test'
# Conflicts:
# src/jlmap3d/jl3ddrive/jl3ddrive.js
|
2019-08-30 18:47:51 +08:00 |
|
ival
|
210c460c69
|
Merge branch 'dev' into test
|
2019-08-30 18:23:19 +08:00 |
|
ival
|
55166e7aea
|
修改elementUi切换中英文不成功的问题
|
2019-08-30 18:20:07 +08:00 |
|
joylink_cuiweidong
|
86c014bbc6
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-30 18:00:42 +08:00 |
|
joylink_cuiweidong
|
389b711edc
|
电梯组件代码优化
|
2019-08-30 17:59:38 +08:00 |
|
zyy
|
2c5bb4bea7
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-30 17:58:29 +08:00 |
|
zyy
|
741af50a2a
|
desc: 地图绘制显示车站公里标，
|
2019-08-30 17:58:15 +08:00 |
|
ival
|
ae84e1ba4e
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# src/utils/baseUrl.js
|
2019-08-30 17:53:37 +08:00 |
|
fan
|
bf23362b2b
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-30 17:43:50 +08:00 |
|
fan
|
8fa43ce797
|
ibp盘调整
|
2019-08-30 17:43:17 +08:00 |
|
ival
|
9b9be66ea0
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-30 17:12:52 +08:00 |
|
ival
|
36facbb67d
|
修改重新生成排班计划的页面
|
2019-08-30 17:12:39 +08:00 |
|
zyy
|
abf1afcdf2
|
desc: 修改逻辑顺序
|
2019-08-30 17:09:31 +08:00 |
|
zyy
|
22beeffc53
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/utils/baseUrl.js
# src/views/screenMonitor/list/demonList.vue
|
2019-08-30 17:03:51 +08:00 |
|
zyy
|
0398179e0d
|
desc: 用户权限流程修改，接口对接
|
2019-08-30 17:00:18 +08:00 |
|
ival
|
d3ff24c4f8
|
设置时间组件为可清空组件
|
2019-08-30 16:41:55 +08:00 |
|
ival
|
ff94ade817
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-30 16:35:24 +08:00 |
|
ival
|
1dabf22fd6
|
修改数据显示
|
2019-08-30 16:35:13 +08:00 |
|
fan
|
ed3f31972d
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-30 16:22:21 +08:00 |
|
fan
|
0503afb4c9
|
ibp盘调整
|
2019-08-30 16:22:10 +08:00 |
|
ival
|
5574df0e9d
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-30 15:46:23 +08:00 |
|
ival
|
546957e926
|
增加排版计划处理
|
2019-08-30 15:46:08 +08:00 |
|
fan
|
b2b28f8c9d
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpAlarm.vue
# src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpAppendageBox.vue
# src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpArrow.vue
# src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpButton.vue
# src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpElevator.vue
# src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpKey.vue
# src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpLamp.vue
# src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpLine.vue
# src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpRotatingButton.vue
# src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpText.vue
# src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpTipBox.vue
|
2019-08-30 15:06:08 +08:00 |
|
fan
|
755754ebd3
|
ibp调整
|
2019-08-30 15:01:37 +08:00 |
|
joylink_cuiweidong
|
dec0da6c1a
|
电话端子添加到页面中
|
2019-08-30 14:15:10 +08:00 |
|
joylink_cuiweidong
|
9cea1f91a9
|
ibp盘右侧样式调整
|
2019-08-30 13:32:56 +08:00 |
|
joylink_cuiweidong
|
911d269562
|
钥匙层级调整
|
2019-08-30 11:21:34 +08:00 |
|
joylink_cuiweidong
|
e865e6de3b
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/ibp/shape/alarm.js
|
2019-08-30 10:59:14 +08:00 |
|
joylink_cuiweidong
|
64c939c8be
|
钥匙组件添加到页面
|
2019-08-30 10:55:34 +08:00 |
|
fan
|
f1a762556c
|
关闭ibp入口
|
2019-08-30 10:36:03 +08:00 |
|
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 |
|
ival
|
eb5f71febd
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# src/jlmap3d/jl3ddrive/jl3ddrive.js
# src/utils/baseUrl.js
# static/model/suidao/suidao.FBX
|
2019-08-30 09:23:40 +08:00 |
|
ival
|
3da74652c5
|
增加派班计划
|
2019-08-30 09:00:36 +08:00 |
|
joylink_cuiweidong
|
c9937ffc48
|
电梯组件添加到页面中
|
2019-08-29 18:45:20 +08:00 |
|
sunzhenyu
|
64b3d18ab4
|
Merge branch 'test'
|
2019-08-29 17:17:49 +08:00 |
|
sunzhenyu
|
e80e3eb224
|
mergemaster
|
2019-08-29 17:17:10 +08:00 |
|
sunzhenyu
|
d7efef41e4
|
pull
|
2019-08-29 17:16:33 +08:00 |
|
sunzhenyu
|
6c325be953
|
修改模型地址
|
2019-08-29 17:15:13 +08:00 |
|
ival
|
fd03ed6d59
|
修改每日运行图查询接口
|
2019-08-29 14:48:26 +08:00 |
|
ival
|
dce9903175
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-29 13:52:48 +08:00 |
|
ival
|
1616639f6f
|
修改运行图接口
|
2019-08-29 13:52:34 +08:00 |
|
joylink_cuiweidong
|
225747ac57
|
电梯组件调整
|
2019-08-29 13:25:02 +08:00 |
|