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
01 Nov, 2023
1 commit
  • Merge branch 'perf/main_dev' into 'main_dev' ...
    47d55da0
    Perf/main dev
    
    See merge request yunteng/thingskit-scada!154
    xp.Huang authored
    2023-11-01 01:17:41 +0000  
    Browse Files »

31 Oct, 2023
25 commits
  • Merge branch 'local_dev_ft' into 'perf/main_dev' ...
    2d6023c8
    fix: 组态,修改获取设备接口,新增传组织id
    
    See merge request yunteng/thingskit-scada!153
    温伟 authored
    2023-10-31 13:01:39 +0000  
    Browse Files »
  • perf: 优化折线图取值区间
    a516d3ff
    ww authored
    2023-10-31 21:01:17 +0800  
    Browse Files »
  • Merge branch 'perf/main_dev' into local_dev_ft
    ea180dd7
    dev001 authored
    2023-10-31 20:57:15 +0800  
    Browse Files »
  • fix: 组态,修改获取设备接口,新增传组织id
    acc9ab19
    dev001 authored
    2023-10-31 20:56:22 +0800  
    Browse Files »
  • fix: 修复温度计无法回显绑定数据源
    289e59e2
    ww authored
    2023-10-31 20:48:57 +0800  
    Browse Files »
  • fix: 修复图片组件无法更新
    ab6da34f
    ww authored
    2023-10-31 20:46:26 +0800  
    Browse Files »
  • Merge remote-tracking branch 'origin/perf/main_dev' into perf/main_dev
    a316e31e
    ww authored
    2023-10-31 20:29:18 +0800  
    Browse Files »
  • Merge branch 'fix/zfl' into 'perf/main_dev' ...
    39f28195
    参数设置命令下发
    
    See merge request yunteng/thingskit-scada!152
    温伟 authored
    2023-10-31 12:28:35 +0000  
    Browse Files »
  • perf: 修复流量计组件设置颜色无效
    7d935277
    ww authored
    2023-10-31 20:27:56 +0800  
    Browse Files »
  • fix: 修改参数设置命令下发的问题
    4eaa9ed7
    loveumiko authored
    2023-10-31 20:11:40 +0800  
    Browse Files »
  • Merge branch 'perf/main_dev' of http://git.yunteng.com/yunteng/thingskit-scada into fix/zfl
    f280184c
    loveumiko authored
    2023-10-31 19:16:58 +0800  
    Browse Files »
  • perf: 优化使用枚举值
    a267a621
    ww authored
    2023-10-31 19:02:11 +0800  
    Browse Files »
  • Merge remote-tracking branch 'origin/fix/zfl' into perf/main_dev
    752b0a1d
    ww authored
    2023-10-31 17:46:36 +0800  
    Browse Files »
  • fix: 修复socket切换页面后无法获取实时数据
    04b5b4e1
    ww authored
    2023-10-31 17:43:35 +0800  
    Browse Files »
  • Merge branch 'fix/zfl' of http://git.yunteng.com/yunteng/thingskit-scada into fix/zfl
    ccaadc2b
    loveumiko authored
    2023-10-31 17:18:36 +0800  
    Browse Files »
  • fxi: 更改数据源的逻辑
    3e05e086
    dev001 authored
    2023-10-31 17:16:18 +0800  
    Browse Files »
  • chore: 格式化代码
    4ba2e5dc
    ww authored
    2023-10-31 17:00:00 +0800  
    Browse Directory »
  • fix: 修复配置文件配置错误
    a5e5359b
    ww authored
    2023-10-31 14:43:15 +0800  
    Browse Files »
  • perf: 优化告警列表
    d26b3c52
    ww authored
    2023-10-31 14:13:56 +0800  
    Browse Files »
  • fix: 修复windiCSS引入
    e36c83fa
    ww authored
    2023-10-31 11:46:30 +0800  
    Browse Files »
  • Merge remote-tracking branch 'origin/fix/zfl' into perf/main_dev
    c08613db
    ww authored
    2023-10-31 11:28:59 +0800  
    Browse Files »
  • fix: 修改数据源类型和取值
    19f40b52
    loveumiko authored
    2023-10-31 11:18:25 +0800  
    Browse File »
  • perf: 优化告警列表
    5c377368
    ww authored
    2023-10-31 11:06:13 +0800  
    Browse Files »
  • Merge branch 'merge/perf/main_dev' into 'main_dev' ...
    d3da2bfb
    perf: 重构组态
    
    See merge request yunteng/thingskit-scada!150
    xp.Huang authored
    2023-10-31 01:46:26 +0000  
    Browse Files »
  • perf: 重构组态
    06a645b4
    ww authored
    2023-10-31 09:21:38 +0800  
    Browse Files »

14 Sep, 2023
4 commits
  • Merge branch 'fix/data-dynamic-display' into 'main_dev' ...
    9f5dee19
    fix: 修复数据动效显示隐藏失效
    
    See merge request yunteng/thingskit-scada!129
    xp.Huang authored
    2023-09-14 14:06:55 +0000  
    Browse Files »
  • fix: 修复数据动效显示隐藏失效
    6a0f1012
    ww authored
    2023-09-14 21:56:36 +0800  
    Browse Files »
  • Merge branch 'perf/organization-query' into 'main_dev' ...
    8d8e6620
    perf: 优化组态数据源查询根据组态所属组织进行查询
    
    See merge request yunteng/thingskit-scada!128
    xp.Huang authored
    2023-09-14 13:08:35 +0000  
    Browse Files »
  • perf: 优化组态数据源查询根据组态所属组织进行查询
    40b061aa
    ww authored
    2023-09-14 19:56:59 +0800  
    Browse Files »

13 Sep, 2023
2 commits
  • Merge branch 'fix/DEFECT-1591' into 'main_dev' ...
    8eb4cc8c
    fix: 修复告警列表改变大小后绑定设备无效
    
    See merge request yunteng/thingskit-scada!127
    xp.Huang authored
    2023-09-13 10:10:09 +0000  
    Browse Files »
  • fix: 修复告警列表改变大小后绑定设备无效
    59b7d922
    ww authored
    2023-09-13 17:43:15 +0800  
    Browse Files »

12 Sep, 2023
6 commits
  • Merge branch 'fix/DEFECT-1459' into 'main_dev' ...
    ec9e739d
    fix: 修改告警记录别名显示
    
    See merge request yunteng/thingskit-scada!125
    xp.Huang authored
    2023-09-12 12:47:05 +0000  
    Browse Files »
  • fix: 修改告警记录别名显示
    b62d17c5
    loveumiko authored
    2023-09-12 20:35:44 +0800  
    Browse Directory »
  • Merge branch 'fix/DEFECT-1511' into 'main_dev' ...
    c07ac862
    fix: DEFECT-1511 修复流量计组件无法回显小数类型的值
    
    See merge request yunteng/thingskit-scada!124
    xp.Huang authored
    2023-09-12 09:15:57 +0000  
    Browse Directory »
  • fix: DEFECT-1511 修复流量计组件无法回显小数类型的值
    03235c16
    ww authored
    2023-09-12 16:59:37 +0800  
    Browse Files »
  • Merge branch 'fix/DEFECT-1568' into 'main_dev' ...
    708a7869
    fix: 设备属性绑定新增搜索功能
    
    See merge request yunteng/thingskit-scada!123
    xp.Huang authored
    2023-09-12 08:39:48 +0000  
    Browse Files »
  • fix: 设备属性绑定新增搜索功能
    4374f235
    ww authored
    2023-09-12 14:13:08 +0800  
    Browse Directory »

11 Aug, 2023
2 commits
  • Merge branch 'fix/tcp-device-send-command' into 'main_dev' ...
    d15c0347
    fix: 修复tcp服务命令下发
    
    See merge request yunteng/thingskit-scada!121
    xp.Huang authored
    2023-08-11 11:43:11 +0000  
    Browse Files »
  • fix: 修复tcp服务命令下发
    462e7fa1
    ww authored
    2023-08-11 19:42:40 +0800  
    Browse Directory »