100011797
|
ca7d9cba0a
|
fix: 场景联动-执行动作
|
2023-03-04 16:37:26 +08:00 |
leiqiaochu
|
db0d033588
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-04 16:03:49 +08:00 |
|
leiqiaochu
|
ad2cf137f5
|
fix: 组件替换
|
2023-03-04 16:03:30 +08:00 |
xieyonghong
|
67518f28b3
|
update: merge
|
2023-03-04 15:11:58 +08:00 |
|
xieyonghong
|
b015dd4f01
|
update: 更新组件库
|
2023-03-04 15:11:58 +08:00 |
|
leiqiaochu
|
14d2a782ce
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-04 13:46:50 +08:00 |
|
leiqiaochu
|
43cb12bb2b
|
fix: 设备接入表格样式接入
|
2023-03-04 13:46:11 +08:00 |
wzyyy
|
787df89acd
|
fix: merge
|
2023-03-04 11:52:35 +08:00 |
|
wzyyy
|
7e053e0d00
|
fix: 物联卡组件替换及部分场景联动
|
2023-03-04 11:51:42 +08:00 |
|
xieyonghong
|
b48b1348ba
|
update: 更新路由菜单
|
2023-03-04 11:07:37 +08:00 |
|
xieyonghong
|
e00e659e41
|
update: 更新路由菜单
|
2023-03-04 11:07:36 +08:00 |
JiangQiming
|
d8ceb8e8e8
|
update: 添加注释
|
2023-03-04 11:01:22 +08:00 |
|
JiangQiming
|
94bef052bc
|
update: 分屏展示优化
|
2023-03-04 10:49:33 +08:00 |
|
JiangQiming
|
5790ea6064
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-04 10:25:35 +08:00 |
|
JiangQiming
|
52d521cd51
|
fix: 分屏数量切换
|
2023-03-04 10:25:19 +08:00 |
胡彪
|
9b8ce9e586
|
Merge pull request #56 from jetlinks/dev-hub
feat: 通道管理 卡片列表、新增编辑等功能
|
2023-03-04 10:13:25 +08:00 |
jackhoo_98
|
9212cd6a7f
|
Merge branch 'dev' into dev-hub
|
2023-03-04 10:10:16 +08:00 |
|
jackhoo_98
|
349f066870
|
feat: 通道管理 卡片列表、新增编辑等功能
|
2023-03-04 10:07:51 +08:00 |
|
JiangQiming
|
bfb1cb5403
|
update: 分屏展示优化
|
2023-03-03 18:41:04 +08:00 |
|
JiangQiming
|
eb2430fb8d
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-03 18:29:35 +08:00 |
|
JiangQiming
|
19a0d366f0
|
update: 分屏展示图标
|
2023-03-03 18:29:19 +08:00 |
easy
|
90359de6b5
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-03 18:20:34 +08:00 |
|
easy
|
fab790bbe6
|
update: 右上角
|
2023-03-03 18:17:06 +08:00 |
|
JiangQiming
|
9649dd9cbd
|
update: 分屏展示
|
2023-03-03 18:11:53 +08:00 |
|
xieyonghong
|
70eafa2f5a
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-03-03 15:47:57 +08:00 |
|
xieyonghong
|
37a4845f8b
|
update: 更新jetlinks-ui-components版本
|
2023-03-03 15:47:32 +08:00 |
|
JiangQiming
|
27a2fc7fb9
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-03 15:36:57 +08:00 |
|
JiangQiming
|
5b6e0611c4
|
feat: 分屏展示
|
2023-03-03 15:36:39 +08:00 |
|
easy
|
9e84a7bb8c
|
update: 又上角铃铛
|
2023-03-03 14:47:10 +08:00 |
|
jackhoo_98
|
dd1c05e0b8
|
feat: post方法新增扩展参数
|
2023-03-03 11:35:22 +08:00 |
|
xieyonghong
|
c055250aec
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-03-02 21:54:50 +08:00 |
|
xieyonghong
|
b3acf4f6df
|
update: yarn lock
|
2023-03-02 21:51:44 +08:00 |
|
easy
|
0c435bffbd
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-02 21:50:30 +08:00 |
|
easy
|
9cb75775f1
|
update: JTable更改为j-pro-table
|
2023-03-02 21:49:43 +08:00 |
|
xieyonghong
|
376cfe4d3d
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/views/rule-engine/Scene/Save/Device/index.vue
# yarn.lock
|
2023-03-02 21:48:50 +08:00 |
|
xieyonghong
|
db82ec462a
|
update: 优化场景联动-触发规则回显
|
2023-03-02 21:40:45 +08:00 |
|
easy
|
68a52db344
|
feat: 右上角部分
|
2023-03-02 21:40:21 +08:00 |
|
wzyyy
|
6467b4ef4f
|
fix: 物联卡管理组件替换
|
2023-03-02 20:58:56 +08:00 |
|
wzyyy
|
36b673157a
|
fix: merge
|
2023-03-02 20:46:32 +08:00 |
|
wzyyy
|
376d54fdb4
|
fix: a-rang-picker
|
2023-03-02 20:45:37 +08:00 |
|
leiqiaochu
|
94cbb42173
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-02 20:44:11 +08:00 |
|
leiqiaochu
|
6ba0f0cbb6
|
feat: 告警配置
|
2023-03-02 20:43:37 +08:00 |
|
wzyyy
|
4d8f68dabb
|
fix: 物联卡及数据解析替换
|
2023-03-02 20:43:33 +08:00 |
|
JiangQiming
|
66c451122b
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-02 20:23:37 +08:00 |
|
JiangQiming
|
8a3acd57ee
|
feat: 视频播放组件封装
|
2023-03-02 20:23:21 +08:00 |
wangshuaiswim
|
c401da070b
|
fix: 修改替换组件
|
2023-03-02 19:12:20 +08:00 |
|
JiangQiming
|
86ff238df7
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-02 18:11:11 +08:00 |
|
JiangQiming
|
32c200e08c
|
feat: 视频播放组件
|
2023-03-02 18:10:53 +08:00 |
|
100011797
|
f7fac41743
|
fix: 修改设备列表为protable
|
2023-03-02 17:55:28 +08:00 |
|
JiangQiming
|
dcf0b05bc7
|
update: 表格更换为JProTable
|
2023-03-02 17:52:12 +08:00 |