Commit 872267ad authored by co_dengxiongwen's avatar co_dengxiongwen

tj

parent a6e685a9
...@@ -41,8 +41,8 @@ el-container(style="padding:0px;height:77.6vh;") ...@@ -41,8 +41,8 @@ el-container(style="padding:0px;height:77.6vh;")
span.unit PPM span.unit PPM
table-list(:tableColums='tableHeader' :tableData='dataList' :isShowOp="true" :opNum='4') table-list(:tableColums='tableHeader' :tableData='dataList' :isShowOp="true" :opNum='4')
template(#operation='data') template(#operation='data')
el-button(type='text' size='small' @click="showParams(scope.row, 1)") 历史数据 el-button(type='text' size='small' @click="showParams(data.scope, 1)") 历史数据
el-button(type='text' size='small' @click="showParams(scope.row, 2)") 统计图表 el-button(type='text' size='small' @click="showParams(data.scope, 2)") 统计图表
//- el-table( //- el-table(
//- size="mini", //- size="mini",
//- :data="dataList", //- :data="dataList",
...@@ -153,7 +153,7 @@ export default { ...@@ -153,7 +153,7 @@ export default {
components: { components: {
tablePagination, tablePagination,
history, history,
tableList, tableList
}, },
data() { data() {
return { return {
...@@ -173,7 +173,7 @@ export default { ...@@ -173,7 +173,7 @@ export default {
{ label: '温度(℃)', prop: 'temperature', format: true }, { label: '温度(℃)', prop: 'temperature', format: true },
{ label: '湿度(%RH)', prop: 'humidity', format: true }, { label: '湿度(%RH)', prop: 'humidity', format: true },
{ label: 'CO₂(PPM)', prop: 'carbon_dioxide', format: true }, { label: 'CO₂(PPM)', prop: 'carbon_dioxide', format: true },
{ label: '设备状态', prop: 'statusName', format: true }, { label: '设备状态', prop: 'statusName', format: true }
] ]
} }
}, },
......
...@@ -64,10 +64,19 @@ ...@@ -64,10 +64,19 @@
</el-form> </el-form>
</div> </div>
<table-list :tableColums='tableColums' :tableData='tableData' :showOpr='true' :opNum='2'> <table-list
:tableColums="tableColums"
:tableData="tableData"
:showOpr="true"
:opNum="2"
>
<template #operation="data"> <template #operation="data">
<el-button type="text" @click="openHistoryHandle(data.scope.row)">历史数据</el-button> <el-button type="text" @click="openHistoryHandle(data.scope)"
<el-button type="text" @click="openPicTHandle(data.scope.row)">统计图表</el-button> >历史数据</el-button
>
<el-button type="text" @click="openPicTHandle(data.scope)"
>统计图表</el-button
>
</template> </template>
</table-list> </table-list>
<!-- <enTable <!-- <enTable
...@@ -87,8 +96,13 @@ ...@@ -87,8 +96,13 @@
</div> </div>
</cardList> </cardList>
<el-footer class="box_footer"> <el-footer class="box_footer">
<tablePagination :pageSize="pageSize" :totalSize="totalSize" @parentMethod="getDataList"> <tablePagination
</tablePagination></el-footer> :pageSize="pageSize"
:totalSize="totalSize"
@parentMethod="getDataList"
>
</tablePagination
></el-footer>
<history-data-modal <history-data-modal
:historyDataModalVisible="historyDataModalVisible" :historyDataModalVisible="historyDataModalVisible"
...@@ -119,7 +133,7 @@ export default { ...@@ -119,7 +133,7 @@ export default {
historyDataModal, historyDataModal,
statisticPicTableModal, statisticPicTableModal,
tablePagination, tablePagination,
tableList, tableList
}, },
data() { data() {
return { return {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment