|
@@ -14,6 +14,7 @@
|
|
|
height="100%"
|
|
|
chartsType="listMonitor"
|
|
|
:option="echartsOption"
|
|
|
+ :chartsColumns="chartsColumns"
|
|
|
/>
|
|
|
</div>
|
|
|
<div class="charts-box" v-else-if="chartsType === 'detail' && deviceListApi">
|
|
@@ -30,7 +31,9 @@
|
|
|
:xAxisPropType="resultXAxisPropType"
|
|
|
:dataSource="detailDataSource"
|
|
|
height="100%"
|
|
|
+ :option="echartsOption2"
|
|
|
chartsType="detail"
|
|
|
+ :chartsColumns="chartsColumns"
|
|
|
/>
|
|
|
</div>
|
|
|
<div class="charts-box" v-else-if="chartsType === 'history'">
|
|
@@ -80,6 +83,7 @@
|
|
|
:option="echartsOption1"
|
|
|
chartsType="history"
|
|
|
style="margin-top: 20px;"
|
|
|
+ :chartsColumns="chartsColumns"
|
|
|
/>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -156,10 +160,22 @@
|
|
|
};
|
|
|
const echartsOption1 = {
|
|
|
grid: {
|
|
|
- top: '60px',
|
|
|
+ top: '70px',
|
|
|
+ left: '10px',
|
|
|
+ right: '5px',
|
|
|
+ bottom: '5%',
|
|
|
+ containLabel: true,
|
|
|
+ },
|
|
|
+ toolbox: {
|
|
|
+ feature: {},
|
|
|
+ },
|
|
|
+ };
|
|
|
+ const echartsOption2 = {
|
|
|
+ grid: {
|
|
|
+ top: '70px',
|
|
|
left: '10px',
|
|
|
right: '5px',
|
|
|
- bottom: '10%',
|
|
|
+ bottom: '2%',
|
|
|
containLabel: true,
|
|
|
},
|
|
|
toolbox: {
|
|
@@ -247,6 +263,7 @@
|
|
|
total,
|
|
|
echartsOption,
|
|
|
echartsOption1,
|
|
|
+ echartsOption2,
|
|
|
onChange,
|
|
|
};
|
|
|
},
|