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
22 Dec, 2021
3 commits
  • 修改teambitionbug和重写站内通知的逻辑。优化代码
    b2d1e361
    sqy authored
    2021-12-22 16:09:21 +0800  
    Browse Directory »
  • Merge branch 'ft-dev' into 'main' ...
    2c122df0
    设备配置待完善报警规则处理
    
    See merge request huang/yun-teng-iot-front!39
    xp.Huang authored
    2021-12-22 01:13:50 +0000  
    Browse Directory »
  • Merge branch 'sqy_dev' into 'main' ...
    368b6655
    fix:改写通知管理,优化代码,修改bug
    
    See merge request huang/yun-teng-iot-front!38
    xp.Huang authored
    2021-12-22 01:12:50 +0000  
    Browse Files »

21 Dec, 2021
2 commits
  • wip:设备配置待完善报警规则处理
    9fda834c
    fengistao authored
    2021-12-21 18:13:06 +0800  
    Browse Files »
  • fix:改写通知管理,优化代码,修改bug
    58425391
    sqy authored
    2021-12-21 18:12:25 +0800  
    Browse Files »

20 Dec, 2021
8 commits
  • fix(front): 提交合并漏掉的detailColumns
    497a6947
    黄 x authored
    2021-12-20 21:57:46 +0800  
    Browse Directory »
  • Merge remote-tracking branch 'origin/sqy_dev' ...
    e3467ebc
    # Conflicts:
    #	src/views/stationnotification/notificationmanager/config.d.ts
    黄 x authored
    2021-12-20 21:25:17 +0800  
    Browse Directory »
  • '修改租户配置,修改通知管理代码,修改地图显示'
    169a3374
    sqy authored
    2021-12-20 21:16:59 +0800  
    Browse Files »
  • Merge branch 'ft-dev' into 'main' ...
    8e0ba2ab
    feat:修复没分配首页权限显示404,秋云修复修改密码,设配配置搜集三个子弹窗的数据
    
    See merge request huang/yun-teng-iot-front!36
    xp.Huang authored
    2021-12-20 13:16:27 +0000  
    Browse Directory »
  • feat:修复没分配首页权限显示404,秋云修复修改密码,wip:设配配置搜集三个子弹窗的数据
    61208621
    fengistao authored
    2021-12-20 21:14:59 +0800  
    Browse Directory »
  • fix(front):修复租户修改,造成租户管理员不能登录的bug
    4b6ec322
    黄 x authored
    2021-12-20 15:58:56 +0800  
    Browse Files »
  • Merge branch 'sqy_dev' into 'main' ...
    76f5677b
    fix:修复租户删除问题
    
    See merge request huang/yun-teng-iot-front!35
    xp.Huang authored
    2021-12-20 07:19:27 +0000  
    Browse Files »
  • fix:修复租户删除问题
    e795a65d
    sqy authored
    2021-12-20 15:18:18 +0800  
    Browse Directory »

18 Dec, 2021
2 commits
  • Merge remote-tracking branch 'origin/sqy_dev' ...
    ad6bb0b4
    # Conflicts:
    #	src/enums/pageEnum.ts
    黄 x authored
    2021-12-18 09:34:58 +0800  
    Browse Directory »
  • Merge branch 'ft-dev' into 'main' ...
    02789163
    设备配置新增报警规则的弹窗(详情模板、启用规则、规则条件)
    
    See merge request huang/yun-teng-iot-front!33
    xp.Huang authored
    2021-12-18 01:33:24 +0000  
    Browse Files »

17 Dec, 2021
3 commits
  • fix:调整oem地区显示,更新地理位置,优化UI界面
    b4372a2a
    sqy authored
    2021-12-17 18:07:04 +0800  
    Browse Directory »
  • wip:设备配置新增报警规则的弹窗(详情模板、启用规则、规则条件)
    6c6a1430
    fengistao authored
    2021-12-17 18:04:17 +0800  
    Browse Directory »
  • Merge branch 'sqy_dev' into 'main' ...
    e5a3b607
    wip:联调设备,fix:修复eslint警告,表单加自定义验证,重写oem省市联动,fix:修改bug
    
    See merge request huang/yun-teng-iot-front!32
    xp.Huang authored
    2021-12-17 01:02:36 +0000  
    Browse Files »

16 Dec, 2021
4 commits
  • '解决一个冲突'
    4f03bfd5
    sqy authored
    2021-12-16 18:18:53 +0800  
    Browse Directory »
  • 'wip:联调设备,fix:修复eslint警告,表单加自定义验证,重写oem省市联动,fix:修改bug'
    03afa351
    sqy authored
    2021-12-16 18:15:58 +0800  
    Browse Files »
  • Merge branch 'ft-dev' into 'main' ...
    4defefd8
    feat:设备配置调通删除接口
    
    See merge request huang/yun-teng-iot-front!31
    xp.Huang authored
    2021-12-16 10:07:32 +0000  
    Browse Files »
  • feat:设备配置调通删除接口
    25f3c7f2
    fengistao authored
    2021-12-16 18:02:39 +0800  
    Browse Files »

15 Dec, 2021
5 commits
  • Merge branch 'ft-dev' into 'main' ...
    7b806ddb
    feat:新增设备配置,已调通新增和详情和分页,待调通删除
    
    See merge request huang/yun-teng-iot-front!30
    xp.Huang authored
    2021-12-15 13:38:21 +0000  
    Browse Files »
  • feat:新增设备配置,已调通新增和详情和分页,待调通删除
    a044a668
    fengistao authored
    2021-12-15 21:35:34 +0800  
    Browse Files »
  • feat:新增设备配置,调通新增和分页和详情,待调通删除
    f4a6af58
    fengistao authored
    2021-12-15 21:31:26 +0800  
    Browse Files »
  • Merge branch 'sqy_dev1' into 'main' ...
    4c14f772
    'fix:解决tab无法加载问题,调试了一部分设备管理接口,待完善,解决账号管理问题,消息配置问题解决'
    
    See merge request huang/yun-teng-iot-front!29
    xp.Huang authored
    2021-12-15 13:26:39 +0000  
    Browse Files »
  • 'fix:解决tab无法加载问题,调试了一部分设备管理接口,待完善,解决账号管理问题,消息配置问题解决'
    ec72752d
    sqy authored
    2021-12-15 21:20:07 +0800  
    Browse Directory »

14 Dec, 2021
13 commits
  • Merge branch 'ft-dev' into 'main' ...
    d2d7b6ed
    fix:修复bug
    
    See merge request huang/yun-teng-iot-front!28
    xp.Huang authored
    2021-12-14 12:29:39 +0000  
    Browse Files »
  • Merge branch 'sqy_dev' into 'main' ...
    59bfea9e
    调整bug,修复
    
    See merge request huang/yun-teng-iot-front!27
    xp.Huang authored
    2021-12-14 12:29:24 +0000  
    Browse Files »
  • '调整bug'
    46b59c87
    sqy authored
    2021-12-14 20:26:21 +0800  
    Browse Files »
  • fix:修好bug
    62cea6ec
    fengistao authored
    2021-12-14 20:25:57 +0800  
    Browse Directory »
  • fix(front): 修改删除租户管理的参数传递
    65f607a6
    黄 x authored
    2021-12-14 20:04:00 +0800  
    Browse Files »
  • Merge branch 'main' into sqy_dev
    10fdcf85
    sqy authored
    2021-12-14 11:50:48 +0800  
    Browse Files »
  • Merge branch 'main' of http://git.yuntengiot.com/huang/yun-teng-iot-front
    c2151650
    sqy authored
    2021-12-14 11:50:26 +0800  
    Browse Files »
  • Merge branch 'ft-dev' into 'main' ...
    bbb2d11a
    fix:修复bug
    
    See merge request huang/yun-teng-iot-front!26
    xp.Huang authored
    2021-12-14 03:49:39 +0000  
    Browse Files »
  • Merge branch 'main' into sqy_dev
    f6400dcc
    sqy authored
    2021-12-14 11:48:47 +0800  
    Browse Files »
  • 'faet:详情copy功能'
    cdd108fa
    sqy authored
    2021-12-14 11:47:10 +0800  
    Browse Files »
  • fix:修复bug
    b15b74c5
    fengistao authored
    2021-12-14 11:44:44 +0800  
    Browse Directory »
  • '修改版本控制忽略文件'
    9059d3c0
    sqy authored
    2021-12-14 09:19:21 +0800  
    Browse Files »
  • Merge remote-tracking branch 'origin/ft-dev' ...
    19046b44
    # Conflicts:
    #	.env.development
    黄 x authored
    2021-12-14 09:10:54 +0800  
    Browse Files »