Commit Graph

758 Commits

Author SHA1 Message Date
xieyonghong 020a917b13 Merge remote-tracking branch 'origin/dev' into dev 2023-03-01 10:30:05 +08:00
xieyonghong 9c0f506618 update: 更新样式引入 2023-03-01 10:26:27 +08:00
easy 1793218b6a Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-01 09:43:23 +08:00
easy 1bcdb93455 update: 应用管理、api配置、第三方用户首页over 2023-03-01 09:43:04 +08:00
wangshuaiswim 65e76e6225 fix: 修改PermissionButton响应式 2023-02-28 22:11:59 +08:00
xieyonghong 7e450b53db Merge remote-tracking branch 'origin/dev' into dev 2023-02-28 22:02:05 +08:00
xieyonghong 833359a40e feat: 添加jetlinks-ui-components 2023-02-28 22:01:24 +08:00
JiangQiming c8ff870a8a fix: 删除无用代码 2023-02-28 21:58:51 +08:00
JiangQiming f538867e65 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-02-28 21:54:46 +08:00
JiangQiming 2456da950d feat: 国标级联新增字段验证 2023-02-28 21:54:33 +08:00
leiqiaochu 459ad37e0d feat: 告警记录页面 2023-02-28 21:50:25 +08:00
leiqiaochu 962fa72fdb feat: 告警记录页面 2023-02-28 21:49:28 +08:00
100011797 1634d01c2a fix: 场景联动权限 2023-02-28 21:37:56 +08:00
100011797 7822393092 feat: 场景联动卡片 2023-02-28 21:32:47 +08:00
胡彪 fdb3323bcc
Merge pull request #54 from jetlinks/dev-hub
feat: 设备接入网关 接口调试 加入权限
2023-02-28 21:19:25 +08:00
jackhoo_98 67a5a78db5 Merge branch 'dev' into dev-hub 2023-02-28 21:17:00 +08:00
jackhoo_98 7143af3ff1 feat: 设备接入网关 接口调试 加入权限 2023-02-28 21:15:54 +08:00
JiangQiming 80ea19a6e2 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-02-28 21:13:25 +08:00
JiangQiming fbff5146bd feat: 国标级联新增/编辑 2023-02-28 21:13:10 +08:00
wangshuaiswim bee4050386 fix: 物模型TSL修改 2023-02-28 20:44:44 +08:00
wangshuaiswim 5a613e40e9 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-02-28 20:06:33 +08:00
wangshuaiswim 468bbd3eb3 fix: 修改物模型 2023-02-28 20:06:15 +08:00
JiangQiming e233e9f55f fix: 代码编辑器数据监听错误解决 2023-02-28 19:45:23 +08:00
JiangQiming abdfee115c Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-02-28 18:55:28 +08:00
JiangQiming d0b0cfa6ba feat: 国标级联列表/禁用/启用/删除 2023-02-28 18:55:13 +08:00
easy ff52e85331 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-02-28 18:07:25 +08:00
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