From 31fe6a2693200f081e0f9a0e0641d7c2fd0e308b Mon Sep 17 00:00:00 2001
From: "zangch@mesnac.com" <zangch@mesnac.com>
Date: Tue, 16 Sep 2025 18:04:41 +0800
Subject: [PATCH] =?UTF-8?q?refactor(dms/report):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=95=85=E9=9A=9C=E7=B1=BB=E5=9E=8B=E6=95=B0=E6=8D=AE=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E5=92=8C=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 注释掉设备模型和设备编号的查询输入框
- 添加调试函数 debugFaultType，用于打印故障类型值和字典对应关系
- 在 getList 函数中添加调试信息，打印接收到的数据- 优化故障类型的数据处理和展示
---
 src/views/dms/prodBaseMachineInfo/index.vue | 21 ++++++++++++-
 src/views/dms/report/index.vue              | 34 +++++++++++++++++----
 2 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/src/views/dms/prodBaseMachineInfo/index.vue b/src/views/dms/prodBaseMachineInfo/index.vue
index 6ae93fe..bb34c10 100644
--- a/src/views/dms/prodBaseMachineInfo/index.vue
+++ b/src/views/dms/prodBaseMachineInfo/index.vue
@@ -296,7 +296,15 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <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-col>
           <el-col :span="12">
@@ -680,6 +688,7 @@ import {
   Tools, Notification, TurnOff, Warning, Money, Switch, View,
   ShoppingCart, CircleCheck, Position, MagicStick, Plus, Edit, Delete
 } from '@element-plus/icons-vue';
+import { getDmsBaseDeviceSupplierList } from '@/api/dms/dmsBaseDeviceSupplier';
 
 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 () => {
 //   try {
@@ -1523,9 +1538,12 @@ let timer = null;
 onMounted(() => {
   getList();
   getDeviceTypes();
+
   // getWorkshopListSelect();
   getDmsDeviceModeListSelect();
   updateCurrentTime();
+
+  getSupplierInfoListSelect();
   timer = setInterval(updateCurrentTime, 1000);
 });
 
@@ -1555,6 +1573,7 @@ watch(selectedMachine, (newMachine) => {
     loadLifecycleTypes();
   }
 });
+
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/dms/report/index.vue b/src/views/dms/report/index.vue
index 5bf3d26..a734403 100644
--- a/src/views/dms/report/index.vue
+++ b/src/views/dms/report/index.vue
@@ -16,12 +16,12 @@
                 @change="onDateChange"
                 clearable />
             </el-form-item>
-            <el-form-item label="设备模型" prop="deviceModeId">
-              <el-input v-model="queryParams.deviceModeId" placeholder="输入设备模型ID" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="设备编号" prop="machineCode">
-              <el-input v-model="queryParams.machineCode" placeholder="输入设备编号" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
+<!--            <el-form-item label="设备模型" prop="deviceModeId">-->
+<!--              <el-input v-model="queryParams.deviceModeId" placeholder="输入设备模型ID" clearable @keyup.enter="handleQuery" />-->
+<!--            </el-form-item>-->
+<!--            <el-form-item label="设备编号" prop="machineCode">-->
+<!--              <el-input v-model="queryParams.machineCode" placeholder="输入设备编号" clearable @keyup.enter="handleQuery" />-->
+<!--            </el-form-item>-->
             <!-- <el-form-item label="故障类型" prop="faultType">
               <el-select v-model="queryParams.faultType" placeholder="选择故障类型" clearable>
                 <el-option label="外部故障" value="1" />
@@ -124,12 +124,34 @@ const formatDate = (val?: string | null) => {
   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 () => {
   loading.value = true;
   try {
     const res = await listFaultTrace(queryParams);
     list.value = res.rows ?? [];
     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 {
     loading.value = false;
   }