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
09 Feb, 2022
7 commits
  • Merge branch 'ft-dev' into 'main' ...
    aae82259
    fix:修复场景联动新增问题
    
    See merge request huang/yun-teng-iot-front!103
    xp.Huang authored
    2022-02-09 10:05:41 +0000  
    Browse Directory »
  • fix:修复场景联动新增问题
    6a225297
    fengtao authored
    2022-02-09 18:04:05 +0800  
    Browse Files »
  • Merge branch 'sqy_dev' into 'main' ...
    655799a1
    fix:修改teambition上的几个问题:告警时间范围,消息配置回显错误,首页样式调整以及数据调整
    
    See merge request huang/yun-teng-iot-front!102
    xp.Huang authored
    2022-02-09 10:03:52 +0000  
    Browse Files »
  • 'fix:修改teambition上的几个问题:告警时间范围,消息配置回显错误,首页样式调整以及数据调整'
    e2786ef4
    sqy authored
    2022-02-09 17:50:40 +0800  
    Browse Files »
  • fix:重构后修复场景联动选择组织没设备问题
    d85b5ced
    fengtao authored
    2022-02-09 11:15:12 +0800  
    Browse Files »
  • Merge branch 'sqy_dev' into 'main' ...
    69358c3c
    fix:优化首页骨架屏展示和echarts动画时间
    
    See merge request huang/yun-teng-iot-front!100
    xp.Huang authored
    2022-02-09 01:17:42 +0000  
    Browse Files »
  • Merge branch 'main' into sqy_dev
    502ffdb0
    sqy authored
    2022-02-09 09:12:26 +0800  
    Browse Directory »

08 Feb, 2022
2 commits
  • Merge branch 'ft-dev' into 'main' ...
    2fca457f
    refactor:重构场景联动完成
    
    See merge request huang/yun-teng-iot-front!99
    xp.Huang authored
    2022-02-08 10:03:17 +0000  
    Browse Files »
  • refactor:重构场景联动完成
    8cce81b2
    fengtao authored
    2022-02-08 18:01:08 +0800  
    Browse Files »

29 Jan, 2022
1 commit
  • '优化首页骨架屏展示和echarts动画时间'
    4cb09fa3
    sqy authored
    2022-01-29 14:47:13 +0800  
    Browse Files »

25 Jan, 2022
5 commits
  • Merge branch 'sqy_dev' into 'main' ...
    37e1dc00
    'fix:調整首頁租戶消息量進度條'
    
    See merge request huang/yun-teng-iot-front!98
    xp.Huang authored
    2022-01-25 09:58:33 +0000  
    Browse Files »
  • Merge branch 'ft-dev' into 'main' ...
    27604ed8
    style:微调设备配置样式
    
    See merge request huang/yun-teng-iot-front!96
    xp.Huang authored
    2022-01-25 09:58:23 +0000  
    Browse Files »
  • 'fix:調整首頁租戶消息量進度條'
    ba9a388e
    sqy authored
    2022-01-25 17:53:59 +0800  
    Browse Files »
  • style:微调设备配置样式
    2690a752
    fengtao authored
    2022-01-25 17:53:51 +0800  
    Browse Files »
  • Merge branch 'ft-dev' into 'main' ...
    9580973a
    feat:新增租户配置的创建时间字段,fix:修复消息配置编辑控制台警告问题
    
    See merge request huang/yun-teng-iot-front!95
    xp.Huang authored
    2022-01-25 06:22:14 +0000  
    Browse Files »

24 Jan, 2022
6 commits
  • Merge branch 'sqy_dev' into 'main' ...
    633f8db2
    '修改通知头像,修改首页样式'
    
    See merge request huang/yun-teng-iot-front!94
    xp.Huang authored
    2022-01-24 10:46:55 +0000  
    Browse Files »
  • feat:新增租户配置的创建时间字段,fix:修复消息配置编辑控制台警告问题
    75318139
    fengtao authored
    2022-01-24 18:46:36 +0800  
    Browse Files »
  • '修改通知头像,修改首页样式'
    fa6ab188
    sqy authored
    2022-01-24 18:45:36 +0800  
    Browse Files »
  • '合并主分支代码,解决冲突'
    828168a7
    sqy authored
    2022-01-24 13:51:05 +0800  
    Browse Files »
  • 'fix:修复账号管理验证手机号,以及删除无用的mock数据'
    0f04dc58
    sqy authored
    2022-01-24 13:43:59 +0800  
    Browse Files »
  • Merge branch 'ft-dev' into 'main' ...
    98354099
    fix:修复账号管理手机号编辑问题,fix:修改场景联动部分问题,主要是修改一下数据收集
    
    See merge request huang/yun-teng-iot-front!93
    xp.Huang authored
    2022-01-24 01:22:49 +0000  
    Browse Files »

20 Jan, 2022
6 commits
  • Merge branch 'main' into ft-dev
    386d2058
    fengtao authored
    2022-01-20 17:56:49 +0800  
    Browse Files »
  • fix:修复账号管理手机号编辑问题,fix:修改场景联动部分问题,主要是修改一下数据收集
    fa515ee3
    fengtao authored
    2022-01-20 17:55:59 +0800  
    Browse Files »
  • Merge branch 'sqy_dev' into 'main' ...
    5906aa50
    '增加设备网关设备选项,地理位置图表不正确显示'
    
    See merge request huang/yun-teng-iot-front!92
    xp.Huang authored
    2022-01-20 08:57:55 +0000  
    Browse Files »
  • '增加设备网关设备选项,地理位置图表不正确显示'
    75b071fa
    sqy authored
    2022-01-20 16:55:00 +0800  
    Browse Files »
  • Merge remote-tracking branch 'origin/ft-dev' ...
    f6dece6c
    # Conflicts:
    #	src/views/dashboard/workbench/components/VisitAnalysis.vue
    #	src/views/dashboard/workbench/components/VisitAnalysisBar.vue
    黄 x authored
    2022-01-20 09:06:01 +0800  
    Browse Files »
  • Merge branch 'sqy_dev' into 'main' ...
    695a46ea
    '调整首页,修改设备'
    
    See merge request huang/yun-teng-iot-front!90
    xp.Huang authored
    2022-01-20 01:01:08 +0000  
    Browse Files »

19 Jan, 2022
2 commits
  • style:修改设备配置样式,fix:修改报警详细信息为输入框,fix:清除设备配置部分控制台警告,fix:完全清除场景联动控制台警告,fix:修复角色管理菜单… ...
    3a077970
    …回显问题,feat:新增消息发送里的手机号验证规则
    fengtao authored
    2022-01-19 20:35:57 +0800  
    Browse Files »
  • '调整首页,修改设备'
    1527079e
    sqy authored
    2022-01-19 20:33:37 +0800  
    Browse Files »

18 Jan, 2022
6 commits
  • Merge branch 'sqy_dev' into 'main' ...
    db7d22cf
    '更新一些静态图片。更改通知一个字段'
    
    See merge request huang/yun-teng-iot-front!89
    xp.Huang authored
    2022-01-18 10:23:42 +0000  
    Browse Files »
  • '更新一些静态图片。更改通知一个字段'
    4c4d09a2
    sqy authored
    2022-01-18 18:22:05 +0800  
    Browse Directory »
  • Merge branch 'ft-dev' into 'main' ...
    d9dcaeaf
    fix:检查发现邮件发送记录和短信发送记录问题,fix:修改设备配置点击无效问题,style:修改设备配置键名筛选器表格高度,fix:修改场景联动样式问题
    
    See merge request huang/yun-teng-iot-front!88
    xp.Huang authored
    2022-01-18 08:58:06 +0000  
    Browse Files »
  • fix:检查发现邮件发送记录和短信发送记录问题,fix:修改设备配置点击无效问题,style:修改设备配置键名筛选器表格高度,fix:修改场景联动样式问题
    0f1b4fca
    fengtao authored
    2022-01-18 16:54:21 +0800  
    Browse Directory »
  • Merge branch 'sqy_dev' into 'main' ...
    4f7cf20d
    'fix:修改主页,通知'
    
    See merge request huang/yun-teng-iot-front!87
    xp.Huang authored
    2022-01-18 08:53:34 +0000  
    Browse Files »
  • 'fix:修改主页,通知'
    e0f5f41c
    sqy authored
    2022-01-18 16:51:44 +0800  
    Browse Files »

17 Jan, 2022
5 commits
  • Merge branch 'sqy_dev' into 'main' ...
    69eaf81a
    'fix:修改一些静态图片打包后不能正常显示,设备页面的地图和地理位置的铆钉'..'修改前端的一些样式,以及美化界面,首页系统管理员图表接口联调'
    
    See merge request huang/yun-teng-iot-front!86
    xp.Huang authored
    2022-01-17 11:28:34 +0000  
    Browse Files »
  • Merge branch 'ft-dev' into 'main' ...
    1bab7fe3
    fix:修改设备配置详情页样式,待修改场景联动样式
    
    See merge request huang/yun-teng-iot-front!85
    xp.Huang authored
    2022-01-17 11:27:57 +0000  
    Browse Files »
  • '修改前端的一些样式,以及美化界面,首页系统管理员图表接口联调'
    4fcb1b99
    sqy authored
    2022-01-17 18:31:13 +0800  
    Browse Files »
  • fix:修改设备配置详情页样式,wip:待修改场景联动样式
    00f9d3fd
    fengtao authored
    2022-01-17 18:29:06 +0800  
    Browse Files »
  • Merge branch 'ft-dev' into 'main' ...
    e4646fe8
    fix:修复租户管理员新增账号问题,fix:修复未分配首页,地址栏输入/#/重定向404问题,feat:新增设备页面的设备名字跳转到设备配置页面,并且高亮当前行
    
    See merge request huang/yun-teng-iot-front!84
    xp.Huang authored
    2022-01-17 06:33:49 +0000  
    Browse Files »