胡彪
|
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 |
|
100011797
|
8b66147fa6
|
fix: 北向输出权限按钮
|
2023-02-24 09:26:24 +08:00 |
wangshuaiswim
|
ee37c20d8d
|
fix: 修复代码编辑框回显
|
2023-02-23 20:09:30 +08:00 |
|
wangshuaiswim
|
372cf91fbb
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-23 20:03:51 +08:00 |
|
wangshuaiswim
|
82fccd6be5
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-23 20:02:56 +08:00 |
easy
|
e938c9f198
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-23 20:02:47 +08:00 |
|
wangshuaiswim
|
0b090cf818
|
fix: 物模型属性开发
|
2023-02-23 20:02:33 +08:00 |
|
easy
|
c781537912
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-23 20:02:30 +08:00 |
leiqiaochu
|
1d555a5f19
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-23 20:01:58 +08:00 |
|
leiqiaochu
|
282365fc3d
|
feat: 告警配置
|
2023-02-23 20:00:40 +08:00 |
|
easy
|
1740f85d2d
|
feat: 应用管理
|
2023-02-23 19:59:33 +08:00 |
JiangQiming
|
56de5f93d1
|
fix: bug #10140 #10143 #10144 #10145 #
|
2023-02-23 19:56:03 +08:00 |
|
JiangQiming
|
e0837f2745
|
fix: bug#10161
|
2023-02-23 18:45:13 +08:00 |
|
JiangQiming
|
d2767b0a0a
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-23 17:53:09 +08:00 |
|
JiangQiming
|
9ecd4b6b6b
|
fix: bug#10161
|
2023-02-23 17:52:55 +08:00 |
xieyonghong
|
7d0fbc0e1c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-02-23 17:30:36 +08:00 |
|
xieyonghong
|
f49cffe1d6
|
style: 优化Search简单模式样式
|
2023-02-23 17:29:01 +08:00 |
|
JiangQiming
|
d36d5356bb
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-23 17:00:16 +08:00 |
|
JiangQiming
|
6a66caf3ec
|
fix: bug#10164, #10157
|
2023-02-23 17:00:02 +08:00 |
|
xieyonghong
|
2291f02fcf
|
update: 挪动docker文件位置
|
2023-02-23 16:53:40 +08:00 |
|
xieyonghong
|
4258311ed6
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# vite.config.ts
|
2023-02-23 16:37:51 +08:00 |
|
xieyonghong
|
8ddd2562f1
|
feat: 新增场景联动设备规则新增Modal
|
2023-02-23 16:36:21 +08:00 |
|
JiangQiming
|
9da62e46bf
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-23 16:17:13 +08:00 |
|
JiangQiming
|
5a93ab1dcd
|
fix: #10163
|
2023-02-23 16:16:58 +08:00 |
|
100011797
|
34d870f1ec
|
fix: 修改阿里云新增和卡片
|
2023-02-23 15:47:34 +08:00 |
|
JiangQiming
|
b239bfc8b2
|
update: 设备功能调试, 精简模式新增字段必填验证
|
2023-02-23 14:30:03 +08:00 |
|
JiangQiming
|
7000ccd85b
|
feat: 通知模板调试新增表格字段验证
|
2023-02-23 13:46:46 +08:00 |
|
JiangQiming
|
11e9d6faf9
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-23 11:13:06 +08:00 |
|
JiangQiming
|
18aaedc779
|
feat: 通知配置调试, 新增必填验证
|
2023-02-23 11:12:51 +08:00 |
|
100011797
|
3e82cc7d5e
|
feat: 新增空组件
|
2023-02-23 11:05:48 +08:00 |
|
leiqiaochu
|
8bb756e5e6
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-23 10:59:26 +08:00 |
|
leiqiaochu
|
cd1e08c055
|
fix: 路由跳转方法
|
2023-02-23 10:58:50 +08:00 |
|
xieyonghong
|
dd3013ee04
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-02-23 10:19:51 +08:00 |
|
xieyonghong
|
a805bfe5f7
|
feat: 新增Ellipsis组件
|
2023-02-23 10:18:32 +08:00 |
|
easy
|
063c6bbe8d
|
update: 系统管理模块添加面包屑
|
2023-02-23 10:18:15 +08:00 |
|
JiangQiming
|
4961bb5bb2
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-23 10:07:36 +08:00 |
|
JiangQiming
|
9678a2512a
|
style: 通知管理列表卡片图表宽高统一
|
2023-02-23 10:07:22 +08:00 |
|
xieyonghong
|
f16320a99c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-02-23 09:47:36 +08:00 |
|
JiangQiming
|
afdef48c20
|
update: 通知配置详情数据丢失解决
|
2023-02-23 09:46:30 +08:00 |
|
xieyonghong
|
7d9cd9c5c0
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-02-23 09:45:22 +08:00 |
|
xieyonghong
|
0592de1e81
|
update: 优化vuex中的权限数据
|
2023-02-23 09:42:31 +08:00 |
|
leiqiaochu
|
d526158076
|
fix: 基础配置进入页面
|
2023-02-23 09:10:10 +08:00 |
|
wangshuaiswim
|
c201ebdbf4
|
fix: 物模型属性组件开发
|
2023-02-22 20:48:10 +08:00 |
|
leiqiaochu
|
7bd5c034e5
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-22 20:42:35 +08:00 |
|
leiqiaochu
|
7cef68f828
|
feat: 告警中心告警配置
|
2023-02-22 20:41:54 +08:00 |
|
JiangQiming
|
0ad8294fd0
|
fix: 切换通知方式, 重置部分字段
|
2023-02-22 20:10:20 +08:00 |
|
JiangQiming
|
ec85d0f5df
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-22 20:03:10 +08:00 |