From e8492176ae4a8b92bbc4c098c4e58a87ae5ab902 Mon Sep 17 00:00:00 2001
From: jiminglei <836545853@qq.com>
Date: Thu, 21 Mar 2024 16:41:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A8=A1=E5=9E=8B=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=953=E4=B8=AA=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 psdc-ui/package.json                        |  1 +
 psdc-ui/src/views/system/building/index.vue | 14 +++-----------
 psdc-ui/src/views/system/kitchen/index.vue  | 14 +++-----------
 3 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/psdc-ui/package.json b/psdc-ui/package.json
index a14f07e..b0fb6bd 100644
--- a/psdc-ui/package.json
+++ b/psdc-ui/package.json
@@ -23,6 +23,7 @@
     "pinia": "2.0.22",
     "vue": "3.2.45",
     "vue-cropper": "1.0.3",
+    "vue-json-viewer": "3",
     "vue-router": "4.1.4",
     "yarn": "^1.22.19"
   },
diff --git a/psdc-ui/src/views/system/building/index.vue b/psdc-ui/src/views/system/building/index.vue
index 03d993d..53ebf78 100644
--- a/psdc-ui/src/views/system/building/index.vue
+++ b/psdc-ui/src/views/system/building/index.vue
@@ -68,7 +68,7 @@
         <el-button @click="cancel">重 置</el-button>
       </div>
     </div>
-    <div class="result" v-if="show1">
+    <div class="result" v-if="show2">
       <div class="til">方案评分</div>
       <div class="point">
         <el-form  ref="userRef" label-width="300px">
@@ -91,7 +91,7 @@
     </div>
     <div class="result" v-if="show1">
       <div class="til">
-        最佳方案：{{result.planName}}
+        方案详情
       </div>
       <div class="info">
         <div class="card">
@@ -220,6 +220,7 @@ const arr = ref([1])
 const point = ref(3.7)
 const point1 = ref('78')
 const show1 = ref(false)
+const show2 = ref(false)
 const test1 = ref(null)
 const test2= ref(null)
 const test3 = ref(null)
@@ -577,15 +578,6 @@ const submitForm = () => {
                 type: 'error',
               })
             }else{
-              for(let i in res.report.matchedDeviceList)
-              {
-                res.report.matchedDeviceList[i].rat = res.report.matchedDeviceList[i].rating/20
-              }
-              let num =  res.report.matchedDeviceList.reduce((prev, curr) => {
-                return curr.rat > prev.rat ? curr : prev;
-              });
-              res.report.planName = num.planName
-              res.report.environment = "本次改造方案减排"+res.report.calculate+"吨"
               result.value=res.report
               textarea.value=res.report
               show1.value = true
diff --git a/psdc-ui/src/views/system/kitchen/index.vue b/psdc-ui/src/views/system/kitchen/index.vue
index 8e768b8..50f8ed7 100644
--- a/psdc-ui/src/views/system/kitchen/index.vue
+++ b/psdc-ui/src/views/system/kitchen/index.vue
@@ -63,7 +63,7 @@
         <el-button @click="cancel">重 置</el-button>
       </div>
     </div>
-    <div class="result" v-if="show1">
+    <div class="result" v-if="show2">
       <div class="til">方案评分</div>
       <div class="point">
         <el-form  ref="userRef" label-width="300px">
@@ -86,7 +86,7 @@
     </div>
     <div class="result" v-if="show1">
       <div class="til">
-        最佳方案：{{result.planName}}
+       方案详情
       </div>
       <div class="info">
         <div class="card">
@@ -215,6 +215,7 @@ const arr = ref([1])
 const point = ref(3.7)
 const point1 = ref('78')
 const show1 = ref(false)
+const show2 = ref(false)
 const test1 = ref(null)
 const test2= ref(null)
 const test3 = ref(null)
@@ -567,15 +568,6 @@ const submitForm = () => {
                 type: 'error',
               })
             }else{
-              for(let i in res.report.matchedDeviceList)
-              {
-                res.report.matchedDeviceList[i].rat = res.report.matchedDeviceList[i].rating/20
-              }
-              let num =  res.report.matchedDeviceList.reduce((prev, curr) => {
-                return curr.rat > prev.rat ? curr : prev;
-              });
-              res.report.planName = num.planName
-              res.report.environment = "本次改造方案减排"+res.report.calculate+"吨"
               result.value=res.report
               textarea.value=res.report
               show1.value = true