|
@@ -140,8 +140,7 @@ export default {
|
|
|
let buttonCode1 = ref('');
|
|
|
let buttonCode2 = ref('');
|
|
|
let deviceStatData=ref({"avgMonth":{},"currYield":{"jb":{},"rz":{}}});
|
|
|
- let typeUnitName = '';
|
|
|
- const dataTypeUnit={
|
|
|
+ const dataTypeUnit={
|
|
|
'Length':'米',
|
|
|
'Weight':'吨',
|
|
|
'price':'元/米',
|
|
@@ -149,8 +148,6 @@ export default {
|
|
|
'steam':'GJ',
|
|
|
'water':'m³',
|
|
|
};
|
|
|
- var line1_tipdata = {};
|
|
|
- var line2_tipdata = {};
|
|
|
let getDataTimer=null;
|
|
|
let getDataTimer1 = null;
|
|
|
let getDataTimer2 = null;
|
|
@@ -374,7 +371,6 @@ export default {
|
|
|
}
|
|
|
function LoadSCLine(dataType) {
|
|
|
buttonCode1.value = dataType;
|
|
|
- typeUnitName = dataTypeUnit[dataType];
|
|
|
let data = deviceStatData.value.prodTrade;
|
|
|
//生产趋势
|
|
|
//获取数据中weight、aweight、bweight
|
|
@@ -387,11 +383,11 @@ export default {
|
|
|
var tv = data[i]['date'];
|
|
|
times.push([tv,data[i].tips]);
|
|
|
if(dataType=='Length'){
|
|
|
- week_aefficiency.push(data[i]['jbLength'])
|
|
|
- week_befficiency.push(data[i]['rzLength'])
|
|
|
+ week_aefficiency.push({value:data[i]['jbLength'],type:'Length'})
|
|
|
+ week_befficiency.push({value:data[i]['rzLength'],type:'Length'})
|
|
|
}else{
|
|
|
- week_aefficiency.push(data[i]['jbWeight'])
|
|
|
- week_befficiency.push(data[i]['rzWeight'])
|
|
|
+ week_aefficiency.push({value:data[i]['jbWeight'],type:'Weight'})
|
|
|
+ week_befficiency.push({value:data[i]['rzWeight'],type:'Weight'})
|
|
|
}
|
|
|
}
|
|
|
if (week_aefficiency.length == 0 && week_befficiency.length==0) {
|
|
@@ -421,6 +417,7 @@ export default {
|
|
|
});
|
|
|
v_series.push({
|
|
|
name: "染整", type: 'bar', smooth: true, //symbol: 'none',
|
|
|
+ dataType:'Weight',
|
|
|
data: week_befficiency, itemStyle: {
|
|
|
normal: {
|
|
|
color: '#295589', // 这里设置折线的颜色
|
|
@@ -485,11 +482,10 @@ export default {
|
|
|
formatter: function (params) {
|
|
|
let xv='';
|
|
|
let result = '';
|
|
|
- console.log(params)
|
|
|
params.forEach(function (item) {
|
|
|
xv=`${item.name}`;
|
|
|
xv = xv.split(',')[1]+'<br>';
|
|
|
- result += ` ${item.marker} ${item.seriesName}: ${item.value}(`+typeUnitName+`)<br/>`;
|
|
|
+ result += ` ${item.marker} ${item.seriesName}: ${item.value}(`+dataTypeUnit[item.data.type]+`)<br/>`;
|
|
|
});
|
|
|
return xv+result;
|
|
|
}
|
|
@@ -546,7 +542,6 @@ export default {
|
|
|
}
|
|
|
function LoadUsedLine(dataType){
|
|
|
buttonCode2.value = dataType;
|
|
|
- typeUnitName = dataTypeUnit[dataType];
|
|
|
let data = deviceStatData.value.energyTrade;
|
|
|
//能耗趋势
|
|
|
var t = echarts_used_qushi.value;
|
|
@@ -556,8 +551,8 @@ export default {
|
|
|
var week_befficiency = [];
|
|
|
for (var i = 0; i < data.length; i++) {
|
|
|
times.push([data[i]['date'],data[i].tips]);
|
|
|
- if(data[i]['jb'][dataType]!=null) week_aefficiency.push(data[i]['jb'][dataType]);
|
|
|
- if(data[i]['rz'][dataType]!=null) week_befficiency.push(data[i]['rz'][dataType]);
|
|
|
+ if(data[i]['jb'][dataType]!=null) week_aefficiency.push({value:data[i]['jb'][dataType],type:dataType});
|
|
|
+ if(data[i]['rz'][dataType]!=null) week_befficiency.push({value:data[i]['rz'][dataType],type:dataType});
|
|
|
}
|
|
|
if (week_aefficiency.length> 0) {
|
|
|
v_series.push({
|
|
@@ -610,7 +605,7 @@ export default {
|
|
|
params.forEach(function (item) {
|
|
|
xv=`${item.name}`;
|
|
|
xv = xv.split(',')[1]+'<br>';
|
|
|
- result += ` ${item.marker} ${item.seriesName}: ${item.value}(`+typeUnitName+`)<br/>`;
|
|
|
+ result += ` ${item.marker} ${item.seriesName}: ${item.value}(`+dataTypeUnit[item.data.type]+`)<br/>`;
|
|
|
});
|
|
|
return xv+result;
|
|
|
}
|