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
02 Nov, 2023
12 commits
  • 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 »
  • 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 »
  • Merge remote-tracking branch 'origin/fix/zfl' into perf/main_dev
    3cd4b201
    ww authored
    2023-11-02 14:26:06 +0800  
    Browse Directory »
  • perf: 移除vue3-seamless-scroll插件
    93a40494
    ww authored
    2023-11-02 14:25:34 +0800  
    Browse Files »
  • fix: 修改图表组件的表单获取
    3bb9a118
    loveumiko authored
    2023-11-02 11:47:59 +0800  
    Browse Files »
  • chore: 格式化代码
    609fffbb
    ww authored
    2023-11-02 11:20:02 +0800  
    Browse Directory »
  • fix: 修复仪表盘设置单位无效
    3a4f3218
    loveumiko authored
    2023-11-02 11:09:15 +0800  
    Browse Directory »
  • fix: 修改apiSelect不能搜索
    9ed0e7cf
    loveumiko authored
    2023-11-02 09:58:22 +0800  
    Browse Files »
  • Merge branch 'perf/main_dev' into 'main_dev' ...
    be4a782b
    Perf/main dev
    
    See merge request yunteng/thingskit-scada!157
    xp.Huang authored
    2023-11-02 01:14:59 +0000  
    Browse Files »

01 Nov, 2023
27 commits
  • fix: DEFECT-1731 修复重复提示
    135caac0
    ww authored
    2023-11-01 19:03:48 +0800  
    Browse Files »
  • fix: 修复仪表盘无法设置单位
    eb141885
    ww authored
    2023-11-01 18:59:10 +0800  
    Browse Directory »
  • Merge remote-tracking branch 'origin/fix/zfl' into perf/main_dev
    7bb8bcd5
    ww authored
    2023-11-01 18:36:53 +0800  
    Browse Directory »
  • fix: 修复柱状图预览模式下使用预览数据
    32a934a7
    ww authored
    2023-11-01 18:36:38 +0800  
    Browse Directory »
  • Merge branch 'perf/main_dev' of http://git.yunteng.com/yunteng/thingskit-scada into fix/zfl
    31e1fde6
    loveumiko authored
    2023-11-01 18:34:53 +0800  
    Browse Directory »
  • fix: 修复数据订阅时dataSourceJson存在可能为空的情况
    dfe6025f
    ww authored
    2023-11-01 18:32:25 +0800  
    Browse Files »
  • fix: 修改选择命令下发方式
    330cd047
    loveumiko authored
    2023-11-01 18:22:42 +0800  
    Browse Directory »
  • fix: DEFECT-1723 修复鼠标移入折线图时无法显示具体值
    1d986bc0
    ww authored
    2023-11-01 17:30:06 +0800  
    Browse Directory »
  • Merge branch 'perf/main_dev' of http://git.yunteng.com/yunteng/thingskit-scada into fix/zfl
    1b5b3369
    loveumiko authored
    2023-11-01 17:28:38 +0800  
    Browse Files »
  • Merge branch 'fix/zfl' into 'perf/main_dev' ...
    eb4f2d6a
    修改参数下发问题
    
    See merge request yunteng/thingskit-scada!156
    温伟 authored
    2023-11-01 09:18:16 +0000  
    Browse Directory »
  • fix: DEFECT-1727修复命令下发重复提示
    be8f1949
    ww authored
    2023-11-01 17:17:49 +0800  
    Browse Directory »
  • Merge branch 'perf/main_dev' of http://git.yunteng.com/yunteng/thingskit-scada into fix/zfl
    1a518774
    loveumiko authored
    2023-11-01 17:15:09 +0800  
    Browse Files »
  • fix: 修改参数下发问题
    b68a8c5d
    loveumiko authored
    2023-11-01 17:12:02 +0800  
    Browse Directory »
  • fix: DEFECT-1725删除界面后缀
    cd1291c3
    ww authored
    2023-11-01 17:08:43 +0800  
    Browse Files »
  • perf: 优化数字时钟无法设置字体大小
    ebea68b0
    ww authored
    2023-11-01 16:59:19 +0800  
    Browse Files »
  • fix: 修复apiSelect配置别名选项时option中无别名无法正确回显
    26bd2e0a
    ww authored
    2023-11-01 16:45:11 +0800  
    Browse Files »
  • Merge branch 'perf/main_dev' into 'main_dev' ...
    ad72cf40
    Perf/main dev
    
    See merge request yunteng/thingskit-scada!155
    xp.Huang authored
    2023-11-01 08:10:15 +0000  
    Browse Files »
  • fix: 优化折现图实时推送
    d28b93ae
    ww authored
    2023-11-01 16:03:41 +0800  
    Browse Directory »
  • fix: 修复组态在测试环境导入会打开新的浏览器窗口
    69642e56
    ww authored
    2023-11-01 15:48:34 +0800  
    Browse Files »
  • Merge branch 'perf/main_dev' of http://git.yunteng.com/yunteng/thingskit-scada into fix/zfl
    dffdac6d
    loveumiko authored
    2023-11-01 15:44:58 +0800  
    Browse Directory »
  • fix: 修改参数设置的问题i
    806534aa
    loveumiko authored
    2023-11-01 15:44:13 +0800  
    Browse Files »
  • perf: 优化更多图形库,无法隐藏已开启的图形库
    3afea5ed
    ww authored
    2023-11-01 15:23:43 +0800  
    Browse Directory »
  • perf: 优化默认展开基础元件
    9f18ee65
    ww authored
    2023-11-01 15:07:47 +0800  
    Browse Files »
  • fix: 修复导入xml为多页时,剩余页失效&&设备详情接口调用逻辑修改
    61ce2c23
    ww authored
    2023-11-01 14:43:32 +0800  
    Browse Files »
  • Merge branch 'perf/main_dev' of http://git.yunteng.com/yunteng/thingskit-scada into fix/zfl
    5b3085cb
    loveumiko authored
    2023-11-01 10:50:48 +0800  
    Browse Files »
  • perf: 优化折现图名称
    4c16f116
    ww authored
    2023-11-01 10:50:09 +0800  
    Browse Files »
  • Merge branch 'perf/main_dev' into 'main_dev' ...
    47d55da0
    Perf/main dev
    
    See merge request yunteng/thingskit-scada!154
    xp.Huang authored
    2023-11-01 01:17:41 +0000  
    Browse Files »

31 Oct, 2023
1 commit
  • Merge branch 'local_dev_ft' into 'perf/main_dev' ...
    2d6023c8
    fix: 组态,修改获取设备接口,新增传组织id
    
    See merge request yunteng/thingskit-scada!153
    温伟 authored
    2023-10-31 13:01:39 +0000  
    Browse Files »