diff --git a/src/api/system/label.ts b/src/api/system/label.ts index 86c1337..7c040fa 100644 --- a/src/api/system/label.ts +++ b/src/api/system/label.ts @@ -12,9 +12,9 @@ } // 删除 -export function delProcessList(id: string) { +export function delLabel(id: string) { const param = { - deployId: id, + rfid: id, } return request({ url: `${prefix}/delete`, @@ -22,101 +22,4 @@ data: param, }) } -// 废止 -export function updateState(id: string, state: number) { - const param = { - deployId: id, - state, - } - return request({ - url: `${prefix}/updateState`, - method: 'post', - data: param, - }) -} -// 加载流程定义 -export function unloadProcess(params: Object) { - const param = { - _value: params, - } - return request({ - url: `${prefix}/jsonToBpmn`, - method: 'post', - data: param, - }) -} - -// 流程定义编辑 -export function editProcess(params: Object) { - const param = { - _value: params, - } - return request({ - url: `${prefix}/update`, - method: 'post', - data: param, - }) -} - -// 新建流程 -export function addProcess(params: Object) { - const param = { - _value: params, - } - return request({ - url: `${prefix}/jsonToBpmn`, - method: 'post', - data: param, - }) -} - -// 获取流程定义详情 -export function getProcessDetail(formId: string) { - const param = { - formId, - } - return request({ - url: `${prefix}/detail`, - method: 'post', - data: param, - }) -} - -// 获取关联业务列表 -export function getBusinessList() { - return request({ - url: `${prefix}/flowFormList`, - method: 'get', - }) -} - -// 获取发起人的主管层级数 -export function getDirectorLevel(userId: number | string) { - return request({ - url: `${prefix}/directorLevel`, - method: 'get', - params: { userId }, - }) -} - -// 导出列表 -export function exportProcessList(data: { - deploymentId: string - suspensionState: string - number: string - name: string - business: string - person: string - beginTime: string - endTime: string - status: string - ids: string[] -}) { - return request({ - url: `${prefix}/listExport`, - method: 'post', - responseType: 'blob', - data, - }) -} diff --git a/src/api/system/label.ts b/src/api/system/label.ts index 86c1337..7c040fa 100644 --- a/src/api/system/label.ts +++ b/src/api/system/label.ts @@ -12,9 +12,9 @@ } // 删除 -export function delProcessList(id: string) { +export function delLabel(id: string) { const param = { - deployId: id, + rfid: id, } return request({ url: `${prefix}/delete`, @@ -22,101 +22,4 @@ data: param, }) } -// 废止 -export function updateState(id: string, state: number) { - const param = { - deployId: id, - state, - } - return request({ - url: `${prefix}/updateState`, - method: 'post', - data: param, - }) -} -// 加载流程定义 -export function unloadProcess(params: Object) { - const param = { - _value: params, - } - return request({ - url: `${prefix}/jsonToBpmn`, - method: 'post', - data: param, - }) -} - -// 流程定义编辑 -export function editProcess(params: Object) { - const param = { - _value: params, - } - return request({ - url: `${prefix}/update`, - method: 'post', - data: param, - }) -} - -// 新建流程 -export function addProcess(params: Object) { - const param = { - _value: params, - } - return request({ - url: `${prefix}/jsonToBpmn`, - method: 'post', - data: param, - }) -} - -// 获取流程定义详情 -export function getProcessDetail(formId: string) { - const param = { - formId, - } - return request({ - url: `${prefix}/detail`, - method: 'post', - data: param, - }) -} - -// 获取关联业务列表 -export function getBusinessList() { - return request({ - url: `${prefix}/flowFormList`, - method: 'get', - }) -} - -// 获取发起人的主管层级数 -export function getDirectorLevel(userId: number | string) { - return request({ - url: `${prefix}/directorLevel`, - method: 'get', - params: { userId }, - }) -} - -// 导出列表 -export function exportProcessList(data: { - deploymentId: string - suspensionState: string - number: string - name: string - business: string - person: string - beginTime: string - endTime: string - status: string - ids: string[] -}) { - return request({ - url: `${prefix}/listExport`, - method: 'post', - responseType: 'blob', - data, - }) -} diff --git a/src/assets/icons/icon-export.svg b/src/assets/icons/icon-export.svg index 618ab70..62df451 100644 --- a/src/assets/icons/icon-export.svg +++ b/src/assets/icons/icon-export.svg @@ -1,3 +1,3 @@ - + diff --git a/src/api/system/label.ts b/src/api/system/label.ts index 86c1337..7c040fa 100644 --- a/src/api/system/label.ts +++ b/src/api/system/label.ts @@ -12,9 +12,9 @@ } // 删除 -export function delProcessList(id: string) { +export function delLabel(id: string) { const param = { - deployId: id, + rfid: id, } return request({ url: `${prefix}/delete`, @@ -22,101 +22,4 @@ data: param, }) } -// 废止 -export function updateState(id: string, state: number) { - const param = { - deployId: id, - state, - } - return request({ - url: `${prefix}/updateState`, - method: 'post', - data: param, - }) -} -// 加载流程定义 -export function unloadProcess(params: Object) { - const param = { - _value: params, - } - return request({ - url: `${prefix}/jsonToBpmn`, - method: 'post', - data: param, - }) -} - -// 流程定义编辑 -export function editProcess(params: Object) { - const param = { - _value: params, - } - return request({ - url: `${prefix}/update`, - method: 'post', - data: param, - }) -} - -// 新建流程 -export function addProcess(params: Object) { - const param = { - _value: params, - } - return request({ - url: `${prefix}/jsonToBpmn`, - method: 'post', - data: param, - }) -} - -// 获取流程定义详情 -export function getProcessDetail(formId: string) { - const param = { - formId, - } - return request({ - url: `${prefix}/detail`, - method: 'post', - data: param, - }) -} - -// 获取关联业务列表 -export function getBusinessList() { - return request({ - url: `${prefix}/flowFormList`, - method: 'get', - }) -} - -// 获取发起人的主管层级数 -export function getDirectorLevel(userId: number | string) { - return request({ - url: `${prefix}/directorLevel`, - method: 'get', - params: { userId }, - }) -} - -// 导出列表 -export function exportProcessList(data: { - deploymentId: string - suspensionState: string - number: string - name: string - business: string - person: string - beginTime: string - endTime: string - status: string - ids: string[] -}) { - return request({ - url: `${prefix}/listExport`, - method: 'post', - responseType: 'blob', - data, - }) -} diff --git a/src/assets/icons/icon-export.svg b/src/assets/icons/icon-export.svg index 618ab70..62df451 100644 --- a/src/assets/icons/icon-export.svg +++ b/src/assets/icons/icon-export.svg @@ -1,3 +1,3 @@ - + diff --git a/src/assets/icons/icon-import.svg b/src/assets/icons/icon-import.svg index 62df451..618ab70 100644 --- a/src/assets/icons/icon-import.svg +++ b/src/assets/icons/icon-import.svg @@ -1,3 +1,3 @@ - + diff --git a/src/api/system/label.ts b/src/api/system/label.ts index 86c1337..7c040fa 100644 --- a/src/api/system/label.ts +++ b/src/api/system/label.ts @@ -12,9 +12,9 @@ } // 删除 -export function delProcessList(id: string) { +export function delLabel(id: string) { const param = { - deployId: id, + rfid: id, } return request({ url: `${prefix}/delete`, @@ -22,101 +22,4 @@ data: param, }) } -// 废止 -export function updateState(id: string, state: number) { - const param = { - deployId: id, - state, - } - return request({ - url: `${prefix}/updateState`, - method: 'post', - data: param, - }) -} -// 加载流程定义 -export function unloadProcess(params: Object) { - const param = { - _value: params, - } - return request({ - url: `${prefix}/jsonToBpmn`, - method: 'post', - data: param, - }) -} - -// 流程定义编辑 -export function editProcess(params: Object) { - const param = { - _value: params, - } - return request({ - url: `${prefix}/update`, - method: 'post', - data: param, - }) -} - -// 新建流程 -export function addProcess(params: Object) { - const param = { - _value: params, - } - return request({ - url: `${prefix}/jsonToBpmn`, - method: 'post', - data: param, - }) -} - -// 获取流程定义详情 -export function getProcessDetail(formId: string) { - const param = { - formId, - } - return request({ - url: `${prefix}/detail`, - method: 'post', - data: param, - }) -} - -// 获取关联业务列表 -export function getBusinessList() { - return request({ - url: `${prefix}/flowFormList`, - method: 'get', - }) -} - -// 获取发起人的主管层级数 -export function getDirectorLevel(userId: number | string) { - return request({ - url: `${prefix}/directorLevel`, - method: 'get', - params: { userId }, - }) -} - -// 导出列表 -export function exportProcessList(data: { - deploymentId: string - suspensionState: string - number: string - name: string - business: string - person: string - beginTime: string - endTime: string - status: string - ids: string[] -}) { - return request({ - url: `${prefix}/listExport`, - method: 'post', - responseType: 'blob', - data, - }) -} diff --git a/src/assets/icons/icon-export.svg b/src/assets/icons/icon-export.svg index 618ab70..62df451 100644 --- a/src/assets/icons/icon-export.svg +++ b/src/assets/icons/icon-export.svg @@ -1,3 +1,3 @@ - + diff --git a/src/assets/icons/icon-import.svg b/src/assets/icons/icon-import.svg index 62df451..618ab70 100644 --- a/src/assets/icons/icon-import.svg +++ b/src/assets/icons/icon-import.svg @@ -1,3 +1,3 @@ - + diff --git a/src/views/system/label/label.ts b/src/views/system/label/label.ts index 0add3f9..9841a07 100644 --- a/src/views/system/label/label.ts +++ b/src/views/system/label/label.ts @@ -17,3 +17,12 @@ name: string value: string } + +export interface ILabelItem { + rfid: string + state: string + equipmentNo: string + equipmentName: string + equipmentDeptName: string + equipmentDirectorName: string +} diff --git a/src/api/system/label.ts b/src/api/system/label.ts index 86c1337..7c040fa 100644 --- a/src/api/system/label.ts +++ b/src/api/system/label.ts @@ -12,9 +12,9 @@ } // 删除 -export function delProcessList(id: string) { +export function delLabel(id: string) { const param = { - deployId: id, + rfid: id, } return request({ url: `${prefix}/delete`, @@ -22,101 +22,4 @@ data: param, }) } -// 废止 -export function updateState(id: string, state: number) { - const param = { - deployId: id, - state, - } - return request({ - url: `${prefix}/updateState`, - method: 'post', - data: param, - }) -} -// 加载流程定义 -export function unloadProcess(params: Object) { - const param = { - _value: params, - } - return request({ - url: `${prefix}/jsonToBpmn`, - method: 'post', - data: param, - }) -} - -// 流程定义编辑 -export function editProcess(params: Object) { - const param = { - _value: params, - } - return request({ - url: `${prefix}/update`, - method: 'post', - data: param, - }) -} - -// 新建流程 -export function addProcess(params: Object) { - const param = { - _value: params, - } - return request({ - url: `${prefix}/jsonToBpmn`, - method: 'post', - data: param, - }) -} - -// 获取流程定义详情 -export function getProcessDetail(formId: string) { - const param = { - formId, - } - return request({ - url: `${prefix}/detail`, - method: 'post', - data: param, - }) -} - -// 获取关联业务列表 -export function getBusinessList() { - return request({ - url: `${prefix}/flowFormList`, - method: 'get', - }) -} - -// 获取发起人的主管层级数 -export function getDirectorLevel(userId: number | string) { - return request({ - url: `${prefix}/directorLevel`, - method: 'get', - params: { userId }, - }) -} - -// 导出列表 -export function exportProcessList(data: { - deploymentId: string - suspensionState: string - number: string - name: string - business: string - person: string - beginTime: string - endTime: string - status: string - ids: string[] -}) { - return request({ - url: `${prefix}/listExport`, - method: 'post', - responseType: 'blob', - data, - }) -} diff --git a/src/assets/icons/icon-export.svg b/src/assets/icons/icon-export.svg index 618ab70..62df451 100644 --- a/src/assets/icons/icon-export.svg +++ b/src/assets/icons/icon-export.svg @@ -1,3 +1,3 @@ - + diff --git a/src/assets/icons/icon-import.svg b/src/assets/icons/icon-import.svg index 62df451..618ab70 100644 --- a/src/assets/icons/icon-import.svg +++ b/src/assets/icons/icon-import.svg @@ -1,3 +1,3 @@ - + diff --git a/src/views/system/label/label.ts b/src/views/system/label/label.ts index 0add3f9..9841a07 100644 --- a/src/views/system/label/label.ts +++ b/src/views/system/label/label.ts @@ -17,3 +17,12 @@ name: string value: string } + +export interface ILabelItem { + rfid: string + state: string + equipmentNo: string + equipmentName: string + equipmentDeptName: string + equipmentDirectorName: string +} diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue index ecb3d45..d790282 100644 --- a/src/views/system/label/list.vue +++ b/src/views/system/label/list.vue @@ -1,29 +1,34 @@ - +