Sign in

简柏林 / thingskit-scada · Commits

GitLab

  • Go to dashboard
  • Project
  • Activity
  • Files
  • Commits
  • Builds 0
  • Graphs
  • Milestones
  • Issues 0
  • Merge Requests 0
  • Labels
  • Wiki
  • Network
  • Commits 721
  • Network
  • Compare
  • Branches 2
  • Tags 0
  • thingskit-scada
26 Feb, 2024
5 commits
  • fix: 视频组件视频流为必选&&视频新增loading加载
    0ff75950
    ww authored
    2024-02-26 18:11:21 +0800  
    Browse Files »
  • Merge branch 'fix/DEFECT-1940' into 'main_dev' ...
    4ae77c09
    fix: 修复模版创建TCP类型产品,无法获取传输协议
    
    See merge request yunteng/thingskit-scada!221
    xp.Huang authored
    2024-02-26 07:18:32 +0000  
    Browse Files »
  • Merge branch 'feat/video-component-support-gbt' into 'main_dev' ...
    445cfec6
    feat: 视频组件支持gbt
    
    See merge request yunteng/thingskit-scada!220
    xp.Huang authored
    2024-02-26 07:18:10 +0000  
    Browse Files »
  • fix: DEFECT-1940 修复模版创建TCP类型产品,无法获取传输协议
    59b28c8c
    ww authored
    2024-02-26 15:15:18 +0800  
    Browse Files »
  • feat: 视频组件支持gbt
    dff69cdb
    ww authored
    2024-02-26 11:37:57 +0800  
    Browse Files »

23 Feb, 2024
4 commits
  • Merge branch 'fix/switch-component-status' into 'main_dev' ...
    16a6e0fc
    fix: 修复开关组件无推送值时状态
    
    See merge request yunteng/thingskit-scada!219
    xp.Huang authored
    2024-02-23 06:58:21 +0000  
    Browse Files »
  • fix: 修复开关组件无推送值时状态
    390ea437
    ww authored
    2024-02-23 14:01:18 +0800  
    Browse Files »
  • Merge branch 'fix/rpc-command-deliver' into 'main_dev' ...
    ee078697
    fix: 修复rcp双向命令设备不在线时提升命令下发成功
    
    See merge request yunteng/thingskit-scada!218
    xp.Huang authored
    2024-02-23 02:40:55 +0000  
    Browse Files »
  • fix: 修复rcp双向命令设备不在线时提升命令下发成功
    19b8f2ff
    ww authored
    2024-02-23 10:35:16 +0800  
    Browse Files »

22 Feb, 2024
2 commits
  • Merge branch 'fix/object-model-bool' into 'main_dev' ...
    d0a8e2b5
    fix: 修复bool类型TCP Modbus设备命令值
    
    See merge request yunteng/thingskit-scada!217
    xp.Huang authored
    2024-02-22 11:53:16 +0000  
    Browse Files »
  • fix: 修复bool类型TCP Modbus设备命令值
    1b784d0b
    ww authored
    2024-02-22 19:40:28 +0800  
    Browse Files »

07 Feb, 2024
2 commits
  • Merge branch 'feat/object-model' into 'main_dev' ...
    cd0263e1
    feat:支持标准modbus_rtu解析及命令下发
    
    See merge request yunteng/thingskit-scada!216
    xp.Huang authored
    2024-02-07 01:44:36 +0000  
    Browse Files »
  • feat:支持标准modbus_rtu解析及命令下发
    a4392a5d
    张 峰林 authored
    2024-02-07 01:44:36 +0000  
    Browse Files »

26 Jan, 2024
1 commit
  • Merge branch 'fix/DEFECT-1888' into 'main_dev' ...
    36e69e2d
    fix: 修复引用模板创建组态时图表组件不显示设备名称
    
    See merge request yunteng/thingskit-scada!215
    xp.Huang authored
    2024-01-26 02:02:58 +0000  
    Browse Files »

25 Jan, 2024
1 commit
  • fix: 修复引用模板创建组态时图表组件不显示设备名称
    460a6b4e
    loveumiko authored
    2024-01-25 18:13:49 +0800  
    Browse Files »

18 Jan, 2024
1 commit
  • Merge branch 'fix/DEFECT-1886' into 'main_dev' ...
    b823113d
    fix: 修复折线图鼠标移入没显示具体的值
    
    See merge request yunteng/thingskit-scada!214
    xp.Huang authored
    2024-01-18 01:59:56 +0000  
    Browse Files »

17 Jan, 2024
2 commits
  • fix: 修复折线图鼠标移入没显示具体的值
    bfe7826c
    loveumiko authored
    2024-01-17 17:58:27 +0800  
    Browse Files »
  • Merge branch 'perf/chart-mulitple-attr' into 'main_dev' ...
    2dd02e88
    perf: 优化折线图柱状图属性可以进行多选
    
    See merge request yunteng/thingskit-scada!213
    xp.Huang authored
    2024-01-17 08:11:00 +0000  
    Browse Files »

16 Jan, 2024
1 commit
  • perf: 优化折线图柱状图属性可以进行多选
    3259190b
    loveumiko authored
    2024-01-16 10:19:38 +0800  
    Browse Files »

10 Jan, 2024
4 commits
  • Merge branch 'fix/DEFECT-1874' into 'main_dev' ...
    ab77670d
    fix: 修复设备双向命令下发接口配置不正常
    
    See merge request yunteng/thingskit-scada!212
    xp.Huang authored
    2024-01-10 09:02:01 +0000  
    Browse Files »
  • fix: 修复设备双向命令下发接口配置不正常
    5c02c407
    ww authored
    2024-01-10 16:59:25 +0800  
    Browse Files »
  • Merge branch 'perf/command-delivery' into 'main_dev' ...
    341ec851
    perf: 优化命令下发&&物模型枚举与结构体回显
    
    See merge request yunteng/thingskit-scada!211
    xp.Huang authored
    2024-01-10 07:33:50 +0000  
    Browse Files »
  • perf: 优化命令下发&&物模型枚举与结构体回显
    85a9d018
    ww authored
    2024-01-10 10:19:01 +0800  
    Browse Files »

29 Dec, 2023
4 commits
  • Merge branch 'main_dev' into 'main' ...
    e7195427
    Main dev
    
    See merge request yunteng/thingskit-scada!210
    xp.Huang authored
    2023-12-29 08:05:01 +0000  
    Browse Files »
  • Merge branch 'fix/tcp-switch-command-send' into 'main_dev' ...
    1a91e970
    fix: 修复TCP命令下发浮点类型生成modbus命令时method参数传递错误
    
    See merge request yunteng/thingskit-scada!209
    xp.Huang authored
    2023-12-29 08:04:13 +0000  
    Browse Files »
  • fix: 修复TCP命令下发浮点类型生成modbus命令时method参数传递错误
    d6ed5412
    ww authored
    2023-12-29 15:49:00 +0800  
    Browse Files »
  • Merge branch 'main_dev' into 'main' ...
    64b137e4
    Main dev
    
    See merge request yunteng/thingskit-scada!208
    xp.Huang authored
    2023-12-29 01:01:16 +0000  
    Browse Files »

28 Dec, 2023
3 commits
  • Merge branch 'fix/tcp-switch-command-send' into 'main_dev' ...
    13c29cba
    fix: 修复tcp开关下发命令通过modbus获取命令
    
    See merge request yunteng/thingskit-scada!207
    xp.Huang authored
    2023-12-28 07:51:13 +0000  
    Browse Files »
  • fix: 修复tcp开关下发命令通过modbus获取命令
    7534bb10
    ww authored
    2023-12-28 14:23:53 +0800  
    Browse Files »
  • Merge branch 'fix/DEFECT-1855' into 'main_dev' ...
    ad6f08ce
    fix: 修复TCP类型设备整型未使用缩放因子
    
    See merge request yunteng/thingskit-scada!206
    xp.Huang authored
    2023-12-28 02:52:57 +0000  
    Browse Files »

27 Dec, 2023
3 commits
  • fix: 修复TCP类型设备整型未使用缩放因子
    d2135015
    ww authored
    2023-12-27 17:47:51 +0800  
    Browse Files »
  • Merge branch 'fix/DEFECT-1855' into 'main_dev' ...
    846eb423
    fix: 修复组态属性下发tcp设备没有缩放因子
    
    See merge request yunteng/thingskit-scada!205
    xp.Huang authored
    2023-12-27 09:25:46 +0000  
    Browse Files »
  • fix: 修复组态属性下发tcp设备没有缩放因子
    3b113770
    ww authored
    2023-12-27 17:17:39 +0800  
    Browse Files »

26 Dec, 2023
2 commits
  • Merge branch 'fix/object-model-number-type-value-limit' into 'main_dev' ...
    72019892
    fix: 统一物模型整型与浮点型的最大值与最小值
    
    See merge request yunteng/thingskit-scada!204
    xp.Huang authored
    2023-12-26 03:51:58 +0000  
    Browse Files »
  • fix: 统一物模型整型与浮点型的最大值与最小值
    9ff43203
    ww authored
    2023-12-26 11:06:30 +0800  
    Browse Files »

25 Dec, 2023
4 commits
  • Merge branch 'fix/DEFECT-1844' into 'main_dev' ...
    7b6ec822
    fix: 修复告警列表设置滚动停留时间无效
    
    See merge request yunteng/thingskit-scada!203
    xp.Huang authored
    2023-12-25 06:10:41 +0000  
    Browse Files »
  • Merge branch 'fix/DEFECT-1837' into 'main_dev' ...
    f9daf1c2
    fix: 修复从流媒体平台配置的视频流无法播放
    
    See merge request yunteng/thingskit-scada!202
    xp.Huang authored
    2023-12-25 06:09:55 +0000  
    Browse Files »
  • fix: 修复告警列表设置滚动停留时间无效
    625da518
    ww authored
    2023-12-25 11:47:40 +0800  
    Browse Files »
  • fix: 修复从流媒体平台配置的视频流无法播放
    ea328bb4
    ww authored
    2023-12-25 10:57:15 +0800  
    Browse Files »

22 Dec, 2023
1 commit
  • Merge branch 'fix/DEFECT-1841' into 'main_dev' ...
    182a3bca
    fix: 修复视频组件分享后显示为编辑模式视频
    
    See merge request yunteng/thingskit-scada!201
    xp.Huang authored
    2023-12-22 06:29:35 +0000  
    Browse Files »