Commit Graph

306 Commits

Author SHA1 Message Date
leiqiaochu d7198a7ad1 fix: bug菜单管理按钮样式 2023-03-31 16:16:18 +08:00
jackhoo_98 0ec07a4d73 fix: bug#10847 修复菜单管理部分bug 2023-03-31 15:55:12 +08:00
JiangQiming 1beaab1732 fix: bug#11309 2023-03-31 15:52:20 +08:00
leiqiaochu 39d6a156a8 feat: license页面 2023-03-31 14:19:10 +08:00
JiangQiming f2b1b6250e Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-31 14:02:18 +08:00
JiangQiming 497ac1f4ca fix: bug#11274、11273、11272 2023-03-31 14:02:03 +08:00
100011797 4b08712c61 fix: 修改应用管理的状态展示 2023-03-31 13:52:41 +08:00
jackhoo_98 0998f4bc79 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-31 12:40:02 +08:00
jackhoo_98 e7be6d4770 update: 统一修改浏览器标签跳转、设备接入网关新增快速添加 2023-03-31 12:39:44 +08:00
JiangQiming efded0457b fix: bug#11227、11266、11260 2023-03-31 11:51:27 +08:00
JiangQiming f4770bc03f fix: bug#11260 2023-03-31 10:09:04 +08:00
JiangQiming d3af662267 fix: bug#11249、11247、10637、11250 2023-03-30 20:24:05 +08:00
JiangQiming f25468066b fix: bug#11223 2023-03-30 19:58:28 +08:00
JiangQiming f08e28560a update: 系统管理列表撑满高度 2023-03-30 17:18:43 +08:00
JiangQiming a75f2a3fd6 fix: bug#11106 2023-03-30 16:20:16 +08:00
JiangQiming 2bccd21378 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-30 15:51:41 +08:00
JiangQiming c88706282f fix: bug#11106 2023-03-30 15:51:16 +08:00
leiqiaochu 2dbd7e31b6 fix: bug路由校验 初始化跳转 2023-03-30 15:39:04 +08:00
xieyonghong d3ea02c0f6 style: 优化组织管理样式 2023-03-30 13:42:16 +08:00
JiangQiming 57af547bfb Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-30 11:50:49 +08:00
JiangQiming c6ec16350e fix: bug#11221 2023-03-30 11:50:32 +08:00
leiqiaochu 92315c3c39 fix: bug#10777 2023-03-30 11:45:09 +08:00
leiqiaochu 18d950d63f fix: bug#10777 11128 11212 2023-03-30 11:32:15 +08:00
JiangQiming d7790f203f fix: bug#11139、11214 2023-03-30 10:56:51 +08:00
JiangQiming e61efa5832 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-29 22:06:43 +08:00
JiangQiming cea070b35c fix: bug#10766 2023-03-29 22:06:27 +08:00
100011797 55cd57269d fix: ico改变 2023-03-29 22:04:09 +08:00
leiqiaochu 922624cbc2 fix: bug#10781 2023-03-29 21:57:36 +08:00
JiangQiming e9f84f959a fix: bug#10803 2023-03-29 21:39:39 +08:00
JiangQiming 4424b56d4c Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-29 21:29:46 +08:00
JiangQiming b7034c5ca4 fix: bug#11037、11057 2023-03-29 21:29:30 +08:00
leiqiaochu 3aa73c4f08 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-29 20:55:07 +08:00
JiangQiming ee323a1a7d Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-29 20:52:50 +08:00
JiangQiming 95c0409c21 fix: bug#11157 2023-03-29 20:52:33 +08:00
leiqiaochu 382f0bff44 fix: bug#11195 2023-03-29 20:45:34 +08:00
100011797 ecd956b4fd fix: 修改场景联动执行动作设备查询排序 2023-03-29 20:38:24 +08:00
JiangQiming 16dc7b7aa7 fix: bug#10762 2023-03-29 20:01:18 +08:00
JiangQiming 0ce7fd5a59 fix: bug#11062、11139 2023-03-29 17:54:23 +08:00
JiangQiming b676b2bba3 fix: bug#11187 2023-03-29 16:34:12 +08:00
JiangQiming d690240184 fix: bug#10692 2023-03-29 14:47:58 +08:00
JiangQiming ac63d41f0b fix: bug#10776、10778 2023-03-29 14:42:55 +08:00
JiangQiming 6cb8e67da2 fix: bug#11071、11075、11058、11062、11151 2023-03-29 10:53:16 +08:00
JiangQiming d8f19671c2 fix: bug#10953 2023-03-28 19:45:37 +08:00
JiangQiming 0ea4214ee3 fix: bug#11114、10540、10783 2023-03-28 16:46:29 +08:00
JiangQiming f8006832e1 fix: bug#11108、10690、10754、10736、11118 2023-03-28 16:07:50 +08:00
JiangQiming be4b59de57 fix: bug#11001 2023-03-28 14:59:48 +08:00
JiangQiming 913560934d Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-28 14:11:28 +08:00
JiangQiming 42828b295f fix: bug#10762 2023-03-28 14:11:13 +08:00
100011797 0a93cd2926 fix:场景联动 2023-03-28 11:01:06 +08:00
jackhoo_98 2aaa3ae945 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-28 10:58:16 +08:00
JiangQiming 055de0750e fix: bug#10756 2023-03-28 10:55:19 +08:00
JiangQiming 4b2439374a fix: bug#10740、11100 2023-03-28 10:07:17 +08:00
jackhoo_98 4782c510d5 fix: 菜单管理 更改初始菜单引用 2023-03-28 10:02:58 +08:00
JiangQiming ffff3debad Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-28 09:27:31 +08:00
JiangQiming 067e471b4c fix: bug#11028、11030、11068、10924、11056、10941 2023-03-28 09:27:12 +08:00
jackhoo_98 45f634b37c Merge branch 'dev' into dev-hub 2023-03-27 20:34:08 +08:00
JiangQiming f6947dd3e5 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-27 20:00:36 +08:00
JiangQiming 1aae61582e fix: bug#10766 2023-03-27 20:00:18 +08:00
jackhoo_98 5f5b3e5b41 fix: bug#10945 修复菜单管理部分bug 2023-03-27 19:45:28 +08:00
leiqiaochu 4e8c6dfe9d Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-27 17:58:39 +08:00
leiqiaochu ace81f616d fix: bug#11037 11041 11051 11066 2023-03-27 17:56:47 +08:00
100011797 9fb80e4123 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-27 17:05:09 +08:00
100011797 ee7c4e11f7 fix: 修改场景联动 2023-03-27 17:04:08 +08:00
JiangQiming dbd14ce4d6 fix: bug#10924、11001 2023-03-27 16:11:06 +08:00
JiangQiming 9594893a50 fix: bug#10909、10912 2023-03-27 15:44:48 +08:00
JiangQiming d58bef5897 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-27 15:29:39 +08:00
JiangQiming 6c47f20f9d fix: bug#10892、10953 2023-03-27 15:29:23 +08:00
jackhoo_98 414a9987d2 Merge branch 'dev' into dev-hub 2023-03-27 15:27:01 +08:00
jackhoo_98 049bf99395 fix: 菜单管理 完成菜单配置 2023-03-27 15:25:53 +08:00
JiangQiming 5d19f58f59 fix: bug#10967、10974 2023-03-27 14:13:52 +08:00
JiangQiming 71fe3f81bd fix: bug#10894 2023-03-27 10:47:50 +08:00
xieyonghong 6919d41b93 Merge remote-tracking branch 'origin/dev' into dev 2023-03-26 22:27:49 +08:00
jackhoo_98 05776bd630 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-26 19:13:34 +08:00
jackhoo_98 0f6f2cccb6 feat: 菜单管理 重构菜单配置 完成交互逻辑 2023-03-26 19:12:01 +08:00
xieyonghong 6f8f77bcd6 fix: bug#10958 2023-03-26 17:15:05 +08:00
JiangQiming 532c82afe6 fix: bug#10905、10895、10912、10926、10927、10886 2023-03-25 15:56:11 +08:00
JiangQiming 934200dfcd fix: bug#10914、10888 2023-03-25 14:44:07 +08:00
JiangQiming 582ebddd21 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-24 18:48:10 +08:00
JiangQiming 07510a272e fix: bug#10891、10890、10893、10894、10905、10901 2023-03-24 18:47:55 +08:00
jackhoo_98 af8f951ed8 Merge branch 'dev' into dev-hub 2023-03-24 18:05:22 +08:00
jackhoo_98 1c23a544fe fix: 菜单管理 菜单配置todo 2023-03-24 18:04:13 +08:00
JiangQiming 58e01fe28e Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-24 16:31:40 +08:00
JiangQiming b8a587fd00 fix: bug#10540、10885、10818、10566、10418 2023-03-24 16:31:24 +08:00
100011797 cfa898e12b fix: 数据源修改 2023-03-24 16:17:40 +08:00
jackhoo_98 62bd45e624 fix: bug#10844 2023-03-24 15:34:04 +08:00
JiangQiming 8c2af7fe76 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-24 15:22:19 +08:00
JiangQiming 8d35495808 fix: bug#10863、10816、10739、10746、10749 2023-03-24 15:22:02 +08:00
xieyonghong 570950c4e3 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-24 13:51:09 +08:00
xieyonghong 01d3a0939d fix: 修复二次确认按钮换行 2023-03-24 13:34:42 +08:00
JiangQiming f55bf06297 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-24 11:50:15 +08:00
JiangQiming 62f8061e3b fix: bug#10742、10828、10827、10657 2023-03-24 11:49:58 +08:00
100011797 19684721e2 fix: 数据源bug 2023-03-24 10:59:11 +08:00
JiangQiming 004eb1fb2f fix: bug#10816、10814、10812、10789、10780、10775、等 2023-03-23 21:00:09 +08:00
JiangQiming f00d69d30e fix: bug#10841、10838、10835、10834、10828、10827 2023-03-23 18:02:27 +08:00
JiangQiming 9c9ee029e6 fix: bug#10773、10772、10829、10826 2023-03-23 16:46:02 +08:00
JiangQiming b4734056d8 fix: bug#10609-1 2023-03-23 15:36:31 +08:00
JiangQiming e9d5c8e9c3 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-23 11:48:46 +08:00
JiangQiming 0e09858d38 fix: bug#10706、10678 2023-03-23 11:47:58 +08:00
xieyonghong a8478617cd fix: bug#10763、10750、10732、10686 2023-03-23 08:42:31 +08:00
JiangQiming 4e123ac64c fix: bug#10706-1 2023-03-22 19:45:54 +08:00
JiangQiming b6b4677367 fix: bug#10550 2023-03-22 15:36:16 +08:00
JiangQiming 352c4d263b fix: bug#10675、10674、10663 2023-03-21 18:33:55 +08:00
JiangQiming c70dcf6f62 fix: bug#10669、10679、10680 2023-03-21 18:15:59 +08:00
JiangQiming b78aa24b8e fix: bug#10653、10654 2023-03-21 17:26:03 +08:00
JiangQiming 9759fea2cc fix: bug#10647、10644、10640 2023-03-21 16:43:09 +08:00
JiangQiming c71a38d424 fix: bug#10618、10608、10671、10532、10530、10649 2023-03-21 16:07:38 +08:00
JiangQiming 5abfe399e2 update: 通知管理, 视频中心, 系统管理message引入方式改为jetlinks组件库 2023-03-21 11:08:09 +08:00
JiangQiming c08f29d4da fix: bug#10561 2023-03-20 17:36:33 +08:00
JiangQiming 30e98f69af fix: 1.bug#10597、10533; 2.系统基础配置优化 2023-03-20 14:57:19 +08:00
easy d29346248e fix: bug#10537 2023-03-17 17:43:58 +08:00
easy 3794849946 update: api配置优化 2023-03-17 15:18:32 +08:00
easy 0b99ea0096 fix: bug#10532、10531、10530、10527、10534、10529 2023-03-17 14:32:43 +08:00
easy f45cc4da61 fix: bug#10532、10531、10530、10527 2023-03-17 11:51:02 +08:00
easy dee82d2115 update: api配置-调试 请求参数表格 2023-03-16 11:19:38 +08:00
easy 6c4da9db2f update: 代码编辑器更换 2023-03-16 10:43:12 +08:00
easy c25562adfb fix: #10442、#10441 2023-03-16 10:18:45 +08:00
easy 174cf36d09 update: 用户管理 2023-03-15 17:41:22 +08:00
easy f13ebbc16c update: 应用管理权限完善 2023-03-15 15:05:36 +08:00
easy c0f9b249e9 update: uhasPermission属性更正 2023-03-15 14:26:49 +08:00
easy 8576a18ec5 update: <a-upload>组件替换 2023-03-15 09:52:02 +08:00
easy 8b86084d82 update: 图标组件替换 2023-03-14 17:13:09 +08:00
easy 5352ef782a fix: 组件更换、首页跳转完善 2023-03-14 16:56:20 +08:00
easy 557c41afb6 fix: api配置、应用管理 2023-03-14 16:04:23 +08:00
easy 0103cba6f7 update: 搜索组件替换 2023-03-14 10:19:58 +08:00
easy 6dfc0cb1db fix: 数据源管理 删除行 2023-03-13 17:05:16 +08:00
easy e121ae9a81 fix: 关系配置 2023-03-13 16:27:34 +08:00
easy 4b63114795 fix: 权限管理 2023-03-13 16:03:14 +08:00
easy 5c65ca9c50 fix: 菜单管理 2023-03-13 15:36:24 +08:00
easy 7c86bdc569 fix: 角色管理 2023-03-13 14:48:13 +08:00
easy 2340964514 fix: 部门管理 2023-03-13 14:11:31 +08:00
easy 2315a05224 fix: 首页、部门 2023-03-13 11:21:17 +08:00
easy df1fe4bd0f fix: 组织管理自测及优化 2023-03-10 18:08:29 +08:00
easy 8e92b62c5c fix: 用户管理自测及优化 2023-03-10 14:12:28 +08:00
easy 0c80efe6d2 fix: 基础配置自测及优化 2023-03-10 10:49:13 +08:00
easy 37e381f961 fix: 个人中心 2023-03-09 17:28:35 +08:00
easy 58106e9fe4 update: 应用管理组件替换、弹窗优化 2023-03-08 19:43:36 +08:00
easy 68720f668c update: api配置组件替换、逻辑优化 2023-03-08 19:07:34 +08:00
easy ae3f1a96ff update: 菜单-添加按钮弹窗组件修改 2023-03-08 14:18:01 +08:00
easy e2339e28b5 update: 基础配置组件替换 2023-03-07 15:52:29 +08:00
easy e2417ed44e update: 数据源管理组件替换、弹窗优化 2023-03-07 14:58:42 +08:00
easy a57870a2e1 update: 关系配置组件替换、弹窗优化 2023-03-07 14:08:49 +08:00
easy 9a7c8d3bc7 update: 菜单管理优化 2023-03-07 10:21:10 +08:00
easy d4d26c504d update: 菜单管理组件替换、痰喘优化 2023-03-06 20:06:49 +08:00
easy 3039c20e2f update: 角色管理组件更换、弹窗逻辑优化 2023-03-06 16:35:59 +08:00
easy 787c85b399 update: 角色管理-搜索组件更换 2023-03-06 14:05:58 +08:00
easy 1abe6450d3 update: 组织管理优化 2023-03-06 14:02:19 +08:00
easy 24b2afd45c update: 组织管理-产品页 2023-03-06 11:43:45 +08:00
easy ef87b7767a update: 组织管理弹窗优化、a-组件更换为j- 2023-03-04 17:23:39 +08:00
easy b80b3bfb2c update: 个人中心、用户管理代码优化 2023-03-04 13:52:41 +08:00
easy 89310a6c8d update: 用户管理优化 2023-03-04 11:10:59 +08:00