diff --git a/src/views/common/index.vue b/src/views/common/index.vue
index eaf6dee..562954a 100644
--- a/src/views/common/index.vue
+++ b/src/views/common/index.vue
@@ -40,7 +40,7 @@
                       <div v-if="scope.row[column.field] == item.id">
                         {{item.name}}
                       </div>
-                      
+
                     </div>
                 </div>
                 <div v-else-if="column.type=='ask_type_id'">
diff --git a/src/views/rain/inspection/inspection.vue b/src/views/rain/inspection/inspection.vue
index ec8826f..77a4454 100644
--- a/src/views/rain/inspection/inspection.vue
+++ b/src/views/rain/inspection/inspection.vue
@@ -37,7 +37,7 @@
                   style="margin-left: 10px;">审核</Button>
                 <Button v-if="scope.row['status']==1" ghost size="small" @click="show(scope.row)" type="primary"
                   style="margin-left: 10px;">办结</Button>
-                <Button ghost size="small" @click="del(scope.row)" type="error" style="margin-left: 10px;">删除</Button>
+                <Button ghost size="small" v-if="scope.row['status']==0||scope.row['status']==1" @click="del(scope.row)" type="error" style="margin-left: 10px;">删除</Button>
               </div>
               <div v-else-if="column.type=='type'">
                 <el-tag v-if="scope.row[column.field]==1">日常雨水设施</el-tag>
@@ -235,7 +235,7 @@
                     <el-table-column prop="type_name" label="操作结果">
                     </el-table-column>
 
-                    <el-table-column prop="admin_id" label="操作人" width="180">
+                    <el-table-column prop="adminName" label="操作人" width="180">
                     </el-table-column>
                   </el-table>
 
@@ -388,7 +388,7 @@
                     <el-table-column prop="type_name" label="操作结果">
                     </el-table-column>
 
-                    <el-table-column prop="admin_id" label="操作人" width="180">
+                    <el-table-column prop="adminName" label="操作人" width="180">
                     </el-table-column>
                   </el-table>
 
@@ -921,7 +921,13 @@
           // this.$set(that.form,res)
           that.rainType = result.type;
           that.nowstatus = result.status;
-          that.rainMaintainLogs = result.rain_maintain_logs;
+
+          if(result.rain_inspection_logs){
+            for(var k of result.rain_inspection_logs){
+                k.adminName = k.admin?k.admin.name : ""
+            }
+          }
+          that.rainMaintainLogs = result.rain_inspection_logs;
           that.end_types = result.end_type
           if (that.rainType == 1) {
             that.rainTitle = "日常雨水设施"
@@ -957,7 +963,7 @@
             case 2:
               that.form = result.building_site_info;
               let building_site = result.building_site_info.building_site
-              that.form.building_site_id =
+              that.form.building_site_id =building_site.id
               that.form.address = building_site.address
               that.form.latitude=building_site.latitude
               that.form.longitude=building_site.longitude
diff --git a/src/views/rain/maintain/maintain.vue b/src/views/rain/maintain/maintain.vue
index b15acd1..6e80632 100644
--- a/src/views/rain/maintain/maintain.vue
+++ b/src/views/rain/maintain/maintain.vue
@@ -37,7 +37,7 @@
                     style="margin-left: 10px;">审核</Button>
                   <Button v-if="scope.row['status']==1" ghost size="small" @click="show(scope.row)" type="primary"
                     style="margin-left: 10px;">办结</Button>
-                  <Button ghost size="small" @click="del(scope.row)" type="error" style="margin-left: 10px;">删除</Button>
+                  <Button ghost size="small" v-if="scope.row['status']==0||scope.row['status']==1" @click="del(scope.row)" type="error" style="margin-left: 10px;">删除</Button>
                 </div>
                 <div v-else-if="column.type=='type'">
                     <el-tag v-if="scope.row[column.field]==1">雨水管道疏挖</el-tag>
@@ -216,7 +216,7 @@
                             </el-table-column>
 
                             <el-table-column
-                              prop="admin_id"
+                              prop="adminName"
                               label="操作人"
                               width="180">
                             </el-table-column>
@@ -344,7 +344,7 @@
                             </el-table-column>
 
                             <el-table-column
-                              prop="admin_id"
+                              prop="adminName"
                               label="操作人"
                               width="180">
                             </el-table-column>
@@ -438,7 +438,7 @@
                           </el-table-column>
 
                           <el-table-column
-                            prop="admin_id"
+                            prop="adminName"
                             label="操作人"
                             width="180">
                           </el-table-column>
@@ -938,6 +938,11 @@
           that.rainType = result.type;
           that.nowstatus = result.status;
           that.formdetail.id = result.id
+          if(result.rain_maintain_logs){
+            for(var k of result.rain_maintain_logs){
+                k.adminName = k.admin?k.admin.name : ""
+            }
+          }
           that.rainMaintainLogs = result.rain_maintain_logs;
           that.end_types = result.end_type
           if(that.rainType==1){