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
13 Dec, 2021
5 commits
  • Merge branch 'sqy_dev' into 'main' ...
    f40541a3
    'fix:修复合并的失败的登录bug'
    
    See merge request huang/yun-teng-iot-front!23
    xp.Huang authored
    2021-12-13 02:49:35 +0000  
    Browse Directory »
  • 'fix:修复合并的失败的登录bug'
    734ffd85
    sqy authored
    2021-12-13 10:48:00 +0800  
    Browse Directory »
  • Merge branch 'sqy_dev' into 'main' ...
    4fe7d1e9
    oem,首页,登录页逻辑界面修改
    
    See merge request huang/yun-teng-iot-front!22
    xp.Huang authored
    2021-12-13 02:15:12 +0000  
    Browse Directory »
  • Merge branch 'ft-dev' into 'main' ...
    50c826f9
    feat:设备配置增加告警,新增租户配置页面
    
    See merge request huang/yun-teng-iot-front!21
    xp.Huang authored
    2021-12-13 02:14:31 +0000  
    Browse Directory »
  • 'oem,首页,登录页逻辑界面修改'
    0306c83e
    sqy authored
    2021-12-13 10:05:57 +0800  
    Browse Directory »

10 Dec, 2021
1 commit
  • feat:设备配置增加告警,新增租户配置页面
    710be853
    fengistao authored
    2021-12-10 17:34:08 +0800  
    Browse Files »

09 Dec, 2021
14 commits
  • Merge branch 'ft-dev' into 'main' ...
    fa183584
    feat:通知增加查看功能
    
    See merge request huang/yun-teng-iot-front!20
    xp.Huang authored
    2021-12-09 12:23:04 +0000  
    Browse Directory »
  • feat:通知增加查看功能
    bfb42dc0
    fengistao authored
    2021-12-09 17:55:54 +0800  
    Browse Files »
  • Merge branch 'sqy_dev1' into 'main' ...
    bd405529
    联调租户管理员,未完成
    
    See merge request huang/yun-teng-iot-front!19
    xp.Huang authored
    2021-12-09 08:38:43 +0000  
    Browse Files »
  • '联调租户管理员接口,未完成'
    54393f1d
    sqy authored
    2021-12-09 16:32:43 +0800  
    Browse Directory »
  • Merge branch 'main' into sqy_dev1
    082826af
    sqy authored
    2021-12-09 16:14:46 +0800  
    Browse Directory »
  • '更改租戶code'
    497ec080
    sqy authored
    2021-12-09 16:13:37 +0800  
    Browse Directory »
  • fix(front): 角色与后端保持一致
    a0ee99f3
    黄 x authored
    2021-12-09 16:13:35 +0800  
    Browse Directory »
  • '暫存oemLogo代碼,待解決本地緩存問題'
    0e686625
    sqy authored
    2021-12-09 15:52:36 +0800  
    Browse Directory »
  • 'oem暂存'
    e18b6398
    sqy authored
    2021-12-09 14:06:22 +0800  
    Browse Directory »
  • fix:修复租户设置权限后菜单显示问题
    fe541336
    fengistao authored
    2021-12-09 11:30:54 +0800  
    Browse Files »
  • Merge branch 'ft-dev' into 'main' ...
    fae0848e
    站内通知前端页面和接口联调完成
    
    See merge request huang/yun-teng-iot-front!18
    xp.Huang authored
    2021-12-09 02:13:10 +0000  
    Browse Directory »
  • wip:站内通知前端页面和接口联调完成
    b0f800ab
    fengistao authored
    2021-12-09 09:40:32 +0800  
    Browse Directory »
  • Merge branch 'sqy_dev' into 'main' ...
    3443f055
    oem内容定制修改中
    
    See merge request huang/yun-teng-iot-front!17
    xp.Huang authored
    2021-12-09 01:36:20 +0000  
    Browse Files »
  • 'wip:oem内容定制修改中'
    4e2e426f
    sqy authored
    2021-12-09 09:32:45 +0800  
    Browse Files »

08 Dec, 2021
7 commits
  • Merge branch 'sqy_dev' into 'main' ...
    f16e723b
    'fix:将分析页代码与工作台互换'
    
    See merge request huang/yun-teng-iot-front!16
    xp.Huang authored
    2021-12-08 10:12:09 +0000  
    Browse Files »
  • 'fix:修复OEM页面的位置选择回显问题'
    7415b393
    sqy authored
    2021-12-08 16:32:11 +0800  
    Browse Directory »
  • 'fix:将分析页代码与工作台互换'
    737a6932
    sqy authored
    2021-12-08 11:28:36 +0800  
    Browse Directory »
  • refactor(front): 移除未使用的emit
    c05571a4
    fengistao authored
    2021-12-08 10:21:51 +0800  
    Browse Files »
  • Merge remote-tracking branch 'origin/sqy_dev'
    cb89b20c
    黄 x authored
    2021-12-08 09:24:39 +0800  
    Browse Files »
  • Merge branch 'main' into 'sqy_dev' ...
    d99342b5
    # Conflicts:
    #   src/views/system/account/AccountModal.vue
    xp.Huang authored
    2021-12-08 01:23:56 +0000  
    Browse Directory »
  • Merge branch 'ft-dev' into 'main' ...
    21f41971
    联调场景联动接口完成  feat:站内通知前端页面完成,接口调了4个
    
    See merge request huang/yun-teng-iot-front!14
    xp.Huang authored
    2021-12-08 01:21:25 +0000  
    Browse Directory »

07 Dec, 2021
4 commits
  • 'fix:修复字典回显不正确问题'
    c2bcede5
    sqy authored
    2021-12-07 18:08:05 +0800  
    Browse Files »
  • wip:联调场景联动接口完成 feat:站内通知前端页面完成,接口调了4个
    37f43cae
    fengistao authored
    2021-12-07 17:59:04 +0800  
    Browse Directory »
  • 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
6 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 »