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
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
2 commits
  • 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 »
  • fix: 修复视频组件分享后显示为编辑模式视频
    97c8014d
    ww authored
    2023-12-22 10:27:08 +0800  
    Browse Files »

20 Dec, 2023
2 commits
  • Merge branch 'feat/object-model-enums-type' into 'main_dev' ...
    11b31233
    feat: 物模型新增枚举类型
    
    See merge request yunteng/thingskit-scada!200
    xp.Huang authored
    2023-12-20 08:48:06 +0000  
    Browse Files »
  • feat: 物模型新增枚举类型
    54c692b4
    ww authored
    2023-12-20 16:44:28 +0800  
    Browse Files »

19 Dec, 2023
2 commits
  • Merge branch 'fix/DEFECT-1832' into 'main_dev' ...
    8e3acda9
    fix: 修复模版预览时能进行指令下发
    
    See merge request yunteng/thingskit-scada!199
    xp.Huang authored
    2023-12-19 10:27:18 +0000  
    Browse Files »
  • fix: 修复模版预览时能进行指令下发
    f5580f8e
    ww authored
    2023-12-19 16:31:49 +0800  
    Browse Files »

06 Dec, 2023
1 commit
  • chore: thingskit v1.2.1_release
    51d5576c
    xp.Huang authored
    2023-12-06 00:52:33 +0800  
    Browse Files »

05 Dec, 2023
9 commits
  • chore: 调整配置文件
    e988e78d
    xp.Huang authored
    2023-12-05 18:26:44 +0800  
    Browse Files »
  • Merge remote-tracking branch 'origin/main_dev' ...
    846954b0
    # Conflicts:
    #	.env.development
    #	.env.production
    xp.Huang authored
    2023-12-05 18:23:17 +0800  
    Browse Files »
  • Merge branch 'perf/thermometer-component' into 'main_dev' ...
    79f72261
    perf: 优化温度计预览时无法显示具体值
    
    See merge request yunteng/thingskit-scada!197
    xp.Huang authored
    2023-12-05 07:36:11 +0000  
    Browse Files »
  • perf: 优化温度计预览时无法显示具体值
    d9e6d691
    ww authored
    2023-12-05 15:32:48 +0800  
    Browse Files »
  • Merge branch 'fix/alarm-list-device-query' into 'main_dev' ...
    c786a778
    fix: 修复告警组件设备列表查询接口变更
    
    See merge request yunteng/thingskit-scada!196
    xp.Huang authored
    2023-12-05 07:27:39 +0000  
    Browse Files »
  • fix: 修复告警组件设备列表查询接口变更
    6b95a2f3
    ww authored
    2023-12-05 15:02:24 +0800  
    Browse Files »
  • Merge branch 'fix/DEFECT-1802' into 'main_dev' ...
    f71dffc5
    fix: 修复判断组态是否未模版引用时逻辑错误
    
    See merge request yunteng/thingskit-scada!195
    xp.Huang authored
    2023-12-05 06:30:29 +0000  
    Browse Files »
  • fix: 修复判断组态是否未模版引用时逻辑错误
    725c4547
    ww authored
    2023-12-05 14:28:12 +0800  
    Browse Files »
  • Merge branch 'fix/alarm-list-not-auth' into 'main_dev' ...
    8cff99c3
    fix: 修复告警列表分享模式未查询告警列表
    
    See merge request yunteng/thingskit-scada!194
    xp.Huang authored
    2023-12-05 01:18:52 +0000  
    Browse Files »

04 Dec, 2023
1 commit
  • fix: 修复告警列表分享模式未查询告警列表
    33be1c63
    ww authored
    2023-12-04 20:01:46 +0800  
    Browse Files »