Commit Graph

1213 Commits

Author SHA1 Message Date
easy 137018753c Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-16 15:34:41 +08:00
easy 2f7a4f718b update: 首页代码优化 2023-03-16 15:34:24 +08:00
leiqiaochu 1a3c10b18d fix: bug#10455 10451 10448 2023-03-16 15:29:13 +08:00
JiangQiming 914e495f2e fix: bug#10387 2023-03-16 15:19:10 +08:00
JiangQiming e919fd6bef Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-16 11:50:25 +08:00
JiangQiming cf36e34e4f fix: bug#10389、10421 2023-03-16 11:50:12 +08:00
easy db3c66d3b7 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-16 11:19:55 +08:00
easy dee82d2115 update: api配置-调试 请求参数表格 2023-03-16 11:19:38 +08:00
100011797 60751783c2 fix: 边缘端映射组件替换 2023-03-16 11:00:04 +08:00
wzyyy 7d10dc3e6e Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-16 10:44:27 +08:00
wzyyy da47dcb028 fix: 数据解析代码优化 2023-03-16 10:43:53 +08:00
easy 6c4da9db2f update: 代码编辑器更换 2023-03-16 10:43:12 +08:00
JiangQiming 5604c8bd35 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-16 10:39:51 +08:00
JiangQiming 1b046f96d2 update: 编辑器替换 2023-03-16 10:39:38 +08:00
xieyonghong 2507618860 update: 优化过滤条件回显 2023-03-16 10:21:25 +08:00
JiangQiming e9d3546197 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-16 10:20:58 +08:00
JiangQiming 83a9f9f0cb fix: bug#10439 2023-03-16 10:20:45 +08:00
easy e70b8d7812 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-16 10:19:04 +08:00
easy c25562adfb fix: #10442、#10441 2023-03-16 10:18:45 +08:00
leiqiaochu 708f93dc28 fix: 产品仪表盘新增上传详情更改数据回显 2023-03-16 10:15:56 +08:00
胡彪 f76f76965d
Merge pull request #61 from jetlinks/dev-hub
fix: 运维管理、数据采集修复部分bug
2023-03-16 09:58:10 +08:00
jackhoo_98 62592b6e83 Merge branch 'dev' into dev-hub 2023-03-16 09:56:14 +08:00
jackhoo_98 7e83d5bdc2 fix: 运维管理 设备接入网关自测todo 2023-03-16 09:54:48 +08:00
JiangQiming 0200d1d419 update: 新增注释 2023-03-15 18:22:59 +08:00
JiangQiming 39c58b8e35 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-15 18:09:58 +08:00
JiangQiming 54493d025f fix: bug#10433、10428、10426 2023-03-15 18:09:44 +08:00
jackhoo_98 d8ca8ce212 fix: 运维管理 日志管理修复部分bug 2023-03-15 17:55:13 +08:00
easy 62a405b8cd Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-15 17:44:52 +08:00
JiangQiming f8906faa11 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-15 17:42:58 +08:00
JiangQiming 42df14d815 fix: bug#10406、10399、10390、10391、10410、10387、10392、10425、10415、10416、10417、10412、10409、10405 2023-03-15 17:42:42 +08:00
easy 46df7d35c5 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-15 17:41:45 +08:00
easy 174cf36d09 update: 用户管理 2023-03-15 17:41:22 +08:00
jackhoo_98 ea8620278a update: 采集器 点位新增 更新数据类型 2023-03-15 17:31:36 +08:00
leiqiaochu bebb4b8d45 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-15 17:10:31 +08:00
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