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
03 Nov, 2023
22 commits
  • Merge branch 'main_dev' into 'main' ...
    c4611147
    perf: 优化密码设置需要先完成单击事件绑定
    
    See merge request yunteng/thingskit-scada!172
    xp.Huang authored
    2023-11-03 13:57:17 +0000  
    Browse Files »
  • 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 'main_dev' into 'main' ...
    038da2bb
    fix: 修复双向命令下发时判断设备在线取值错误
    
    See merge request yunteng/thingskit-scada!170
    xp.Huang authored
    2023-11-03 09:44:51 +0000  
    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 'main_dev' into 'main' ...
    ab381347
    fix: 修复Xml2JS类在windows环境下打包获取路径链接符号为反斜杠
    
    See merge request yunteng/thingskit-scada!168
    xp.Huang authored
    2023-11-03 08:55:57 +0000  
    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 »
  • Merge remote-tracking branch 'origin/main_dev' ...
    4a422fab
    # Conflicts:
    #	README-DEFAULT.md
    #	src/main/webapp/js/api/index.js
    #	src/main/webapp/js/const/const.js
    #	src/main/webapp/js/diagramly/sidebar/thingskit/Sidebar-Basic-Components.js
    #	src/main/webapp/js/diagramly/sidebar/thingskit/Sidebar-Charts.js
    #	src/main/webapp/js/grapheditor/Format.js
    #	src/main/webapp/styles/formatChange.css
    xp.Huang authored
    2023-11-03 16:24:53 +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
18 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 Directory »
  • fix: 修复视频预览问题
    8bb1c7fa
    loveumiko authored
    2023-11-02 20:13:56 +0800  
    Browse Files »
  • Merge branch 'perf/main_dev' into 'main_dev' ...
    88b3d777
    Perf/main dev
    
    See merge request yunteng/thingskit-scada!160
    xp.Huang authored
    2023-11-02 09:46:18 +0000  
    Browse Files »
  • Merge branch 'fix/zfl' into 'perf/main_dev' ...
    1eeb7d47
    fix: 修复设备选择是网关子时命令下发方式没有服务调用
    
    See merge request yunteng/thingskit-scada!159
    温伟 authored
    2023-11-02 09:43:04 +0000  
    Browse Directory »
  • perf: 优化组件样式绑定
    25c4dad5
    ww authored
    2023-11-02 17:42:39 +0800  
    Browse Directory »
  • fix: 修复设备选择是网关子时命令下发方式没有服务调用
    971ce856
    loveumiko authored
    2023-11-02 16:38:49 +0800  
    Browse Directory »
  • Merge branch 'main_dev' of http://git.yunteng.com/yunteng/thingskit-scada into fix/zfl
    4da4ac9e
    loveumiko authored
    2023-11-02 16:30:53 +0800  
    Browse Files »
  • fix: 修复设备选择是网关子时命令下发方式没有服务调用
    fbbd8867
    loveumiko authored
    2023-11-02 16:30:31 +0800  
    Browse Directory »
  • perf: 更换图片组件占位符
    c263f243
    ww authored
    2023-11-02 16:14:52 +0800  
    Browse Directory »
  • perf: 优化图片组件的默认图片
    210ac5f1
    ww authored
    2023-11-02 15:49:14 +0800  
    Browse Files »
  • perf: 优化温度计配置
    c874188d
    ww authored
    2023-11-02 15:42:29 +0800  
    Browse Files »
  • fix: 修改图表组件模板时传输数据问题
    ed5d14f1
    loveumiko authored
    2023-11-02 15:27:44 +0800  
    Browse Files »
  • fix: 解决代码冲突
    f9476cd0
    loveumiko authored
    2023-11-02 15:16:58 +0800  
    Browse Directory »
  • fix: 图表组件添加显示设备属性名称
    722457ac
    loveumiko authored
    2023-11-02 15:04:05 +0800  
    Browse Directory »