Commit Graph

404 Commits

Author SHA1 Message Date
jackhoo_98 a98f02d881 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-01-18 10:21:04 +08:00
jackhoo_98 6e34f8c018 feat: 设备接入网关 通道类设备接入 modbus、opcua 2023-01-18 10:20:43 +08:00
easy b13bdb30bb Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-01-17 18:17:40 +08:00
easy 9ae2c6981a update: 角色管理 2023-01-17 18:17:21 +08:00
100011797 c2d571802e fix: merge 2023-01-17 18:05:27 +08:00
100011797 5e5087602c feat: 设备管理批量操作 2023-01-17 18:04:42 +08:00
jackhoo_98 693da4ec6d Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-01-17 18:03:36 +08:00
jackhoo_98 599a0378a1 feat: 设备接入网关 视频类设备接入 固定地址/GB28181 2023-01-17 18:03:01 +08:00
xieyonghong bf28ffca3d Merge remote-tracking branch 'origin/dev' into dev 2023-01-17 17:47:17 +08:00
xieyonghong ca4984e5b2 update: 完善Search组件 2023-01-17 17:46:56 +08:00
JiangQiming f59567b1ed fix: valueitem组件附件上传地址改为公共地址 2023-01-17 17:45:02 +08:00
JiangQiming e8d0eab231 feat: 配置新增附件上传组件 2023-01-17 17:43:07 +08:00
JiangQiming 063602078a Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-01-17 15:52:49 +08:00
JiangQiming 83a18d21c0 fix: 配置详情表单 2023-01-17 15:52:34 +08:00
xieyonghong 1013b6663b Merge remote-tracking branch 'origin/dev' into dev 2023-01-17 14:48:17 +08:00
xieyonghong d1b28b2333 update: 添加Search特殊处理like的值 2023-01-17 14:46:38 +08:00
100011797 5779115050 feat: FILE_UPLOAD 2023-01-17 14:32:47 +08:00
xieyonghong 69142425df feat: 添加Search使用文档 2023-01-17 14:08:05 +08:00
xieyonghong c9d40164ab Merge remote-tracking branch 'origin/dev' into dev 2023-01-17 13:34:39 +08:00
JiangQiming a05f3b8f56 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-01-17 11:47:59 +08:00
JiangQiming 5d5bdb4f52 fix: 解决表单字段验证始终不通过问题 2023-01-17 11:47:46 +08:00
xieyonghong 6934a59e56 Merge remote-tracking branch 'origin/dev' into dev 2023-01-17 11:44:41 +08:00
xieyonghong f3120719c5 update: 优化Search组件查询以及重置 2023-01-17 11:41:58 +08:00
easy 890d2b091b Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-01-17 11:39:10 +08:00
easy 66e88145c7 feat: 角色管理 2023-01-17 11:38:16 +08:00
100011797 eb7eaef064 fix: 刷新表格 2023-01-17 11:34:38 +08:00
jackhoo_98 9e3857302b Merge branch 'dev-hub' into dev 2023-01-16 18:24:30 +08:00
jackhoo_98 4281bd2a15 fix: 设备接入网关 GB/T 28181第一步基本表单样式 2023-01-16 18:23:56 +08:00
easy bc9fa060f5 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-01-16 18:15:24 +08:00
easy e36529d7bd update: 系统管理-基础配置 2023-01-16 18:14:45 +08:00
JiangQiming be826f4d1c Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-01-16 18:01:00 +08:00
JiangQiming cd146583a1 feat: 通知模板页面 2023-01-16 18:00:45 +08:00
100011797 c583a61732 fix: merge 2023-01-16 15:25:34 +08:00
100011797 e3ddbbd3c4 fix: 更新AIcon 2023-01-16 15:19:41 +08:00
xieyonghong b54d1082ca feat: 添加filterTreeSelectNode、filterSelectNode函数 2023-01-16 15:13:43 +08:00
JiangQiming ad54e34a93 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-01-16 15:10:10 +08:00
JiangQiming 7b7ced3534 feat: 通知配置新增说明文档 2023-01-16 15:09:55 +08:00
xieyonghong 7c349ee6a8 Merge remote-tracking branch 'origin/dev' into dev 2023-01-16 11:06:07 +08:00
xieyonghong 1e39595360 update: 优化Search组件options处理 2023-01-16 11:05:17 +08:00
jackhoo_98 79524793af Merge branch 'dev-hub' into dev 2023-01-16 09:55:36 +08:00
jackhoo_98 295a283856 fix: 设备接入网关 视频设备表单 2023-01-16 09:53:54 +08:00
easy 6d01346d51 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-01-13 14:35:57 +08:00
easy 8dd5f2f22a update: 首页 2023-01-13 14:35:34 +08:00
xieyonghong 9332e59f51 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	yarn.lock
2023-01-13 14:30:14 +08:00
xieyonghong 2a2a8121c3 update: 优化Search组件 2023-01-13 14:29:16 +08:00
JiangQiming 30c1a1813d Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-01-13 14:28:25 +08:00
JiangQiming 466dbae465 feat: 新增通知配置钉钉文档 2023-01-13 14:28:12 +08:00
100011797 a44b57232f fix: 修改tree 2023-01-13 14:24:52 +08:00
blp 6d18f10d2a Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-01-13 14:02:54 +08:00
blp 2e26ee726d fix: 修改登录页 2023-01-13 14:02:23 +08:00