JiangQiming
|
0189595c99
|
fix: 通知配置, 卡片按钮插槽
|
2023-01-31 10:40:28 +08:00 |
xiongqian
|
d93ab65a4a
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-31 09:52:21 +08:00 |
|
xiongqian
|
809515e73e
|
feat: 增加产品新增弹窗
|
2023-01-31 09:52:00 +08:00 |
jackhoo_98
|
df2f497605
|
fix: merge branch dev-hub into dev
|
2023-01-31 09:38:42 +08:00 |
wangshuaiswim
|
cc07ccb19d
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
# Conflicts:
# src/router/menu.ts
|
2023-01-30 18:41:48 +08:00 |
|
wangshuaiswim
|
b9d6ca5854
|
fix: 增加设备详情页
|
2023-01-30 18:40:08 +08:00 |
|
wangshuaiswim
|
42d18f687b
|
fix: 修改上传物模型组件
|
2023-01-30 18:39:12 +08:00 |
|
jackhoo_98
|
282c93ecdd
|
feat: 设备接入网关 卡片列表基本样式
|
2023-01-30 18:18:18 +08:00 |
100011797
|
f5f0d2cb23
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-30 18:14:08 +08:00 |
|
100011797
|
24514e2b7a
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-30 18:13:29 +08:00 |
blp
|
21efdef721
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-30 18:13:08 +08:00 |
|
100011797
|
a8ef765702
|
fix: 合并冲突
|
2023-01-30 18:12:57 +08:00 |
|
blp
|
ac62778a2f
|
feat: 增加物联卡列表卡片、导出、导入、绑定设备
|
2023-01-30 18:12:42 +08:00 |
easy
|
ed03ceea5c
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-30 18:11:25 +08:00 |
|
100011797
|
56ca9f1dcf
|
feat: 新增设备和设备基础信息
|
2023-01-30 18:11:11 +08:00 |
|
easy
|
0c9de15e9a
|
update: 菜单管理
|
2023-01-30 18:11:05 +08:00 |
|
wangshuaiswim
|
a3451187a4
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-30 18:08:53 +08:00 |
|
wangshuaiswim
|
9a483a678d
|
fix: 修改scss为less，修复权限组件
|
2023-01-30 18:06:47 +08:00 |
xieyonghong
|
8d2b41c8f5
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-01-30 17:35:39 +08:00 |
|
JiangQiming
|
c9c8583712
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-30 17:30:26 +08:00 |
|
xieyonghong
|
2533a1dff7
|
update: 1.优化动态路由；2. PageContainer放开title插槽
|
2023-01-30 17:30:12 +08:00 |
|
JiangQiming
|
9a82577e9c
|
feat: 绑定用户接口
|
2023-01-30 17:30:12 +08:00 |
|
xiongqian
|
0a8aab6c8e
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
# Conflicts:
# src/api/device/product.ts
|
2023-01-30 17:22:39 +08:00 |
|
xiongqian
|
9da8599575
|
feat: 添加产品列表模块
|
2023-01-30 17:19:41 +08:00 |
|
easy
|
fda769acc6
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-30 17:11:49 +08:00 |
|
JiangQiming
|
c1adddbb3b
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-30 17:08:46 +08:00 |
|
JiangQiming
|
05e1281728
|
feat: 同步用户接口
|
2023-01-30 17:06:50 +08:00 |
|
easy
|
4a6b4c6003
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-30 17:06:47 +08:00 |
|
xieyonghong
|
96787070ea
|
update: 删除未使用参数
|
2023-01-30 17:06:15 +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 |
|
wangshuaiswim
|
6abc69e1d8
|
fix: 修复权限按钮组件
|
2023-01-30 15:04:46 +08:00 |
|
jackhoo_98
|
e96a43ad8b
|
Merge branch 'dev' into dev-hub
|
2023-01-30 14:51:21 +08:00 |
|
jackhoo_98
|
9d4ed41193
|
feat: 证书管理 列表
|
2023-01-30 14:49:55 +08:00 |
|
JiangQiming
|
9f0e384be6
|
feat: 通知模板记录
|
2023-01-30 10:55:15 +08:00 |
|
JiangQiming
|
6898913d45
|
feat: 通知模板调试接口
|
2023-01-30 10:47:02 +08:00 |
|
JiangQiming
|
b667574d78
|
fix: 去除card
|
2023-01-30 09:54:18 +08:00 |
|
100011797
|
2b6048707b
|
fix: 合并代码
|
2023-01-30 09:35:56 +08:00 |
|
100011797
|
c5bc7e7f6a
|
fix: 新增设备
|
2023-01-30 09:34:04 +08:00 |
|
JiangQiming
|
817226e1d5
|
feat: 通知模板页面
|
2023-01-29 18:44:12 +08:00 |
|
JiangQiming
|
cf4314d29c
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-29 18:41:10 +08:00 |
|
JiangQiming
|
0f773c9aa6
|
feat: 导入导出接口联调
|
2023-01-29 18:40:56 +08:00 |
|
wangshuaiswim
|
f66ee9bdf8
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-29 18:33:02 +08:00 |
|
wangshuaiswim
|
f5f56a1257
|
fix: 物模型组件开发
|
2023-01-29 18:32:41 +08:00 |
|
easy
|
68e3ae3a5c
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-29 18:25:13 +08:00 |
|
easy
|
8bdc444957
|
update: 权限管理添加权限
|
2023-01-29 18:24:44 +08:00 |
|
JiangQiming
|
95c01fc7eb
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-29 18:14:11 +08:00 |
|
JiangQiming
|
7a560e8746
|
feat: 通知配置,通知记录页面+接口联调
|
2023-01-29 18:13:56 +08:00 |
|
blp
|
96963c5c81
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
# Conflicts:
# src/components/AIcon/index.tsx
|
2023-01-29 18:07:19 +08:00 |
|
blp
|
8c66f9a319
|
feat: 新增物联卡管理列表
|
2023-01-29 18:05:25 +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 |
|
easy
|
4badeb8d2a
|
update: 首页优化及完善权限
|
2023-01-29 16:08:40 +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 |
|
easy
|
dc6ad3b081
|
update: 权限管理
|
2023-01-29 13:58:18 +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 |