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 Dec, 2023
4 commits
  • 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
8 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 »
  • Merge branch 'fix/operation-check-status' into 'main_dev' ...
    bce1b3c6
    fix: 修复状态设置启用状态更新失败
    
    See merge request yunteng/thingskit-scada!184
    xp.Huang authored
    2023-11-20 01:40:36 +0000  
    Browse Files »
  • fix: 修复状态设置启用状态更新失败
    62b144e1
    ww authored
    2023-11-20 09:39:28 +0800  
    Browse Files »

17 Nov, 2023
7 commits
  • Merge branch 'fix/checkd-status-lose' into 'main_dev' ...
    48141291
    Fix/checkd status lose
    
    See merge request yunteng/thingskit-scada!183
    温伟 authored
    2023-11-17 08:30:43 +0000  
    Browse Files »
  • fix: 修复选中状态丢失
    9af7db61
    ww authored
    2023-11-17 16:30:23 +0800  
    Browse Files »
  • Merge branch 'feat/click-event-add-attribute-send' into 'main_dev' ...
    91b6be51
    feat: 事件下发新增属性下发
    
    See merge request yunteng/thingskit-scada!182
    xp.Huang authored
    2023-11-17 08:15:42 +0000  
    Browse Files »
  • feat: 事件下发新增属性下发
    312ed103
    ww authored
    2023-11-17 16:14:25 +0800  
    Browse Files »
  • Merge branch 'perf/event-template' into 'main_dev' ...
    2d4c51e3
    perf: 优化事件在模版模式中无法选择产品
    
    See merge request yunteng/thingskit-scada!181
    xp.Huang authored
    2023-11-17 08:13:00 +0000  
    Browse Files »
  • feat: 事件下发新增属性下发
    d793d9ef
    ww authored
    2023-11-17 16:11:58 +0800  
    Browse Directory »
  • perf: 优化事件在模版模式中无法选择产品
    358bd696
    ww authored
    2023-11-17 09:40:28 +0800  
    Browse Files »

16 Nov, 2023
2 commits
  • Merge branch 'fix/template-mode-data-effect' into 'main_dev' ...
    c78fb78e
    fix: 修复组态在创建模版时数据动效未将设备Id置为空
    
    See merge request yunteng/thingskit-scada!180
    xp.Huang authored
    2023-11-16 01:27:37 +0000  
    Browse Files »
  • Merge branch 'perf/water-flow-component' into 'main_dev' ...
    a201616e
    perf: 优化流速设置时,新增tooltip提示
    
    See merge request yunteng/thingskit-scada!179
    xp.Huang authored
    2023-11-16 01:27:23 +0000  
    Browse Files »

15 Nov, 2023
8 commits
  • fix: 修复组态在创建模版时数据动效未将设备Id置为空
    2ad418e5
    ww authored
    2023-11-15 17:42:00 +0800  
    Browse Files »
  • perf: 优化流速设置时,新增tooltip提示
    4a1e9987
    ww authored
    2023-11-15 17:15:39 +0800  
    Browse Files »
  • Merge branch 'feat/oss-support' into 'main_dev' ...
    a492541f
    pref: 优化oss地址拼接
    
    See merge request yunteng/thingskit-scada!178
    xp.Huang authored
    2023-11-15 07:20:33 +0000  
    Browse Files »
  • pref: 优化oss地址拼接
    b21477ad
    ww authored
    2023-11-15 15:17:42 +0800  
    Browse Files »
  • Merge branch 'feat/oss-support' into 'main_dev' ...
    fb500fb3
    fix: 修复复制oss文件名拼接问题
    
    See merge request yunteng/thingskit-scada!177
    xp.Huang authored
    2023-11-15 07:13:53 +0000  
    Browse Files »
  • fix: 修复复制oss文件名拼接问题
    ea19aba8
    ww authored
    2023-11-15 15:11:26 +0800  
    Browse Files »
  • Merge branch 'feat/oss-support' into 'main_dev' ...
    f56c60da
    feat: oss支持
    
    See merge request yunteng/thingskit-scada!176
    xp.Huang authored
    2023-11-15 06:20:02 +0000  
    Browse Files »
  • feat: oss支持
    98f606aa
    ww authored
    2023-11-15 13:54:15 +0800  
    Browse Files »

08 Nov, 2023
3 commits
  • Merge branch 'feat/flow-compoment' into 'main_dev' ...
    518f8712
    perf: 水流组件新增流动速度设置
    
    See merge request yunteng/thingskit-scada!174
    xp.Huang authored
    2023-11-08 11:38:19 +0000  
    Browse Files »
  • perf: 水流组件新增流动速度设置
    d2512d27
    ww authored
    2023-11-08 17:44:10 +0800  
    Browse Files »
  • Merge branch 'fix/get-device-list-by-productIds' into 'main_dev' ...
    65e24b17
    fix: 修复当产品id为空时,http请求携带参数需为空数组
    
    See merge request yunteng/thingskit-scada!173
    xp.Huang authored
    2023-11-08 02:51:01 +0000  
    Browse Files »