1.饲喂计划剩料今日剩料量改成昨日；2.过程分析-加时间筛选

.env.development

@@ -6,8 +6,8 @@ ENV = 'development'
 # VUE_APP_BASE_API = 'http://192.168.1.70:8082/'
 # VUE_APP_BASE_API = 'http://kpttest.kptyun.com/'
 # 白少后台本地
-# VUE_APP_BASE_API = 'http://192.168.1.77:8081/'
-VUE_APP_BASE_API = 'http://192.168.1.93/'
+VUE_APP_BASE_API = 'http://192.168.1.77:8081/'
+# VUE_APP_BASE_API = 'http://192.168.1.93/'
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
 # to control whether the babel-plugin-dynamic-import-node plugin is enabled.
 # It only does one thing by converting all import() to require().

src/utils/request.js

@@ -14,9 +14,9 @@ if (DoMainString) {
 var reg =  /(25[0-5]|2[0-4]\d|[0-1]\d{2}|[1-9]?\d)\.(25[0-5]|2[0-4]\d|[0-1]\d{2}|[1-9]?\d)\.(25[0-5]|2[0-4]\d|[0-1]\d{2}|[1-9]?\d)\.(25[0-5]|2[0-4]\d|[0-1]\d{2}|[1-9]?\d)/;
 var browserUrl = window.location.hostname
 console.log("========url===",reg.test(browserUrl))
-if (reg.test(browserUrl)){
-  URL = window.location.protocol +"//"+ browserUrl + ":8082/"
-}
+// if (reg.test(browserUrl)){
+//   URL = window.location.protocol +"//"+ browserUrl + ":8082/"
+// }
 
 Cookies.set('url',URL)
 console.log(process.env.VUE_APP_BASE_API,'===========URL1111')

src/views/statisticalAnalysis/feedingEfficiency/pasture/index.vue

@@ -48,7 +48,7 @@
             <el-table-column sortable label="撒料量（kg）" min-width="60px" align="center" prop="撒料量" />
             <el-table-column sortable label="平均混料时间" min-width="70px" align="center" prop="混料时间" />
             <el-table-column sortable label="转投剩料量（kg）" min-width="70px" align="center" prop="转投剩料量" />
-            <el-table-column sortable label="今日剩料量（kg）" min-width="70px" align="center" prop="今日剩料量" />
+            <el-table-column sortable label="昨日剩料量（kg）" min-width="70px" align="center" prop="今日剩料量" />
             <el-table-column sortable label="剩料率（%）" min-width="60px" align="center" prop="剩料率" />
             <el-table-column sortable label="TMR干物质（%）" min-width="65px" align="center" prop="TMR干物质" />
             <el-table-column sortable label="配方干物质采食量（kg/头）" min-width="80px" align="center" prop="配方干物质采食量" />

src/views/statisticalAnalysis/processAnalysis/pasture/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="search">
-      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" :picker-options="pickerOptions" @change="change_date"/>
+      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 450px;" :picker-options="pickerOptions" @change="change_date"/>
       <el-button class="el-icon-arrow-left elIconArrowLeft" :disabled="Beforedisabled" @click="handleBefore" />
       <el-button class="el-icon-arrow-right elIconArrowRight" :disabled="Nextdisabled" @click="handleNext" />
       <el-select v-model="table.getdataListParm.parammaps.lpplantype" placeholder="计划类型" class="filter-item" style="width: 120px;" clearable>
@@ -583,8 +583,8 @@ export default {
           returntype: 'Map',
           parammaps: {
             pastureid: Cookies.get('pastureid'),
-            startTime: parseTime(new Date(), '{y}-{m}-{d}'),
-            stopTime: parseTime(new Date(), '{y}-{m}-{d}'),
+            startTime: parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}'),
+            stopTime: parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}'),
             inputDatetime: [new Date(), new Date()],
             iscompleted: '',
             tmrtname: '',
@@ -699,8 +699,8 @@ export default {
     },
 
     getDownList() {
-      this.downTMR.parammaps.startdate = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
-      this.downTMR.parammaps.enddate = parseTime(this.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
+      this.downTMR.parammaps.startdate = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d} {h}:{i}:{s}')
+      this.downTMR.parammaps.enddate = parseTime(this.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d} {h}:{i}:{s}')
       GetDataByName(this.downTMR).then(response => {
         console.log(response.data.list)
          this.TMRList = response.data.list
@@ -875,8 +875,8 @@ export default {
     form_search() {
       console.log('点击了查询')
       if (this.table.getdataListParm.parammaps.inputDatetime !== '' && this.table.getdataListParm.parammaps.inputDatetime !== null) {
-        this.table.getdataListParm.parammaps.startTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
-        this.table.getdataListParm.parammaps.stopTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
+        this.table.getdataListParm.parammaps.startTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d} {h}:{i}:{s}')
+        this.table.getdataListParm.parammaps.stopTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d} {h}:{i}:{s}')
       } else {
         this.table.getdataListParm.parammaps.inputDatetime = ''
         this.table.getdataListParm.parammaps.startTime = ''
@@ -968,8 +968,8 @@ export default {
       this.table.getdataListParm.parammaps.tmrtname = ''
       this.table.getdataListParm.parammaps.iscompleted = ''
       this.table.getdataListParm.parammaps.lpplantype = ''
-      this.table.getdataListParm.parammaps.startTime = parseTime(new Date(), '{y}-{m}-{d}')
-      this.table.getdataListParm.parammaps.stopTime = parseTime(new Date(), '{y}-{m}-{d}')
+      this.table.getdataListParm.parammaps.startTime = parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}')
+      this.table.getdataListParm.parammaps.stopTime = parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}')
       this.table.getdataListParm.parammaps.inputDatetime = [new Date(), new Date()]
       this.table.getdataListParm.offset = 1
       this.getList()
@@ -989,8 +989,8 @@ export default {
         this.table.getdataListParm.parammaps.inputDatetime.push(start, stop)
         this.$forceUpdate()
       }
-      this.table.getdataListParm.parammaps.startTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
-      this.table.getdataListParm.parammaps.stopTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
+      this.table.getdataListParm.parammaps.startTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d} {h}:{i}:{s}')
+      this.table.getdataListParm.parammaps.stopTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d} {h}:{i}:{s}')
       this.getDownList()
       this.getList()
     },
@@ -1012,8 +1012,8 @@ export default {
         this.table.getdataListParm.parammaps.inputDatetime.push(start2, stop2)
         this.$forceUpdate()
       }
-      this.table.getdataListParm.parammaps.startTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
-      this.table.getdataListParm.parammaps.stopTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
+      this.table.getdataListParm.parammaps.startTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d} {h}:{i}:{s}')
+      this.table.getdataListParm.parammaps.stopTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d} {h}:{i}:{s}')
       this.getDownList()
       this.getList()
     },