Commit Graph

  • ad7329b694
    Merge pull request #48 from jetlinks/dev-hub 胡彪 2023-02-20 09:30:43 +0800
  • 1ad7bcad8b Merge branch 'dev' into dev-hub jackhoo_98 2023-02-20 09:28:13 +0800
  • 67df928602 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev easy 2023-02-17 18:17:07 +0800
  • 42d49a3083 feat: 系统管理-数据源管理 easy 2023-02-17 18:16:49 +0800
  • bc93563d12 feat: 网络组件详情 代码优化,共享/独立配置表单校验 jackhoo_98 2023-02-17 18:14:09 +0800
  • 21863de3b1 fix: 合并冲突 100011797 2023-02-17 18:12:49 +0800
  • 6cb673fbe2 feat: 设备诊断 100011797 2023-02-17 18:11:55 +0800
  • 8dcb2a00e2 fix: 物模型属性表单开发 wangshuaiswim 2023-02-17 17:43:22 +0800
  • cdd0ddd88a Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev JiangQiming 2023-02-17 17:37:20 +0800
  • 87c4447f31 feat: 视频设备-新增编辑 JiangQiming 2023-02-17 17:37:04 +0800
  • 9e2c0069b6 update: 菜单管理、权限管理、关系配置添加权限 easy 2023-02-17 14:37:26 +0800
  • 5d21fe98c2
    Merge pull request #47 from jetlinks/dev-hub 胡彪 2023-02-17 09:36:54 +0800
  • f7f0556b00 Merge branch 'dev' into dev-hub jackhoo_98 2023-02-17 09:28:45 +0800
  • 0fddd9b8ff feat: 网络组件详情 独立配置表单样式 jackhoo_98 2023-02-17 09:22:30 +0800
  • 646e586119 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev JiangQiming 2023-02-16 18:05:23 +0800
  • 7bf810065f feat: 视频中心-新增/编辑页面 JiangQiming 2023-02-16 18:05:08 +0800
  • eb2e68e0ea Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev easy 2023-02-16 18:03:53 +0800
  • 184e10d239 fix: 修复PermissionButton中popconfirm方法调用 wangshuaiswim 2023-02-16 18:03:10 +0800
  • d692480d41 update: 角色管理添加按钮权限 easy 2023-02-16 17:35:44 +0800
  • 7e434d0928 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev easy 2023-02-16 16:45:17 +0800
  • b706ff1c09 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev leiqiaochu 2023-02-16 16:42:00 +0800
  • b2df14d6b5 chore: 代理地址恢复 leiqiaochu 2023-02-16 16:41:02 +0800
  • 86c005b67c Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev easy 2023-02-16 16:35:58 +0800
  • 0929185967 update: 组织管理添加按钮权限 easy 2023-02-16 16:35:39 +0800
  • 7daa9df6a6 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev wangshuaiswim 2023-02-16 16:23:07 +0800
  • 24690e1cdb fix: 修改权限按钮重复点击问题 wangshuaiswim 2023-02-16 16:22:34 +0800
  • b7b3ecbd1c Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev JiangQiming 2023-02-16 16:13:39 +0800
  • 693c9d3311 feat: 视频中心-视频设备列表开发 JiangQiming 2023-02-16 16:13:23 +0800
  • 293bba37a1 feat: 告警中心仪表盘 leiqiaochu 2023-02-16 16:07:14 +0800
  • 40a62317d9 feat: 告警中心仪表盘 leiqiaochu 2023-02-16 16:05:29 +0800
  • d7754789bf update: 用户管理添加按钮权限 easy 2023-02-16 14:47:40 +0800
  • bf6c705eda fix: 修复PermissionButton禁用不生效问题 wangshuaiswim 2023-02-16 14:31:44 +0800
  • b2653adda5 update: 代码编辑器支持脚本语言输入 JiangQiming 2023-02-16 14:03:46 +0800
  • b55a7bd490 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev JiangQiming 2023-02-16 13:45:52 +0800
  • 7308148b69 feat: 视频中心, 仪表盘开发 JiangQiming 2023-02-16 13:45:34 +0800
  • b3459c4f97 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev easy 2023-02-16 11:33:14 +0800
  • 4c61eaf918 feat: 用户管理 easy 2023-02-16 11:32:52 +0800
  • 9b0cf80578
    Merge pull request #46 from jetlinks/dev-hub 胡彪 2023-02-16 09:05:50 +0800
  • 0138941c57 Merge branch 'dev' into dev-hub jackhoo_98 2023-02-16 09:02:16 +0800
  • 6acc522ed5 feat: 网络组件详情 表单共享配置基本样式 jackhoo_98 2023-02-15 21:01:46 +0800
  • ab45dabd7f feat: 北向输出 100011797 2023-02-15 18:56:52 +0800
  • b493288b2e feat: 规则编排 leiqiaochu 2023-02-15 18:52:47 +0800
  • 91ae45d227 feat: 网络组件 卡片/列表基本功能 jackhoo_98 2023-02-15 13:34:56 +0800
  • 4d099365d8 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev easy 2023-02-14 17:53:19 +0800
  • da5b9bd790 update: 部门管理over easy 2023-02-14 17:52:59 +0800
  • 648ca2d7ff
    Merge pull request #45 from jetlinks/dev-hub 胡彪 2023-02-14 14:58:46 +0800
  • 97c6d391fb Merge branch 'dev' into dev-hub jackhoo_98 2023-02-14 14:56:10 +0800
  • 2555f827ef feat: 流媒体服务 卡片列表/新增/编辑等功能 jackhoo_98 2023-02-14 14:53:53 +0800
  • b02f7f5add Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev easy 2023-02-13 18:11:46 +0800
  • 60acde0b8e update: 组织管理-产品、设备模块 easy 2023-02-13 18:11:22 +0800
  • 220a2f65db feat: 设备管理仪表盘 leiqiaochu 2023-02-13 17:52:19 +0800
  • 51b234b2b0 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev easy 2023-02-10 18:14:00 +0800
  • 025c2c430a update: 部门管理 easy 2023-02-10 18:13:41 +0800
  • 6d68860808 feat: 消息协议解析 leiqiaochu 2023-02-10 17:43:53 +0800
  • db05307557 update: 组织管理 easy 2023-02-09 18:27:35 +0800
  • 09a3873546 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev easy 2023-02-08 18:16:21 +0800
  • bd7547405b feat: 部门管理 easy 2023-02-08 18:16:06 +0800
  • ece2ba2ff4 update: 权限管理 easy 2023-02-08 18:15:16 +0800
  • 37c8110ddc feat: 关系配置 easy 2023-02-08 18:12:27 +0800
  • f81d36708d Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev xiongqian 2023-02-08 17:05:37 +0800
  • 839d14937d feat: 产品管理添加导入导出功能 xiongqian 2023-02-08 17:00:43 +0800
  • 0bf0046fb2 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev blp 2023-02-08 14:43:41 +0800
  • beebc3fafa fix: 样式冲突,类名修改 blp 2023-02-08 14:43:13 +0800
  • 3b799e53d7 update: 角色管理over easy 2023-02-07 18:05:00 +0800
  • a8af608299 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev xiongqian 2023-02-07 11:36:55 +0800
  • af3175e974 fix: 修改引导页显示 xiongqian 2023-02-07 11:36:35 +0800
  • b50cd0cba2 feat: 新增设备接入模块 xiongqian 2023-02-07 11:33:46 +0800
  • 619d21f3f1 fix: 物联卡引导页菜单、按钮权限 blp 2023-02-07 10:13:52 +0800
  • 355bc6df64 fix: 修改物联卡列表卡片显示 blp 2023-02-06 18:25:53 +0800
  • 75e5c67ead feat: 新增设备管理-子设备 blp 2023-02-06 18:24:19 +0800
  • a7772d55b5 update: 角色管理-权限分配组件 easy 2023-02-06 18:11:54 +0800
  • 3d22650763 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev easy 2023-02-03 18:15:42 +0800
  • 8df165e916 update: 菜单管理-菜单配置 easy 2023-02-03 18:15:22 +0800
  • 3df97244e3 fix: 仪表盘、物联卡管理查看 根据时间选择查询流量图表 blp 2023-02-03 17:39:27 +0800
  • b4850cb168 Merge branch 'dev-hub' into dev jackhoo_98 2023-02-02 23:04:53 +0800
  • b46b71812d fix: 物模型开发 wangshuaiswim 2023-02-02 18:29:23 +0800
  • 519042d019 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev easy 2023-02-02 18:10:16 +0800
  • 6aeaa716bf update: 菜单管理-菜单配置 easy 2023-02-02 18:09:54 +0800
  • c54894a20f feat: 协议管理 jackhoo_98 2023-02-02 18:08:26 +0800
  • ecd941c84c update: 组件RadioCard新增layout、checkStyle、disabled属性 jackhoo_98 2023-02-02 18:07:14 +0800
  • fa00834c95 fix: 运行状态操作 100011797 2023-02-02 17:55:36 +0800
  • 2c6e4173f8 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev JiangQiming 2023-02-02 17:23:44 +0800
  • c051cdeae4 feat: 视频中心,仪表盘图表card封装 JiangQiming 2023-02-02 17:23:29 +0800
  • af2136a033 fix: 修改搜索传参、弹窗按钮中文 blp 2023-02-02 14:32:29 +0800
  • ff87cb9b6d feat: 新增物联卡操作记录 blp 2023-02-02 13:56:26 +0800
  • f2bd1d37a2 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev JiangQiming 2023-02-02 11:51:20 +0800
  • e67d9519a8 feat: 视频中心仪表盘 JiangQiming 2023-02-02 11:51:06 +0800
  • 095a8a9977 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev wangshuaiswim 2023-02-02 11:42:37 +0800
  • ae37dbc2bd fix: 修改PermissionButton的Props透传 wangshuaiswim 2023-02-02 11:41:55 +0800
  • 001bb6bce0 feat: 新增平台对接 blp 2023-02-02 11:06:58 +0800
  • 67d637cca9 fix: 修复拓展路由无法访问 xieyonghong 2023-02-02 10:42:35 +0800
  • eaea45668c Merge remote-tracking branch 'origin/dev' into dev xieyonghong 2023-02-02 10:38:20 +0800
  • f9e283b190 fix: 修复详情路由无法访问 xieyonghong 2023-02-02 10:37:53 +0800
  • ad2e5b1ec5 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev xiongqian 2023-02-01 18:23:41 +0800
  • 93763374fe fix: 修改产品新增、编辑、添加详情页面 xiongqian 2023-02-01 18:23:24 +0800
  • 00d57cc44a Merge remote-tracking branch 'origin/dev' into dev xieyonghong 2023-02-01 18:21:44 +0800
  • 22bdc79013 update: 1.优化多层级路由 xieyonghong 2023-02-01 18:21:00 +0800
  • 9e6d68a555 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev blp 2023-02-01 18:16:18 +0800
  • 9304911139 fix: 修改page-container blp 2023-02-01 18:15:30 +0800
  • c384fd6f6c Merge branch 'dev-hub' into dev jackhoo_98 2023-02-01 18:14:44 +0800