wangshuaiswim
|
46264b3696
|
fix: 物模型功能开发
|
2023-02-28 10:26:59 +08:00 |
|
wangshuaiswim
|
231950bdea
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-28 10:26:30 +08:00 |
xieyonghong
|
940bbfc11f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-02-28 08:49:03 +08:00 |
|
xieyonghong
|
a0f9d8d44c
|
feat: 新增场景联动-触发规则-功能
|
2023-02-28 08:47:53 +08:00 |
jackhoo_98
|
568afdb69e
|
fix: 运维管理 仪表盘代码优化
|
2023-02-27 19:59:30 +08:00 |
|
wangshuaiswim
|
02153a63da
|
fix: 物模型属性开发
|
2023-02-27 19:35:05 +08:00 |
|
wangshuaiswim
|
76dfb3a797
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-27 19:24:43 +08:00 |
|
wangshuaiswim
|
9189d8a212
|
fix: 物模型开发
|
2023-02-27 19:24:22 +08:00 |
JiangQiming
|
84278cd232
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-27 18:13:20 +08:00 |
|
JiangQiming
|
5c9ad767ad
|
feat: 通道管理
|
2023-02-27 18:13:06 +08:00 |
|
jackhoo_98
|
401634be3e
|
feat: 运维管理 仪表盘
|
2023-02-27 18:10:06 +08:00 |
easy
|
1330d3401c
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-27 17:50:15 +08:00 |
|
easy
|
72c72888df
|
update: 应用管理添加集成菜单弹窗、cardbox组件添加遮罩层
|
2023-02-27 17:49:40 +08:00 |
|
xieyonghong
|
ebacfa71da
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-02-27 16:47:09 +08:00 |
|
xieyonghong
|
e4a124a433
|
feat: 新增场景联动-触发规则-属性修改
|
2023-02-27 16:40:53 +08:00 |
|
JiangQiming
|
89e1271206
|
fix: bug#10229
|
2023-02-27 16:13:49 +08:00 |
|
JiangQiming
|
980dd7af3a
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-27 14:42:27 +08:00 |
|
JiangQiming
|
c60410c1d4
|
feat: 通道列表
|
2023-02-27 14:40:49 +08:00 |
|
jackhoo_98
|
fd0c3f2eb8
|
fix: 远程升级新增 修复版本号重复校验
|
2023-02-27 11:45:41 +08:00 |
胡彪
|
79ac088b79
|
Merge pull request #53 from jetlinks/dev-hub
feat: 远程升级 升级任务详情
|
2023-02-27 10:54:43 +08:00 |
|
jackhoo_98
|
a77997d87f
|
Merge branch 'dev' into dev-hub
|
2023-02-27 10:53:07 +08:00 |
|
easy
|
c24be85601
|
update: 应用管理
|
2023-02-26 18:03:51 +08:00 |
|
jackhoo_98
|
c3b8d46e7c
|
feat: 远程升级 升级任务详情
|
2023-02-25 21:44:23 +08:00 |
|
jackhoo_98
|
d226d8758f
|
feat: 远程升级 升级任务详情 基本样式
|
2023-02-24 18:24:15 +08:00 |
|
xieyonghong
|
bba6ef3c30
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-02-24 18:22:56 +08:00 |
|
xieyonghong
|
be501e77fe
|
feat: 新增场景联动-触发规则
|
2023-02-24 18:21:44 +08:00 |
100011797
|
25ee85681c
|
fix: 运行状态详情查看
|
2023-02-24 18:07:41 +08:00 |
|
JiangQiming
|
15be308dc8
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-24 18:01:08 +08:00 |
|
JiangQiming
|
55a0a2adb5
|
feat: 视频设备通道
|
2023-02-24 18:00:53 +08:00 |
|
easy
|
d97018475c
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-24 17:59:11 +08:00 |
|
easy
|
86ee86d119
|
update: 应用管理
|
2023-02-24 17:58:44 +08:00 |
|
JiangQiming
|
446f4b17d5
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-24 17:46:28 +08:00 |
|
JiangQiming
|
8b842883ec
|
feat: 视频编辑优化
|
2023-02-24 17:46:14 +08:00 |
leiqiaochu
|
6a275ee983
|
feat: 告警中心告警配置40%
|
2023-02-24 17:23:36 +08:00 |
|
JiangQiming
|
1003130a4c
|
fix: bug#10174
|
2023-02-24 17:19:00 +08:00 |
|
JiangQiming
|
164cec5aa5
|
fix: bug#10191
|
2023-02-24 17:06:13 +08:00 |
|
JiangQiming
|
0dcdac0ee6
|
fix: bug#10196
|
2023-02-24 16:50:45 +08:00 |
|
JiangQiming
|
f3620e5e07
|
fix: bug#10198
|
2023-02-24 14:55:30 +08:00 |
|
jackhoo_98
|
15ff1c7759
|
feat: 远程升级 升级任务
|
2023-02-24 14:18:06 +08:00 |
|
JiangQiming
|
15c31a449b
|
fix: bug#10199 #10201
|
2023-02-24 14:07:45 +08:00 |
|
JiangQiming
|
6af3a1a998
|
fix: 解决字段内容提取变量重复的bug
|
2023-02-24 11:51:45 +08:00 |
|
JiangQiming
|
ad2bc40614
|
fix: bug#10163
|
2023-02-24 11:15:27 +08:00 |
|
JiangQiming
|
b874687bfe
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-24 10:19:59 +08:00 |
|
JiangQiming
|
b5e547831d
|
fix: bug#10181
|
2023-02-24 10:19:47 +08:00 |
|
leiqiaochu
|
bf8b593573
|
fix: 规则编排样式
|
2023-02-24 09:53:52 +08:00 |
|
leiqiaochu
|
442ca04cf8
|
fix: 惨平页面
|
2023-02-24 09:50:23 +08:00 |
|
胡彪
|
564dbc1bfc
|
Merge pull request #52 from jetlinks/dev-hub
feat: 远程升级 升级任务列表/选择设备组件
|
2023-02-24 09:38:51 +08:00 |
|
jackhoo_98
|
6ee95decd0
|
fix: 合并冲突
|
2023-02-24 09:37:33 +08:00 |
|
jackhoo_98
|
13cba5d457
|
feat: 远程升级 升级任务列表/选择设备组件
|
2023-02-24 09:34:07 +08:00 |
|
100011797
|
0e3c28e64d
|
fix: merge
|
2023-02-24 09:27:53 +08:00 |