Sign in

简柏林 / thingskit-front · Commits

GitLab

  • Go to dashboard
  • Project
  • Activity
  • Files
  • Commits
  • Builds 0
  • Graphs
  • Milestones
  • Issues 0
  • Merge Requests 0
  • Labels
  • Wiki
  • Network
  • Commits 4,552
  • Network
  • Compare
  • Branches 9
  • Tags 0
  • thingskit-front
14 Nov, 2023
4 commits
  • Merge branch 'fix/DEFECT-1748' into 'main_dev' ...
    04568e8f
    fix: 修复场景联动选择框上下移动时会跟随移动,固定位置
    
    See merge request yunteng/thingskit-front!1003
    xp.Huang authored
    2023-11-14 07:18:29 +0000  
    Browse Directory »
  • Merge branch 'fix/DEFECT-1743' into 'main_dev' ...
    96e35f38
    fix: 修复看板组件编辑,复制等提示去掉后面符号
    
    See merge request yunteng/thingskit-front!1002
    xp.Huang authored
    2023-11-14 07:14:13 +0000  
    Browse Files »
  • revert: 场景联动查询时间
    8748a0eb
    xp.Huang authored
    2023-11-14 10:24:27 +0800  
    Browse Directory »
  • fix: 修复场景联动选择框上下移动时会跟随移动,固定位置
    f6c9e1e2
    loveumiko authored
    2023-11-14 09:52:47 +0800  
    Browse Files »

13 Nov, 2023
7 commits
  • Merge branch 'perf/linkedage-enable-rule' into 'main_dev' ...
    831bd1ad
    Perf/linkedage enable rule
    
    See merge request yunteng/thingskit-front!1001
    xp.Huang authored
    2023-11-13 09:02:04 +0000  
    Browse Files »
  • fix: 修复看板组件编辑,复制等提示去掉后面符号
    72c28a55
    loveumiko authored
    2023-11-13 16:57:31 +0800  
    Browse Directory »
  • fix: 修复启用规则开始时间能大于结束时间
    2a662c47
    ww authored
    2023-11-13 16:57:25 +0800  
    Browse Files »
  • Merge branch 'local_fix_report_config_by_ft' into 'main_dev' ...
    4b86efb5
    fix: 修复报表导出,报表查看,日期取值问题
    
    See merge request yunteng/thingskit-front!1000
    xp.Huang authored
    2023-11-13 03:50:46 +0000  
    Browse Files »
  • fix: 修复报表导出,报表查看,日期取值问题
    9641390f
    fengwotao authored
    2023-11-13 11:48:19 +0800  
    Browse Directory »
  • Merge branch 'fix/report-config' into 'main_dev' ...
    03ccb74b
    fix: 修复报表配置数据类型为原始数据时存在时间间隔字段
    
    See merge request yunteng/thingskit-front!999
    xp.Huang authored
    2023-11-13 00:50:09 +0000  
    Browse Files »
  • Merge branch 'fix/linkedge' into 'main_dev' ...
    ebafc985
    fix: 修复场景联动启用规则在查看模式下能打开其他规则
    
    See merge request yunteng/thingskit-front!998
    xp.Huang authored
    2023-11-13 00:49:59 +0000  
    Browse Files »

10 Nov, 2023
8 commits
  • fix: 修复报表配置数据类型为原始数据时存在时间间隔字段
    53818391
    ww authored
    2023-11-10 11:37:30 +0800  
    Browse Directory »
  • fix: 修复场景联动启用规则在查看模式下能打开其他规则
    c09465de
    ww authored
    2023-11-10 10:52:08 +0800  
    Browse Files »
  • Merge branch 'perf/linkedage-enable-ruleB' into 'main_dev' ...
    7cbcfb69
    perf: 优化时间选择
    
    See merge request yunteng/thingskit-front!997
    xp.Huang authored
    2023-11-10 02:22:46 +0000  
    Browse Files »
  • perf: 优化时间选择
    b96ff940
    ww authored
    2023-11-10 10:08:27 +0800  
    Browse Files »
  • Merge branch 'perf/linkedge' into 'main_dev' ...
    8f68d27e
    perf: 优化场景联动条件筛选按钮名称
    
    See merge request yunteng/thingskit-front!996
    xp.Huang authored
    2023-11-10 01:21:33 +0000  
    Browse Files »
  • perf: 优化场景联动条件筛选按钮名称
    c722b968
    ww authored
    2023-11-10 09:13:56 +0800  
    Browse Files »
  • Merge branch 'fix/rule-chain-show-detail-mode' into 'main_dev' ...
    611cecc5
    fix: 修复场景联动查看详情时无法打开启用规则
    
    See merge request yunteng/thingskit-front!993
    xp.Huang authored
    2023-11-10 01:11:13 +0000  
    Browse Directory »
  • Merge branch 'fix/rule-chain' into 'main_dev' ...
    d6525211
    fix: 修复规则链设备配置无法选择状态
    
    See merge request yunteng/thingskit-front!992
    xp.Huang authored
    2023-11-10 01:11:03 +0000  
    Browse Directory »

09 Nov, 2023
2 commits
  • fix: 修复规则链查看详情时无法打开启用规则
    a77e24ac
    ww authored
    2023-11-09 16:02:49 +0800  
    Browse Files »
  • fix: 修复规则链设备配置无法选择状态
    6c2311a0
    ww authored
    2023-11-09 15:32:32 +0800  
    Browse Directory »

08 Nov, 2023
1 commit
  • Merge branch 'local_dev_branch_by_ft' into 'main_dev' ...
    31a31840
    fix: DEFECT-1741 修改报表导出点击报表查看趋势图里属性映射成物模型的标识符名
    
    See merge request yunteng/thingskit-front!991
    xp.Huang authored
    2023-11-08 11:37:58 +0000  
    Browse Files »

06 Nov, 2023
1 commit
  • fix: DEFECT-1741 修改报表导出点击报表查看趋势图里属性映射成物模型的标识符名
    2b2a1c3b
    fengwotao authored
    2023-11-06 15:29:05 +0800  
    Browse Directory »

03 Nov, 2023
14 commits
  • feat:合并ThingsKit v1.2.0版本
    56943d39
    xp.Huang authored
    2023-11-03 07:24:34 +0000  
    Browse Directory »
  • Merge branch 'fix/video-control-tootip' into 'main_dev' ...
    9e16bbfb
    fi: 云台控制添加tooltip文字提示
    
    See merge request yunteng/thingskit-front!988
    xp.Huang authored
    2023-11-03 07:01:22 +0000  
    Browse Files »
  • ci: 修改配置文件
    48dec295
    xp.Huang authored
    2023-11-03 14:58:06 +0800  
    Browse Files »
  • fi: 云台控制添加tooltip文字提示
    be82ec80
    loveumiko authored
    2023-11-03 14:56:46 +0800  
    Browse Files »
  • Merge branch 'feat/device-new-protocol' into 'main_dev' ...
    951f8bb5
    fix: 隐藏GBT28181的页面和逻辑
    
    See merge request yunteng/thingskit-front!986
    xp.Huang authored
    2023-11-03 06:06:21 +0000  
    Browse Files »
  • fix: 隐藏GBT81的逻辑和页面展示
    e8c89150
    loveumiko authored
    2023-11-03 14:05:51 +0800  
    Browse Files »
  • fix: 隐藏GBT81的逻辑和页面展示
    329bf38b
    loveumiko authored
    2023-11-03 12:45:28 +0800  
    Browse Files »
  • fix: 隐藏GBT81的逻辑和页面展示
    bc5993c7
    loveumiko authored
    2023-11-03 12:43:56 +0800  
    Browse Files »
  • fix: 隐藏GBT81的逻辑和页面展示
    01401887
    loveumiko authored
    2023-11-03 11:49:07 +0800  
    Browse Files »
  • Merge branch 'main_dev' of http://git.yunteng.com/yunteng/thingskit-front into f… ...
    96b74e63
    …eat/device-new-protocol
    loveumiko authored
    2023-11-03 11:39:09 +0800  
    Browse Files »
  • Merge branch 'perf/history-data-query-form' into 'main_dev' ...
    2cc73ce7
    perf: 调整历史数据表单顺序调整
    
    See merge request yunteng/thingskit-front!984
    xp.Huang authored
    2023-11-03 03:13:05 +0000  
    Browse Files »
  • perf: 调整历史数据表单顺序调整
    c509f617
    ww authored
    2023-11-03 09:39:20 +0800  
    Browse Files »
  • Merge branch 'fix/introduce' into 'main_dev' ...
    209639c0
    fix: 修改文件变量引入失败
    
    See merge request yunteng/thingskit-front!983
    xp.Huang authored
    2023-11-03 01:05:37 +0000  
    Browse Files »
  • fix: 修改文件引入问题
    a60c40c4
    loveumiko authored
    2023-11-03 09:03:30 +0800  
    Browse Files »

02 Nov, 2023
3 commits
  • Merge branch 'fix/configuration-center' into 'main_dev' ...
    e2255bd0
    fix: 修复组态权限区分
    
    See merge request yunteng/thingskit-front!982
    xp.Huang authored
    2023-11-02 15:01:49 +0000  
    Browse Files »
  • Merge branch 'local_dev_branch_by_ft' into 'main_dev' ...
    73ce7b23
    fix: 修改阿里云或者腾讯云发送参数,校验参数问题
    
    See merge request yunteng/thingskit-front!981
    xp.Huang authored
    2023-11-02 15:01:32 +0000  
    Browse Files »
  • fix: 修复温度计无法动态更新刻度
    7bc12e52
    ww authored
    2023-11-02 22:20:11 +0800  
    Browse Files »