|
|
@@ -3,15 +3,14 @@ |
|
|
|
:visible="visible" |
|
|
|
title="烧制温度" |
|
|
|
class="temperature-dialog" |
|
|
|
width="80%" |
|
|
|
width="90%" |
|
|
|
@close="handleClose" |
|
|
|
:destroy-on-close="false" |
|
|
|
:close-on-click-modal="false" |
|
|
|
> |
|
|
|
:close-on-click-modal="false"> |
|
|
|
<div class="data-list"> |
|
|
|
<BaseListTable |
|
|
|
v-loading="tableLoading" |
|
|
|
style="height: 85%" |
|
|
|
style="height: 90%" |
|
|
|
:table-config="{ height: '100%' }" |
|
|
|
:column-config="tableConfig" |
|
|
|
:table-data="dataList" |
|
|
@@ -30,8 +29,9 @@ |
|
|
|
:total="totalPage" |
|
|
|
layout="total, sizes, prev, pager, next, jumper"></el-pagination> |
|
|
|
</div> |
|
|
|
<div class="temp-chart" style="height: 300px;"> |
|
|
|
<div id="temp-chart" class="temp-chart__inner" style="height: 100%;" /> |
|
|
|
<div class="temp-chart" style="height: 100%; overflow: hidden;"> |
|
|
|
<div id="temp-chart" class="temp-chart__inner" style="height: 100%; background:#ccc;" /> |
|
|
|
<!-- <div id="lambda-chart" class="lambda-chart__inner" style="height: 50%; background: #f001;" /> --> |
|
|
|
</div> |
|
|
|
</el-dialog> |
|
|
|
</template> |
|
|
@@ -93,14 +93,14 @@ export default { |
|
|
|
if (res.code === 0) { |
|
|
|
if ("list" in res.data) { |
|
|
|
this.dataList = res.data.list; |
|
|
|
this.totalPage = res.data.total |
|
|
|
this.totalPage = res.data.total; |
|
|
|
} else if (Array.isArray(res.data)) { |
|
|
|
this.dataList = res.data; |
|
|
|
this.totalPage = res.data.length |
|
|
|
this.totalPage = res.data.length; |
|
|
|
} // else ... |
|
|
|
} else { |
|
|
|
this.dataList.splice(0); |
|
|
|
this.totalPage = 0 |
|
|
|
this.totalPage = 0; |
|
|
|
} |
|
|
|
// this.dataList = [ |
|
|
|
// { id: 1, code: 1, press1: 1, press2: 1, createTime: "2023-4-21 01:00:00", temp1: 1000 }, |
|
|
@@ -122,7 +122,12 @@ export default { |
|
|
|
// 根据 dataList 绘制折线图 |
|
|
|
if (!this.chart) this.chart = echarts.init(document.getElementById("temp-chart")); |
|
|
|
// const y_data = Array(65).fill(0) |
|
|
|
this.chart.setOption(loadChartConfig(null, this.dataList.map(i => i.temp1))); |
|
|
|
this.chart.setOption( |
|
|
|
loadChartConfig( |
|
|
|
null, |
|
|
|
this.dataList.map((i) => i.temp1) |
|
|
|
) |
|
|
|
); |
|
|
|
}, |
|
|
|
handleOperate() {}, |
|
|
|
handlePageChange(page) { |
|
|
@@ -152,7 +157,7 @@ export default { |
|
|
|
.data-list, |
|
|
|
.temp-chart { |
|
|
|
/* border: 1px solid #ccc; */ |
|
|
|
width: 35%; |
|
|
|
width: 45%; |
|
|
|
overflow-y: auto; |
|
|
|
position: relative; |
|
|
|
} |
|
|
@@ -161,7 +166,7 @@ export default { |
|
|
|
flex: 1; |
|
|
|
/* margin-left: 18px; */ |
|
|
|
padding-left: 10px; |
|
|
|
margin-left: 10px; |
|
|
|
|
|
|
|
/* border-left: 1px solid #ccc; */ |
|
|
|
/* background-color: lightblue; */ |
|
|
|
} |
|
|
|