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
18 Apr, 2023
2 commits
  • Merge branch 'ft' into 'main_dev' ...
    be4155d1
    fix: 修改Teambition上的问题
    
    See merge request yunteng/thingskit-front!542
    xp.Huang authored
    2023-04-18 01:37:13 +0000  
    Browse Files »
  • Merge branch 'main_dev' into ft
    07ef1fd2
    fengwotao authored
    2023-04-18 09:33:32 +0800  
    Browse Files »

17 Apr, 2023
26 commits
  • Merge branch 'dev-fix-ww' into 'main_dev' ...
    c5077dc9
    fix: 修复teambition bug
    
    See merge request yunteng/thingskit-front!541
    xp.Huang authored
    2023-04-17 13:08:53 +0000  
    Browse Files »
  • feat:调度日志新增时间筛选
    038d1b5f
    fengwotao authored
    2023-04-17 19:45:13 +0800  
    Browse Files »
  • chore: 恢复合并到main_dev丢失的代码(公共接口管理部分代码)
    aeb49c91
    fengwotao authored
    2023-04-17 17:06:36 +0800  
    Browse Files »
  • fix:打开测试接口,可以关闭
    a978c13d
    fengwotao authored
    2023-04-17 17:05:33 +0800  
    Browse Files »
  • fix:新增请求类型&地址验证
    b1c30a77
    fengwotao authored
    2023-04-17 17:04:24 +0800  
    Browse Files »
  • perf: 看板管理优化切换控制组件时数据源重置属性选择款或服务选择框
    283688d5
    ww authored
    2023-04-17 17:04:04 +0800  
    Browse Files »
  • perf: drop console
    a277416b
    ww authored
    2023-04-17 16:51:02 +0800  
    Browse Files »
  • fix: 看板管理控制组件下发指令失败后开关也能切换成功
    004cebd8
    ww authored
    2023-04-17 16:40:47 +0800  
    Browse Files »
  • perf: DEFECT-1173 任务中心新增详情页面
    814ad1f5
    ww authored
    2023-04-17 16:22:55 +0800  
    Browse Files »
  • fix:DEFECT-1177 新增点击触发器和执行动作时,如果没选择组织,提示框提示先选择组织
    e37cb6f2
    fengwotao authored
    2023-04-17 15:56:54 +0800  
    Browse Files »
  • fix:DEFECT-1175 and 1176 报表配置刚开始为聚合数据,然后再点击编辑,选择聚合条件少了计数, and 编辑时,求和显示为count了
    c2836752
    fengwotao authored
    2023-04-17 15:28:49 +0800  
    Browse Files »
  • pref:DEFECT-1174 报表配置 自定义周期新增分组间隔
    86d40b53
    fengwotao authored
    2023-04-17 15:27:38 +0800  
    Browse Files »
  • fix: DEFECT-1172 任务中心modal标题未更改
    86532274
    ww authored
    2023-04-17 14:45:14 +0800  
    Browse Files »
  • fix: DEFECT-1169 任务中心自定义cron表达式拼接错误
    0196ae2d
    ww authored
    2023-04-17 14:41:35 +0800  
    Browse Files »
  • pref:DEFECT-1158 新增转换脚本时,加一个测试功能
    91ea8d94
    fengwotao authored
    2023-04-17 14:21:53 +0800  
    Browse Files »
  • fix: DEFECT-1170 任务中心模糊查询重置未清空查询参数
    96526939
    ww authored
    2023-04-17 11:54:57 +0800  
    Browse Files »
  • perf: DEFECT-1167 任务中心筛选描述修改
    e8769d0d
    ww authored
    2023-04-17 11:18:39 +0800  
    Browse Files »
  • fix: DEFECT-1163 切换控制组件后只重置属性选择框
    26d30614
    ww authored
    2023-04-17 11:17:28 +0800  
    Browse Files »
  • pref:DEFECT-1154 转换脚本问号提示后续需要进行相应的修改
    8353fbf4
    fengwotao authored
    2023-04-17 11:13:20 +0800  
    Browse Files »
  • pref:DEFECT-1154 转换脚本问号提示后续需要进行相应的修改
    b78c84fa
    fengwotao authored
    2023-04-17 11:12:24 +0800  
    Browse Files »
  • fix: 任务中心运行任务运行全部任务缺失参数
    825b3bee
    ww authored
    2023-04-17 11:00:31 +0800  
    Browse Files »
  • fix: 修复任务中心运行任务按钮未控制权限
    3157fb2a
    ww authored
    2023-04-17 10:46:01 +0800  
    Browse Files »
  • perf: 分享徽标新增颜色区分
    71ab99b2
    ww authored
    2023-04-17 10:37:09 +0800  
    Browse Files »
  • feat: DEFECT-1123 分享功能新增分享链接
    1da996ec
    ww authored
    2023-04-17 10:28:05 +0800  
    Browse Files »
  • chore: 恢复合并到main_dev丢失的代码(TCP详情和产品分页表格部分代码)
    1f788a85
    fengwotao authored
    2023-04-17 10:16:30 +0800  
    Browse Files »
  • chore: 恢复合并到main_dev丢失的代码(公共接口管理)
    4c930d7b
    fengwotao authored
    2023-04-17 10:09:19 +0800  
    Browse Files »

14 Apr, 2023
7 commits
  • Merge branch 'dev-ww' into 'main' ...
    53e42e29
    fix: 合并代码重复合并
    
    See merge request yunteng/thingskit-front!540
    xp.Huang authored
    2023-04-14 10:58:44 +0000  
    Browse Files »
  • fix: 合并代码重复合并
    0475d023
    ww authored
    2023-04-14 18:55:58 +0800  
    Browse Files »
  • Merge remote-tracking branch 'origin/ww' ...
    cbb36837
    # Conflicts:
    #	.env.development
    xp.Huang authored
    2023-04-14 18:51:37 +0800  
    Browse Files »
  • Merge branch 'main_dev' ...
    c9cd2fad
    # Conflicts:
    #	src/views/dataview/publicApi/components/SimpleRequest/components/bodyTable.vue
    #	src/views/dataview/publicApi/components/SimpleRequest/components/paramsTable.vue
    #	src/views/dataview/publicApi/components/TestInterface/bodyTest/index.vue
    #	src/views/dataview/publicApi/components/TestInterface/bodyTest/testEditBodyCellTable.vue
    #	src/views/dataview/publicApi/components/TestInterface/components/excuteTest.vue
    #	src/views/dataview/publicApi/components/TestInterface/headerTest/index.vue
    #	src/views/dataview/publicApi/components/TestInterface/paramsTest/index.vue
    #	src/views/dataview/publicApi/components/TestInterface/paramsTest/testEditParamsCellTable.vue
    #	src/views/dataview/publicApi/form.vue
    #	src/views/dataview/publicApi/hooks/useUtils.ts
    #	src/views/dataview/publicApi/list.vue
    #	src/views/device/profiles/CardMode.vue
    xp.Huang authored
    2023-04-14 18:45:43 +0800  
    Browse Files »
  • feat: 完成任务中心立即实行实现
    3d1616dc
    ww authored
    2023-04-14 18:16:11 +0800  
    Browse Files »
  • feat: 新增运行任务调用模态框
    66212522
    ww authored
    2023-04-14 15:55:26 +0800  
    Browse Files »
  • fix: DEFECT-1113 修复看板管理控制组件数据回显问题
    eca2a637
    ww authored
    2023-04-14 15:34:16 +0800  
    Browse Files »

13 Apr, 2023
4 commits
  • perf: 新增按钮权限控制
    ef367005
    ww authored
    2023-04-13 17:45:02 +0800  
    Browse Files »
  • fix: 定时任务列表任务组名回显&&禁用编辑cron表达式和任务分组
    aff02bc3
    ww authored
    2023-04-13 17:31:17 +0800  
    Browse Files »
  • feat: 完成任务中心modbus指令生成&&设备详情任务是否允许任务执行
    45d95317
    ww authored
    2023-04-13 16:47:20 +0800  
    Browse Files »
  • Merge branch 'ft' into 'main_dev' ...
    98be9762
    fix: 修改Teambition上的问题
    
    See merge request yunteng/thingskit-front!535
    
    (cherry picked from commit b8da6b5459e02e32e7e4e8a832c845ec9d7fc27b)
    
    8c259679 pref: 脚本管理,移除上报数据类型和下行数据解析
    68707d7b fix: DEFECT-1133 修复产品从最后一页分页查询,然后查询出来17条,但是显示第二页,界面显示为第一页的数据,点第一页界面不变
    5618db44 fix: DEFECT-1118 只修复PC端,tcp命令下发输入内容验证字母和数字
    7f595afd pref: 修改TCP脚本
    2d3fda8c fix: DEFECT-1149 报表配置,新增填入数据后,再去编辑,数据未回显(执行方式为立即执行时)
    4524080e fix: DEFECT-1076 修复暗黑模式下新增通知白色显示框问题
    2405426e fix: DEFECT-1148 websocket测试,先正常选择,测试有数据,然后把参数设置清空,再执行测试请求,依然有数据显示(应该是有缓存)
    xp.Huang authored
    2023-04-13 09:29:28 +0800  
    Browse Files »

12 Apr, 2023
1 commit
  • feat: 完成modbus rtu指令生成页面
    f58124e6
    ww authored
    2023-04-12 20:03:22 +0800  
    Browse Files »