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
01 Mar, 2024
2 commits
  • docs: v1.0.7_release
    fe27c91c
    xp.Huang authored
    2024-03-01 19:14:51 +0800  
    Browse Files »
  • Merge branch 'main_dev' into 'main' ...
    6924fd95
    Main dev
    
    See merge request yunteng/thingskit-app!153
    xp.Huang authored
    2024-03-01 01:04:01 +0000  
    Browse Files »

29 Feb, 2024
8 commits
  • Merge branch 'fix/indexofdevice-add-first-get' into 'main_dev' ...
    7e746ed4
    fix: 修复首页和设备tabs切换得时候没有请求数据
    
    See merge request yunteng/thingskit-app!152
    xp.Huang authored
    2024-02-29 09:13:03 +0000  
    Browse Files »
  • fix: 修复首页和设备tabs切换得时候没有请求数据
    847ee68d
    张 峰林 authored
    2024-02-29 09:13:03 +0000  
    Browse Files »
  • Merge branch 'fix/camera-gbt-get-play' into 'main_dev' ...
    69253a01
    fix: 修复摄像头国标视频播放问题
    
    See merge request yunteng/thingskit-app!151
    xp.Huang authored
    2024-02-29 07:37:18 +0000  
    Browse Files »
  • fix: 修复摄像头国标视频播放问题
    2234b045
    loveumiko authored
    2024-02-29 15:21:48 +0800  
    Browse Files »
  • Merge branch 'fix/device-GBT-show-tabs' into 'main_dev' ...
    289d74b8
    feat:GBT设备详情只展示基本信息
    
    See merge request yunteng/thingskit-app!150
    xp.Huang authored
    2024-02-29 06:24:19 +0000  
    Browse Files »
  • feat:GBT设备详情只展示基本信息
    6473eaf9
    张 峰林 authored
    2024-02-29 06:24:19 +0000  
    Browse Files »
  • Merge branch 'fix/camera-add-gbturl' into 'main_dev' ...
    5066c03d
    fix :小程序增加国标接口调用
    
    See merge request yunteng/thingskit-app!149
    xp.Huang authored
    2024-02-29 02:51:59 +0000  
    Browse Files »
  • fix :小程序增加国标接口调用
    94f45f0d
    张 峰林 authored
    2024-02-29 02:51:59 +0000  
    Browse Files »

21 Feb, 2024
2 commits
  • Merge branch 'fix/DEFECT-1931' into 'main_dev' ...
    a798fb37
    fix: 手机端网关子设备增加在线时命令下发的按钮
    
    See merge request yunteng/thingskit-app!148
    xp.Huang authored
    2024-02-21 08:12:22 +0000  
    Browse Files »
  • fix: 手机端网关子设备增加在线时命令下发的按钮
    85434582
    loveumiko authored
    2024-02-21 15:50:06 +0800  
    Browse Files »

07 Feb, 2024
4 commits
  • Merge branch 'fix/alarm-jump-parameter' into 'main_dev' ...
    59c543e7
    fix: 修复告警跳转返回时参数没有清空
    
    See merge request yunteng/thingskit-app!146
    xp.Huang authored
    2024-02-07 03:14:31 +0000  
    Browse Files »
  • fix: 修复告警跳转返回时参数没有清空
    ef51b270
    loveumiko authored
    2024-02-07 10:29:10 +0800  
    Browse Files »
  • Merge branch 'fix/login-phone-code' into 'main_dev' ...
    e47e882b
    fix: 修复发送验证码过后还可以继续点击
    
    See merge request yunteng/thingskit-app!145
    xp.Huang authored
    2024-02-07 01:17:32 +0000  
    Browse Files »
  • Merge branch 'fix/device-hihstory-select-attr' into 'main_dev' ...
    41f4dfcd
    fix: 修复详情历史数据选择属性时是标识符的问题
    
    See merge request yunteng/thingskit-app!144
    xp.Huang authored
    2024-02-07 01:17:24 +0000  
    Browse Files »

06 Feb, 2024
2 commits
  • fix: 修复发送验证码过后还可以继续点击
    d3bf3417
    loveumiko authored
    2024-02-06 17:48:04 +0800  
    Browse Files »
  • fix: 修复详情历史数据选择属性时是标识符的问题
    0764368b
    loveumiko authored
    2024-02-06 16:43:21 +0800  
    Browse Files »

01 Feb, 2024
8 commits
  • Merge branch 'main_dev' into 'main' ...
    981e6ea0
    Main dev
    
    See merge request yunteng/thingskit-app!143
    xp.Huang authored
    2024-02-01 05:00:41 +0000  
    Browse Files »
  • Main dev
    0fc5b181
    xp.Huang authored
    2024-02-01 05:00:41 +0000  
    Browse Files »
  • Merge branch 'main_dev' into 'main' ...
    895993ab
    fix: 修改第三方登录和绑定账号的问题
    
    See merge request yunteng/thingskit-app!141
    xp.Huang authored
    2024-02-01 04:22:53 +0000  
    Browse Files »
  • fix: 修改第三方登录和绑定账号的问题
    996ee2f9
    xp.Huang authored
    2024-02-01 04:22:53 +0000  
    Browse Files »
  • Merge branch 'main' into 'main_dev' ...
    71292627
    # Conflicts:
    #   pages/alarm/alarm.vue
    xp.Huang authored
    2024-02-01 03:24:33 +0000  
    Browse Files »
  • Merge branch 'fix/third-login-error' into 'main_dev' ...
    2b29bfc8
    fix: 修改第三方登录和绑定账号的问题
    
    See merge request yunteng/thingskit-app!137
    xp.Huang authored
    2024-02-01 03:19:49 +0000  
    Browse Files »
  • fix: 修改第三方登录和绑定账号的问题
    d5aba70b
    loveumiko authored
    2024-02-01 11:18:13 +0800  
    Browse Files »
  • Merge branch 'main_dev' into 'main' ...
    8ded8f1c
    Main dev
    
    See merge request yunteng/thingskit-app!136
    xp.Huang authored
    2024-02-01 02:52:09 +0000  
    Browse Files »

02 Jan, 2024
7 commits
  • Merge branch 'cherry-pick-5c060124' into 'main' ...
    05d78a22
    fix: 修复mp端,摄像头点击播放,无法退出全屏问题
    
    See merge request yunteng/thingskit-app!134
    xp.Huang authored
    2024-01-02 10:45:37 +0000  
    Browse Files »
  • fix: 修复mp端,摄像头点击播放,无法退出全屏问题 ...
    04c79eae
    
    (cherry picked from commit 5c060124)
    fengwotao authored
    2024-01-02 18:45:25 +0800  
    Browse Files »
  • Merge branch 'fix_camera_issure' into 'main_dev' ...
    60cb4726
    fix: 修复移动端,摄像头点击播放,无法退出全屏问题
    
    See merge request yunteng/thingskit-app!133
    xp.Huang authored
    2024-01-02 10:45:05 +0000  
    Browse Files »
  • fix: 修复mp端,摄像头点击播放,无法退出全屏问题
    5c060124
    fengwotao authored
    2024-01-02 18:37:14 +0800  
    Browse Files »
  • docs: v1.0.6_release
    e96a4fdb
    xp.Huang authored
    2024-01-02 11:08:47 +0800  
    Browse Files »
  • docs: 移除console
    86e842a3
    xp.Huang authored
    2024-01-02 11:07:45 +0800  
    Browse Files »
  • Merge branch 'main_dev' ...
    6c2a476b
    # Conflicts:
    #	pages/alarm/alarm.vue
    xp.Huang authored
    2024-01-02 11:05:50 +0800  
    Browse Files »

29 Dec, 2023
3 commits
  • Merge branch 'fix/alarm-device-history' into 'main_dev' ...
    d0a3430d
    fix: 修改告警徽标数和设备历史数据问题
    
    See merge request yunteng/thingskit-app!131
    xp.Huang authored
    2023-12-29 09:00:51 +0000  
    Browse Files »
  • fix: 修改告警徽标数和设备历史数据问题
    e76e232a
    张 峰林 authored
    2023-12-29 09:00:51 +0000  
    Browse Files »
  • Merge branch 'main_dev' ...
    19bc7b16
    # Conflicts:
    #	pages/alarm/alarm.vue
    xp.Huang authored
    2023-12-29 09:22:46 +0800  
    Browse Files »

28 Dec, 2023
2 commits
  • Merge branch 'fix/camera-manage-flv' into 'main_dev' ...
    ab30c83c
    fix: 修复摄像头流媒体没有请求对应的接口
    
    See merge request yunteng/thingskit-app!129
    xp.Huang authored
    2023-12-28 11:25:27 +0000  
    Browse Files »
  • fix: 修复摄像头流媒体没有请求对应的接口
    5f6fce4e
    loveumiko authored
    2023-12-28 17:37:57 +0800  
    Browse Files »

25 Dec, 2023
2 commits
  • Merge branch 'fix/scroll-bug' into 'main_dev' ...
    90fc9fc7
    fix: 修复下拉刷新组件的出现问题
    
    See merge request yunteng/thingskit-app!128
    xp.Huang authored
    2023-12-25 10:50:55 +0000  
    Browse Files »
  • fix: 修复下拉刷新组件的出现问题
    dfd91a1b
    张 峰林 authored
    2023-12-25 10:50:55 +0000  
    Browse Files »