fix: 接口更新

src/components/Customize/wavyLineChart.vue

@@ -94,6 +94,25 @@ export default {
           axisPointer: {
             type: `shadow`,
           },
+          formatter: function (params) {
+            console.log(params)
+            return [
+              params[0].axisValue +
+                `<i style="padding:0 6px"></i> ` +
+                params[0].value +
+                `<i style="padding:0 12px"></i> ` +
+                `较上日` +
+                `<i style="padding:0 6px"></i> ` +
+                params[2].value,
+              params[1].axisValue +
+                `<i style="padding:0 6px"></i> ` +
+                params[1].value +
+                `<i style="padding:0 12px"></i> ` +
+                `较去年` +
+                `<i style="padding:0 6px"></i> ` +
+                params[3].value,
+            ].join(`<br>`)
+          },
         },
         grid: {
           top: `20%`,
@@ -213,6 +232,14 @@ export default {
             },
             data: this.dataArray.LastYear,
           },
+          {
+            data: this.dataArray.comparisonLastDay,
+            type: `line`,
+          },
+          {
+            data: this.dataArray.comparisonLastYear,
+            type: `line`,
+          },
         ],
       }
 

src/components/Customize/weatherForecast.vue

@@ -22,7 +22,7 @@ export default {
       type: Array,
     },
     dataArray: {
-      type: Array,
+      type: Object,
     },
     barWidth: {
       type: String,
@@ -93,9 +93,13 @@ export default {
             color: `#fff`,
           },
           formatter: function (params) {
-            return [params[0].axisValueLabel, params[0].value + `度`].join(
-              `<br>`
-            )
+            return [
+              params[0].axisValueLabel,
+              params[0].value +
+                `度` +
+                `<i style="padding:0 12px"></i> ` +
+                params[1].value,
+            ].join(`<br>`)
           },
         },
         // 图例
@@ -145,7 +149,7 @@ export default {
         // 数据
         series: [
           {
-            data: this.dataArray,
+            data: this.dataArray.temperature,
             connectNulls: true,
             type: `line`,
             symbolSize: 0,
@@ -168,9 +172,12 @@ export default {
               ],
             },
           },
+          {
+            data: this.dataArray.Weather,
+            type: `line`,
+          },
         ],
       }
-
       myChart.setOption(this.option, true)
     },
   },

src/views/page1/index.vue

@@ -117,7 +117,10 @@ export default {
       TransplantdataArray: [],
       Transplantarea: [],
       Weatherarea: [],
-      WeatherdataArray: [],
+      WeatherdataArray: {
+        temperature: [],
+        Weather: [],
+      },
       wavyLineArea: [],
       wavyLinedataArray: {
         LastYear: [],
@@ -219,10 +222,14 @@ export default {
     getWeatherForecast() {
       return this.$http.get(`/api/weatherForecast`).then((res) => {
         const area = []
-        const dataArray = []
+        const dataArray = {
+          temperature: [],
+          Weather: [],
+        }
         res.forEach((element) => {
           area.push(element.时间)
-          dataArray.push(element.温度)
+          dataArray.temperature.push(element.温度)
+          dataArray.Weather.push(element.天气)
         })
         this.Weatherarea = area
         this.WeatherdataArray = dataArray

src/views/page2/index.vue

@@ -26,7 +26,7 @@
         id="`本年移栽数量趋势`"
         :lineName="yearName"
         style="position: absolute; right: 50px; top: 760px; z-index: 10"
-        title="本年移栽数量趋势"
+        title="本年移栽数据趋势"
         :area.sync="yearTrendarea"
         class="animated fadeInRight"
         :dataArray.sync="yearTrendDataArray"
@@ -112,16 +112,20 @@ export default {
       console.log(`val`, val)
     },
     getTrendOfTransplantQuantityThisMonth() {
-      this.$http.get(`/trendOfTransplantQuantityThisMonth`).then((res) => {
+      this.$http.get(`/api/trendOfTransplantQuantityThisMonth`).then((res) => {
         const area = []
         const dataArray = {
           LastYear: [],
           thisYear: [],
+          comparisonLastDay: [],
+          comparisonLastYear: [],
         }
         res.forEach((element) => {
           area.push(element.时间)
           dataArray.LastYear.push(element.去年)
           dataArray.thisYear.push(element.今年)
+          dataArray.comparisonLastDay.push(element.较上日 + `%`)
+          dataArray.comparisonLastYear.push(element.较去年 + `%`)
         })
         this.monthTrendarea = area
         this.monthTrendDataArray = dataArray
@@ -129,16 +133,20 @@ export default {
       })
     },
     getThisYearsTransplantingDataTrend() {
-      this.$http.get(`/thisYearsTransplantingDataTrend`).then((res) => {
+      this.$http.get(`/api/thisYearsTransplantingDataTrend`).then((res) => {
         const area = []
         const dataArray = {
           LastYear: [],
           thisYear: [],
+          comparisonLastDay: [],
+          comparisonLastYear: [],
         }
         res.forEach((element) => {
           area.push(element.时间)
           dataArray.LastYear.push(element.去年)
           dataArray.thisYear.push(element.今年)
+          dataArray.comparisonLastDay.push(element.较上日 + `%`)
+          dataArray.comparisonLastYear.push(element.较去年 + `%`)
         })
         this.yearTrendarea = area
         this.yearTrendDataArray = dataArray
@@ -146,7 +154,7 @@ export default {
       })
     },
     getAnalysisOfTransplantingSituation() {
-      this.$http.get(`/api/analysisOfTransplantingSituation`).then((res) => {
+      this.$http.get(`/api/transplantAreaInEachRegion2`).then((res) => {
         const area = []
         const dataArray = {
           Done: [],

src/views/page3/index.vue

@@ -49,7 +49,7 @@
         style="position: absolute; right: 50px; top: 95px"
         class="animated fadeInRight"
         v-if="isWeather"
-        title="天气预报"
+        title="实时天气"
         :area="Weatherarea"
         :dataArray="WeatherdataArray"
         :alertValue="30"
@@ -73,8 +73,8 @@
         :lineName="monthName"
         title="月度移栽面积分析"
         class="animated fadeInRight"
-        :area.sync="monthTrendarea"
-        :dataArray.sync="monthTrendDataArray"
+        :area.sync="monthTrendAnalysearea"
+        :dataArray.sync="monthTrendAnalyseDataArray"
       />
       <wavyLineChart
         id="`年度移栽趋势`"
@@ -93,9 +93,9 @@
         style="position: absolute; right: 50px; top: 730px; z-index: 10"
         :lineName="yearName"
         title="年度移栽面积分析"
-        :area.sync="yearTrendarea"
+        :area.sync="yearTrendAnalysearea"
         class="animated fadeInRight"
-        :dataArray.sync="yearTrendDataArray"
+        :dataArray.sync="yearTrendAnalyseDataArray"
         v-if="isYearTrend"
       />
     </div>
@@ -175,6 +175,8 @@ export default {
         lastName: `上月`,
         thisName: `本月`,
       },
+      monthTrendAnalysearea: [],
+      monthTrendAnalyseDataArray: [],
       yearTrendarea: [],
       yearTrendDataArray: {
         LastYear: [],
@@ -186,6 +188,8 @@ export default {
         lastName: `去年`,
         thisName: `今年`,
       },
+      yearTrendAnalysearea: [],
+      yearTrendAnalyseDataArray: [],
       statisticsData: {
         title: `处理率`,
         value: 0,
@@ -213,6 +217,14 @@ export default {
           time: 1000 * 5,
           fn: this.getThisYearsTransplantingDataTrend,
         },
+        {
+          time: 1000 * 5,
+          fn: this.getMonthlyTransplantationAreaAnalysis,
+        },
+        {
+          time: 1000 * 5,
+          fn: this.getAnalysisOfAnnualTransplantArea,
+        },
         {
           time: 1000 * 5,
           fn: this.getStatistics,
@@ -255,10 +267,14 @@ export default {
     getWeatherForecast() {
       return this.$http.get(`/api/weatherForecast`).then((res) => {
         const area = []
-        const dataArray = []
+        const dataArray = {
+          temperature: [],
+          Weather: [],
+        }
         res.forEach((element) => {
           area.push(element.时间)
-          dataArray.push(element.温度)
+          dataArray.temperature.push(element.温度)
+          dataArray.Weather.push(element.天气)
         })
         this.Weatherarea = area
         this.WeatherdataArray = dataArray
@@ -266,39 +282,89 @@ export default {
       })
     },
     getTrendOfTransplantQuantityThisMonth() {
-      this.$http.get(`/trendOfTransplantQuantityThisMonth`).then((res) => {
+      this.$http.get(`/api/transplantTrendAnalysis`).then((res) => {
         const area = []
         const dataArray = {
           LastYear: [],
           thisYear: [],
+          comparisonLastDay: [],
+          comparisonLastYear: [],
         }
         res.forEach((element) => {
           area.push(element.时间)
           dataArray.LastYear.push(element.去年)
           dataArray.thisYear.push(element.今年)
+          dataArray.comparisonLastDay.push(element.较上日 + `%`)
+          dataArray.comparisonLastYear.push(element.较去年 + `%`)
         })
         this.monthTrendarea = area
         this.monthTrendDataArray = dataArray
         this.isMonthTrend = true
       })
     },
+    getMonthlyTransplantationAreaAnalysis() {
+      this.$http.get(`/api/monthlyTransplantationAreaAnalysis`).then((res) => {
+        const area = []
+        const dataArray = {
+          LastYear: [],
+          thisYear: [],
+          comparisonLastDay: [],
+          comparisonLastYear: [],
+        }
+        res.forEach((element) => {
+          area.push(element.时间)
+          dataArray.LastYear.push(element.去年)
+          dataArray.thisYear.push(element.今年)
+          dataArray.comparisonLastDay.push(element.较上日 + `%`)
+          dataArray.comparisonLastYear.push(element.较去年 + `%`)
+        })
+        this.monthTrendAnalysearea = area
+        this.monthTrendAnalyseDataArray = dataArray
+        this.isMonthTrend = true
+      })
+    },
     getThisYearsTransplantingDataTrend() {
-      this.$http.get(`/thisYearsTransplantingDataTrend`).then((res) => {
+      this.$http.get(`/api/thisYearsTransplantingDataTrend`).then((res) => {
         const area = []
         const dataArray = {
           LastYear: [],
           thisYear: [],
+          comparisonLastDay: [],
+          comparisonLastYear: [],
         }
         res.forEach((element) => {
           area.push(element.时间)
           dataArray.LastYear.push(element.去年)
           dataArray.thisYear.push(element.今年)
+          dataArray.comparisonLastDay.push(element.较上日 + `%`)
+          dataArray.comparisonLastYear.push(element.较去年 + `%`)
         })
         this.yearTrendarea = area
         this.yearTrendDataArray = dataArray
         this.isYearTrend = true
       })
     },
+    getAnalysisOfAnnualTransplantArea() {
+      this.$http.get(`/api/analysisOfAnnualTransplantArea`).then((res) => {
+        const area = []
+        const dataArray = {
+          LastYear: [],
+          thisYear: [],
+          comparisonLastDay: [],
+          comparisonLastYear: [],
+        }
+        res.forEach((element) => {
+          area.push(element.时间)
+          dataArray.LastYear.push(element.去年)
+          dataArray.thisYear.push(element.今年)
+          dataArray.comparisonLastDay.push(element.较上日 + `%`)
+          dataArray.comparisonLastYear.push(element.较去年 + `%`)
+        })
+        this.yearTrendAnalysearea = area
+        this.yearTrendAnalyseDataArray = dataArray
+        this.isYearTrend = true
+      })
+    },
     getStatistics() {
       return this.$http.get(`/api/transplantData`).then((res) => {
         const obj = this.statisticsData