diff --git a/src/api/mes/vulcAlarmItems/index.ts b/src/api/mes/vulcAlarmItems/index.ts new file mode 100644 index 0000000..edeaac0 --- /dev/null +++ b/src/api/mes/vulcAlarmItems/index.ts @@ -0,0 +1,77 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { VulcAlarmItemsVO, VulcAlarmItemsForm, VulcAlarmItemsQuery } from '@/api/mes/vulcAlarmItems/types'; + +/** + * 查询报警项目信息列表 + * @param query + * @returns {*} + */ + +export const listVulcAlarmItems = (query?: VulcAlarmItemsQuery): AxiosPromise => { + return request({ + url: '/mes/vulcAlarmItems/list', + method: 'get', + params: query + }); +}; + +/** + * 查询报警项目信息详细 + * @param alarmItemsId + */ +export const getVulcAlarmItems = (alarmItemsId: string | number): AxiosPromise => { + return request({ + url: '/mes/vulcAlarmItems/' + alarmItemsId, + method: 'get' + }); +}; + +/** + * 新增报警项目信息 + * @param data + */ +export const addVulcAlarmItems = (data: VulcAlarmItemsForm) => { + return request({ + url: '/mes/vulcAlarmItems', + method: 'post', + data: data + }); +}; + +/** + * 修改报警项目信息 + * @param data + */ +export const updateVulcAlarmItems = (data: VulcAlarmItemsForm) => { + return request({ + url: '/mes/vulcAlarmItems', + method: 'put', + data: data + }); +}; + +/** + * 删除报警项目信息 + * @param alarmItemsId + */ +export const delVulcAlarmItems = (alarmItemsId: string | number | Array) => { + return request({ + url: '/mes/vulcAlarmItems/' + alarmItemsId, + method: 'delete' + }); +}; + + +/** + * 下拉框查询报警项目信息列表 + * @param query + * @returns {*} + */ +export function getProdVulcAlarmItemsList (query) { + return request({ + url: '/mes/vulcAlarmItems/getProdVulcAlarmItemsList', + method: 'get', + params: query + }); +}; diff --git a/src/api/mes/vulcAlarmItems/types.ts b/src/api/mes/vulcAlarmItems/types.ts new file mode 100644 index 0000000..72a6954 --- /dev/null +++ b/src/api/mes/vulcAlarmItems/types.ts @@ -0,0 +1,101 @@ +export interface VulcAlarmItemsVO { + /** + * 报警项目ID + */ + alarmItemsId: string | number; + + /** + * 报警项目编号 + */ + alarmItemsCode: string; + + /** + * 报警项目名称 + */ + alarmItemsName: string; + + /** + * 报警类型 + */ + alarmType: string; + + /** + * 激活标识(1是 0否) + */ + activeFlag: string; + + /** + * 备注 + */ + remark: string; + +} + +export interface VulcAlarmItemsForm extends BaseEntity { + /** + * 报警项目ID + */ + alarmItemsId?: string | number; + + /** + * 报警项目编号 + */ + alarmItemsCode?: string; + + /** + * 报警项目名称 + */ + alarmItemsName?: string; + + /** + * 报警类型 + */ + alarmType?: string; + + /** + * 激活标识(1是 0否) + */ + activeFlag?: string; + + /** + * 备注 + */ + remark?: string; + +} + +export interface VulcAlarmItemsQuery extends PageQuery { + + /** + * 报警项目ID + */ + alarmItemsId?: string | number; + + /** + * 报警项目编号 + */ + alarmItemsCode?: string; + + /** + * 报警项目名称 + */ + alarmItemsName?: string; + + /** + * 报警类型 + */ + alarmType?: string; + + /** + * 激活标识(1是 0否) + */ + activeFlag?: string; + + /** + * 日期范围参数 + */ + params?: any; +} + + + diff --git a/src/api/mes/vulcAlarmStandard/index.ts b/src/api/mes/vulcAlarmStandard/index.ts new file mode 100644 index 0000000..18a90ec --- /dev/null +++ b/src/api/mes/vulcAlarmStandard/index.ts @@ -0,0 +1,77 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { VulcAlarmStandardVO, VulcAlarmStandardForm, VulcAlarmStandardQuery } from '@/api/mes/vulcAlarmStandard/types'; + +/** + * 查询报警标准信息列表 + * @param query + * @returns {*} + */ + +export const listVulcAlarmStandard = (query?: VulcAlarmStandardQuery): AxiosPromise => { + return request({ + url: '/mes/vulcAlarmStandard/list', + method: 'get', + params: query + }); +}; + +/** + * 查询报警标准信息详细 + * @param alarmStandardId + */ +export const getVulcAlarmStandard = (alarmStandardId: string | number): AxiosPromise => { + return request({ + url: '/mes/vulcAlarmStandard/' + alarmStandardId, + method: 'get' + }); +}; + +/** + * 新增报警标准信息 + * @param data + */ +export const addVulcAlarmStandard = (data: VulcAlarmStandardForm) => { + return request({ + url: '/mes/vulcAlarmStandard', + method: 'post', + data: data + }); +}; + +/** + * 修改报警标准信息 + * @param data + */ +export const updateVulcAlarmStandard = (data: VulcAlarmStandardForm) => { + return request({ + url: '/mes/vulcAlarmStandard', + method: 'put', + data: data + }); +}; + +/** + * 删除报警标准信息 + * @param alarmStandardId + */ +export const delVulcAlarmStandard = (alarmStandardId: string | number | Array) => { + return request({ + url: '/mes/vulcAlarmStandard/' + alarmStandardId, + method: 'delete' + }); +}; + + +/** + * 下拉框查询报警标准信息列表 + * @param query + * @returns {*} + */ +export function getProdVulcAlarmStandardList (query) { + return request({ + url: '/mes/vulcAlarmStandard/getProdVulcAlarmStandardList', + method: 'get', + params: query + }); +}; diff --git a/src/api/mes/vulcAlarmStandard/types.ts b/src/api/mes/vulcAlarmStandard/types.ts new file mode 100644 index 0000000..734c544 --- /dev/null +++ b/src/api/mes/vulcAlarmStandard/types.ts @@ -0,0 +1,176 @@ +export interface VulcAlarmStandardVO { + /** + * 报警项目ID + */ + alarmStandardId: string | number; + + /** + * 报警项目ID + */ + alarmItemsId: string | number; + + /** + * 工艺步序ID + */ + stepId: string | number; + + /** + * 工艺步序编号 + */ + stepCode: string; + + /** + * 开始时间(s) + */ + startTime: number; + + /** + * 持续时间(s) + */ + durationTime: number; + + /** + * 标准值(Mpa/℃) + */ + standardValue: number; + + /** + * 最大值(Mpa/℃) + */ + maxValue: number; + + /** + * 最小值(Mpa/℃) + */ + minValue: number; + + /** + * 控制标识(1是 0否) + */ + activeFlag: string; + + /** + * 备注 + */ + remark: string; + +} + +export interface VulcAlarmStandardForm extends BaseEntity { + /** + * 报警项目ID + */ + alarmStandardId?: string | number; + + /** + * 报警项目ID + */ + alarmItemsId?: string | number; + + /** + * 工艺步序ID + */ + stepId?: string | number; + + /** + * 工艺步序编号 + */ + stepCode?: string; + + /** + * 开始时间(s) + */ + startTime?: number; + + /** + * 持续时间(s) + */ + durationTime?: number; + + /** + * 标准值(Mpa/℃) + */ + standardValue?: number; + + /** + * 最大值(Mpa/℃) + */ + maxValue?: number; + + /** + * 最小值(Mpa/℃) + */ + minValue?: number; + + /** + * 控制标识(1是 0否) + */ + activeFlag?: string; + + /** + * 备注 + */ + remark?: string; + +} + +export interface VulcAlarmStandardQuery extends PageQuery { + + /** + * 报警项目ID + */ + alarmStandardId?: string | number; + + /** + * 报警项目ID + */ + alarmItemsId?: string | number; + + /** + * 工艺步序ID + */ + stepId?: string | number; + + /** + * 工艺步序编号 + */ + stepCode?: string; + + /** + * 开始时间(s) + */ + startTime?: number; + + /** + * 持续时间(s) + */ + durationTime?: number; + + /** + * 标准值(Mpa/℃) + */ + standardValue?: number; + + /** + * 最大值(Mpa/℃) + */ + maxValue?: number; + + /** + * 最小值(Mpa/℃) + */ + minValue?: number; + + /** + * 控制标识(1是 0否) + */ + activeFlag?: string; + + /** + * 日期范围参数 + */ + params?: any; +} + + + diff --git a/src/api/qms/QcInspectionMain/index.ts b/src/api/qms/QcInspectionMain/index.ts index 94a9f9b..17c46b8 100644 --- a/src/api/qms/QcInspectionMain/index.ts +++ b/src/api/qms/QcInspectionMain/index.ts @@ -75,3 +75,20 @@ export function getQcInspectionMainList (query) { params: query }); }; + +/** + * 导入数据 + * + * @param file 导入文件 + * @param updateSupport 是否更新已存在数据 + */ +export const importData = (file: File, updateSupport: boolean) => { + const formData = new FormData(); + formData.append('file', file); + formData.append('updateSupport', updateSupport.toString()); + return request({ + url: '/qms/QcInspectionMain/importData', + method: 'post', + data: formData + }); +}; \ No newline at end of file diff --git a/src/api/qms/qcInspectionItem/index.ts b/src/api/qms/qcInspectionItem/index.ts index b2d1040..a9ea6b8 100644 --- a/src/api/qms/qcInspectionItem/index.ts +++ b/src/api/qms/qcInspectionItem/index.ts @@ -75,3 +75,21 @@ export function getQcInspectionItemList (query) { params: query }); }; + +/** + * 导入数据 + * + * @param file 导入文件 + * @param updateSupport 是否更新已存在数据 + */ +export const importData = (file: File, updateSupport: boolean) => { + const formData = new FormData(); + formData.append('file', file); + formData.append('updateSupport', updateSupport.toString()); + return request({ + url: '/qms/qcInspectionItem/importData', + method: 'post', + data: formData + }); +}; + diff --git a/src/api/qms/qcInspectionItemCategory/index.ts b/src/api/qms/qcInspectionItemCategory/index.ts index 20522d5..95017f9 100644 --- a/src/api/qms/qcInspectionItemCategory/index.ts +++ b/src/api/qms/qcInspectionItemCategory/index.ts @@ -75,3 +75,17 @@ export function getQcInspectionItemCategoryList (query) { params: query }); }; + + /** + * 导入数据 + * + * @param file 导入文件 + * @param updateSupport 是否更新已存在数据 + */ + export const importData = (file: File, updateSupport: boolean) => { + return request({ + url: '/qms/qcInspectionItemCategory/importData', + method: 'post', + data: { file, updateSupport } + }); + }; diff --git a/src/api/qms/qcInspectionResult/index.ts b/src/api/qms/qcInspectionResult/index.ts index 8109a8f..8a31f4c 100644 --- a/src/api/qms/qcInspectionResult/index.ts +++ b/src/api/qms/qcInspectionResult/index.ts @@ -75,3 +75,20 @@ export function getQcInspectionResultList (query) { params: query }); }; + +/** + * 导入数据 + * + * @param file 导入文件 + * @param updateSupport 是否更新已存在数据 + */ +export const importData = (file: File, updateSupport: boolean) => { + const formData = new FormData(); + formData.append('file', file); + formData.append('updateSupport', updateSupport.toString()); + return request({ + url: '/qms/qcInspectionResult/importData', + method: 'post', + data: formData + }); +}; \ No newline at end of file diff --git a/src/api/qms/qcInspectionResult/types.ts b/src/api/qms/qcInspectionResult/types.ts index df273b2..3289b56 100644 --- a/src/api/qms/qcInspectionResult/types.ts +++ b/src/api/qms/qcInspectionResult/types.ts @@ -15,7 +15,7 @@ export interface QcInspectionResultVO { itemId: string | number; /** - * 检测结果(0合格,1不合格) + * 检测结果(0合格,1不合格,2未判定) */ detectResult: number; @@ -53,7 +53,7 @@ export interface QcInspectionResultForm extends BaseEntity { itemId?: string | number; /** - * 检测结果(0合格,1不合格) + * 检测结果(0合格,1不合格,2未判定) */ detectResult?: number; @@ -92,7 +92,7 @@ export interface QcInspectionResultQuery extends PageQuery { itemId?: string | number; /** - * 检测结果(0合格,1不合格) + * 检测结果(0合格,1不合格,2未判定) */ detectResult?: number; diff --git a/src/api/qms/qcInspectionTemplate/index.ts b/src/api/qms/qcInspectionTemplate/index.ts index ed46a60..4af727d 100644 --- a/src/api/qms/qcInspectionTemplate/index.ts +++ b/src/api/qms/qcInspectionTemplate/index.ts @@ -17,7 +17,7 @@ export const listQcInspectionTemplate = (query?: QcInspectionTemplateQuery): Axi }; /** - * 查询检测模板主详细 + * 查询检测模板主表详细 * @param templateId */ export const getQcInspectionTemplate = (templateId: string | number): AxiosPromise => { @@ -28,7 +28,7 @@ export const getQcInspectionTemplate = (templateId: string | number): AxiosPromi }; /** - * 新增检测模板主 + * 新增检测模板主表 * @param data */ export const addQcInspectionTemplate = (data: QcInspectionTemplateForm) => { @@ -40,7 +40,7 @@ export const addQcInspectionTemplate = (data: QcInspectionTemplateForm) => { }; /** - * 修改检测模板主 + * 修改检测模板主表 * @param data */ export const updateQcInspectionTemplate = (data: QcInspectionTemplateForm) => { @@ -52,7 +52,7 @@ export const updateQcInspectionTemplate = (data: QcInspectionTemplateForm) => { }; /** - * 删除检测模板主 + * 删除检测模板主表 * @param templateId */ export const delQcInspectionTemplate = (templateId: string | number | Array) => { @@ -64,7 +64,7 @@ export const delQcInspectionTemplate = (templateId: string | number | Array { + const formData = new FormData(); + formData.append('file', file); + formData.append('updateSupport', updateSupport.toString()); + return request({ + url: '/qms/qcInspectionTemplate/importData', + method: 'post', + data: formData + }); +}; \ No newline at end of file diff --git a/src/api/qms/qcInspectionType/index.ts b/src/api/qms/qcInspectionType/index.ts index 126a6f6..d6431fe 100644 --- a/src/api/qms/qcInspectionType/index.ts +++ b/src/api/qms/qcInspectionType/index.ts @@ -75,3 +75,20 @@ export function getQcInspectionTypeList (query) { params: query }); }; + + /** + * 导入数据 + * + * @param file 导入文件 + * @param updateSupport 是否更新已存在数据 + */ + export const importData = (file: File, updateSupport: boolean) => { + const formData = new FormData(); + formData.append('file', file); + formData.append('updateSupport', updateSupport.toString()); + return request({ + url: '/qms/qcInspectionType/importData', + method: 'post', + data: formData + }); +}; \ No newline at end of file diff --git a/src/api/qms/qcTemplateItem/index.ts b/src/api/qms/qcTemplateItem/index.ts index 79d75f1..f711c9e 100644 --- a/src/api/qms/qcTemplateItem/index.ts +++ b/src/api/qms/qcTemplateItem/index.ts @@ -75,3 +75,21 @@ export function getQcTemplateItemList (query) { params: query }); }; + + + /** + * 导入数据 + * + * @param file 导入文件 + * @param updateSupport 是否更新已存在数据 + */ + export const importData = (file: File, updateSupport: boolean) => { + const formData = new FormData(); + formData.append('file', file); + formData.append('updateSupport', updateSupport.toString()); + return request({ + url: '/qms/qcTemplateItem/importData', + method: 'post', + data: formData + }); +}; \ No newline at end of file diff --git a/src/views/mes/vulcAlarmItems/index.vue b/src/views/mes/vulcAlarmItems/index.vue new file mode 100644 index 0000000..d271133 --- /dev/null +++ b/src/views/mes/vulcAlarmItems/index.vue @@ -0,0 +1,287 @@ + + + diff --git a/src/views/mes/vulcAlarmStandard/index.vue b/src/views/mes/vulcAlarmStandard/index.vue new file mode 100644 index 0000000..5443141 --- /dev/null +++ b/src/views/mes/vulcAlarmStandard/index.vue @@ -0,0 +1,386 @@ + + + diff --git a/src/views/qms/QcInspectionMain/index.vue b/src/views/qms/QcInspectionMain/index.vue index fe364c1..e14a673 100644 --- a/src/views/qms/QcInspectionMain/index.vue +++ b/src/views/qms/QcInspectionMain/index.vue @@ -51,6 +51,9 @@ 导出模板 + + 导入 + @@ -776,6 +779,31 @@ const calculateUnqualifiedQty = () => { } } +/** 导入按钮操作 */ +const fileInput = ref(); +const uploading = ref(false); +const handleImport = () => { + fileInput.value?.click(); +} +const onFileChange = async (event: Event) => { + const input = event.target as HTMLInputElement; + if (input.files && input.files.length > 0) { + const file = input.files[0]; + uploading.value = true; + try { + await importData(file, true); + proxy?.$modal.msgSuccess("导入成功"); + await getList(); + } catch (err) { + proxy?.$modal.msgError("导入失败"); + console.error(err); + } finally { + uploading.value = false; + input.value = ''; + } + } +} + onMounted(() => { getInspectionItemList(); getInspectionTypeList(); diff --git a/src/views/qms/qcInspectionItem/index.vue b/src/views/qms/qcInspectionItem/index.vue index c058820..ce84485 100644 --- a/src/views/qms/qcInspectionItem/index.vue +++ b/src/views/qms/qcInspectionItem/index.vue @@ -93,6 +93,9 @@ 导出 + + 导入 + @@ -290,7 +293,7 @@