Sign in

简柏林 / thingskit-app · Commits

GitLab

  • Go to dashboard
  • Project
  • Activity
  • Files
  • Commits
  • Builds 0
  • Graphs
  • Milestones
  • Issues 0
  • Merge Requests 0
  • Labels
  • Wiki
  • Network
  • Commits 498
  • Network
  • Compare
  • Branches 4
  • Tags 0
  • thingskit-app
26 Apr, 2022
1 commit
  • fix:调整设备的命令记录和修复bug
    a50e0c90
    sqy authored
    2022-04-26 18:09:21 +0800  
    Browse Files »

25 Apr, 2022
20 commits
  • Merge branch 'sqy_dev' into 'main' ...
    51316321
    'fix:修改部分的设备样式和调整命令记录‘
    
    See merge request huang/thingskit-app!35
    xp.Huang authored
    2022-04-25 12:16:39 +0000  
    Browse Files »
  • Merge branch 'main' into sqy_dev
    477261d1
    sqy authored
    2022-04-25 20:14:32 +0800  
    Browse Directory »
  • Merge branch 'dev-ft' into 'main' ...
    ab624e46
    refractor:移除一些无用代码,feat:增加了默认头像
    
    See merge request huang/thingskit-app!34
    xp.Huang authored
    2022-04-25 12:13:05 +0000  
    Browse Files »
  • feat:新增第三方解绑功能
    bdc47200
    fengtao authored
    2022-04-25 20:11:30 +0800  
    Browse Files »
  • 'fix:修改部分的设备样式和调整命令记录‘
    d9a25cd8
    sqy authored
    2022-04-25 20:11:24 +0800  
    Browse Files »
  • Merge branch 'main' into dev-ft
    7b6ed7a3
    fengtao authored
    2022-04-25 18:23:27 +0800  
    Browse Files »
  • refractor:移除一些无用代码,feat:增加了默认头像
    3badfea2
    fengtao authored
    2022-04-25 18:22:05 +0800  
    Browse Directory »
  • refractor:修改意见反馈样式
    8794f8f5
    fengtao authored
    2022-04-25 18:05:13 +0800  
    Browse Files »
  • refractor:移除底部tabbar
    be38ee90
    fengtao authored
    2022-04-25 18:04:29 +0800  
    Browse Files »
  • refractor:移除一些无用代码,修改密码框眼睛图表颜色
    232f91fc
    fengtao authored
    2022-04-25 17:39:39 +0800  
    Browse Files »
  • refractor:移除无用代码
    e1069bfb
    fengtao authored
    2022-04-25 16:55:49 +0800  
    Browse Files »
  • reractor:移除无用代码
    772856d8
    fengtao authored
    2022-04-25 16:54:51 +0800  
    Browse Directory »
  • refractor:移除代码
    518f79b5
    fengtao authored
    2022-04-25 16:53:41 +0800  
    Browse Files »
  • fix:修改tabbar告警徽标加载数据
    cc368157
    fengtao authored
    2022-04-25 16:52:50 +0800  
    Browse Files »
  • feat:系统通知新增阅读状态
    6cba0d32
    fengtao authored
    2022-04-25 16:51:39 +0800  
    Browse Files »
  • refractor:删除一些无用代码,增加401踢回登录页
    597b630f
    fengtao authored
    2022-04-25 14:51:34 +0800  
    Browse Directory »
  • feat:增加注释
    6c78ee70
    fengtao authored
    2022-04-25 14:50:14 +0800  
    Browse Directory »
  • refractor:首页告警跳转代码优化
    07db9bf6
    fengtao authored
    2022-04-25 14:49:24 +0800  
    Browse Directory »
  • fix:DEFECT-355 修改告警筛选传时间问题
    2dc70eb1
    fengtao authored
    2022-04-25 14:44:39 +0800  
    Browse Files »
  • Merge branch 'dev-ft' into 'main' ...
    da3c5e94
    feat:新增第三方登录和账号绑定功能,refractor:修改意见反馈样式,fix:DEFECT-346,去除通知筛选输入框
    
    See merge request huang/thingskit-app!33
    xp.Huang authored
    2022-04-25 00:54:56 +0000  
    Browse Files »

24 Apr, 2022
4 commits
  • Merge branch 'main' into dev-ft
    d33a1a5d
    fengtao authored
    2022-04-24 18:00:05 +0800  
    Browse Files »
  • feat:新增第三方登录和账号绑定功能,refractor:修改意见反馈样式,fix:DEFECT-346去除通知筛选输入框
    2a3c5288
    fengtao authored
    2022-04-24 17:59:52 +0800  
    Browse Files »
  • Merge branch 'sqy_dev' into 'main' ...
    1f2e5d74
    fix:优化设备的部分样式
    
    See merge request huang/thingskit-app!32
    xp.Huang authored
    2022-04-24 01:15:56 +0000  
    Browse Directory »
  • Merge branch 'dev-ft' into 'main' ...
    d392d692
    refractor:修改页面样式(告警,通知,摄像头,等)
    
    See merge request huang/thingskit-app!31
    xp.Huang authored
    2022-04-24 01:15:37 +0000  
    Browse Files »

22 Apr, 2022
5 commits
  • fix:优化设备的部分样式
    1cb7accf
    sqy authored
    2022-04-22 18:17:19 +0800  
    Browse Files »
  • Merge branch 'main' into dev-ft
    1ef8fed8
    fengtao authored
    2022-04-22 18:08:13 +0800  
    Browse Files »
  • refractor:修改页面样式(告警,通知,摄像头,等),
    cb67ce92
    fengtao authored
    2022-04-22 18:07:32 +0800  
    Browse Files »
  • Merge branch 'sqy_dev' into 'main' ...
    5d16e648
    解决设备样式没有合并问题
    
    See merge request huang/thingskit-app!30
    xp.Huang authored
    2022-04-22 02:10:03 +0000  
    Browse Files »
  • 解决设备样式没有合并问题
    90afbe88
    sqy authored
    2022-04-22 10:03:58 +0800  
    Browse Directory »

21 Apr, 2022
10 commits
  • Merge remote-tracking branch 'origin/sqy_dev' ...
    852707bb
    # Conflicts:
    #	pages.json
    #	pages/device/device.vue
    黄 x authored
    2022-04-21 20:19:39 +0800  
    Browse Directory »
  • Merge branch 'ft-dev' into 'main' ...
    924b0610
    fix:修改告警查询,显示所属组织,设备跳转查询
    
    See merge request huang/thingskit-app!28
    xp.Huang authored
    2022-04-21 12:08:51 +0000  
    Browse Files »
  • fix:改设备的样式bug
    2d6e3010
    sqy authored
    2022-04-21 20:07:27 +0800  
    Browse Files »
  • Merge branch 'main' into ft-dev
    a900a097
    fengtao authored
    2022-04-21 20:03:15 +0800  
    Browse Files »
  • fix:修改告警查询,显示所属组织,设备跳转查询
    14100b8d
    fengtao authored
    2022-04-21 20:02:08 +0800  
    Browse Files »
  • Merge branch 'ft-dev' into 'main' ...
    e46b1dc1
    fix:去除初始化弹窗错误
    
    See merge request huang/thingskit-app!27
    xp.Huang authored
    2022-04-21 09:16:18 +0000  
    Browse Files »
  • fix:去除初始化弹窗错误
    4d98dc44
    fengtao authored
    2022-04-21 17:14:27 +0800  
    Browse Files »
  • Merge branch 'ft-dev' into 'main' ...
    66868538
    fix:修改通知详情和通知类型判断,refractor:修改告警分页文本样式
    
    See merge request huang/thingskit-app!26
    xp.Huang authored
    2022-04-21 08:59:50 +0000  
    Browse Files »
  • Merge branch 'main' into ft-dev
    10f8385a
    fengtao authored
    2022-04-21 16:54:05 +0800  
    Browse Directory »
  • fix:修改通知详情和通知类型判断,refractor:修改告警分页文本样式
    3be4a23c
    fengtao authored
    2022-04-21 16:52:55 +0800  
    Browse Files »