|
|
@@ -47,7 +47,7 @@
|
|
|
<el-table-column align="center" label="本月末主电表读数" prop="newMain" width="130" />
|
|
|
<el-table-column align="center" label="主电表耗电量" prop="mainNumber" width="110" />
|
|
|
<el-table-column align="center" label="上月末辅电表读数" prop="lastAuxiliary" width="130" />
|
|
|
- <el-table-column align="center" label="本月末本电表读数" prop="newAuxiliary" width="130" />
|
|
|
+ <el-table-column align="center" label="本月末辅电表读数" prop="newAuxiliary" width="130" />
|
|
|
<el-table-column align="center" label="辅电表耗电量" prop="auxiliaryNumber" width="110" />
|
|
|
</el-table>
|
|
|
|
|
|
@@ -71,9 +71,9 @@
|
|
|
@row-click="mxtableRowClick" :show-overflow-tooltip="true"
|
|
|
@selection-change="handleSelectionChange">
|
|
|
<el-table-column sortable align="center" label="机台编号" prop="机台编号" width="120" />
|
|
|
- <el-table-column sortable align="center" label="开工时间" prop="开工时间" width="115" />
|
|
|
- <el-table-column sortable align="center" label="主电表" prop="主电表" width="200" />
|
|
|
- <el-table-column sortable align="center" label="辅电表" prop="辅电表" width="100" />
|
|
|
+ <el-table-column sortable align="center" label="开工时间" prop="开工时间" width="160" />
|
|
|
+ <el-table-column sortable align="center" label="主电表" prop="主电表" width="140" />
|
|
|
+ <el-table-column sortable align="center" label="辅电表" prop="辅电表" width="140" />
|
|
|
</el-table>
|
|
|
|
|
|
<!-- 分页 -->
|
|
|
@@ -165,6 +165,11 @@ const handleNodeExpand = (nodeData, node) => {
|
|
|
// 表格行点击事件处理
|
|
|
const hztableRowClick = async (row) => {
|
|
|
console.log('行点击:', row)
|
|
|
+ if(row.newMain === 0){
|
|
|
+ ElMessage.error('本月末主电表读数为0，无数据')
|
|
|
+ mxtableData.value = [];
|
|
|
+ return
|
|
|
+ }
|
|
|
const response = await PowerMachineDetail({mouth:noderq.value,machine:row.MachineCode})
|
|
|
if (response?.code === 0 && Array.isArray(response.data)) {
|
|
|
mxtableData.value = response.data;
|
