Commit Graph

540 Commits

Author SHA1 Message Date
100011797 3e82cc7d5e feat: 新增空组件 2023-02-23 11:05:48 +08:00
leiqiaochu 8bb756e5e6 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-02-23 10:59:26 +08:00
leiqiaochu cd1e08c055 fix: 路由跳转方法 2023-02-23 10:58:50 +08:00
xieyonghong dd3013ee04 Merge remote-tracking branch 'origin/dev' into dev 2023-02-23 10:19:51 +08:00
xieyonghong a805bfe5f7 feat: 新增Ellipsis组件 2023-02-23 10:18:32 +08:00
JiangQiming 4961bb5bb2 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-02-23 10:07:36 +08:00
JiangQiming 9678a2512a style: 通知管理列表卡片图表宽高统一 2023-02-23 10:07:22 +08:00
xieyonghong f16320a99c Merge remote-tracking branch 'origin/dev' into dev 2023-02-23 09:47:36 +08:00
JiangQiming afdef48c20 update: 通知配置详情数据丢失解决 2023-02-23 09:46:30 +08:00
xieyonghong 7d9cd9c5c0 Merge remote-tracking branch 'origin/dev' into dev 2023-02-23 09:45:22 +08:00
xieyonghong 0592de1e81 update: 优化vuex中的权限数据 2023-02-23 09:42:31 +08:00
leiqiaochu d526158076 fix: 基础配置进入页面 2023-02-23 09:10:10 +08:00
wangshuaiswim c201ebdbf4 fix: 物模型属性组件开发 2023-02-22 20:48:10 +08:00
leiqiaochu 7bd5c034e5 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-02-22 20:42:35 +08:00
leiqiaochu 7cef68f828 feat: 告警中心告警配置 2023-02-22 20:41:54 +08:00
JiangQiming 0ad8294fd0 fix: 切换通知方式, 重置部分字段 2023-02-22 20:10:20 +08:00
JiangQiming ec85d0f5df Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-02-22 20:03:10 +08:00
JiangQiming 819fa1cae5 fix: 解决编辑回显数据错误问题 2023-02-22 20:02:56 +08:00
easy 618c46d7b6 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-02-22 20:02:18 +08:00
easy db7f20e19b update: api配置 2023-02-22 20:01:31 +08:00
JiangQiming c73c43e288 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-02-22 19:40:07 +08:00
JiangQiming 310cf92c57 update: 通知模板未选配置不查收信部门和收信人 2023-02-22 19:38:58 +08:00
jackhoo_98 67a2a42ae2 fix: 修复Icon组件iconKeys值问题 2023-02-22 19:36:53 +08:00
胡彪 fedddfe3d0
Merge pull request #51 from jetlinks/dev-hub
feat: 远程升级 列表/新增/编辑
2023-02-22 19:29:32 +08:00
jackhoo_98 de0159ab2e fix: 合并冲突 2023-02-22 19:21:47 +08:00
jackhoo_98 906bc836ca feat: 远程升级 列表/新增/编辑 2023-02-22 19:14:15 +08:00
100011797 474bc29aab feat: 设备详情modbus和opcua 2023-02-22 18:09:48 +08:00
JiangQiming ea98e6c788 update: 类型改变清空字段 2023-02-22 17:55:08 +08:00
JiangQiming 5cd3065b39 update: 新增默认值 2023-02-22 17:29:12 +08:00
JiangQiming dccebe617e Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-02-22 17:23:31 +08:00
JiangQiming 611fa0ea18 update: 类型改变重置字段 2023-02-22 17:22:42 +08:00
xieyonghong 737a06e988 Merge remote-tracking branch 'origin/dev' into dev 2023-02-22 17:01:45 +08:00
xieyonghong b9d91170a8 update: 优化查询组件重置功能 2023-02-22 17:01:04 +08:00
JiangQiming 50af3f1ad8 update: 路由跳转改为menuStory方式 2023-02-22 16:50:45 +08:00
xieyonghong c48ea97962 update: 优化查询组件性能问题 2023-02-22 16:44:34 +08:00
JiangQiming 9fd6044e56 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-02-22 16:35:38 +08:00
JiangQiming 5c1506a4c4 update: 通知模板优化 2023-02-22 16:35:23 +08:00
xieyonghong 754fe63fc1 update: 优化北向输出跳转 2023-02-22 16:07:24 +08:00
xieyonghong 1460ebcdbb update: 优化菜单路由处理 2023-02-22 15:51:13 +08:00
xieyonghong 9d8b31713c update: 重命名Northbound 2023-02-22 14:15:00 +08:00
xieyonghong 643067656d Merge remote-tracking branch 'origin/dev' into dev 2023-02-22 13:38:52 +08:00
xieyonghong e313b36471 update: 优化路由处理 2023-02-22 13:36:51 +08:00
JiangQiming 8ac4fc8178 update: 通知管理交互优化 2023-02-22 11:03:45 +08:00
JiangQiming 9a3a752ac0 update: 通知模板详情接口调用逻辑更改 2023-02-22 10:30:17 +08:00
JiangQiming 3bb6a8f519 fix: 解决表单回显必填验证无法通过的问题 2023-02-22 10:20:08 +08:00
JiangQiming 383b4a897e update: 页面新增page-container组件包裹 2023-02-22 09:50:54 +08:00
xieyonghong 58bbb1ac36 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	yarn.lock
2023-02-22 09:11:05 +08:00
xieyonghong 1851833bc4 update: 优化动态路由 2023-02-22 09:08:20 +08:00
JiangQiming ba17669e95 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-02-21 20:06:29 +08:00
JiangQiming 7a220d2c1e fix: 通知管理优化 2023-02-21 20:06:13 +08:00