diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts index 47ab284..04da2af 100644 --- a/src/api/eqpt/device/model.ts +++ b/src/api/eqpt/device/model.ts @@ -32,6 +32,7 @@ url: '/equipment/model/export', method: 'post', data, + responseType: 'blob', }) } // 新建或编辑 diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts index 47ab284..04da2af 100644 --- a/src/api/eqpt/device/model.ts +++ b/src/api/eqpt/device/model.ts @@ -32,6 +32,7 @@ url: '/equipment/model/export', method: 'post', data, + responseType: 'blob', }) } // 新建或编辑 diff --git a/src/api/eqpt/device/task.ts b/src/api/eqpt/device/task.ts new file mode 100644 index 0000000..2a83db0 --- /dev/null +++ b/src/api/eqpt/device/task.ts @@ -0,0 +1,38 @@ +/** + * 参试任务管理相关 + */ +import request from '@/api/index' + +// 列表 +export function getTaskList(params: any) { + return request({ + url: `/equipment/task/listPage?limit=${params.limit}&offset=${params.offset}`, + method: 'post', + data: params, + }) +} +// 新增 +export function addTask(params: any) { + return request({ + url: '/equipment/task/add', + method: 'post', + data: params, + }) +} +// 新增 +export function updateTask(params: any) { + return request({ + url: '/equipment/task/update', + method: 'post', + data: params, + }) +} +// 删除 +export function delTask(params: any) { + return request({ + url: '/equipment/task/delete', + method: 'post', + data: params, + }) +} + diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts index 47ab284..04da2af 100644 --- a/src/api/eqpt/device/model.ts +++ b/src/api/eqpt/device/model.ts @@ -32,6 +32,7 @@ url: '/equipment/model/export', method: 'post', data, + responseType: 'blob', }) } // 新建或编辑 diff --git a/src/api/eqpt/device/task.ts b/src/api/eqpt/device/task.ts new file mode 100644 index 0000000..2a83db0 --- /dev/null +++ b/src/api/eqpt/device/task.ts @@ -0,0 +1,38 @@ +/** + * 参试任务管理相关 + */ +import request from '@/api/index' + +// 列表 +export function getTaskList(params: any) { + return request({ + url: `/equipment/task/listPage?limit=${params.limit}&offset=${params.offset}`, + method: 'post', + data: params, + }) +} +// 新增 +export function addTask(params: any) { + return request({ + url: '/equipment/task/add', + method: 'post', + data: params, + }) +} +// 新增 +export function updateTask(params: any) { + return request({ + url: '/equipment/task/update', + method: 'post', + data: params, + }) +} +// 删除 +export function delTask(params: any) { + return request({ + url: '/equipment/task/delete', + method: 'post', + data: params, + }) +} + diff --git a/src/assets/icons/icon-task.svg b/src/assets/icons/icon-task.svg new file mode 100644 index 0000000..213c7cd --- /dev/null +++ b/src/assets/icons/icon-task.svg @@ -0,0 +1 @@ + diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts index 47ab284..04da2af 100644 --- a/src/api/eqpt/device/model.ts +++ b/src/api/eqpt/device/model.ts @@ -32,6 +32,7 @@ url: '/equipment/model/export', method: 'post', data, + responseType: 'blob', }) } // 新建或编辑 diff --git a/src/api/eqpt/device/task.ts b/src/api/eqpt/device/task.ts new file mode 100644 index 0000000..2a83db0 --- /dev/null +++ b/src/api/eqpt/device/task.ts @@ -0,0 +1,38 @@ +/** + * 参试任务管理相关 + */ +import request from '@/api/index' + +// 列表 +export function getTaskList(params: any) { + return request({ + url: `/equipment/task/listPage?limit=${params.limit}&offset=${params.offset}`, + method: 'post', + data: params, + }) +} +// 新增 +export function addTask(params: any) { + return request({ + url: '/equipment/task/add', + method: 'post', + data: params, + }) +} +// 新增 +export function updateTask(params: any) { + return request({ + url: '/equipment/task/update', + method: 'post', + data: params, + }) +} +// 删除 +export function delTask(params: any) { + return request({ + url: '/equipment/task/delete', + method: 'post', + data: params, + }) +} + diff --git a/src/assets/icons/icon-task.svg b/src/assets/icons/icon-task.svg new file mode 100644 index 0000000..213c7cd --- /dev/null +++ b/src/assets/icons/icon-task.svg @@ -0,0 +1 @@ + diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue index db05d4d..61957f8 100644 --- a/src/views/tested/device/info/components/list.vue +++ b/src/views/tested/device/info/components/list.vue @@ -10,6 +10,7 @@ import { SCHEDULE } from '@/utils/scheduleDict' import useTemplateDownload from '@/utils/useTemplateDownload' import { exportFile } from '@/utils/exportUtils' +import task from '@/views/tested/device/task/index.vue' const $props = defineProps({ statusName: { type: String, @@ -392,6 +393,15 @@ const importList = () => { fileRef.value.click() } +// 绑定参试任务 +const taskRef = ref() +const bindTask = () => { + taskRef.value.initDialog() +} +// 确认绑定 +const bind = (ids: string[]) => { + console.log(ids, '参数任务ids') +} // 详情 const detail = (row: IlistObjType) => { if ($props.statusName === '草稿箱' || $props.statusName === '未通过' || $props.statusName === '已取消') { @@ -546,6 +556,8 @@ + + @@ -580,6 +592,7 @@ +
diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts index 47ab284..04da2af 100644 --- a/src/api/eqpt/device/model.ts +++ b/src/api/eqpt/device/model.ts @@ -32,6 +32,7 @@ url: '/equipment/model/export', method: 'post', data, + responseType: 'blob', }) } // 新建或编辑 diff --git a/src/api/eqpt/device/task.ts b/src/api/eqpt/device/task.ts new file mode 100644 index 0000000..2a83db0 --- /dev/null +++ b/src/api/eqpt/device/task.ts @@ -0,0 +1,38 @@ +/** + * 参试任务管理相关 + */ +import request from '@/api/index' + +// 列表 +export function getTaskList(params: any) { + return request({ + url: `/equipment/task/listPage?limit=${params.limit}&offset=${params.offset}`, + method: 'post', + data: params, + }) +} +// 新增 +export function addTask(params: any) { + return request({ + url: '/equipment/task/add', + method: 'post', + data: params, + }) +} +// 新增 +export function updateTask(params: any) { + return request({ + url: '/equipment/task/update', + method: 'post', + data: params, + }) +} +// 删除 +export function delTask(params: any) { + return request({ + url: '/equipment/task/delete', + method: 'post', + data: params, + }) +} + diff --git a/src/assets/icons/icon-task.svg b/src/assets/icons/icon-task.svg new file mode 100644 index 0000000..213c7cd --- /dev/null +++ b/src/assets/icons/icon-task.svg @@ -0,0 +1 @@ + diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue index db05d4d..61957f8 100644 --- a/src/views/tested/device/info/components/list.vue +++ b/src/views/tested/device/info/components/list.vue @@ -10,6 +10,7 @@ import { SCHEDULE } from '@/utils/scheduleDict' import useTemplateDownload from '@/utils/useTemplateDownload' import { exportFile } from '@/utils/exportUtils' +import task from '@/views/tested/device/task/index.vue' const $props = defineProps({ statusName: { type: String, @@ -392,6 +393,15 @@ const importList = () => { fileRef.value.click() } +// 绑定参试任务 +const taskRef = ref() +const bindTask = () => { + taskRef.value.initDialog() +} +// 确认绑定 +const bind = (ids: string[]) => { + console.log(ids, '参数任务ids') +} // 详情 const detail = (row: IlistObjType) => { if ($props.statusName === '草稿箱' || $props.statusName === '未通过' || $props.statusName === '已取消') { @@ -546,6 +556,8 @@ + + @@ -580,6 +592,7 @@ +
diff --git a/src/views/tested/device/task/addDialog.vue b/src/views/tested/device/task/addDialog.vue new file mode 100644 index 0000000..620e689 --- /dev/null +++ b/src/views/tested/device/task/addDialog.vue @@ -0,0 +1,170 @@ + + + + + + diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts index 47ab284..04da2af 100644 --- a/src/api/eqpt/device/model.ts +++ b/src/api/eqpt/device/model.ts @@ -32,6 +32,7 @@ url: '/equipment/model/export', method: 'post', data, + responseType: 'blob', }) } // 新建或编辑 diff --git a/src/api/eqpt/device/task.ts b/src/api/eqpt/device/task.ts new file mode 100644 index 0000000..2a83db0 --- /dev/null +++ b/src/api/eqpt/device/task.ts @@ -0,0 +1,38 @@ +/** + * 参试任务管理相关 + */ +import request from '@/api/index' + +// 列表 +export function getTaskList(params: any) { + return request({ + url: `/equipment/task/listPage?limit=${params.limit}&offset=${params.offset}`, + method: 'post', + data: params, + }) +} +// 新增 +export function addTask(params: any) { + return request({ + url: '/equipment/task/add', + method: 'post', + data: params, + }) +} +// 新增 +export function updateTask(params: any) { + return request({ + url: '/equipment/task/update', + method: 'post', + data: params, + }) +} +// 删除 +export function delTask(params: any) { + return request({ + url: '/equipment/task/delete', + method: 'post', + data: params, + }) +} + diff --git a/src/assets/icons/icon-task.svg b/src/assets/icons/icon-task.svg new file mode 100644 index 0000000..213c7cd --- /dev/null +++ b/src/assets/icons/icon-task.svg @@ -0,0 +1 @@ + diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue index db05d4d..61957f8 100644 --- a/src/views/tested/device/info/components/list.vue +++ b/src/views/tested/device/info/components/list.vue @@ -10,6 +10,7 @@ import { SCHEDULE } from '@/utils/scheduleDict' import useTemplateDownload from '@/utils/useTemplateDownload' import { exportFile } from '@/utils/exportUtils' +import task from '@/views/tested/device/task/index.vue' const $props = defineProps({ statusName: { type: String, @@ -392,6 +393,15 @@ const importList = () => { fileRef.value.click() } +// 绑定参试任务 +const taskRef = ref() +const bindTask = () => { + taskRef.value.initDialog() +} +// 确认绑定 +const bind = (ids: string[]) => { + console.log(ids, '参数任务ids') +} // 详情 const detail = (row: IlistObjType) => { if ($props.statusName === '草稿箱' || $props.statusName === '未通过' || $props.statusName === '已取消') { @@ -546,6 +556,8 @@ + + @@ -580,6 +592,7 @@ +
diff --git a/src/views/tested/device/task/addDialog.vue b/src/views/tested/device/task/addDialog.vue new file mode 100644 index 0000000..620e689 --- /dev/null +++ b/src/views/tested/device/task/addDialog.vue @@ -0,0 +1,170 @@ + + + + + + diff --git a/src/views/tested/device/task/index.vue b/src/views/tested/device/task/index.vue new file mode 100644 index 0000000..b3f5981 --- /dev/null +++ b/src/views/tested/device/task/index.vue @@ -0,0 +1,197 @@ + + + + +