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
29 Nov, 2021
1 commit
  • fix(front): 添加设备配置分步操作
    04c4d5ef
    黄 x authored
    2021-11-29 14:06:06 +0800  
    Browse File »

26 Nov, 2021
4 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 Files »
  • '设备页面开发'
    505d2a83
    sqy authored
    2021-11-26 18:38:01 +0800  
    Browse Files »
  • 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
7 commits
  • '(fix):解决冲突v1.1'
    f2e44989
    sqy authored
    2021-11-18 13:13:46 +0800  
    Browse Files »
  • '解决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 Files »
  • fix(front): 前端格式化测试
    087312a2
    黄 x authored
    2021-11-18 10:56:50 +0800  
    Browse Files »
  • feat(front): 把OrganizationIdTree调整为公告页面
    e6a352d3
    黄 x authored
    2021-11-18 10:19:07 +0800  
    Browse Files »
  • 'sqy_告警联系人'
    2a3b3065
    sqy authored
    2021-11-18 10:14:16 +0800  
    Browse Files »
  • fix(front): 修改账号修改回显问题
    65efcbff
    黄 x authored
    2021-11-18 10:08:01 +0800  
    Browse Files »

17 Nov, 2021
1 commit
  • feat(front): 添加组织管理的CRUD及添加用户时的所属组织
    565024f0
    黄 x authored
    2021-11-17 16:15:30 +0800  
    Browse Files »

15 Nov, 2021
1 commit
  • fix(front): 修改账号修改回显问题
    f833cb1e
    黄 x authored
    2021-11-15 15:43:28 +0800  
    Browse Files »

12 Nov, 2021
2 commits
  • feat(front): 新增设备及设备配置页面【待完善新增、修改】
    310138b3
    黄 x authored
    2021-11-12 11:51:55 +0800  
    Browse Files »
  • fix(front): 修改租户角色回显问题
    74c11a97
    黄 x authored
    2021-11-12 11:50:44 +0800  
    Browse Files »

11 Nov, 2021
1 commit
  • fix(front): ...
    7ed979f0
    增租户菜单、租户角色页面显示BUG
    黄 x authored
    2021-11-11 22:34:58 +0800  
    Browse Files »

10 Nov, 2021
1 commit
  • fix(front): ...
    ed891030
    增租户菜单、租户角色 同时修改相应页面及BUG
    黄 x authored
    2021-11-10 21:24:13 +0800  
    Browse Files »

21 Oct, 2021
2 commits
  • feat(backend): 1、修改Device不直接关联TbProfile【使用平台profileId关联】2、添加平台设备配置时添加TB的设备配置【待完善】
    6ac7d1cc
    黄 x authored
    2021-10-21 20:29:13 +0800  
    Browse Files »
  • feat(backend): 修改后台fast-iot为yun-teng-iot
    59f7e21e
    黄 x authored
    2021-10-21 09:48:22 +0800  
    Browse Files »

18 Oct, 2021
2 commits
  • feat(front): 添加修改密码【待完善初始设置时,直接设置密码】
    a1dee94b
    黄 x authored
    2021-10-18 21:20:18 +0800  
    Browse Files »
  • Initial commit
    c7b48a75
    黄 x authored
    2021-10-18 15:45:23 +0800  
    Browse Files »