Merge branch 'dev' of http://gogs.gzzzyd.com/xiaowenhua/vueDataV into dev

src/components/Customize/cake.vue

@@ -228,7 +228,7 @@ export default {
   width: 401px;
   height: 234px;
   .chartsdom {
-    width: 80%;
+    width: 90%;
     height: 90%;
   }
   .panel {

src/components/Customize/map/index.vue

@@ -45,7 +45,7 @@ export default {
           value: 0.5,
           adcode: `520625`,
         },
-        { name: `石阡县`, value: 0, adcode: `520623` },
+        { name: `石阡县`, value: 0.3, adcode: `520623` },
         { name: `江口县`, value: 0.5, adcode: `520621` },
         { name: `玉屏侗族自治县`, value: 0.5, adcode: `520622` },
         { name: `思南县`, value: 0.5, adcode: ` 520624` },

src/components/Customize/wavyLineChart.vue

@@ -40,6 +40,9 @@ export default {
     dataArray: {
       type: Object,
     },
+    lineName: {
+      type: Object,
+    },
     title: {
       type: String,
       default: ``,
@@ -147,7 +150,7 @@ export default {
         ],
         series: [
           {
-            name: `今年`,
+            name: this.lineName.thisName,
             type: `line`,
             smooth: this.smooth == `true` ? true : false,
             symbol: `none`,
@@ -179,7 +182,7 @@ export default {
             data: this.dataArray.thisYear,
           },
           {
-            name: `去年`,
+            name: this.lineName.lastName,
             type: `line`,
             smooth: this.smooth,
             symbol: `none`,

src/views/page1/index.vue

@@ -30,6 +30,7 @@
     <wavyLineChart
       :unit="`平方米/面积`"
       id="`wavyLineChart`"
+      :lineName="yearName"
       style="position: absolute; right: 50px; top: 115px"
       class="animated fadeInRight"
       v-if="isWavyLine"
@@ -43,12 +44,13 @@
       class="animated fadeInRight"
       v-if="isHorizontal"
       id="`移栽情况分析`"
-      title="移栽情 况分析"
+      title="移栽情况分析"
       :area="HorizontalArea"
       :dataArray="HorizontalArray"
     />
     <wavyLineChart
       id="`移栽趋势分析`"
+      :lineName="yearName"
       style="position: absolute; right: 50px; top: 760px"
       class="animated fadeInRight"
       v-if="isTrend"
@@ -108,6 +110,10 @@ export default {
           { name: `烟农数量`, value: undefined },
         ],
       },
+      yearName: {
+        lastName: `去年`,
+        thisName: `今年`,
+      },
       TransplantdataArray: [],
       Transplantarea: [],
       Weatherarea: [],

src/views/page2/index.vue

@@ -15,20 +15,22 @@
       <wavyLineChart
         id="`本月移栽数量趋势`"
         style="position: absolute; right: 50px; top: 460px; z-index: 10"
-        v-if="isTrend"
+        v-if="isMonthTrend"
         title="本月移栽数量趋势"
-        :area.sync="trendarea"
-        :dataArray.sync="trendDataArray"
+        :area.sync="monthTrendarea"
+        :dataArray.sync="monthTrendDataArray"
+        :lineName="monthName"
         class="animated fadeInRight"
       />
       <wavyLineChart
         id="`本年移栽数量趋势`"
+        :lineName="yearName"
         style="position: absolute; right: 50px; top: 760px; z-index: 10"
-        v-if="isTrend"
         title="本年移栽数量趋势"
-        :area.sync="trendarea"
+        :area.sync="yearTrendarea"
         class="animated fadeInRight"
-        :dataArray.sync="trendDataArray"
+        :dataArray.sync="yearTrendDataArray"
+        v-if="isYearTrend"
       />
     </bgBox>
   </div>
@@ -55,13 +57,27 @@ export default {
       HorizontalArray: {
         Done: [],
       },
+      yearName: {
+        lastName: `去年`,
+        thisName: `今年`,
+      },
       isHorizontal: true,
-      trendarea: [],
-      trendDataArray: {
+      monthTrendarea: [],
+      monthTrendDataArray: {
+        LastYear: [],
+        thisYear: [],
+      },
+      monthName: {
+        lastName: `上月`,
+        thisName: `本月`,
+      },
+      yearTrendarea: [],
+      yearTrendDataArray: {
         LastYear: [],
         thisYear: [],
       },
-      isTrend: true,
+      isMonthTrend: false,
+      isYearTrend: false,
     }
   },
   computed: {},
@@ -74,7 +90,11 @@ export default {
         },
         {
           time: 1000 * 5,
-          fn: this.getTrendAnalysis,
+          fn: this.getTrendOfTransplantQuantityThisMonth,
+        },
+        {
+          time: 1000 * 5,
+          fn: this.getThisYearsTransplantingDataTrend,
         },
       ],
       this
@@ -91,8 +111,25 @@ export default {
       }
       console.log(`val`, val)
     },
-    getTrendAnalysis() {
-      this.$http.get(`/api/transplantTrendAnalysis`).then((res) => {
+    getTrendOfTransplantQuantityThisMonth() {
+      this.$http.get(`/trendOfTransplantQuantityThisMonth`).then((res) => {
+        const area = []
+        const dataArray = {
+          LastYear: [],
+          thisYear: [],
+        }
+        res.forEach((element) => {
+          area.push(element.时间)
+          dataArray.LastYear.push(element.去年)
+          dataArray.thisYear.push(element.今年)
+        })
+        this.monthTrendarea = area
+        this.monthTrendDataArray = dataArray
+        this.isMonthTrend = true
+      })
+    },
+    getThisYearsTransplantingDataTrend() {
+      this.$http.get(`/thisYearsTransplantingDataTrend`).then((res) => {
         const area = []
         const dataArray = {
           LastYear: [],
@@ -103,9 +140,9 @@ export default {
           dataArray.LastYear.push(element.去年)
           dataArray.thisYear.push(element.今年)
         })
-        this.trendarea = area
-        this.trendDataArray = dataArray
-        this.isTrend = true
+        this.yearTrendarea = area
+        this.yearTrendDataArray = dataArray
+        this.isYearTrend = true
       })
     },
     getAnalysisOfTransplantingSituation() {

src/views/page3/index.vue

@@ -58,41 +58,45 @@
         id="`月度移栽趋势`"
         barWidth="448px"
         style="position: absolute; right: 550px; top: 400px; z-index: 10"
-        v-if="isTrend"
+        v-if="isMonthTrend"
+        :lineName="monthName"
         title="月度移栽趋势"
-        :area.sync="trendarea"
         class="animated fadeInRight"
-        :dataArray.sync="trendDataArray"
+        :area.sync="monthTrendarea"
+        :dataArray.sync="monthTrendDataArray"
       />
       <wavyLineChart
         id="`月度移栽面积分析`"
         barWidth="448px"
         style="position: absolute; right: 550px; top: 730px; z-index: 10"
-        v-if="isTrend"
+        v-if="isMonthTrend"
+        :lineName="monthName"
         title="月度移栽面积分析"
-        :area.sync="trendarea"
         class="animated fadeInRight"
-        :dataArray.sync="trendDataArray"
+        :area.sync="monthTrendarea"
+        :dataArray.sync="monthTrendDataArray"
       />
       <wavyLineChart
         id="`年度移栽趋势`"
         barWidth="448px"
         style="position: absolute; right: 50px; top: 400px; z-index: 10"
-        v-if="isTrend"
+        :lineName="yearName"
         title="年度移栽趋势"
-        :area.sync="trendarea"
+        :area.sync="yearTrendarea"
         class="animated fadeInRight"
-        :dataArray.sync="trendDataArray"
+        :dataArray.sync="yearTrendDataArray"
+        v-if="isYearTrend"
       />
       <wavyLineChart
         id="`年度移栽面积分析`"
         barWidth="448px"
         style="position: absolute; right: 50px; top: 730px; z-index: 10"
-        v-if="isTrend"
+        :lineName="yearName"
         title="年度移栽面积分析"
-        :area.sync="trendarea"
+        :area.sync="yearTrendarea"
         class="animated fadeInRight"
-        :dataArray.sync="trendDataArray"
+        :dataArray.sync="yearTrendDataArray"
+        v-if="isYearTrend"
       />
     </div>
   </bgBox>
@@ -162,6 +166,26 @@ export default {
         LastYear: [],
         thisYear: [],
       },
+      monthTrendarea: [],
+      monthTrendDataArray: {
+        LastYear: [],
+        thisYear: [],
+      },
+      monthName: {
+        lastName: `上月`,
+        thisName: `本月`,
+      },
+      yearTrendarea: [],
+      yearTrendDataArray: {
+        LastYear: [],
+        thisYear: [],
+      },
+      isMonthTrend: false,
+      isYearTrend: false,
+      yearName: {
+        lastName: `去年`,
+        thisName: `今年`,
+      },
       statisticsData: {
         title: `处理率`,
         value: 0,
@@ -174,7 +198,6 @@ export default {
       Weatherarea: [],
       WeatherdataArray: [],
       isCake: false,
-      isTrend: false,
       isWeather: false,
     }
   },
@@ -184,7 +207,11 @@ export default {
       [
         {
           time: 1000 * 5,
-          fn: this.getTrendAnalysis,
+          fn: this.getTrendOfTransplantQuantityThisMonth,
+        },
+        {
+          time: 1000 * 5,
+          fn: this.getThisYearsTransplantingDataTrend,
         },
         {
           time: 1000 * 5,
@@ -238,8 +265,25 @@ export default {
         this.isWeather = true
       })
     },
-    getTrendAnalysis() {
-      this.$http.get(`/api/transplantTrendAnalysis`).then((res) => {
+    getTrendOfTransplantQuantityThisMonth() {
+      this.$http.get(`/trendOfTransplantQuantityThisMonth`).then((res) => {
+        const area = []
+        const dataArray = {
+          LastYear: [],
+          thisYear: [],
+        }
+        res.forEach((element) => {
+          area.push(element.时间)
+          dataArray.LastYear.push(element.去年)
+          dataArray.thisYear.push(element.今年)
+        })
+        this.monthTrendarea = area
+        this.monthTrendDataArray = dataArray
+        this.isMonthTrend = true
+      })
+    },
+    getThisYearsTransplantingDataTrend() {
+      this.$http.get(`/thisYearsTransplantingDataTrend`).then((res) => {
         const area = []
         const dataArray = {
           LastYear: [],
@@ -250,9 +294,9 @@ export default {
           dataArray.LastYear.push(element.去年)
           dataArray.thisYear.push(element.今年)
         })
-        this.trendarea = area
-        this.trendDataArray = dataArray
-        this.isTrend = true
+        this.yearTrendarea = area
+        this.yearTrendDataArray = dataArray
+        this.isYearTrend = true
       })
     },
     getStatistics() {
@@ -282,7 +326,7 @@ export default {
       })
     },
     backFn() {
-      console.log(`backFn`)
+      this.$router.back()
     },
     tabChange(val) {
       console.log(`val`, val)