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 |
|
easy
|
9cb75775f1
|
update: JTable更改为j-pro-table
|
2023-03-02 21:49:43 +08:00 |
|
easy
|
83f2793346
|
feat: 通知记录
|
2023-03-02 17:00:10 +08:00 |
|
xieyonghong
|
730997231e
|
update: 优化ProLayout使用
|
2023-03-01 17:24:57 +08:00 |
|
easy
|
1793218b6a
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-01 09:43:23 +08:00 |
|
easy
|
1bcdb93455
|
update: 应用管理、api配置、第三方用户首页over
|
2023-03-01 09:43:04 +08:00 |
|
100011797
|
7822393092
|
feat: 场景联动卡片
|
2023-02-28 21:32:47 +08:00 |
|
easy
|
0ef7e80c5c
|
update: api配置左侧树按模式对数据进行过滤
|
2023-02-28 18:06:57 +08:00 |
|
easy
|
b827b54a71
|
update: 第三方应用首页
|
2023-02-28 15:49:07 +08:00 |
|
easy
|
72c72888df
|
update: 应用管理添加集成菜单弹窗、cardbox组件添加遮罩层
|
2023-02-27 17:49:40 +08:00 |
|
easy
|
c24be85601
|
update: 应用管理
|
2023-02-26 18:03:51 +08:00 |
|
easy
|
86ee86d119
|
update: 应用管理
|
2023-02-24 17:58:44 +08:00 |
|
easy
|
1740f85d2d
|
feat: 应用管理
|
2023-02-23 19:59:33 +08:00 |
|
easy
|
063c6bbe8d
|
update: 系统管理模块添加面包屑
|
2023-02-23 10:18:15 +08:00 |
|
easy
|
db7f20e19b
|
update: api配置
|
2023-02-22 20:01:31 +08:00 |
|
easy
|
a9bb84ed6e
|
update: api配置
|
2023-02-21 19:53:03 +08:00 |
|
easy
|
f5e7ce0015
|
update: api配置
|
2023-02-21 16:56:42 +08:00 |
|
easy
|
cdb964e932
|
update: 暂存
|
2023-02-21 13:39:43 +08:00 |
|
easy
|
58e5eec93b
|
update: 数据源管理-管理模块
|
2023-02-20 19:58:37 +08:00 |
|
easy
|
42d49a3083
|
feat: 系统管理-数据源管理
|
2023-02-17 18:16:49 +08:00 |
|
easy
|
9e2c0069b6
|
update: 菜单管理、权限管理、关系配置添加权限
|
2023-02-17 14:37:26 +08:00 |
|
easy
|
d692480d41
|
update: 角色管理添加按钮权限
|
2023-02-16 17:35:44 +08:00 |
|
easy
|
0929185967
|
update: 组织管理添加按钮权限
|
2023-02-16 16:35:39 +08:00 |
|
easy
|
d7754789bf
|
update: 用户管理添加按钮权限
|
2023-02-16 14:47:40 +08:00 |
|
easy
|
4c61eaf918
|
feat: 用户管理
|
2023-02-16 11:32:52 +08:00 |
|
easy
|
da5b9bd790
|
update: 部门管理over
|
2023-02-14 17:52:59 +08:00 |
|
easy
|
60acde0b8e
|
update: 组织管理-产品、设备模块
|
2023-02-13 18:11:22 +08:00 |
|
easy
|
025c2c430a
|
update: 部门管理
|
2023-02-10 18:13:41 +08:00 |
|
easy
|
db05307557
|
update: 组织管理
|
2023-02-09 18:27:35 +08:00 |
|
easy
|
ece2ba2ff4
|
update: 权限管理
|
2023-02-08 18:15:16 +08:00 |
|
easy
|
37c8110ddc
|
feat: 关系配置
|
2023-02-08 18:12:27 +08:00 |
|
easy
|
3b799e53d7
|
update: 角色管理over
|
2023-02-07 18:05:00 +08:00 |
|
easy
|
a7772d55b5
|
update: 角色管理-权限分配组件
|
2023-02-06 18:11:54 +08:00 |
|
easy
|
8df165e916
|
update: 菜单管理-菜单配置
|
2023-02-03 18:15:22 +08:00 |
|
easy
|
6aeaa716bf
|
update: 菜单管理-菜单配置
|
2023-02-02 18:09:54 +08:00 |
|
easy
|
d4bf79f802
|
update: 菜单管理
|
2023-02-01 18:10:53 +08:00 |
|
easy
|
66f77fbbd4
|
update: 菜单管理-暂存
|
2023-02-01 11:00:20 +08:00 |
|
easy
|
c55d3cd0de
|
update: 删除多余文件
|
2023-01-31 18:25:51 +08:00 |
|
easy
|
730a77d2c4
|
update: 菜单管理
|
2023-01-31 18:23:56 +08:00 |
|
easy
|
471a442709
|
update: 菜单管理-暂存
|
2023-01-31 11:39:47 +08:00 |
|
easy
|
0c9de15e9a
|
update: 菜单管理
|
2023-01-30 18:11:05 +08:00 |
|
easy
|
4a6b4c6003
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-30 17:06:47 +08:00 |
|
easy
|
b0148bcac6
|
update: 暂存
|
2023-01-30 17:05:27 +08:00 |
|
xieyonghong
|
e6c2a0875a
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/router/menu.ts
# src/utils/comm.ts
|
2023-01-30 16:57:51 +08:00 |
|
xieyonghong
|
6d701c5204
|
feat: 添加PageContainer；完善动态路由
|
2023-01-30 16:52:33 +08:00 |
|
easy
|
8bdc444957
|
update: 权限管理添加权限
|
2023-01-29 18:24:44 +08:00 |
|
easy
|
dc6ad3b081
|
update: 权限管理
|
2023-01-29 13:58:18 +08:00 |
|
easy
|
e41f19ca69
|
feat: 权限管理
|
2023-01-28 18:12:36 +08:00 |
|
easy
|
12121c1376
|
update: 角色管理
|
2023-01-18 12:42:10 +08:00 |
|
easy
|
9ae2c6981a
|
update: 角色管理
|
2023-01-17 18:17:21 +08:00 |
|
easy
|
66e88145c7
|
feat: 角色管理
|
2023-01-17 11:38:16 +08:00 |
|
easy
|
e36529d7bd
|
update: 系统管理-基础配置
|
2023-01-16 18:14:45 +08:00 |
|
easy
|
a9f57ac414
|
update: 首页样式调整
|
2023-01-12 18:30:07 +08:00 |
|
easy
|
6728105539
|
update: api配置
|
2023-01-12 17:39:02 +08:00 |
|
easy
|
ffc55b91e0
|
update: api配置
|
2023-01-11 18:11:56 +08:00 |
|
easy
|
2436e8fa0d
|
update: api配置界面
|
2023-01-11 14:41:16 +08:00 |
|
easy
|
c67de84110
|
首页目录调整+api配置页面
|
2023-01-10 18:26:17 +08:00 |