Sign in

简柏林 / thingskit-front · Commits

GitLab

  • Go to dashboard
  • Project
  • Activity
  • Files
  • Commits
  • Builds 0
  • Graphs
  • Milestones
  • Issues 0
  • Merge Requests 0
  • Labels
  • Wiki
  • Network
  • Commits 4,552
  • Network
  • Compare
  • Branches 9
  • Tags 0
  • thingskit-front
08 Feb, 2024
3 commits
  • fix: 修复新增GBT时通道号问题
    1cfa17bd
    loveumiko authored
    2024-02-08 13:03:01 +0800  
    Browse Files »
  • Merge branch 'fix/video-GBT-cancel' into 'main_dev' ...
    338f226b
    fix: 修复国标播放和新增接口调用问题
    
    See merge request yunteng/thingskit-front!1211
    xp.Huang authored
    2024-02-08 03:38:25 +0000  
    Browse Files »
  • fix: 修复国标播放和新增接口调用问题
    628d883c
    张 峰林 authored
    2024-02-08 03:38:25 +0000  
    Browse Files »

07 Feb, 2024
4 commits
  • Merge branch 'feat/object-model' into 'main_dev' ...
    66a595da
    feat:支持标准modbus_rtu解析
    
    See merge request yunteng/thingskit-front!1209
    xp.Huang authored
    2024-02-07 01:42:59 +0000  
    Browse Files »
  • feat:支持标准modbus_rtu解析
    3804a6bf
    张 峰林 authored
    2024-02-07 01:42:59 +0000  
    Browse Files »
  • Merge branch 'feat/transport-type-GBT28181' into 'main_dev' ...
    9fc75900
    feat: gbt28181(支持点播、云台控制)
    
    See merge request yunteng/thingskit-front!1208
    xp.Huang authored
    2024-02-07 01:42:03 +0000  
    Browse Files »
  • feat: gbt28181(支持点播、云台控制)
    520ac95c
    张 峰林 authored
    2024-02-07 01:42:03 +0000  
    Browse Files »

05 Feb, 2024
3 commits
  • Merge branch 'ft' into 'main_dev' ...
    59683e06
    fix: 修复videojs切换至其他页面,返回播放界面,视频时延问题
    
    See merge request yunteng/thingskit-front!1207
    xp.Huang authored
    2024-02-05 09:42:18 +0000  
    Browse Files »
  • fix: 修复videojs切换至其他页面,返回播放界面,视频时延问题
    5f2633ad
    fengwotao authored
    2024-02-05 17:38:14 +0800  
    Browse Files »
  • Merge branch 'fix/video-control-scale' into 'main_dev' ...
    8c0b5609
    fix: 修复视频云台控制全屏时的点击全屏按钮时没有进行放大
    
    See merge request yunteng/thingskit-front!1206
    xp.Huang authored
    2024-02-05 01:16:29 +0000  
    Browse Files »

04 Feb, 2024
1 commit
  • fix: 修复视频云台控制全屏时的点击全屏按钮时没有进行放大
    bf921948
    loveumiko authored
    2024-02-04 18:04:53 +0800  
    Browse Files »

31 Jan, 2024
2 commits
  • Merge branch 'ft' into 'main_dev' ...
    937e63bc
    fix: 修复产品当前页全选时,批量删除按钮未生效问题
    
    See merge request yunteng/thingskit-front!1205
    xp.Huang authored
    2024-01-31 02:28:59 +0000  
    Browse Files »
  • fix: 修复产品当前页全选时,批量删除按钮未生效问题
    8ae35e32
    fengwotao authored
    2024-01-31 09:40:07 +0800  
    Browse Files »

30 Jan, 2024
4 commits
  • Merge branch 'dev_ft' into 'main_dev' ...
    56d6b857
    fix: 修改视频配置,点击编辑回显,部分回显失败
    
    See merge request yunteng/thingskit-front!1204
    xp.Huang authored
    2024-01-30 06:35:08 +0000  
    Browse Files »
  • fix: 修改视频配置,点击编辑回显,部分回显失败
    057afba9
    fengwotao authored
    2024-01-30 13:46:09 +0800  
    Browse Files »
  • Merge branch 'fix/rule-chain' into 'main_dev' ...
    bcb2015d
    fix: 修复设备配置链接节点配置错误
    
    See merge request yunteng/thingskit-front!1202
    xp.Huang authored
    2024-01-30 03:22:57 +0000  
    Browse Files »
  • fix: 修复设备配置链接节点配置错误
    fa0eca7a
    ww authored
    2024-01-30 11:22:08 +0800  
    Browse Files »

29 Jan, 2024
7 commits
  • Merge branch 'dev_by_ft' into 'main_dev' ...
    f0e3f398
    fix: 修改视频配置,点击编辑回显,部分回显失败
    
    See merge request yunteng/thingskit-front!1201
    xp.Huang authored
    2024-01-29 12:08:20 +0000  
    Browse Files »
  • fix: 修改视频配置,点击编辑回显,部分回显失败
    eb8a7ad5
    fengtao authored
    2024-01-29 12:08:20 +0000  
    Browse Files »
  • Merge branch 'fix_add_transporttype' into 'main_dev' ...
    e3a58369
    fix: 修复批量处理产品,选择分配产品时,mqtt分配到TCP设备后,TCP数据错误
    
    See merge request yunteng/thingskit-front!1200
    xp.Huang authored
    2024-01-29 09:52:16 +0000  
    Browse Files »
  • Merge branch 'ft' into 'main_dev' ...
    2187e8b8
    fix: 修复产品编辑上传图片时,第一次编辑显示出图片,再去点编辑,图片消失,编辑确定后没有图片显示了(新增也是一样)
    
    See merge request yunteng/thingskit-front!1199
    xp.Huang authored
    2024-01-29 09:51:56 +0000  
    Browse Files »
  • fix: 修复产品编辑上传图片时,第一次编辑显示出图片,再去点编辑,图片消失,编辑确定后没有图片显示了(新增也是一样)
    f14faf65
    fengtao authored
    2024-01-29 09:51:56 +0000  
    Browse Files »
  • fix: DEFECT-1878 修复批量处理产品,选择分配产品时,mqtt分配到TCP设备后,TCP数据错误
    43a27788
    dev001 authored
    2024-01-29 16:53:37 +0800  
    Browse Files »
  • Merge branch 'fix/DEFECT-1908' into 'main_dev' ...
    d45566e6
    fix: 修复数据流转rest-api选择凭据类型,输入用户名和密码点击保存,再点进去数据未保存
    
    See merge request yunteng/thingskit-front!1198
    xp.Huang authored
    2024-01-29 01:45:34 +0000  
    Browse Files »

26 Jan, 2024
5 commits
  • fix: 修复数据流转rest-api选择凭据类型,输入用户名和密码点击保存,再点进去数据未保存
    86694d47
    loveumiko authored
    2024-01-26 17:19:29 +0800  
    Browse Files »
  • Merge branch 'fix/DEFECT-1904' into 'main_dev' ...
    b6402422
    fix: 修复设备分布的历史数据查询中升降序未生效
    
    See merge request yunteng/thingskit-front!1196
    xp.Huang authored
    2024-01-26 02:02:36 +0000  
    Browse Files »
  • fix: 修复设备分布的历史数据查询中升降序未生效
    5d0d809d
    张 峰林 authored
    2024-01-26 02:02:36 +0000  
    Browse Files »
  • Merge branch 'dev_by_ft' into 'main_dev' ...
    8be6194f
    pref: 优化发布主题去掉感叹号,复制设备id和访问令牌去掉省略号
    
    See merge request yunteng/thingskit-front!1197
    xp.Huang authored
    2024-01-26 02:02:18 +0000  
    Browse Files »
  • pref: 优化发布主题去掉感叹号,复制设备id和访问令牌去掉省略号
    c46b3d3f
    fengtao authored
    2024-01-26 02:02:18 +0000  
    Browse Files »

25 Jan, 2024
2 commits
  • Merge branch 'dev_by_ft' into 'main_dev' ...
    0c81eb9e
    pref: DEFECT-1897 去掉复制后面~号
    
    See merge request yunteng/thingskit-front!1194
    xp.Huang authored
    2024-01-25 01:10:14 +0000  
    Browse Files »
  • Merge branch 'fix/object-model-form-reset' into 'main_dev' ...
    5e0a9bfe
    fix: 修复物模型编辑后新增未重置表单
    
    See merge request yunteng/thingskit-front!1195
    xp.Huang authored
    2024-01-25 01:04:03 +0000  
    Browse Files »

24 Jan, 2024
7 commits
  • fix: 修复物模型编辑后新增未重置表单
    bef25025
    ww authored
    2024-01-24 18:49:47 +0800  
    Browse Files »
  • pref: DEFECT-1897 优化模板分享去掉省略号,大屏分享去掉省略号,发布主题去掉感叹号,复制设备id和访问令牌去掉省略号
    34bec581
    fengwotao authored
    2024-01-24 17:04:04 +0800  
    Browse Files »
  • Merge branch 'fengtao' into 'main_dev' ...
    7ce87528
    fix: DEFECT-1902 客户账号中编辑组织时,选择层级独立,再选择一个组织,报500,前端参数传入问题
    
    See merge request yunteng/thingskit-front!1193
    xp.Huang authored
    2024-01-24 03:50:40 +0000  
    Browse Files »
  • Merge branch 'fix/DEFECT-1898' into 'main_dev' ...
    83bc4e2b
    fix: 修复设备详情物模型趋势数据排序无效
    
    See merge request yunteng/thingskit-front!1192
    xp.Huang authored
    2024-01-24 03:49:02 +0000  
    Browse Files »
  • Merge branch 'fix/DEFECT-1900' into 'main_dev' ...
    38bba287
    fix: 修复看板控制组件4设置密码框时下发命令重复弹出密码框
    
    See merge request yunteng/thingskit-front!1191
    xp.Huang authored
    2024-01-24 03:48:41 +0000  
    Browse Files »
  • Merge branch 'main_dev' into fengtao
    d824ad9c
    fengwotao authored
    2024-01-24 10:22:14 +0800  
    Browse Files »
  • fix: DEFECT-1902 客户账号中编辑组织时,选择层级独立,再选择一个组织,报500,前端参数传入问题
    a3303c5f
    fengwotao authored
    2024-01-24 10:20:59 +0800  
    Browse Files »

23 Jan, 2024
2 commits
  • Merge branch 'fengtao' into 'main_dev' ...
    21312de2
    fix: 统一枚举名称
    
    See merge request yunteng/thingskit-front!1190
    xp.Huang authored
    2024-01-23 12:18:59 +0000  
    Browse Files »
  • fix: 统一枚举名称
    2d99dd4f
    fengtao authored
    2024-01-23 12:18:59 +0000  
    Browse Files »