Merge remote-tracking branch 'origin/master'

master
xs 5 days ago
commit 696515279d

@ -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<VulcAlarmItemsVO[]> => {
return request({
url: '/mes/vulcAlarmItems/list',
method: 'get',
params: query
});
};
/**
*
* @param alarmItemsId
*/
export const getVulcAlarmItems = (alarmItemsId: string | number): AxiosPromise<VulcAlarmItemsVO> => {
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<string | number>) => {
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
});
};

@ -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;
}

@ -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<VulcAlarmStandardVO[]> => {
return request({
url: '/mes/vulcAlarmStandard/list',
method: 'get',
params: query
});
};
/**
*
* @param alarmStandardId
*/
export const getVulcAlarmStandard = (alarmStandardId: string | number): AxiosPromise<VulcAlarmStandardVO> => {
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<string | number>) => {
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
});
};

@ -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;
}

@ -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
});
};

@ -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
});
};

@ -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 }
});
};

@ -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
});
};

@ -15,7 +15,7 @@ export interface QcInspectionResultVO {
itemId: string | number;
/**
* 01
* 012
*/
detectResult: number;
@ -53,7 +53,7 @@ export interface QcInspectionResultForm extends BaseEntity {
itemId?: string | number;
/**
* 01
* 012
*/
detectResult?: number;
@ -92,7 +92,7 @@ export interface QcInspectionResultQuery extends PageQuery {
itemId?: string | number;
/**
* 01
* 012
*/
detectResult?: number;

@ -17,7 +17,7 @@ export const listQcInspectionTemplate = (query?: QcInspectionTemplateQuery): Axi
};
/**
*
*
* @param templateId
*/
export const getQcInspectionTemplate = (templateId: string | number): AxiosPromise<QcInspectionTemplateVO> => {
@ -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<string | number>) => {
@ -64,7 +64,7 @@ export const delQcInspectionTemplate = (templateId: string | number | Array<stri
/**
*
*
* @param query
* @returns {*}
*/
@ -75,3 +75,20 @@ export function getQcInspectionTemplateList (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/qcInspectionTemplate/importData',
method: 'post',
data: formData
});
};

@ -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
});
};

@ -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
});
};

@ -0,0 +1,287 @@
<template>
<div class="p-2">
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
<div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" :inline="true">
<!-- <el-form-item label="报警项目编号" prop="alarmItemsCode">-->
<!-- <el-input v-model="queryParams.alarmItemsCode" placeholder="请输入报警项目编号" clearable @keyup.enter="handleQuery" />-->
<!-- </el-form-item>-->
<el-form-item label="报警项目名称" prop="alarmItemsName" label-width='120'>
<el-input v-model="queryParams.alarmItemsName" placeholder="请输入报警项目名称" clearable @keyup.enter="handleQuery" />
</el-form-item>
<!-- <el-form-item label="报警类型" prop="alarmType">-->
<!-- <el-select v-model="queryParams.alarmType" placeholder="请选择报警类型" clearable >-->
<!-- <el-option v-for="dict in vulc_alarm_type" :key="dict.value" :label="dict.label" :value="dict.value"/>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery"></el-button>
<el-button icon="Refresh" @click="resetQuery"></el-button>
</el-form-item>
</el-form>
</el-card>
</div>
</transition>
<el-card shadow="never">
<template #header>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['mes:vulcAlarmItems:add']"></el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['mes:vulcAlarmItems:edit']"></el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['mes:vulcAlarmItems:remove']"></el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['mes:vulcAlarmItems:export']"></el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
</el-row>
</template>
<el-table v-loading="loading" :data="vulcAlarmItemsList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="报警项目ID" align="center" prop="alarmItemsId" v-if="columns[0].visible"/>
<el-table-column label="报警项目编号" align="center" prop="alarmItemsCode" v-if="columns[2].visible"/>
<el-table-column label="报警项目名称" align="center" prop="alarmItemsName" v-if="columns[3].visible"/>
<el-table-column label="报警类型" align="center" prop="alarmType" v-if="columns[4].visible">
<template #default="scope">
<dict-tag :options="vulc_alarm_type" :value="scope.row.alarmType"/>
</template>
</el-table-column>
<el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[5].visible">
<template #default="scope">
<dict-tag :options="active_flag" :value="scope.row.activeFlag"/>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" v-if="columns[6].visible"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip content="修改" placement="top">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['mes:vulcAlarmItems:edit']"></el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top">
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['mes:vulcAlarmItems:remove']"></el-button>
</el-tooltip>
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-card>
<!-- 添加或修改报警项目信息对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
<el-form ref="vulcAlarmItemsFormRef" :model="form" :rules="rules" label-width="120px">
<el-form-item label="报警项目编号" prop="alarmItemsCode">
<el-input v-model="form.alarmItemsCode" placeholder="请输入报警项目编号" />
</el-form-item>
<el-form-item label="报警项目名称" prop="alarmItemsName">
<el-input v-model="form.alarmItemsName" placeholder="请输入报警项目名称" />
</el-form-item>
<el-form-item label="报警类型" prop="alarmType">
<el-radio-group v-model="form.alarmType">
<el-radio
v-for="dict in vulc_alarm_type"
:key="dict.value"
:value="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="激活标识" prop="activeFlag">
<el-radio-group v-model="form.activeFlag">
<el-radio
v-for="dict in active_flag"
:key="dict.value"
:value="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</template>
</el-dialog>
</div>
</template>
<script setup name="VulcAlarmItems" lang="ts">
import { listVulcAlarmItems, getVulcAlarmItems, delVulcAlarmItems, addVulcAlarmItems, updateVulcAlarmItems } from '@/api/mes/vulcAlarmItems';
import { VulcAlarmItemsVO, VulcAlarmItemsQuery, VulcAlarmItemsForm } from '@/api/mes/vulcAlarmItems/types';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { active_flag, vulc_alarm_type } = toRefs<any>(proxy?.useDict('active_flag', 'vulc_alarm_type'));
const vulcAlarmItemsList = ref<VulcAlarmItemsVO[]>([]);
const buttonLoading = ref(false);
const loading = ref(true);
const showSearch = ref(true);
const ids = ref<Array<string | number>>([]);
const single = ref(true);
const multiple = ref(true);
const total = ref(0);
const queryFormRef = ref<ElFormInstance>();
const vulcAlarmItemsFormRef = ref<ElFormInstance>();
const dialog = reactive<DialogOption>({
visible: false,
title: ''
});
//
const columns = ref<FieldOption[]>([
{ key: 0, label: `报警项目ID`, visible: false },
{ key: 1, label: `租户编号`, visible: false },
{ key: 2, label: `报警项目编号`, visible: true },
{ key: 3, label: `报警项目名称`, visible: true },
{ key: 4, label: `报警类型`, visible: true },
{ key: 5, label: `激活标识`, visible: true },
{ key: 6, label: `备注`, visible: false },
{ key: 7, label: `创建部门`, visible: false },
{ key: 8, label: `创建人`, visible: false },
{ key: 9, label: `创建时间`, visible: false },
{ key: 10, label: `更新人`, visible: false },
{ key: 11, label: `更新时间`, visible: false },
{ key: 12, label: `删除标志`, visible: false },
]);
const initFormData: VulcAlarmItemsForm = {
alarmItemsId: undefined,
alarmItemsCode: undefined,
alarmItemsName: undefined,
alarmType: '1',
activeFlag: '1',
remark: undefined,
}
const data = reactive<PageData<VulcAlarmItemsForm, VulcAlarmItemsQuery>>({
form: {...initFormData},
queryParams: {
pageNum: 1,
pageSize: 10,
alarmItemsId: undefined,
alarmItemsCode: undefined,
alarmItemsName: undefined,
alarmType: undefined,
activeFlag: undefined,
params: {
}
},
rules: {
alarmItemsCode: [
{ required: true, message: "报警项目编号不能为空", trigger: "blur" }
],
alarmItemsName: [
{ required: true, message: "报警项目名称不能为空", trigger: "blur" }
],
alarmType: [
{ required: true, message: "报警类型不能为空", trigger: "change" }
],
}
});
const { queryParams, form, rules } = toRefs(data);
/** 查询报警项目信息列表 */
const getList = async () => {
loading.value = true;
const res = await listVulcAlarmItems(queryParams.value);
vulcAlarmItemsList.value = res.rows;
total.value = res.total;
loading.value = false;
}
/** 取消按钮 */
const cancel = () => {
reset();
dialog.visible = false;
}
/** 表单重置 */
const reset = () => {
form.value = {...initFormData};
vulcAlarmItemsFormRef.value?.resetFields();
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
getList();
}
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value?.resetFields();
handleQuery();
}
/** 多选框选中数据 */
const handleSelectionChange = (selection: VulcAlarmItemsVO[]) => {
ids.value = selection.map(item => item.alarmItemsId);
single.value = selection.length != 1;
multiple.value = !selection.length;
}
/** 新增按钮操作 */
const handleAdd = () => {
reset();
dialog.visible = true;
dialog.title = "添加报警项目信息";
}
/** 修改按钮操作 */
const handleUpdate = async (row?: VulcAlarmItemsVO) => {
reset();
const _alarmItemsId = row?.alarmItemsId || ids.value[0]
const res = await getVulcAlarmItems(_alarmItemsId);
Object.assign(form.value, res.data);
dialog.visible = true;
dialog.title = "修改报警项目信息";
}
/** 提交按钮 */
const submitForm = () => {
vulcAlarmItemsFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
if (form.value.alarmItemsId) {
await updateVulcAlarmItems(form.value).finally(() => buttonLoading.value = false);
} else {
await addVulcAlarmItems(form.value).finally(() => buttonLoading.value = false);
}
proxy?.$modal.msgSuccess("操作成功");
dialog.visible = false;
await getList();
}
});
}
/** 删除按钮操作 */
const handleDelete = async (row?: VulcAlarmItemsVO) => {
const _alarmItemsIds = row?.alarmItemsId || ids.value;
await proxy?.$modal.confirm('是否确认删除报警项目信息编号为"' + _alarmItemsIds + '"的数据项?').finally(() => loading.value = false);
await delVulcAlarmItems(_alarmItemsIds);
proxy?.$modal.msgSuccess("删除成功");
await getList();
}
/** 导出按钮操作 */
const handleExport = () => {
proxy?.download('mes/vulcAlarmItems/export', {
...queryParams.value
}, `vulcAlarmItems_${new Date().getTime()}.xlsx`)
}
onMounted(() => {
getList();
});
</script>

@ -0,0 +1,386 @@
<template>
<div class='p-2'>
<transition :enter-active-class='proxy?.animate.searchAnimate.enter'
:leave-active-class='proxy?.animate.searchAnimate.leave'>
<div v-show='showSearch' class='mb-[10px]'>
<el-card shadow='hover'>
<el-form ref='queryFormRef' :model='queryParams' :inline='true' label-width='100'>
<!-- <el-form-item label="报警标准ID" prop="alarmStandardId">-->
<!-- <el-input v-model="queryParams.alarmStandardId" placeholder="请输入报警标准ID" clearable @keyup.enter="handleQuery" />-->
<!-- </el-form-item>-->
<el-form-item label='报警项目' prop='alarmItemsId'>
<el-select v-model='queryParams.alarmItemsId' placeholder='请选择报警项目' clearable
@keyup.enter='handleQuery' >
<el-option
v-for='item in alarmItemsList'
:key='item.alarmItemsId'
:label='item.alarmItemsName'
:value='item.alarmItemsId'
/>
</el-select>
</el-form-item>
<el-form-item label='工艺步序' prop='stepId'>
<el-select v-model='queryParams.stepId' placeholder='请选择工艺步序' clearable @keyup.enter='handleQuery' >
<el-option
v-for='item in technologyStepList'
:key='item.stepId'
:label='item.technologyName + "_" + item.stepName'
:value='item.stepId'
/>
</el-select>
</el-form-item>
<!-- <el-form-item label='工艺步序编号' prop='stepCode'>-->
<!-- <el-input v-model='queryParams.stepCode' placeholder='请输入工艺步序编号' clearable-->
<!-- @keyup.enter='handleQuery' />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="控制标识" prop="activeFlag">-->
<!-- <el-select v-model="queryParams.activeFlag" placeholder="请选择控制标识" clearable >-->
<!-- <el-option v-for="dict in active_flag" :key="dict.value" :label="dict.label" :value="dict.value"/>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item>
<el-button type='primary' icon='Search' @click='handleQuery'>搜索</el-button>
<el-button icon='Refresh' @click='resetQuery'>重置</el-button>
</el-form-item>
</el-form>
</el-card>
</div>
</transition>
<el-card shadow='never'>
<template #header>
<el-row :gutter='10' class='mb8'>
<el-col :span='1.5'>
<el-button type='primary' plain icon='Plus' @click='handleAdd' v-hasPermi="['mes:vulcAlarmStandard:add']">
新增
</el-button>
</el-col>
<el-col :span='1.5'>
<el-button type='success' plain icon='Edit' :disabled='single' @click='handleUpdate()'
v-hasPermi="['mes:vulcAlarmStandard:edit']">修改
</el-button>
</el-col>
<el-col :span='1.5'>
<el-button type='danger' plain icon='Delete' :disabled='multiple' @click='handleDelete()'
v-hasPermi="['mes:vulcAlarmStandard:remove']">删除
</el-button>
</el-col>
<el-col :span='1.5'>
<el-button type='warning' plain icon='Download' @click='handleExport'
v-hasPermi="['mes:vulcAlarmStandard:export']">导出
</el-button>
</el-col>
<right-toolbar v-model:showSearch='showSearch' :columns='columns' :search='true'
@queryTable='getList'></right-toolbar>
</el-row>
</template>
<el-table v-loading='loading' :data='vulcAlarmStandardList' @selection-change='handleSelectionChange'>
<el-table-column type='selection' width='55' align='center' />
<el-table-column label='报警标准ID' align='center' prop='alarmStandardId' v-if='columns[0].visible' />
<el-table-column label='工艺名称' align='center' prop='technologyName' v-if='columns[18].visible' width='100' />
<el-table-column label='工艺步序编号' align='center' prop='stepCode' v-if='columns[4].visible' width='120' />
<el-table-column label='工艺步序' align='center' prop='stepName' v-if='columns[3].visible' width='100' />
<el-table-column label='报警项目' align='center' prop='alarmItemsName' v-if='columns[2].visible' width='130' />
<el-table-column label='开始时间(s)' align='center' prop='startTime' v-if='columns[5].visible' width='100' />
<el-table-column label='持续时间(s)' align='center' prop='durationTime' v-if='columns[6].visible' width='100' />
<el-table-column label='标准值(Mpa/℃)' align='center' prop='standardValue' v-if='columns[7].visible'
width='120' />
<el-table-column label='最大值(Mpa/℃)' align='center' prop='maxValue' v-if='columns[8].visible' width='120' />
<el-table-column label='最小值(Mpa/℃)' align='center' prop='minValue' v-if='columns[9].visible' width='120' />
<el-table-column label='控制标识' align='center' prop='activeFlag' v-if='columns[10].visible'>
<template #default='scope'>
<dict-tag :options='active_flag' :value='scope.row.activeFlag' />
</template>
</el-table-column>
<el-table-column label='备注' align='center' prop='remark' v-if='columns[11].visible' />
<el-table-column label='操作' align='center' class-name='small-padding fixed-width'>
<template #default='scope'>
<el-tooltip content='修改' placement='top'>
<el-button link type='primary' icon='Edit' @click='handleUpdate(scope.row)'
v-hasPermi="['mes:vulcAlarmStandard:edit']"></el-button>
</el-tooltip>
<el-tooltip content='删除' placement='top'>
<el-button link type='primary' icon='Delete' @click='handleDelete(scope.row)'
v-hasPermi="['mes:vulcAlarmStandard:remove']"></el-button>
</el-tooltip>
</template>
</el-table-column>
</el-table>
<pagination v-show='total > 0' :total='total' v-model:page='queryParams.pageNum'
v-model:limit='queryParams.pageSize' @pagination='getList' />
</el-card>
<!-- 添加或修改报警标准信息对话框 -->
<el-dialog :title='dialog.title' v-model='dialog.visible' width='500px' append-to-body>
<el-form ref='vulcAlarmStandardFormRef' :model='form' :rules='rules' label-width='120px'>
<el-form-item label='报警项目' prop='alarmItemsId'>
<el-select v-model='form.alarmItemsId' placeholder='请选择报警项目'>
<el-option
v-for='item in alarmItemsList'
:key='item.alarmItemsId'
:label='item.alarmItemsName'
:value='item.alarmItemsId'
/>
</el-select>
</el-form-item>
<el-form-item label='工艺步序' prop='stepId'>
<el-select v-model='form.stepId' placeholder='请选择工艺步序'>
<el-option
v-for='item in technologyStepList'
:key='item.stepId'
:label='item.technologyName + "_" + item.stepName'
:value='item.stepId'
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="工艺步序编号" prop="stepCode">-->
<!-- <el-input v-model="form.stepCode" placeholder="请输入工艺步序编号" />-->
<!-- </el-form-item>-->
<el-form-item label='开始时间(s)' prop='startTime'>
<el-input v-model='form.startTime' placeholder='请输入开始时间(s)' />
</el-form-item>
<el-form-item label='持续时间(s)' prop='durationTime'>
<el-input v-model='form.durationTime' placeholder='请输入持续时间(s)' />
</el-form-item>
<el-form-item label='标准值(Mpa/℃)' prop='standardValue'>
<el-input v-model='form.standardValue' placeholder='请输入标准值(Mpa/℃)' />
</el-form-item>
<el-form-item label='最大值(Mpa/℃)' prop='maxValue'>
<el-input v-model='form.maxValue' placeholder='请输入最大值(Mpa/℃)' />
</el-form-item>
<el-form-item label='最小值(Mpa/℃)' prop='minValue'>
<el-input v-model='form.minValue' placeholder='请输入最小值(Mpa/℃)' />
</el-form-item>
<el-form-item label='控制标识' prop='activeFlag'>
<el-radio-group v-model='form.activeFlag'>
<el-radio
v-for='dict in active_flag'
:key='dict.value'
:value='dict.value'
>{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label='备注' prop='remark'>
<el-input v-model='form.remark' placeholder='请输入备注' />
</el-form-item>
</el-form>
<template #footer>
<div class='dialog-footer'>
<el-button :loading='buttonLoading' type='primary' @click='submitForm'> </el-button>
<el-button @click='cancel'> </el-button>
</div>
</template>
</el-dialog>
</div>
</template>
<script setup name='VulcAlarmStandard' lang='ts'>
import {
listVulcAlarmStandard,
getVulcAlarmStandard,
delVulcAlarmStandard,
addVulcAlarmStandard,
updateVulcAlarmStandard
} from '@/api/mes/vulcAlarmStandard';
import { VulcAlarmStandardVO, VulcAlarmStandardQuery, VulcAlarmStandardForm } from '@/api/mes/vulcAlarmStandard/types';
import { getProcessInfoList } from '@/api/mes/baseProcessInfo';
import { getProdVulcAlarmItemsList } from '@/api/mes/vulcAlarmItems';
import { getProdTechnologyStepInfoList } from '@/api/mes/technologyStepInfo';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { active_flag } = toRefs<any>(proxy?.useDict('active_flag'));
const vulcAlarmStandardList = ref<VulcAlarmStandardVO[]>([]);
const buttonLoading = ref(false);
const loading = ref(true);
const showSearch = ref(true);
const ids = ref<Array<string | number>>([]);
const single = ref(true);
const multiple = ref(true);
const total = ref(0);
const queryFormRef = ref<ElFormInstance>();
const vulcAlarmStandardFormRef = ref<ElFormInstance>();
const dialog = reactive<DialogOption>({
visible: false,
title: ''
});
/** 查询报警项目下拉框结构 */
const alarmItemsList = ref([]);
const getSelectVulcAlarmItemsList = async () => {
let res = await getProdVulcAlarmItemsList(null);
alarmItemsList.value = res.data;
};
/** 查询硫化工艺下拉框结构 */
const technologyStepList = ref([]);
const getSelectTechnologyStepInfoList = async () => {
let res = await getProdTechnologyStepInfoList({ processId: 18 });
technologyStepList.value = res.data;
};
//
const columns = ref<FieldOption[]>([
{ key: 0, label: `报警标准ID`, visible: false },
{ key: 1, label: `租户编号`, visible: false },
{ key: 2, label: `报警项目`, visible: true },
{ key: 3, label: `工艺步序`, visible: true },
{ key: 4, label: `工艺步序编号`, visible: true },
{ key: 5, label: `开始时间(s)`, visible: true },
{ key: 6, label: `持续时间(s)`, visible: true },
{ key: 7, label: `标准值(Mpa/℃)`, visible: true },
{ key: 8, label: `最大值(Mpa/℃)`, visible: true },
{ key: 9, label: `最小值(Mpa/℃)`, visible: true },
{ key: 10, label: `控制标识`, visible: true },
{ key: 11, label: `备注`, visible: true },
{ key: 12, label: `创建部门`, visible: false },
{ key: 13, label: `创建人`, visible: false },
{ key: 14, label: `创建时间`, visible: false },
{ key: 15, label: `更新人`, visible: false },
{ key: 16, label: `更新时间`, visible: false },
{ key: 17, label: `删除标志`, visible: false },
{ key: 18, label: `工艺名称`, visible: true }
]);
const initFormData: VulcAlarmStandardForm = {
alarmStandardId: undefined,
alarmItemsId: undefined,
stepId: undefined,
stepCode: undefined,
startTime: undefined,
durationTime: undefined,
standardValue: undefined,
maxValue: undefined,
minValue: undefined,
activeFlag: '1',
remark: undefined
};
const data = reactive<PageData<VulcAlarmStandardForm, VulcAlarmStandardQuery>>({
form: { ...initFormData },
queryParams: {
pageNum: 1,
pageSize: 10,
alarmStandardId: undefined,
alarmItemsId: undefined,
stepId: undefined,
stepCode: undefined,
startTime: undefined,
durationTime: undefined,
standardValue: undefined,
maxValue: undefined,
minValue: undefined,
activeFlag: undefined,
params: {}
},
rules: {
alarmItemsId: [
{ required: true, message: '报警项目不能为空', trigger: 'blur' }
],
stepId: [
{ required: true, message: '工艺步序不能为空', trigger: 'blur' }
]
}
});
const { queryParams, form, rules } = toRefs(data);
/** 查询报警标准信息列表 */
const getList = async () => {
loading.value = true;
const res = await listVulcAlarmStandard(queryParams.value);
vulcAlarmStandardList.value = res.rows;
total.value = res.total;
loading.value = false;
};
/** 取消按钮 */
const cancel = () => {
reset();
dialog.visible = false;
};
/** 表单重置 */
const reset = () => {
form.value = { ...initFormData };
vulcAlarmStandardFormRef.value?.resetFields();
};
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
getList();
};
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value?.resetFields();
handleQuery();
};
/** 多选框选中数据 */
const handleSelectionChange = (selection: VulcAlarmStandardVO[]) => {
ids.value = selection.map(item => item.alarmStandardId);
single.value = selection.length != 1;
multiple.value = !selection.length;
};
/** 新增按钮操作 */
const handleAdd = () => {
reset();
dialog.visible = true;
dialog.title = '添加报警标准信息';
};
/** 修改按钮操作 */
const handleUpdate = async (row?: VulcAlarmStandardVO) => {
reset();
const _alarmStandardId = row?.alarmStandardId || ids.value[0];
const res = await getVulcAlarmStandard(_alarmStandardId);
Object.assign(form.value, res.data);
dialog.visible = true;
dialog.title = '修改报警标准信息';
};
/** 提交按钮 */
const submitForm = () => {
vulcAlarmStandardFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
if (form.value.alarmStandardId) {
await updateVulcAlarmStandard(form.value).finally(() => buttonLoading.value = false);
} else {
await addVulcAlarmStandard(form.value).finally(() => buttonLoading.value = false);
}
proxy?.$modal.msgSuccess('操作成功');
dialog.visible = false;
await getList();
}
});
};
/** 删除按钮操作 */
const handleDelete = async (row?: VulcAlarmStandardVO) => {
const _alarmStandardIds = row?.alarmStandardId || ids.value;
await proxy?.$modal.confirm('是否确认删除报警标准信息编号为"' + _alarmStandardIds + '"的数据项?').finally(() => loading.value = false);
await delVulcAlarmStandard(_alarmStandardIds);
proxy?.$modal.msgSuccess('删除成功');
await getList();
};
/** 导出按钮操作 */
const handleExport = () => {
proxy?.download('mes/vulcAlarmStandard/export', {
...queryParams.value
}, `vulcAlarmStandard_${new Date().getTime()}.xlsx`);
};
onMounted(() => {
getSelectVulcAlarmItemsList();
getSelectTechnologyStepInfoList();
getList();
});
</script>

@ -51,6 +51,9 @@
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExportTemplate" v-hasPermi="['qms:QcInspectionMain:export']"></el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleImport" v-hasPermi="['qms:QcInspectionMain:import']"></el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
</el-row>
</template>
@ -776,6 +779,31 @@ const calculateUnqualifiedQty = () => {
}
}
/** 导入按钮操作 */
const fileInput = ref<HTMLInputElement>();
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();

@ -93,6 +93,9 @@
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['qms:qcInspectionItem:export']"></el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleImport" v-hasPermi="['qms:qcInspectionItem:import']"></el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
</el-row>
</template>
@ -290,7 +293,7 @@
</template>
<script setup name="QcInspectionItem" lang="ts">
import { listQcInspectionItem, getQcInspectionItem, delQcInspectionItem, addQcInspectionItem, updateQcInspectionItem, getQcInspectionItemList } from '@/api/qms/qcInspectionItem';
import { listQcInspectionItem, getQcInspectionItem, delQcInspectionItem, addQcInspectionItem, updateQcInspectionItem, getQcInspectionItemList, importData } from '@/api/qms/qcInspectionItem';
import { QcInspectionItemVO, QcInspectionItemQuery, QcInspectionItemForm } from '@/api/qms/qcInspectionItem/types';
import { getQcInspectionItemCategoryList } from '@/api/qms/qcInspectionItemCategory';
import { QcInspectionItemCategoryVO } from '@/api/qms/qcInspectionItemCategory/types';
@ -508,6 +511,31 @@ const getTypeList = async () => {
qcInspectionTypeList.value = res.data;
};
/** 导入按钮操作 */
const fileInput = ref<HTMLInputElement>();
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(() => {
getList();
getCategoryList();

@ -1,5 +1,24 @@
<template>
<div class="p-2">
<el-row :gutter="20">
<!--部门树-->
<el-col :lg="4" :xs="24" style="">
<el-card shadow="hover">
<el-input v-model="inspectionTypeName" placeholder="请输入检测类型名称" clearable prefix-icon="Search" />
<el-tree
ref="inspectionTypeTreeRef"
class="mt-2"
:data="qcInspectionTypeList"
:props="{ label: 'typeName', children: 'children' }"
:expand-on-click-node="false"
:filter-node-method="filterNode"
highlight-current
default-expand-all
@node-click="handleNodeClick"
/>
</el-card>
</el-col>
<el-col :lg="20" :xs="24">
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
<div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover">
@ -46,6 +65,9 @@
<el-col :span="1.5">
<el-button type="info" plain icon="Sort" @click="handleToggleExpandAll">/</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" plain icon="Import" @click="handleImport"></el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
</template>
@ -121,11 +143,15 @@
</div>
</template>
</el-dialog>
</el-col>
</el-row>
</div>
</template>
<script setup name="QcInspectionItemCategory" lang="ts">
import { listQcInspectionItemCategory, getQcInspectionItemCategory, delQcInspectionItemCategory, addQcInspectionItemCategory, updateQcInspectionItemCategory } from '@/api/qms/qcInspectionItemCategory';
import { listQcInspectionItemCategory, getQcInspectionItemCategory, delQcInspectionItemCategory, addQcInspectionItemCategory, updateQcInspectionItemCategory, importData } from '@/api/qms/qcInspectionItemCategory';
import { QcInspectionItemCategoryVO, QcInspectionItemCategoryQuery, QcInspectionItemCategoryForm } from '@/api/qms/qcInspectionItemCategory/types';
import {getQcInspectionTypeList} from "@/api/qms/qcInspectionType";
import { QcInspectionTypeVO } from '@/api/qms/qcInspectionType/types';
@ -154,7 +180,7 @@ const total = ref(0);
const queryFormRef = ref<ElFormInstance>();
const qcInspectionItemCategoryFormRef = ref<ElFormInstance>();
// const qcInspectionItemCategoryTableRef = ref<ElTableInstance>();
const qcInspectionItemCategoryTableRef = ref<ElTableInstance>();
const inspectionTypeTreeRef = ref<TreeInstance>();
const inspectionTypeName = ref('');
@ -328,9 +354,35 @@ const handleNodeClick = (data: QcInspectionTypeVO) => {
};
watch(inspectionTypeName, val => {
inspectionTypeTreeRef.value?.filter(val);
});
/** 导入按钮操作 */
const fileInput = ref<HTMLInputElement>();
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(() => {
getList();

@ -47,6 +47,12 @@
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['qms:qcInspectionType:export']"></el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExportTemplate" v-hasPermi="['qms:qcInspectionType:export']"></el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" plain icon="Upload" @click="handleImport" v-hasPermi="['qms:qcInspectionType:add']"></el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
</el-row>
</template>
@ -86,6 +92,7 @@
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-card>
<!-- 添加或修改检测类型对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
<el-form ref="qcInspectionTypeFormRef" :model="form" :rules="rules" label-width="120px">
@ -126,11 +133,12 @@
</div>
</template>
</el-dialog>
<input ref="fileInput" type="file" accept=".xlsx, .xls" style="display: none" @change="onFileChange" />
</div>
</template>
<script setup name="QcInspectionType" lang="ts">
import { listQcInspectionType, getQcInspectionType, delQcInspectionType, addQcInspectionType, updateQcInspectionType } from '@/api/qms/qcInspectionType';
import { listQcInspectionType, getQcInspectionType, delQcInspectionType, addQcInspectionType, updateQcInspectionType, importData } from '@/api/qms/qcInspectionType';
import { QcInspectionTypeVO, QcInspectionTypeQuery, QcInspectionTypeForm } from '@/api/qms/qcInspectionType/types';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@ -189,12 +197,12 @@ const data = reactive<PageData<QcInspectionTypeForm, QcInspectionTypeQuery>>({
}
},
rules: {
typeId: [
{ required: true, message: "检测类型主键不能为空", trigger: "blur" }
],
typeCode: [
{ required: true, message: "检测类型编码不能为空", trigger: "blur" }
],
// typeId: [
// { required: true, message: "", trigger: "blur" }
// ],
// typeCode: [
// { required: true, message: "", trigger: "blur" }
// ],
typeName: [
{ required: true, message: "检测类型名称不能为空", trigger: "blur" }
],
@ -299,6 +307,36 @@ const handleExport = () => {
}, `qcInspectionType_${new Date().getTime()}.xlsx`)
}
const handleExportTemplate = () => {
proxy?.download('qms/qcInspectionType/exportTemplate', {
}, `qcInspectionType_${new Date().getTime()}.xlsx`)
}
/** 导入按钮操作 */
const fileInput = ref<HTMLInputElement>();
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(() => {

Loading…
Cancel
Save