更新7-14

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

@@ -916,9 +916,11 @@
             <el-table-column label="修改时间" min-width="100px" align="center" prop="updateTime" />
             <el-table-column label="饲料重量（KG）" min-width="100px" align="center">
               <template slot-scope="{row}">
-                  <span v-if="row.status == 0">{{row.weight}}</span>
-                  <span v-else style="color: red;">{{row.weight}}</span>
-                </template>
+                <span v-if="row.weight !==undefined &&row.weight.indexOf('/') !== -1" style="color: red;">
+                  {{row.weight}}
+                </span>
+                <span v-else>{{row.weight}}</span>
+              </template>
             </el-table-column>
           </el-table>
           <pagination v-show="feedTemp.total>0" :total="feedTemp.total" :page.sync="feedTemp.getdataListParm.offset" :limit.sync="feedTemp.getdataListParm.pagecount" @pagination="getFeedList()" />
@@ -985,27 +987,6 @@
                 <el-button class="successBorder" @click="handleFenceSearch">查询</el-button>
               </div>
               <div class="table">
-                <!-- <u-table
-                  :key="fenceTemp.tab2.tableKey"
-                  v-loading="fenceTemp.tab2.listLoading"
-                  element-loading-text="给我一点时间"
-                  :data="fenceTemp.tab2.list"
-                  border
-                  highlight-current-row
-                  style="width: 100%;"
-                  :row-style="rowStyle"
-                  :cell-style="rowStyle"
-                  class="elTable table-fixed"
-                  :span-method="objectSpanMethod2"
-                >
-                  <u-table-column label="序号" width="50px" align="center" type="index" />
-                  <u-table-column label="修改时间" width="100px" align="center" prop="createdate" />
-                  <u-table-column label="班次" min-width="100px" align="center" prop="times" />
-                  <u-table-column label="车" min-width="100px" align="center" prop="times" />
-                  <u-table-column label="第二车" min-width="100px" align="center" prop="times" />
-                  <u-table-column label="第三车" min-width="100px" align="center" prop="times" />
-                  <u-table-column label="第四车" min-width="100px" align="center" prop="times" />
-                </u-table> -->
                 <u-table
                   :key="fenceTemp.tab2.tableKey"
                   v-loading="fenceTemp.tab2.listLoading"
@@ -4545,7 +4526,7 @@ export default {
       const start = new Date()
       const end = new Date()
       this.recipeNameTemp.getdataListParm.parammaps.inputDatetime[0] = parseTime(start.setTime(start.getTime() - 3600 * 1000 * 24 * 7), '{y}-{m}-{d}')
-      this.recipeNameTemp.getdataListParm.parammaps.inputDatetime[1] = parseTime(end.setTime(end.getTime() - 3600 * 1000 * 24 * 1), '{y}-{m}-{d}')
+      this.recipeNameTemp.getdataListParm.parammaps.inputDatetime[1] = parseTime(end.setTime(end.getTime()), '{y}-{m}-{d}')
       this.getRecipeNameList()
     },
     getRecipeNameList(){
@@ -4555,8 +4536,8 @@ export default {
         this.recipeNameTemp.getdataListParm.parammaps.startTime = ''
         this.recipeNameTemp.getdataListParm.parammaps.stopTime = ''
       } else {
-        this.recipeNameTemp.getdataListParm.parammaps.startTime = this.recipeNameTemp.getdataListParm.parammaps.inputDatetime[0]
-        this.recipeNameTemp.getdataListParm.parammaps.stopTime = this.recipeNameTemp.getdataListParm.parammaps.inputDatetime[1]
+        this.recipeNameTemp.getdataListParm.parammaps.startTime = this.recipeNameTemp.getdataListParm.parammaps.inputDatetime[0] + ' 00:00'
+        this.recipeNameTemp.getdataListParm.parammaps.stopTime = this.recipeNameTemp.getdataListParm.parammaps.inputDatetime[1] + ' 23:59'
       }
       const url = 'authdata/GetArrList'
       const data = {
@@ -4605,7 +4586,7 @@ export default {
       const start = new Date()
       const end = new Date()
       this.feedTemp.getdataListParm.parammaps.inputDatetime[0] = parseTime(start.setTime(start.getTime() - 3600 * 1000 * 24 * 7), '{y}-{m}-{d}')
-      this.feedTemp.getdataListParm.parammaps.inputDatetime[1] = parseTime(end.setTime(end.getTime() - 3600 * 1000 * 24 * 1), '{y}-{m}-{d}')
+      this.feedTemp.getdataListParm.parammaps.inputDatetime[1] = parseTime(end.setTime(end.getTime()), '{y}-{m}-{d}')
       this.getFeedList()
     },
     getFeedList(){
@@ -4615,8 +4596,8 @@ export default {
         this.feedTemp.getdataListParm.parammaps.startTime = ''
         this.feedTemp.getdataListParm.parammaps.stopTime = ''
       } else {
-        this.feedTemp.getdataListParm.parammaps.startTime = this.feedTemp.getdataListParm.parammaps.inputDatetime[0]
-        this.feedTemp.getdataListParm.parammaps.stopTime = this.feedTemp.getdataListParm.parammaps.inputDatetime[1]
+        this.feedTemp.getdataListParm.parammaps.startTime = this.feedTemp.getdataListParm.parammaps.inputDatetime[0] +' 00:00'
+        this.feedTemp.getdataListParm.parammaps.stopTime = this.feedTemp.getdataListParm.parammaps.inputDatetime[1] +' 23:59'
       }
       const url = 'authdata/GetDataByName'
       const data = {
@@ -4656,21 +4637,21 @@ export default {
       this.recipeNameTemp.temp = Object.assign({}, row)
       this.recipeNameTemp.dialogFormVisible = true
       this.textMap.recipeNameTxt = '配方修改记录——配方：' + row.配方名称
-      this.recipeNameTemp.dialogStatus = 'rowRecipeRecordTxt'
+      this.recipeNameTemp.dialogStatus = 'recipeNameTxt'
       this.recipeNameTemp.getdataListParm.parammaps.pastureid = Cookies.get('pastureid')
       this.recipeNameTemp.getdataListParm.parammaps.fitid = row.ftid
       const start = new Date()
       const end = new Date()
       this.recipeNameTemp.getdataListParm.parammaps.inputDatetime = []
       this.recipeNameTemp.getdataListParm.parammaps.inputDatetime[0] = parseTime(start.setTime(start.getTime() - 3600 * 1000 * 24 * 7), '{y}-{m}-{d}')
-      this.recipeNameTemp.getdataListParm.parammaps.inputDatetime[1] = parseTime(end.setTime(end.getTime() - 3600 * 1000 * 24 * 1), '{y}-{m}-{d}')
+      this.recipeNameTemp.getdataListParm.parammaps.inputDatetime[1] = parseTime(end.setTime(end.getTime()), '{y}-{m}-{d}')
       this.getRecipeNameList()
     },
     clickFence3(row) {
       console.log('点击了撒料统计-栏舍',row)
       this.fenceTemp.temp = Object.assign({}, row)
       this.fenceTemp.dialogFormVisible = true
-      this.textMap.fenceTxt = '配方修改记录——饲料：' + row.饲料
+      this.textMap.fenceTxt = '配方修改记录——栏舍：' + row.栏舍
       this.fenceTemp.dialogStatus = 'fenceTxt'
       this.fenceTemp.activeName = 'first'
       this.fenceTemp.tab1.getdataListParm.parammaps.barname = row.栏舍
@@ -4679,7 +4660,7 @@ export default {
       const start = new Date()
       const end = new Date()
       this.fenceTemp.tab1.getdataListParm.parammaps.inputDatetime[0] = parseTime(start.setTime(start.getTime() - 3600 * 1000 * 24 * 7), '{y}-{m}-{d}')
-      this.fenceTemp.tab1.getdataListParm.parammaps.inputDatetime[1] = parseTime(end.setTime(end.getTime() - 3600 * 1000 * 24 * 1), '{y}-{m}-{d}')
+      this.fenceTemp.tab1.getdataListParm.parammaps.inputDatetime[1] = parseTime(end.setTime(end.getTime()), '{y}-{m}-{d}')
       this.getFenceList1()
     },
     getFenceList1(){
@@ -4813,12 +4794,12 @@ export default {
       if(item == 'first'){
         this.fenceTemp.tab1.getdataListParm.parammaps.inputDatetime = []
         this.fenceTemp.tab1.getdataListParm.parammaps.inputDatetime[0] = parseTime(start.setTime(start.getTime() - 3600 * 1000 * 24 * 7), '{y}-{m}-{d}')
-        this.fenceTemp.tab1.getdataListParm.parammaps.inputDatetime[1] = parseTime(end.setTime(end.getTime() - 3600 * 1000 * 24 * 1), '{y}-{m}-{d}')
+        this.fenceTemp.tab1.getdataListParm.parammaps.inputDatetime[1] = parseTime(end.setTime(end.getTime()), '{y}-{m}-{d}')
         this.getFenceList1()
       }else{
         this.fenceTemp.tab2.getdataListParm.parammaps.inputDatetime = []
         this.fenceTemp.tab2.getdataListParm.parammaps.inputDatetime[0] = parseTime(start.setTime(start.getTime() - 3600 * 1000 * 24 * 7), '{y}-{m}-{d}')
-        this.fenceTemp.tab2.getdataListParm.parammaps.inputDatetime[1] = parseTime(end.setTime(end.getTime() - 3600 * 1000 * 24 * 1), '{y}-{m}-{d}')
+        this.fenceTemp.tab2.getdataListParm.parammaps.inputDatetime[1] = parseTime(end.setTime(end.getTime()), '{y}-{m}-{d}')
         this.getFenceList2()
       }
     },