diff --git a/src/views/lll/NYJCD/SCX1.vue b/src/views/lll/NYJCD/SCX1.vue
index 49566b6..c93bb86 100644
--- a/src/views/lll/NYJCD/SCX1.vue
+++ b/src/views/lll/NYJCD/SCX1.vue
@@ -179,14 +179,9 @@
 </template>
 <script>
 import * as echarts from "echarts";
-<<<<<<< HEAD
-import { getPie3D, getParametricEquation } from "../../../utils/fhgl";
-const color = ["#099FE3", "#00DBEB", "#50F4C1"];
-=======
 // import "echarts-gl";
 // import { getPie3D, getParametricEquation } from "../../../utils/fhgl";
 // const color = ["#099FE3", "#00DBEB", "#50F4C1"];
->>>>>>> a4eafbbdba2ec2ad248c68d9a6ad642c832f8471
 export default {
   data() {
     return {
@@ -1535,65 +1530,8 @@ export default {
       myChart.setOption(option, true);
     },
 
-<<<<<<< HEAD
     //
     // 初始化label样式
-    setLabel() {
-      this.optionData.forEach((item, index) => {
-        item.itemStyle = {
-          color: color[index],
-        };
-        item.label = {
-          normal: {
-            show: true,
-            color: color[index],
-            position: "right",
-            // distance:-10,
-            offset: [0, 3],
-            formatter: [
-              "{d|{d}%}",
-              "————",
-              //   '{c|{c}}{b|台}',
-              "{b|{b}}",
-            ].join("\n"), // 用\n来换行
-            rich: {
-              b: {
-                lineHeight: 25,
-                align: "left",
-                fontSize: 30,
-                color: "#fff",
-              },
-              c: {
-                fontSize: 22,
-                // color: '#fff',
-                textShadowColor: "#1c90a6",
-                textShadowOffsetX: 0,
-                textShadowOffsetY: 2,
-                textShadowBlur: 5,
-                color: color[index],
-              },
-              d: {
-                color: color[index],
-                fontSize: 40,
-                align: "left",
-              },
-            },
-          },
-        };
-        item.labelLine = {
-          normal: {
-            length2: 200,
-            lineStyle: {
-              width: 2,
-              color: color[index],
-            },
-          },
-        };
-      });
-    },
-=======
-    // 
-        // 初始化label样式
     //     setLabel() {
     //   this.optionData.forEach((item, index) => {
     //     item.itemStyle = {
@@ -1647,7 +1585,6 @@ export default {
     //     };
     //   });
     // },
->>>>>>> a4eafbbdba2ec2ad248c68d9a6ad642c832f8471
     // // 图表初始化
     // initChart() {
     //   this.statusChart = echarts.init(this.$refs.chart);
@@ -1827,13 +1764,8 @@ export default {
     //   });
     // },
   },
-<<<<<<< HEAD
   created() {
-    this.setLabel();
-=======
-  created(){
     // this.setLabel();
->>>>>>> a4eafbbdba2ec2ad248c68d9a6ad642c832f8471
   },
   mounted() {
     this.defineEcharts("pdsssdh", this.option1);