更新4-27

src/views/dashboard/pasture/index.vue

@@ -1417,7 +1417,7 @@ export default {
             sheetName: '成本统计'
           }
         ]
-        json2excel(excelDatasTabChart2, '泌乳牛采食量', true, 'xlsx')
+        json2excel(excelDatasTabChart2, '成本统计', true, 'xlsx')
       } else if (item == 'row4chartLine2') {
         console.log('混料实际重量统计')
         var excelDatasTabChart4 = [

src/views/formulationPlan/materialIssuancePlan/index.vue

@@ -691,6 +691,9 @@ export default {
         this.create.temp.tclassname = this.TMRNumberList.find(obj => obj.id === item).tclassname
         this.create.temp.mytmrid = this.create.temp.tmrid
         this.create.temp.mytmrname = this.create.temp.tmrname
+        if (this.isDispaly || this.create.dialogStatus == 'update') {
+          this.getClearList()
+        }
         console.log('TMR编号item==>', item)
       }
         console.log('tmrname==>', this.create.temp)

src/views/login/index.vue

@@ -406,7 +406,7 @@ $bg: #ccc;
 $light_gray: #ccc;
 $cursor: #000;
 .login-container{
-  position: relative;height: 100%;width: 100%;background:  url("../../assets/images/nlogin-bg.png") no-repeat;
+  position: relative;height: 100%;width: 100%;background:  url("../../assets/images/nlogin-bg1.jpg") no-repeat;
     .new-login{
       width: 50%;height: 42%;position: absolute;left: 0;right: 0;bottom: 0;top: 0;margin: auto;
       .new-login-l{

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

@@ -603,29 +603,29 @@
         </div>
       </el-tab-pane>
       <el-tab-pane label="混料统计" name="second">
-        <div class="search">
-          <el-date-picker v-model="tab2.table.getdataListParm.parammaps.inputDatetime2" :clearable="false" style="float: left;width: 140px;" type="date" placeholder="选择日期"> </el-date-picker>
+        <div class="search" ref="myHeightSecond">
+          <el-date-picker v-model="tab2.table.getdataListParm.parammaps.inputDatetime2" :clearable="false" style="width: 140px;margin-top: 5px;" type="date" placeholder="选择日期"> </el-date-picker>
           <!-- <el-date-picker v-model="tab2.table.getdataListParm.parammaps.inputDatetime" :clearable="false" style="width: 230px;float: left;" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions" /> -->
-          <el-button class="el-icon-arrow-left elIconArrowLeft" style="float: left;" :disabled="Beforedisabled2" @click="handleBefore2" />
-          <el-button class="el-icon-arrow-right elIconArrowRight" style="float: left;" :disabled="Nextdisabled2" @click="handleNext2" />
+          <el-button class="el-icon-arrow-left elIconArrowLeft" style="display:inline-block;margin-top: 5px;" :disabled="Beforedisabled2" @click="handleBefore2" />
+          <el-button class="el-icon-arrow-right elIconArrowRight" style="display:inline-block;margin-top: 5px;" :disabled="Nextdisabled2" @click="handleNext2" />
           <el-select clearable filterable v-model="tab2.table.getdataListParm.parammaps.tmrtname" placeholder="TMR设备" class="filter-item" style="width: 120px;">
             <el-option v-for="(item,index) in tab2.TMRNameList" :key="index" :label="item.tmrloadname" :value="item.tmrloadname" />
           </el-select>
           <!-- <el-input v-model="tab2.table.getdataListParm.parammaps.tmrtname" style="width: 110px;" placeholder="TMR名称" class="filter-item" clearable /> -->
-          <el-input v-model="tab2.table.getdataListParm.parammaps.projname" style="width: 110px;" placeholder="车次" class="filter-item" clearable />
-          <el-select v-model="tab2.table.getdataListParm.parammaps.times" style="width: 110px;" filterable placeholder="班次" class="filter-item" clearable>
+          <el-input v-model="tab2.table.getdataListParm.parammaps.projname" style="margin-top: 5px;width: 110px;" placeholder="车次" class="filter-item" clearable />
+          <el-select v-model="tab2.table.getdataListParm.parammaps.times" style="margin-top: 5px;width: 110px;" filterable placeholder="班次" class="filter-item" clearable>
             <el-option v-for="item in tab2.frequencyList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
-          <el-input v-model="tab2.table.getdataListParm.parammaps.templetname" style="width: 110px;" placeholder="配方名称" class="filter-item" clearable />
-          <el-select v-model="tab2.table.getdataListParm.parammaps.buttontype" style="width: 130px;" filterable placeholder="跳转方式" class="filter-item" clearable>
+          <el-input v-model="tab2.table.getdataListParm.parammaps.templetname" style="margin-top: 5px;width: 110px;" placeholder="配方名称" class="filter-item" clearable />
+          <el-select v-model="tab2.table.getdataListParm.parammaps.buttontype" style="margin-top: 5px;width: 130px;" filterable placeholder="跳转方式" class="filter-item" clearable>
             <el-option v-for="item in tab2.jumpModeList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
-          <el-select v-model="tab2.table.getdataListParm.parammaps.isuse" style="width: 130px;" filterable placeholder="上传状态" class="filter-item" clearable>
+          <el-select v-model="tab2.table.getdataListParm.parammaps.isuse" style="margin-top: 5px;width: 130px;" filterable placeholder="上传状态" class="filter-item" clearable>
             <el-option v-for="item in tab2.isuseList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
-          <el-button class="successBorder" @click="handleSearch2">查询</el-button>
-          <el-button class="successBorder" @click="handleRefresh2">重置</el-button>
-          <el-button style="float: right;margin-right: 10px;margin-bottom:10px;" class="export" icon="el-icon-upload2" @click="handleExport2">导出</el-button>
+          <el-button class="successBorder" style="margin-top: 5px;" @click="handleSearch2">查询</el-button>
+          <el-button class="successBorder" style="margin-top: 5px;" @click="handleRefresh2">重置</el-button>
+          <el-button style="float: right;margin-right: 10px;margin-bottom:10px;margin-top: 5px;" class="export" icon="el-icon-upload2" @click="handleExport2">导出</el-button>
         </div>
         <div class="table">
           <u-table
@@ -641,7 +641,7 @@
             :row-style="rowStyle"
             :cell-style="cellStyle"
             class="elTable table-fixed"
-            :max-height="myHeight2"
+            :max-height="myHeightSecond"
           >
             <u-table-column sortable label="日期" min-width="70px" align="center" prop="日期" />
             <u-table-column sortable label="TMR名称" min-width="70px" align="center" prop="TMR名称" />
@@ -666,30 +666,30 @@
         </div>
       </el-tab-pane>
       <el-tab-pane label="撒料统计" name="third">
-        <div class="search">
-          <el-date-picker v-model="tab3.table.getdataListParm.parammaps.inputDatetime2" :clearable="false" style="float: left;width:140px;" type="date" placeholder="选择日期"> </el-date-picker>
+        <div class="search" ref="myHeightThird">
+          <el-date-picker v-model="tab3.table.getdataListParm.parammaps.inputDatetime2" :clearable="false" style="margin-top: 5px;width:140px;" type="date" placeholder="选择日期"> </el-date-picker>
           <!-- <el-date-picker v-model="tab3.table.getdataListParm.parammaps.inputDatetime" :clearable="false" style="width: 230px;float: left;" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions" /> -->
-          <el-button class="el-icon-arrow-left elIconArrowLeft" style="float: left;" :disabled="Beforedisabled3" @click="handleBefore3" />
-          <el-button class="el-icon-arrow-right elIconArrowRight" style="float: left;" :disabled="Nextdisabled3" @click="handleNext3" />
-          <el-select v-model="tab3.table.getdataListParm.parammaps.tmrtname" placeholder="TMR设备" class="filter-item" style="width: 120px;" clearable filterable>
+          <el-button class="el-icon-arrow-left elIconArrowLeft" style="dispaly:inline-block;margin-top: 5px;" :disabled="Beforedisabled3" @click="handleBefore3" />
+          <el-button class="el-icon-arrow-right elIconArrowRight" style="dispaly:inline-block;margin-top: 5px;" :disabled="Nextdisabled3" @click="handleNext3" />
+          <el-select v-model="tab3.table.getdataListParm.parammaps.tmrtname" placeholder="TMR设备" class="filter-item" style="margin-top: 5px;width: 120px;" clearable filterable>
             <el-option v-for="(item,index) in tab3.TMRNameList" :key="index" :label="item.tmrloadname" :value="item.tmrloadname" />
           </el-select>
           <!-- <el-input v-model="tab3.table.getdataListParm.parammaps.tmrtname" style="width: 110px;" placeholder="TMR名称" class="filter-item" clearable /> -->
-          <el-input v-model="tab3.table.getdataListParm.parammaps.projname" style="width: 110px;" placeholder="车次" class="filter-item" clearable />
-          <el-select v-model="tab3.table.getdataListParm.parammaps.times" style="width: 100px;" filterable placeholder="班次" class="filter-item" clearable>
+          <el-input v-model="tab3.table.getdataListParm.parammaps.projname" style="margin-top: 5px;width: 110px;" placeholder="车次" class="filter-item" clearable />
+          <el-select v-model="tab3.table.getdataListParm.parammaps.times" style="margin-top: 5px;width: 100px;" filterable placeholder="班次" class="filter-item" clearable>
             <el-option v-for="item in tab3.frequencyList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
-          <el-input v-model="tab3.table.getdataListParm.parammaps.templetname" style="width: 110px;" placeholder="配方名称" class="filter-item" clearable />
-          <el-input v-model="tab3.table.getdataListParm.parammaps.fname" style="width: 110px;" placeholder="栏舍名称" class="filter-item" clearable />
-          <el-select v-model="tab3.table.getdataListParm.parammaps.buttontype" style="width: 110px;" filterable placeholder="跳转方式" class="filter-item" clearable>
+          <el-input v-model="tab3.table.getdataListParm.parammaps.templetname" style="margin-top: 5px;width: 110px;" placeholder="配方名称" class="filter-item" clearable />
+          <el-input v-model="tab3.table.getdataListParm.parammaps.fname" style="margin-top: 5px;width: 110px;" placeholder="栏舍名称" class="filter-item" clearable />
+          <el-select v-model="tab3.table.getdataListParm.parammaps.buttontype" style="margin-top: 5px;width: 110px;" filterable placeholder="跳转方式" class="filter-item" clearable>
             <el-option v-for="item in tab3.jumpModeList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
-          <el-select v-model="tab3.table.getdataListParm.parammaps.isuse" style="width: 130px;" filterable placeholder="上传状态" class="filter-item" clearable>
+          <el-select v-model="tab3.table.getdataListParm.parammaps.isuse" style="margin-top: 5px;width: 130px;" filterable placeholder="上传状态" class="filter-item" clearable>
             <el-option v-for="item in tab3.isuseList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
-          <el-button class="successBorder" @click="handleSearch3">查询</el-button>
-          <el-button class="successBorder" @click="handleRefresh3">重置</el-button>
-          <el-button style="float: right;margin-right: 10px;margin-bottom:10px;" class="export" icon="el-icon-upload2" @click="handleExport3">导出</el-button>
+          <el-button class="successBorder" style="margin-top: 5px;" @click="handleSearch3">查询</el-button>
+          <el-button class="successBorder" style="margin-top: 5px;" @click="handleRefresh3">重置</el-button>
+          <el-button style="float: right;margin-right: 10px;margin-bottom:10px;margin-top: 5px;" class="export" icon="el-icon-upload2" @click="handleExport3">导出</el-button>
         </div>
         <div class="table">
           <u-table
@@ -705,7 +705,7 @@
             :row-style="rowStyle"
             :cell-style="cellStyle"
             class="elTable table-fixed"
-            :max-height="myHeight2"
+            :max-height="myHeightThird"
           >
             <u-table-column sortable label="日期" min-width="70px" align="center" prop="日期" />
             <u-table-column sortable label="TMR名称" min-width="70px" align="center" prop="TMR名称" />
@@ -1265,11 +1265,13 @@ export default {
         exportList: '导出',
       },
       isokDisable:false,
-      myHeight2: document.documentElement.clientHeight - 85 - 150
+      // search
+      myHeight2: document.documentElement.clientHeight - 85 - 150,
+      myHeightSecond: '',
+      myHeightThird:''
     }
   },
   created() {
-    console.log(this.isShowDialog, 'this.isShowDialog')
     this.getTimeFn()
     this.getAllYear()
     this.getIsDisplay()
@@ -2111,6 +2113,12 @@ export default {
         this.getChart6()
         this.getChart7()
       } else if (this.activeName == 'second') {
+        setTimeout(()=> {
+          console.log(this.$refs.myHeightSecond.offsetHeight,'myHeightSecond')
+          this.myHeightSecond = document.documentElement.clientHeight - 40 - this.$refs.myHeightSecond.offsetHeight - 150
+        }, 100);
+        // document.documentElement.clientHeight - 85 - 150
+        // this.myHeight3 = document.documentElement.clientHeight - 85 - 150
         // const start2 = new Date()
         // const end2 = new Date()
         // start2.setTime(start2.getTime() - 3600 * 1000 * 24 * 1)
@@ -2129,6 +2137,10 @@ export default {
         this.getTab2List()
         this.getTMRNameList2()
       } else if (this.activeName == 'third') {
+        setTimeout(()=> {
+          console.log(this.$refs.myHeightThird.offsetHeight,'myHeightThird')
+          this.myHeightThird = document.documentElement.clientHeight - 40 - this.$refs.myHeightThird.offsetHeight - 150
+        }, 100);
         // const start3 = new Date()
         // const end3 = new Date()
         // start3.setTime(start3.getTime() - 3600 * 1000 * 24 * 1)