xieyonghong
|
6d701c5204
|
feat: 添加PageContainer；完善动态路由
|
2023-01-30 16:52:33 +08:00 |
|
xieyonghong
|
92c4901750
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/components/AIcon/index.tsx
|
2023-01-29 17:43:05 +08:00 |
jackhoo_98
|
a3639e8bae
|
Merge branch 'dev-hub' into dev
|
2023-01-29 17:39:23 +08:00 |
|
jackhoo_98
|
35a53fc47c
|
feat: 设备接入网关 云平台接入 Ctwing/OneNet设备接入
|
2023-01-29 17:38:07 +08:00 |
|
xieyonghong
|
f3bc5740af
|
feat: 优化Layout组件，添加动态路由
|
2023-01-29 17:16:16 +08:00 |
JiangQiming
|
1aa7839a54
|
feat: 通知配置调试页面+接口联调
|
2023-01-29 16:02:20 +08:00 |
|
JiangQiming
|
e0c8e413bb
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-29 14:45:18 +08:00 |
|
JiangQiming
|
c71328aab9
|
feat: 通知配置列表
|
2023-01-29 14:45:03 +08:00 |
|
jackhoo_98
|
3c5a2ef320
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-29 11:51:37 +08:00 |
|
jackhoo_98
|
6929dd2cfd
|
feat: 设备接入网关 官方接入 边缘网关/子设备接入
|
2023-01-29 11:51:21 +08:00 |
|
JiangQiming
|
3b660203ea
|
feat: 收信人, 部门和标签组件封装
|
2023-01-29 10:31:21 +08:00 |
|
JiangQiming
|
516127a168
|
fix: 通知模板-短信模板表单字段调试
|
2023-01-29 10:08:03 +08:00 |
|
xieyonghong
|
f66e483f18
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/components/AIcon/index.tsx
|
2023-01-29 09:08:40 +08:00 |
xiongqian
|
1efe058322
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
# Conflicts:
# src/components/AIcon/index.tsx
|
2023-01-28 21:57:44 +08:00 |
|
xiongqian
|
37c4e654ee
|
feat: 新增产品分类模块
|
2023-01-28 21:56:11 +08:00 |
easy
|
ff7de315c8
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-28 18:13:10 +08:00 |
|
xieyonghong
|
11fc6fa4f7
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/components/AIcon/index.tsx
|
2023-01-28 18:12:43 +08:00 |
|
easy
|
e41f19ca69
|
feat: 权限管理
|
2023-01-28 18:12:36 +08:00 |
blp
|
cfb01f5125
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-28 18:12:28 +08:00 |
|
blp
|
4a01193d97
|
feat: 新增物联卡-仪表盘
|
2023-01-28 18:12:04 +08:00 |
|
xieyonghong
|
3e42721d31
|
feat: 新增Layout组件，优化部分配置文件
|
2023-01-28 18:11:30 +08:00 |
|
JiangQiming
|
9f87a92f0a
|
fix: 优化
|
2023-01-28 18:04:49 +08:00 |
|
JiangQiming
|
841fa8433a
|
feat: 通知管理接口
|
2023-01-28 17:51:10 +08:00 |
|
JiangQiming
|
6b5bd5ee25
|
feat: 通知模板接口联调
|
2023-01-28 17:12:58 +08:00 |
|
JiangQiming
|
b45f6f087a
|
fix: 优化变量列表组件
|
2023-01-28 16:25:31 +08:00 |
|
JiangQiming
|
11fe52ce49
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-28 16:06:46 +08:00 |
|
JiangQiming
|
3383183e3b
|
feat: 通知模板,新增变量列表组件
|
2023-01-28 16:06:33 +08:00 |
|
blp
|
0028362a08
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-28 14:38:28 +08:00 |
|
blp
|
0970e823de
|
fix: 修改登录页面 记住我
|
2023-01-28 14:38:05 +08:00 |
|
JiangQiming
|
45708850f4
|
feat: 通知模板,新增附件信息组件
|
2023-01-28 13:50:14 +08:00 |
|
JiangQiming
|
62adffa7e7
|
feat: 通知模板,新增附件信息组件
|
2023-01-28 11:44:08 +08:00 |
|
easy
|
7f321213a8
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-18 12:43:01 +08:00 |
|
easy
|
12121c1376
|
update: 角色管理
|
2023-01-18 12:42:10 +08:00 |
|
xiongqian
|
e6383367c8
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
# Conflicts:
# package-lock.json
# yarn.lock
|
2023-01-18 10:47:48 +08:00 |
|
xiongqian
|
9cbabbeab3
|
fix: 修改初始化页面菜单数据
|
2023-01-18 10:44:42 +08:00 |
|
jackhoo_98
|
a98f02d881
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-18 10:21:04 +08:00 |
|
jackhoo_98
|
6e34f8c018
|
feat: 设备接入网关 通道类设备接入 modbus、opcua
|
2023-01-18 10:20:43 +08:00 |
|
easy
|
b13bdb30bb
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-17 18:17:40 +08:00 |
|
easy
|
9ae2c6981a
|
update: 角色管理
|
2023-01-17 18:17:21 +08:00 |
100011797
|
c2d571802e
|
fix: merge
|
2023-01-17 18:05:27 +08:00 |
|
100011797
|
5e5087602c
|
feat: 设备管理批量操作
|
2023-01-17 18:04:42 +08:00 |
|
jackhoo_98
|
693da4ec6d
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-17 18:03:36 +08:00 |
|
jackhoo_98
|
599a0378a1
|
feat: 设备接入网关 视频类设备接入 固定地址/GB28181
|
2023-01-17 18:03:01 +08:00 |
|
xieyonghong
|
bf28ffca3d
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-01-17 17:47:17 +08:00 |
|
xieyonghong
|
ca4984e5b2
|
update: 完善Search组件
|
2023-01-17 17:46:56 +08:00 |
|
JiangQiming
|
f59567b1ed
|
fix: valueitem组件附件上传地址改为公共地址
|
2023-01-17 17:45:02 +08:00 |
|
JiangQiming
|
e8d0eab231
|
feat: 配置新增附件上传组件
|
2023-01-17 17:43:07 +08:00 |
|
JiangQiming
|
063602078a
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-17 15:52:49 +08:00 |
|
JiangQiming
|
83a18d21c0
|
fix: 配置详情表单
|
2023-01-17 15:52:34 +08:00 |
|
xieyonghong
|
1013b6663b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-01-17 14:48:17 +08:00 |