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
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 Directory »
  • 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 Directory »
  • 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 Directory »
  • fix: DEFECT-1878 修复批量处理产品,选择分配产品时,mqtt分配到TCP设备后,TCP数据错误
    43a27788
    dev001 authored
    2024-01-29 16:53:37 +0800  
    Browse Directory »
  • 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 Directory »
  • 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 Directory »
  • fix: 修复设备分布的历史数据查询中升降序未生效
    5d0d809d
    张 峰林 authored
    2024-01-26 02:02:36 +0000  
    Browse Directory »
  • 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 Directory »

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 Directory »
  • 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 Directory »
  • 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 Directory »

23 Jan, 2024
12 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 Directory »
  • fix: 修复设备详情物模型趋势数据排序无效
    34baa117
    ww authored
    2024-01-23 18:29:29 +0800  
    Browse Files »
  • fix: 修复看板控制组件4设置密码框时下发命令重复弹出密码框
    e4b78959
    ww authored
    2024-01-23 18:21:09 +0800  
    Browse Directory »
  • fix: 修改枚举字段为ISC
    b1d7668e
    fengwotao authored
    2024-01-23 17:25:56 +0800  
    Browse Files »
  • fix: 修改枚举为海康
    587320db
    fengwotao authored
    2024-01-23 17:01:13 +0800  
    Browse Files »
  • Merge branch 'fengtao' into 'main_dev' ...
    12028af0
    perf: 优化视频配置代码,如果是萤石云则暂时隐藏云台控制
    
    See merge request yunteng/thingskit-front!1189
    xp.Huang authored
    2024-01-23 06:40:52 +0000  
    Browse Files »
  • Merge branch 'fix/DEFECT-1890' into 'main_dev' ...
    3bde8331
    fix: DEFECT-1890 修复地图选择结构体时无法绘制路径
    
    See merge request yunteng/thingskit-front!1188
    xp.Huang authored
    2024-01-23 06:40:43 +0000  
    Browse Directory »
  • Merge branch 'fix/DEFECT-1894' into 'main_dev' ...
    d6503094
    fix: 修复部分组件无产品id时查询报错
    
    See merge request yunteng/thingskit-front!1187
    xp.Huang authored
    2024-01-23 06:40:32 +0000  
    Browse Files »
  • fix: DEFECT-1890 修复地图选择结构体时无法绘制路径
    5d250b25
    ww authored
    2024-01-23 11:39:32 +0800  
    Browse Directory »
  • fix: 修复部分组件无产品id时查询报错
    edc1274c
    ww authored
    2024-01-23 10:21:40 +0800  
    Browse Directory »
  • Merge branch 'main_dev' into fengtao
    90f6f285
    fengwotao authored
    2024-01-23 09:37:21 +0800  
    Browse Files »

22 Jan, 2024
4 commits
  • Merge branch 'fix/DEFECT-1889' into 'main_dev' ...
    d8ac959b
    fix: 修复控制组件4只能绑定modbus设备
    
    See merge request yunteng/thingskit-front!1186
    xp.Huang authored
    2024-01-22 07:40:26 +0000  
    Browse Files »
  • Merge branch 'fix/DEFECT-1879' into 'main_dev' ...
    656f8572
    fix: DEFECT-1879 修复数据流转编辑时变更产品设备查询为空
    
    See merge request yunteng/thingskit-front!1185
    xp.Huang authored
    2024-01-22 07:40:13 +0000  
    Browse Files »
  • Merge branch 'fix/DEFECT-1891' into 'main_dev' ...
    07a8c45e
    Fix/defect 1891
    
    See merge request yunteng/thingskit-front!1184
    xp.Huang authored
    2024-01-22 07:40:00 +0000  
    Browse Files »
  • Merge branch 'fix/DEFECT-1892' into 'main_dev' ...
    063d31a1
    fix: 设备详情表格排序不生效
    
    See merge request yunteng/thingskit-front!1183
    xp.Huang authored
    2024-01-22 07:39:51 +0000  
    Browse Files »

19 Jan, 2024
3 commits
  • fix: 修复控制组件4只能绑定modbus设备
    f3a846f8
    ww authored
    2024-01-19 18:03:28 +0800  
    Browse Files »
  • fix: DEFECT-1879 修复数据流转编辑时变更产品设备查询为空
    446c0970
    ww authored
    2024-01-19 17:42:21 +0800  
    Browse Directory »
  • fix: 修复设备详情物模型历史数据超过一年后无分组间隔选项
    91f29a5b
    ww authored
    2024-01-19 17:20:33 +0800  
    Browse Directory »