fix: page2接口对接

src/components/Customize/Complex histograms.vue

@@ -40,6 +40,10 @@ export default {
       type: String,
       default: ``,
     },
+    showLegnd: {
+      type: Boolean,
+      default: true
+    },
     unit: {
       type: String,
     },
@@ -56,15 +60,28 @@ export default {
     getEchart() {
       let myChart = echarts.init(document.getElementById(this.id))
       let data = {
-        data: [
-          [92, 0, 8, 143, 89, 67, 0, 0],
-          [12, 0, 8, 14, 23, 44, 0, 0],
-        ],
+        data: [],
         color: [["#00FFE3", "#4693EC"], ["#1B92FF", "#1B92FF"]],
-        xAxis: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月'],
-        legend: ["今年当月", "去年当月"],
+        xAxis: [],
+        legend: [],
       };
+      if (this.dataArray) {
+        data.data = []
+        data.legend = []
+        if (this.dataArray.thisYear) {
+          data.data.push(this.dataArray.thisYear || [])
+          data.legend.push("今年")
+        }
+        if (this.dataArray.LastYear) {
+          data.data.push(this.dataArray.LastYear || [])
+          data.legend.push("去年")
+        }
+      }
 
+      if (this.area) {
+        data.xAxis = []
+        data.xAxis = this.area
+      }
       let series = data.data.map((item, index) => {
         return {
           name: data.legend[index],
@@ -95,7 +112,7 @@ export default {
           data: data.xAxis
         },
         legend: {
-          show: true,
+          show: this.showLegnd,
           textStyle: {
             color: '#ffffff'//字体颜色
           }
@@ -110,11 +127,11 @@ export default {
           },
         },
         grid: {
-          top: '15%',
-          left: '5%',
+          top: '10%',
+          left: '10%',
           right: '5%',
-          bottom: '15%',
-          containLabel: true
+          bottom: '25%',
+          // containLabel: true
         },
         yAxis: {
           type: 'value'

src/components/Customize/HybridCharts.vue

@@ -25,11 +25,6 @@ import boxTop from '@/components/boxTop/index.vue'
 export default {
   data() {
     return {
-      isHoist: true,
-      tabs: {
-        index: this.$props.tabIndex,
-        list: [`交易额`, `交易类型`],
-      },
       chartData: [
         {
           value: 30,
@@ -73,8 +68,12 @@ export default {
       default: ``,
     },
     data: {
-      type: Object,
-      default: new Object(),
+      type: Array,
+      default: [],
+    },
+    dataSource:{
+      type: Array,
+      default: [],
     },
     tabIndex: {
       type: Number,
@@ -98,6 +97,7 @@ export default {
       handler() {
         this.getEchart()
         this.getEchartAgain()
+        this.chartData = this.data
       },
       deep: true, // 深度监听
       immediate: true, // 立即执行
@@ -227,13 +227,7 @@ export default {
     },
     getEchartAgain() {
       let myChart = echarts.init(document.getElementById('rankingCharts'))
-      const dataSource = [
-        {name: '服务数据管理', value: 3713, percent: "29.5"},
-        {name: '组织部', value: 3022, percent: "32"},
-        {name: '服务数据', value: 2647, percent: "24.3"},
-        {name: '水务管理', value: 2291, percent: "50"},
-        {name: '水务管理', value: 2291, percent: "50"}
-      ];
+      const dataSource = this.dataSource;
       let dataSourcemax = 0
       dataSource.forEach((item) => {
         if (dataSourcemax < item.value) {
@@ -341,7 +335,7 @@ export default {
               offset: [10, -20],
               formatter: function (fItem) {
                 let obj = dataSource.find(item => item.name === fItem.name)
-                return `{unitWid|交易量}{value|${obj.value}}{unit|交易额}{percent|${obj.percent}}`
+                return `{unitWid|交易量}{value|${obj.value}}{unit|交易额}{ratio|${obj.ratio}}`
               },
               position: 'insideRight', // 在上方显示
               // 数值样式，显示的文字大小和颜色
@@ -354,7 +348,7 @@ export default {
                   fontSize: 16,
                   padding: [0, 0, -10, 5]
                 },
-                percent: {
+                ratio: {
                   color: '#00ffff',
                   fontSize: 16,
                   padding: [0, 0, -10, 5],

src/components/Customize/histogram.vue

@@ -3,7 +3,7 @@
   <div class="oblongBox" :style="{height:barHeight }">
     <div class="chartsdom" id="cylindrical">
     </div>
-    <div class="title"><span class="label">商品总数</span><span class="value">{{ total }}</span></div>
+    <div class="title"><span class="label">{{title}}</span><span class="value">{{ total }}</span></div>
   </div>
 </template>
 
@@ -31,6 +31,9 @@ export default {
     total: {
       type: String || Number,
     },
+    title:{
+      type: String,
+    },
     dataArray: {
       type: Array,
     },

src/components/Customize/weatherForecast.vue

@@ -2,18 +2,19 @@
 <template>
   <div class="weatherBox" :style="{height:barHeight}">
     <boxTop :title="title">
-      <div class="select_btn">
-        <el-select size="small" :popper-append-to-body="false" style="width: 120px" v-model="value" placeholder="请选择">
-          <el-option
-              v-for="(item, index) in selectList"
-              :key="index"
-              :label="item.value"
-              :value="item.value">
-          </el-option>
-        </el-select>
-      </div>
+      <!--      <div class="select_btn">-->
+      <!--        <el-select size="small" :popper-append-to-body="false" style="width: 120px" v-model="value" placeholder="请选择">-->
+      <!--          <el-option-->
+      <!--              v-for="(item, index) in selectList"-->
+      <!--              :key="index"-->
+      <!--              :label="item.value"-->
+      <!--              :value="item.value">-->
+      <!--          </el-option>-->
+      <!--        </el-select>-->
+      <!--      </div>-->
     </boxTop>
     <div class="chartsdom" :id="id"></div>
+    <div class="title"><span class="label">{{title}}</span><span class="value">{{ total }}</span></div>
   </div>
 </template>
 
@@ -55,6 +56,7 @@ export default {
     },
     dataArray: {
       type: Object,
+      default: null
     },
     barHeight: {
       type: String,
@@ -116,9 +118,25 @@ export default {
         ],
         unit: "亩",
         xAxis: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'],
-        legend: ["今年当月", "去年当月"],
+        legend: ["今年", "去年"],
       };
 
+      if (this.dataArray) {
+        data.data = []
+        data.legend = []
+        if (this.dataArray.thisYear) {
+          data.data.push(this.dataArray.thisYear || [])
+          data.legend.push("今年")
+        } else if (this.dataArray.LastYear) {
+          data.data.push(this.dataArray.LastYear || [])
+          data.legend.push("去年")
+        }
+      }
+      if (this.area) {
+        data.xAxis = []
+        data.xAxis = this.area
+      }
+
       let series = data.data.map((item, index) => {
         return {
           name: data.legend[index],
@@ -178,7 +196,7 @@ export default {
           },
         },
         grid: {
-          top: '15%',
+          top: '10%',
           left: '5%',
           right: '5%',
           bottom: '15%',

src/components/boxTop/index.vue

@@ -18,9 +18,7 @@ export default {
   props: {
     title: {
       type: String,
-      default: `区域排行`,
     },
-
   },
   mounted() {
   },

src/config.js

@@ -2,11 +2,11 @@ export default {
   development: {
     // baseApi: `http://192.168.1.86:8100`,
     // baseApi: `https://www.gzzzyd.com/tobacco-api`,
-    baseApi: `http://192.168.0.223:8080`,
+    baseApi: `http://192.168.1.62:8080`,
   },
   production: {
     // baseApi: `http://192.168.1.86:8100`,
     // baseApi: `https://www.gzzzyd.com/tobacco-api`,
-    baseApi: `http://192.168.0.223:8080`,
+    baseApi: `http://192.168.1.62:8080`,
   },
 }[process.env.NODE_ENV || `production`]

src/views/page1/index.vue

@@ -1,8 +1,9 @@
 <template>
-  <bgBox :tabChange="tabChange" class="bgBox" :tabIndex="0">
+  <bgBox :tabChange="pageTabChange" class="bgBox" :tabIndex="0">
     <histogram
         style="position: absolute; left: 20px; top: 98px"
         class="animated fadeInLeft"
+        title="商品总数"
         :total=goodsStatisticsTotal
         :barHeight="'234px'"
         :area="goodsStatisticsArea"
@@ -52,7 +53,7 @@
         <div
             :class="[`tab-item`, { cur: index === tabs.index }]"
             :key="item"
-            @click="tabs.index = index"
+            @click="changeTabs(index)"
             v-for="(item, index) in tabs.list"
         >
           {{ item }}
@@ -60,6 +61,7 @@
       </div>
     </div>
     <weatherForecast
+        barHeight="216px"
         id="当年平台订单总量月同比"
         :lineName="yearName"
         style="position: absolute; right: 20px; top: 150px"
@@ -74,23 +76,31 @@
         :barHeight="'216px'"
         class="animated fadeInRight"
         title="当年平台订单总量月环比"
+        :area="wavyLineArea"
+        :showLegnd="false"
+        :dataArray="wavyLinedataArray"
     >
     </ComplexHistograms>
     <weatherForecast
-        id="总交易趋势"
+        id="系统当年平台订单"
+        barHeight="216px"
         :lineName="yearName"
         style="position: absolute; right: 20px; top: 606px"
         class="animated fadeInRight"
         title="系统当年平台订单总交易趋势(月)"
-        :area="Weatherarea"
-        :dataArray="WeatherdataArray"
+        :area="thisYearTrendArea"
+        :showLegnd="false"
+        :dataArray="thisYearTrendArray"
     ></weatherForecast>
     <ComplexHistograms
-        id="系统去年平台订单总交易趋势"
+        id="系统去年"
         style="position: absolute; right: 20px; top: 834px"
         :barHeight="'225px'"
         class="animated fadeInRight"
         title="系统去年平台订单总交易趋势(月)"
+        :area="lastYearTrendArea"
+        :showLegnd="false"
+        :dataArray="lastYearTrendArray"
     >
     </ComplexHistograms>
   </bgBox>
@@ -138,10 +148,15 @@ export default {
       goodsStatisticsArray: [],
       goodsStatisticsArea: [],
       goodsStatisticsTotal: null,
-      Weatherarea: [],
-      WeatherdataArray: {
-        temperature: [],
-        Weather: [],
+      thisYearTrendArea: [],
+      lastYearTrendArea: [],
+      thisYearTrendArray: {
+        thisYear: [],
+        LastYear: [],
+      },
+      lastYearTrendArray: {
+        thisYear: [],
+        LastYear: [],
       },
       wavyLineArea: [],
       wavyLinedataArray: {
@@ -169,10 +184,10 @@ export default {
     this.getJSON()
     this.$util.autoVueFn(
         [
-          //   {
-          //     time: 1000 * 60,
-          //     fn: this.getWeatherForecast,
-          //   },
+            {
+              time: 1000 * 360,
+              fn: this.getThisYearTrendForecast,
+            },
           {
             time: 1000 * 300,
             fn: this.getGoodsStatistics,
@@ -185,18 +200,22 @@ export default {
             time: 1000 * 300,
             fn: this.getStatistics,
           },
-          //   {
-          //     time: 1000 * 60,
-          //     fn: this.getTransplantAreaInEachRegion,
-          //   },
+            {
+              time: 1000 * 360,
+              fn: this.getTransplantAreaInEachRegion,
+            },
+          {
+            time: 1000 * 360,
+            fn: this.getLastYearTrendForecast,
+          },
           {
             time: 1000 * 360,
             fn: this.getTradeTypeRankData,
           },
-          //   {
-          //     time: 1000 * 60,
-          //     fn: this.getTrendAnalysis,
-          //   },
+          {
+            time: 1000 * 360,
+            fn: this.getTrendAnalysis,
+          },
         ],
         {
           vm: this,
@@ -209,8 +228,14 @@ export default {
   mounted() {
   },
   methods: {
-
-    tabChange(val) {
+    changeTabs(index){
+      this.tabs.index = index
+      this.getThisYearTrendForecast()
+      this.getLastYearTrendForecast()
+      this.getTransplantAreaInEachRegion()
+      this.getTrendAnalysis()
+    },
+    pageTabChange(val) {
       if (val === 0) {
         this.$router.push(`/page1`)
       } else if (val === 1) {
@@ -218,7 +243,6 @@ export default {
       } else if (val === 2) {
         this.$router.push(`/page3`)
       }
-      console.log(`val`, val)
     },
     getGoodsStatistics() {
       return this.$http
@@ -243,40 +267,66 @@ export default {
             this.tradeTypeDateList = res.list
           })
     },
-    getWeatherForecast() {
+    getThisYearTrendForecast() {
       return this.$http
-          .get(`/api/weatherForecast`, {
+          .get(`/api/screen/swpt/thisYearTrend`, {
             params: {
-              districtId: 0,
+              type:this.tabs.index +1,
             },
           })
           .then((res) => {
             const area = []
             const dataArray = {
-              temperature: [],
-              Weather: [],
+              thisYear: [],
+              LastYear: [],
             }
             res.forEach((element) => {
-              area.push(element.时间)
-              dataArray.temperature.push(element.温度)
-              dataArray.Weather.push(element.天气)
+              area.push(element.label)
+              dataArray.thisYear.push(element.value)
+              dataArray.LastYear.push(element.ratio)
+            })
+            this.thisYearTrendArea = area
+            this.thisYearTrendArray = dataArray
+            this.isWeather = true
+          })
+    },
+    getLastYearTrendForecast() {
+      return this.$http
+          .get(`/api/screen/swpt/lastYearTrend`, {
+            params: {
+              type:this.tabs.index +1,
+            },
+          })
+          .then((res) => {
+            const area = []
+            const dataArray = {
+              thisYear: [],
+              LastYear: [],
+            }
+            res.forEach((element) => {
+              area.push(element.label)
+              dataArray.LastYear.push(element.value)
             })
-            this.Weatherarea = area
-            this.WeatherdataArray = dataArray
+            this.lastYearTrendArea = area
+            this.lastYearTrendArray = dataArray
             this.isWeather = true
           })
     },
     getTransplantAreaInEachRegion() {
-      return this.$http.get(`/api/transplantAreaInEachRegion`).then((res) => {
+      return this.$http.get(`/api/screen/swpt/monthOnMonth`, {
+        params: {
+          type:this.tabs.index +1,
+        },
+      }).then((res) => {
         const area = []
         const dataArray = {
           LastYear: [],
           thisYear: [],
         }
         res.forEach((element) => {
-          area.push(element.名称.slice(0, 2))
-          dataArray.LastYear.push(element.去年)
-          dataArray.thisYear.push(element.今年)
+          area.push(element.month)
+          dataArray.thisYear.push(element.thisYear)
+          dataArray.LastYear.push(element.lastYear)
         })
         this.wavyLineArea = area
         this.wavyLinedataArray = dataArray
@@ -285,7 +335,6 @@ export default {
     },
     getTradeTypeRankData() {
       this.$http.get(`/api/screen/swpt/tradeTypeRank`).then((res) => {
-        console.log(res)
         this.tradeTypeRankData = res
       })
     },
@@ -295,16 +344,20 @@ export default {
       })
     },
     getTrendAnalysis() {
-      return this.$http.get(`/api/transplantTrendAnalysis`).then((res) => {
+      return this.$http.get(`/api/screen/swpt/yearOnYear`, {
+        params: {
+          type: this.tabs.index + 1,
+        },
+      }).then((res) => {
         const area = []
         const dataArray = {
           LastYear: [],
           thisYear: [],
         }
         res.forEach((element) => {
-          area.push(element.时间)
-          dataArray.LastYear.push(element.去年)
-          dataArray.thisYear.push(element.今年)
+          area.push(element.month)
+          dataArray.LastYear.push(element.lastYear)
+          dataArray.thisYear.push(element.thisYear)
         })
         this.trendarea = area
         this.trendDataArray = dataArray

src/views/page2/index.vue

@@ -3,15 +3,16 @@
     <histogram
         style="position: absolute; left: 20px; top: 98px"
         class="animated fadeInLeft"
-        title="各区域移栽产量分析"
+        title="商品总额"
         :barHeight="'316px'"
-        total="2700"
-        :area="Transplantarea"
-        :dataArray="TransplantdataArray"
+        :total=goodsTotal
+        :area="goodsPlantArea"
+        :dataArray="goodsPlantDataArray"
     />
     <weatherForecast
         id="平台订单总量趋势（月）"
         :barHeight="'312px'"
+        :showLegnd="false"
         style="position: absolute; left: 20px; top: 426px"
         class="animated fadeInLeft"
         title="平台订单总量趋势(月)"
@@ -24,6 +25,9 @@
         style="position: absolute; left: 20px; top: 750px"
         class="animated fadeInLeft"
         title="平台订单总交易额趋势(月)"
+        :area="wavyLineArea"
+        :showLegnd="false"
+        :dataArray="wavyLinedataArray"
     >
     </ComplexHistograms>
     <threeMap
@@ -37,22 +41,23 @@
         v-if="hasGetJson"
         :getJson="getJson"
     ></threeMap>
-<!--    <pieChartsList :barHeight="'254px'"-->
-<!--                   id="商品交易类型分布"-->
-<!--                   style="position: absolute; right: 50%; top: 760px;   transform: translate(50%,15%);"-->
-<!--                   title="商品交易类型分布"-->
-<!--                   :area="trendarea"-->
-<!--                   :dataArray="trendDataArray">-->
+    <!--    <pieChartsList :barHeight="'254px'"-->
+    <!--                   id="商品交易类型分布"-->
+    <!--                   style="position: absolute; right: 50%; top: 760px;   transform: translate(50%,15%);"-->
+    <!--                   title="商品交易类型分布"-->
+    <!--                   :area="trendarea"-->
+    <!--                   :dataArray="trendDataArray">-->
 
-<!--    </pieChartsList>-->
+    <!--    </pieChartsList>-->
     <weatherForecast
         :barHeight="'254px'"
         id="订单总量"
         style="position: absolute; right: 20px; top: 98px"
         class="animated fadeInRight"
         title="订单总量"
-        :area="trendarea"
-        :dataArray="trendDataArray"
+        :showLegnd="false"
+        :area="HorizontalArea"
+        :dataArray="HorizontalArray"
     ></weatherForecast>
     <weatherForecast
         id="订单总量2"
@@ -60,12 +65,15 @@
         style="position: absolute; right: 20px; top: 364px"
         class="animated fadeInRight"
         title="订单总量"
+        :showLegnd="false"
         :area="Weatherarea"
         :dataArray="WeatherdataArray"
     ></weatherForecast>
     <HybridCharts
         class="animated fadeInRight"
         title="平台订单来源类型分布"
+        :data="chartData"
+        :dataSource="dataSource"
         style="position: absolute; right: 20px; top: 630px">
     </HybridCharts>
   </bgBox>
@@ -107,6 +115,8 @@ export default {
       },
       max: 100,
       autoVueFnInit: false,
+      chartData:[],
+      dataSource:[],
       statisticsData: {
         title: `目标完成率`,
         value: 0,
@@ -123,8 +133,9 @@ export default {
         lastName: `去年`,
         thisName: `今年`,
       },
-      TransplantdataArray: [120, 200, 150, 80, 70, 110, 130],
-      Transplantarea: ['商品类型', '商品类型', '商品类型', '商品类型', '商品类型', '商品类型', '商品类型'],
+      goodsTotal: null,
+      goodsPlantDataArray: [120, 200, 150, 80, 70, 110, 130],
+      goodsPlantArea: ['商品类型', '商品类型', '商品类型', '商品类型', '商品类型', '商品类型', '商品类型'],
       Weatherarea: [],
       WeatherdataArray: {
         temperature: [],
@@ -158,47 +169,45 @@ export default {
   computed: {},
   created() {
     this.getJSON()
-    // this.$util.autoVueFn(
-    //   [
-    //     {
-    //       time: 1000 * 60,
-    //       fn: this.getWeatherForecast,
-    //     },
-    //     {
-    //       time: 1000 * 60,
-    //       fn: this.getAnalysisOfTransplantYieldInVariousRegions,
-    //     },
-    //     {
-    //       time: 1000 * 60,
-    //       fn: this.getTransplantAreaInEachRegion,
-    //     },
-    //     {
-    //       time: 1000 * 60,
-    //       fn: this.getAnalysisOfTransplantingSituation,
-    //     },
-    //     {
-    //       time: 1000 * 60,
-    //       fn: this.getStatistics,
-    //     },
-    //     {
-    //       time: 1000 * 60,
-    //       fn: this.getTrendAnalysis,
-    //     },
-    //   ],
-    //   {
-    //     vm: this,
-    //     batEnd() {
-    //       this.autoVueFnInit = true
-    //     },
-    //   }
-    // )
+    this.$util.autoVueFn(
+        [
+          //     {
+          //       time: 1000 * 60,
+          //       fn: this.getWeatherForecast,
+          //     },
+          {
+            time: 1000 * 60,
+            fn: this.getAnalysisOfTransplantYieldInVariousRegions,
+          },
+              {
+                time: 1000 * 60,
+                fn: this.getTransplantAreaInEachRegion,
+              },
+          //     {
+          //       time: 1000 * 60,
+          //       fn: this.getAnalysisOfTransplantingSituation,
+          //     },
+              {
+                time: 1000 * 60,
+                fn: this.getStatistics,
+              },
+              {
+                time: 1000 * 60,
+                fn: this.getTrendAnalysis,
+              },
+        ],
+        {
+          vm: this,
+          batEnd() {
+            this.autoVueFnInit = true
+          },
+        }
+    )
   },
   mounted() {
   },
   methods: {
     async toView(code) {
-      console.log(code)
-
       const {id, 区域编码} = (await this.$util.code2base(this, code)) || {}
       this.$router.push({
         path: `/page3`,
@@ -216,30 +225,26 @@ export default {
       } else if (val === 2) {
         this.$router.push(`/page3`)
       }
-      console.log(`val`, val)
     },
     getAnalysisOfTransplantYieldInVariousRegions() {
       return this.$http
-          .get(`/api/analysisOfTransplantYieldInVariousRegions`)
+          .get(`/api/screen/qxjy/goodsStatistics`)
           .then((res) => {
             const area = []
             const dataArray = []
-            res.forEach((element) => {
-              area.push(element.名称.slice(0, 2))
-              dataArray.push(element.值)
+            res.list.forEach((element) => {
+              area.push(element.label)
+              dataArray.push(element.value)
             })
-            this.Transplantarea = area
-            this.TransplantdataArray = dataArray
+            this.goodsTotal = res.total
+            this.goodsPlantArea = area
+            this.goodsPlantDataArray = dataArray
             this.isGetData = true
           })
     },
     getWeatherForecast() {
       return this.$http
-          .get(`/api/weatherForecast`, {
-            params: {
-              districtId: 0,
-            },
-          })
+          .get(`/api/screen/qxjy/orderTotalAmount`)
           .then((res) => {
             const area = []
             const dataArray = {
@@ -257,16 +262,16 @@ export default {
           })
     },
     getTransplantAreaInEachRegion() {
-      return this.$http.get(`/api/transplantAreaInEachRegion`).then((res) => {
+      return this.$http.get(`/api/screen/qxjy/orderTotalTrend`).then((res) => {
         const area = []
         const dataArray = {
           LastYear: [],
           thisYear: [],
         }
+        console.log(res,'231323123')
         res.forEach((element) => {
-          area.push(element.名称.slice(0, 2))
-          dataArray.LastYear.push(element.去年)
-          dataArray.thisYear.push(element.今年)
+          area.push(element.label)
+          dataArray.thisYear.push(element.value)
         })
         this.wavyLineArea = area
         this.wavyLinedataArray = dataArray
@@ -274,7 +279,7 @@ export default {
       })
     },
     getAnalysisOfTransplantingSituation() {
-      this.$http.get(`/api/analysisOfTransplantingSituation`).then((res) => {
+      this.$http.get(`/api/screen/qxjy/orderTotal`).then((res) => {
         const area = []
         const dataArray = {
           Done: [],
@@ -292,42 +297,23 @@ export default {
       })
     },
     getStatistics() {
-      return this.$http.get(`/api/realTimeStatistics`).then((res) => {
-        const obj = this.statisticsData
-        // eslint-disable-next-line no-prototype-builtins
-        if (res.hasOwnProperty(obj.title)) {
-          obj.value = res[obj.title]
-        }
-        const list1 = this.statisticsData.acrossList
-        this.statisticsData.acrossList = list1.map((item) => {
-          // eslint-disable-next-line no-prototype-builtins
-          if (res.hasOwnProperty(item.name)) {
-            return {...item, value: res[item.name]}
-          }
-          return item
-        })
-        const list2 = this.statisticsData.verticalList
-        this.statisticsData.verticalList = list2.map((item) => {
-          // eslint-disable-next-line no-prototype-builtins
-          if (res.hasOwnProperty(item.name)) {
-            return {...item, value: res[item.name]}
-          }
-          return item
-        })
-        this.isCake = true
+      return this.$http.get(`/api/screen/qxjy/orderSourceType`).then((res) => {
+        console.log(res)
+        this.chartData = res.list1
+        this.dataSource = res.list2
       })
     },
     getTrendAnalysis() {
-      return this.$http.get(`/api/transplantTrendAnalysis`).then((res) => {
+      return this.$http.get(`/api/screen/qxjy/orderTotalTrend`).then((res) => {
         const area = []
         const dataArray = {
           LastYear: [],
           thisYear: [],
         }
         res.forEach((element) => {
-          area.push(element.时间)
-          dataArray.LastYear.push(element.去年)
-          dataArray.thisYear.push(element.今年)
+          area.push(element.label
+          )
+          dataArray.thisYear.push(element.value)
         })
         this.trendarea = area
         this.trendDataArray = dataArray