|
|
@@ -96,23 +96,28 @@
|
|
|
<h4 style="text-align:center;">泌乳牛干物质采食量</h4>
|
|
|
<div v-if="tab.chart1.isChart" class="button">
|
|
|
<div class="chartButton">
|
|
|
- <el-radio-group v-model="tab.chart1.getdataListParm.parammaps.specificDate" class="specificDate" size="mini" style="display: inline-block;" @change="changeChartSpecificDate('chart1')">
|
|
|
+ <my-select ref="tenantselect" :model="tab.chart1.getdataListParm.parammaps.statisticsList" :option="tab.chart1.statisticsList" :value="'name'" :label="'name'" style="width: 150px;margin-right: 5px;margin-top: 5px;float: left;" placeholder="请选择统计参数" @searchSelect="changeStatisticChart1" />
|
|
|
+ <el-select v-model="tab.chart1.getdataListParm.parammaps.ccname" filterable placeholder="牲畜类别" class="filter-item" clearable style="width: 150px;margin-right: 5px;margin-top: 5px;" @change="changeLivestockType">
|
|
|
+ <el-option v-for="item in tab.chart1.livestockTypeList" :key="item.value" :label="item.label" :value="item.label" />
|
|
|
+ </el-select>
|
|
|
+ <el-radio-group v-model="tab.chart1.getdataListParm.parammaps.specificDate" class="specificDate" size="mini" style="display: inline-block;margin-right: 10px;" @change="changeChartSpecificDate('chart1')">
|
|
|
<el-radio-button label="1" border>日</el-radio-button>
|
|
|
<!-- <el-radio-button label="2" border>周</el-radio-button> -->
|
|
|
<el-radio-button label="3" border>月</el-radio-button>
|
|
|
</el-radio-group>
|
|
|
- <div v-show="tab.chart1.getdataListParm.parammaps.specificDate == '1'" class="day" style="display: inline-block;margin-left:10px;">
|
|
|
+ <!-- <br/> -->
|
|
|
+ <div v-show="tab.chart1.getdataListParm.parammaps.specificDate == '1'" class="day" style="display: inline-block;margin-top: 5px;">
|
|
|
<el-date-picker v-model="tab.chart1.getdataListParm.parammaps.inputDatetime" style="width:220px;" :clearable="false" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptionsDate" />
|
|
|
</div>
|
|
|
- <div v-show="tab.chart1.getdataListParm.parammaps.specificDate == '2'" class="week" style="display: inline-block; clear: both;margin-left:10px;">
|
|
|
- <el-select v-model="tab.chart1.getdataListParm.parammaps.selectYear" class="filter-item" style="width:80px;margin-right:10px;" placeholder="年份" @change="changeChartYear('chart1')">
|
|
|
+ <div v-show="tab.chart1.getdataListParm.parammaps.specificDate == '2'" class="week" style="display: inline-block; clear: both;">
|
|
|
+ <el-select v-model="tab.chart1.getdataListParm.parammaps.selectYear" class="filter-item" style="width:80px;margin-right:10px;margin-top: 5px;" placeholder="年份" @change="changeChartYear('chart1')">
|
|
|
<el-option v-for="item in tab.yearList" :key="item" :label="item" :value="item" />
|
|
|
</el-select>
|
|
|
<el-select v-model="tab.chart1.getdataListParm.parammaps.selectWeek" class="filter-item" style="width:160px;" multiple :multiple-limit="2" placeholder="请选择周">
|
|
|
<el-option v-for="(item,index) in tab.chart1.getdataListParm.parammaps.weekList" :key="index" :label="item.name" :value="item.id" />
|
|
|
</el-select>
|
|
|
</div>
|
|
|
- <div v-show="tab.chart1.getdataListParm.parammaps.specificDate == '3'" class="month" style="display: inline-block;margin-left:10px;">
|
|
|
+ <div v-show="tab.chart1.getdataListParm.parammaps.specificDate == '3'" class="month" style="display: inline-block;">
|
|
|
<el-date-picker v-model="tab.chart1.getdataListParm.parammaps.chartMonth" style="width:220px;" :clearable="false" value-format="yyyy-MM-dd" type="monthrange" class="inputDatetime filter-item" range-separator="至" :picker-options="pickerOptionsMonth" />
|
|
|
</div>
|
|
|
<el-button class="successBorder" style="margin-left:10px;" @click="handleChartDate('chart1')">确认</el-button>
|
|
|
@@ -217,6 +222,7 @@
|
|
|
<h4 style="text-align:center;">混料时间统计</h4>
|
|
|
<div v-if="tab.chart3.isChart" class="button">
|
|
|
<div class="chartButton">
|
|
|
+ <my-select ref="tenantselect" :model="tab.chart3.getdataListParm.parammaps.statisticsList" :option="tab.chart3.statisticsList" :value="'name'" :label="'name'" style="width: 150px;margin-right: 5px;float: left;" placeholder="请选择统计参数" @searchSelect="changeStatisticChart3" />
|
|
|
<el-radio-group v-model="tab.chart3.getdataListParm.parammaps.specificDate" class="specificDate" size="mini" style="display: inline-block;" @change="changeChartSpecificDate('chart3')">
|
|
|
<el-radio-button label="1" border>日</el-radio-button>
|
|
|
<!-- <el-radio-button label="2" border>周</el-radio-button> -->
|
|
|
@@ -264,7 +270,8 @@
|
|
|
class="elTable table-fixed"
|
|
|
>
|
|
|
<el-table-column sortable label="日期" min-width="110px" align="center" prop="日期" />
|
|
|
- <el-table-column sortable label="混料时间（分钟）" min-width="110px" align="center" prop="field1" />
|
|
|
+ <el-table-column sortable label="配方名称" min-width="110px" align="center" prop="名称" />
|
|
|
+ <el-table-column sortable label="准确率" min-width="110px" align="center" prop="准确率" />
|
|
|
</el-table>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -541,7 +548,7 @@
|
|
|
import echarts from 'echarts'
|
|
|
|
|
|
require('echarts/theme/macarons')
|
|
|
-import { GetDataByName, postJson, GetReportform, whichWeek } from '@/api/common'
|
|
|
+import { GetDataByName, postJson, GetReportform, whichWeek,GetDataByNames } from '@/api/common'
|
|
|
import Cookies from 'js-cookie'
|
|
|
import { parseTime } from '@/utils/index.js'
|
|
|
import Pagination from '@/components/Pagination'
|
|
|
@@ -678,6 +685,7 @@ export default {
|
|
|
chart1: {
|
|
|
chartLine: null,
|
|
|
chartLine_data: {},
|
|
|
+ livestockTypeList: [], // 牲畜类别
|
|
|
getdataListParm: {
|
|
|
name: 'getFeedEffMR',
|
|
|
page: 1,
|
|
|
@@ -695,13 +703,16 @@ export default {
|
|
|
chartMonth: '',
|
|
|
yearList: [],
|
|
|
weekList: [],
|
|
|
- status: 0
|
|
|
+ status: 0,
|
|
|
+ ccname:''
|
|
|
}
|
|
|
},
|
|
|
tableKey: 1,
|
|
|
list: [],
|
|
|
total: 0,
|
|
|
listLoading: true,
|
|
|
+ statisticsList:[],
|
|
|
+ chart1Data3:[],
|
|
|
isChart: true,
|
|
|
isTable: false,
|
|
|
table: {
|
|
|
@@ -778,6 +789,8 @@ export default {
|
|
|
list: [],
|
|
|
total: 0,
|
|
|
listLoading: true,
|
|
|
+ statisticsList: [],
|
|
|
+ chart3Data3: [],
|
|
|
isChart: true,
|
|
|
isTable: false,
|
|
|
table: {
|
|
|
@@ -956,6 +969,9 @@ export default {
|
|
|
tab2Download2List3:[],
|
|
|
tab2Download2List4:[],
|
|
|
frequencyList:[],
|
|
|
+ requestParams: [
|
|
|
+ {"name":"getCowclassList","page":1,"offset":1,"pagecount":50,"returntype":"Map","parammaps":{"pastureid":Cookies.get('pastureid'),"classname":"","parentname":"","enable":1}},
|
|
|
+ ],
|
|
|
rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
|
|
|
cellStyle: { padding: 0 + 'px' },
|
|
|
myHeight: document.documentElement.clientHeight - 85 - 210
|
|
|
@@ -963,6 +979,7 @@ export default {
|
|
|
},
|
|
|
created() {
|
|
|
this.getAllYear()
|
|
|
+ this.getDownList()
|
|
|
this.getTabList()
|
|
|
this.getTimeFn()
|
|
|
this.getChart1()
|
|
|
@@ -973,6 +990,15 @@ export default {
|
|
|
this.getIsDisplay()
|
|
|
},
|
|
|
methods: {
|
|
|
+ getDownList() {
|
|
|
+ GetDataByNames(this.requestParams).then(response => {
|
|
|
+ this.tab.chart1.livestockTypeList = response.data.getCowclassList.list
|
|
|
+ for(var i=0;i<this.tab.chart1.livestockTypeList.length;i++){
|
|
|
+ this.tab.chart1.livestockTypeList[i].label = this.tab.chart1.livestockTypeList[i].classname;
|
|
|
+ this.tab.chart1.livestockTypeList[i].value = this.tab.chart1.livestockTypeList[i].id;
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
getIsDisplay() {
|
|
|
GetDataByName(this.tab.maxTime.getMaxTimesParm).then(response => {
|
|
|
console.log(response.data.list[0].inforvalue)
|
|
|
@@ -1892,6 +1918,36 @@ export default {
|
|
|
handleQuickJumpTop() {
|
|
|
window.scrollTo(0, 0)
|
|
|
},
|
|
|
+
|
|
|
+ // 泌乳牛干物质采食量
|
|
|
+ changeStatisticChart1(arr) {
|
|
|
+ console.log(arr,'arr===')
|
|
|
+ var arr1 = []
|
|
|
+ for (let i = 0; i < arr.length; i++) {
|
|
|
+ if (arr[i] !== 'all') {
|
|
|
+ arr1.push(arr[i])
|
|
|
+ }
|
|
|
+ }
|
|
|
+ this.tab.chart1.getdataListParm.parammaps.statisticsList = arr1
|
|
|
+ console.log(this.tab.chart1.getdataListParm.parammaps.statisticsList,'=====0000')
|
|
|
+ var arrData3 = []
|
|
|
+ for (let i = 0; i < this.tab.chart1.getdataListParm.parammaps.statisticsList.length; i++) {
|
|
|
+ const myId = this.tab.chart1.statisticsList.find(obj => obj.name == this.tab.chart1.getdataListParm.parammaps.statisticsList[i]).id
|
|
|
+ for (let j = 0; j < this.tab.chart1.chart1Data3.length; j++) {
|
|
|
+ if (j == myId) {
|
|
|
+ arrData3.push(this.tab.chart1.chart1Data3[j])
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ console.log(arrData3,'arrData3')
|
|
|
+ this.tab.chart1.chartLine_data.data3 = arrData3
|
|
|
+
|
|
|
+ this.tab.chart1.chartLine_data.data3 = this.tab.chart1.getdataListParm.parammaps.statisticsList
|
|
|
+ this.roadChartLine1(this.tab.chart1.chartLine_data)
|
|
|
+ },
|
|
|
+ changeLivestockType(){
|
|
|
+ this.getChart1()
|
|
|
+ },
|
|
|
// 泌乳牛干物质采食量
|
|
|
getChart1() {
|
|
|
this.tab.chart1.listLoading = true
|
|
|
@@ -1910,23 +1966,66 @@ export default {
|
|
|
data.parammaps.status = this.tab.chart1.getdataListParm.parammaps.status
|
|
|
}
|
|
|
postJson(url, data).then(response => {
|
|
|
- if (response.data !== null && response.data.list !== null && response.data.data !== null) {
|
|
|
- console.log('泌乳牛干物质采食量图表数据', response.data.list)
|
|
|
- for (let i = 0; i < response.data.data.length; i++) {
|
|
|
- if (response.data.data[i].field1 !== '' && response.data.data[i].field1 !== undefined) {
|
|
|
- response.data.data[i].field1 = parseFloat(response.data.data[i].field1)
|
|
|
- }
|
|
|
- if (response.data.data[i].field2 !== '' && response.data.data[i].field2 !== undefined) {
|
|
|
- response.data.data[i].field2 = parseFloat(response.data.data[i].field2)
|
|
|
- }
|
|
|
+ // if (response.data !== null && response.data.list !== null && response.data.data !== null) {
|
|
|
+ // console.log('泌乳牛干物质采食量图表数据', response.data.list)
|
|
|
+ // for (let i = 0; i < response.data.data.length; i++) {
|
|
|
+ // if (response.data.data[i].field1 !== '' && response.data.data[i].field1 !== undefined) {
|
|
|
+ // response.data.data[i].field1 = parseFloat(response.data.data[i].field1)
|
|
|
+ // }
|
|
|
+ // if (response.data.data[i].field2 !== '' && response.data.data[i].field2 !== undefined) {
|
|
|
+ // response.data.data[i].field2 = parseFloat(response.data.data[i].field2)
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // this.tab.chart1.table.list = response.data.data
|
|
|
+ // this.tab.chart1.chartLine_data = response.data.list
|
|
|
+ // this.tab.chart1.chartLine_data = {
|
|
|
+ // chartType:'line_bar',
|
|
|
+ // date: ['2019-01', '2019-02', '2019-03', '2019-04', '2019-05', '2019-06', '2019-07', '2019-08', '2019-09', '2019-10', '2019-11', '2019-12'],
|
|
|
+ // legendArr1: ['采食量-数据1', '采食量-数据2', '采食量-数据3', '采食量-数据4' ],
|
|
|
+ // dataArr1:[
|
|
|
+ // [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
|
|
|
+ // [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
|
|
|
+ // [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
|
|
|
+ // [2, 10, 3, 2, 10, 4, 4, 9, 3, 9, 3, 8],
|
|
|
+ // ],
|
|
|
+ // legendArr2: ['产奶量-数据1', '产奶量-数据2'],
|
|
|
+ // dataArr2:[
|
|
|
+ // [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 5],
|
|
|
+ // [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
|
|
|
+ // ],
|
|
|
+ // }
|
|
|
+ this.tab.chart1.chartLine_data = response.data
|
|
|
+ this.tab.chart1.chartLine_data.legendArr1 = []
|
|
|
+ this.tab.chart1.chartLine_data.legendArr2 = []
|
|
|
+ response.data.ftname.forEach((item)=>{
|
|
|
+ var str1 = '采食量-' + item
|
|
|
+ this.tab.chart1.chartLine_data.legendArr1.push(str1)
|
|
|
+ })
|
|
|
+ response.data.ftname.forEach((item)=>{
|
|
|
+ var str2 = '产奶量-' + item
|
|
|
+ this.tab.chart1.chartLine_data.legendArr2.push(str2)
|
|
|
+ })
|
|
|
+ // this.tab.chart1.chartLine_data.legendArr1 = this.tab.chart1.chartLine_data.ftname
|
|
|
+ // this.tab.chart1.chartLine_data.legendArr2 = this.tab.chart1.chartLine_data.ftname
|
|
|
+ var data3 = this.tab.chart1.chartLine_data.legendArr1.concat(this.tab.chart1.chartLine_data.legendArr2)
|
|
|
+
|
|
|
+ this.tab.chart1.chartLine_data.data3 = Array.from(new Set(data3))
|
|
|
+ this.tab.chart1.getdataListParm.parammaps.statisticsList = []
|
|
|
+ this.tab.chart1.statisticsList = []
|
|
|
+ console.log(data3,'data3')
|
|
|
+ for (let i = 0; i < data3.length; i++) {
|
|
|
+ this.tab.chart1.getdataListParm.parammaps.statisticsList.push(data3[i])
|
|
|
+ var obj = {}
|
|
|
+ obj.id = i
|
|
|
+ obj.name = data3[i]
|
|
|
+ this.tab.chart1.statisticsList.push(obj)
|
|
|
}
|
|
|
- this.tab.chart1.table.list = response.data.data
|
|
|
- this.tab.chart1.chartLine_data = response.data.list
|
|
|
+ console.log(this.tab.chart1.getdataListParm.parammaps.statisticsList,'statisticsList')
|
|
|
// this.tab.chart1.total = response.data.total
|
|
|
- } else {
|
|
|
- this.tab.chart1.list = []
|
|
|
- this.tab.chart1.chartLine_data = {}
|
|
|
- }
|
|
|
+ // } else {
|
|
|
+ // this.tab.chart1.list = []
|
|
|
+ // this.tab.chart1.chartLine_data = {}
|
|
|
+ // }
|
|
|
this.roadChartLine1(this.tab.chart1.chartLine_data)
|
|
|
setTimeout(() => {
|
|
|
this.tab.chart1.listLoading = false
|
|
|
@@ -1938,19 +2037,50 @@ export default {
|
|
|
this.tab.chart1.chartLine.dispose()
|
|
|
}
|
|
|
this.tab.chart1.chartLine = echarts.init(document.getElementById('chartLine1'))
|
|
|
+ console.log(chartLine_data,'chartLine_data')
|
|
|
var option = {
|
|
|
- tooltip: { trigger: 'axis', axisPointer: { type: 'cross', crossStyle: { color: '#999' }}},
|
|
|
- legend: { data: ['泌乳牛干物质采食量', '泌乳牛产奶量'], right: 10, show: true, type: 'scroll' },
|
|
|
+ tooltip: {
|
|
|
+ trigger: "axis",
|
|
|
+ axisPointer: { type: 'cross', crossStyle: { color: '#999' }},
|
|
|
+ },
|
|
|
+ legend: {
|
|
|
+ data:chartLine_data.data3,
|
|
|
+ right: 10, show: true, type: 'scroll' ,
|
|
|
+ },
|
|
|
grid: { top: '15%', left: '8%', right: '8%', containLabel: true },
|
|
|
- xAxis: [{ type: 'category', data: chartLine_data.data1 }],
|
|
|
+ xAxis: [{ type: 'category', data: chartLine_data.date }],
|
|
|
yAxis: [
|
|
|
{ splitLine: { show: false }, type: 'value', name: '泌乳牛干物质\n采食量', axisLabel: { formatter: '{value} ' }},
|
|
|
{ splitLine: { show: false }, type: 'value', name: '泌乳牛产奶量', axisLabel: { formatter: '{value} ' }}
|
|
|
],
|
|
|
- series: [
|
|
|
- { name: '泌乳牛干物质采食量', type: 'bar', itemStyle: { normal: { color: '#61a5e8' }}, data: chartLine_data.data2 },
|
|
|
- { name: '泌乳牛产奶量', type: 'line', itemStyle: { normal: { color: '#ff2d2d' }}, yAxisIndex: 1, data: chartLine_data.data3 }
|
|
|
- ]
|
|
|
+ // series: [
|
|
|
+ // { name: '泌乳牛干物质采食量', type: 'bar', itemStyle: { normal: { color: '#61a5e8' }}, data: chartLine_data.data2 },
|
|
|
+ // { name: '泌乳牛产奶量', type: 'line', itemStyle: { normal: { color: '#ff2d2d' }}, yAxisIndex: 1, data: chartLine_data.data3 }
|
|
|
+ // ]
|
|
|
+ series: function (e) {
|
|
|
+ var serie = [];
|
|
|
+ for (var i = 0; i < chartLine_data.date.length; i++) {
|
|
|
+ var item = {
|
|
|
+ name: chartLine_data.legendArr1[i],
|
|
|
+ data: chartLine_data.dataArr1[i],
|
|
|
+ type: 'line',
|
|
|
+ emphasis: { label: { show: true, position: 'inside' } },
|
|
|
+ }
|
|
|
+ serie.push(item);
|
|
|
+ }
|
|
|
+
|
|
|
+ for (var i = 0; i < chartLine_data.date.length; i++) {
|
|
|
+ var item = {
|
|
|
+ name: chartLine_data.legendArr2[i],
|
|
|
+ data: chartLine_data.dataArr2[i],
|
|
|
+ type: 'bar',
|
|
|
+ yAxisIndex: 1,
|
|
|
+ emphasis: { label: { show: true, position: 'inside' } },
|
|
|
+ }
|
|
|
+ serie.push(item);
|
|
|
+ }
|
|
|
+ return serie;
|
|
|
+ }()
|
|
|
}
|
|
|
this.tab.chart1.chartLine.setOption(option)
|
|
|
window.onresize = function() {
|
|
|
@@ -2090,6 +2220,11 @@ export default {
|
|
|
type: 'line',
|
|
|
data: chartLine_data.data3[i].data
|
|
|
}
|
|
|
+ var item2 = {
|
|
|
+ name: chartLine_data.data1[i],
|
|
|
+ type: '',
|
|
|
+ data: chartLine_data.data3[i].data
|
|
|
+ }
|
|
|
serie.push(item)
|
|
|
}
|
|
|
}
|
|
|
@@ -2104,6 +2239,27 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
|
|
|
+ changeStatisticChart3(arr) {
|
|
|
+ var arr1 = []
|
|
|
+ for (let i = 0; i < arr.length; i++) {
|
|
|
+ if (arr[i] !== 'all') {
|
|
|
+ arr1.push(arr[i])
|
|
|
+ }
|
|
|
+ }
|
|
|
+ this.tab.chart3.getdataListParm.parammaps.statisticsList = arr1
|
|
|
+ var arrData3 = []
|
|
|
+ for (let i = 0; i < this.tab.chart3.getdataListParm.parammaps.statisticsList.length; i++) {
|
|
|
+ const myId = this.tab.chart3.statisticsList.find(obj => obj.name == this.tab.chart3.getdataListParm.parammaps.statisticsList[i]).id
|
|
|
+ for (let j = 0; j < this.tab.chart3.chart3Data3.length; j++) {
|
|
|
+ if (j == myId) {
|
|
|
+ arrData3.push(this.tab.chart3.chart3Data3[j])
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ this.tab.chart3.chartLine_data.data3 = arrData3
|
|
|
+ this.tab.chart3.chartLine_data.data1 = this.tab.chart3.getdataListParm.parammaps.statisticsList
|
|
|
+ this.roadChartLine3(this.tab.chart3.chartLine_data)
|
|
|
+ },
|
|
|
// 混料时间统计
|
|
|
getChart3() {
|
|
|
this.tab.chart3.listLoading = true
|
|
|
@@ -2127,7 +2283,32 @@ export default {
|
|
|
this.tab.chart3.table.list = response.data.data
|
|
|
this.tab.chart3.chartLine_data = response.data.list
|
|
|
this.tab.chart3.total = response.data.total
|
|
|
+ this.tab.chart3.statisticsList = []
|
|
|
+ this.tab.chart3.getdataListParm.parammaps.statisticsList = []
|
|
|
+ for (let i = 0; i < response.data.list.data1.length; i++) {
|
|
|
+ // if (i < 10) {
|
|
|
+ this.tab.chart3.getdataListParm.parammaps.statisticsList.push(response.data.list.data1[i])
|
|
|
+ // }
|
|
|
+ var obj = {}
|
|
|
+ obj.id = i
|
|
|
+ obj.name = response.data.list.data1[i]
|
|
|
+ this.tab.chart3.statisticsList.push(obj)
|
|
|
+ }
|
|
|
+ this.tab.chart3.chart3Data3 = response.data.list.data3
|
|
|
this.tab.chart3.total = response.data.total
|
|
|
+ console.log('牛栏剩料率图数据', this.tab.chart3.chartLine_data)
|
|
|
+ console.log('牛栏剩料率表数据', this.tab.chart3.table.list)
|
|
|
+ var arrData3 = []
|
|
|
+ for (let i = 0; i < this.tab.chart3.getdataListParm.parammaps.statisticsList.length; i++) {
|
|
|
+ const myId = this.tab.chart3.statisticsList.find(obj => obj.name == this.tab.chart3.getdataListParm.parammaps.statisticsList[i]).id
|
|
|
+ for (let j = 0; j < this.tab.chart3.chart3Data3.length; j++) {
|
|
|
+ if (j == myId) {
|
|
|
+ arrData3.push(this.tab.chart3.chart3Data3[j])
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ this.tab.chart3.chartLine_data.data3 = arrData3
|
|
|
+ this.tab.chart3.chartLine_data.data1 = this.tab.chart3.getdataListParm.parammaps.statisticsList
|
|
|
} else {
|
|
|
this.tab.chart3.list = []
|
|
|
this.tab.chart3.chartLine_data = {}
|
|
|
@@ -2150,10 +2331,7 @@ export default {
|
|
|
tooltip: {
|
|
|
trigger: 'axis'
|
|
|
},
|
|
|
- legend: {
|
|
|
- data: ['混料时间'],
|
|
|
- right: 10, show: true, type: 'scroll'
|
|
|
- },
|
|
|
+ legend: { data: chartLine_data.data1, right: 10, show: true, type: 'scroll' },
|
|
|
grid: {
|
|
|
top: '15%',
|
|
|
left: '5%',
|
|
|
@@ -2165,21 +2343,27 @@ export default {
|
|
|
right: '2%',
|
|
|
feature: {}
|
|
|
},
|
|
|
- xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data1, name: '日期' },
|
|
|
+ xAxis: { type: 'category', boundaryGap: false, data: chartLine_data.data2, name: '日期' },
|
|
|
yAxis: {
|
|
|
type: 'value', name: '分钟',
|
|
|
axisLabel: {
|
|
|
formatter: '{value}min'
|
|
|
}
|
|
|
},
|
|
|
- series: [
|
|
|
- {
|
|
|
- name: '混料时间',
|
|
|
- type: 'line',
|
|
|
- stack: '总量',
|
|
|
- data: chartLine_data.data2
|
|
|
+ series: (function() {
|
|
|
+ var serie = []
|
|
|
+ if (chartLine_data.data3 !== undefined) {
|
|
|
+ for (var i = 0; i < chartLine_data.data3.length; i++) {
|
|
|
+ var item = {
|
|
|
+ name: chartLine_data.data1[i],
|
|
|
+ type: 'line',
|
|
|
+ data: chartLine_data.data3[i].data
|
|
|
+ }
|
|
|
+ serie.push(item)
|
|
|
+ }
|
|
|
}
|
|
|
- ]
|
|
|
+ return serie
|
|
|
+ }())
|
|
|
}
|
|
|
this.tab.chart3.chartLine.setOption(option)
|
|
|
window.onresize = function() {
|
|
|
@@ -2472,8 +2656,8 @@ export default {
|
|
|
console.log('混料时间统计导出')
|
|
|
var excelDatasTabChart3 = [
|
|
|
{
|
|
|
- tHeader: ['日期', '混料时间（分钟）'],
|
|
|
- filterVal: ['日期', 'field1'],
|
|
|
+ tHeader: ['日期', '配方名称','准确率'],
|
|
|
+ filterVal: ['日期', '名称','准确率'],
|
|
|
tableDatas: this.tab.chart3.table.list,
|
|
|
sheetName: '混料时间统计'
|
|
|
}
|
|
|
@@ -2646,7 +2830,7 @@ export default {
|
|
|
</script>
|
|
|
<style lang="scss" scoped>
|
|
|
.button{
|
|
|
- height: 95px;
|
|
|
+ height: 130px;
|
|
|
.exportTable2{float: right;margin-right: 5px;margin-top: 5px;}
|
|
|
}
|
|
|
.app-container1{padding-left: 10px;background-color: #F4F4F4;}
|
