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
26 Jul, 2023
1 commit
  • fix: 隐藏github,gitlab,oneDrive按钮
    ea9499fa
    ww authored
    2023-07-26 14:21:48 +0800  
    Browse Directory »

23 Jul, 2023
4 commits
  • Merge branch 'perf/tcp-sensor-send-command' into 'main_dev' ...
    e790793c
    perf: tcp子设备下发参数时使用modbus生成命令
    
    See merge request yunteng/thingskit-scada!89
    xp.Huang authored
    2023-07-23 09:26:53 +0000  
    Browse Files »
  • perf: tcp子设备下发参数时使用modbus生成命令
    7dc23102
    ww authored
    2023-07-23 16:26:02 +0800  
    Browse File »
  • Merge branch 'fix/iframe-fit-page' into 'main_dev' ...
    5ec211d0
    fix: 修复组态使用iframe嵌套时未自适应页面
    
    See merge request yunteng/thingskit-scada!87
    xp.Huang authored
    2023-07-23 03:07:57 +0000  
    Browse Files »
  • fix: 修复组态使用iframe嵌套时未自适应页面
    2aead0f8
    ww authored
    2023-07-23 11:04:51 +0800  
    Browse Files »

13 Jul, 2023
1 commit
  • Merge branch 'fix/service-invoke' into 'main_dev' ...
    fdde315f
    fix: 修复服务命令同步为双向异步为单向
    
    See merge request yunteng/thingskit-scada!86
    xp.Huang authored
    2023-07-13 02:31:03 +0000  
    Browse Files »

12 Jul, 2023
1 commit
  • fix: 修复服务命令同步为双向异步为单向
    cac1be02
    ww authored
    2023-07-12 11:23:21 +0800  
    Browse Files »

07 Jul, 2023
2 commits
  • Merge branch 'fix/service-command-issue' into 'main_dev' ...
    52661c2c
    fix: 修复服务命令下发同步异步方式&&过滤只读输入参数
    
    See merge request yunteng/thingskit-scada!84
    xp.Huang authored
    2023-07-07 09:15:16 +0000  
    Browse Files »
  • fix: 修复服务命令下发同步异步方式&&过滤只读输入参数
    8ec548e9
    ww authored
    2023-07-07 16:35:20 +0800  
    Browse File »

06 Jul, 2023
4 commits
  • Merge branch 'fix/control-component-service-identifer' into 'main_dev' ...
    2638b4c5
    fix: 控制组件调用服务时携带标识符
    
    See merge request yunteng/thingskit-scada!83
    xp.Huang authored
    2023-07-06 13:19:02 +0000  
    Browse Files »
  • fix: 控制组件调用服务时携带标识符
    ff27dfce
    ww authored
    2023-07-06 21:17:03 +0800  
    Browse Directory »
  • Merge branch 'fix/video-select-empty-option' into 'main_dev' ...
    50b90be9
    fix: 修复视频组件选择空选项报错
    
    See merge request yunteng/thingskit-scada!82
    xp.Huang authored
    2023-07-06 12:50:50 +0000  
    Browse Files »
  • fix: 修复视频组件选择空选项报错
    cfb41d63
    ww authored
    2023-07-06 20:46:16 +0800  
    Browse Directory »

05 Jul, 2023
5 commits
  • Merge branch 'fix/DEFECT-1383' into 'main_dev' ...
    7eff4a0b
    fix: 修复组态导入时图表组件未渲染示例
    
    See merge request yunteng/thingskit-scada!81
    xp.Huang authored
    2023-07-05 09:50:13 +0000  
    Browse Files »
  • Merge branch 'fix/DEFECT-1367' into 'main_dev' ...
    b63786bb
    fix: 修复组态导入时页面title变更为文件名
    
    See merge request yunteng/thingskit-scada!80
    xp.Huang authored
    2023-07-05 09:49:57 +0000  
    Browse Files »
  • fix: 修复组态导入时图表组件未渲染示例
    28af9e3e
    ww authored
    2023-07-05 15:46:32 +0800  
    Browse Files »
  • fix: 修复组态导入时图表组件未渲染示例
    e8209777
    ww authored
    2023-07-05 15:45:46 +0800  
    Browse Directory »
  • fix: 修复组态导入时页面title变更为文件名
    3ab7d514
    ww authored
    2023-07-05 15:36:12 +0800  
    Browse Files »

03 Jul, 2023
2 commits
  • Merge branch 'fix/DEFECT-1355' into 'main_dev' ...
    417e64f3
    fix: DEFECT-1355修复根据平台信息设置的网页徽标使用错误
    
    See merge request yunteng/thingskit-scada!79
    xp.Huang authored
    2023-07-03 11:30:55 +0000  
    Browse Files »
  • fix: DEFECT-1355修复根据平台信息设置的网页徽标使用错误
    f157160d
    ww authored
    2023-07-03 17:40:26 +0800  
    Browse Files »

30 Jun, 2023
10 commits
  • Merge branch 'feat/video-component-support-rtsp-protocol' into main_dev
    0eef5f3a
    ww authored
    2023-06-30 18:18:41 +0800  
    Browse Files »
  • fix: flv.js启用自动清除缓存
    7ceb7774
    ww authored
    2023-06-30 16:58:59 +0800  
    Browse Files »
  • fix: 修复flv.js开启自动清除缓存报错
    fdd95672
    ww authored
    2023-06-30 15:57:19 +0800  
    Browse Files »
  • fix: 修复部分文件被加入git追踪
    045d7146
    ww authored
    2023-06-30 15:11:58 +0800  
    Browse Directory »
  • fix: 修复部分文件被加入git最终
    35c7da9a
    ww authored
    2023-06-30 15:09:45 +0800  
    Browse Directory »
  • Merge branch 'feat/video-component-support-rtsp-protocol' into 'main_dev' ...
    98dd27b6
    feat: 实现视频组件rtsp协议
    
    See merge request yunteng/thingskit-scada!77
    xp.Huang authored
    2023-06-30 01:58:06 +0000  
    Browse Files »
  • merge: 合并代码解决冲突
    55f983a6
    ww authored
    2023-06-30 09:53:28 +0800  
    Browse Files »
  • Merge branch 'feat/dynamic-title-switch' into 'main_dev' ...
    983cac4e
    perf: 变量图片将按钮选项置顶, 图表组件实时数据堆叠数据截取
    
    See merge request yunteng/thingskit-scada!76
    xp.Huang authored
    2023-06-30 01:45:47 +0000  
    Browse Files »
  • perf: flv设置自动清除缓存
    549740f5
    ww authored
    2023-06-30 09:28:05 +0800  
    Browse Directory »
  • perf: flv设置自动清除缓存
    83f3cf6d
    ww authored
    2023-06-30 09:27:10 +0800  
    Browse Files »

29 Jun, 2023
2 commits
  • feat: 实现视频组件rtsp协议
    f06719d1
    ww authored
    2023-06-29 20:21:24 +0800  
    Browse Directory »
  • feat: 视频组件实现flv协议播放
    eca96f70
    ww authored
    2023-06-29 20:06:05 +0800  
    Browse Files »

28 Jun, 2023
1 commit
  • perf: 变量图片将按钮选项置顶, 图表组件实时数据堆叠数据截取
    14a8747e
    ww authored
    2023-06-28 14:07:14 +0800  
    Browse Directory »

27 Jun, 2023
3 commits
  • Merge branch 'feat/dynamic-title-switch' into 'main_dev' ...
    74259d51
    feat: 文本组件新增标题控制
    
    See merge request yunteng/thingskit-scada!75
    xp.Huang authored
    2023-06-27 06:29:31 +0000  
    Browse Files »
  • chore: 合并代码解决冲突
    22e00dac
    ww authored
    2023-06-27 11:50:15 +0800  
    Browse Files »
  • feat: 文本组件新增标题控制
    a380e6d8
    ww authored
    2023-06-27 11:28:27 +0800  
    Browse Directory »

21 Jun, 2023
3 commits
  • Merge branch 'cherry-pick-8894b5a8' into 'main' ...
    dc3aa56e
    fix: 允许文件未找到,设置allowEmpty:true
    
    See merge request yunteng/thingskit-scada!74
    xp.Huang authored
    2023-06-21 02:34:33 +0000  
    Browse Files »
  • fix: 允许文件未找到,设置allowEmpty:true ...
    b56ed380
    
    (cherry picked from commit 8894b5a8)
    xp.Huang authored
    2023-06-21 10:34:12 +0800  
    Browse Files »
  • fix: 允许文件未找到,设置allowEmpty:true
    8894b5a8
    xp.Huang authored
    2023-06-21 10:33:03 +0800  
    Browse Files »

20 Jun, 2023
1 commit
  • Merge branch 'feat/new-component-alarm-table' into 'main_dev' ...
    3010d5b2
    fix: 修复组态预览时会进行内容最大化
    
    See merge request yunteng/thingskit-scada!73
    xp.Huang authored
    2023-06-20 03:45:10 +0000  
    Browse Directory »