Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc

src/view/analyze.vue

@@ -125,7 +125,7 @@
         <ePie4
           :list="data.list.data"
           :year="data.list.year"
-          :name="data.jzfxName"
+
           v-if="showEchart"
         ></ePie4>
       </div>
@@ -749,7 +749,6 @@ const jypxList = reactive([
 const jz = ref("1");
 const jzChange = (value, label) => {
   jz.value = value;
-  data.jzfxName = label;
   data.list = data.dataAnalysis[value - 1];
 };
 const showEchart = ref(false);
@@ -1056,8 +1055,8 @@ const getData = async () => {
         data.dataAnalysis[5].data.push(item.jzrs);
       });
     }
-    jzChange('1', '特困')
+    jz.value = '1';
- 
+    data.list = data.dataAnalysis[0];
   });
      showEchart.value = true;
 };

src/view/echart_analyze/pie4.vue

@@ -30,7 +30,7 @@ const props = defineProps({
 });
 const chart = ref(); // 创建DOM引用
 const data = reactive({
-  name:'特困',
+  // name:'特困',
   list: [6280, 6280, 6280, 5924, 1824],
   year: [2020, 2021, 2022, 2023, 2024],
   bg: [0, 0, 0, 0],
@@ -155,7 +155,7 @@ watch(
   () => props.list,
   (newVal, oldVal) => {
     data.list = newVal;
-     data.name = props.name;
+    //  data.name = props.name;
          data.bg.length=0;
     data.year.forEach(item=>{
       data.bg.push(0)
@@ -168,7 +168,7 @@ watch(
   () => props.year,
   (newVal, oldVal) => {
     data.year = newVal;
-     data.name = props.name;
+    //  data.name = props.name;
          data.bg.length=0;
     data.year.forEach(item=>{
       data.bg.push(0)
@@ -182,7 +182,7 @@ onBeforeMount(() => {
   setTimeout(() => {
     data.list = props.list;
     data.year = props.year;
-    data.name = props.name;
+    // data.name = props.name;
     data.bg.length=0;
     data.year.forEach(item=>{
       data.bg.push(0)