Merge remote-tracking branch 'origin3/master'

psdc-ui/.env.development

@@ -1,5 +1,5 @@
 # 页面标题
-VITE_APP_TITLE = 电能替代分布式控制试验平台
+VITE_APP_TITLE = 密钥管理
 
 # 开发环境配置
 VITE_APP_ENV = 'development'

psdc-ui/.env.production

@@ -1,5 +1,5 @@
 # 页面标题
-VITE_APP_TITLE = 电能替代分布式控制试验平台
+VITE_APP_TITLE = 密钥管理
 
 # 生产环境配置
 VITE_APP_ENV = 'production'

psdc-ui/.env.staging

@@ -1,5 +1,5 @@
 # 页面标题
-VITE_APP_TITLE = 电能替代分布式控制试验平台
+VITE_APP_TITLE = 密钥管理
 
 # 生产环境配置
 VITE_APP_ENV = 'staging'

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"
   },

psdc-ui/src/main.js

@@ -6,7 +6,7 @@ import ElementPlus from 'element-plus'
 import locale from 'element-plus/lib/locale/lang/zh-cn' // 中文语言
 
 import '@/assets/styles/index.scss' // global css
-import 'lib-flexible/flexible.js'
+// import 'lib-flexible/flexible.js'
 import App from './App'
 import store from './store'
 import router from './router'

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

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