Commit Graph

  • 94bef052bc update: 分屏展示优化 JiangQiming 2023-03-04 10:49:33 +0800
  • 0c515e849e update: 个人中心模块a-组件替换为j- easy 2023-03-04 10:45:05 +0800
  • 5790ea6064 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev JiangQiming 2023-03-04 10:25:35 +0800
  • 52d521cd51 fix: 分屏数量切换 JiangQiming 2023-03-04 10:25:19 +0800
  • 9b8ce9e586
    Merge pull request #56 from jetlinks/dev-hub 胡彪 2023-03-04 10:13:25 +0800
  • 9212cd6a7f Merge branch 'dev' into dev-hub jackhoo_98 2023-03-04 10:10:16 +0800
  • 349f066870 feat: 通道管理 卡片列表、新增编辑等功能 jackhoo_98 2023-03-04 10:07:51 +0800
  • bfb1cb5403 update: 分屏展示优化 JiangQiming 2023-03-03 18:41:04 +0800
  • eb2430fb8d Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev JiangQiming 2023-03-03 18:29:35 +0800
  • 19a0d366f0 update: 分屏展示图标 JiangQiming 2023-03-03 18:29:19 +0800
  • 90359de6b5 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev easy 2023-03-03 18:20:34 +0800
  • fab790bbe6 update: 右上角 easy 2023-03-03 18:17:06 +0800
  • 9649dd9cbd update: 分屏展示 JiangQiming 2023-03-03 18:11:53 +0800
  • 70eafa2f5a Merge remote-tracking branch 'origin/dev' into dev xieyonghong 2023-03-03 15:47:57 +0800
  • 37a4845f8b update: 更新jetlinks-ui-components版本 xieyonghong 2023-03-03 15:47:32 +0800
  • 27a2fc7fb9 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev JiangQiming 2023-03-03 15:36:57 +0800
  • 5b6e0611c4 feat: 分屏展示 JiangQiming 2023-03-03 15:36:39 +0800
  • 9e84a7bb8c update: 又上角铃铛 easy 2023-03-03 14:47:10 +0800
  • dd1c05e0b8 feat: post方法新增扩展参数 jackhoo_98 2023-03-03 11:35:22 +0800
  • c055250aec Merge remote-tracking branch 'origin/dev' into dev xieyonghong 2023-03-02 21:54:50 +0800
  • b3acf4f6df update: yarn lock xieyonghong 2023-03-02 21:51:44 +0800
  • 0c435bffbd Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev easy 2023-03-02 21:50:30 +0800
  • 9cb75775f1 update: JTable更改为j-pro-table easy 2023-03-02 21:49:43 +0800
  • 376cfe4d3d Merge remote-tracking branch 'origin/dev' into dev xieyonghong 2023-03-02 21:48:50 +0800
  • db82ec462a update: 优化场景联动-触发规则回显 xieyonghong 2023-03-02 21:40:45 +0800
  • 68a52db344 feat: 右上角部分 easy 2023-03-02 21:40:21 +0800
  • 6467b4ef4f fix: 物联卡管理组件替换 wzyyy 2023-03-02 20:58:56 +0800
  • 36b673157a fix: merge wzyyy 2023-03-02 20:46:32 +0800
  • 376d54fdb4 fix: a-rang-picker wzyyy 2023-03-02 20:45:37 +0800
  • 94cbb42173 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev leiqiaochu 2023-03-02 20:44:11 +0800
  • 6ba0f0cbb6 feat: 告警配置 leiqiaochu 2023-03-02 20:43:37 +0800
  • 4d8f68dabb fix: 物联卡及数据解析替换 wzyyy 2023-03-02 20:43:33 +0800
  • 66c451122b Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev JiangQiming 2023-03-02 20:23:37 +0800
  • 8a3acd57ee feat: 视频播放组件封装 JiangQiming 2023-03-02 20:23:21 +0800
  • c401da070b fix: 修改替换组件 wangshuaiswim 2023-03-02 19:12:01 +0800
  • 86ff238df7 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev JiangQiming 2023-03-02 18:11:11 +0800
  • 32c200e08c feat: 视频播放组件 JiangQiming 2023-03-02 18:10:53 +0800
  • f7fac41743 fix: 修改设备列表为protable 100011797 2023-03-02 17:55:28 +0800
  • dcf0b05bc7 update: 表格更换为JProTable JiangQiming 2023-03-02 17:52:12 +0800
  • c3da2ad806 Merge branch 'dev' into dev-hub jackhoo_98 2023-03-02 17:02:16 +0800
  • 21ae942d98 feat: 通道管理 todo jackhoo_98 2023-03-02 17:01:12 +0800
  • 8a6e28fccc Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev easy 2023-03-02 17:00:59 +0800
  • 83f2793346 feat: 通知记录 easy 2023-03-02 17:00:10 +0800
  • 75e36877a0 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev JiangQiming 2023-03-02 15:59:04 +0800
  • a7a2eb0dbf feat: 视频播放 JiangQiming 2023-03-02 15:56:08 +0800
  • 2090822bab Merge branch 'dev' into dev-hub jackhoo_98 2023-03-02 15:49:01 +0800
  • 8bef5114fa feat: 数据采集 仪表盘 jackhoo_98 2023-03-02 15:46:43 +0800
  • 56d81a0bf8 Merge remote-tracking branch 'origin/dev' into dev xieyonghong 2023-03-02 14:33:48 +0800
  • b3ea70db0f feat: 新增encodeParams工具 xieyonghong 2023-03-02 14:33:28 +0800
  • 2607f9aace Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev JiangQiming 2023-03-02 14:05:25 +0800
  • deac9539c1 update: 表格组件新增表头插槽 JiangQiming 2023-03-02 14:05:06 +0800
  • 421788b2d6 Merge remote-tracking branch 'origin/dev' into dev xieyonghong 2023-03-02 14:03:21 +0800
  • 2781017096 update: 添加force命令 xieyonghong 2023-03-02 14:02:59 +0800
  • 849bfbdaad feat: 告警记录 leiqiaochu 2023-03-02 11:08:07 +0800
  • 569c430ca2 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev leiqiaochu 2023-03-02 10:16:04 +0800
  • a298904a02 feat: 告警记录 leiqiaochu 2023-03-02 10:05:11 +0800
  • 80e2b02364 update: 删除无用代码 JiangQiming 2023-03-01 21:53:01 +0800
  • dd35a8a14d Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev JiangQiming 2023-03-01 21:51:47 +0800
  • d73f115319 update: 推送地址错误更改 JiangQiming 2023-03-01 21:51:32 +0800
  • 42ecbbf0ea Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev wzyyy 2023-03-01 21:35:15 +0800
  • f36e4b00ac fix: 物联卡权限及下载模板 wzyyy 2023-03-01 21:34:49 +0800
  • eb54d5c001 update: 未选择通道禁止批量解绑 JiangQiming 2023-03-01 21:23:48 +0800
  • 08c0b1e9d0 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev JiangQiming 2023-03-01 21:19:43 +0800
  • 3707b71c38 feat: 国标级联推送 JiangQiming 2023-03-01 21:19:16 +0800
  • 67bb94ed7c feat: 告警记录 leiqiaochu 2023-03-01 21:01:09 +0800
  • 5c3e344348 feat: 告警记录 leiqiaochu 2023-03-01 20:59:58 +0800
  • 8d2558b721 fix: 修复代码编辑器光标问题 JiangQiming 2023-03-01 20:31:22 +0800
  • 5a2e42ec8f Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev JiangQiming 2023-03-01 20:29:12 +0800
  • 2d8c99b28c fix: 修复代码编辑器光标问题 JiangQiming 2023-03-01 20:28:54 +0800
  • e787cc0e86 update: 个人中心-基本设置 easy 2023-03-01 19:14:48 +0800
  • 9aeb5faa90 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev wangshuaiswim 2023-03-01 18:43:21 +0800
  • c07199ca2b fix: 解决物模型TODO wangshuaiswim 2023-03-01 18:42:40 +0800
  • 4263052d4a Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev JiangQiming 2023-03-01 18:06:56 +0800
  • 503f7f8d44 feat: 国标ID修改 JiangQiming 2023-03-01 18:06:40 +0800
  • 4e0670b362
    Merge pull request #55 from jetlinks/dev-hub 胡彪 2023-03-01 17:34:01 +0800
  • 86c15261e8 fix: 合并冲突 jackhoo_98 2023-03-01 17:32:29 +0800
  • 2299ae271f Merge remote-tracking branch 'origin/dev' into dev xieyonghong 2023-03-01 17:26:52 +0800
  • 730997231e update: 优化ProLayout使用 xieyonghong 2023-03-01 17:24:57 +0800
  • 9f217551b6 feat: 绑定通道 JiangQiming 2023-03-01 17:19:08 +0800
  • 1230ea3d90 feat: 运维管理 仪表盘 新增empty状态 jackhoo_98 2023-03-01 17:08:32 +0800
  • 4e75bf94c6 feat: 远程升级 加入权限 jackhoo_98 2023-03-01 17:08:18 +0800
  • 349104b70f feat: 国标级联通道列表 JiangQiming 2023-03-01 16:40:59 +0800
  • 716387150a feat: 网络组件 加入权限 jackhoo_98 2023-03-01 15:45:49 +0800
  • a63be77691 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev wzyyy 2023-03-01 15:07:37 +0800
  • 7cefa62e45 fix: 去掉ant的样式 wzyyy 2023-03-01 15:07:21 +0800
  • eee87548e8 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev leiqiaochu 2023-03-01 14:56:58 +0800
  • b71248c1b4 feat: 告警记录 leiqiaochu 2023-03-01 14:56:03 +0800
  • 344729b5de Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev JiangQiming 2023-03-01 14:52:15 +0800
  • 5b7979405e fix: 代码编辑器光标一直在文本最前面解决 JiangQiming 2023-03-01 14:51:57 +0800
  • d3e45d78bb feat: 流媒体服务 加入权限 jackhoo_98 2023-03-01 14:49:52 +0800
  • a6c5a40a76 Merge remote-tracking branch 'origin/dev' into dev xieyonghong 2023-03-01 14:23:53 +0800
  • c20f707f77 update: 修改源地址 xieyonghong 2023-03-01 14:23:21 +0800
  • 01d3988035 update: 优化变量less文件 xieyonghong 2023-03-01 14:22:50 +0800
  • 1f4bdc274e fix: merge wzyyy 2023-03-01 14:15:55 +0800
  • 34fbb4d67c feat: 数据解析 wzyyy 2023-03-01 14:14:09 +0800
  • f6a41fac5f update: 视频设备新增产品状态 JiangQiming 2023-03-01 11:52:37 +0800
  • fac1b5d1df update: 国标级联表单数据赋值方式更改 JiangQiming 2023-03-01 11:40:12 +0800
  • ec89aaae88 feat: 证书管理 加入权限 jackhoo_98 2023-03-01 11:37:26 +0800
  • 8972c003ba feat: 协议管理 加入权限 jackhoo_98 2023-03-01 10:58:19 +0800
  • 020a917b13 Merge remote-tracking branch 'origin/dev' into dev xieyonghong 2023-03-01 10:30:05 +0800