Commit Graph

  • a00232ce24 fix: bug#19132 XieYongHong 2023-10-20 18:07:29 +0800
  • 369b8484ac fix: 优化内部应用集成 XieYongHong 2023-10-20 17:26:14 +0800
  • cb4716f37d
    fix: bug#19135、19137 qiaochuLei 2023-10-20 16:55:31 +0800
  • 564ab3a0ea fix: bug#19087 XieYongHong 2023-10-19 18:08:56 +0800
  • 2776fd2968 Merge branch 'dev' into dev-dictionary XieYongHong 2023-10-19 11:08:56 +0800
  • 283baa6816
    fix: bug#19069 XieYongHong 2023-10-19 10:54:21 +0800
  • 94069da4b1 Merge branch 'dev' into dev-dictionary XieYongHong 2023-10-18 18:14:58 +0800
  • 6f59a150d3 fix: bug#19130 XieYongHong 2023-10-18 18:13:30 +0800
  • fe080130b8 Merge branch 'dev' into dev-dictionary XieYongHong 2023-10-17 15:31:41 +0800
  • 329ec037d2 Merge branch 'dev-dictionary' of github.com:jetlinks/jetlinks-ui-vue into dev-dictionary leiqiaochu 2023-10-17 15:29:13 +0800
  • c0bb93b2f7 fix: 获取菜单 leiqiaochu 2023-10-17 15:28:21 +0800
  • 2c891e7f49 fix: 优化设备批量导出查询条件 XieYongHong 2023-10-16 15:45:31 +0800
  • c4ddde59ab fix: 优化设备批量导出查询条件 XieYongHong 2023-10-16 15:32:50 +0800
  • 18433ef6e3 fix: 删除多余无效引入 XieYongHong 2023-10-16 09:42:42 +0800
  • ad04405afb
    fix: bug#18784 qiaochuLei 2023-10-12 18:00:27 +0800
  • 940be8e53b Merge branch 'dev' into dev-dictionary XieYongHong 2023-10-12 17:56:03 +0800
  • e6205e6602
    fix: bug#18996 qiaochuLei 2023-10-11 17:34:25 +0800
  • 54a9c3382f feat: 删除关系配置 leiqiaochu 2023-10-11 16:03:47 +0800
  • 700aa9a5d5 feat: 关系配置组件 leiqiaochu 2023-10-11 15:45:38 +0800
  • 8ffb079c62 Merge branch 'dev' into dev-dictionary XieYongHong 2023-10-10 11:53:12 +0800
  • 3be96fca1c Merge branch 'dev-dictionary' of github.com:jetlinks/jetlinks-ui-vue into dev-dictionary leiqiaochu 2023-10-10 11:05:22 +0800
  • dca46aeb43 feat: 关系组件 leiqiaochu 2023-10-10 11:04:32 +0800
  • 5f41a9a125 fix: 优化查询条件;合并dev部分代码 XieYongHong 2023-10-10 10:25:30 +0800
  • 035281ba06 fix: 优化查询条件 XieYongHong 2023-10-10 10:20:15 +0800
  • 8f69ac098e Merge branch 'dev' into dev-dictionary XieYongHong 2023-10-10 09:53:17 +0800
  • 3b3f379c03
    fix: bug#18975、18961、16956 qiaochuLei 2023-10-10 09:50:25 +0800
  • 406101c134 feat: 初始化角色组接口变更 leiqiaochu 2023-10-09 15:56:47 +0800
  • 637a1b0bd4 feat: 初始化角色分组 leiqiaochu 2023-10-09 15:44:02 +0800
  • acb7826d91 feat: 初始化分组 leiqiaochu 2023-10-09 15:22:48 +0800
  • 09c0cee3bb fix: 修复菜单相关bug leiqiaochu 2023-10-09 10:33:15 +0800
  • dbdb044075 Merge branch 'dev-dictionary' of github.com:jetlinks/jetlinks-ui-vue into dev-dictionary leiqiaochu 2023-10-09 10:01:59 +0800
  • 83594756ea fix: 初始化 leiqiaochu 2023-10-09 10:01:18 +0800
  • 8b7e6e2931 Merge branch 'dev' into dev-dictionary XieYongHong 2023-10-08 18:32:57 +0800
  • 1e80c57181
    fix: bug#18961、18962、18872 qiaochuLei 2023-10-08 18:31:01 +0800
  • fe31c775f5 Merge remote-tracking branch 'origin/dev-dictionary' into dev-dictionary XieYongHong 2023-10-08 16:42:43 +0800
  • 5b0a9fe9ae Merge branch 'dev' into dev-dictionary XieYongHong 2023-10-08 16:41:21 +0800
  • 6533b5ec00 fix: bug#18951 leiqiaochu 2023-10-08 16:35:51 +0800
  • ac074990cb
    fix: bug#16958、18772、系统菜单非选中状态不显示 XieYongHong 2023-10-08 11:22:06 +0800
  • da55dc1020 fix: 修改数据字典 leiqiaochu 2023-10-08 10:42:37 +0800
  • f55df1e8ca
    fix: bug#16958、18772 qiaochuLei 2023-10-08 09:50:10 +0800
  • 88996cbdfb Merge remote-tracking branch 'origin/dev-dictionary' into dev-dictionary XieYongHong 2023-10-07 17:22:02 +0800
  • 7fe91c7dcc fix: bug#18886 XieYongHong 2023-10-07 17:21:48 +0800
  • 2f107adde3 Merge branch 'dev-dictionary' of github.com:jetlinks/jetlinks-ui-vue into dev-dictionary leiqiaochu 2023-10-07 17:15:27 +0800
  • 21925700a5 fix: bug#18920 leiqiaochu 2023-10-07 17:14:56 +0800
  • 24a669adc6 fix: bug#18886 XieYongHong 2023-10-07 17:14:43 +0800
  • 14bc5cf16f Merge branch 'dev' into dev-dictionary XieYongHong 2023-10-07 15:25:48 +0800
  • 90104848c1 fix: bug#18156 XieYongHong 2023-10-07 15:11:39 +0800
  • 189c88aa92 fix: bug#18766 leiqiaochu 2023-10-07 14:03:21 +0800
  • 06f128bd0b fix: bug#18898 leiqiaochu 2023-10-07 13:36:48 +0800
  • 9d4177e1c9 fix: 修改请求菜单接口参数 leiqiaochu 2023-09-27 17:21:52 +0800
  • c8717c6f0c fix: bug#18850 leiqiaochu 2023-09-27 17:18:44 +0800
  • 3afcac7c71 feat: 新增用户角色展示 leiqiaochu 2023-09-27 16:31:31 +0800
  • c46122d08a Merge branch 'dev-dictionary' of github.com:jetlinks/jetlinks-ui-vue into dev-dictionary leiqiaochu 2023-09-27 15:05:56 +0800
  • a55e7d2af1 fix: bug#18805 leiqiaochu 2023-09-27 15:05:35 +0800
  • 7c75248aae Merge remote-tracking branch 'origin/dev-dictionary' into dev-dictionary XieYongHong 2023-09-27 13:58:12 +0800
  • 490f34b215 feat: 关系改造 leiqiaochu 2023-09-27 13:42:24 +0800
  • ed98810e95 fix: 修复低码渲染异常问题 XieYongHong 2023-09-27 11:28:54 +0800
  • fbbcf60c35 fix: bug#18724 leiqiaochu 2023-09-27 11:25:49 +0800
  • b805c8b748 fix: bug#18760 leiqiaochu 2023-09-27 10:43:37 +0800
  • 9802069905 fix: 修改菜单 leiqiaochu 2023-09-27 09:43:49 +0800
  • e482e158f6 fix: 修改bug leiqiaochu 2023-09-26 18:15:21 +0800
  • 1540cd71f8 fix: 数据字典菜单初始化 leiqiaochu 2023-09-25 15:00:09 +0800
  • c3286b6661
    fix: bug#视频回放加载bug XieYongHong 2023-09-25 14:05:28 +0800
  • d73e6641a1 feat: 关系配置通用组件 leiqiaochu 2023-09-25 11:53:33 +0800
  • bf0df077a9 feat: 关系配置通用组件 leiqiaochu 2023-09-25 11:51:01 +0800
  • b7849f4d07 feat: 关系配置组件 leiqiaochu 2023-09-25 10:37:18 +0800
  • 8f663bb21d Merge remote-tracking branch 'origin/dev-dictionary' into dev-dictionary XieYongHong 2023-09-22 18:30:19 +0800
  • 3cdd04f675 fix: 优化低码回显 XieYongHong 2023-09-22 18:30:02 +0800
  • bd09253eaf feat: 初始化页面改造 leiqiaochu 2023-09-22 17:48:02 +0800
  • e5388b418f feat: 初始化改造 leiqiaochu 2023-09-22 16:24:46 +0800
  • dd1ff0d018 fix: bug#18647 leiqiaochu 2023-09-22 14:57:22 +0800
  • 387ae15120 fix: bug#18495 leiqiaochu 2023-09-21 16:55:56 +0800
  • 5f9988eda2 Merge branch 'dev-dictionary' of github.com:jetlinks/jetlinks-ui-vue into dev-dictionary leiqiaochu 2023-09-21 11:02:23 +0800
  • 1fab8aa9f5 fix: 子设备解绑bug leiqiaochu 2023-09-21 11:00:51 +0800
  • 1a0cb1d9c8 Merge remote-tracking branch 'origin/dev-dictionary' into dev-dictionary XieYongHong 2023-09-21 09:41:16 +0800
  • 48d0c4cef5 fix: 优化低码回显 XieYongHong 2023-09-21 09:41:00 +0800
  • 7943a4108f fix: bug#18550、18545、 leiqiaochu 2023-09-20 21:49:23 +0800
  • 351a399135 Merge branch 'dev-dictionary' of github.com:jetlinks/jetlinks-ui-vue into dev-dictionary leiqiaochu 2023-09-20 20:14:00 +0800
  • 654c344455 fix: bug#18505、18507 leiqiaochu 2023-09-20 20:13:37 +0800
  • f719c99d64 Merge branch 'dev' into dev-dictionary XieYongHong 2023-09-20 19:58:46 +0800
  • 41ea25f927
    fix: bug#视频回放加载bug qiaochuLei 2023-09-20 19:53:42 +0800
  • a9e25810f9 Merge branch 'dev-dictionary' of github.com:jetlinks/jetlinks-ui-vue into dev-dictionary leiqiaochu 2023-09-20 16:38:21 +0800
  • 47fc37fffe feat: 菜单改造 leiqiaochu 2023-09-20 16:37:40 +0800
  • 1b4ebe5297 fix: 优化低码回显 XieYongHong 2023-09-20 13:45:45 +0800
  • 2d80c4ad4e Merge branch 'dev' into dev-dictionary XieYongHong 2023-09-20 10:08:12 +0800
  • 566df47ce8
    fix: 边缘端映射bug qiaochuLei 2023-09-20 10:04:14 +0800
  • 0bfe7efc43 Merge branch 'dev' into dev-dictionary XieYongHong 2023-09-14 10:09:51 +0800
  • d8f712471f
    fix: bug#18148;解决合并冲突 qiaochuLei 2023-09-14 09:28:04 +0800
  • 03db286aab Merge branch 'dev-dictionary' of github.com:jetlinks/jetlinks-ui-vue into dev-dictionary leiqiaochu 2023-09-11 14:35:18 +0800
  • 69e4599337 feat: 角色管理用户管理改造 leiqiaochu 2023-09-11 14:34:26 +0800
  • 51794071a7 fix: 获取低码服务url XieYongHong 2023-09-08 19:16:17 +0800
  • 96a2499b92 Merge branch 'dev' into dev-dictionary XieYongHong 2023-09-08 19:10:07 +0800
  • ae4354f28a
    fix: bug#18002、17889、17665、17684 XieYongHong 2023-09-08 19:07:44 +0800
  • f1a40db005 fix: 添加低码路由处理 XieYongHong 2023-09-08 18:58:44 +0800
  • 99533a38be feat: 角色管理改造 leiqiaochu 2023-09-08 16:27:32 +0800
  • 0dc60d125f
    fix: bug#18002、17889、17665、17684 qiaochuLei 2023-09-08 10:12:08 +0800
  • a3b29ae01e feat: 数据字典权限 leiqiaochu 2023-09-06 10:35:04 +0800
  • 6a62c2bf4e feat: 数据字典优化 leiqiaochu 2023-09-04 19:55:50 +0800
  • 22ee69d1db Merge branch 'dev' into dev-dictionary leiqiaochu 2023-09-04 19:15:51 +0800
  • dfc1d1556c feat: 数据字典 leiqiaochu 2023-09-04 19:15:23 +0800