Commit Graph

1079 Commits

Author SHA1 Message Date
leiqiaochu 27cd241bee fix: 产品仪表盘和上传bug 2023-03-15 17:09:38 +08:00
jackhoo_98 8051989d2c fix: 运维管理 协议管理修复部分bug 2023-03-15 17:03:47 +08:00
xieyonghong 2cd4d7ddb1 feat: 场景联动新增过滤条件组件 2023-03-15 16:33:01 +08:00
xieyonghong a28f46e01c update: 更新场景联动ParamsDropdown中的属性 2023-03-15 16:33:00 +08:00
xieyonghong 2f964837b9 update: 场景联动集成执行动作 2023-03-15 16:33:00 +08:00
jackhoo_98 87824d39bd fix: 运维管理 网络组件及详情修复部分bug 2023-03-15 16:16:02 +08:00
leiqiaochu c830357640 fix: 规则编排自测与组件替换 2023-03-15 15:51:55 +08:00
JiangQiming 2aeaae3a50 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-15 15:46:03 +08:00
JiangQiming 599311631d update: 初始值改为undefined, 解决placeholder无效的问题 2023-03-15 15:45:47 +08:00
easy ce02e2de1b Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-15 15:05:51 +08:00
easy f13ebbc16c update: 应用管理权限完善 2023-03-15 15:05:36 +08:00
JiangQiming 471b12a2fa Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-15 14:55:51 +08:00
JiangQiming 71187fcf85 update: 通知记录弹窗分页尺码大小优化 2023-03-15 14:55:30 +08:00
leiqiaochu 4a4123b2e7 fix: 子设备修改和新增绑定自测 2023-03-15 14:36:14 +08:00
easy 8a811aad25 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-15 14:27:05 +08:00
easy c0f9b249e9 update: uhasPermission属性更正 2023-03-15 14:26:49 +08:00
jackhoo_98 0879a35eeb fix: 运维管理 仪表盘修复部分bug 2023-03-15 13:54:00 +08:00
JiangQiming f4a0cc77b6 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-15 11:41:46 +08:00
JiangQiming 03436802b9 fix: bug#10232 2023-03-15 11:40:23 +08:00
100011797 2b18323745 fix: 场景联动-通知配置-options处理 2023-03-15 11:39:00 +08:00
jackhoo_98 30b97ca3cb fix: 数据采集 通道管理代码优化 2023-03-15 11:29:57 +08:00
xieyonghong d7f3ba6317 update: 场景联动条件优化 2023-03-15 10:20:43 +08:00
easy 0011e85de9 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-15 09:52:22 +08:00
easy 8576a18ec5 update: <a-upload>组件替换 2023-03-15 09:52:02 +08:00
JiangQiming 81590a0af3 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-15 09:50:28 +08:00
JiangQiming cdd755a369 update: upload组件替换 2023-03-15 09:50:10 +08:00
胡彪 eb75286c90
Merge pull request #60 from jetlinks/dev-hub
fix: 数据采集 更换组件,修复部分bug
2023-03-15 09:41:28 +08:00
jackhoo_98 9736d6e954 Merge branch 'dev' into dev-hub 2023-03-15 09:40:10 +08:00
jackhoo_98 dcf6aef0e6 fix: 数据采集 更换组件,修复部分bug 2023-03-15 09:38:32 +08:00
leiqiaochu fa5e34a77e fix: 组件替换 2023-03-14 17:51:51 +08:00
leiqiaochu ea5761846e fix: 组件替换 2023-03-14 17:48:24 +08:00
easy 9dff4d7a95 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-14 17:34:48 +08:00
JiangQiming 1cfb9edc35 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-14 17:31:44 +08:00
JiangQiming 670ea4de15 update: 通知配置-同步 用户前端分页 2023-03-14 17:31:30 +08:00
leiqiaochu 2559138a4a Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-14 17:28:18 +08:00
leiqiaochu 02cb643d8c feat: 新增子设备绑定 2023-03-14 17:25:56 +08:00
easy 8b86084d82 update: 图标组件替换 2023-03-14 17:13:09 +08:00
xieyonghong 67739f0714 update: proSearch添加class 2023-03-14 17:06:29 +08:00
xieyonghong ce9ce6ff4a update: 修改Upload文件名;优化CardBox样式 2023-03-14 17:06:29 +08:00
easy 5352ef782a fix: 组件更换、首页跳转完善 2023-03-14 16:56:20 +08:00
easy 73bb4bbc5f Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-14 16:04:42 +08:00
easy 557c41afb6 fix: api配置、应用管理 2023-03-14 16:04:23 +08:00
JiangQiming cfab80094e update: 组件更换测试 2023-03-14 16:01:55 +08:00
JiangQiming bd688acb11 update: 组件更换测试 2023-03-14 15:48:31 +08:00
JiangQiming 05c83c2d4c Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-14 14:54:35 +08:00
JiangQiming 4331a273c6 update: 组件更换测试 2023-03-14 14:54:19 +08:00
100011797 899d88b3eb fix: feat 2023-03-14 14:35:17 +08:00
JiangQiming 529d7cf927 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-14 14:33:03 +08:00
JiangQiming b66d48e626 update: 组件更换测试 2023-03-14 14:32:48 +08:00
100011797 d488752e20 fix: merge 2023-03-14 13:44:11 +08:00