产出品管理和土地资源部分调整

new-digital-agriculture-screen/src/views/entities/components/valueCharts.vue

@@ -117,7 +117,7 @@ const state = reactive({
     yAxis: [
       {
         type: 'category',
-        data: ['耿马镇', '勐撒镇', '勐永镇', '孟定镇', '大兴乡'].reverse(),
+        data: ['耿马镇', '勐撒镇', '勐永镇', '孟定镇', '大兴乡'],
         axisTick: {
           show: false,
         },
@@ -152,63 +152,63 @@ const state = reactive({
             },
           },
         },
-        data: [12000, 8000, 6000, 4000, 3500],
+        data: [8653.1, 9455.7, 4502.8, 4907.2, 4152],
       },
     ],
     series: [
-      // {
+      {
-      //   name: '值',
+        name: '值',
-      //   type: 'bar',
+        type: 'bar',
-      //   zlevel: 1,
+        zlevel: 1,
-      //   barBorderRadius: 10,
+        barBorderRadius: 10,
-      //   itemStyle: {
+        itemStyle: {
-      //     borderRadius: [10, 10, 10, 10],
+          borderRadius: [10, 10, 10, 10],
-      //     color: 'rgba(100, 200, 255, 0.3)',
+          color: 'rgba(100, 200, 255, 0.3)',
-      //   },
+        },
-      //   backgroundStyle: {
+        backgroundStyle: {
-      //     color: 'rgba(100, 200, 255, 0.3)',
+          color: 'rgba(100, 200, 255, 0.3)',
-      //     borderRadius: [10, 10, 10, 10], // 必须与barBorderRadius保持一致
+          borderRadius: [10, 10, 10, 10], // 必须与barBorderRadius保持一致
-      //   },
+        },
-      //   barWidth: 14,
+        barWidth: 20,
-      //   data: values,
+        data: values,
-      //   label: {
+        label: {
-      //     position: [0, -16],
+          position: [0, -16],
-      //     align: 'left',
+          align: 'left',
-      //     show: true,
+          show: true,
-      //     formatter: (params) => {
+          formatter: (params) => {
-      //       return params.name;
+            return params.name;
-      //     },
+          },
-      //   },
+        },
-      //   barMaxWidth: 40,
+        barMaxWidth: 40,
-      //   markLine: {
+        markLine: {
-      //     label: {
+          label: {
-      //       color: '#26a69a',
+            color: '#26a69a',
-      //     },
+          },
-      //   },
+        },
-      // },
+      },
-      // {
+      {
-      //   name: '背景',
+        name: '背景',
-      //   type: 'bar',
+        type: 'bar',
-      //   barWidth: 14,
+        barWidth: 20,
-      //   barGap: '-100%',
+        barGap: '-100%',
-      //   data: maxData,
+        data: maxData,
-      //   barBorderRadius: 30,
+        barBorderRadius: 30,
-      //   itemStyle: {
+        itemStyle: {
-      //     normal: {
+          normal: {
-      //       color: 'rgba(105,131,242,.3)',
+            color: 'rgba(105,131,242,.3)',
-      //       borderRadius: 10,
+            borderRadius: 10,
-      //     },
+          },
-      //   },
+        },
-      //   label: {
+        label: {
-      //     show: false,
+          show: false,
-      //   },
+        },
-      //   barMaxWidth: 14,
+        barMaxWidth: 40,
-      //   markLine: {
+        markLine: {
-      //     label: {
+          label: {
-      //       color: '#26a69a',
+            color: '#26a69a',
-      //     },
+          },
-      //   },
+        },
-      // },
+      },
     ],
   },
 });
@@ -252,6 +252,8 @@ const loadData = (val) => {
       }
     }
   }
+  console.log(state.data);
+  console.log(state.option.yAxis);
   values = getValue(state.data);
   titles = getName(state.data);
   max = Math.max(...state.data);

new-digital-agriculture-screen/src/views/entities/index.vue

@@ -133,11 +133,11 @@ const loadData = async () => {
   await sleep(500);
   state.data = {
     one: [
-      { value: 3500, name: '大兴乡' },
+      { value: 4152, name: '大兴乡' },
-      { value: 6000, name: '勐撒镇' },
+      { value: 4907.2, name: '勐撒镇' },
-      { value: 4000, name: '勐永镇' },
+      { value: 4502.8, name: '勐永镇' },
-      { value: 8000, name: '孟定镇' },
+      { value: 9455.7, name: '孟定镇' },
-      { value: 12000, name: '耿马镇' },
+      { value: 8653.1, name: '耿马镇' },
     ],
     third: [
       // { value: 35.61, value1: 178.06, name: '耿马镇' },

new-digital-agriculture-screen/src/views/land/index.vue

@@ -22,7 +22,7 @@
     </el-col>
     <el-col :span="6" class="right-charts">
       <div class="right-charts-item">
-        <customBack top-title="全县耕地面积" :top-postion="'right'">
+        <customBack top-title="全县土地用地数据" :top-postion="'right'">
           <template #back>
             <landFour :data="state.data.four" />
           </template>
@@ -30,7 +30,7 @@
       </div>
       <div class="right-charts-item">
         <customBack
-          top-title="管理需求分类"
+          top-title="乡镇土地用地数据"
           :down-title="'所有类型'"
           :top-postion="'right'"
           :down-width="'140px'"