727

src/echarts/options.js

@@ -1042,7 +1042,7 @@ export function setNydbhqs(ele, dataIn) {
 			}],
 		series: [
 			{
-				name: "农用地面积",	
+				name: "农用地面积",
 				type: "line",
 				showSymbol: false,
 				data: areaData,
@@ -1148,7 +1148,7 @@ export function setYyqdfx(ele, dataIn) {
 		},
 		series: [
 			{
-				name: "用药强度",	
+				name: "用药强度",
 				type: "line",
 				smooth: true,
 				showSymbol: true,
@@ -1184,10 +1184,10 @@ export function setXsqs(ele, dataIn) {
 
 	let xData = []; let sales = []; let pay = []; let subsidy = []
 	dataIn.forEach(i => {
-		xData.push(i.time)
-		sales.push(i.sales)
-		pay.push(i.pay)
-		subsidy.push(i.subsidy)
+		xData.push(i.saleTime)
+		sales.push(i.totalSalePrice)
+		pay.push(i.totalZfPrice)
+		subsidy.push(i.totalBtPrice)
 	})
 
 	let option = {
@@ -1495,7 +1495,7 @@ export function setSdbtfx(ele, dataIn) {
 				data: dataFormat.money_jzb,
 			},
 			{
-				name: "水稻种植补贴面积",	
+				name: "水稻种植补贴面积",
 				type: "line",
 				smooth: true,
 				showSymbol: false,
@@ -1515,7 +1515,7 @@ export function setSdbtfx(ele, dataIn) {
 				data: dataFormat.area_zz,
 			},
 			{
-				name: "水稻机插秧补贴面积",	
+				name: "水稻机插秧补贴面积",
 				type: "line",
 				smooth: true,
 				showSymbol: false,
@@ -1535,7 +1535,7 @@ export function setSdbtfx(ele, dataIn) {
 				data: dataFormat.area_jcy,
 			},
 			{
-				name: "水稻机直播补贴面积",	
+				name: "水稻机直播补贴面积",
 				type: "line",
 				smooth: true,
 				showSymbol: false,
@@ -1743,7 +1743,7 @@ export function setClqs(ele, dataIn) {
 
 	Object.keys(yData).forEach((key, index) => {
 		seriesArr.push({
-			name: key,	
+			name: key,
 			type: "line",
 			smooth: true,
 			showSymbol: false,
@@ -2003,7 +2003,7 @@ export function setTzl(ele, dataIn, yUnit='单位(吨)') {
 	]
 	Object.keys(yData).forEach((key,index) => {
 		seriesArr.push({
-			name: key,	
+			name: key,
 			type: "line",
 			smooth: true,
 			showSymbol: false,
@@ -2290,4 +2290,4 @@ export function setCylht(ele, dataIn) {
 	}
 	cylht = setOptions(ele, option)
 	return cylht
-}
+}

src/services/znfx.js

@@ -119,7 +119,7 @@ export function GetActualData(params) {
 //销售订单信息
 export function GetSalesOrder(params) {
   return request({
-    url: 'http://101.132.114.72:8080/cmnw_trans/fbgk/saleOrderInfoList',
+    url: 'http://101.132.114.72:8080/cmnw_trans//trans/fbgk/saleOrderInfoList',
     method: 'get',
     params: {
       ...params
@@ -130,7 +130,7 @@ export function GetSalesOrder(params) {
 //销售订单总体信息
 export function GetSalesOrderSummary(params) {
   return request({
-    url: 'http://101.132.114.72:8080/cmnw_trans/fbgk/saleOrderSummary',
+    url: 'http://101.132.114.72:8080/cmnw_trans/trans/fbgk/saleOrderSummary',
     method: 'get',
     params: {
       ...params
@@ -141,7 +141,7 @@ export function GetSalesOrderSummary(params) {
 //补贴金额&销售趋势
 export function GetBubsidyAndSaleTrend() {
   return request({
-    url: 'http://101.132.114.72:8080/cmnw_trans/fbgk/subsidyAndSaleTrend',
+    url: 'http://101.132.114.72:8080/cmnw_trans/trans/fbgk/subsidyAndSaleTrend',
     method: 'get',
   })
 }
@@ -155,7 +155,15 @@ export function GetGczList() {
 }
 
 //物联监测设备曲线
-
+export function GetMonitorStat(groupID) {
+  return request({
+    url: '/zhwl/base_monitor_stat',
+    method: 'get',
+    params: {
+      groupID
+    }
+  })
+}
 
 //实验室检测报告
 export function GetSysReport(baseName) { //基地名称

src/views/deck/pages/znfx_sub/ZnfxNzjy.vue

@@ -63,7 +63,7 @@
       <span class="box-title2">销售订单信息</span>
       <div class="cr-b2">
         <div class="crb2-sort">
-          <el-select v-model="sort_xsdd.year" @change="getMonthArr" placeholder="请选择年" class="select-default" popper-class="select-default-popper">
+          <el-select v-model="sort_xsdd.year" @change="getChange" placeholder="请选择年" class="select-default" popper-class="select-default-popper">
             <el-option v-for="item in yearArr" :key="item" :label="item+'年'" :value="item"></el-option>
           </el-select>
           <el-select v-model="sort_xsdd.month" placeholder="请选择月" class="select-default" popper-class="select-default-popper">
@@ -160,8 +160,8 @@ export default {
       monthArr: [],
       data_xsdd: {
         overview: [
-          { title: '购买主体', value: 1634, unit: '个' },
-          { title: '订单数量', value: 2467, unit: '单' }
+          { title: '购买主体', value: '', unit: '个', key: 'saleUserCount' },
+          { title: '订单数量', value: '', unit: '单', key: 'saleOrderCount' }
         ],
         tableData: [
           { shop: 'XXXXXX', purchaser:'张三', goodsName:'甲氰菊酯', count:'3', price:'25', time:'2023-06-06' },
@@ -180,16 +180,16 @@ export default {
       },
       data_xsqs: {
         overview: [
-          { title: '上年补贴总额', value: 143, unit: '万' },
-          { title: '当年已补贴金额', value: 53, unit: '万' }
+          { title: '上年补贴总额', value: 143, unit: '万',key: 'lastYearSubsidyTotal' },
+          { title: '当年已补贴金额', value: 53, unit: '万',key: 'currentYearSubsidyAmount' }
         ],
         chart: [
-          { time: '22-12', sales: 3900, pay: 3000, subsidy: 3350 },
-          { time: '23-01', sales: 2400, pay: 1600, subsidy: 1900 },
-          { time: '23-02', sales: 3100, pay: 2300, subsidy: 2700 },
-          { time: '23-03', sales: 3000, pay: 2100, subsidy: 2500 },
-          { time: '23-04', sales: 2700, pay: 1900, subsidy: 2200 },
-          { time: '23-05', sales: 3900, pay: 3000, subsidy: 3350 },
+          // { saleTime: '22年12月', totalSalePrice: 3900, totalZfPrice: 3000, totalBtPrice: 3350 },
+          // { saleTime: '23-01', totalSalePrice: 2400, totalZfPrice: 1600, totalBtPrice: 1900 },
+          // { saleTime: '23-02', totalSalePrice: 3100, totalZfPrice: 2300, totalBtPrice: 2700 },
+          // { saleTime: '23-03', totalSalePrice: 3000, totalZfPrice: 2100, totalBtPrice: 2500 },
+          // { saleTime: '23-04', totalSalePrice: 2700, totalZfPrice: 1900, totalBtPrice: 2200 },
+          // { saleTime: '23-05', totalSalePrice: 3900, totalZfPrice: 3000, totalBtPrice: 3350 },
         ]
       }
     }
@@ -197,20 +197,13 @@ export default {
   mounted() {
     this.getRecentYears()
     this.sort_xsdd.year = new Date().getFullYear()
-    this.getMonthArr()
+    // this.getMonthArr()
     this.sort_xsdd.month = new Date().getMonth()+1
     setYyqdfx(document.getElementById('chart-clb3'), this.data_yyqd.chart)
     setXsqs(document.getElementById('chart-crb3'), this.data_xsqs.chart)
-    //todo 拿到地址后参数对应上
-    GetSalesOrder(this.sort_xsdd).then(res => {
-      this.data_xsdd.tableData = res.data
-    })
-    GetSalesOrderSummary(this.sort_xsdd).then(res => {
-      this.data_xsdd.overview = res.data
-    })
-    GetBubsidyAndSaleTrend().then(res => {
-      console.log(res.data)
-    })
+    this.getSaleOrder()
+    this.getSaleSummary()
+    this.getSaleTrend()
   },
   methods: {
     getRecentYears() {
@@ -219,14 +212,39 @@ export default {
         this.yearArr.push(thisYear+i)
       }
     },
-    getMonthArr() {
-      this.sort_xsdd.month = ''
-      this.monthArr = []
-      const d = new Date()
-      const maxMonth = d.getFullYear()===this.sort_xsdd.year? d.getMonth()+1: 12
-      for(let i=1; i<=maxMonth; i++) {
-        this.monthArr.push(i)
-      }
+    // getMonthArr() {
+    //   this.sort_xsdd.month = ''
+    //   this.monthArr = []
+    //   const d = new Date()
+    //   const maxMonth = d.getFullYear()===this.sort_xsdd.year? d.getMonth()+1: 12
+    //   for(let i=1; i<=maxMonth; i++) {
+    //     this.monthArr.push(i)
+    //   }
+    // },
+    getChange(){
+      this.getSaleOrder()
+      this.getSaleSummary()
+    },
+    getSaleOrder(){
+      GetSalesOrder(this.sort_xsdd).then(res => {
+        this.data_xsdd.tableData = res.data.list
+      })
+    },
+    getSaleSummary(){
+      GetSalesOrderSummary(this.sort_xsdd).then(res => {
+        this.data_xsdd.overview.forEach(i => {
+          i.value = res.data[i.key]
+        })
+      })
+    },
+    getSaleTrend(){
+      GetBubsidyAndSaleTrend().then(res => {
+        this.data_xsqs.overview.forEach(i => {
+          i.value = res.data[i.key]
+        })
+        this.data_xsqs.chart = res.data.saleTrendVOS
+        setXsqs(document.getElementById('chart-crb3'), this.data_xsqs.chart)
+      })
     }
   },
   watch: {