fix：修改数据

src/components/charts/options/barOption.js

@@ -99,14 +99,14 @@ const styleName2 = {
       },
     },
     {
-      data: [0, 0, 0,1],
+      data: [0, 1, 0,13],
       type: "bar",
       barWidth: 26,
       stack: "total",
       label: {
         show: true,
         color: "#fff",
-        position: "top",
+        // position: "top",
         formatter: ({ value }) => {
           return value ? value : "";
         },
@@ -116,11 +116,11 @@ const styleName2 = {
           color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
             {
               offset: 0,
-              color: "#bb7d4c",
+              color: "#ff0000",
             },
             {
               offset: 1,
-              color: "#90603a",
+              color: "#B81500",
             },
           ]),
         },
@@ -131,7 +131,7 @@ const styleName2 = {
       },
     },
     {
-      data: [16,16,16, 15],
+      data: [16,15,16, 3],
       type: "bar",
       barWidth: 26,
       stack: "total",
@@ -192,7 +192,7 @@ const styleName3 = {
       },
     },
     {
-      data: [16, 8, 0, 0],
+      data: [16, 16, 16, 16],
       type: "bar",
       barWidth: 26,
       stack: "total",
@@ -224,7 +224,7 @@ const styleName3 = {
       },
     },
     {
-      data: [0,0, 16, 16],
+      data: [0,0, 0, 0],
       type: "bar",
       barWidth: 26,
       stack: "total",

src/components/charts/options/oneLineOption.js

@@ -35,7 +35,7 @@ export const oneLine = {
                 color: "rgba(185, 185, 185, 0.12)",
             }
         },
-        data: ['9/1', '9/7', '9/13', '9/19', '9/25', '10/1', '10/7']
+        data: ['2/12', '2/13', '2/14', '2/15', '2/16', '2/17', '2/18']
     },
     yAxis: [{
         type: 'value',
@@ -67,7 +67,7 @@ export const oneLine = {
     series: [
         {
             name: "温度",
-            data: [21, 27, 32, 22, 20, 24, 26],
+            data: [12, 11, 14, 16, 23, 18, 22],
             type: 'line',
             smooth: true,
             symbol: "none",
@@ -89,8 +89,8 @@ export const oneLine = {
                     {
                         name: "text",
                         value: "最高",
-                        xAxis: '9/13',
-                        yAxis: 32,
+                        xAxis: '2/16',
+                        yAxis: 23,
                         symbolOffset: [0, "-50%"],
                         label: {
                             offset: [0, 22],
@@ -101,8 +101,8 @@ export const oneLine = {
                     },
                     {
                         name: "mark",
-                        xAxis: '9/13',
-                        yAxis: 32,
+                        xAxis: '2/16',
+                        yAxis: 23,
                         value: "",
                         label: {
                             backgroundColor: "#fff",
@@ -116,8 +116,8 @@ export const oneLine = {
                     {
                         name: "text",
                         value: "最低",
-                        xAxis: '9/25',
-                        yAxis: 20,
+                        xAxis: '2/13',
+                        yAxis: 11,
                         symbolOffset: [0, "-50%"],
                         label: {
                             offset: [0, 22],
@@ -128,8 +128,8 @@ export const oneLine = {
                     },
                     {
                         name: "mark",
-                        xAxis: '9/25',
-                        yAxis: 20,
+                        xAxis: '2/13',
+                        yAxis: 11,
                         value: "",
                         label: {
                             backgroundColor: "#fff",

src/views/home/components/homePage.vue

@@ -2,6 +2,9 @@
   <div class="chart-list">
     <div class="chart-item">
       <chart-box name="气象预警" arrow="left">
+        <template #title-right>
+          <div class="button">果园报告</div>
+        </template>
         <div class="base-wrap">
           <!-- <div class="base-item">111</div> -->
           <img src="@/assets/images/home/base.png" alt="">
@@ -12,7 +15,7 @@
     <div class="chart-item phenology">
       <chart-box name="物候调节" arrow="left">
         <template #title-left>
-          <span class="title-left"> - 花芽萌动期</span>
+          <span class="title-left"> - 长花穗期</span>
         </template>
         <bar-chart class="bar-chart" styleName="styleName3" :xData="phenologyXData" :yData="phenologyYData"></bar-chart>
         <div class="time-line">
@@ -21,7 +24,7 @@
             <img class="time-img" src="@/assets/images/home/time-line.png" alt="">
           </div> -->
           <div class="tips box-bg">
-            物候进程：预计 <span>12天</span> 后进入花蕾抽出期
+            物候进程：预计 <span>15天</span> 后进入开花期
           </div>
         </div>
       </chart-box>
@@ -39,7 +42,7 @@
             <img class="time-img" src="@/assets/images/home/time-line.png" alt="">
           </div> -->
           <div class="tips box-bg">
-            所有区域中，<span>6</span> %区域出现毛毡病需要 <span>打药</span>
+            所有区域中，<span>14</span> %区域出现病虫害需要 <span>防治</span>
           </div>
         </div>
         <!-- <pie-chart class="pie-chart" styleName="styleName1"></pie-chart> -->
@@ -53,7 +56,7 @@
         <div class="content">
           <bar-chart styleName="styleName1" :xData="evaluateXData" :yData="evaluateYData"></bar-chart>
           <div class="box-bg text">
-            目前果园跨度异常比例达到<span>12%</span>，需要提供 <span>叶面肥</span>补充营养
+            目前果园跨度异常比例达到<span>2%</span>，需要提供 <span>叶面肥</span>补充营养
           </div>
         </div>
         <!-- <div class="text-list box-bg">
@@ -93,12 +96,12 @@ import oneLineChart from "@/components/charts/oneLineChart.vue";
 const phenologyXData = ["新梢褪绿", "花芽萌动","花蕾抽出","花穗伸长"]
 const phenologyYData = [{
   startNum:0,
-  endNum:1,
+  endNum:16,
   startColor:"#c6ab6b",
   endColor:"#4e442e"
 },{
-  startNum:8,
-  endNum:8,
+  startNum:0,
+  endNum:16,
   startColor:"#c6ab6b",
   endColor:"#4e442e"
 },{
@@ -144,7 +147,7 @@ const phenologyYData1 = [{
 
 // 营养评估
 const evaluateXData = ["低", "中", "高"]
-const evaluateYData = [2, 8, 6]
+const evaluateYData = [1, 8, 7]
 </script>
 
 <style lang="scss" scoped>
@@ -159,6 +162,12 @@ const evaluateYData = [2, 8, 6]
     height: calc(100% / 4);
     box-sizing: border-box;
     margin-bottom: 10px;
+    .button{
+      border: 1px solid rgba(255, 255, 255, 0.4);
+      border-radius: 4px;
+      padding: 2px 10px;
+      cursor: pointer;
+    }
     &.chart-item:last-child {
       margin: 0;
     }

src/views/home/components/indicatorChart.vue

@@ -167,7 +167,7 @@ const processData = () => {
 .card-chart {
     padding: 8px 4px 0 4px;
     width: 100%;
-    height: 170px;
+    height: 210px;
     box-sizing: border-box;
 }
 </style>

src/views/home/index.vue

@@ -18,12 +18,12 @@
               <div class="box-name" @click="handleSelectArea">果园日志</div>
             </template>
             <div class="log-content">
-              1月14日，共抽样150棵树，拍摄了300张照片
+              2月13日，共抽样193棵树，拍摄了193张照片
             </div>
             <div class="chart-wrap">
               <indicator-chart></indicator-chart>
-              <img class="line" src="@/assets/images/home/time1.png" alt="">
-              <img src="@/assets/images/home/text.png" alt="">
+              <!-- <img class="line" src="@/assets/images/home/time1.png" alt=""> -->
+              <!-- <img src="@/assets/images/home/text.png" alt=""> -->
             </div>
           </chart-box>
         </div>
@@ -214,23 +214,36 @@ eventBus.on('echart:barClick',(e)=>{
   btnIndex.value = null
   eventBus.emit("clear:area")
   samplePointLayer.updateAreaStatus(false)
-  const arr =  ["花芽萌动", "毛毡病"]
+  const arr =  ["花穗伸长", "啃食虫害","毛毡病"]
   const isDraw = arr.includes(e)
   const index = arr.indexOf(e)
   if(isDraw){
     if(index===0){
       regionLayer.selectAreaMultiple([
+        {value:0,color:"green"},
         {value:1,color:"green"},
+        {value:2,color:"green"},
         {value:3,color:"green1"},
+        {value:4,color:"green1"},
         {value:5,color:"green2"},
         {value:6,color:"green1"},
+        {value:7,color:"green2"},
+        {value:8,color:"green2"},
         {value:9,color:"green"},
+        {value:10,color:"green"},
         {value:11,color:"green1"},
         {value:12,color:"green2"},
-        {value:0,color:"green"},
+        {value:13,color:"green"},
+        {value:14,color:"green2"},
       ])
+    }else if(index===1){
+      regionLayer.selectAreaMultiple([{value:6,color:"red"}])
     }else{
-      regionLayer.selectAreaMultiple([{value:8,color:"red"}])
+      regionLayer.selectAreaMultiple([
+        {value:12,color:"red2"},
+        {value:10,color:"red"},
+        {value:1,color:"red"}
+      ])
     }
   }
 })

src/views/home/map/samplePointLayer.js

@@ -181,10 +181,6 @@ class SamplePointLayer {
     // item["icon"] = imgSrc
   }
 
-  ccc(){
-    console.log('00000000');
-  }
-
   reset(farm, region){
     console.log('farm',farm);
     this.clearCluster()