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 |
|
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 |
|
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
|
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 |
|
JiangQiming
|
819fa1cae5
|
fix: 解决编辑回显数据错误问题
|
2023-02-22 20:02:56 +08:00 |
|
easy
|
618c46d7b6
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-22 20:02:18 +08:00 |
|
easy
|
db7f20e19b
|
update: api配置
|
2023-02-22 20:01:31 +08:00 |
|
JiangQiming
|
c73c43e288
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-22 19:40:07 +08:00 |
|
JiangQiming
|
310cf92c57
|
update: 通知模板未选配置不查收信部门和收信人
|
2023-02-22 19:38:58 +08:00 |
|
jackhoo_98
|
67a2a42ae2
|
fix: 修复Icon组件iconKeys值问题
|
2023-02-22 19:36:53 +08:00 |
|
jackhoo_98
|
de0159ab2e
|
fix: 合并冲突
|
2023-02-22 19:21:47 +08:00 |
|
jackhoo_98
|
906bc836ca
|
feat: 远程升级 列表/新增/编辑
|
2023-02-22 19:14:15 +08:00 |
|
100011797
|
474bc29aab
|
feat: 设备详情modbus和opcua
|
2023-02-22 18:09:48 +08:00 |
|
JiangQiming
|
ea98e6c788
|
update: 类型改变清空字段
|
2023-02-22 17:55:08 +08:00 |
|
JiangQiming
|
5cd3065b39
|
update: 新增默认值
|
2023-02-22 17:29:12 +08:00 |
|
JiangQiming
|
dccebe617e
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-22 17:23:31 +08:00 |
|
JiangQiming
|
611fa0ea18
|
update: 类型改变重置字段
|
2023-02-22 17:22:42 +08:00 |
|
xieyonghong
|
737a06e988
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-02-22 17:01:45 +08:00 |
|
xieyonghong
|
b9d91170a8
|
update: 优化查询组件重置功能
|
2023-02-22 17:01:04 +08:00 |
|
JiangQiming
|
50af3f1ad8
|
update: 路由跳转改为menuStory方式
|
2023-02-22 16:50:45 +08:00 |
|
xieyonghong
|
c48ea97962
|
update: 优化查询组件性能问题
|
2023-02-22 16:44:34 +08:00 |
|
JiangQiming
|
9fd6044e56
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-22 16:35:38 +08:00 |
|
JiangQiming
|
5c1506a4c4
|
update: 通知模板优化
|
2023-02-22 16:35:23 +08:00 |
|
xieyonghong
|
754fe63fc1
|
update: 优化北向输出跳转
|
2023-02-22 16:07:24 +08:00 |
|
xieyonghong
|
1460ebcdbb
|
update: 优化菜单路由处理
|
2023-02-22 15:51:13 +08:00 |
|
xieyonghong
|
9d8b31713c
|
update: 重命名Northbound
|
2023-02-22 14:15:00 +08:00 |
|
xieyonghong
|
643067656d
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-02-22 13:38:52 +08:00 |
|
xieyonghong
|
e313b36471
|
update: 优化路由处理
|
2023-02-22 13:36:51 +08:00 |
|
JiangQiming
|
8ac4fc8178
|
update: 通知管理交互优化
|
2023-02-22 11:03:45 +08:00 |
|
JiangQiming
|
9a3a752ac0
|
update: 通知模板详情接口调用逻辑更改
|
2023-02-22 10:30:17 +08:00 |
|
JiangQiming
|
3bb6a8f519
|
fix: 解决表单回显必填验证无法通过的问题
|
2023-02-22 10:20:08 +08:00 |
|
JiangQiming
|
383b4a897e
|
update: 页面新增page-container组件包裹
|
2023-02-22 09:50:54 +08:00 |
|
xieyonghong
|
58bbb1ac36
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# yarn.lock
|
2023-02-22 09:11:05 +08:00 |
|
xieyonghong
|
1851833bc4
|
update: 优化动态路由
|
2023-02-22 09:08:20 +08:00 |
|
JiangQiming
|
ba17669e95
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-21 20:06:29 +08:00 |
|
JiangQiming
|
7a220d2c1e
|
fix: 通知管理优化
|
2023-02-21 20:06:13 +08:00 |
|
easy
|
a9bb84ed6e
|
update: api配置
|
2023-02-21 19:53:03 +08:00 |
|
xieyonghong
|
4599a01de7
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-02-21 19:46:38 +08:00 |
|
xieyonghong
|
80b7436717
|
update: 优化打包
|
2023-02-21 19:44:43 +08:00 |
|
easy
|
58e9a993a3
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-21 16:57:00 +08:00 |
|
easy
|
f5e7ce0015
|
update: api配置
|
2023-02-21 16:56:42 +08:00 |
|
leiqiaochu
|
ee89ea27b0
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-21 16:46:11 +08:00 |
|
leiqiaochu
|
e2eabb7bcb
|
fix: 初始化页面
|
2023-02-21 16:45:36 +08:00 |
|
jackhoo_98
|
c0367ebebd
|
Merge branch 'dev' into dev-hub
|
2023-02-21 16:39:36 +08:00 |
|
jackhoo_98
|
235b620c9e
|
feat: 网络组件详情 新增/编辑功能
|
2023-02-21 16:38:18 +08:00 |
|
easy
|
6dffff43dd
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-21 13:41:19 +08:00 |
|
easy
|
cdb964e932
|
update: 暂存
|
2023-02-21 13:39:43 +08:00 |
|
jackhoo_98
|
9fee5864c5
|
Merge branch 'dev' into dev-hub
|
2023-02-21 09:38:32 +08:00 |
|
jackhoo_98
|
5f56b3d4db
|
feat: 网络组件详情 表单部分交互
|
2023-02-21 09:37:48 +08:00 |
|
100011797
|
97e40c509a
|
fix: 合并冲突
|
2023-02-20 20:05:20 +08:00 |
|
100011797
|
909abdbc2a
|
feat: websocket
|
2023-02-20 20:03:45 +08:00 |
|
easy
|
e5e096b0d0
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-20 19:58:57 +08:00 |
|
easy
|
58e5eec93b
|
update: 数据源管理-管理模块
|
2023-02-20 19:58:37 +08:00 |
|
JiangQiming
|
d3bdbe8909
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-20 16:54:44 +08:00 |
|
JiangQiming
|
b82c2ecda7
|
update: 代码编辑器格式化
|
2023-02-20 16:54:17 +08:00 |
|
leiqiaochu
|
aab1fc7d45
|
fix: 产品切换物联网卡导出无数据
|
2023-02-20 15:47:25 +08:00 |
|
JiangQiming
|
45e2479831
|
feat: 设备功能-高级模式页面&接口联调
|
2023-02-20 15:38:16 +08:00 |
|
JiangQiming
|
9fb27c6fd7
|
feat: 设备功能-精简模式页面&接口联调
|
2023-02-20 14:54:29 +08:00 |
|
JiangQiming
|
fbd917328c
|
feat: 设备功能
|
2023-02-20 13:52:11 +08:00 |
|
JiangQiming
|
c29f2d0cad
|
feat: 设备详情新增设备功能菜单
|
2023-02-20 11:06:04 +08:00 |
|
JiangQiming
|
ca66f58bdd
|
fix: 解决通知管理表格卡片超出边界的问题
|
2023-02-20 10:41:20 +08:00 |
|
JiangQiming
|
0148179444
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-20 10:35:31 +08:00 |
|
JiangQiming
|
94254b6235
|
fix: 删除无用代码
|
2023-02-20 10:35:18 +08:00 |