Commits · ecbfc6c380fbf4b323b13e6c65c523bb6b313d7f · 简柏林 / thingskit-front

18 Apr, 2023

7 commits

Merge branch 'main_dev' into ft
ecbfc6c3

fengwotao authored
2023-04-18 21:10:47 +0800
Browse Files »
pref:调整公共接口管理
8725e59e

fengwotao authored
2023-04-18 21:09:43 +0800
Browse Files »
fix:DEFECT-1191 移除设备列表里的地址码
3e21de91

fengwotao authored
2023-04-18 16:54:02 +0800
Browse Files »
pref:调整公共接口管理
d8a328be

fengwotao authored
2023-04-18 16:47:45 +0800
Browse Files »
fix:DEFECT-1190 修复选择几个该租户创建的公共接口,批量发布提示错误,批量删除也不成功,而且选择了数据,再恢复刷新后,批量删除和批量发布按钮还显示为红色状态
e2b70c09

fengwotao authored
2023-04-18 16:45:23 +0800
Browse Files »
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

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 »

简柏林 / thingskit-front · Commits

GitLab

18 Apr, 2023

17 Apr, 2023

14 Apr, 2023