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 |
|
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 |
|
xieyonghong
|
d1b28b2333
|
update: 添加Search特殊处理like的值
|
2023-01-17 14:46:38 +08:00 |
|
100011797
|
5779115050
|
feat: FILE_UPLOAD
|
2023-01-17 14:32:47 +08:00 |
|
xieyonghong
|
69142425df
|
feat: 添加Search使用文档
|
2023-01-17 14:08:05 +08:00 |
|
xieyonghong
|
c9d40164ab
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-01-17 13:34:39 +08:00 |
|
JiangQiming
|
a05f3b8f56
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-17 11:47:59 +08:00 |
|
JiangQiming
|
5d5bdb4f52
|
fix: 解决表单字段验证始终不通过问题
|
2023-01-17 11:47:46 +08:00 |
|
xieyonghong
|
6934a59e56
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-01-17 11:44:41 +08:00 |
|
xieyonghong
|
f3120719c5
|
update: 优化Search组件查询以及重置
|
2023-01-17 11:41:58 +08:00 |
|
easy
|
890d2b091b
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-17 11:39:10 +08:00 |
|
easy
|
66e88145c7
|
feat: 角色管理
|
2023-01-17 11:38:16 +08:00 |
|
100011797
|
eb7eaef064
|
fix: 刷新表格
|
2023-01-17 11:34:38 +08:00 |
|
jackhoo_98
|
9e3857302b
|
Merge branch 'dev-hub' into dev
|
2023-01-16 18:24:30 +08:00 |
|
jackhoo_98
|
4281bd2a15
|
fix: 设备接入网关 GB/T 28181第一步基本表单样式
|
2023-01-16 18:23:56 +08:00 |
|
easy
|
bc9fa060f5
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-16 18:15:24 +08:00 |
|
easy
|
e36529d7bd
|
update: 系统管理-基础配置
|
2023-01-16 18:14:45 +08:00 |
|
JiangQiming
|
be826f4d1c
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-16 18:01:00 +08:00 |
|
JiangQiming
|
cd146583a1
|
feat: 通知模板页面
|
2023-01-16 18:00:45 +08:00 |
|
100011797
|
c583a61732
|
fix: merge
|
2023-01-16 15:25:34 +08:00 |
|
100011797
|
e3ddbbd3c4
|
fix: 更新AIcon
|
2023-01-16 15:19:41 +08:00 |
|
xieyonghong
|
b54d1082ca
|
feat: 添加filterTreeSelectNode、filterSelectNode函数
|
2023-01-16 15:13:43 +08:00 |
|
JiangQiming
|
ad54e34a93
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-16 15:10:10 +08:00 |
|
JiangQiming
|
7b7ced3534
|
feat: 通知配置新增说明文档
|
2023-01-16 15:09:55 +08:00 |
|
xieyonghong
|
7c349ee6a8
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-01-16 11:06:07 +08:00 |
|
xieyonghong
|
1e39595360
|
update: 优化Search组件options处理
|
2023-01-16 11:05:17 +08:00 |
|
jackhoo_98
|
79524793af
|
Merge branch 'dev-hub' into dev
|
2023-01-16 09:55:36 +08:00 |
|
jackhoo_98
|
295a283856
|
fix: 设备接入网关 视频设备表单
|
2023-01-16 09:53:54 +08:00 |
|
easy
|
6d01346d51
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-13 14:35:57 +08:00 |
|
easy
|
8dd5f2f22a
|
update: 首页
|
2023-01-13 14:35:34 +08:00 |
|
xieyonghong
|
9332e59f51
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# yarn.lock
|
2023-01-13 14:30:14 +08:00 |
|
xieyonghong
|
2a2a8121c3
|
update: 优化Search组件
|
2023-01-13 14:29:16 +08:00 |
|
JiangQiming
|
30c1a1813d
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-13 14:28:25 +08:00 |
|
JiangQiming
|
466dbae465
|
feat: 新增通知配置钉钉文档
|
2023-01-13 14:28:12 +08:00 |
|
100011797
|
a44b57232f
|
fix: 修改tree
|
2023-01-13 14:24:52 +08:00 |
|
blp
|
6d18f10d2a
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-13 14:02:54 +08:00 |
|
blp
|
2e26ee726d
|
fix: 修改登录页
|
2023-01-13 14:02:23 +08:00 |
wangshuaiswim
|
b02d2704f3
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-13 13:56:22 +08:00 |
|
wangshuaiswim
|
55336d6aa9
|
feat: 新增物模型组件开发
|
2023-01-13 13:56:00 +08:00 |
|
JiangQiming
|
fd46e8088b
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-13 13:51:31 +08:00 |
|
JiangQiming
|
bafa5ef62b
|
fix: webhook编辑表格优化
|
2023-01-13 13:51:15 +08:00 |
|
100011797
|
91eeb2dadd
|
fix: 修改table卡片插槽样式
|
2023-01-13 13:47:28 +08:00 |
|
jackhoo_98
|
91d1d10da5
|
fix: 设备接入网关 自定义设备接入第三步
|
2023-01-13 13:37:23 +08:00 |
|
wangshuaiswim
|
7b53119ad9
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-13 11:55:02 +08:00 |
|
wangshuaiswim
|
badecf9f64
|
feat: 增加menuStore
|
2023-01-13 11:54:44 +08:00 |
|
JiangQiming
|
83c75f1ae6
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-13 11:49:39 +08:00 |
|
JiangQiming
|
5323a10c82
|
fix: 通知配置新增修改接口联调
|
2023-01-13 11:49:09 +08:00 |
|
wangshuaiswim
|
e01ab75de9
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-13 11:03:32 +08:00 |
|
wangshuaiswim
|
8bd8ad3a39
|
feat: 新增设备和产品接口，新增productStore，新增utils.ts
|
2023-01-13 11:03:13 +08:00 |
|
jackhoo_98
|
44d6d77b8e
|
fix: 证书管理 文件上传地址常量更改
|
2023-01-13 10:35:55 +08:00 |
|
jackhoo_98
|
7c62c8903d
|
Merge remote-tracking branch 'origin/dev' into dev-hub
|
2023-01-13 09:54:22 +08:00 |
|
jackhoo_98
|
f225993626
|
fix: 设备接入网关 json转Markdown
|
2023-01-13 09:52:56 +08:00 |
|
wangshuaiswim
|
3ed04a35ff
|
fix: 修改VERSION_CODE
|
2023-01-13 09:49:43 +08:00 |
|
wangshuaiswim
|
5a47580ab7
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-13 09:46:31 +08:00 |
|
wangshuaiswim
|
0a2056bc0a
|
fix: 修改SystemConst定义
|
2023-01-13 09:46:05 +08:00 |
|
xiongqian
|
5f6aa6ce65
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-12 19:17:35 +08:00 |
|
xiongqian
|
2094994890
|
feat: 初始化页面添加接口调试和图片上传
|
2023-01-12 19:17:14 +08:00 |
|
blp
|
f6fd6b38ef
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-12 18:31:40 +08:00 |
|
blp
|
c217d51ab6
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
# Conflicts:
# src/router/menu.ts
|
2023-01-12 18:31:15 +08:00 |
|
easy
|
18c6c95ccf
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-12 18:30:25 +08:00 |
|
easy
|
a9f57ac414
|
update: 首页样式调整
|
2023-01-12 18:30:07 +08:00 |
|
blp
|
b971bda7ac
|
feat: 添加物联卡首页
|
2023-01-12 18:28:43 +08:00 |
|
100011797
|
20061fb499
|
fix: table actions
|
2023-01-12 18:23:53 +08:00 |
|
jackhoo_98
|
cc8e9aa77b
|
Merge remote-tracking branch 'origin/dev' into dev-hub
|
2023-01-12 18:13:11 +08:00 |
|
jackhoo_98
|
ab8636c7fd
|
feat: 设备接入网关 自定义设备接入 二三步部分功能
|
2023-01-12 18:12:52 +08:00 |
|
JiangQiming
|
0154ca8a32
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-12 18:02:07 +08:00 |
|
JiangQiming
|
7ee453b706
|
feat: webhook请求头字段表格
|
2023-01-12 18:00:04 +08:00 |
|
wangshuaiswim
|
bcdf8b7882
|
fix: 新增设备和产品接口
|
2023-01-12 17:56:51 +08:00 |
|
wangshuaiswim
|
a1e00a3734
|
add: 增加设备和产品typing
|
2023-01-12 17:56:19 +08:00 |
|
wangshuaiswim
|
9658a11666
|
add: 增加instanceStore
|
2023-01-12 17:55:48 +08:00 |
|
easy
|
085a2d711a
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-12 17:39:45 +08:00 |
|
easy
|
6728105539
|
update: api配置
|
2023-01-12 17:39:02 +08:00 |
|
JiangQiming
|
a91b4b6b99
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-12 16:50:37 +08:00 |
|
JiangQiming
|
c05cf5d961
|
feat: 通知配置详情表单
|
2023-01-12 16:48:39 +08:00 |
|
100011797
|
ea151386b9
|
fix: merge
|
2023-01-12 15:32:14 +08:00 |
|
100011797
|
7451dad544
|
fix: vue转tsx
|
2023-01-12 15:31:20 +08:00 |
|
blp
|
b69a1721bf
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-12 14:42:11 +08:00 |
|
blp
|
2ef9df6c04
|
fix: 登录页样式修改
|
2023-01-12 14:41:49 +08:00 |
|
xieyonghong
|
bd7ef2131b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-01-12 11:46:44 +08:00 |
|
xieyonghong
|
34459132cf
|
update: 添加axios response泛型处理
|
2023-01-12 11:45:59 +08:00 |
|
wangshuaiswim
|
48ca21ab3d
|
fix: 修改设备api目录，增加产品api
|
2023-01-12 11:34:24 +08:00 |
|
xieyonghong
|
3135213a05
|
fix: 修复commit信息无法校验
|
2023-01-12 09:54:56 +08:00 |
|
xieyonghong
|
0890350cf2
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-01-12 09:34:31 +08:00 |
|
xiongqian
|
b0983a1988
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
# Conflicts:
# components.d.ts
|
2023-01-11 18:41:06 +08:00 |
|
xiongqian
|
5304559608
|
feat: 添加初始化页面接口数据
|
2023-01-11 18:38:33 +08:00 |
|
xieyonghong
|
ec79fa0669
|
feat: 新增Search组件
|
2023-01-11 18:26:30 +08:00 |
|
100011797
|
7f61e53b75
|
fix: merge
|
2023-01-11 18:24:29 +08:00 |
|
100011797
|
2d49f87cea
|
feat: 表格选择
|
2023-01-11 18:24:07 +08:00 |
|
jackhoo_98
|
011f289262
|
Merge branch 'dev-hub' into dev
|
2023-01-11 18:13:39 +08:00 |
|
jackhoo_98
|
8ac810bfb5
|
feat: 设备接入网关 接入第一步部分功能
|
2023-01-11 18:12:41 +08:00 |
|
easy
|
fed499e18c
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-11 18:12:21 +08:00 |
|
easy
|
ffc55b91e0
|
update: api配置
|
2023-01-11 18:11:56 +08:00 |
|
JiangQiming
|
0f7cc7d9ec
|
fix: 单点登录接口联调
|
2023-01-11 18:07:10 +08:00 |
|
JiangQiming
|
d2a82edbe4
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-11 16:39:30 +08:00 |
|
JiangQiming
|
f687ca0fad
|
fix: 单点登录接口
|
2023-01-11 16:38:57 +08:00 |
|
xieyonghong
|
3cfee37765
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# components.d.ts
|
2023-01-11 16:12:01 +08:00 |
|
xieyonghong
|
e2e12cd5c5
|
update: 优化FormBuilder组件的验证
|
2023-01-11 16:10:58 +08:00 |
|
xieyonghong
|
bf493c3a96
|
feat: 完善FormBuilder组件
|
2023-01-11 16:06:06 +08:00 |
|
easy
|
26617fc559
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-11 14:42:21 +08:00 |
|
easy
|
2436e8fa0d
|
update: api配置界面
|
2023-01-11 14:41:16 +08:00 |