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
25 Dec, 2023
2 commits
  • 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: 修复从流媒体平台配置的视频流无法播放
    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
3 commits
  • fix: 修复告警列表分享模式未查询告警列表
    33be1c63
    ww authored
    2023-12-04 20:01:46 +0800  
    Browse Files »
  • Merge branch 'perf/template-mode-device-query' into 'main_dev' ...
    cb975689
    Perf/template mode device query
    
    See merge request yunteng/thingskit-scada!193
    xp.Huang authored
    2023-12-04 06:41:41 +0000  
    Browse Files »
  • perf: 优化组态引用模板,查询设备接口变更
    df64f3a0
    dev001 authored
    2023-12-04 09:49:08 +0800  
    Browse Files »

01 Dec, 2023
5 commits
  • wip: 新增通过组态id查询设备列表接口
    0686d4ea
    loveumiko authored
    2023-12-01 17:58:55 +0800  
    Browse Files »
  • wip: 引用模板设备查询接口变更
    5cfe086b
    loveumiko authored
    2023-12-01 17:43:58 +0800  
    Browse File »
  • Merge branch 'fix/DEFECT-1798' into 'main_dev' ...
    0d8bf1b5
    fix: 修复组态属性下发弹框操作密码验证重复
    
    See merge request yunteng/thingskit-scada!192
    xp.Huang authored
    2023-12-01 08:03:14 +0000  
    Browse Files »
  • fix: 修复组态属性下发弹框操作密码验证重复
    5aed566e
    loveumiko authored
    2023-12-01 11:23:42 +0800  
    Browse Files »
  • fix: 修复组态属性下发弹框操作密码验证重复
    e200e178
    loveumiko authored
    2023-12-01 11:20:28 +0800  
    Browse Files »

28 Nov, 2023
4 commits
  • Merge branch 'fix/attribute-deliver-password' into 'main_dev' ...
    352568a8
    fix: 修复属性下发取消密码无效
    
    See merge request yunteng/thingskit-scada!191
    xp.Huang authored
    2023-11-28 12:59:50 +0000  
    Browse Files »
  • fix: 修复属性下发取消密码无效
    b32b4b05
    ww authored
    2023-11-28 20:15:21 +0800  
    Browse Files »
  • Merge branch 'fix/data-view-embed' into 'main_dev' ...
    3b23acae
    fix: 修复大屏内嵌组态,公开大屏未携带公开的大屏token
    
    See merge request yunteng/thingskit-scada!190
    xp.Huang authored
    2023-11-28 09:16:01 +0000  
    Browse Files »
  • fix: 修复大屏内嵌组态,公开大屏未携带公开的大屏token
    b582de0c
    ww authored
    2023-11-28 17:14:31 +0800  
    Browse Files »

27 Nov, 2023
2 commits
  • Merge branch 'fix/DEFECT-1755' into 'main_dev' ...
    bba347a4
    fix: 修复模版组态无法显示设备名称
    
    See merge request yunteng/thingskit-scada!189
    xp.Huang authored
    2023-11-27 11:10:22 +0000  
    Browse Files »
  • fix: 修复模版组态无法显示设备名称
    07a9bd39
    ww authored
    2023-11-27 18:03:24 +0800  
    Browse Files »

21 Nov, 2023
2 commits
  • Merge branch 'fix/DEFECT-1766' into 'main_dev' ...
    7d81e7a1
    fix: 修复双击事件无效
    
    See merge request yunteng/thingskit-scada!188
    xp.Huang authored
    2023-11-21 08:08:44 +0000  
    Browse Files »
  • fix: 修复双击事件无效
    9483f99d
    ww authored
    2023-11-21 11:27:19 +0800  
    Browse Files »

20 Nov, 2023
6 commits
  • Merge branch 'feat/button-components-add-image' into 'main_dev' ...
    0d962aab
    perf: 模版模式放开预览选项
    
    See merge request yunteng/thingskit-scada!187
    xp.Huang authored
    2023-11-20 09:44:10 +0000  
    Browse Files »
  • perf: 模版模式放开预览选项
    e04547e9
    ww authored
    2023-11-20 17:07:28 +0800  
    Browse Files »
  • Merge branch 'feat/button-components-add-image' into 'main_dev' ...
    b9f9cd58
    perf: 优化按钮组件图片未能自适应填充父元素
    
    See merge request yunteng/thingskit-scada!186
    xp.Huang authored
    2023-11-20 08:28:31 +0000  
    Browse Files »
  • perf: 优化按钮组件图片未能自适应填充父元素
    b6b788d6
    ww authored
    2023-11-20 16:25:43 +0800  
    Browse Files »
  • Merge branch 'feat/button-components-add-image' into 'main_dev' ...
    06b075b5
    feat: 按钮类别新增8个组件样式
    
    See merge request yunteng/thingskit-scada!185
    xp.Huang authored
    2023-11-20 07:54:12 +0000  
    Browse Files »
  • feat: 按钮类别新增8个组件样式
    555602d2
    ww authored
    2023-11-20 14:56:06 +0800  
    Browse Files »