|
|
@@ -2,13 +2,18 @@
|
|
|
<div class="app-container">
|
|
|
<!-- <h1>牧场</h1> -->
|
|
|
<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" />
|
|
|
- <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-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-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>
|
|
|
<el-option v-for="item in planTypeList" :key="item.value" :label="item.lable" :value="item.value" />
|
|
|
</el-select>
|
|
|
- <el-input v-model="table.getdataListParm.parammaps.tmrtname" placeholder="TMR名称" style="width: 180px;" class="filter-item" clearable />
|
|
|
+ <el-select v-model="table.getdataListParm.parammaps.tmrtname" placeholder="TMR名称" class="filter-item" style="width: 220px;" clearable multiple>
|
|
|
+ <el-option v-for="item in TMRList" :key="item.tmrtname" :label="item.tmrtname" :value="item.tmrtname" />
|
|
|
+ </el-select>
|
|
|
+
|
|
|
+
|
|
|
+ <!-- <el-input v-model="table.getdataListParm.parammaps.tmrtname" placeholder="TMR名称" style="width: 180px;" class="filter-item" clearable /> -->
|
|
|
<el-select v-model="table.getdataListParm.parammaps.iscompleted" placeholder="工作状态" class="filter-item" style="width: 120px;" clearable>
|
|
|
<el-option v-for="item in workingConditionList" :key="item.id" :label="item.name" :value="item.id" />
|
|
|
</el-select>
|
|
|
@@ -40,34 +45,34 @@
|
|
|
<el-table-column sortable label="TMR名称" min-width="80px" align="center" prop="tmrtname" />
|
|
|
</el-table>
|
|
|
</div>
|
|
|
- <span v-if="table.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ table.total }}条</span>
|
|
|
+ <span v-if="table.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ table.total }}条</span>
|
|
|
</el-col>
|
|
|
<!-- 预混计划 -->
|
|
|
- <el-col v-if="isPremixedPlan" :span="16">
|
|
|
- <div class="title">
|
|
|
- <b>过程详情</b>
|
|
|
- <span> ({{ title }})</span>
|
|
|
+ <el-col v-if="isPremixedPlan" :span="16">
|
|
|
+ <div class="title">
|
|
|
+ <b>过程详情</b>
|
|
|
+ <span> ({{ title }})</span>
|
|
|
</div>
|
|
|
- <div class="detail">
|
|
|
- <div v-if="table2.list.length !== 0">
|
|
|
- <b>{{ table2.list[0].proesstime }}</b>
|
|
|
- <span>过程时间</span>
|
|
|
- </div>
|
|
|
- <div v-if="table2.list.length !== 0">
|
|
|
- <b>{{ table2.list[0].proesstime }}</b>
|
|
|
- <span>混料时间</span>
|
|
|
- </div>
|
|
|
- <div v-if="table2.list.length !== 0">
|
|
|
- <b>{{ table2.list[0].iscompleted }}</b>
|
|
|
- <span>工作状态</span>
|
|
|
- </div>
|
|
|
- <div v-if="table2.list.length !== 0">
|
|
|
- <b>{{ table2.list[0].Hdif }}</b>
|
|
|
- <span>混料误差值</span>
|
|
|
- </div>
|
|
|
- <div v-if="table2.list.length !== 0">
|
|
|
- <b>{{ table2.list[0].HdifRate }}</b>
|
|
|
- <span>混料准确率</span>
|
|
|
+ <div class="detail">
|
|
|
+ <div v-if="table2.list.length !== 0">
|
|
|
+ <b>{{ table2.list[0].proesstime }}</b>
|
|
|
+ <span>过程时间</span>
|
|
|
+ </div>
|
|
|
+ <div v-if="table2.list.length !== 0">
|
|
|
+ <b>{{ table2.list[0].proesstime }}</b>
|
|
|
+ <span>混料时间</span>
|
|
|
+ </div>
|
|
|
+ <div v-if="table2.list.length !== 0">
|
|
|
+ <b>{{ table2.list[0].iscompleted }}</b>
|
|
|
+ <span>工作状态</span>
|
|
|
+ </div>
|
|
|
+ <div v-if="table2.list.length !== 0">
|
|
|
+ <b>{{ table2.list[0].Hdif }}</b>
|
|
|
+ <span>混料误差值</span>
|
|
|
+ </div>
|
|
|
+ <div v-if="table2.list.length !== 0">
|
|
|
+ <b>{{ table2.list[0].HdifRate }}</b>
|
|
|
+ <span>混料准确率</span>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="Mixture">
|
|
|
@@ -101,38 +106,38 @@
|
|
|
</el-col>
|
|
|
<!-- 撒料计划 -->
|
|
|
<el-col v-if="isSpreadingPlan" :span="16">
|
|
|
- <div class="title">
|
|
|
- <b>过程详情</b>
|
|
|
- <span> ({{ title }})</span>
|
|
|
+ <div class="title">
|
|
|
+ <b>过程详情</b>
|
|
|
+ <span> ({{ title }})</span>
|
|
|
</div>
|
|
|
- <div class="detail">
|
|
|
- <div v-if="table2.list.length !== 0">
|
|
|
- <b>{{ table2.list[0].proesstime }}</b>
|
|
|
- <span>过程时间</span>
|
|
|
- </div>
|
|
|
- <div v-if="table2.list.length !== 0">
|
|
|
- <b>{{ table2.list[0].proesstime }}</b>
|
|
|
- <span>混料时间</span>
|
|
|
- </div>
|
|
|
- <div v-if="table2.list.length !== 0">
|
|
|
- <b>{{ table2.list[0].iscompleted }}</b>
|
|
|
- <span>工作状态</span>
|
|
|
- </div>
|
|
|
- <div v-if="table2.list.length !== 0">
|
|
|
- <b>{{ table2.list[0].Hdif }}kg</b>
|
|
|
- <span>混料误差值</span>
|
|
|
- </div>
|
|
|
- <div v-if="table2.list.length !== 0">
|
|
|
- <b>{{ table2.list[0].HdifRate }}</b>
|
|
|
- <span>混料准确率</span>
|
|
|
- </div>
|
|
|
- <div v-if="table2.list.length !== 0">
|
|
|
- <b>{{ table2.list[0].Sdif }}kg</b>
|
|
|
- <span>撒料误差值</span>
|
|
|
- </div>
|
|
|
- <div v-if="table2.list.length !== 0">
|
|
|
- <b>{{ table2.list[0].SdifRate }}</b>
|
|
|
- <span>撒料准确率</span>
|
|
|
+ <div class="detail">
|
|
|
+ <div v-if="table2.list.length !== 0">
|
|
|
+ <b>{{ table2.list[0].proesstime }}</b>
|
|
|
+ <span>过程时间</span>
|
|
|
+ </div>
|
|
|
+ <div v-if="table2.list.length !== 0">
|
|
|
+ <b>{{ table2.list[0].proesstime }}</b>
|
|
|
+ <span>混料时间</span>
|
|
|
+ </div>
|
|
|
+ <div v-if="table2.list.length !== 0">
|
|
|
+ <b>{{ table2.list[0].iscompleted }}</b>
|
|
|
+ <span>工作状态</span>
|
|
|
+ </div>
|
|
|
+ <div v-if="table2.list.length !== 0">
|
|
|
+ <b>{{ table2.list[0].Hdif }}kg</b>
|
|
|
+ <span>混料误差值</span>
|
|
|
+ </div>
|
|
|
+ <div v-if="table2.list.length !== 0">
|
|
|
+ <b>{{ table2.list[0].HdifRate }}</b>
|
|
|
+ <span>混料准确率</span>
|
|
|
+ </div>
|
|
|
+ <div v-if="table2.list.length !== 0">
|
|
|
+ <b>{{ table2.list[0].Sdif }}kg</b>
|
|
|
+ <span>撒料误差值</span>
|
|
|
+ </div>
|
|
|
+ <div v-if="table2.list.length !== 0">
|
|
|
+ <b>{{ table2.list[0].SdifRate }}</b>
|
|
|
+ <span>撒料准确率</span>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="Mixture">
|
|
|
@@ -200,18 +205,18 @@
|
|
|
</el-col>
|
|
|
<!-- 剩料计划 -->
|
|
|
<el-col v-if="isResidualMaterialPlan" :span="16">
|
|
|
- <div class="title">
|
|
|
- <b>过程详情</b>
|
|
|
- <span> ({{ title }})</span>
|
|
|
+ <div class="title">
|
|
|
+ <b>过程详情</b>
|
|
|
+ <span> ({{ title }})</span>
|
|
|
</div>
|
|
|
- <div class="detail">
|
|
|
- <div v-if="table2.list.length !== 0">
|
|
|
- <b>{{ table2.list[0].proesstime }}</b>
|
|
|
- <span>过程时间</span>
|
|
|
- </div>
|
|
|
- <div v-if="table2.list.length !== 0">
|
|
|
- <b>{{ table2.list[0].iscompleted }}</b>
|
|
|
- <span>工作状态</span>
|
|
|
+ <div class="detail">
|
|
|
+ <div v-if="table2.list.length !== 0">
|
|
|
+ <b>{{ table2.list[0].proesstime }}</b>
|
|
|
+ <span>过程时间</span>
|
|
|
+ </div>
|
|
|
+ <div v-if="table2.list.length !== 0">
|
|
|
+ <b>{{ table2.list[0].iscompleted }}</b>
|
|
|
+ <span>工作状态</span>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="Mixture">
|
|
|
@@ -265,48 +270,48 @@
|
|
|
class="elTable table-fixed"
|
|
|
max-height="200px"
|
|
|
>
|
|
|
- <el-table-column label="操作编号" min-width="110px" align="center" prop="sort" />
|
|
|
- <el-table-column label="转投栏舍" min-width="110px" align="center" prop="fname" />
|
|
|
- <el-table-column label="允许分配剩料量" min-width="110px" align="center" prop="lweight" />
|
|
|
- <el-table-column label="实际分配重量（kg）" min-width="110px" align="center" prop="actualweightminus" />
|
|
|
+ <el-table-column label="操作编号" min-width="110px" align="center" prop="sort" />
|
|
|
+ <el-table-column label="转投栏舍" min-width="110px" align="center" prop="fname" />
|
|
|
+ <el-table-column label="允许分配剩料量" min-width="110px" align="center" prop="lweight" />
|
|
|
+ <el-table-column label="实际分配重量（kg）" min-width="110px" align="center" prop="actualweightminus" />
|
|
|
<el-table-column label="废弃剩料重量" min-width="110px" align="center" prop="aweight" />
|
|
|
</el-table>
|
|
|
</div>
|
|
|
</el-col>
|
|
|
<!-- 撒料计划-混料 -->
|
|
|
<el-col v-if="isSpreadingPlanSH" :span="16">
|
|
|
- <div class="title">
|
|
|
- <b>过程详情</b>
|
|
|
- <span> ({{ title }})</span>
|
|
|
+ <div class="title">
|
|
|
+ <b>过程详情</b>
|
|
|
+ <span> ({{ title }})</span>
|
|
|
</div>
|
|
|
- <div class="detail">
|
|
|
- <div v-if="table2.list.length !== 0">
|
|
|
- <b>{{ table2.list[0].proesstime }}</b>
|
|
|
- <span>过程时间</span>
|
|
|
- </div>
|
|
|
- <div v-if="table2.list.length !== 0">
|
|
|
- <b>{{ table2.list[0].proesstime }}</b>
|
|
|
- <span>混料时间</span>
|
|
|
- </div>
|
|
|
- <div v-if="table2.list.length !== 0">
|
|
|
- <b>{{ table2.list[0].iscompleted }}</b>
|
|
|
- <span>工作状态</span>
|
|
|
- </div>
|
|
|
- <div v-if="table2.list.length !== 0">
|
|
|
- <b>{{ table2.list[0].Hdif }}kg</b>
|
|
|
- <span>混料误差值</span>
|
|
|
- </div>
|
|
|
- <div v-if="table2.list.length !== 0">
|
|
|
- <b>{{ table2.list[0].HdifRate }}</b>
|
|
|
- <span>混料准确率</span>
|
|
|
- </div>
|
|
|
- <div v-if="table2.list.length !== 0">
|
|
|
- <b>{{ table2.list[0].Sdif }}kg</b>
|
|
|
- <span>撒料误差值</span>
|
|
|
- </div>
|
|
|
- <div v-if="table2.list.length !== 0">
|
|
|
- <b>{{ table2.list[0].SdifRate }}</b>
|
|
|
- <span>撒料准确率</span>
|
|
|
+ <div class="detail">
|
|
|
+ <div v-if="table2.list.length !== 0">
|
|
|
+ <b>{{ table2.list[0].proesstime }}</b>
|
|
|
+ <span>过程时间</span>
|
|
|
+ </div>
|
|
|
+ <div v-if="table2.list.length !== 0">
|
|
|
+ <b>{{ table2.list[0].proesstime }}</b>
|
|
|
+ <span>混料时间</span>
|
|
|
+ </div>
|
|
|
+ <div v-if="table2.list.length !== 0">
|
|
|
+ <b>{{ table2.list[0].iscompleted }}</b>
|
|
|
+ <span>工作状态</span>
|
|
|
+ </div>
|
|
|
+ <div v-if="table2.list.length !== 0">
|
|
|
+ <b>{{ table2.list[0].Hdif }}kg</b>
|
|
|
+ <span>混料误差值</span>
|
|
|
+ </div>
|
|
|
+ <div v-if="table2.list.length !== 0">
|
|
|
+ <b>{{ table2.list[0].HdifRate }}</b>
|
|
|
+ <span>混料准确率</span>
|
|
|
+ </div>
|
|
|
+ <div v-if="table2.list.length !== 0">
|
|
|
+ <b>{{ table2.list[0].Sdif }}kg</b>
|
|
|
+ <span>撒料误差值</span>
|
|
|
+ </div>
|
|
|
+ <div v-if="table2.list.length !== 0">
|
|
|
+ <b>{{ table2.list[0].SdifRate }}</b>
|
|
|
+ <span>撒料准确率</span>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="Mixture">
|
|
|
@@ -374,38 +379,38 @@
|
|
|
</el-col>
|
|
|
<!-- 撒料计划-撒料 -->
|
|
|
<el-col v-if="isSpreadingPlanSS" :span="16">
|
|
|
- <div class="title">
|
|
|
- <b>过程详情</b>
|
|
|
- <span> ({{ title }})</span>
|
|
|
+ <div class="title">
|
|
|
+ <b>过程详情</b>
|
|
|
+ <span> ({{ title }})</span>
|
|
|
</div>
|
|
|
- <div class="detail">
|
|
|
- <div v-if="table2.list.length !== 0">
|
|
|
- <b>{{ table2.list[0].proesstime }}</b>
|
|
|
- <span>过程时间</span>
|
|
|
- </div>
|
|
|
- <div v-if="table2.list.length !== 0">
|
|
|
- <b>{{ table2.list[0].proesstime }}</b>
|
|
|
- <span>混料时间</span>
|
|
|
- </div>
|
|
|
- <div v-if="table2.list.length !== 0">
|
|
|
- <b>{{ table2.list[0].iscompleted }}</b>
|
|
|
- <span>工作状态</span>
|
|
|
- </div>
|
|
|
- <div v-if="table2.list.length !== 0">
|
|
|
- <b>{{ table2.list[0].Hdif }}kg</b>
|
|
|
- <span>混料误差值</span>
|
|
|
- </div>
|
|
|
- <div v-if="table2.list.length !== 0">
|
|
|
- <b>{{ table2.list[0].HdifRate }}</b>
|
|
|
- <span>混料准确率</span>
|
|
|
- </div>
|
|
|
- <div v-if="table2.list.length !== 0">
|
|
|
- <b>{{ table2.list[0].Sdif }}kg</b>
|
|
|
- <span>撒料误差值</span>
|
|
|
- </div>
|
|
|
- <div v-if="table2.list.length !== 0">
|
|
|
- <b>{{ table2.list[0].SdifRate }}</b>
|
|
|
- <span>撒料准确率</span>
|
|
|
+ <div class="detail">
|
|
|
+ <div v-if="table2.list.length !== 0">
|
|
|
+ <b>{{ table2.list[0].proesstime }}</b>
|
|
|
+ <span>过程时间</span>
|
|
|
+ </div>
|
|
|
+ <div v-if="table2.list.length !== 0">
|
|
|
+ <b>{{ table2.list[0].proesstime }}</b>
|
|
|
+ <span>混料时间</span>
|
|
|
+ </div>
|
|
|
+ <div v-if="table2.list.length !== 0">
|
|
|
+ <b>{{ table2.list[0].iscompleted }}</b>
|
|
|
+ <span>工作状态</span>
|
|
|
+ </div>
|
|
|
+ <div v-if="table2.list.length !== 0">
|
|
|
+ <b>{{ table2.list[0].Hdif }}kg</b>
|
|
|
+ <span>混料误差值</span>
|
|
|
+ </div>
|
|
|
+ <div v-if="table2.list.length !== 0">
|
|
|
+ <b>{{ table2.list[0].HdifRate }}</b>
|
|
|
+ <span>混料准确率</span>
|
|
|
+ </div>
|
|
|
+ <div v-if="table2.list.length !== 0">
|
|
|
+ <b>{{ table2.list[0].Sdif }}kg</b>
|
|
|
+ <span>撒料误差值</span>
|
|
|
+ </div>
|
|
|
+ <div v-if="table2.list.length !== 0">
|
|
|
+ <b>{{ table2.list[0].SdifRate }}</b>
|
|
|
+ <span>撒料准确率</span>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="Mixture">
|
|
|
@@ -487,16 +492,16 @@ import { parseTime } from '@/utils/index.js'
|
|
|
export default {
|
|
|
name: 'PastureProcessAnalysis',
|
|
|
data() {
|
|
|
- return {
|
|
|
- myheight:970,
|
|
|
+ return {
|
|
|
+ myheight:970,
|
|
|
title: '',
|
|
|
isPremixedPlan: '', // 预混计划
|
|
|
isSpreadingPlan: '', // 撒料计划
|
|
|
isResidualMaterialPlan: '', // 剩料计划,
|
|
|
isSpreadingPlanSH: '', // 撒料计划-混料
|
|
|
isSpreadingPlanSS: '', // 撒料计划-撒料
|
|
|
- pickerMinDate: '',
|
|
|
- Beforedisabled: false,
|
|
|
+ pickerMinDate: '',
|
|
|
+ Beforedisabled: false,
|
|
|
Nextdisabled: false,
|
|
|
pickerOptions: {
|
|
|
onPick: ({ maxDate, minDate }) => {
|
|
|
@@ -510,17 +515,17 @@ export default {
|
|
|
if (this.pickerMinDate !== '') {
|
|
|
const one = 31 * 24 * 3600 * 1000
|
|
|
const minTime = this.pickerMinDate - one
|
|
|
- let maxTime = this.pickerMinDate + one
|
|
|
-
|
|
|
+ let maxTime = this.pickerMinDate + one
|
|
|
+
|
|
|
// console.log(minTime, 'minTime')
|
|
|
// console.log(maxTime, 'maxTime')
|
|
|
- // console.log(new Date(), 'new Date()')
|
|
|
- // console.log(Date.now(), 'Date.now()')
|
|
|
+ // console.log(new Date(), 'new Date()')
|
|
|
+ // console.log(Date.now(), 'Date.now()')
|
|
|
// console.log(time.getTime(), 'time.getTime()')
|
|
|
- if (maxTime > new Date()) {
|
|
|
- maxTime = Date.now() + 8.64e7
|
|
|
+ if (maxTime > new Date()) {
|
|
|
+ maxTime = Date.now() + 8.64e7
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
return time.getTime() < minTime || time.getTime() > maxTime
|
|
|
}
|
|
|
return time.getTime() > Date.now() + 8.64e7
|
|
|
@@ -628,23 +633,50 @@ export default {
|
|
|
chartLine_data: []
|
|
|
},
|
|
|
chartLine: null,
|
|
|
- chartLine_data: {},
|
|
|
+ chartLine_data: {},
|
|
|
chartName: '',
|
|
|
// rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
|
|
|
- cellStyle: { padding: 0 + 'px' }
|
|
|
+ cellStyle: { padding: 0 + 'px' },
|
|
|
+
|
|
|
+
|
|
|
+ TMRList:[],
|
|
|
+ downTMR: { name: 'getDownloadedplanTmrName', offset: 0, pagecount: 0,
|
|
|
+ parammaps: {
|
|
|
+ pastureid: Cookies.get('pastureid'),
|
|
|
+ startdate: parseTime(new Date(), '{y}-{m}-{d}'),
|
|
|
+ enddate: parseTime(new Date(), '{y}-{m}-{d}'),
|
|
|
+ }
|
|
|
+ },
|
|
|
}
|
|
|
},
|
|
|
created() {
|
|
|
+ this.getDownList()
|
|
|
this.getList()
|
|
|
+
|
|
|
},
|
|
|
methods: {
|
|
|
+
|
|
|
+ change_date(e){
|
|
|
+ console.log(e)
|
|
|
+ this.getDownList()
|
|
|
+ },
|
|
|
+
|
|
|
+ getDownList() {
|
|
|
+ this.downTMR.parammaps.startdate = this.table.getdataListParm.parammaps.startTime
|
|
|
+ this.downTMR.parammaps.enddate = this.table.getdataListParm.parammaps.stopTime
|
|
|
+ GetDataByName(this.downTMR).then(response => {
|
|
|
+ console.log(response.data.list)
|
|
|
+ this.TMRList = response.data.list
|
|
|
+ })
|
|
|
+ },
|
|
|
+
|
|
|
// TMR设备列表
|
|
|
getList() {
|
|
|
this.table.listLoading = true
|
|
|
GetDataByName(this.table.getdataListParm).then(response => {
|
|
|
// console.log('TMR设备列表table数据', response.data.list)
|
|
|
if (response.data.list !== null) {
|
|
|
- this.table.list = response.data.list
|
|
|
+ this.table.list = response.data.list
|
|
|
this.table.total = response.data.total
|
|
|
if (response.data.list[0].lpplantype == '预混计划') {
|
|
|
this.isPremixedPlan = true
|
|
|
@@ -667,9 +699,9 @@ export default {
|
|
|
this.table2.getdataListParm.name = 'getprocessAnalysisStrSH'
|
|
|
this.table3.getdataListParm.name = 'getprocessAnalysisHLSH'
|
|
|
this.table4.getdataListParm.name = 'getprocessAnalysisSLSH'
|
|
|
- this.table2.getdataListParm.parammaps.id = response.data.list[0].id
|
|
|
- this.table2.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
|
|
|
- this.table3.getdataListParm.parammaps.pid = response.data.list[0].id
|
|
|
+ this.table2.getdataListParm.parammaps.id = response.data.list[0].id
|
|
|
+ this.table2.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
|
|
|
+ this.table3.getdataListParm.parammaps.pid = response.data.list[0].id
|
|
|
this.table3.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
|
|
|
this.table4.getdataListParm.parammaps.pid = response.data.list[0].id
|
|
|
this.table4.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
|
|
|
@@ -683,16 +715,16 @@ export default {
|
|
|
this.isPremixedPlan = false
|
|
|
this.isSpreadingPlanSH = true
|
|
|
this.isSpreadingPlanSS = false
|
|
|
- this.table2.getdataListParm.parammaps.id = response.data.list[0].id
|
|
|
- this.table2.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
|
|
|
- this.table3.getdataListParm.parammaps.pid = response.data.list[0].id
|
|
|
- this.table3.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
|
|
|
- this.table4.getdataListParm.parammaps.pid = response.data.list[0].id
|
|
|
+ this.table2.getdataListParm.parammaps.id = response.data.list[0].id
|
|
|
+ this.table2.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
|
|
|
+ this.table3.getdataListParm.parammaps.pid = response.data.list[0].id
|
|
|
+ this.table3.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
|
|
|
+ this.table4.getdataListParm.parammaps.pid = response.data.list[0].id
|
|
|
this.table4.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
|
|
|
this.getList2()
|
|
|
this.getList3()
|
|
|
this.getList4()
|
|
|
- this.chart1.getdataListParm.parammaps.pid = response.data.list[0].id
|
|
|
+ this.chart1.getdataListParm.parammaps.pid = response.data.list[0].id
|
|
|
this.chart1.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
|
|
|
this.getChart1()
|
|
|
} else if (response.data.list[0].lpplantype == '撒料计划-撒料') {
|
|
|
@@ -702,16 +734,16 @@ export default {
|
|
|
this.isPremixedPlan = false
|
|
|
this.isSpreadingPlanSH = false
|
|
|
this.isSpreadingPlanSS = true
|
|
|
- this.table2.getdataListParm.parammaps.id = response.data.list[0].id
|
|
|
- this.table2.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
|
|
|
- this.table3.getdataListParm.parammaps.pid = response.data.list[0].id
|
|
|
- this.table3.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
|
|
|
- this.table4.getdataListParm.parammaps.pid = response.data.list[0].id
|
|
|
+ this.table2.getdataListParm.parammaps.id = response.data.list[0].id
|
|
|
+ this.table2.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
|
|
|
+ this.table3.getdataListParm.parammaps.pid = response.data.list[0].id
|
|
|
+ this.table3.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
|
|
|
+ this.table4.getdataListParm.parammaps.pid = response.data.list[0].id
|
|
|
this.table4.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
|
|
|
this.getList2()
|
|
|
this.getList3()
|
|
|
this.getList4()
|
|
|
- this.chart1.getdataListParm.parammaps.pid = response.data.list[0].id
|
|
|
+ this.chart1.getdataListParm.parammaps.pid = response.data.list[0].id
|
|
|
this.chart1.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
|
|
|
this.getChart1()
|
|
|
} else if (response.data.list[0].lpplantype == '预称重计划') {
|
|
|
@@ -721,16 +753,16 @@ export default {
|
|
|
this.isPremixedPlan = false
|
|
|
this.isSpreadingPlanSH = true
|
|
|
this.isSpreadingPlanSS = false
|
|
|
- this.table2.getdataListParm.parammaps.id = response.data.list[0].id
|
|
|
- this.table2.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
|
|
|
- this.table3.getdataListParm.parammaps.pid = response.data.list[0].id
|
|
|
- this.table3.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
|
|
|
- this.table4.getdataListParm.parammaps.pid = response.data.list[0].id
|
|
|
+ this.table2.getdataListParm.parammaps.id = response.data.list[0].id
|
|
|
+ this.table2.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
|
|
|
+ this.table3.getdataListParm.parammaps.pid = response.data.list[0].id
|
|
|
+ this.table3.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
|
|
|
+ this.table4.getdataListParm.parammaps.pid = response.data.list[0].id
|
|
|
this.table4.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
|
|
|
this.getList2()
|
|
|
this.getList3()
|
|
|
this.getList4()
|
|
|
- this.chart1.getdataListParm.parammaps.pid = response.data.list[0].id
|
|
|
+ this.chart1.getdataListParm.parammaps.pid = response.data.list[0].id
|
|
|
this.chart1.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
|
|
|
this.getChart1()
|
|
|
} else {
|
|
|
@@ -740,11 +772,11 @@ export default {
|
|
|
this.isPremixedPlan = false
|
|
|
this.isSpreadingPlanSH = false
|
|
|
this.isSpreadingPlanSS = false
|
|
|
- this.table2.getdataListParm.parammaps.id = response.data.list[0].id
|
|
|
- this.table2.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
|
|
|
- this.table3.getdataListParm.parammaps.pid = response.data.list[0].id
|
|
|
- this.table3.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
|
|
|
- this.table4.getdataListParm.parammaps.pid = response.data.list[0].id
|
|
|
+ this.table2.getdataListParm.parammaps.id = response.data.list[0].id
|
|
|
+ this.table2.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
|
|
|
+ this.table3.getdataListParm.parammaps.pid = response.data.list[0].id
|
|
|
+ this.table3.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
|
|
|
+ this.table4.getdataListParm.parammaps.pid = response.data.list[0].id
|
|
|
this.table4.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
|
|
|
this.getList2()
|
|
|
this.getList3()
|
|
|
@@ -752,7 +784,7 @@ export default {
|
|
|
this.chart1.getdataListParm.parammaps.pid = response.data.list[0].id
|
|
|
this.chart1.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
|
|
|
this.getChart1()
|
|
|
- }
|
|
|
+ }
|
|
|
this.title = response.data.list[0].lpplantype
|
|
|
} else {
|
|
|
this.table.list = []
|
|
|
@@ -785,59 +817,61 @@ export default {
|
|
|
console.log('点击了重置')
|
|
|
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.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.inputDatetime = [new Date(), new Date()]
|
|
|
this.table.getdataListParm.offset = 1
|
|
|
this.getList()
|
|
|
- },
|
|
|
- handleBefore() {
|
|
|
- if (this.table.getdataListParm.parammaps.inputDatetime !== '' && this.table.getdataListParm.parammaps.inputDatetime !== null) {
|
|
|
- var start = new Date(this.table.getdataListParm.parammaps.inputDatetime[0].setDate(this.table.getdataListParm.parammaps.inputDatetime[0].getDate() - 1))
|
|
|
- var stop = new Date(this.table.getdataListParm.parammaps.inputDatetime[1].setDate(this.table.getdataListParm.parammaps.inputDatetime[1].getDate() - 1))
|
|
|
- if (stop > Date.now()) {
|
|
|
- this.Nextdisabled = true
|
|
|
- this.Beforedisabled = false
|
|
|
- } else {
|
|
|
- this.Nextdisabled = false
|
|
|
- this.Beforedisabled = false
|
|
|
- }
|
|
|
- this.table.getdataListParm.parammaps.inputDatetime.length = 0
|
|
|
- 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.getList()
|
|
|
- },
|
|
|
- handleNext() {
|
|
|
- if (this.table.getdataListParm.parammaps.inputDatetime !== '' && this.table.getdataListParm.parammaps.inputDatetime !== null) {
|
|
|
- var start2 = new Date(this.table.getdataListParm.parammaps.inputDatetime[0].setDate(this.table.getdataListParm.parammaps.inputDatetime[0].getDate() + 1))
|
|
|
- var stop2 = new Date(this.table.getdataListParm.parammaps.inputDatetime[1].setDate(this.table.getdataListParm.parammaps.inputDatetime[1].getDate() + 1))
|
|
|
- // console.log(stop2)
|
|
|
- // console.log(Date.now() + 8.64e7)
|
|
|
- // console.log(stop2 > Date.now() + 8.64e7)
|
|
|
- if (stop2 > Date.now()) {
|
|
|
- this.Nextdisabled = true
|
|
|
- this.Beforedisabled = false
|
|
|
- } else {
|
|
|
- this.Nextdisabled = false
|
|
|
- this.Beforedisabled = false
|
|
|
- }
|
|
|
- this.table.getdataListParm.parammaps.inputDatetime.length = 0
|
|
|
- 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.getList()
|
|
|
+ },
|
|
|
+ handleBefore() {
|
|
|
+ if (this.table.getdataListParm.parammaps.inputDatetime !== '' && this.table.getdataListParm.parammaps.inputDatetime !== null) {
|
|
|
+ var start = new Date(this.table.getdataListParm.parammaps.inputDatetime[0].setDate(this.table.getdataListParm.parammaps.inputDatetime[0].getDate() - 1))
|
|
|
+ var stop = new Date(this.table.getdataListParm.parammaps.inputDatetime[1].setDate(this.table.getdataListParm.parammaps.inputDatetime[1].getDate() - 1))
|
|
|
+ if (stop > Date.now()) {
|
|
|
+ this.Nextdisabled = true
|
|
|
+ this.Beforedisabled = false
|
|
|
+ } else {
|
|
|
+ this.Nextdisabled = false
|
|
|
+ this.Beforedisabled = false
|
|
|
+ }
|
|
|
+ this.table.getdataListParm.parammaps.inputDatetime.length = 0
|
|
|
+ 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.getDownList()
|
|
|
+ this.getList()
|
|
|
+ },
|
|
|
+ handleNext() {
|
|
|
+ if (this.table.getdataListParm.parammaps.inputDatetime !== '' && this.table.getdataListParm.parammaps.inputDatetime !== null) {
|
|
|
+ var start2 = new Date(this.table.getdataListParm.parammaps.inputDatetime[0].setDate(this.table.getdataListParm.parammaps.inputDatetime[0].getDate() + 1))
|
|
|
+ var stop2 = new Date(this.table.getdataListParm.parammaps.inputDatetime[1].setDate(this.table.getdataListParm.parammaps.inputDatetime[1].getDate() + 1))
|
|
|
+ // console.log(stop2)
|
|
|
+ // console.log(Date.now() + 8.64e7)
|
|
|
+ // console.log(stop2 > Date.now() + 8.64e7)
|
|
|
+ if (stop2 > Date.now()) {
|
|
|
+ this.Nextdisabled = true
|
|
|
+ this.Beforedisabled = false
|
|
|
+ } else {
|
|
|
+ this.Nextdisabled = false
|
|
|
+ this.Beforedisabled = false
|
|
|
+ }
|
|
|
+ this.table.getdataListParm.parammaps.inputDatetime.length = 0
|
|
|
+ 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.getDownList()
|
|
|
+ this.getList()
|
|
|
},
|
|
|
rowClick(row, column, event) {
|
|
|
this.table2.getdataListParm.parammaps.id = row.id
|
|
|
this.table3.getdataListParm.parammaps.pid = row.id
|
|
|
this.table4.getdataListParm.parammaps.pid = row.id
|
|
|
- this.chart1.getdataListParm.parammaps.pid = row.id
|
|
|
+ this.chart1.getdataListParm.parammaps.pid = row.id
|
|
|
this.chartName = row.tmrtname
|
|
|
if (row.lpplantype == '预混计划') {
|
|
|
this.isPremixedPlan = true
|
|
|
@@ -847,7 +881,7 @@ export default {
|
|
|
this.isSpreadingPlanSH = false
|
|
|
this.isSpreadingPlanSS = false
|
|
|
this.table2.getdataListParm.name = 'getprocessAnalysisStr'
|
|
|
- this.table3.getdataListParm.name = 'getprocessAnalysisHL'
|
|
|
+ this.table3.getdataListParm.name = 'getprocessAnalysisHL'
|
|
|
this.table2.getdataListParm.parammaps.pastureid = row.pastureid
|
|
|
this.table3.getdataListParm.parammaps.pastureid = row.pastureid
|
|
|
this.getList2()
|
|
|
@@ -861,8 +895,8 @@ export default {
|
|
|
this.isSpreadingPlanSS = false
|
|
|
this.table2.getdataListParm.name = 'getprocessAnalysisStrSH'
|
|
|
this.table3.getdataListParm.name = 'getprocessAnalysisHLSH'
|
|
|
- this.table4.getdataListParm.name = 'getprocessAnalysisSLSH'
|
|
|
- this.table2.getdataListParm.parammaps.pastureid = row.pastureid
|
|
|
+ this.table4.getdataListParm.name = 'getprocessAnalysisSLSH'
|
|
|
+ this.table2.getdataListParm.parammaps.pastureid = row.pastureid
|
|
|
this.table3.getdataListParm.parammaps.pastureid = row.pastureid
|
|
|
this.table4.getdataListParm.parammaps.pastureid = row.pastureid
|
|
|
this.getList2()
|
|
|
@@ -876,10 +910,10 @@ export default {
|
|
|
this.isSpreadingPlanSS = false
|
|
|
this.table2.getdataListParm.name = 'getprocessAnalysisStr'
|
|
|
this.table3.getdataListParm.name = 'getprocessAnalysisHL'
|
|
|
- this.table4.getdataListParm.name = 'getprocessAnalysisSL'
|
|
|
- this.table2.getdataListParm.parammaps.pastureid = row.pastureid
|
|
|
- this.table3.getdataListParm.parammaps.pastureid = row.pastureid
|
|
|
- this.table4.getdataListParm.parammaps.pastureid = row.pastureid
|
|
|
+ this.table4.getdataListParm.name = 'getprocessAnalysisSL'
|
|
|
+ this.table2.getdataListParm.parammaps.pastureid = row.pastureid
|
|
|
+ this.table3.getdataListParm.parammaps.pastureid = row.pastureid
|
|
|
+ this.table4.getdataListParm.parammaps.pastureid = row.pastureid
|
|
|
this.chart1.getdataListParm.parammaps.pastureid = row.pastureid
|
|
|
this.getList2()
|
|
|
this.getList3()
|
|
|
@@ -893,10 +927,10 @@ export default {
|
|
|
this.isSpreadingPlanSS = true
|
|
|
this.table2.getdataListParm.name = 'getprocessAnalysisStr'
|
|
|
this.table3.getdataListParm.name = 'getprocessAnalysisHL'
|
|
|
- this.table4.getdataListParm.name = 'getprocessAnalysisSL'
|
|
|
- this.table2.getdataListParm.parammaps.pastureid = row.pastureid
|
|
|
- this.table3.getdataListParm.parammaps.pastureid = row.pastureid
|
|
|
- this.table4.getdataListParm.parammaps.pastureid = row.pastureid
|
|
|
+ this.table4.getdataListParm.name = 'getprocessAnalysisSL'
|
|
|
+ this.table2.getdataListParm.parammaps.pastureid = row.pastureid
|
|
|
+ this.table3.getdataListParm.parammaps.pastureid = row.pastureid
|
|
|
+ this.table4.getdataListParm.parammaps.pastureid = row.pastureid
|
|
|
this.chart1.getdataListParm.parammaps.pastureid = row.pastureid
|
|
|
this.getList2()
|
|
|
this.getList3()
|
|
|
@@ -910,10 +944,10 @@ export default {
|
|
|
this.isSpreadingPlanSS = false
|
|
|
this.table2.getdataListParm.name = 'getprocessAnalysisStr'
|
|
|
this.table3.getdataListParm.name = 'getprocessAnalysisHL'
|
|
|
- this.table4.getdataListParm.name = 'getprocessAnalysisSL'
|
|
|
- this.table2.getdataListParm.parammaps.pastureid = row.pastureid
|
|
|
- this.table3.getdataListParm.parammaps.pastureid = row.pastureid
|
|
|
- this.table4.getdataListParm.parammaps.pastureid = row.pastureid
|
|
|
+ this.table4.getdataListParm.name = 'getprocessAnalysisSL'
|
|
|
+ this.table2.getdataListParm.parammaps.pastureid = row.pastureid
|
|
|
+ this.table3.getdataListParm.parammaps.pastureid = row.pastureid
|
|
|
+ this.table4.getdataListParm.parammaps.pastureid = row.pastureid
|
|
|
this.chart1.getdataListParm.parammaps.pastureid = row.pastureid
|
|
|
this.getList2()
|
|
|
this.getList3()
|
|
|
@@ -928,16 +962,16 @@ export default {
|
|
|
|
|
|
this.table2.getdataListParm.name = 'getprocessAnalysisStr'
|
|
|
this.table3.getdataListParm.name = 'getprocessAnalysisHL'
|
|
|
- this.table4.getdataListParm.name = 'getprocessAnalysisSL'
|
|
|
- this.table2.getdataListParm.parammaps.pastureid = row.pastureid
|
|
|
- this.table3.getdataListParm.parammaps.pastureid = row.pastureid
|
|
|
- this.table4.getdataListParm.parammaps.pastureid = row.pastureid
|
|
|
+ this.table4.getdataListParm.name = 'getprocessAnalysisSL'
|
|
|
+ this.table2.getdataListParm.parammaps.pastureid = row.pastureid
|
|
|
+ this.table3.getdataListParm.parammaps.pastureid = row.pastureid
|
|
|
+ this.table4.getdataListParm.parammaps.pastureid = row.pastureid
|
|
|
this.chart1.getdataListParm.parammaps.pastureid = row.pastureid
|
|
|
this.getList2()
|
|
|
this.getList3()
|
|
|
this.getList4()
|
|
|
this.getChart1()
|
|
|
- }
|
|
|
+ }
|
|
|
this.title = '' + row.lpplantype
|
|
|
},
|
|
|
// 过程详情
|
|
|
@@ -964,7 +998,7 @@ export default {
|
|
|
this.table3.list = response.data.list
|
|
|
var sumlweight = 0
|
|
|
var sumactualweightminus = 0
|
|
|
- var sumsweight = 0
|
|
|
+ var sumsweight = 0
|
|
|
var sumproesstime = ''
|
|
|
for (let i = 0; i < response.data.list.length; i++) {
|
|
|
if (response.data.list[i].lweight == undefined) { response.data.list[i].lweight = 0 }
|
|
|
@@ -972,7 +1006,7 @@ export default {
|
|
|
if (response.data.list[i].sweight == undefined) { response.data.list[i].sweight = 0 }
|
|
|
sumlweight += parseFloat(response.data.list[i].lweight)
|
|
|
sumactualweightminus += parseFloat(response.data.list[i].actualweightminus)
|
|
|
- sumsweight += parseFloat(response.data.list[i].sweight)
|
|
|
+ sumsweight += parseFloat(response.data.list[i].sweight)
|
|
|
sumproesstime = response.data.list[0].sumproesstime
|
|
|
}
|
|
|
sumlweight = formatNum(sumlweight, 2)
|
|
|
@@ -996,7 +1030,7 @@ export default {
|
|
|
this.table4.list = response.data.list
|
|
|
var sumlweight = 0
|
|
|
var sumactualweightminus = 0
|
|
|
- var sumsweight = 0
|
|
|
+ var sumsweight = 0
|
|
|
var sumproesstime = ''
|
|
|
for (let i = 0; i < response.data.list.length; i++) {
|
|
|
if (response.data.list[i].lweight == undefined) { response.data.list[i].lweight = 0 }
|
|
|
@@ -1004,7 +1038,7 @@ export default {
|
|
|
if (response.data.list[i].sweight == undefined) { response.data.list[i].sweight = 0 }
|
|
|
sumlweight += parseFloat(response.data.list[i].lweight)
|
|
|
sumactualweightminus += parseFloat(response.data.list[i].actualweightminus)
|
|
|
- sumsweight += parseFloat(response.data.list[i].sweight)
|
|
|
+ sumsweight += parseFloat(response.data.list[i].sweight)
|
|
|
sumproesstime = response.data.list[0].sumproesstime
|
|
|
}
|
|
|
sumlweight = formatNum(sumlweight, 2)
|
|
|
@@ -1052,35 +1086,35 @@ export default {
|
|
|
getChart1() {
|
|
|
this.chart1.listLoading = true
|
|
|
GetReportform(this.chart1.getdataListParm).then(response => {
|
|
|
- if (response.data.list !== null) {
|
|
|
- // response.data.list = {
|
|
|
- // // 'data1': ['09:34:32', '09:34:46', '09:34:46', '09:34:50'],
|
|
|
- // 'data2': [
|
|
|
- // ['09:34:32', '1724.11'],
|
|
|
- // ['09:34:46', '1724.12'],
|
|
|
- // ['09:34:46', '-50.13'],
|
|
|
- // ['09:34:50', '-51.14']
|
|
|
- // ],
|
|
|
- // 'data3': [
|
|
|
- // ['09:34:32', '0'],
|
|
|
- // ['09:34:46', '1725.15'],
|
|
|
- // ['09:34:46', '1726.16'],
|
|
|
- // ['09:34:50', '1.17']
|
|
|
- // ],
|
|
|
- // 'data4': [
|
|
|
- // ['09:34:32', '0.18'],
|
|
|
- // ['09:34:46', '1725.19'],
|
|
|
- // ['09:34:46', '1335.20'],
|
|
|
- // ['09:34:50', '1.21']
|
|
|
- // ],
|
|
|
- // 'data5': [
|
|
|
- // ['09:34:32', '0.22', '栏舍', '303东1'],
|
|
|
- // ['09:34:46', '1726.23', '饲料', '国产燕麦2'],
|
|
|
- // ['09:34:46', '1335.24', '栏舍', '303东3'],
|
|
|
- // ['09:34:50', '1.25', '饲料', '国产燕麦4']
|
|
|
- // ]
|
|
|
+ if (response.data.list !== null) {
|
|
|
+ // response.data.list = {
|
|
|
+ // // 'data1': ['09:34:32', '09:34:46', '09:34:46', '09:34:50'],
|
|
|
+ // 'data2': [
|
|
|
+ // ['09:34:32', '1724.11'],
|
|
|
+ // ['09:34:46', '1724.12'],
|
|
|
+ // ['09:34:46', '-50.13'],
|
|
|
+ // ['09:34:50', '-51.14']
|
|
|
+ // ],
|
|
|
+ // 'data3': [
|
|
|
+ // ['09:34:32', '0'],
|
|
|
+ // ['09:34:46', '1725.15'],
|
|
|
+ // ['09:34:46', '1726.16'],
|
|
|
+ // ['09:34:50', '1.17']
|
|
|
+ // ],
|
|
|
+ // 'data4': [
|
|
|
+ // ['09:34:32', '0.18'],
|
|
|
+ // ['09:34:46', '1725.19'],
|
|
|
+ // ['09:34:46', '1335.20'],
|
|
|
+ // ['09:34:50', '1.21']
|
|
|
+ // ],
|
|
|
+ // 'data5': [
|
|
|
+ // ['09:34:32', '0.22', '栏舍', '303东1'],
|
|
|
+ // ['09:34:46', '1726.23', '饲料', '国产燕麦2'],
|
|
|
+ // ['09:34:46', '1335.24', '栏舍', '303东3'],
|
|
|
+ // ['09:34:50', '1.25', '饲料', '国产燕麦4']
|
|
|
+ // ]
|
|
|
// }
|
|
|
- this.chart1.list = response.data.data
|
|
|
+ this.chart1.list = response.data.data
|
|
|
console.log('实时监控', response.data.list)
|
|
|
this.chart1.chartLine_data = response.data.list
|
|
|
this.chart1.total = response.data.total
|
|
|
@@ -1093,7 +1127,7 @@ export default {
|
|
|
}, 100)
|
|
|
})
|
|
|
},
|
|
|
- roadChartLine1(chartLine_data) {
|
|
|
+ roadChartLine1(chartLine_data) {
|
|
|
console.log(chartLine_data.data5, 'chartLine_data')
|
|
|
if (this.chartLine != null) {
|
|
|
this.chartLine.dispose()
|
|
|
@@ -1107,78 +1141,78 @@ export default {
|
|
|
data: [{ name: '设计重量' }, { name: '实际重量' }]
|
|
|
}, {
|
|
|
itemWidth: 15, itemHeight: 15, right: '0', textStyle: { fontSize: 12 },
|
|
|
- data: [
|
|
|
- // { name: '开始重量', icon: 'image://https://kptyun.cn:8081/file/pic/3.png' }, // { name: '结束重量', icon: 'image://https://kptyun.cn:8081/file/pic/4.png' },
|
|
|
- // { name: '结束重量', icon: 'image://https://kptyun.cn:8081/file/pic/4.png' }, // { name: '结束重量', icon: 'image://https://kptyun.cn:8081/file/pic/4.png' },
|
|
|
- { name: '开始重量' },
|
|
|
- { name: '结束重量' }
|
|
|
+ data: [
|
|
|
+ // { name: '开始重量', icon: 'image://https://kptyun.cn:8081/file/pic/3.png' }, // { name: '结束重量', icon: 'image://https://kptyun.cn:8081/file/pic/4.png' },
|
|
|
+ // { name: '结束重量', icon: 'image://https://kptyun.cn:8081/file/pic/4.png' }, // { name: '结束重量', icon: 'image://https://kptyun.cn:8081/file/pic/4.png' },
|
|
|
+ { name: '开始重量' },
|
|
|
+ { name: '结束重量' }
|
|
|
]
|
|
|
}],
|
|
|
tooltip: {
|
|
|
- trigger: 'axis',
|
|
|
- formatter: function(params) {
|
|
|
- // console.log(params, 'params')
|
|
|
- var tip = params[0].name
|
|
|
- for (let i = 0; i < params.length; i++) {
|
|
|
- if (params[i].seriesName == '设计重量') {
|
|
|
- tip += '<br>' + params[i].seriesName + ':' + params[i].value[1]
|
|
|
- }
|
|
|
- if (params[i].seriesName == '实际重量') {
|
|
|
- tip += '<br>' + params[i].seriesName + ':' + params[i].value[1]
|
|
|
- }
|
|
|
- if (params[i].seriesName == '开始重量') {
|
|
|
- tip += '<br>' + params[i].seriesName + ':' + params[i].value[1]
|
|
|
- }
|
|
|
- if (params[i].seriesName == '结束重量') {
|
|
|
- tip += '<br>' + params[i].seriesName + ':' + params[i].value[1] + '<br>' + params[i].value[2] + params[i].value[3]
|
|
|
- }
|
|
|
- }
|
|
|
- return tip
|
|
|
+ trigger: 'axis',
|
|
|
+ formatter: function(params) {
|
|
|
+ // console.log(params, 'params')
|
|
|
+ var tip = params[0].name
|
|
|
+ for (let i = 0; i < params.length; i++) {
|
|
|
+ if (params[i].seriesName == '设计重量') {
|
|
|
+ tip += '<br>' + params[i].seriesName + ':' + params[i].value[1]
|
|
|
+ }
|
|
|
+ if (params[i].seriesName == '实际重量') {
|
|
|
+ tip += '<br>' + params[i].seriesName + ':' + params[i].value[1]
|
|
|
+ }
|
|
|
+ if (params[i].seriesName == '开始重量') {
|
|
|
+ tip += '<br>' + params[i].seriesName + ':' + params[i].value[1]
|
|
|
+ }
|
|
|
+ if (params[i].seriesName == '结束重量') {
|
|
|
+ tip += '<br>' + params[i].seriesName + ':' + params[i].value[1] + '<br>' + params[i].value[2] + params[i].value[3]
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return tip
|
|
|
}
|
|
|
},
|
|
|
calculable: true,
|
|
|
- xAxis: [
|
|
|
- { type: 'category' }
|
|
|
- // { type: 'category', splitLine: { show: false }, name: '时间', data: chartLine_data.data1, axisLabel: { show: true, textStyle: { color: '#666' }}}
|
|
|
+ xAxis: [
|
|
|
+ { type: 'category' }
|
|
|
+ // { type: 'category', splitLine: { show: false }, name: '时间', data: chartLine_data.data1, axisLabel: { show: true, textStyle: { color: '#666' }}}
|
|
|
],
|
|
|
- yAxis: [{ type: 'value' }],
|
|
|
- toolbox: {
|
|
|
- show: false,
|
|
|
- feature: {
|
|
|
- dataZoom: { realtime: false, yAxisIndex: 'none', },
|
|
|
- restore: {},
|
|
|
- }
|
|
|
- },
|
|
|
- dataZoom: [
|
|
|
- {type: 'inside'}, //用于添加滚轮缩放
|
|
|
- {type:'slider' }, //用于添加滑动条缩放，
|
|
|
+ yAxis: [{ type: 'value' }],
|
|
|
+ toolbox: {
|
|
|
+ show: false,
|
|
|
+ feature: {
|
|
|
+ dataZoom: { realtime: false, yAxisIndex: 'none', },
|
|
|
+ restore: {},
|
|
|
+ }
|
|
|
+ },
|
|
|
+ dataZoom: [
|
|
|
+ {type: 'inside'}, //用于添加滚轮缩放
|
|
|
+ {type:'slider' }, //用于添加滑动条缩放，
|
|
|
],
|
|
|
series: [
|
|
|
{ symbol: 'none', name: '实际重量', type: 'line', data: chartLine_data.data3, itemStyle: { normal: { lineStyle: { color: '#38c193' }}}},
|
|
|
- { symbol: 'none', name: '设计重量', type: 'line', step: 'middle', data: chartLine_data.data2 },
|
|
|
- // { name: '开始重量', symbol: 'image://https://kptyun.cn:8081/file/pic/3.png', symbolSize: 10, type: 'scatter', data: chartLine_data.data4 },
|
|
|
- // { name: '结束重量', symbol: 'image://https://kptyun.cn:8081/file/pic/4.png', symbolSize: 10, type: 'scatter', data: chartLine_data.data5 }
|
|
|
- { name: '开始重量', symbolSize: 10, type: 'scatter', data: chartLine_data.data4 },
|
|
|
- { name: '结束重量', symbolSize: 10, type: 'scatter', data: chartLine_data.data5 }
|
|
|
+ { symbol: 'none', name: '设计重量', type: 'line', step: 'middle', data: chartLine_data.data2 },
|
|
|
+ // { name: '开始重量', symbol: 'image://https://kptyun.cn:8081/file/pic/3.png', symbolSize: 10, type: 'scatter', data: chartLine_data.data4 },
|
|
|
+ // { name: '结束重量', symbol: 'image://https://kptyun.cn:8081/file/pic/4.png', symbolSize: 10, type: 'scatter', data: chartLine_data.data5 }
|
|
|
+ { name: '开始重量', symbolSize: 10, type: 'scatter', data: chartLine_data.data4 },
|
|
|
+ { name: '结束重量', symbolSize: 10, type: 'scatter', data: chartLine_data.data5 }
|
|
|
]
|
|
|
}
|
|
|
this.chartLine.setOption(option)
|
|
|
window.onresize = function() {
|
|
|
this.chartLine.resize()
|
|
|
}
|
|
|
- },
|
|
|
- rowStyle({ row, rowIndex }) {
|
|
|
- console.log(row, rowIndex,'777777');
|
|
|
- let stylejson = {};
|
|
|
- if (row.abnormal == 1) {
|
|
|
- stylejson.background = "#fb8072";// 背景颜色
|
|
|
- stylejson.maxHeight = '30px';// 背景颜色
|
|
|
- stylejson.height = '30px';// 背景颜色
|
|
|
- // 也可以修改文字颜色
|
|
|
- return stylejson;
|
|
|
- } else {
|
|
|
- return "";
|
|
|
- }
|
|
|
+ },
|
|
|
+ rowStyle({ row, rowIndex }) {
|
|
|
+ console.log(row, rowIndex,'777777');
|
|
|
+ let stylejson = {};
|
|
|
+ if (row.abnormal == 1) {
|
|
|
+ stylejson.background = "#fb8072";// 背景颜色
|
|
|
+ stylejson.maxHeight = '30px';// 背景颜色
|
|
|
+ stylejson.height = '30px';// 背景颜色
|
|
|
+ // 也可以修改文字颜色
|
|
|
+ return stylejson;
|
|
|
+ } else {
|
|
|
+ return "";
|
|
|
+ }
|
|
|
},
|
|
|
|
|
|
}
|
|
|
@@ -1187,18 +1221,18 @@ export default {
|
|
|
</script>
|
|
|
<style lang="scss" scoped>
|
|
|
.search{padding-top:10px;clear: both;}
|
|
|
- .table{margin-top:10px;}
|
|
|
- /deep/.el-table--scrollable-y .el-table__body-wrapper{
|
|
|
- bottom: 15px;
|
|
|
+ .table{margin-top:10px;}
|
|
|
+ /deep/.el-table--scrollable-y .el-table__body-wrapper{
|
|
|
+ bottom: 15px;
|
|
|
}
|
|
|
.detail{
|
|
|
- height:84px;padding:0 10px;font:16px/32px '';color:#333;background: #F9F9F9;display: flex; align-items: center;text-align: center;
|
|
|
- div{
|
|
|
- height: 15px;width: 20%;border-right: 1px solid #E0E0E0;color: #333;
|
|
|
- b{line-height: 20px;font-size: 16px;display: block;margin-top: -10px;height: 20px;color: #009A69;}
|
|
|
- span{font-size: 14px;}
|
|
|
- }
|
|
|
+ height:84px;padding:0 10px;font:16px/32px '';color:#333;background: #F9F9F9;display: flex; align-items: center;text-align: center;
|
|
|
+ div{
|
|
|
+ height: 15px;width: 20%;border-right: 1px solid #E0E0E0;color: #333;
|
|
|
+ b{line-height: 20px;font-size: 16px;display: block;margin-top: -10px;height: 20px;color: #009A69;}
|
|
|
+ span{font-size: 14px;}
|
|
|
+ }
|
|
|
div:last-child{border-right:none}
|
|
|
- }
|
|
|
+ }
|
|
|
.title{height: 50px;line-height: 50px;}
|
|
|
</style>
|
