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
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
4 commits
  • 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 »
  • fix: 修复组态预览时会进行内容最大化
    e0ebe5f1
    ww authored
    2023-06-20 10:30:45 +0800  
    Browse Files »
  • Merge branch 'feat/new-component-alarm-table' into 'main_dev' ...
    9f945cdf
    Feat/new component alarm table
    
    See merge request yunteng/thingskit-scada!72
    xp.Huang authored
    2023-06-20 02:14:40 +0000  
    Browse Directory »
  • fix: DEFECT-1342修复告警列表设备为必填项
    5a6f1a86
    ww authored
    2023-06-20 09:35:26 +0800  
    Browse Files »

15 Jun, 2023
1 commit
  • feat: 完成告警列表开发
    69fe9a7e
    ww authored
    2023-06-15 15:35:06 +0800  
    Browse Directory »

14 Jun, 2023
1 commit
  • fix: 修复开关按钮设置文字后预览页面文字丢失
    c551e652
    ww authored
    2023-06-14 15:46:20 +0800  
    Browse Directory »

13 Jun, 2023
5 commits
  • fix: 修复ant编译不通过打包失败
    066248da
    ww authored
    2023-06-13 17:22:30 +0800  
    Browse Directory »
  • fix: 修复控制元件更新
    6b7d70f9
    ww authored
    2023-06-13 16:55:30 +0800  
    Browse Files »
  • fix: 隐藏流量计组件与告警组件
    17a954d1
    ww authored
    2023-06-13 15:32:33 +0800  
    Browse Directory »
  • fix: 修复参数设置按钮样式问题
    a237e013
    ww authored
    2023-06-13 15:28:50 +0800  
    Browse Files »
  • fix: 固定页面尺寸背景, 超出后不衍生背景
    0b73e858
    ww authored
    2023-06-13 13:57:25 +0800  
    Browse Files »

12 Jun, 2023
3 commits
  • Merge branch 'fix/DEFECT-1329' into 'main_dev' ...
    b22c9db1
    fix: 修复参数设置组件可以变更样式
    
    See merge request yunteng/thingskit-scada!71
    xp.Huang authored
    2023-06-12 09:34:13 +0000  
    Browse Files »
  • fix: 修复参数设置组件可以变更样式
    f1c5b3ac
    ww authored
    2023-06-12 17:01:23 +0800  
    Browse Files »
  • feat: 完成告警列表组件的开发
    aa68f537
    ww authored
    2023-06-12 15:48:06 +0800  
    Browse Files »

08 Jun, 2023
2 commits
  • Merge branch 'build/build-package-faild' into 'main_dev' ...
    72a2c545
    fix: 修复ant编译不通过打包失败
    
    See merge request yunteng/thingskit-scada!70
    xp.Huang authored
    2023-06-08 10:15:20 +0000  
    Browse Files »
  • fix: 修复ant编译不通过打包失败
    b91648ae
    ww authored
    2023-06-08 10:15:08 +0800  
    Browse Files »

05 Jun, 2023
2 commits
  • Merge branch 'fix/DEFECT-1290' into 'main_dev' ...
    bb68b6a5
    fix: 修复新增第二页无默认页面设计尺寸
    
    See merge request yunteng/thingskit-scada!69
    xp.Huang authored
    2023-06-05 02:04:37 +0000  
    Browse Files »
  • fix: 修复新增第二页无默认页面设计尺寸
    80d0c595
    ww authored
    2023-06-05 10:03:20 +0800  
    Browse Directory »

01 Jun, 2023
2 commits
  • Merge branch 'dev-fix-ww' into 'main_dev' ...
    d8f4966f
    feat: 新增流量计组件
    
    See merge request yunteng/thingskit-scada!68
    xp.Huang authored
    2023-06-01 06:11:06 +0000  
    Browse Files »
  • feat: 新增流量计组件
    cdcf00db
    ww authored
    2023-06-01 14:01:47 +0800  
    Browse Files »

24 May, 2023
1 commit
  • Merge branch 'fix-chart' into 'main_dev' ...
    42ceaf40
    fix: 修复图表绑定相同设备不同属性时,图表更新bug
    
    See merge request yunteng/thingskit-scada!67
    xp.Huang authored
    2023-05-24 01:44:27 +0000  
    Browse Files »