|
|
@@ -2,8 +2,7 @@
|
|
|
<div class="app-container1">
|
|
|
<el-tabs v-model="activeName" @tab-click="handleTabClick">
|
|
|
<el-tab-pane label="汇总统计" name="first">
|
|
|
- <!-- <div ref="scrollContainer" @scroll="handleScroll" :style="{ height: myHeight1+'px', overflowY: 'auto', overflowX: 'hidden' }"> -->
|
|
|
- <!-- <div> -->
|
|
|
+ <div ref="scrollContainer" @scroll="handleScroll" :style="{ height: myHeight1+'px', overflowY: 'auto', overflowX: 'hidden' }">
|
|
|
<div class="search">
|
|
|
<el-date-picker v-model="tab.table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" :picker-options="pickerOptions" />
|
|
|
<el-button class="el-icon-arrow-left elIconArrowLeft" :disabled="Beforedisabled" @click="handleBefore" />
|
|
|
@@ -592,11 +591,11 @@
|
|
|
<h4>栏舍撒料时间统计</h4>
|
|
|
<div v-if="tab.chart7.isChart" class="button">
|
|
|
<div class="chartButton">
|
|
|
- <!-- 君盛 -->
|
|
|
+ <!-- 君盛-->
|
|
|
<!-- <el-select v-model="tab.chart7.getdataListParm.parammaps.statisticsList" multiple placeholder="请选择" collapse-tags @change="changeStatisticChart7">
|
|
|
<el-option v-for="item in tab.chart7.statisticsList" :key="item.name" :label="item.name" :value="item.name" />
|
|
|
</el-select> -->
|
|
|
- <!-- 其他牧场 -->
|
|
|
+ <!-- 其他牧场 -->
|
|
|
<my-select ref="tenantselect" :model="tab.chart7.getdataListParm.parammaps.statisticsList" :option="tab.chart7.statisticsList" :value="'name'" :label="'name'" style="width: 150px;margin-right: 5px;float: left;" placeholder="请选择统计参数" @searchSelect="changeStatisticChart7" />
|
|
|
<el-radio-group v-model="tab.chart7.getdataListParm.parammaps.specificDate" class="specificDate" size="mini" style="display: inline-block;" @change="changeChartSpecificDate('chart7')">
|
|
|
<el-radio-button label="1" border>日</el-radio-button>
|
|
|
@@ -652,7 +651,7 @@
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
</div>
|
|
|
- <!-- </div>
|
|
|
+ </div>
|
|
|
</el-tab-pane>
|
|
|
<el-tab-pane label="混料统计" name="second">
|
|
|
<div class="search" ref="myHeightSecond">
|
|
|
@@ -1881,7 +1880,6 @@ export default {
|
|
|
// this.getChart4()
|
|
|
// this.getChart5()
|
|
|
// this.getChart6()
|
|
|
- // this.getChart7()
|
|
|
},
|
|
|
mounted() {},
|
|
|
methods: {
|
|
|
@@ -4249,7 +4247,7 @@ export default {
|
|
|
// this.tab.chart7.getdataListParm.parammaps.statisticsList.push(response.data.list.data1[i])
|
|
|
// }
|
|
|
// 其他牧场
|
|
|
- // this.tab.chart7.getdataListParm.parammaps.statisticsList.push(response.data.list.data1[i])
|
|
|
+ this.tab.chart7.getdataListParm.parammaps.statisticsList.push(response.data.list.data1[i])
|
|
|
var obj = {}
|
|
|
obj.id = i
|
|
|
obj.name = response.data.list.data1[i]
|
