Commit eb665ccc authored by yaqizhang's avatar yaqizhang

设备巡检表格

parent b7df2f5f
...@@ -63,10 +63,13 @@ ...@@ -63,10 +63,13 @@
</el-form> </el-form>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-table max-height="175px" :data="form.inspectionDataList" style="width: 89%; margin-left: 30px;"> <el-table :data="form.inspectionDataList" height="130" style="width: 89%;margin-left: 30px;margin-top: -15px;">
<el-table-column label="设备名称" align="center" prop="deviceName" /> <el-table-column label="设备名称" align="center" prop="deviceName">
<el-table-column label="设备编号" align="center" prop="deviceCode" /> </el-table-column>
<el-table-column label="设备类型" align="center" prop="deviceType" /> <el-table-column label="设备编号" align="center" prop="deviceCode">
</el-table-column>
<el-table-column label="设备类型" align="center" prop="deviceType">
</el-table-column>
<el-table-column label="处理状态" align="center" prop="dealStatus"> <el-table-column label="处理状态" align="center" prop="dealStatus">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.dealStatus == null || scope.row.dealStatus == ''">未处理</span> <span v-if="scope.row.dealStatus == null || scope.row.dealStatus == ''">未处理</span>
...@@ -86,7 +89,7 @@ ...@@ -86,7 +89,7 @@
</el-col> </el-col>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<div id="marbox" style="width: 100%;height: 250px;margin-top: -25px; border: 1px solid rgb(218, 213, 213);"> <div id="marbox" style="width: 100%;height: 270px;margin-top: -25px; border: 1px solid rgb(218, 213, 213);">
<div style="width: 100%;height: 100%" id="containerInspect"></div> <div style="width: 100%;height: 100%" id="containerInspect"></div>
</div> </div>
</el-col> </el-col>
...@@ -684,4 +687,11 @@ ...@@ -684,4 +687,11 @@
font-size: 15px; font-size: 15px;
font-weight: 900; font-weight: 900;
} }
.el-table::before {
left: 0;
bottom: 0;
width: 100%;
height: 0px;
}
</style> </style>
\ No newline at end of file
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