xieyonghong
|
ce4d63be55
|
fix: 优化oauth页面
|
2023-04-27 16:25:08 +08:00 |
|
xieyonghong
|
9b138b0e6c
|
fix: 删除多余代码
|
2023-04-27 15:45:17 +08:00 |
|
xieyonghong
|
f6659da1b8
|
fix: 修复插件管理新增id校验失败
|
2023-04-27 14:54:27 +08:00 |
|
xieyonghong
|
a2bebe1f36
|
fix: 修复插件设备映射后没有回显
|
2023-04-27 14:09:22 +08:00 |
|
xieyonghong
|
84e4b790d1
|
Merge branch '2.0-bugfix' into dev
|
2023-04-27 11:43:54 +08:00 |
|
xieyonghong
|
816cadbc3b
|
fix: 修复内部应用页面跳转后显示错误提示的问题
|
2023-04-27 11:42:38 +08:00 |
|
xieyonghong
|
a44edbb036
|
fix: 修复采集器查询失败问题
|
2023-04-27 11:22:41 +08:00 |
|
xieyonghong
|
5dcba5e4aa
|
fix: 优化插件映射传参
|
2023-04-27 10:43:35 +08:00 |
|
xieyonghong
|
c2ad03d526
|
Merge branch '2.0-bugfix' into dev
|
2023-04-26 18:08:48 +08:00 |
|
xieyonghong
|
ca4c364155
|
fix: bug#12338
|
2023-04-26 18:05:23 +08:00 |
|
xieyonghong
|
84fa6f877b
|
fix: bug#12350
|
2023-04-26 16:38:39 +08:00 |
|
xieyonghong
|
0a661d4a64
|
fix: bug#12362
|
2023-04-26 16:26:41 +08:00 |
|
xieyonghong
|
b193c56f64
|
fix: bug#12460
|
2023-04-26 14:31:28 +08:00 |
|
xieyonghong
|
122c7ae928
|
fix: bug#12637、12632
|
2023-04-26 14:30:09 +08:00 |
|
xieyonghong
|
5f8bc64b1e
|
fix: 修复右上角通知文件notification兼容处理
|
2023-04-26 10:25:49 +08:00 |
|
xieyonghong
|
c99d2795bc
|
fix: bug#12637
|
2023-04-26 10:00:27 +08:00 |
|
xieyonghong
|
a01d4d278a
|
Merge branch '2.0-bugfix' into dev
# Conflicts:
# src/views/notice/Template/Detail/index.vue
|
2023-04-25 18:28:13 +08:00 |
|
xieyonghong
|
730a42567f
|
fix: bug#12051
|
2023-04-25 18:21:26 +08:00 |
|
xieyonghong
|
f65f9e645f
|
fix: 修复通知管理-钉钉调试失败
|
2023-04-25 17:45:56 +08:00 |
|
xieyonghong
|
f83287ce12
|
fix: bug#12492
|
2023-04-25 15:36:35 +08:00 |
|
xieyonghong
|
229bec30ed
|
fix: 优化场景联动-消息通知-内置参数
|
2023-04-25 15:32:52 +08:00 |
|
xieyonghong
|
1568102bbe
|
style: 优化设备接入详情页步骤按钮
|
2023-04-24 18:08:15 +08:00 |
|
xieyonghong
|
5f7e1a88d3
|
fix: bug#10975
|
2023-04-24 18:00:11 +08:00 |
|
xieyonghong
|
0a3070f3df
|
fix: bug#12135
|
2023-04-24 17:52:56 +08:00 |
|
xieyonghong
|
8d817c5365
|
fix: bug#12122
|
2023-04-24 17:39:17 +08:00 |
|
xieyonghong
|
5ac7ff4906
|
fix: bug#10944
|
2023-04-24 13:59:51 +08:00 |
|
xieyonghong
|
50ba72b1c5
|
fix: bug#12017
|
2023-04-24 13:39:36 +08:00 |
|
xieyonghong
|
1e42dd9475
|
fix: bug#12084
|
2023-04-24 11:39:39 +08:00 |
|
xieyonghong
|
faf9a518e9
|
fix: bug#19092
|
2023-04-24 11:29:06 +08:00 |
|
xieyonghong
|
0154fb7d7c
|
fix: 修复场景联动数据格式错误问题
|
2023-04-24 11:05:26 +08:00 |
|
xieyonghong
|
a42c108b08
|
style: 替换新图片；优化物模型提示语颜色；更新组件库1.0.9
|
2023-04-24 10:13:37 +08:00 |
|
xieyonghong
|
609514ed61
|
style: 优化卡片颜色
|
2023-04-23 15:30:30 +08:00 |
|
xieyonghong
|
0206235e8f
|
style: 优化告警中心-仪表盘图片
|
2023-04-23 15:06:47 +08:00 |
|
xieyonghong
|
29ffa38c10
|
style: 优化视频中心-首页图片
|
2023-04-23 14:54:09 +08:00 |
|
xieyonghong
|
d61207076f
|
style: 优化视频中心-仪表盘图片
|
2023-04-23 14:50:49 +08:00 |
|
xieyonghong
|
d552ddf3f6
|
style: 优化告警仪表盘-最新告警-告警级别宽度
|
2023-04-23 14:34:14 +08:00 |
|
xieyonghong
|
8e7864219f
|
fix: bug#11107
|
2023-04-23 14:27:54 +08:00 |
|
xieyonghong
|
3039b1e42d
|
feat: 优化插件编辑上传回显文件名
|
2023-04-23 13:56:02 +08:00 |
|
xieyonghong
|
a1982f1538
|
feat: 优化产品物模型映射搜索和排序
|
2023-04-23 10:31:17 +08:00 |
|
xieyonghong
|
5772c050f8
|
feat: 完善插件管理
|
2023-04-21 18:49:42 +08:00 |
|
XieYongHong
|
1e37450614
|
fix: 修复登录成功之后在某些情况下无法进入初始化页面
|
2023-04-21 14:41:06 +08:00 |
|
xieyonghong
|
4b2b8c1728
|
fix: 修复登录成功之后查询登录用户信息
|
2023-04-21 14:20:25 +08:00 |
|
xieyonghong
|
0bb5991231
|
fix: 修复通知模板-钉钉机器人参数
|
2023-04-20 20:10:37 +08:00 |
|
xieyonghong
|
fdf8bf055d
|
fix: 修复大小写导致无法打包问题
|
2023-04-20 17:04:04 +08:00 |
|
xieyonghong
|
677f65ff8c
|
feat: 新增设备批量导出-映射设备
|
2023-04-19 17:25:07 +08:00 |
|
xieyonghong
|
875e7c00f7
|
fix: 修复告警中大小写引入问题
|
2023-04-19 17:10:14 +08:00 |
|
xieyonghong
|
144be56c10
|
style: 更新图片
|
2023-04-18 20:15:28 +08:00 |
|
xieyonghong
|
734b8cbff9
|
feat: 新增插件管理
|
2023-04-18 20:09:48 +08:00 |
|
xieyonghong
|
297637f856
|
style: 优化主题色
|
2023-04-18 13:48:07 +08:00 |
|
xieyonghong
|
126c33ad82
|
fix: 修复社区版bug
|
2023-04-17 19:01:13 +08:00 |
|
xieyonghong
|
159a2f8ca7
|
fix: 优化设备接入切换逻辑
|
2023-04-14 18:08:50 +08:00 |
|
xieyonghong
|
2bb44cd518
|
style: 优化图片
|
2023-04-14 09:55:29 +08:00 |
|
xieyonghong
|
d6523ea56b
|
fix: bug#11278
|
2023-04-13 17:26:13 +08:00 |
|
xieyonghong
|
f70b2c78ce
|
style: 样式调整
|
2023-04-13 16:42:27 +08:00 |
|
xieyonghong
|
3f1e9f4980
|
fix: bug#11883、11895
|
2023-04-13 13:46:34 +08:00 |
|
xieyonghong
|
d933bb7869
|
fix: 优化modbus新增点位地址校验规则
|
2023-04-12 17:39:12 +08:00 |
|
xieyonghong
|
d81ef15ec1
|
style: 优化物联卡自适应
|
2023-04-11 17:54:24 +08:00 |
|
xieyonghong
|
dfbf186c5e
|
style: 更换首页图片
|
2023-04-11 16:41:47 +08:00 |
|
xieyonghong
|
a3fd4b32b6
|
update: 删除冗余代码
|
2023-04-11 11:28:19 +08:00 |
|
xieyonghong
|
fb32cc9a38
|
fix: bug#11826
|
2023-04-11 11:27:11 +08:00 |
|
xieyonghong
|
2b996fadf3
|
style: 优化设备接入居中
|
2023-04-11 10:57:19 +08:00 |
|
xieyonghong
|
8480df4f4d
|
style: 优化设备接入网关编辑样式
|
2023-04-10 18:19:04 +08:00 |
|
xieyonghong
|
92c1b48887
|
style: 优化设备接入网关样式
|
2023-04-10 18:05:17 +08:00 |
|
xieyonghong
|
1b91cca362
|
fix: 修复通知模板无法保存
|
2023-04-10 17:50:18 +08:00 |
|
xieyonghong
|
6a1c917273
|
style: 优化运维管理仪表盘样式
|
2023-04-10 17:49:33 +08:00 |
|
xieyonghong
|
1d2670025e
|
fix: 优化设备管理仪表盘样式
|
2023-04-10 14:28:41 +08:00 |
|
xieyonghong
|
ceffa5eaf9
|
fix: 修改通知管理文案
|
2023-04-10 14:09:30 +08:00 |
|
xieyonghong
|
4da0a8feb6
|
style: 调整首页提示颜色
|
2023-04-10 13:58:25 +08:00 |
|
xieyonghong
|
bf48c292db
|
style: 调整首页自适应
|
2023-04-10 13:49:56 +08:00 |
|
xieyonghong
|
d4d6a2f166
|
style: 调整class命名
|
2023-04-10 11:25:53 +08:00 |
|
xieyonghong
|
664bb39858
|
fix: 优化登录文案
|
2023-04-10 11:24:07 +08:00 |
|
xieyonghong
|
9fc1a55def
|
fix: 优化场景联动
|
2023-04-10 09:42:47 +08:00 |
|
xieyonghong
|
f87bef89c3
|
feat: 新增oauth2 页面
|
2023-04-10 09:41:29 +08:00 |
|
xieyonghong
|
0a93fe096d
|
fix: bug#11262
|
2023-04-04 14:03:34 +08:00 |
|
xieyonghong
|
132aa4c920
|
fix: 优化应用管理默认密码校验规则
|
2023-04-03 20:58:40 +08:00 |
|
xieyonghong
|
ba3e5d0194
|
fix: 修复应用管理图标显示
|
2023-04-03 20:31:35 +08:00 |
|
xieyonghong
|
6c9524ab9f
|
fix: 修复单点登录正确获取用户信息
|
2023-04-03 19:46:16 +08:00 |
|
xieyonghong
|
0cbbd52a1e
|
fix: 修复单点登录跳转失败问题
|
2023-04-03 18:38:48 +08:00 |
|
xieyonghong
|
3c329fd8ad
|
update: 优化初始化页面部分代码逻辑
|
2023-04-03 18:13:31 +08:00 |
|
xieyonghong
|
af3159ef95
|
fix: bug#10936
|
2023-04-03 17:46:31 +08:00 |
|
xieyonghong
|
453973fe32
|
fix: 优化接口请求超时时间
|
2023-04-03 17:02:27 +08:00 |
|
xieyonghong
|
c430478319
|
fix: 优化场景联动-执行动作-选择产品；修复用户中心无法解绑
|
2023-04-03 17:00:55 +08:00 |
|
xieyonghong
|
dd163c5611
|
update: 更新为组件库组件
|
2023-04-03 17:00:54 +08:00 |
leiqiaochu
|
a42e6a8fb6
|
fix: bug#11373
|
2023-04-03 14:56:08 +08:00 |
|
xieyonghong
|
0ffe81d805
|
fix: 优化场景联动指标值选择参数处理
|
2023-04-03 10:13:56 +08:00 |
|
xieyonghong
|
6b8d56654c
|
fix: bug#11365
|
2023-04-03 10:11:22 +08:00 |
jackhoo_98
|
25f4ecdbab
|
feat: 菜单管理 菜单配置 修复菜单重复问题
|
2023-04-02 13:45:54 +08:00 |
|
jackhoo_98
|
bdc4f065ef
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-04-01 18:42:04 +08:00 |
|
jackhoo_98
|
94e93a53e5
|
feat: 修复菜单管理 菜单配置 菜单初始化问题
|
2023-04-01 18:41:52 +08:00 |
|
xieyonghong
|
a6d869e7f0
|
fix: bug#10954
|
2023-04-01 18:33:00 +08:00 |
|
xieyonghong
|
ede264c591
|
fix: 优化产品设备接入快速新增默认选中
|
2023-04-01 17:47:05 +08:00 |
|
xieyonghong
|
739490bcbe
|
fix: bug#11213
|
2023-04-01 17:28:32 +08:00 |
|
xieyonghong
|
9c909edafd
|
fix: bug#11328
|
2023-04-01 16:02:06 +08:00 |
wangshuaiswim
|
391ed48365
|
fix: 修改物模型导入后调用的刷新接口
|
2023-04-01 15:13:35 +08:00 |
|
xieyonghong
|
2649b6f755
|
fix: bug#10898
|
2023-04-01 15:10:32 +08:00 |
|
xieyonghong
|
e1dd627601
|
fix: bug#11369
|
2023-04-01 15:10:31 +08:00 |
|
xieyonghong
|
83b9cc8dfc
|
fix: bug#11218
|
2023-04-01 15:10:31 +08:00 |
|
xieyonghong
|
8d2c2133dd
|
fix: 修复场景联动布尔值回显异常
|
2023-04-01 15:10:31 +08:00 |
|
xieyonghong
|
df0b467656
|
fix: bug#10869
|
2023-04-01 15:10:31 +08:00 |
|
xieyonghong
|
9557586bb9
|
fix: 替换组件
|
2023-04-01 15:10:30 +08:00 |
|
jackhoo_98
|
968c68efba
|
feat: bug#11097 修复采集器批量操作失败问题
|
2023-04-01 14:37:17 +08:00 |
|
jackhoo_98
|
3d5f88cddb
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-04-01 14:03:16 +08:00 |
|
jackhoo_98
|
fde1b8b995
|
fix: 网络组件 修复编辑时端口问题
|
2023-04-01 14:02:58 +08:00 |
|
xieyonghong
|
077ad8abe8
|
fix: bug#11270
|
2023-04-01 10:15:42 +08:00 |
100011797
|
6a05668cb5
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-31 22:59:56 +08:00 |
|
100011797
|
2d0fc7117a
|
fix:修改数据源
|
2023-03-31 22:59:48 +08:00 |
JiangQiming
|
bc7d170666
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-31 21:46:18 +08:00 |
|
JiangQiming
|
9fa3747ded
|
fix: bug#11213
|
2023-03-31 21:46:02 +08:00 |
|
xieyonghong
|
200ff5fb61
|
fix: bug#11270
|
2023-03-31 21:24:59 +08:00 |
|
xieyonghong
|
df6bf4d9ee
|
fix: bug#11262
|
2023-03-31 21:24:59 +08:00 |
|
xieyonghong
|
f5a125df65
|
fix: bug#11328
|
2023-03-31 21:24:58 +08:00 |
|
xieyonghong
|
e9f255ca3c
|
fix: 新增个人中心
|
2023-03-31 21:24:58 +08:00 |
|
jackhoo_98
|
b01cc1bb17
|
fix: 设备接入网关删除提示语
|
2023-03-31 21:23:17 +08:00 |
|
jackhoo_98
|
990a2f73af
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-31 21:22:04 +08:00 |
|
jackhoo_98
|
6ae03a9fc9
|
fix: bug#11271
|
2023-03-31 21:21:35 +08:00 |
|
JiangQiming
|
ed2eb21d4b
|
fix: bug#11353
|
2023-03-31 20:32:02 +08:00 |
|
JiangQiming
|
2013ecbddd
|
fix: bug#11223
|
2023-03-31 19:54:53 +08:00 |
|
JiangQiming
|
19944afb8b
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-31 18:56:06 +08:00 |
|
JiangQiming
|
d58ec295a9
|
fix: bug#11269
|
2023-03-31 18:55:45 +08:00 |
|
leiqiaochu
|
1fae2c24f7
|
fix: bug管理员初始化取消
|
2023-03-31 18:05:16 +08:00 |
|
jackhoo_98
|
ae2758b5ba
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-31 18:03:18 +08:00 |
|
wangshuaiswim
|
767501ec11
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-31 17:57:18 +08:00 |
|
wangshuaiswim
|
09e56c4d0c
|
fix: 修复布尔类型值类型是布尔的情况下不能编辑
|
2023-03-31 17:56:51 +08:00 |
|
leiqiaochu
|
7f0625fbca
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-31 17:44:04 +08:00 |
|
100011797
|
f6f99efe2b
|
fix: 修改判断产品修改后数据变化的问题
|
2023-03-31 17:19:17 +08:00 |
|
jackhoo_98
|
bcf1f60ec3
|
fix: bug#11300、11289
|
2023-03-31 17:03:55 +08:00 |
|
JiangQiming
|
c178d22691
|
fix: bug#11251
|
2023-03-31 17:01:39 +08:00 |
|
JiangQiming
|
53971eca2c
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-31 16:18:14 +08:00 |
|
JiangQiming
|
492bc33c00
|
fix: bug#11316
|
2023-03-31 16:17:59 +08:00 |
|
leiqiaochu
|
d7198a7ad1
|
fix: bug菜单管理按钮样式
|
2023-03-31 16:16:18 +08:00 |
|
wangshuaiswim
|
e17ead51c3
|
fix: 删除多余代码
|
2023-03-31 16:07:47 +08:00 |
|
wangshuaiswim
|
a286a1e222
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-31 16:06:37 +08:00 |
|
wangshuaiswim
|
ad14ce0242
|
fix: 修复物模型导入问题
|
2023-03-31 16:06:15 +08:00 |
|
JiangQiming
|
25046ad8d0
|
fix: 登录页三方登录方式logo
|
2023-03-31 15:57:40 +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 |
|
JiangQiming
|
9a8a0d2410
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-31 15:08:20 +08:00 |
|
JiangQiming
|
348ef4570c
|
fix: 11216
|
2023-03-31 15:08:05 +08:00 |
|
jackhoo_98
|
11cf92b90e
|
fix: bug#11233、11276
|
2023-03-31 14:33:58 +08:00 |
|
jackhoo_98
|
63ec13e49b
|
fix: 视频设备新增 快速接入网关，修改浏览器tab关闭时的参数
|
2023-03-31 14:27:28 +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 |
|
xieyonghong
|
f5ef19817b
|
fix: bug#10943
|
2023-03-31 13:55:27 +08:00 |
|
xieyonghong
|
e56be3212a
|
fix: bug#11261、10943、10942
|
2023-03-31 13:55:27 +08:00 |
|
100011797
|
4b08712c61
|
fix: 修改应用管理的状态展示
|
2023-03-31 13:52:41 +08:00 |
|
jackhoo_98
|
008cd45ce7
|
fix: 采集器状态组件引入
|
2023-03-31 13:51:03 +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
|
7223ec88b9
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-31 11:51:44 +08:00 |