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
02 Mar, 2022
1 commit
  • feat:新增场景联动新增按钮,删除按钮和编辑按钮权限,fix:修复设备配置编辑第三步数据回显和无法删除报警规则,修改设备配置文件夹名字
    d9aba9ca
    fengtao authored
    2022-03-02 09:39:33 +0800  
    Browse Files »

01 Mar, 2022
2 commits
  • Merge branch 'main' into ft-dev
    2e024266
    fengtao authored
    2022-03-01 10:26:59 +0800  
    Browse Files »
  • fix:修改账号管理点击编辑时,手机号为空字符串,邮箱为空字符问题
    fbf60ae5
    fengtao authored
    2022-03-01 10:25:45 +0800  
    Browse Files »

28 Feb, 2022
16 commits
  • Merge branch 'sqy_dev' into 'main' ...
    6808b942
    '修复角色,增加修改密码menu'
    
    See merge request huang/yun-teng-iot-front!138
    xp.Huang authored
    2022-02-28 13:28:09 +0000  
    Browse Files »
  • '修复角色,增加修改密码menu'
    4bbd7c10
    sqy authored
    2022-02-28 21:26:17 +0800  
    Browse Files »
  • Merge branch 'sqy_dev' into 'main' ...
    dc0a8c8b
    'fix:修改主题色,调整页面菜单文件名称
    
    See merge request huang/yun-teng-iot-front!137
    xp.Huang authored
    2022-02-28 11:57:26 +0000  
    Browse Files »
  • '调整文件名称'
    5945f8fe
    sqy authored
    2022-02-28 19:49:14 +0800  
    Browse Files »
  • '修改主题色,调整页面菜单文件名称'
    b042fdeb
    sqy authored
    2022-02-28 19:47:57 +0800  
    Browse Files »
  • Merge branch 'ft-dev' into 'main' ...
    656b64d2
    fix:设备配置编辑第三步的数据回显问题解决,待修改设备配置编辑如果什么都没编辑点击提交报400问题
    
    See merge request huang/yun-teng-iot-front!136
    xp.Huang authored
    2022-02-28 11:45:49 +0000  
    Browse Files »
  • Merge branch 'main' into ft-dev
    bd34daf2
    fengtao authored
    2022-02-28 19:44:30 +0800  
    Browse Files »
  • fix:设备配置编辑第三步的数据回显问题解决,待修改设备配置编辑如果什么都没编辑点击提交报400问题
    ff201cbe
    fengtao authored
    2022-02-28 19:43:55 +0800  
    Browse Files »
  • Merge branch 'sqy_dev' into 'main' ...
    c99bf9f2
    'fix:修改前端路由模式,修复选择历史数据时,页面跟着滚动,feat:升级vue新版本以及compiler-sfc'
    
    See merge request huang/yun-teng-iot-front!135
    xp.Huang authored
    2022-02-28 07:59:54 +0000  
    Browse Files »
  • 'fix:修改前端路由模式,修复选择历史数据时,页面跟着滚动,feat:升级vue新版本以及compiler-sfc'
    93c56969
    sqy authored
    2022-02-28 15:57:24 +0800  
    Browse Files »
  • Merge branch 'ft-dev' into 'main' ...
    b6d2a34c
    fix:修复场景联动部分编辑问题,主要是数据重复问题,fix:修复租户第一次修改密码时点击新增时闪烁问题
    
    See merge request huang/yun-teng-iot-front!134
    xp.Huang authored
    2022-02-28 04:03:53 +0000  
    Browse Files »
  • fix:修复场景联动部分编辑问题,主要是数据重复问题,fix:修复租户第一次修改密码时点击新增时闪烁问题
    b65d16e9
    fengtao authored
    2022-02-28 12:02:58 +0800  
    Browse Files »
  • Merge branch 'ft-dev' into 'main' ...
    d8175c88
    fix:修复场景联动新增数据重复问题,fix:场景联动编辑数据重复问题
    
    See merge request huang/yun-teng-iot-front!132
    xp.Huang authored
    2022-02-28 01:33:39 +0000  
    Browse Files »
  • fix:修复场景联动新增数据重复问题,fix:修复场景联动编辑数据重复问题
    d6954312
    fengtao authored
    2022-02-28 09:30:38 +0800  
    Browse Files »
  • fix:修复场景联动新增数据重复问题,fix:场景联动编辑数据重复问题
    a5b42b0f
    fengtao authored
    2022-02-28 09:03:26 +0800  
    Browse Files »
  • fix:修复场景联动新增数据重复问题,fix:场景联动编辑数据重复问题
    7f06695d
    1400859700@qq.com authored
    2022-02-28 07:58:06 +0800  
    Browse Files »

27 Feb, 2022
1 commit
  • Merge branch 'ft-dev' of http://git.yuntengiot.com/huang/yun-teng-iot-front into ft-dev
    a66b7372
    1400859700@qq.com authored
    2022-02-27 16:44:59 +0800  
    Browse Files »

25 Feb, 2022
3 commits
  • Merge branch 'sqy_dev' into 'main' ...
    69a0700e
    feat:"转换脚本开发完成",fix:“菜单显示不正确修复”,feat:所属网关字段,图片样式调整
    
    See merge request huang/yun-teng-iot-front!131
    xp.Huang authored
    2022-02-25 10:59:11 +0000  
    Browse Files »
  • feat:"转换脚本开发完成",fix:“菜单显示不正确修复”,feat:所属网关字段,图片样式调整
    4cea34ff
    sqy authored
    2022-02-25 17:30:30 +0800  
    Browse Files »
  • fix
    e188b290
    fengtao authored
    2022-02-25 17:28:56 +0800  
    Browse Files »

24 Feb, 2022
7 commits
  • Merge branch 'ft-dev' into 'main' ...
    18829609
    fix:修复场景联动,触发器,执行条件,动作,DATA格式为后端所需格式,fix:修复执行动作新增多个问题
    
    See merge request huang/yun-teng-iot-front!130
    xp.Huang authored
    2022-02-24 13:22:50 +0000  
    Browse Files »
  • fix:修复场景联动,触发器,执行条件,动作,DATA格式为后端所需格式,fix:修复执行动作新增多个问题
    363467e4
    fengtao authored
    2022-02-24 21:21:26 +0800  
    Browse Files »
  • Merge branch 'sqy_dev' into 'main' ...
    3a5599e0
    fix:修改问题,feat:新增转换脚本页面
    
    See merge request huang/yun-teng-iot-front!129
    xp.Huang authored
    2022-02-24 11:04:15 +0000  
    Browse Files »
  • Merge branch 'main' into sqy_dev
    af1e5cc2
    sqy authored
    2022-02-24 19:02:40 +0800  
    Browse Files »
  • Merge branch 'ft-dev' into 'main' ...
    befac13f
    fix:修改场景联动页面触发器和执行条件按钮,和选择设备问题,fix:修复设备配置编辑数据回显
    
    See merge request huang/yun-teng-iot-front!128
    xp.Huang authored
    2022-02-24 11:01:57 +0000  
    Browse Files »
  • 'fix:修改问题,feat:新增转换脚本页面'
    82515942
    sqy authored
    2022-02-24 19:01:33 +0800  
    Browse Files »
  • fix:修改场景联动页面触发器和执行条件按钮,和选择设备问题,fix:修复设备配置编辑数据回显
    1ddb8d88
    fengtao authored
    2022-02-24 19:00:02 +0800  
    Browse Files »

23 Feb, 2022
5 commits
  • Merge branch 'ft-dev' into 'main' ...
    05e72343
    fix:修复设备配置第三步点击新增数据一样的问题,fix:修改场景联动一些字段
    
    See merge request huang/yun-teng-iot-front!127
    xp.Huang authored
    2022-02-23 12:58:39 +0000  
    Browse Files »
  • Merge branch 'main' into ft-dev
    fd8b7180
    fengtao authored
    2022-02-23 20:56:58 +0800  
    Browse Files »
  • fix:修复设备配置第三步点击新增数据一样的问题,fix:修改场景联动一些字段
    8dabb2c1
    fengtao authored
    2022-02-23 20:55:50 +0800  
    Browse Files »
  • Merge branch 'sqy_dev' into 'main' ...
    9d3c583b
    'fix:恢复租户角色roleType字段'
    
    See merge request huang/yun-teng-iot-front!126
    xp.Huang authored
    2022-02-23 07:43:14 +0000  
    Browse Files »
  • 'fix:恢复租户角色roleType字段'
    eb3f397e
    sqy authored
    2022-02-23 15:41:45 +0800  
    Browse Files »

22 Feb, 2022
5 commits
  • Merge branch 'ft-dev' into 'main' ...
    b2c2d9b1
    fix:修复场景联动执行条件和执行动作回显问题
    
    See merge request huang/yun-teng-iot-front!125
    xp.Huang authored
    2022-02-22 13:37:48 +0000  
    Browse Files »
  • fix:修复场景联动执行条件和执行动作回显问题
    82e865a1
    fengtao authored
    2022-02-22 20:58:49 +0800  
    Browse Files »
  • Merge branch 'ft-dev' into 'main' ...
    fb67b8ce
    fix:修改数据转换配置接口路径
    
    See merge request huang/yun-teng-iot-front!124
    xp.Huang authored
    2022-02-22 06:29:32 +0000  
    Browse Files »
  • Merge branch 'main' into ft-dev
    572e045c
    fengtao authored
    2022-02-22 14:27:20 +0800  
    Browse Files »
  • fix:修改数据转换配置接口路径
    7d720750
    fengtao authored
    2022-02-22 14:26:51 +0800  
    Browse Files »