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
27 Dec, 2021
1 commit
  • fix:修复菜单列表多个请求问题
    daf8ad41
    fengistao authored
    2021-12-27 14:31:40 +0800  
    Browse Files »

24 Dec, 2021
14 commits
  • Merge branch 'ft-dev' into 'main' ...
    bf82116d
    fix:修复修改密码和404
    
    See merge request huang/yun-teng-iot-front!47
    xp.Huang authored
    2021-12-24 10:00:08 +0000  
    Browse Files »
  • Merge branch 'sqy_dev' into 'main' ...
    3613688c
    fix:修改首页通知信息,修改我的通知UI,解决之前遗留的bug
    
    See merge request huang/yun-teng-iot-front!46
    xp.Huang authored
    2021-12-24 09:59:30 +0000  
    Browse Files »
  • Merge branch 'main' into ft-dev
    4f8f5d5d
    fengistao authored
    2021-12-24 17:58:25 +0800  
    Browse Files »
  • fix:修复修改密码和404
    d8a5cdbb
    fengistao authored
    2021-12-24 17:57:33 +0800  
    Browse Files »
  • 'fix:修改短信接口'
    97d08c4f
    sqy authored
    2021-12-24 17:56:59 +0800  
    Browse Files »
  • Merge branch 'main' into sqy_dev
    4e224d8f
    sqy authored
    2021-12-24 16:30:41 +0800  
    Browse Files »
  • fix:修改首页通知信息,修改我的通知UI,解决之前遗留的bug
    1e15025d
    sqy authored
    2021-12-24 16:27:06 +0800  
    Browse Files »
  • fix(front): 使用后台返回的DictText
    e8658d2a
    黄 x authored
    2021-12-24 16:24:07 +0800  
    Browse Files »
  • Merge branch 'sqy_dev' into 'main' ...
    e038a147
    fix:修改平台账号角色回显问题,以及删除无用代码,优化代码
    
    See merge request huang/yun-teng-iot-front!45
    xp.Huang authored
    2021-12-24 01:34:25 +0000  
    Browse Files »
  • Merge branch 'main' into sqy_dev
    32066348
    sqy authored
    2021-12-24 09:31:06 +0800  
    Browse Files »
  • Merge branch 'ft-dev' into 'main' ...
    f9a9f157
    style:设备配置样式修改,feat:设备配置详情优化代码
    
    See merge request huang/yun-teng-iot-front!44
    xp.Huang authored
    2021-12-24 01:30:39 +0000  
    Browse Files »
  • fix:修改平台账号角色回显问题,以及删除无用代码,优化代码
    aea40257
    sqy authored
    2021-12-24 09:28:35 +0800  
    Browse Files »
  • Merge branch 'main' into ft-dev
    a60fcfe8
    fengistao authored
    2021-12-24 09:28:18 +0800  
    Browse Files »
  • style:设备配置样式修改,feat:设备配置详情优化代码
    9d634463
    fengistao authored
    2021-12-24 09:26:56 +0800  
    Browse Files »

23 Dec, 2021
2 commits
  • Merge branch 'sqy_dev' into 'main' ...
    906f2771
    fix:修改租户管理:验证,400错误,fix:我的通知显示’无‘问题     fefactor:重构公共组件组织树
    
    See merge request huang/yun-teng-iot-front!43
    xp.Huang authored
    2021-12-23 08:30:48 +0000  
    Browse Files »
  • fix:修改租户管理:验证,400错误,fix:我的通知显示’无‘问题 ...
    629206a2
    fefactor:重构公共组件组织树
    sqy authored
    2021-12-23 16:29:50 +0800  
    Browse Files »

22 Dec, 2021
10 commits
  • Merge branch 'sqy_dev' into 'main' ...
    da9fcd94
    fix:修改租户管理bug,修改站内通知的问题,修改设备更改
    
    See merge request huang/yun-teng-iot-front!42
    xp.Huang authored
    2021-12-22 13:16:55 +0000  
    Browse Files »
  • Merge branch 'main' into sqy_dev
    3656bd8b
    sqy authored
    2021-12-22 21:15:16 +0800  
    Browse Files »
  • Merge branch 'ft-dev' into 'main' ...
    0dee3302
    feat:租户配置联调分页、新增、删除接口,wip:设备配置联调新增、分页、删除接口
    
    See merge request huang/yun-teng-iot-front!41
    xp.Huang authored
    2021-12-22 13:13:47 +0000  
    Browse Files »
  • fix:修改站内通知和其他问题
    781bbe21
    sqy authored
    2021-12-22 21:12:36 +0800  
    Browse Files »
  • Merge branch 'main' into ft-dev
    c25e9fcb
    fengistao authored
    2021-12-22 21:09:29 +0800  
    Browse Files »
  • feat:租户配置分页接口和新增和删除接口,wip:设备配置新增报警规则
    6695d737
    fengistao authored
    2021-12-22 21:08:11 +0800  
    Browse Files »
  • Merge branch 'sqy_dev' into 'main' ...
    179e524e
    修改teambitionbug和重写站内通知的逻辑。优化代码
    
    See merge request huang/yun-teng-iot-front!40
    xp.Huang authored
    2021-12-22 08:11:05 +0000  
    Browse Files »
  • 修改teambitionbug和重写站内通知的逻辑。优化代码
    b2d1e361
    sqy authored
    2021-12-22 16:09:21 +0800  
    Browse Files »
  • 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 Files »
  • 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 Files »
  • 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 Files »
  • '修改租户配置,修改通知管理代码,修改地图显示'
    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 Files »
  • feat:修复没分配首页权限显示404,秋云修复修改密码,wip:设配配置搜集三个子弹窗的数据
    61208621
    fengistao authored
    2021-12-20 21:14:59 +0800  
    Browse Files »
  • 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 Files »

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 Files »
  • 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
1 commit
  • fix:调整oem地区显示,更新地理位置,优化UI界面
    b4372a2a
    sqy authored
    2021-12-17 18:07:04 +0800  
    Browse Files »