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 |
jackhoo_98
|
c3da2ad806
|
Merge branch 'dev' into dev-hub
|
2023-03-02 17:02:16 +08:00 |
|
jackhoo_98
|
21ae942d98
|
feat: 通道管理 todo
|
2023-03-02 17:01:12 +08:00 |
easy
|
8a6e28fccc
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-02 17:00:59 +08:00 |
|
easy
|
83f2793346
|
feat: 通知记录
|
2023-03-02 17:00:10 +08:00 |
|
JiangQiming
|
75e36877a0
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-02 15:59:04 +08:00 |
|
JiangQiming
|
a7a2eb0dbf
|
feat: 视频播放
|
2023-03-02 15:56:08 +08:00 |
|
jackhoo_98
|
2090822bab
|
Merge branch 'dev' into dev-hub
|
2023-03-02 15:49:01 +08:00 |
|
jackhoo_98
|
8bef5114fa
|
feat: 数据采集 仪表盘
|
2023-03-02 15:46:43 +08:00 |
xieyonghong
|
56d81a0bf8
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-03-02 14:33:48 +08:00 |
|
xieyonghong
|
b3ea70db0f
|
feat: 新增encodeParams工具
|
2023-03-02 14:33:28 +08:00 |
|
JiangQiming
|
2607f9aace
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-02 14:05:25 +08:00 |
|
JiangQiming
|
deac9539c1
|
update: 表格组件新增表头插槽
|
2023-03-02 14:05:06 +08:00 |
|
xieyonghong
|
421788b2d6
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-03-02 14:03:21 +08:00 |
|
xieyonghong
|
2781017096
|
update: 添加force命令
|
2023-03-02 14:02:59 +08:00 |
|
leiqiaochu
|
849bfbdaad
|
feat: 告警记录
|
2023-03-02 11:08:07 +08:00 |
|
leiqiaochu
|
569c430ca2
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-02 10:16:04 +08:00 |
|
leiqiaochu
|
a298904a02
|
feat: 告警记录
|
2023-03-02 10:05:11 +08:00 |
|
JiangQiming
|
80e2b02364
|
update: 删除无用代码
|
2023-03-01 21:53:01 +08:00 |
|
JiangQiming
|
dd35a8a14d
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-01 21:51:47 +08:00 |
|
JiangQiming
|
d73f115319
|
update: 推送地址错误更改
|
2023-03-01 21:51:32 +08:00 |
|
wzyyy
|
42ecbbf0ea
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-01 21:35:15 +08:00 |
|
wzyyy
|
f36e4b00ac
|
fix: 物联卡权限及下载模板
|
2023-03-01 21:34:49 +08:00 |
|
JiangQiming
|
eb54d5c001
|
update: 未选择通道禁止批量解绑
|
2023-03-01 21:23:48 +08:00 |
|
JiangQiming
|
08c0b1e9d0
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-01 21:19:43 +08:00 |
|
JiangQiming
|
3707b71c38
|
feat: 国标级联推送
|
2023-03-01 21:19:16 +08:00 |
|
leiqiaochu
|
67bb94ed7c
|
feat: 告警记录
|
2023-03-01 21:01:09 +08:00 |
|
leiqiaochu
|
5c3e344348
|
feat: 告警记录
|
2023-03-01 20:59:58 +08:00 |
|
JiangQiming
|
8d2558b721
|
fix: 修复代码编辑器光标问题
|
2023-03-01 20:31:22 +08:00 |
|
JiangQiming
|
5a2e42ec8f
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-01 20:29:12 +08:00 |
|
JiangQiming
|
2d8c99b28c
|
fix: 修复代码编辑器光标问题
|
2023-03-01 20:28:54 +08:00 |
|
easy
|
e787cc0e86
|
update: 个人中心-基本设置
|
2023-03-01 19:14:48 +08:00 |
|
wangshuaiswim
|
9aeb5faa90
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-01 18:43:21 +08:00 |
|
wangshuaiswim
|
c07199ca2b
|
fix: 解决物模型TODO
|
2023-03-01 18:43:02 +08:00 |
|
JiangQiming
|
4263052d4a
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-01 18:06:56 +08:00 |
|
JiangQiming
|
503f7f8d44
|
feat: 国标ID修改
|
2023-03-01 18:06:40 +08:00 |
胡彪
|
4e0670b362
|
Merge pull request #55 from jetlinks/dev-hub
feat: 运维管理 加入权限
|
2023-03-01 17:34:01 +08:00 |
|
jackhoo_98
|
86c15261e8
|
fix: 合并冲突
|
2023-03-01 17:32:29 +08:00 |
|
xieyonghong
|
2299ae271f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-03-01 17:26:52 +08:00 |