|
@@ -682,15 +682,15 @@ export default {
|
|
trigger: "axis",
|
|
trigger: "axis",
|
|
textStyle: { fontSize: '100%' },
|
|
textStyle: { fontSize: '100%' },
|
|
formatter: params => {
|
|
formatter: params => {
|
|
- let rander = params.map(item =>
|
|
|
|
|
|
+ let rander = params.map((item ,itemindex) =>
|
|
`
|
|
`
|
|
-
|
|
|
|
<div style='
|
|
<div style='
|
|
border:none;
|
|
border:none;
|
|
border-radius:3px;
|
|
border-radius:3px;
|
|
color:#FFF;
|
|
color:#FFF;
|
|
font-size:12px
|
|
font-size:12px
|
|
'>
|
|
'>
|
|
|
|
+ ${itemindex == 0 ? `<div>${item.axisValue}</div>` : ''}
|
|
${item.seriesName}: ${item.value}
|
|
${item.seriesName}: ${item.value}
|
|
</div>`).join('')
|
|
</div>`).join('')
|
|
return rander
|
|
return rander
|
|
@@ -704,7 +704,7 @@ export default {
|
|
containLabel: true
|
|
containLabel: true
|
|
},
|
|
},
|
|
legend: {
|
|
legend: {
|
|
- data: ['完成收储', '计划收储'],
|
|
|
|
|
|
+ data: ['完成供应', '计划供应'],
|
|
left: '7%',
|
|
left: '7%',
|
|
top: '5%',
|
|
top: '5%',
|
|
textStyle: {
|
|
textStyle: {
|
|
@@ -783,8 +783,8 @@ export default {
|
|
0
|
|
0
|
|
],
|
|
],
|
|
top: '92%',
|
|
top: '92%',
|
|
- "start": 0,
|
|
|
|
- "end": 8,
|
|
|
|
|
|
+ startValue: 0,
|
|
|
|
+ endValue: 5,
|
|
handleIcon: 'path://M306.1,413c0,2.2-1.8,4-4,4h-59.8c-2.2,0-4-1.8-4-4V200.8c0-2.2,1.8-4,4-4h59.8c2.2,0,4,1.8,4,4V413z',
|
|
handleIcon: 'path://M306.1,413c0,2.2-1.8,4-4,4h-59.8c-2.2,0-4-1.8-4-4V200.8c0-2.2,1.8-4,4-4h59.8c2.2,0,4,1.8,4,4V413z',
|
|
handleSize: '110%',
|
|
handleSize: '110%',
|
|
handleStyle: {
|
|
handleStyle: {
|
|
@@ -803,7 +803,7 @@ export default {
|
|
"end": 35
|
|
"end": 35
|
|
}],
|
|
}],
|
|
series: [{
|
|
series: [{
|
|
- name: '完成收储',
|
|
|
|
|
|
+ name: '完成供应',
|
|
type: 'bar',
|
|
type: 'bar',
|
|
barWidth: '12px',
|
|
barWidth: '12px',
|
|
itemStyle: {
|
|
itemStyle: {
|
|
@@ -820,7 +820,7 @@ export default {
|
|
data: result[0].data
|
|
data: result[0].data
|
|
}
|
|
}
|
|
, {
|
|
, {
|
|
- name: "计划收储",
|
|
|
|
|
|
+ name: "计划供应",
|
|
type: 'line',
|
|
type: 'line',
|
|
smooth: true,
|
|
smooth: true,
|
|
itemStyle: {
|
|
itemStyle: {
|
|
@@ -1062,18 +1062,18 @@ export default {
|
|
let xdata = [];
|
|
let xdata = [];
|
|
let result = [
|
|
let result = [
|
|
{
|
|
{
|
|
- name: "计划收储",
|
|
|
|
|
|
+ name: "计划供应",
|
|
data: [],
|
|
data: [],
|
|
},
|
|
},
|
|
{
|
|
{
|
|
- name: "完成收储",
|
|
|
|
|
|
+ name: "完成供应",
|
|
data: [],
|
|
data: [],
|
|
},
|
|
},
|
|
];
|
|
];
|
|
data.data.forEach((res) => {
|
|
data.data.forEach((res) => {
|
|
xdata.push(res.tdyt);
|
|
xdata.push(res.tdyt);
|
|
- result[0].data.push(res.jh_crmj);
|
|
|
|
- result[1].data.push(res.sj_crmj);
|
|
|
|
|
|
+ result[0].data.push(res.sj_crmj);
|
|
|
|
+ result[1].data.push(res.jh_crmj);
|
|
});
|
|
});
|
|
|
|
|
|
// store.state.cockpit_tdgy.gy_jg.xdata = xdata;
|
|
// store.state.cockpit_tdgy.gy_jg.xdata = xdata;
|