Commit Graph

435 Commits

Author SHA1 Message Date
easy 86c005b67c Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-02-16 16:35:58 +08:00
easy 0929185967 update: 组织管理添加按钮权限 2023-02-16 16:35:39 +08:00
wangshuaiswim 7daa9df6a6 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-02-16 16:23:07 +08:00
wangshuaiswim 24690e1cdb fix: 修改权限按钮重复点击问题 2023-02-16 16:22:47 +08:00
JiangQiming b7b3ecbd1c Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-02-16 16:13:39 +08:00
JiangQiming 693c9d3311 feat: 视频中心-视频设备列表开发 2023-02-16 16:13:23 +08:00
leiqiaochu 293bba37a1 feat: 告警中心仪表盘 2023-02-16 16:07:14 +08:00
leiqiaochu 40a62317d9 feat: 告警中心仪表盘 2023-02-16 16:05:29 +08:00
easy d7754789bf update: 用户管理添加按钮权限 2023-02-16 14:47:40 +08:00
wangshuaiswim bf6c705eda fix: 修复PermissionButton禁用不生效问题 2023-02-16 14:32:21 +08:00
JiangQiming b2653adda5 update: 代码编辑器支持脚本语言输入 2023-02-16 14:03:46 +08:00
JiangQiming b55a7bd490 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-02-16 13:45:52 +08:00
JiangQiming 7308148b69 feat: 视频中心, 仪表盘开发 2023-02-16 13:45:34 +08:00
easy b3459c4f97 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-02-16 11:33:14 +08:00
easy 4c61eaf918 feat: 用户管理 2023-02-16 11:32:52 +08:00
胡彪 9b0cf80578
Merge pull request #46 from jetlinks/dev-hub
feat: 流媒体服务、网络组件列表
2023-02-16 09:05:50 +08:00
jackhoo_98 0138941c57 Merge branch 'dev' into dev-hub 2023-02-16 09:02:16 +08:00
jackhoo_98 6acc522ed5 feat: 网络组件详情 表单共享配置基本样式 2023-02-15 21:01:46 +08:00
100011797 ab45dabd7f feat: 北向输出 2023-02-15 18:56:52 +08:00
leiqiaochu b493288b2e feat: 规则编排 2023-02-15 18:52:47 +08:00
jackhoo_98 91ae45d227 feat: 网络组件 卡片/列表基本功能 2023-02-15 13:34:56 +08:00
easy 4d099365d8 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-02-14 17:53:19 +08:00
easy da5b9bd790 update: 部门管理over 2023-02-14 17:52:59 +08:00
胡彪 648ca2d7ff
Merge pull request #45 from jetlinks/dev-hub
feat: 流媒体服务 卡片列表/新增/编辑等功能
2023-02-14 14:58:46 +08:00
jackhoo_98 97c6d391fb Merge branch 'dev' into dev-hub 2023-02-14 14:56:10 +08:00
jackhoo_98 2555f827ef feat: 流媒体服务 卡片列表/新增/编辑等功能 2023-02-14 14:53:53 +08:00
easy b02f7f5add Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-02-13 18:11:46 +08:00
easy 60acde0b8e update: 组织管理-产品、设备模块 2023-02-13 18:11:22 +08:00
leiqiaochu 220a2f65db feat: 设备管理仪表盘 2023-02-13 17:52:19 +08:00
easy 51b234b2b0 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-02-10 18:14:00 +08:00
easy 025c2c430a update: 部门管理 2023-02-10 18:13:41 +08:00
leiqiaochu 6d68860808 feat: 消息协议解析 2023-02-10 17:43:53 +08:00
easy db05307557 update: 组织管理 2023-02-09 18:27:35 +08:00
easy 09a3873546 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-02-08 18:16:21 +08:00
easy bd7547405b feat: 部门管理 2023-02-08 18:16:06 +08:00
easy ece2ba2ff4 update: 权限管理 2023-02-08 18:15:16 +08:00
easy 37c8110ddc feat: 关系配置 2023-02-08 18:12:27 +08:00
xiongqian f81d36708d Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-02-08 17:05:37 +08:00
xiongqian 839d14937d feat: 产品管理添加导入导出功能 2023-02-08 17:00:43 +08:00
blp 0bf0046fb2 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-02-08 14:43:41 +08:00
blp beebc3fafa fix: 样式冲突,类名修改 2023-02-08 14:43:13 +08:00
easy 3b799e53d7 update: 角色管理over 2023-02-07 18:05:00 +08:00
xiongqian a8af608299 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-02-07 11:36:55 +08:00
xiongqian af3175e974 fix: 修改引导页显示 2023-02-07 11:36:35 +08:00
xiongqian b50cd0cba2 feat: 新增设备接入模块 2023-02-07 11:33:46 +08:00
blp 619d21f3f1 fix: 物联卡引导页菜单、按钮权限 2023-02-07 10:13:52 +08:00
blp 355bc6df64 fix: 修改物联卡列表卡片显示 2023-02-06 18:25:53 +08:00
blp 75e5c67ead feat: 新增设备管理-子设备 2023-02-06 18:24:19 +08:00
easy a7772d55b5 update: 角色管理-权限分配组件 2023-02-06 18:11:54 +08:00
easy 3d22650763 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-02-03 18:15:42 +08:00