refactor(dms/report): 优化故障类型数据处理和查询功能

- 注释掉设备模型和设备编号的查询输入框
- 添加调试函数 debugFaultType,用于打印故障类型值和字典对应关系
- 在 getList 函数中添加调试信息,打印接收到的数据- 优化故障类型的数据处理和展示
master
zangch@mesnac.com 3 months ago
parent 10bf8a7e8b
commit 31fe6a2693

@ -296,7 +296,15 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="供应商" prop="supplierId"> <el-form-item label="供应商" prop="supplierId">
<el-input v-model="form.supplierId" placeholder="请输入供应商" /> <!-- <el-input v-model="form.supplierId" placeholder="请输入供应商" />-->
<el-select v-model="form.supplierId" placeholder="请选择供应商" style="width: 100%;">
<el-option
v-for="item in supplierInfoList"
:key="item.supplierId"
:label="item.supplierName"
:value="item.supplierId"
/>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@ -680,6 +688,7 @@ import {
Tools, Notification, TurnOff, Warning, Money, Switch, View, Tools, Notification, TurnOff, Warning, Money, Switch, View,
ShoppingCart, CircleCheck, Position, MagicStick, Plus, Edit, Delete ShoppingCart, CircleCheck, Position, MagicStick, Plus, Edit, Delete
} from '@element-plus/icons-vue'; } from '@element-plus/icons-vue';
import { getDmsBaseDeviceSupplierList } from '@/api/dms/dmsBaseDeviceSupplier';
const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@ -919,6 +928,12 @@ const getDeviceTypes = async () => {
} }
}; };
let supplierInfoList =ref([]);
const getSupplierInfoListSelect = async () => {
const res = await getDmsBaseDeviceSupplierList(null);
supplierInfoList.value = res.data;
};
// //
// const getWorkshopListSelect = async () => { // const getWorkshopListSelect = async () => {
// try { // try {
@ -1523,9 +1538,12 @@ let timer = null;
onMounted(() => { onMounted(() => {
getList(); getList();
getDeviceTypes(); getDeviceTypes();
// getWorkshopListSelect(); // getWorkshopListSelect();
getDmsDeviceModeListSelect(); getDmsDeviceModeListSelect();
updateCurrentTime(); updateCurrentTime();
getSupplierInfoListSelect();
timer = setInterval(updateCurrentTime, 1000); timer = setInterval(updateCurrentTime, 1000);
}); });
@ -1555,6 +1573,7 @@ watch(selectedMachine, (newMachine) => {
loadLifecycleTypes(); loadLifecycleTypes();
} }
}); });
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>

@ -16,12 +16,12 @@
@change="onDateChange" @change="onDateChange"
clearable /> clearable />
</el-form-item> </el-form-item>
<el-form-item label="设备模型" prop="deviceModeId"> <!-- <el-form-item label="设备模型" prop="deviceModeId">-->
<el-input v-model="queryParams.deviceModeId" placeholder="输入设备模型ID" clearable @keyup.enter="handleQuery" /> <!-- <el-input v-model="queryParams.deviceModeId" placeholder="输入设备模型ID" clearable @keyup.enter="handleQuery" />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="设备编号" prop="machineCode"> <!-- <el-form-item label="设备编号" prop="machineCode">-->
<el-input v-model="queryParams.machineCode" placeholder="输入设备编号" clearable @keyup.enter="handleQuery" /> <!-- <el-input v-model="queryParams.machineCode" placeholder="输入设备编号" clearable @keyup.enter="handleQuery" />-->
</el-form-item> <!-- </el-form-item>-->
<!-- <el-form-item label="故障类型" prop="faultType"> <!-- <el-form-item label="故障类型" prop="faultType">
<el-select v-model="queryParams.faultType" placeholder="选择故障类型" clearable> <el-select v-model="queryParams.faultType" placeholder="选择故障类型" clearable>
<el-option label="外部故障" value="1" /> <el-option label="外部故障" value="1" />
@ -124,12 +124,34 @@ const formatDate = (val?: string | null) => {
return val.substring(0, 10); return val.substring(0, 10);
}; };
// faultType
const debugFaultType = (faultType: any) => {
console.log('=== 前端字典调试 ===');
console.log('faultType原始值:', JSON.stringify(faultType), '类型:', typeof faultType);
console.log('字典选项:', activity_fault_type.value);
//
const matchedDict = activity_fault_type.value.find(item => item.value === faultType);
console.log('匹配的字典项:', matchedDict);
return ''; //
};
const getList = async () => { const getList = async () => {
loading.value = true; loading.value = true;
try { try {
const res = await listFaultTrace(queryParams); const res = await listFaultTrace(queryParams);
list.value = res.rows ?? []; list.value = res.rows ?? [];
total.value = res.total ?? 0; total.value = res.total ?? 0;
//
console.log('=== 前端接收数据调试 ===');
if (list.value.length > 0) {
console.log('第一条记录 faultType:', JSON.stringify(list.value[0].faultType));
console.log('第一条记录完整数据:', list.value[0]);
}
} finally { } finally {
loading.value = false; loading.value = false;
} }

Loading…
Cancel
Save