Merge branch 'main' of http://47.109.205.240:3000/Web/digital-agriculture-screen

src/components/custom-echart-maps/index.vue

@@ -47,6 +47,7 @@ export default {
     const option = reactive({});
 
     watchEffect(() => {
+      regMap(props.name, props.geo);
       props.chartData && initCharts();
     });
 
@@ -66,7 +67,7 @@ export default {
       }
 
       setOptions(option);
-      regMap(props.name, props.geo);
+
       onMapClick((data) => {
         emit('click', data);
       });

src/views/business/components/businessTwo.vue

@@ -105,9 +105,6 @@ const loadData = async (code = '') => {
     { name: '四排山乡', value: 84 },
     { name: '芒洪乡', value: 82 },
     { name: '大兴乡', value: 64 },
-    { name: '信阳', value: 55 },
-    { name: '新乡', value: 32 },
-    { name: '大同', value: 51 },
   ];
 };
 

src/views/business/index.vue

@@ -32,7 +32,7 @@
         </customBack>
       </div>
       <div class="left-charts-item">
-        <customBack top-title="近三年用地规模曲线" :top-postion="'left'">
+        <customBack top-title="历年用地规模曲线" :top-postion="'left'">
           <template #back>
             <businessThere :data="state.data.there" />
           </template>
@@ -115,10 +115,6 @@ const loadData = async () => {
       { name: '贺派乡', value: 662 },
       { name: '四排山乡', value: 584 },
       { name: '芒洪乡', value: 682 },
-      { name: '大兴乡', value: 664 },
-      { name: '信阳', value: 555 },
-      { name: '新乡', value: 532 },
-      { name: '大同', value: 511 },
     ],
     there: [
       { value: 66, name: '2021' },
@@ -143,9 +139,6 @@ const loadData = async () => {
       { name: '四排山乡', value: 58.34 },
       { name: '芒洪乡', value: 68.12 },
       { name: '大兴乡', value: 66.34 },
-      { name: '信阳', value: 55.75 },
-      { name: '新乡', value: 53.32 },
-      { name: '大同', value: 51.11 },
     ],
     six: [
       {

src/views/entities/components/benefitCharts.vue

@@ -33,42 +33,42 @@ const list = ref([
     img: tomatoImg,
   },
   {
-    name: '产品aa',
+    name: '核桃',
     price: '3.5元/公斤',
     img: a,
   },
   {
-    name: '产品bb',
+    name: '玉米',
     price: '4.5元/公斤',
     img: b,
   },
   {
-    name: '产品cc',
+    name: '黄豆',
     price: '5.5元/公斤',
     img: c,
   },
   {
-    name: '产品dd',
+    name: '韭菜',
     price: '34.5元/公斤',
     img: d,
   },
   {
-    name: '产品ee',
+    name: '辣椒',
     price: '55.5元/公斤',
     img: e,
   },
   {
-    name: '产品ff',
+    name: '豌豆',
     price: '222.5元/公斤',
     img: f,
   },
   {
-    name: '产品gg',
+    name: '香蕉',
     price: '32.5元/公斤',
     img: g,
   },
   {
-    name: '产品hh',
+    name: '青花',
     price: '2.7元/公斤',
     img: h,
   },

src/views/inputs/index.vue

@@ -179,7 +179,7 @@ const loadData = async () => {
         comName: '欧锰化肥',
         totalScore: '99',
         companyType: '经销商',
-        belongCompany: '',
+        belongCompany: '灭百草集团',
         ratingReason: '效果不明显',
       },
       {
@@ -189,7 +189,7 @@ const loadData = async () => {
         comName: '史丹欧化肥',
         totalScore: '99',
         companyType: '经销商',
-        belongCompany: '',
+        belongCompany: '康瑞企业',
         ratingReason: '效果不明显',
       },
       {
@@ -199,7 +199,7 @@ const loadData = async () => {
         comName: '史丹力气化肥',
         totalScore: '99',
         companyType: '经销商',
-        belongCompany: '',
+        belongCompany: '康瑞企业',
         ratingReason: '效果不明显',
       },
       {
@@ -209,7 +209,7 @@ const loadData = async () => {
         comName: '史丹蒙化肥',
         totalScore: '99',
         companyType: '经销商',
-        belongCompany: '',
+        belongCompany: '康瑞企业',
         ratingReason: '效果不明显',
       },
       {
@@ -219,7 +219,7 @@ const loadData = async () => {
         comName: '史丹利化肥',
         totalScore: '99',
         companyType: '生产商',
-        belongCompany: '',
+        belongCompany: '康瑞企业',
         ratingReason: '效果不明显',
       },
       {
@@ -229,7 +229,7 @@ const loadData = async () => {
         comName: '丹正企化肥',
         totalScore: '99',
         companyType: '生产商',
-        belongCompany: '',
+        belongCompany: '康瑞企业',
         ratingReason: '效果不明显',
       },
       {
@@ -239,7 +239,7 @@ const loadData = async () => {
         comName: '丹正企化肥',
         totalScore: '99',
         companyType: '生产商',
-        belongCompany: '',
+        belongCompany: '泰富企业',
         ratingReason: '效果不明显',
       },
       {
@@ -249,7 +249,7 @@ const loadData = async () => {
         comName: '丹非化肥',
         totalScore: '99',
         companyType: '生产商',
-        belongCompany: '',
+        belongCompany: '泰富企业',
         ratingReason: '效果不明显',
       },
       {
@@ -259,7 +259,7 @@ const loadData = async () => {
         comName: '史丹化肥',
         totalScore: '99',
         companyType: '生产商',
-        belongCompany: '',
+        belongCompany: '泰富企业',
         ratingReason: '效果不明显',
       },
       {

src/views/land/index.vue

@@ -125,9 +125,6 @@ const loadData = async () => {
       { name: '四排山乡', value: 58.34 },
       { name: '芒洪乡', value: 68.12 },
       { name: '大兴乡', value: 66.34 },
-      { name: '信阳', value: 55.75 },
-      { name: '新乡', value: 53.32 },
-      { name: '大同', value: 51.11 },
     ],
     there: [
       { value: 10, name: '2020' },