土地供应完成供应修改完成

src/views/cockpit/hysy.vue

@@ -126,17 +126,45 @@ export default {
             }
 
             // yAxis
-            const yAxis = [{
-                axisTick: { show: false },
-                axisLine: { show: false },
-                splitLine: { lineStyle: { color: 'rgba(255,255,255, .05)' } },
-                axisLabel: { show: false, textStyle: { fontSize: 14, color: '#fff' } }
-            }, {
-                show: false,
-                splitLine: { show: false },
-                axisLine: { show: false },
-                axisTick: { show: false },
-            }]
+            const yAxis =  [
+          {
+            min: 0,
+            name: '公顷',
+            type: 'value',
+            axisLine: {
+              show: false,
+              lineStyle: {
+                color: '#BCD3E5'
+              }
+            },
+            splitLine: {
+              show: true,
+              lineStyle: {
+                type: "dashed",
+                color: "rgba(255,255,255,0.1)"
+              },
+            },
+            axisTick: {
+              show: false
+            },
+            axisLabel: {
+              show: true,
+              fontSize: 12,
+
+            },
+            boundaryGap: ['20%', '20%']
+            },]
+            // const yAxis = [{
+            //     axisTick: { show: false },
+            //     axisLine: { show: false },
+            //     splitLine: { lineStyle: { color: 'rgba(255,255,255, .05)' } },
+            //     axisLabel: { show: false, textStyle: { fontSize: 14, color: '#fff' } }
+            // }, {
+            //     show: false,
+            //     splitLine: { show: false },
+            //     axisLine: { show: false },
+            //     axisTick: { show: false },
+            // }]
             // const diamondData = mockData.result.reduce((pre, cur, index) => {
             //     pre[index] = cur.data.map((el, id) => el + (pre[index - 1] ? pre[index - 1][id] : 0))
             //     return pre

src/views/cockpit/tdsy.vue

@@ -75,7 +75,7 @@
             <div class="lb_box box">
               <div class="text">
                 <p>完成供应</p>
-                <span>{{ store.state.cockpit_tdgy.gy_jd_info.info.sj_cr_crmj }}</span>公顷
+                <span>{{ store.state.cockpit_tdgy.gy_jd_info.info.sj_crmj }}</span>公顷
               </div>
             </div>
             <div id="dial_watch_gy_jd">
@@ -254,7 +254,7 @@ export default {
         trigger: "axis",
         textStyle: { fontSize: '100%' },
         formatter: params => {
-          let rander = params.map(item => `<div>${item.seriesName}: ${item.value}</div>`).join('')
+          let rander = params.map(item => `<div>${item.seriesName}: ${item.value}</div>公顷`).join('')
           return rander
         }
       }
@@ -293,17 +293,45 @@ export default {
       }
 
       // yAxis
-      const yAxis = [{
-        axisTick: { show: false },
-        axisLine: { show: false },
-        splitLine: { lineStyle: { color: 'rgba(255,255,255, .05)' } },
-        axisLabel: { show: false, textStyle: { fontSize: 14, color: '#fff' } }
-      }, {
-        show: false,
-        splitLine: { show: false },
-        axisLine: { show: false },
-        axisTick: { show: false },
-      }]
+      const yAxis =  [
+          {
+            min: 0,
+            name: '公顷',
+            type: 'value',
+            axisLine: {
+              show: false,
+              lineStyle: {
+                color: '#BCD3E5'
+              }
+            },
+            splitLine: {
+              show: true,
+              lineStyle: {
+                type: "dashed",
+                color: "rgba(255,255,255,0.1)"
+              },
+            },
+            axisTick: {
+              show: false
+            },
+            axisLabel: {
+              show: true,
+              fontSize: 12,
+
+            },
+            boundaryGap: ['20%', '20%']
+      },]
+      // const yAxis = [{
+      //   axisTick: { show: false },
+      //   axisLine: { show: false },
+      //   splitLine: { lineStyle: { color: 'rgba(255,255,255, .05)' } },
+      //   axisLabel: { show: false, textStyle: { fontSize: 14, color: '#fff' } }
+      // }, {
+      //   show: false,
+      //   splitLine: { show: false },
+      //   axisLine: { show: false },
+      //   axisTick: { show: false },
+      // }]
       const diamondData = mockData.result.reduce((pre, cur, index) => {
         pre[index] = cur.data.map((el, id) => el + (pre[index - 1] ? pre[index - 1][id] : 0))
         return pre
@@ -328,7 +356,7 @@ export default {
           symbolSize: [18, 12],
           data: diamondData[i],
           itemStyle: { color: color2[i] },
-          tooltip: { show: false },
+          tooltip: { show: true },
         })
 
         // 是否最后一个了？
@@ -342,7 +370,7 @@ export default {
             symbolOffset: ["0%", "50%"],
             symbolSize: [18, 10],
             itemStyle: { color: { type: 'linear', x: 0, x2: 1, y: 0, y2: 0, colorStops: color[0] } },
-            tooltip: { show: false },
+            tooltip: { show: true },
           })
           return p
         }