看版

@@ -27,8 +27,8 @@ const type = ref('是')
 const url = ref()
 const obj = ref({})
 const result = ref()
-// const router = useRouter()
-url.value = 'http://192.168.1.152:8899/login/sid=0210d28d-3d3b-4534-bdcf-d81aef6e9325#/'
+const router = useRouter()
+url.value = 'http://192.168.1.152:8899/login/sid=a21df7ef-6d14-4cf3-ad58-c68185f63797#/'
 // url.value = window.location.href
 result.value = url.value?.split('=')[1]?.split('#')[0];
 

@@ -212,8 +212,16 @@ async function handelGetYS002() {
 async function handelGetYS003() {
   const res = await getYS003(url.value, obj.value)
   resYear3.value = res.data.yeargroup
-  handelBing3(res.data.yeargroup[0], res.data.yeargroup[1])
-  handelZhu3(res.data.yeargroup[0], res.data.yeargroup[1])
+  let obj1 = res.data.yeargroup[0]
+  let obj2 = res.data.yeargroup[1]
+  for (let v of obj1.list) {
+    if (v.XJCOST == 0) v.XJCOST = null
+  }
+  
+  handelBing3(obj1, obj2)
+  handelZhu3(obj1, obj2)
+  
+  
   activeName3.value = res.data.yeargroup[1].YEAR
 }
 
@@ -1032,7 +1040,7 @@ const handelZhu3 = (row1, row2) => {
       }
     },
     legend: {
-      data: [name2, name1],
+      data: [name1, name2],
       textStyle: {
         color: "#00DDFF"
       }
@@ -1235,51 +1243,52 @@ const handelZhu4 = (listX, dataList) => {
     ],
     series: [
       {
-        name: '陆地',
+        name: '海上',
         type: 'bar',
         barGap: 0,
         emphasis: {
           focus: 'series'
         },
-        // data: [320, 332, 301, 334, 390, 330, 320, 320, 332, 301, 334, 390],
-        data: dataList,
+        // data: [30, 332, 301, 334, 390, 330, 320, 320, 332, 301, 334, 390],
+        // data: listHai,
         itemStyle: {
           color: {
             type: 'linear',
             x: 0, y: 0, x2: 1, y2: 1, // 垂直渐变
             colorStops: [
-              {offset: 0, color: 'rgba(21, 219, 203, 1)'}, // 顶部颜色
-              {offset: 1, color: 'rgba(106, 235, 228, 1)'}  // 底部颜色
+              {offset: 0, color: 'rgba(0, 168, 255, 1)'}, // 顶部颜色
+              {offset: 1, color: 'rgba(77, 197, 243, 1)'}  // 底部颜色
             ]
           },
-          // borderColor: 'rgba(0, 255, 190, .5)',
-          // borderWidth: 1
+          borderColor: 'rgba(0, 168, 255, .5)',
+          borderWidth: 1
         },
         barWidth: '30%',
       },
       {
-        name: '海上',
+        name: '陆地',
         type: 'bar',
         barGap: 0,
         emphasis: {
           focus: 'series'
         },
-        // data: [30, 332, 301, 334, 390, 330, 320, 320, 332, 301, 334, 390],
-        // data: listHai,
+        // data: [320, 332, 301, 334, 390, 330, 320, 320, 332, 301, 334, 390],
+        data: dataList,
         itemStyle: {
           color: {
             type: 'linear',
             x: 0, y: 0, x2: 1, y2: 1, // 垂直渐变
             colorStops: [
-              {offset: 0, color: 'rgba(0, 168, 255, 1)'}, // 顶部颜色
-              {offset: 1, color: 'rgba(77, 197, 243, 1)'}  // 底部颜色
+              {offset: 0, color: 'rgba(21, 219, 203, 1)'}, // 顶部颜色
+              {offset: 1, color: 'rgba(106, 235, 228, 1)'}  // 底部颜色
             ]
           },
-          borderColor: 'rgba(0, 168, 255, .5)',
-          borderWidth: 1
+          // borderColor: 'rgba(0, 255, 190, .5)',
+          // borderWidth: 1
         },
         barWidth: '30%',
       },
+    
     ]
   }
   chart44.setOption(option)

@@ -306,13 +306,15 @@ async function handelGetYS007() {
     })
     arr1.push({
       value: Math.round(val.PLANCOST / 10000),
-      itemStyle: val.EXERATIO * 100 >= BC.value ? color1 : color3,
+      // itemStyle: val.EXERATIO * 100 >= BC.value ? color1 : color3,
+      itemStyle: color4,
       name: (val.EXERATIO * 100).toFixed() + '%',
     })
     arr2.push({
       value: Math.round(val.EXECOST / 10000),
       name: (val.EXERATIO * 100).toFixed() + '%',
-      itemStyle: val.EXERATIO * 100 >= BC.value ? color2 : color4
+      // itemStyle: val.EXERATIO * 100 >= BC.value ? color2 : color4
+      itemStyle: color2
     })
     arr3.push(val.EXERATIO)
   }
@@ -549,16 +551,16 @@ const setA = (arrY, arr1, arr2, arr3, markLineName, BC) => {
         },
         // data: [320, 302, 301, 334, 390, 330, 320, 330, 320],
         data: arr1,
-        // itemStyle: {
-        //   color: {
-        //     type: 'linear',
-        //     x: 0, y: 0, x2: 1, y2: 1, // 垂直渐变
-        //     colorStops: [
-        //       {offset: 0, color: 'rgba(0, 162, 255, .3)'}, // 顶部颜色
-        //       {offset: 1, color: 'rgba(34, 117, 255, .3)'}  // 底部颜色
-        //     ],
-        //   },
-        // },
+        itemStyle: {
+          color: {
+            type: 'linear',
+            x: 0, y: 0, x2: 1, y2: 1, // 垂直渐变
+            colorStops: [
+              {offset: 0, color: 'rgba(0, 255, 190, 1)'}, // 顶部颜色
+              {offset: 1, color: 'rgba(8, 130, 160, 1)'}  // 底部颜色
+            ],
+          },
+        },
       },
       {
         name: '执行金额',