From 77c78026b813e43ade4cd962b2e50fdf3a68b8ac Mon Sep 17 00:00:00 2001
From: limengnan <420004014@qq.com>
Date: Mon, 18 May 2026 18:23:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=93=E7=AE=97=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../frontend/src/components/antvx6/viewx6.vue | 62 +++++++++----------
 1 file changed, 29 insertions(+), 33 deletions(-)

diff --git a/business-css/frontend/src/components/antvx6/viewx6.vue b/business-css/frontend/src/components/antvx6/viewx6.vue
index d9da0e5..6786a7f 100644
--- a/business-css/frontend/src/components/antvx6/viewx6.vue
+++ b/business-css/frontend/src/components/antvx6/viewx6.vue
@@ -278,16 +278,14 @@ function getName(deviceType:any,name:any){
           tempName = item.name
         }
       })
-
     }
-    
-    
   }
-  
+  for(let i = 0;i<materialList.value.length;i++){
+    if(materialList.value[i].code == name){
+      tempName = materialList.value[i].name
+    }
+  }
   return tempName
-
-
-  
 }
 function groupByDeviceId(data:any) { // 按设备id分组
   // 边界检查：确保输入是数组
@@ -738,27 +736,7 @@ function handleTimeChange(value:any){ // 时间改变
 let sliderMarks:any =ref({
 }) 
 const isAttributeDialog = ref(false)
-const deviceList = ref<any>([{
-  code:'diameter',
-  checked:false,
-  name:'直径'
-  },{
-  code:'height',
-  checked:false,
-  name:'高度',
-  },{
-  code:'volume',
-  checked:false,
-  name:'容量'
-  },{
-  code:'flow_rate',
-  checked:false,
-  name:'流量'
-  },{
-  code:'pulse_speed',
-  checked:false,
-  name:'脉冲速度',
-}])
+const deviceList = ref<any>([])
 const materialList = ref<any>([{
   code:'u_concentration',
   checked:false,
@@ -795,7 +773,29 @@ const materialList = ref<any>([{
   code:'moisture_content',
   checked:false,
   name:'含水率'
-}])
+  },{
+  code:'e_pu238',
+  checked:false,
+  name:'PU-238占比'
+  },{
+  code:'e_pu239',
+  checked:false,
+  name:'PU-239占比'
+  },{
+  code:'e_pu240',
+  checked:false,
+  name:'PU-240占比'
+  },{
+  code:'e_pu241',
+  checked:false,
+  name:'PU-241占比'
+  },{
+  code:'e_pu242',
+  checked:false,
+  name:'PU-242占比'
+  }
+  
+])
 function ChangesettingsClick(){
   deviceList.value.forEach( (item:any) => {
     item.checked = false
@@ -913,10 +913,6 @@ function dialogAttributeDialog(){ // 关闭变动设置弹窗
               <el-checkbox v-model="items.checked" :label="items.name"></el-checkbox>
             </div>
 
-
-            <!-- <div v-for="(item,index) in deviceList" :key="index" class="deviceList-li">
-              <el-checkbox v-model="item.checked" :label="item.name"></el-checkbox>
-            </div> -->
           </div>