Commit Graph

782 Commits

Author SHA1 Message Date
easy 0ef7e80c5c update: api配置左侧树按模式对数据进行过滤 2023-02-28 18:06:57 +08:00
wangshuaiswim 7abe5adf2e fix: 物模型修改 2023-02-28 17:19:06 +08:00
easy 277b77f59e Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-02-28 15:49:27 +08:00
easy b827b54a71 update: 第三方应用首页 2023-02-28 15:49:07 +08:00
JiangQiming f6996b9679 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-02-28 15:47:53 +08:00
JiangQiming 5ee1eec52d feat: 国际级联 2023-02-28 15:47:40 +08:00
100011797 74fb1cc403 feat: 设备-日志管理 2023-02-28 15:25:38 +08:00
JiangQiming 715d269d90 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-02-28 15:01:29 +08:00
JiangQiming e0be36fe33 feat: 通道新增/编辑/删除 2023-02-28 15:01:16 +08:00
100011797 7dbf13888f feat: 地图轨迹 2023-02-28 14:25:38 +08:00
JiangQiming 32f3039153 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-02-28 13:41:22 +08:00
JiangQiming 18b0f25993 fix: bug#10231 2023-02-28 13:41:04 +08:00
leiqiaochu b92fe00806 feat: 告警记录 2023-02-28 11:16:04 +08:00
wangshuaiswim 46264b3696 fix: 物模型功能开发 2023-02-28 10:26:59 +08:00
wangshuaiswim 231950bdea Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-02-28 10:26:30 +08:00
xieyonghong 940bbfc11f Merge remote-tracking branch 'origin/dev' into dev 2023-02-28 08:49:03 +08:00
xieyonghong a0f9d8d44c feat: 新增场景联动-触发规则-功能 2023-02-28 08:47:53 +08:00
jackhoo_98 568afdb69e fix: 运维管理 仪表盘代码优化 2023-02-27 19:59:30 +08:00
wangshuaiswim 02153a63da fix: 物模型属性开发 2023-02-27 19:35:05 +08:00
wangshuaiswim 76dfb3a797 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-02-27 19:24:43 +08:00
wangshuaiswim 9189d8a212 fix: 物模型开发 2023-02-27 19:24:22 +08:00
JiangQiming 84278cd232 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-02-27 18:13:20 +08:00
JiangQiming 5c9ad767ad feat: 通道管理 2023-02-27 18:13:06 +08:00
jackhoo_98 401634be3e feat: 运维管理 仪表盘 2023-02-27 18:10:06 +08:00
easy 1330d3401c Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-02-27 17:50:15 +08:00
easy 72c72888df update: 应用管理添加集成菜单弹窗、cardbox组件添加遮罩层 2023-02-27 17:49:40 +08:00
xieyonghong ebacfa71da Merge remote-tracking branch 'origin/dev' into dev 2023-02-27 16:47:09 +08:00
xieyonghong e4a124a433 feat: 新增场景联动-触发规则-属性修改 2023-02-27 16:40:53 +08:00
JiangQiming 89e1271206 fix: bug#10229 2023-02-27 16:13:49 +08:00
JiangQiming 980dd7af3a Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-02-27 14:42:27 +08:00
JiangQiming c60410c1d4 feat: 通道列表 2023-02-27 14:40:49 +08:00
jackhoo_98 fd0c3f2eb8 fix: 远程升级新增 修复版本号重复校验 2023-02-27 11:45:41 +08:00
胡彪 79ac088b79
Merge pull request #53 from jetlinks/dev-hub
feat: 远程升级 升级任务详情
2023-02-27 10:54:43 +08:00
jackhoo_98 a77997d87f Merge branch 'dev' into dev-hub 2023-02-27 10:53:07 +08:00
easy c24be85601 update: 应用管理 2023-02-26 18:03:51 +08:00
jackhoo_98 c3b8d46e7c feat: 远程升级 升级任务详情 2023-02-25 21:44:23 +08:00
jackhoo_98 d226d8758f feat: 远程升级 升级任务详情 基本样式 2023-02-24 18:24:15 +08:00
xieyonghong bba6ef3c30 Merge remote-tracking branch 'origin/dev' into dev 2023-02-24 18:22:56 +08:00
xieyonghong be501e77fe feat: 新增场景联动-触发规则 2023-02-24 18:21:44 +08:00
100011797 25ee85681c fix: 运行状态详情查看 2023-02-24 18:07:41 +08:00
JiangQiming 15be308dc8 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-02-24 18:01:08 +08:00
JiangQiming 55a0a2adb5 feat: 视频设备通道 2023-02-24 18:00:53 +08:00
easy d97018475c Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-02-24 17:59:11 +08:00
easy 86ee86d119 update: 应用管理 2023-02-24 17:58:44 +08:00
JiangQiming 446f4b17d5 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-02-24 17:46:28 +08:00
JiangQiming 8b842883ec feat: 视频编辑优化 2023-02-24 17:46:14 +08:00
leiqiaochu 6a275ee983 feat: 告警中心告警配置40% 2023-02-24 17:23:36 +08:00
JiangQiming 1003130a4c fix: bug#10174 2023-02-24 17:19:00 +08:00
JiangQiming 164cec5aa5 fix: bug#10191 2023-02-24 17:06:13 +08:00
JiangQiming 0dcdac0ee6 fix: bug#10196 2023-02-24 16:50:45 +08:00