diff --git a/src/views/enterpriseLarge/digitalizationScreen/components/rightPage.vue b/src/views/enterpriseLarge/digitalizationScreen/components/rightPage.vue
index 62dac99..f32bc55 100644
--- a/src/views/enterpriseLarge/digitalizationScreen/components/rightPage.vue
+++ b/src/views/enterpriseLarge/digitalizationScreen/components/rightPage.vue
@@ -122,22 +122,12 @@ const getData = async () => {
     //   };
     // });
 
-<<<<<<< HEAD
-    // 计算每个项目的百分比
-    processedData.forEach((item) => {
-      item.percentage = totalCapacity > 0 ? ((item.value / totalCapacity) * 100).toFixed(2) : '0%';
-    });
-    processedDataList.value = processedData;
-    console.log('🚀 ~ getData ~ processedDataList.value :', processedDataList.value);
-    initPieChart();
-=======
     // // 计算每个项目的百分比
     // processedData.forEach((item) => {
     //   item.percentage = totalCapacity > 0 ? ((item.value / totalCapacity) * 100).toFixed(2) : '0%';
     // });
     // processedDataList.value = processedData;
     // initPieChart();
->>>>>>> l-origin/ljx
   }
 };
 // 初始化饼图