Browse Source

电用量接口对接

duanxiaoduan 1 year ago
parent
commit
f2005066b7
2 changed files with 10 additions and 10 deletions
  1. 2 2
      .env.development
  2. 8 8
      src/views/report/queryElec/index.vue

+ 2 - 2
.env.development

@@ -6,9 +6,9 @@ ENV = 'development'
 # 线上正式地址
 #  VUE_APP_BASE_API = 'http://eam.modernfarming.cn:8000/'
 #  白少后台本地
-# VUE_APP_BASE_API = 'http://192.168.1.77:8082/'
+VUE_APP_BASE_API = 'http://192.168.1.77:8082/'
 # 线上测试
-VUE_APP_BASE_API = 'http://tmrwatch.cn:8082/'
+# VUE_APP_BASE_API = 'http://tmrwatch.cn:8082/'
 # VUE_APP_BASE_API = 'http://127.0.0.1:8082/'
 
 # VUE_APP_BASE_API = 'http://36.155.144.182:18090/'

+ 8 - 8
src/views/report/queryElec/index.vue

@@ -248,7 +248,7 @@ export default {
     },
     // 各牧场年度用电量对比
     getChart1() {
-      let url = '/authdata/water/nowwater?'
+      let url = '/authdata/electricity/nowelectricity?'
       let startTime = parseTime(this.monthDate[0],'{y}-{m}')
       let endTime = parseTime(this.monthDate[1],'{y}-{m}')
       let radio = ''
@@ -282,7 +282,7 @@ export default {
     },
     // 单头牛电量
     getChart2() {
-      let url = '/authdata/water/singlecow?'
+      let url = '/authdata/electricity/singlecow?'
       let startTime = parseTime(this.monthDate[0],'{y}-{m}')
       let endTime = parseTime(this.monthDate[1],'{y}-{m}')
       let radio = ''
@@ -315,7 +315,7 @@ export default {
 
     // 单头牛电费
     getChart3() {
-      let url = '/authdata/water/waterrate?'
+      let url = '/authdata/electricity/electricityrate?'
       let startTime = parseTime(this.monthDate[0],'{y}-{m}')
       let endTime = parseTime(this.monthDate[1],'{y}-{m}')
       let radio = ''
@@ -343,7 +343,7 @@ export default {
     getChart4() {
       console.log(this.getChart4Parm.parammaps.pastureName,'pastureName')
       this.getChart5Parm.parammaps.deptName = this.deptList[0].name
-      let url = '/authdata/water/perhead?'
+      let url = '/authdata/electricity/perhead?'
       let startTime = parseTime(this.monthDate[0],'{y}-{m}')
       let endTime = parseTime(this.monthDate[1],'{y}-{m}')
       let radio = ''
@@ -391,7 +391,7 @@ export default {
       let lastDay = new Date(year, month, 0).getDate();
       let endTime = parseTime(this.monthDate[1],'{y}-{m}') + '-' + lastDay
       let data = {
-        name:"getdeptSumMonthWater",
+        name:"getdeptSumMonthelectricity",
         parammaps:{
           startTime:startTime,
           endTime:endTime,
@@ -425,7 +425,7 @@ export default {
       let lastDay = new Date(year, month, 0).getDate();
       let endTime = parseTime(this.monthDate[1],'{y}-{m}') + '-' + lastDay
       let data = {
-        name:"getPastureSumMonthWater",
+        name:"getPastureSumMonthelectricity",
         parammaps:{
           startTime:startTime,
           endTime:endTime,
@@ -458,7 +458,7 @@ export default {
       let startTime = this.getChart7Parm.parammaps.date
       let endTime = this.getChart7Parm.parammaps.date
       let data = {
-        name:"getPastureSumDayWater",
+        name:"getPastureSumDayelectricity",
         parammaps:{
           startTime:startTime,
           endTime:endTime,
@@ -486,7 +486,7 @@ export default {
     },
     // 电费完成率
     getChart8() {
-      let url = '/authdata/water/ratecomplete?'
+      let url = '/authdata/electricity/ratecomplete?'
       let startTime = parseTime(this.monthDate[0],'{y}-{m}')
       let endTime = parseTime(this.monthDate[1],'{y}-{m}')
       let radio = ''