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
21 Apr, 2022
13 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 »
  • Merge branch 'sqy_dev' into 'main' ...
    76b9e3e4
    fix:修改设备的页面
    
    See merge request huang/thingskit-app!25
    xp.Huang authored
    2022-04-21 08:51:35 +0000  
    Browse Files »
  • Merge branch 'main' into sqy_dev
    27bfa998
    sqy authored
    2022-04-21 16:49:36 +0800  
    Browse Directory »
  • fix:修改设备的页面
    0f18827d
    sqy authored
    2022-04-21 16:48:45 +0800  
    Browse Files »

20 Apr, 2022
3 commits
  • Merge branch 'dev-ft' into 'main' ...
    2da23875
    修改api基础路径,增加默认图片
    
    See merge request huang/thingskit-app!24
    xp.Huang authored
    2022-04-20 11:18:52 +0000  
    Browse Files »
  • Merge branch 'main' into dev-ft
    ea961ac0
    fengtao authored
    2022-04-20 19:10:21 +0800  
    Browse Files »
  • 修改api基础路径,增加默认图片
    f01616e3
    fengtao authored
    2022-04-20 19:09:53 +0800  
    Browse Files »

19 Apr, 2022
10 commits
  • Merge branch 'sqy_dev' into 'main' ...
    0b83e8b9
    '修改设备以及分包'
    
    See merge request huang/thingskit-app!23
    xp.Huang authored
    2022-04-19 12:08:23 +0000  
    Browse Files »
  • '修改设备以及分包'
    7503bc58
    sqy authored
    2022-04-19 20:06:06 +0800  
    Browse Files »
  • Merge branch 'dev-ft' into 'main' ...
    249b8394
    预览打包小程序完成
    
    See merge request huang/thingskit-app!22
    xp.Huang authored
    2022-04-19 09:31:35 +0000  
    Browse Files »
  • wip:预览打包小程序完成
    9f612429
    fengtao authored
    2022-04-19 17:27:03 +0800  
    Browse Files »
  • Merge branch 'dev-ft' into 'main' ...
    2f6bd6e7
    fix:修复所有请求接口无基础路径问题
    
    See merge request huang/thingskit-app!21
    xp.Huang authored
    2022-04-19 03:30:28 +0000  
    Browse Files »
  • fix:修复所有请求接口无基础路径问题
    79ee84f1
    fengtao authored
    2022-04-19 11:29:22 +0800  
    Browse Directory »
  • fix:修复所有请求接口无基础路径问题
    e8aed716
    fengtao authored
    2022-04-19 11:22:54 +0800  
    Browse Files »
  • Merge branch 'sqy_dev' into 'main' ...
    3fea1470
    fix:合并主分支代码以及解决冲突
    
    See merge request huang/thingskit-app!19
    xp.Huang authored
    2022-04-19 01:28:02 +0000  
    Browse Files »
  • fix:合并主分支代码以及解决冲突
    54bbd6c9
    sqy authored
    2022-04-19 09:25:45 +0800  
    Browse Files »
  • Merge branch 'ft-dev' into 'main' ...
    859199c5
    feat:新增意见反馈接口,摄像头接口等
    
    See merge request huang/thingskit-app!17
    xp.Huang authored
    2022-04-19 01:02:34 +0000  
    Browse Files »

18 Apr, 2022
2 commits
  • fix:修改设备页面以及更改组件全局配置
    7d844845
    sqy authored
    2022-04-18 19:00:22 +0800  
    Browse Files »
  • feat:新增意见反馈接口,摄像头接口等
    14453915
    fengtao authored
    2022-04-18 18:59:26 +0800  
    Browse Files »

15 Apr, 2022
4 commits
  • Merge branch 'dev-ft' into 'main' ...
    c2dccd7d
    refractor:重新抽取所有页面样式问题,feat:通知详情新增图片显示
    
    See merge request huang/thingskit-app!16
    xp.Huang authored
    2022-04-15 10:09:13 +0000  
    Browse Directory »
  • Merge branch 'sqy_dev' into 'main' ...
    9645a744
    'fix:修改设备相关代码'
    
    See merge request huang/thingskit-app!15
    xp.Huang authored
    2022-04-15 10:08:18 +0000  
    Browse Files »
  • refractor:重新抽取所有页面样式问题,feat:通知详情新增图片显示
    f7cd33b3
    fengtao authored
    2022-04-15 18:07:08 +0800  
    Browse Files »
  • 'fix:修改设备相关代码'
    cd707d21
    sqy authored
    2022-04-15 18:05:54 +0800  
    Browse Files »

14 Apr, 2022
4 commits
  • Merge remote-tracking branch 'origin/sqy_dev' ...
    60913033
    # Conflicts:
    #	config/request.js
    黄 x authored
    2022-04-14 19:18:19 +0800  
    Browse Files »
  • 改写设备及子页面
    f8bfbc10
    sqy authored
    2022-04-14 19:01:51 +0800  
    Browse Files »
  • Merge branch 'dev-ft' into 'main' ...
    c47dee1d
    feat:新增通知管理接口,通知详情接口,新增告警分页接口,新增告警详情接口,新增告警处理接口,新增告警筛选接口
    
    See merge request huang/thingskit-app!13
    xp.Huang authored
    2022-04-14 10:43:42 +0000  
    Browse Files »
  • feat:新增首页设备数,组织筛选,微信登录拿到数据
    170694bb
    fengtao authored
    2022-04-14 18:42:02 +0800  
    Browse Files »

13 Apr, 2022
3 commits
  • feat:新增通知管理接口,通知详情接口,新增告警分页接口,新增告警详情接口,新增告警处理接口,新增告警筛选接口
    68cd0f1a
    fengtao authored
    2022-04-13 20:36:08 +0800  
    Browse Directory »
  • Merge branch 'dev-ft' into 'main' ...
    c1a439db
    feat:新增登录接口等
    
    See merge request huang/thingskit-app!12
    xp.Huang authored
    2022-04-13 01:26:14 +0000  
    Browse Files »
  • feat:新增登录接口等
    5aab4f02
    fengtao authored
    2022-04-13 09:24:21 +0800  
    Browse Files »

12 Apr, 2022
1 commit
  • revert: 移除初次提交的unpackage目录
    96e9c22c
    黄 x authored
    2022-04-12 19:25:26 +0800  
    Browse Files »