From acca36ea8f93c5032f58a4c85e64e64cb6506f05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Fri, 5 Jan 2024 10:06:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/board/mixData.js          | 23 +++++++++++++++++------
 src/views/board/foaming/index.vue |  2 +-
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/api/board/mixData.js b/src/api/board/mixData.js
index 19b9306..d61eda8 100644
--- a/src/api/board/mixData.js
+++ b/src/api/board/mixData.js
@@ -1,5 +1,13 @@
 import {generalInterfaceList, getSimulateData} from '@/api/board/getData'
 
+let screenData = (e) => {
+  if (e.data !== undefined) {
+    return e.data
+  } else {
+    return e
+  }
+}
+
 export function mixData(params) {
   getSimulateData({customCode: params?.e || ''}).then(val => {
     if (val.rows.length > 0 && val.rows[0].isFlag === 0) {
@@ -7,12 +15,15 @@ export function mixData(params) {
       (params?.f || (() => {
       }))(data)
     } else {
-      generalInterfaceList({
-        method: params?.i || ''
-      }).then(val2 => {
-        (params?.f || (() => {
-        }))(val2?.data || [])
-      })
+      let type = params.t || 1
+      if (type === 1) {
+        generalInterfaceList({
+          method: params?.i || ''
+        }).then(val2 => {
+          (params?.f || (() => {
+          }))(screenData(val2) || [])
+        })
+      }
     }
   })
 
diff --git a/src/views/board/foaming/index.vue b/src/views/board/foaming/index.vue
index 07111b7..16f081b 100644
--- a/src/views/board/foaming/index.vue
+++ b/src/views/board/foaming/index.vue
@@ -689,7 +689,7 @@ export default {
                   value2: val.FIXTUREBOXTYPE,
                   value3: val.FIXTURESTATUS,
                   value4: val.TARGET,
-                  value5: 0,
+                  value5: val.PLAN_SUM,
                   value6: val.PRO_SUM,
                   value7: ((val.PRO_SUM / val.TARGET) * 100).toFixed(2) + '%',
                   value8: val.ANHOUR,