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
07 Dec, 2021
2 commits
  • Merge branch 'sqy_dev' into 'main' ...
    76e5628f
    fix:首页开发,OEM定制开发
    
    See merge request huang/yun-teng-iot-front!13
    xp.Huang authored
    2021-12-07 07:54:11 +0000  
    Browse Files »
  • 'fix:首页开发,wip:OEM定制开发'
    70954e52
    sqy authored
    2021-12-07 15:35:49 +0800  
    Browse Directory »

03 Dec, 2021
1 commit
  • '首页开发'
    1d9b7b74
    sqy authored
    2021-12-03 16:15:58 +0800  
    Browse Directory »

30 Nov, 2021
2 commits
  • Merge branch 'sqy_dev' into 'main' ...
    674be7d5
    'fix:更新地理位置页面以及修复设备位置bug'
    
    See merge request huang/yun-teng-iot-front!12
    xp.Huang authored
    2021-11-30 06:05:09 +0000  
    Browse Files »
  • 'fix:更新地理位置页面以及修复设备位置bug'
    18eaea55
    sqy authored
    2021-11-30 14:02:33 +0800  
    Browse Directory »

29 Nov, 2021
14 commits
  • Merge remote-tracking branch 'origin/ft-dev' ...
    f0e317ed
    # Conflicts:
    #	src/api/sys/menu.ts
    #	src/views/system/menu/index.vue
    #	src/views/system/password/index.vue
    #	yarn.lock
    黄 x authored
    2021-11-29 21:33:25 +0800  
    Browse Files »
  • fix:修改密码
    6869ec3a
    fengistao authored
    2021-11-29 21:17:59 +0800  
    Browse Files »
  • Merge branch 'main' of git.yuntengiot.com:huang/yun-teng-iot-front
    4f788ec2
    黄 x authored
    2021-11-29 21:16:47 +0800  
    Browse Directory »
  • feat:新增
    6acd972d
    fengistao authored
    2021-11-29 21:12:24 +0800  
    Browse Files »
  • Merge branch 'sqy_dev' into 'main' ...
    14f4b0f3
    设备配置页面开发_11.29
    
    See merge request huang/yun-teng-iot-front!9
    xp.Huang authored
    2021-11-29 13:10:12 +0000  
    Browse Files »
  • fix:修改密码和角色回显 feat:新增场景联动接口,待联调 wip:开发场景联动中
    82c219cf
    fengistao authored
    2021-11-29 21:04:56 +0800  
    Browse Directory »
  • '设备配置页面开发'
    d45298c6
    sqy authored
    2021-11-29 21:03:12 +0800  
    Browse File »
  • Merge branch 'ft-dev'
    4c0a23f3
    黄 x authored
    2021-11-29 14:26:07 +0800  
    Browse Directory »
  • Merge branch 'main' into ft-dev
    84a20db3
    黄 x authored
    2021-11-29 14:25:25 +0800  
    Browse Directory »
  • Merge branch 'sqy_dev' into 'main' ...
    6c74ade6
    'feat:(设备页面功能及接口调试)'
    
    See merge request huang/yun-teng-iot-front!8
    xp.Huang authored
    2021-11-29 06:12:06 +0000  
    Browse Directory »
  • Merge branch 'ft-dev' of git.yuntengiot.com:huang/yun-teng-iot-front into ft-dev ...
    11271a2e
     Conflicts:
    	.env.development
    	src/views/system/role/RoleDrawer.vue
    	yarn.lock
    黄 x authored
    2021-11-29 14:10:14 +0800  
    Browse Files »
  • 'feat:(设备页面功能及接口调试)'
    29fb75d0
    sqy authored
    2021-11-29 14:07:21 +0800  
    Browse File »
  • fix(front): 添加设备配置分步操作
    04c4d5ef
    黄 x authored
    2021-11-29 14:06:06 +0800  
    Browse File »
  • wip:场景联动页面模拟接口,新增一个emit插件
    48808a47
    fengistao authored
    2021-11-29 09:25:57 +0800  
    Browse Directory »

26 Nov, 2021
5 commits
  • Merge branch 'sqy_dev' into 'main' ...
    20bdaf98
    设备页面开发
    
    See merge request huang/yun-teng-iot-front!6
    黄 x authored
    2021-11-26 10:56:01 +0000  
    Browse Files »
  • '合并冯涛代码+设备页面开发'
    c1b72283
    sqy authored
    2021-11-26 18:51:40 +0800  
    Browse Directory »
  • '设备页面开发'
    505d2a83
    sqy authored
    2021-11-26 18:38:01 +0800  
    Browse Files »
  • feat(frontend):场景联动模拟接口,新增一个插件emit
    b940a049
    fengistao authored
    2021-11-26 18:06:13 +0800  
    Browse File »
  • Merge branch 'ft-dev' into 'main' ...
    553b54d7
    feat(frontend):新增场景联动前端页面
    
    See merge request huang/yun-teng-iot-front!4
    黄 x authored
    2021-11-26 08:20:22 +0000  
    Browse Files »

25 Nov, 2021
5 commits
  • Merge branch 'main' into 'ft-dev' ...
    86368a4a
    # Conflicts:
    #   .env.development
    #   src/views/device/config.data.ts
    #   src/views/device/index.vue
    #   src/views/system/role/RoleDrawer.vue
    黄 x authored
    2021-11-25 10:20:49 +0000  
    Browse File »
  • feat(frontend):场景联动新增页面编写
    3fd01bf3
    fengistao authored
    2021-11-25 18:05:36 +0800  
    Browse Files »
  • Merge branch 'main' into sqy_dev
    cffe761b
    sqy authored
    2021-11-25 12:56:30 +0800  
    Browse Files »
  • '设备代码合并'
    e5581a54
    sqy authored
    2021-11-25 12:54:26 +0800  
    Browse File »
  • Merge branch 'sqy_dev' into 'main' ...
    46bfbef2
    Sqy dev远程分支与main合并
    
    See merge request huang/yun-teng-iot-front!2
    黄 x authored
    2021-11-25 01:35:22 +0000  
    Browse Files »

24 Nov, 2021
1 commit
  • '设备页面开发'
    c800aa87
    sqy authored
    2021-11-24 18:17:26 +0800  
    Browse Files »

23 Nov, 2021
3 commits
  • '暂存'
    caabfc6a
    sqy authored
    2021-11-23 17:44:27 +0800  
    Browse Files »
  • '解决冲突'
    be864cde
    sqy authored
    2021-11-23 14:42:56 +0800  
    Browse Files »
  • fix(front):'优化代码'
    81eba1ad
    sqy authored
    2021-11-23 14:26:50 +0800  
    Browse Files »

22 Nov, 2021
3 commits
  • fix(front): 设备添加采用分步完善
    07d508e1
    黄 x authored
    2021-11-22 19:14:36 +0800  
    Browse Files »
  • '告警联系人页面开发'
    8cef03a8
    sqy authored
    2021-11-22 18:08:06 +0800  
    Browse Files »
  • test
    83fb89db
    fengistao authored
    2021-11-22 11:38:35 +0800  
    Browse Files »

18 Nov, 2021
4 commits
  • '(fix):解决冲突v1.1'
    f2e44989
    sqy authored
    2021-11-18 13:13:46 +0800  
    Browse Directory »
  • '解决main分支合并的冲突'
    63632ac4
    sqy authored
    2021-11-18 12:57:10 +0800  
    Browse Files »
  • fix(front): 前端格式化测试-返回
    0923c9a5
    黄 x authored
    2021-11-18 10:59:15 +0800  
    Browse Directory »
  • fix(front): 前端格式化测试
    087312a2
    黄 x authored
    2021-11-18 10:56:50 +0800  
    Browse Directory »