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 Nov, 2023
2 commits
  • 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 »
  • 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
4 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 »
  • fix: 修复当产品id为空时,http请求携带参数需为空数组
    e0cad1d0
    ww authored
    2023-11-08 10:47:56 +0800  
    Browse Files »

03 Nov, 2023
18 commits
  • Merge branch 'fix/device-send-command' into 'main_dev' ...
    562c3382
    fix: 修复服务未区分单双向
    
    See merge request yunteng/thingskit-scada!171
    xp.Huang authored
    2023-11-03 10:41:10 +0000  
    Browse Files »
  • perf: 优化密码设置需要先完成单击事件绑定
    c295fc3e
    ww authored
    2023-11-03 18:26:19 +0800  
    Browse Files »
  • fix: 修复服务未区分单双向
    cf27002b
    ww authored
    2023-11-03 18:09:29 +0800  
    Browse Files »
  • Merge branch 'fix/device-send-command' into 'main_dev' ...
    6b0ad371
    fix: 修复双向命令下发时判断设备在线取值错误
    
    See merge request yunteng/thingskit-scada!169
    xp.Huang authored
    2023-11-03 09:43:36 +0000  
    Browse Files »
  • fix: 修复双向命令下发时判断设备在线取值错误
    75ede56f
    ww authored
    2023-11-03 17:15:13 +0800  
    Browse Files »
  • Merge branch 'fix/update-page-size-by-platform' into 'main_dev' ...
    24dd3e99
    Fix/update page size by platform
    
    See merge request yunteng/thingskit-scada!167
    xp.Huang authored
    2023-11-03 08:47:42 +0000  
    Browse Files »
  • fix: 修复Xml2JS类在windows环境下打包获取路径链接符号为反斜杠
    d8763b53
    ww authored
    2023-11-03 16:46:10 +0800  
    Browse Files »
  • fix: 修复不同类型的组态页面尺寸设置
    9d688503
    ww authored
    2023-11-03 16:00:57 +0800  
    Browse Files »
  • Merge branch 'fix/app-login' into 'main_dev' ...
    ab46207e
    perf: 优化小程序访问组态需要获取token
    
    See merge request yunteng/thingskit-scada!165
    xp.Huang authored
    2023-11-03 07:28:28 +0000  
    Browse Files »
  • perf: 优化小程序访问组态需要获取token
    45af203c
    ww authored
    2023-11-03 15:21:11 +0800  
    Browse Directory »
  • Merge branch 'fix/build-file-path-not-found' into 'main_dev' ...
    20c705aa
    fix: 修复build构建时部分文件路径错误
    
    See merge request yunteng/thingskit-scada!164
    xp.Huang authored
    2023-11-03 03:35:07 +0000  
    Browse Files »
  • fix: 修复build构建时部分文件路径错误
    68bc6e51
    ww authored
    2023-11-03 11:25:45 +0800  
    Browse Files »
  • Merge branch 'perf/main_dev' into 'main_dev' ...
    c483fa56
    perf: 优化告警列表组件,少于十条数据时不滚动
    
    See merge request yunteng/thingskit-scada!162
    xp.Huang authored
    2023-11-03 03:13:13 +0000  
    Browse Files »
  • Merge branch 'fix/zfl' into 'perf/main_dev' ...
    7d6ff37f
    修复组态下发命令一直是单向和数据动效显示隐藏隐藏组件取值
    
    See merge request yunteng/thingskit-scada!163
    温伟 authored
    2023-11-03 03:10:40 +0000  
    Browse Files »
  • Merge branch 'perf/main_dev' of http://git.yunteng.com/yunteng/thingskit-scada into fix/zfl
    c03ca117
    loveumiko authored
    2023-11-03 11:09:19 +0800  
    Browse Files »
  • fix: 修复组态下发命令一直是单向和数据动效显示隐藏隐藏组件取值
    00c98f1f
    loveumiko authored
    2023-11-03 11:08:53 +0800  
    Browse Files »
  • perf: 优化告警列表组件,少于十条数据是不滚动
    182da788
    ww authored
    2023-11-03 10:38:19 +0800  
    Browse Files »
  • fix: 修复变量图片表格输入框没对齐的问题
    f8edc316
    loveumiko authored
    2023-11-03 10:05:07 +0800  
    Browse Files »

02 Nov, 2023
6 commits
  • Merge branch 'perf/main_dev' into 'main_dev' ...
    d971016c
    Perf/main dev
    
    See merge request yunteng/thingskit-scada!161
    xp.Huang authored
    2023-11-02 15:01:42 +0000  
    Browse Files »
  • pref: 优化组态权限控制
    df2c8a55
    ww authored
    2023-11-02 21:00:02 +0800  
    Browse Files »
  • perf: 优化组态权限控制
    68af5265
    ww authored
    2023-11-02 20:50:26 +0800  
    Browse Directory »
  • Merge remote-tracking branch 'origin/fix/zfl' into perf/main_dev
    e92ec172
    ww authored
    2023-11-02 20:21:54 +0800  
    Browse Files »
  • perf: 优化组态权限控制
    f9957e6b
    ww authored
    2023-11-02 20:21:39 +0800  
    Browse Files »
  • fix: 修复视频预览问题
    8bb1c7fa
    loveumiko authored
    2023-11-02 20:13:56 +0800  
    Browse Files »