Commit Graph

712 Commits

Author SHA1 Message Date
JiangQiming 75e36877a0 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-02 15:59:04 +08:00
JiangQiming a7a2eb0dbf feat: 视频播放 2023-03-02 15:56:08 +08:00
xieyonghong 56d81a0bf8 Merge remote-tracking branch 'origin/dev' into dev 2023-03-02 14:33:48 +08:00
xieyonghong b3ea70db0f feat: 新增encodeParams工具 2023-03-02 14:33:28 +08:00
JiangQiming 2607f9aace Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-02 14:05:25 +08:00
JiangQiming deac9539c1 update: 表格组件新增表头插槽 2023-03-02 14:05:06 +08:00
xieyonghong 421788b2d6 Merge remote-tracking branch 'origin/dev' into dev 2023-03-02 14:03:21 +08:00
xieyonghong 2781017096 update: 添加force命令 2023-03-02 14:02:59 +08:00
leiqiaochu 849bfbdaad feat: 告警记录 2023-03-02 11:08:07 +08:00
leiqiaochu 569c430ca2 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-02 10:16:04 +08:00
leiqiaochu a298904a02 feat: 告警记录 2023-03-02 10:05:11 +08:00
JiangQiming 80e2b02364 update: 删除无用代码 2023-03-01 21:53:01 +08:00
JiangQiming dd35a8a14d Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-01 21:51:47 +08:00
JiangQiming d73f115319 update: 推送地址错误更改 2023-03-01 21:51:32 +08:00
wzyyy 42ecbbf0ea Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-01 21:35:15 +08:00
wzyyy f36e4b00ac fix: 物联卡权限及下载模板 2023-03-01 21:34:49 +08:00
JiangQiming eb54d5c001 update: 未选择通道禁止批量解绑 2023-03-01 21:23:48 +08:00
JiangQiming 08c0b1e9d0 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-01 21:19:43 +08:00
JiangQiming 3707b71c38 feat: 国标级联推送 2023-03-01 21:19:16 +08:00
leiqiaochu 67bb94ed7c feat: 告警记录 2023-03-01 21:01:09 +08:00
leiqiaochu 5c3e344348 feat: 告警记录 2023-03-01 20:59:58 +08:00
JiangQiming 8d2558b721 fix: 修复代码编辑器光标问题 2023-03-01 20:31:22 +08:00
JiangQiming 5a2e42ec8f Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-01 20:29:12 +08:00
JiangQiming 2d8c99b28c fix: 修复代码编辑器光标问题 2023-03-01 20:28:54 +08:00
easy e787cc0e86 update: 个人中心-基本设置 2023-03-01 19:14:48 +08:00
wangshuaiswim 9aeb5faa90 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-01 18:43:21 +08:00
wangshuaiswim c07199ca2b fix: 解决物模型TODO 2023-03-01 18:43:02 +08:00
JiangQiming 4263052d4a Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-01 18:06:56 +08:00
JiangQiming 503f7f8d44 feat: 国标ID修改 2023-03-01 18:06:40 +08:00
胡彪 4e0670b362
Merge pull request #55 from jetlinks/dev-hub
feat: 运维管理 加入权限
2023-03-01 17:34:01 +08:00
jackhoo_98 86c15261e8 fix: 合并冲突 2023-03-01 17:32:29 +08:00
xieyonghong 2299ae271f Merge remote-tracking branch 'origin/dev' into dev 2023-03-01 17:26:52 +08:00
xieyonghong 730997231e update: 优化ProLayout使用 2023-03-01 17:24:57 +08:00
JiangQiming 9f217551b6 feat: 绑定通道 2023-03-01 17:19:08 +08:00
jackhoo_98 1230ea3d90 feat: 运维管理 仪表盘 新增empty状态 2023-03-01 17:08:32 +08:00
jackhoo_98 4e75bf94c6 feat: 远程升级 加入权限 2023-03-01 17:08:18 +08:00
JiangQiming 349104b70f feat: 国标级联通道列表 2023-03-01 16:40:59 +08:00
jackhoo_98 716387150a feat: 网络组件 加入权限 2023-03-01 15:45:49 +08:00
wzyyy a63be77691 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-01 15:07:37 +08:00
wzyyy 7cefa62e45 fix: 去掉ant的样式 2023-03-01 15:07:21 +08:00
leiqiaochu eee87548e8 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-01 14:56:58 +08:00
leiqiaochu b71248c1b4 feat: 告警记录 2023-03-01 14:56:03 +08:00
JiangQiming 344729b5de Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-01 14:52:15 +08:00
JiangQiming 5b7979405e fix: 代码编辑器光标一直在文本最前面解决 2023-03-01 14:51:57 +08:00
jackhoo_98 d3e45d78bb feat: 流媒体服务 加入权限 2023-03-01 14:49:52 +08:00
xieyonghong a6c5a40a76 Merge remote-tracking branch 'origin/dev' into dev 2023-03-01 14:23:53 +08:00
xieyonghong c20f707f77 update: 修改源地址 2023-03-01 14:23:21 +08:00
xieyonghong 01d3988035 update: 优化变量less文件 2023-03-01 14:22:50 +08:00
wzyyy 1f4bdc274e fix: merge 2023-03-01 14:15:55 +08:00
wzyyy 34fbb4d67c feat: 数据解析 2023-03-01 14:14:09 +08:00