|
@@ -201,13 +201,37 @@
|
|
|
<el-tab-pane label="撒料准确率" name="third" />
|
|
|
<el-tab-pane label="撒料正确率" name="fourth" />
|
|
|
</el-tabs>
|
|
|
- <div class="search">
|
|
|
- <el-input v-model="accuracy.seeRanking.top_rand_start" placeholder="准确率" style="width: 180px;" class="filter-item"
|
|
|
+ <div class="search" v-if="accuracy.seeRanking.activeName == 'first'">
|
|
|
+ <el-input v-model="accuracy.seeRanking.top_rand_start" placeholder="混料准确率" style="width: 180px;" class="filter-item"
|
|
|
type="number" clearable />
|
|
|
<span style="margin-right: 5px;">-</span>
|
|
|
- <el-input v-model="accuracy.seeRanking.top_rand_end" placeholder="准确率" style="width: 180px;" class="filter-item"
|
|
|
+ <el-input v-model="accuracy.seeRanking.top_rand_end" placeholder="混料准确率" style="width: 180px;" class="filter-item"
|
|
|
type="number" clearable />
|
|
|
<el-button class="successBorder" @click="handleSearch">查询</el-button>
|
|
|
+ </div>
|
|
|
+ <div class="search" v-if="accuracy.seeRanking.activeName == 'second'">
|
|
|
+ <el-input v-model="accuracy.seeRanking.top_rand_start" placeholder="混料正确率" style="width: 180px;" class="filter-item"
|
|
|
+ type="number" clearable />
|
|
|
+ <span style="margin-right: 5px;">-</span>
|
|
|
+ <el-input v-model="accuracy.seeRanking.top_rand_end" placeholder="混料正确率" style="width: 180px;" class="filter-item"
|
|
|
+ type="number" clearable />
|
|
|
+ <el-button class="successBorder" @click="handleSearch">查询</el-button>
|
|
|
+ </div>
|
|
|
+ <div class="search" v-if="accuracy.seeRanking.activeName == 'third'">
|
|
|
+ <el-input v-model="accuracy.seeRanking.top_rand_start" placeholder="撒料准确率" style="width: 180px;" class="filter-item"
|
|
|
+ type="number" clearable />
|
|
|
+ <span style="margin-right: 5px;">-</span>
|
|
|
+ <el-input v-model="accuracy.seeRanking.top_rand_end" placeholder="撒料准确率" style="width: 180px;" class="filter-item"
|
|
|
+ type="number" clearable />
|
|
|
+ <el-button class="successBorder" @click="handleSearch">查询</el-button>
|
|
|
+ </div>
|
|
|
+ <div class="search" v-if="accuracy.seeRanking.activeName == 'fourth'">
|
|
|
+ <el-input v-model="accuracy.seeRanking.top_rand_start" placeholder="撒料正确率" style="width: 180px;" class="filter-item"
|
|
|
+ type="number" clearable />
|
|
|
+ <span style="margin-right: 5px;">-</span>
|
|
|
+ <el-input v-model="accuracy.seeRanking.top_rand_end" placeholder="撒料正确率" style="width: 180px;" class="filter-item"
|
|
|
+ type="number" clearable />
|
|
|
+ <el-button class="successBorder" @click="handleSearch">查询</el-button>
|
|
|
</div>
|
|
|
<el-table :key="accuracy.seeRanking.tableKey" v-loading="accuracy.seeRanking.listLoading"
|
|
|
element-loading-text="给我一点时间" :data="accuracy.seeRanking.list" border fit highlight-current-row
|
|
@@ -215,7 +239,10 @@
|
|
|
<el-table-column type="selection" align="center" width="50" />
|
|
|
<el-table-column label="排名" min-width="130px" align="center" type="index"/>
|
|
|
<el-table-column label="牧场名称" min-width="130px" align="center" prop="pasture_name" />
|
|
|
- <el-table-column label="准确率" min-width="130px" align="center" prop="ratio" />
|
|
|
+ <el-table-column v-if="accuracy.seeRanking.activeName == 'first'" label="混料准确率" min-width="130px" align="center" prop="ratio" />
|
|
|
+ <el-table-column v-else-if="accuracy.seeRanking.activeName == 'second'" label="混料正确率" min-width="130px" align="center" prop="ratio" />
|
|
|
+ <el-table-column v-else-if="accuracy.seeRanking.activeName == 'third'" label="撒料准确率" min-width="130px" align="center" prop="ratio" />
|
|
|
+ <el-table-column v-else label="撒料正确率" min-width="130px" align="center" prop="ratio" />
|
|
|
</el-table>
|
|
|
</div>
|
|
|
<div slot="footer" class="dialog-footer" style="right:30px;position:absolute;bottom: 40px;">
|
|
@@ -577,9 +604,11 @@
|
|
|
this.accuracy.dialogFormVisible = true
|
|
|
this.getSeeRankingList()
|
|
|
},
|
|
|
- getSeeRankingList(item) {
|
|
|
+ getSeeRankingList(item) {
|
|
|
+ console.log(this.pastureList,'pastureList')
|
|
|
+ console.log(this.accuracy.more.checkedPasture,'checkedPasture')
|
|
|
let url = '/api/v1/ops/dashboard/top_pasture'
|
|
|
- let pasture_ids = []
|
|
|
+ let pasture_ids = []
|
|
|
this.pastureList.forEach((item) => {
|
|
|
pasture_ids.push(item.id)
|
|
|
})
|
|
@@ -846,7 +875,7 @@
|
|
|
// serie.push(item);
|
|
|
// }
|
|
|
// console.log(serie)
|
|
|
- // return serie;
|
|
|
+ // return serie;
|
|
|
// }()
|
|
|
};
|
|
|
this.accuracy.chart1.chartLine.setOption(option)
|