diff --git a/src/components/dialogShow/index.vue b/src/components/dialogShow/index.vue
index 76b1032..342fcfe 100644
--- a/src/components/dialogShow/index.vue
+++ b/src/components/dialogShow/index.vue
@@ -8,10 +8,11 @@
     </div>
 
     <div slot="footer" class="dialog-footer">
-        <el-button v-if="type=='showinfo'" @click="coloseDia">关 闭</el-button>
+        <el-button @click="coloseDia">关 闭</el-button>
         <slot name="footerbtn"></slot>
     </div>
   </el-dialog>
+  
 </template>
 
 <script>
@@ -50,6 +51,7 @@
     methods:{
         coloseDia(){
           this.$emit('update:isShow',false)
+          this.$emit('resetform')
         }
     }
   }
diff --git a/src/views/rain/basic/site.vue b/src/views/rain/basic/site.vue
index 6119714..44ecd0c 100644
--- a/src/views/rain/basic/site.vue
+++ b/src/views/rain/basic/site.vue
@@ -221,8 +221,23 @@
             message: '请填写联系人',
             trigger: 'blur',
           }],
-          link_mobile:[{
+          build_unit:[{
+            required: true,
+            message: '请填写建设单位',
+            trigger: 'blur',
+          }],
+          carry_unit:[{
+            required: true,
+            message: '请填写施工单位',
+            trigger: 'blur',
+          }],
+          type:[{
             required: true,
+            message: '请选择工地类型',
+            trigger: 'blur',
+          }],
+          link_mobile:[{
+            // required: true,
             message: '请填写联系号码',
             trigger: 'blur',
           },{ pattern: /^1[3456789]\d{9}$/,
diff --git a/src/views/rain/inspection/components/editEquipment.vue b/src/views/rain/inspection/components/editEquipment.vue
index 1185310..7fd49c8 100644
--- a/src/views/rain/inspection/components/editEquipment.vue
+++ b/src/views/rain/inspection/components/editEquipment.vue
@@ -1,147 +1,153 @@
-<template>
-  <!-- 日常雨水设施新增编辑 -->
-  <dialogShow :title="title" :is-show.sync="isShow" :width="width">
-    <template v-slot:content>
-      <el-form :model="form" :rules="rules" ref="form" label-position="right"
-        :label-width="formLabelWidth">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="所属道路" prop="road_id">
-              <el-select class="width100" v-model="roadName" filterable remote @change="chooseRoad"
-                :disabled="roaddisabled" reserve-keyword placeholder="请输入关键词查找道路信息" clearable @focus="remoteRoad"
-                :remote-method="remoteMethod" :loading="roadloading">
-                <el-option v-for="item in roadsList" :key="item.id" :label="item.name" :value="item.id">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="巡查内容" prop="ask_content_id">
-              <el-select multiple class="width100" v-model="askContentArr" placeholder="请选择巡查内容">
-                <el-option v-for="item in equiementList" :key="item.id" :label="item.value" :value="item.id">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="所在位置" prop="address">
-              <avue-input-map :params="mapparams" placeholder="请选择地图" v-model="mapform"></avue-input-map>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="经度" prop="longitude">
-              <el-input disabled="" v-model="form.longitude" placeholder="经度" autocomplete="off"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="纬度" prop="latitude">
-              <el-input disabled="" v-model="form.latitude" placeholder="纬度" autocomplete="off"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="现场照片" prop="files_list">
-              <el-upload multiple action="/api/admin/upload-file" list-type="picture-card" :file-list="filesList"
-                ref="pictureUpload" :auto-upload="true" :data="uploadOther" :on-error="handleError"
-                :on-success="function(responsose,file,fileList) {return handlesuccess(responsose,file,fileList,1)}">
-                <i slot="default" class="el-icon-plus"></i>
-                <div slot="file" slot-scope="{file}">
-                  <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
-                  <span class="el-upload-list__item-actions">
-                    <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
-                      <i class="el-icon-zoom-in"></i>
-                    </span>
-                    <span v-if="!disabled" class="el-upload-list__item-delete" @click="handleRemove(file)">
-                      <i class="el-icon-delete"></i>
-                    </span>
-                  </span>
-                </div>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="是否异常" prop="is_unusual">
-              <el-radio-group v-model="form.is_unusual">
-                <el-radio :label="0">否</el-radio>
-                <el-radio :label="1">是</el-radio>
-                <!-- <el-radio :label="2">破损</el-radio> -->
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12" v-if="form.is_unusual==0">
-            <el-form-item label="巡查开始点位" prop="start_mapform">
-              <avue-input-map :params="mapparams" placeholder="请选择地图" v-model="start_mapform"></avue-input-map>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12" v-if="form.is_unusual==0">
-            <el-form-item label="巡查结束点位" prop="end_mapform">
-              <avue-input-map :params="mapparams" placeholder="请选择地图" v-model="end_mapform"></avue-input-map>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24" v-if="form.is_unusual!=0">
-            <el-form-item label="异常类型" prop="unusual_type_id">
-              <el-select class="width100" v-model="form.unusual_type_id" placeholder="请选择异常类型">
-                <el-option v-for="item in unusualList" :key="item.id" :label="item.value" :value="item.id">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="24" v-if="form.is_unusual!=0">
-            <el-form-item label="异常处置建议" prop="tip">
-              <el-input type="textarea" v-model="form.tip" placeholder="请填写异常处置建议" autocomplete="off"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="10">
-            <el-form-item label="是否现场处理" prop="is_scene">
-              <el-radio-group v-model="form.is_scene">
-                <el-radio :label="0">否</el-radio>
-                <el-radio :label="1">是</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24" v-if="form.is_scene==1">
-            <el-form-item label="现场处理结果" prop="result">
-              <el-input type="textarea" v-model="form.result" placeholder="请填写现场处理结果" autocomplete="off">
-              </el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24" v-if="form.is_scene==1">
-            <el-form-item label="处理后照片" prop="files_end_list">
-              <el-upload multiple action="/api/admin/upload-file" list-type="picture-card" :file-list="dealFilesList"
-                ref="pictureUploads" :limit="3" :auto-upload="true" :data="uploadOther" :on-error="handleError"
-                :on-success="function(responsose,file,fileList) {return handlesuccess(responsose,file,fileList,2)}">
-                <i slot="default" class="el-icon-plus"></i>
-                <div slot="file" slot-scope="{file}">
-                  <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
-                  <span class="el-upload-list__item-actions">
-                    <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
-                      <i class="el-icon-zoom-in"></i>
-                    </span>
-                    <span v-if="!disabled" class="el-upload-list__item-delete" @click="handleRemove(file)">
-                      <i class="el-icon-delete"></i>
-                    </span>
-                  </span>
-                </div>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-
-
-        </el-row>
-
-      </el-form>
-
-
-    </template>
-
-    <template v-slot:footerbtn>
-      <el-button v-if="formType=='auditform'" type="primary" v-preventReClick @click="auditForm('formdetail','1')">保 存
-      </el-button>
-    </template>
-
-  </dialogShow>
+<template>
+  <div>
+    <!-- 日常雨水设施新增编辑 -->
+      <dialogShow :title="title" :is-show.sync="isShow" :width="width">
+        <template v-slot:content>
+          <el-form :model="form" :rules="rules" ref="form" label-position="right" :label-width="labelwidth">
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="所属道路" prop="road_id">
+                  <el-select class="width100" v-model="roadName" filterable remote @change="chooseRoad"
+                    :disabled="roaddisabled" reserve-keyword placeholder="请输入关键词查找道路信息" clearable @focus="remoteRoad"
+                    :remote-method="remoteMethod" :loading="roadloading">
+                    <el-option v-for="item in roadsList" :key="item.id" :label="item.name" :value="item.id">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="巡查内容" prop="ask_content_id">
+                  <el-select multiple class="width100" v-model="askContentArr" placeholder="请选择巡查内容">
+                    <el-option v-for="item in equiementList" :key="item.id" :label="item.value" :value="item.id">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <el-form-item label="所在位置" prop="address">
+                  <avue-input-map :params="mapparams" placeholder="请选择地图" v-model="mapform"></avue-input-map>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="经度" prop="longitude">
+                  <el-input disabled="" v-model="form.longitude" placeholder="经度" autocomplete="off"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="纬度" prop="latitude">
+                  <el-input disabled="" v-model="form.latitude" placeholder="纬度" autocomplete="off"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="现场照片" prop="files_list">
+                  <el-upload multiple action="/api/admin/upload-file" list-type="picture-card" :file-list="filesList"
+                    ref="pictureUpload" :auto-upload="true" :data="uploadOther" :on-error="handleError"
+                    :on-success="function(responsose,file,fileList) {return handlesuccess(responsose,file,fileList,1)}">
+                    <i slot="default" class="el-icon-plus"></i>
+                    <div slot="file" slot-scope="{file}">
+                      <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
+                      <span class="el-upload-list__item-actions">
+                        <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
+                          <i class="el-icon-zoom-in"></i>
+                        </span>
+                        <span v-if="!disabled" class="el-upload-list__item-delete" @click="handleRemove(file)">
+                          <i class="el-icon-delete"></i>
+                        </span>
+                      </span>
+                    </div>
+                  </el-upload>
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="是否异常" prop="is_unusual">
+                  <el-radio-group v-model="form.is_unusual">
+                    <el-radio :label="0">否</el-radio>
+                    <el-radio :label="1">是</el-radio>
+                    <!-- <el-radio :label="2">破损</el-radio> -->
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12" v-if="form.is_unusual==0">
+                <el-form-item label="巡查开始点位" prop="start_mapform">
+                  <avue-input-map :params="mapparams" placeholder="请选择地图" v-model="start_mapform"></avue-input-map>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12" v-if="form.is_unusual==0">
+                <el-form-item label="巡查结束点位" prop="end_mapform">
+                  <avue-input-map :params="mapparams" placeholder="请选择地图" v-model="end_mapform"></avue-input-map>
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" v-if="form.is_unusual!=0">
+                <el-form-item label="异常类型" prop="unusual_type_id">
+                  <el-select class="width100" v-model="form.unusual_type_id" placeholder="请选择异常类型">
+                    <el-option v-for="item in unusualList" :key="item.id" :label="item.value" :value="item.id">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+    
+              <el-col :span="24" v-if="form.is_unusual!=0">
+                <el-form-item label="异常处置建议" prop="tip">
+                  <el-input type="textarea" v-model="form.tip" placeholder="请填写异常处置建议" autocomplete="off"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="10">
+                <el-form-item label="是否现场处理" prop="is_scene">
+                  <el-radio-group v-model="form.is_scene">
+                    <el-radio :label="0">否</el-radio>
+                    <el-radio :label="1">是</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" v-if="form.is_scene==1">
+                <el-form-item label="现场处理结果" prop="result">
+                  <el-input type="textarea" v-model="form.result" placeholder="请填写现场处理结果" autocomplete="off">
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" v-if="form.is_scene==1">
+                <el-form-item label="处理后照片" prop="files_end_list">
+                  <el-upload multiple action="/api/admin/upload-file" list-type="picture-card" :file-list="dealFilesList"
+                    ref="pictureUploads" :limit="3" :auto-upload="true" :data="uploadOther" :on-error="handleError"
+                    :on-success="function(responsose,file,fileList) {return handlesuccess(responsose,file,fileList,2)}">
+                    <i slot="default" class="el-icon-plus"></i>
+                    <div slot="file" slot-scope="{file}">
+                      <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
+                      <span class="el-upload-list__item-actions">
+                        <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
+                          <i class="el-icon-zoom-in"></i>
+                        </span>
+                        <span v-if="!disabled" class="el-upload-list__item-delete" @click="handleRemove(file)">
+                          <i class="el-icon-delete"></i>
+                        </span>
+                      </span>
+                    </div>
+                  </el-upload>
+                </el-form-item>
+              </el-col>
+    
+    
+            </el-row>
+    
+          </el-form>
+    
+    
+        </template>
+    
+        <template v-slot:footerbtn>
+          <el-button type="primary" v-preventReClick @click="submitForm('form')">保 存
+          </el-button>
+        </template>
+    
+      </dialogShow>
+      <div>
+        <el-dialog class="common-dialog" :visible.sync="dialogVisible">
+          <img width="100%" :src="dialogImageUrl" alt="">
+        </el-dialog>
+      </div>
+  </div>
 </template>
 
 <script>
@@ -149,13 +155,17 @@
     get,
     storeequipment,
     saveequipment
-  } from '../../../../api/rain/inspection.js'
-  import {
-    getToken
-  } from '@/utils/auth'
-  import {
-    listroad
+  } from '../../../../api/rain/inspection.js'
+  import {
+    getToken
+  } from '@/utils/auth'
+  import {
+    listroad
   } from '../../../../api/basic/road.js'
+  import {
+    getparameteritem
+  } from '../../../../api/system/dictionary.js'
+  import AvueMap from 'avue-plugin-map'
   import dialogShow from '@/components/dialogShow'
   export default {
     components: {
@@ -169,26 +179,31 @@
         labelwidth: "120px",
         isShow: false,
         infoId: "",
-        
-        disabled:false,
-        uploadOther: {
-          token: ""
-        },
-        mapparams: {
-          zoom: 11,
-        },
-        mapform: [],
-        start_mapform: [],
-        end_mapform: [],
-        roadsList: [],
-        roadName: "",
-        roaddisabled: false,
-        roadloading: false,
+        dialogImageUrl: "",
+        dialogVisible: false,
 
+        disabled: false,
+        uploadOther: {
+          token: ""
+        },
+        mapparams: {
+          zoom: 11,
+        },
+        mapform: [],
+        start_mapform: [],
+        end_mapform: [],
+        unusualList: [],
+        equiementList: [],
+        roadsList: [],
+        roadName: "",
+        roaddisabled: false,
+        roadloading: false,
+        askContentArr: [],
         filesList: [],
         dealFilesList: [],
         form: {
-
+          is_unusual: 0,
+          is_scene: 0
         },
         rules: {}
 
@@ -198,32 +213,66 @@
       infoId(val) {
         this.infoId = val
       },
-      formType(val) {
-        this.formType = val
+      mapform(newVal, oldVal) {
+        this.form.longitude = newVal[0];
+        this.form.latitude = newVal[1];
+        this.form.address = newVal[2];
+      },
+      start_mapform(newVal, oldVal) {
+        this.form.start_longitude = newVal[0];
+        this.form.start_latitude = newVal[1];
+        this.form.start_address = newVal[2];
+      },
+      end_mapform(newVal, oldVal) {
+        this.form.end_longitude = newVal[0];
+        this.form.end_latitude = newVal[1];
+        this.form.end_address = newVal[2];
       }
     },
-    methods: {
-      initLoad(){
-        this.uploadOther.token = getToken();
+    created() {
+      this.initLoad()
+    },
+    methods: {
+      initLoad() {
+        var that = this
+        this.uploadOther.token = getToken();
+        getparameteritem('equiementList').then(res => {
+          that.equiementList = res.detail
+        })
+        getparameteritem('unusualList').then(res => {
+          that.unusualList = res.detail
+        })
       },
-      getEquipmentInfo(id) {
+      getEquipmentInfo(id) {
+        this.resetForm()
         if (id) {
           var that = this;
-          that.form = {}
+          // that.form = {}
           get(id).then(res => {
             let result = Object.assign(that.form, res);
-            that.form = result.rain_equipment_info
-            if (result.rain_inspection_logs) {
-              for (var k of result.rain_inspection_logs) {
-                k.adminName = k.admin ? k.admin.name : ""
-              }
+            that.form = result.rain_equipment_info;
+            that.form.rain_equipment_id = result.rain_equipment_id;
+
+            that.form.ask_content_id = result.rain_equipment_info.ask_content_id ? result
+              .rain_equipment_info.ask_content_id : ""
+            let askArr = result.rain_equipment_info.ask_content_id ? result.rain_equipment_info.ask_content_id
+              .split(",") : []
+            for (var m of askArr) {
+              that.askContentArr.push(parseInt(m))
+            }
+            that.roaddisabled = true
+            that.roadName = result.rain_equipment_info.road ? result.rain_equipment_info.road.name : ""
+            that.mapform = [result.rain_equipment_info.longitude, result.rain_equipment_info.latitude, result
+              .rain_equipment_info.address
+            ]
+            if (result.rain_equipment_info.is_unusual == 0) {
+              that.start_mapform = [result.rain_equipment_info.start_longitude, result.rain_equipment_info
+                .start_latitude, result.rain_equipment_info.start_address
+              ]
+              that.end_mapform = [result.rain_equipment_info.end_longitude, result.rain_equipment_info
+                .end_latitude, result.rain_equipment_info.end_address
+              ]
             }
-            that.form.rainInspectionLogs = result.rain_inspection_logs
-            that.form.roadName = result.rain_equipment_info.road ? result.rain_equipment_info.road.name : ""
-            that.form.end_time = result.end_time
-            that.form.remark = result.remark
-            that.form.end_type = result.end_type
-            that.form.maintain_type = result.maintain_type
             let _files = [];
             for (var mod of result.rain_equipment_info.rain_equipment_files) {
               let m = Object.assign({}, mod);
@@ -248,28 +297,164 @@
             //reject(error)
           })
         }
-      },
-
-      chooseRoad(val) {
-        this.form.road_id = val
-      },
-      remoteRoad() {
-        this.roadsList = []
-      },
-      remoteMethod(query) {
-
-        if (query != '') {
-          this.roadloading = true
-          listroad({
-            name: query
-          }).then(res => {
-            this.roadloading = false
-            this.roadsList = res.data
-          })
-        } else {
-          this.roadsList = []
+      },
+      submitForm(formName) {
+        var that = this;
+        var listUrlbefore = []
+        for (var m of this.filesList) {
+          m.photoType = "before";
+          if (m.response)
+            listUrlbefore.push({
+              "upload_id": m.response.id
+            });
+          else
+            listUrlbefore.push({
+              "upload_id": m.id
+            });
+        }
+        this.form.files_list = listUrlbefore;
+        let listUrlafter = [];
+        for (var m of this.dealFilesList) {
+          if (m.response)
+            listUrlafter.push({
+              "upload_id": m.response.id
+            });
+          else
+            listUrlafter.push({
+              "upload_id": m.upload_id
+            });
+        }
+        this.form.files_end_list = listUrlafter
+        that.form.ask_content_id = this.returnAskContentId(that.askContentArr)
+        if (that.form.is_unusual == 0) {
+          that.form.unusual_type_id = ""
+          that.form.tip = ""
+        }
+        if (that.form.is_unusual == 1) {
+          that.form.start_address = ""
+          that.form.start_latitude = ""
+          that.form.start_longitude = ""
+          that.form.end_address = ""
+          that.form.end_latitude = ""
+          that.form.end_longitude = ""
+        }
+
+        if (that.form.is_scene == 0) {
+          that.form.result = ""
+          that.form.files_end_list = []
         }
+        console.log(that.form)
+        // return
+        this.$refs[formName].validate((valid) => {
+          if (valid) {
+            if (that.infoId) {
+              saveequipment(that.form).then(response => {
+                this.$Message.success('操作成功');
+                this.$emit("auditSuccess")
+                that.isShow = false;
+              }).catch(error => {
+                //reject(error)
+              })
+            } else {
+              storeequipment(that.form).then(response => {
+                this.$Message.success('操作成功');
+                this.$emit("auditSuccess")
+                that.isShow = false;
+              }).catch(error => {
+                //reject(error)
+              })
+            }
+          } else {
+            this.$Message.error('数据校验失败');
+            console.log('error submit!!');
+            return false;
+          }
+        });
+      },
+      resetForm(formName) {
+        var that = this;
+        that.filesList = [];
+        that.dealFilesList = [];
+        that.askContentArr=[]
+        that.roadName = ""
+        that.roaddisabled = false
+        that.mapform = ['', '', ''];
+        that.start_mapform = ['', '', ''];
+        that.end_mapform = ['', '', ''];
+        this.form={
+          is_unusual: 0,
+          is_scene: 0
+        }
+      },
+      chooseRoad(val) {
+        this.form.road_id = val
+      },
+      remoteRoad() {
+        this.roadsList = []
       },
+      remoteMethod(query) {
+        if (query != '') {
+          this.roadloading = true
+          listroad({
+            name: query
+          }).then(res => {
+            this.roadloading = false
+            this.roadsList = res.data
+          })
+        } else {
+          this.roadsList = []
+        }
+      },
+      handleRemove(file) {
+        if (file.photoType == "before") {
+          for (var i = 0; i < this.filesList.length; i++) {
+            if (this.filesList[i].url == file.url) {
+              this.filesList.splice(i, 1)
+            }
+          }
+        } else if (file.photoType == "after") {
+          for (var i = 0; i < this.dealFilesList.length; i++) {
+            if (this.dealFilesList[i].url == file.url) {
+              this.dealFilesList.splice(i, 1)
+            }
+          }
+
+        }
+      },
+      handlePictureCardPreview(file) {
+        this.dialogImageUrl = file.url;
+        this.dialogVisible = true;
+      },
+      handlesuccess(response, file, fileList, index) {
+        if (index == 1) {
+          file.photoType = "before"
+          this.filesList = fileList;
+          // this.form.files_list = listUrl;
+        } else {
+
+          file.photoType = "after"
+          this.dealFilesList = fileList
+        }
+        this.$message({
+          message: '上传成功',
+          type: 'success'
+        });
+      },
+
+      handleError(err, file, fileList) {
+        this.$message.error('上传失败，重新上传');
+      },
+      returnAskContentId(arr) {
+        if (arr.length == 0) {
+          return
+        }
+        let getArr = ""
+        for (var m of arr) {
+          getArr += m + ","
+        }
+        getArr = getArr.substring(0, getArr.length - 1)
+        return getArr
+      }
 
     }
   }
diff --git a/src/views/rain/inspection/components/editSite.vue b/src/views/rain/inspection/components/editSite.vue
new file mode 100644
index 0000000..91c563a
--- /dev/null
+++ b/src/views/rain/inspection/components/editSite.vue
@@ -0,0 +1,447 @@
+<template>
+  <div>
+    <!-- 工地巡查 -->
+    <dialogShow :title="title" :is-show.sync="isShow" :width="width">
+      <template v-slot:content>
+        <!-- 在建工地 -->
+        <el-form :model="form" :rules="rules" ref="form" label-position="right"
+          :label-width="labelwidth">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="所属道路" prop="road_id">
+                <el-select class="width100" v-model="roadName" filterable remote @change="chooseRoad"
+                  :disabled="roaddisabled" reserve-keyword placeholder="请输入关键词查找道路信息" clearable @focus="remoteRoad"
+                  :remote-method="remoteMethod" :loading="roadloading">
+                  <el-option v-for="item in roadsList" :key="item.id" :label="item.name" :value="item.id">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="工地名称" prop="name">
+                <el-select v-model="form.name" allow-create filterable @change="buildchange" class="width100"
+                  placeholder="请选择工地或新建工地">
+                  <el-option v-for="item in buildList" :key="item.id" :label="item.name" :value="item">
+                  </el-option>
+                </el-select>
+                <!-- <el-input disabled="" v-model="form.name" placeholder="工地名称" autocomplete="off"></el-input> -->
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="所在位置" prop="address">
+                <avue-input-map :params="mapparams" placeholder="请选择地图" v-model="mapform"></avue-input-map>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="经度" prop="longitude">
+                <el-input disabled="" v-model="form.longitude" placeholder="经度" autocomplete="off"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="纬度" prop="address">
+                <el-input disabled="" v-model="form.latitude" placeholder="纬度" autocomplete="off"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="工地编号" prop="number">
+                <el-input v-model="form.number" disabled placeholder="工地编号" autocomplete="off"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="建设单位" prop="build_unit">
+                <el-input v-model="form.build_unit" placeholder="请填写建设单位" autocomplete="off"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="施工单位" prop="carry_unit">
+                <el-input v-model="form.carry_unit" placeholder="请填写施工单位" autocomplete="off"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="工地类型" prop="type">
+                <el-select class="width100" v-model="form.type" placeholder="请选择">
+                  <el-option v-for="item in siteType" :key="item.id" :label="item.value" :value="item.id">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="工地状态" prop="status">
+                <el-radio v-model="form.status" v-for="item in siteStatus" :label="item.id">{{item.value}}
+                </el-radio>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="联系人" prop="link_name">
+                <el-input v-model="form.link_name" placeholder="请填写联系人" autocomplete="off"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="联系号码" prop="link_mobile">
+                <el-input v-model="form.link_mobile" placeholder="请填写联系号码" autocomplete="off"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="备注" prop="remark">
+                <el-input type="textarea" v-model="form.remark" placeholder="备注" autocomplete="off"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="现场照片" prop="files_list">
+                <el-upload class="upload-demo" multiple drag action="/api/admin/upload-file"
+                  list-type="picture-card" :file-list="filesList" ref="pictureUpload" :auto-upload="true"
+                  :data="uploadOther" :on-error="handleError"
+                  :on-success="function(responsose,file,fileList) {return handlesuccess(responsose,file,fileList,1)}">
+                  <i slot="default" class="el-icon-plus"></i>
+                  <div slot="file" slot-scope="{file}">
+                    <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
+                    <span class="el-upload-list__item-actions">
+                      <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
+                        <i class="el-icon-zoom-in"></i>
+                      </span>
+                      <span v-if="!disabled" class="el-upload-list__item-delete" @click="handleRemove(file)">
+                        <i class="el-icon-delete"></i>
+                      </span>
+                    </span>
+                  </div>
+                </el-upload>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="是否违法" prop="is_law">
+                <el-radio-group v-model="form.is_law">
+                  <el-radio :label="0">否</el-radio>
+                  <el-radio :label="1">是</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24" v-if="form.is_law==1">
+              <el-form-item label="违规内容" prop="break_id">
+                <el-select class="width100" v-model="form.break_id" placeholder="请选择违规内容">
+                  <el-option v-for="item in siteLaw" :key="item.id" :label="item.value" :value="item.id">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24" v-if="form.is_law==1">
+              <el-form-item label="描述" prop="content">
+                <el-input type="textarea" v-model="form.content" placeholder="备注" autocomplete="off"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+        </el-form>
+
+      </template>
+
+      <template v-slot:footerbtn>
+        <el-button type="primary" v-preventReClick @click="submitForm('form')">保存</el-button>
+      </template>
+
+    </dialogShow>
+     <div>
+       <el-dialog class="common-dialog" :visible.sync="dialogVisible">
+         <img width="100%" :src="dialogImageUrl" alt="">
+       </el-dialog>
+     </div>
+  </div>
+
+
+
+</template>
+
+<script>
+  import {
+    get,
+    storebuilding,
+    savebuilding,
+    getbuilding
+  } from '../../../../api/rain/inspection.js'
+  import {
+    getparameteritem
+  } from '../../../../api/system/dictionary.js'
+  import {
+    listroad
+  } from '../../../../api/basic/road.js'
+  import AvueMap from 'avue-plugin-map'
+  import dialogShow from '@/components/dialogShow'
+  export default {
+    components: {
+      dialogShow,
+      AvueMap
+    },
+    data() {
+      return {
+        formType: "showform", // 审核：auditform  办结 endform 查看 showform
+        title: "在建工地巡查",
+        width: "60%",
+        labelwidth: "120px",
+        isShow: false,
+        infoId: "",
+        dialogImageUrl: "",
+        dialogVisible: false,
+
+        disabled: false,
+        uploadOther: {
+          token: ""
+        },
+        mapparams: {
+          zoom: 11,
+        },
+        mapform: [],
+        roadsList: [],
+        roadName: "",
+        roaddisabled: false,
+        roadloading: false,
+        filesList: [],
+
+        buildList:[],
+        siteType: [],
+        siteLaw: [],
+        siteStatus: [{
+          id: 1,
+          value: "在建"
+        }, {
+          id: 2,
+          value: "完工"
+        }],
+        form: {
+          status:0
+        },
+        rules: {
+          name:[{
+            required: true,
+            message: '请填写工地名称',
+            trigger: 'blur',
+          }],
+          link_name:[{
+            required: true,
+            message: '请填写联系人',
+            trigger: 'blur',
+          }],
+          build_unit:[{
+            required: true,
+            message: '请填写建设单位',
+            trigger: 'blur',
+          }],
+          carry_unit:[{
+            required: true,
+            message: '请填写施工单位',
+            trigger: 'blur',
+          }],
+          type:[{
+            required: true,
+            message: '请选择工地类型',
+            trigger: 'blur',
+          }],
+          link_mobile:[{
+            // required: true,
+            message: '请填写联系号码',
+            trigger: 'blur',
+          },{ pattern: /^1[3456789]\d{9}$/,
+              message: '手机号码格式不正确',
+              trigger: 'blur' ,
+          }],
+        }
+
+      }
+    },
+    watch: {
+      infoId(val) {
+        this.infoId = val
+      }
+    },
+    created() {
+      this.initload()
+    },
+    methods: {
+      initload() {
+        getparameteritem('siteType').then(res => {
+          this.siteType = res.detail
+        })
+        getparameteritem('siteLaw').then(res => {
+          this.siteLaw = res.detail
+        })
+        getbuilding().then(res => {
+          this.buildList = res
+        })
+      },
+      getSiteInfo(id) {
+        this.resetForm()
+        if (id) {
+          var that = this;
+          that.form = {}
+          get(id).then(res => {
+            let result = Object.assign(that.form, res);
+            that.form = result.building_site_info;
+            that.roaddisabled = true
+            that.roadName = result.building_site_info.road ? result.building_site_info.road.name : ""
+            let building_site = result.building_site_info.building_site
+            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
+            that.form.name = building_site.name
+            that.form.number = building_site.number
+            that.form.remark = building_site.remark
+            that.form.status = building_site.status
+            that.form.build_unit = building_site.build_unit
+            that.form.carry_unit = building_site.carry_unit
+            that.form.type = parseInt(building_site.type)
+            that.form.link_name = building_site.link_name
+             that.form.link_mobile = building_site.link_mobile
+            that.form.building_site_id = building_site.id
+            that.form.building_site_content_id = result.building_site_content_id;
+            that.mapform = [building_site.longitude, building_site.latitude, building_site.address]
+            let site_files = [];
+            for (var mod of result.building_site_info.building_site_content_files) {
+              let m = Object.assign({}, mod);
+              m.url = mod.files.url;
+              m.id = mod.files.id;
+              m.photoType = "before";
+              site_files.push(m);
+            }
+            that.filesList = site_files;
+          }).catch(error => {
+            //reject(error)
+          })
+        }
+      },
+     submitForm(formName) {
+       var that = this;
+       var listUrlbefore = []
+       for (var m of this.filesList) {
+         if (m.response)
+           listUrlbefore.push({
+             "upload_id": m.response.id
+           });
+         else
+           listUrlbefore.push({
+             "upload_id": m.id
+           });
+       }
+       that.form.files_list = listUrlbefore
+        console.log('build',that.form)
+       // return
+       this.$refs[formName].validate((valid) => {
+         if (valid) {
+           if (that.infoId) {
+             savebuilding(that.form).then(response => {
+               this.$Message.success('操作成功');
+               this.$emit("auditSuccess")
+               that.isShow = false;
+             }).catch(error => {
+               //reject(error)
+             })
+           } else {
+             storebuilding(that.form).then(response => {
+               this.$Message.success('操作成功');
+               this.$emit("auditSuccess")
+               that.isShow = false;
+             }).catch(error => {
+               //reject(error)
+             })
+           }
+         } else {
+           this.$Message.error('数据校验失败');
+           console.log('error submit!!');
+           return false;
+         }
+       });
+     },
+      resetForm(formName) {
+        var that = this
+        that.filesList = []
+        that.roadName = ""
+        that.roaddisabled = false
+        that.mapform = ['', '', '']
+        this.form={
+          is_law:0,
+          status:1
+        }
+      },
+
+      chooseRoad(val) {
+        this.form.road_id = val
+      },
+      remoteRoad() {
+        this.roadsList = []
+      },
+      remoteMethod(query) {
+
+        if (query != '') {
+          this.roadloading = true
+          listroad({
+            name: query
+          }).then(res => {
+            this.roadloading = false
+            this.roadsList = res.data
+          })
+        } else {
+          this.roadsList = []
+        }
+      },
+      buildchange(val) {
+        if (Object.prototype.toString.call(val) != '[object Object]') {
+          this.mapform = ['', '', ''];
+          this.$refs['form'].resetFields();
+          this.form.name = val
+          this.form.type = ""
+          this.form.status = 0
+          let timeNumber = new Date().getTime()
+          this.form.number = timeNumber
+        }
+        if (Object.prototype.toString.call(val) === '[object Object]') {
+          console.log(val)
+          this.mapform = [val.longitude, val.latitude, val.address]
+          this.form.longitude = val.longitude
+          this.form.latitude = val.latitude
+          this.form.address = val.address
+          this.form.number = val.number
+          this.form.type = parseInt(val.type)
+          this.form.status = val.status
+          this.form.remark = val.remark
+          this.form.building_site_id = val.id
+          this.form.name = val.name
+          this.form.build_unit = val.build_unit
+          this.form.carry_unit = val.carry_unit
+          this.form.link_name = val.link_name
+           this.form.link_mobile = val.link_mobile
+
+        }
+        //判断对象
+
+      },
+      handleRemove(file) {
+          for (var i = 0; i < this.filesList.length; i++) {
+            if (this.filesList[i].url == file.url) {
+              this.filesList.splice(i, 1)
+            }
+          }
+      },
+      handlePictureCardPreview(file) {
+        this.dialogImageUrl = file.url;
+        this.dialogVisible = true;
+      },
+      handlesuccess(response, file, fileList, index) {
+        if (index == 1) {
+          file.photoType = "before"
+          this.filesList = fileList;
+          // this.form.files_list = listUrl;
+        }
+        this.$message({
+          message: '上传成功',
+          type: 'success'
+        });
+      },
+
+      handleError(err, file, fileList) {
+        this.$message.error('上传失败，重新上传');
+      }
+
+    }
+  }
+</script>
+
+<style>
+</style>
diff --git a/src/views/rain/inspection/components/showRainEquipmentInfo.vue b/src/views/rain/inspection/components/showRainEquipmentInfo.vue
index 2ca9d84..94a4036 100644
--- a/src/views/rain/inspection/components/showRainEquipmentInfo.vue
+++ b/src/views/rain/inspection/components/showRainEquipmentInfo.vue
@@ -1,211 +1,218 @@
-<template>
-  <!-- 日常雨水设施查看 -->
-  <dialogShow :title="title" :is-show.sync="isShow" :width="width">
-    <template v-slot:content>
-      <el-form :model="formdetail" :rules="{}" ref="formdetail" label-position="right" :label-width="labelwidth">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="所属道路" prop="road_id">
-              {{form.roadName}}
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="巡查内容" prop="ask_content_id">
-              {{form.ask_content_detail?form.ask_content_detail:""}}
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="所在位置" prop="address">
-              {{form.address}}
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="经度" prop="longitude">
-              {{form.longitude}}
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="纬度" prop="latitude">
-              {{form.latitude}}
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="现场照片" prop="files_list" class="files_check">
-              <el-upload multiple action="/api/admin/upload-file" list-type="picture-card" :file-list="filesList"
-                ref="pictureUploads">
-                <div slot="file" slot-scope="{file}">
-                  <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
-                  <span class="el-upload-list__item-actions">
-                    <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
-                      <i class="el-icon-zoom-in"></i>
-                    </span>
-                  </span>
-                </div>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="24">
-            <el-form-item label="是否异常" prop="is_unusual">
-              <el-tag v-if="form.is_unusual==0">否</el-tag>
-              <el-tag type="warning" v-if="form.is_unusual==1">是</el-tag>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12" v-if="form.is_unusual==0">
-            <el-form-item label="巡查开始点位" prop="start_address">
-              {{form.start_address?form.start_address:""}}
-            </el-form-item>
-          </el-col>
-          <el-col :span="12" v-if="form.is_unusual==0">
-            <el-form-item label="巡查结束点位" prop="address">
-              {{form.end_address?form.end_address:""}}
-            </el-form-item>
-          </el-col>
-          <el-col :span="24" v-if="form.is_unusual!=0">
-            <el-form-item label="异常类型" prop="unusual_type_detail">
-              {{form.unusual_type_detail?form.unusual_type_detail.value:""}}
-            </el-form-item>
-          </el-col>
-          <el-col :span="24" v-if="form.is_unusual!=0">
-            <el-form-item label="异常处置建议" prop="tip">
-              {{form.tip}}
-            </el-form-item>
-          </el-col>
-          <el-col :span="10">
-            <el-form-item label="是否现场处理" prop="is_scene">
-              <el-tag v-if="form.is_scene==0">否</el-tag>
-              <el-tag type="success" v-if="form.is_scene==1">是</el-tag>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24" v-if="form.is_scene==1">
-            <el-form-item label="现场处理结果" prop="result">
-              {{form.result}}
-            </el-form-item>
-          </el-col>
-          <el-col :span="24" v-if="form.is_scene==1">
-            <el-form-item label="处理后照片" prop="files_end_list" class="files_check">
-              <el-upload multiple action="/api/admin/upload-file" list-type="picture-card" :file-list="dealFilesList"
-                ref="pictureUploads">
-                <div slot="file" slot-scope="{file}">
-                  <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
-                  <span class="el-upload-list__item-actions">
-                    <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
-                      <i class="el-icon-zoom-in"></i>
-                    </span>
-                  </span>
-                </div>
-              </el-upload>
-
-            </el-form-item>
-          </el-col>
-
-
-          <!-- 查看 -->
-          <div v-if="formType=='showform'">
-            <el-col :span="24">
-              <el-form-item label="有无违法转办">
-                <el-tag v-if="form.end_type==0">无</el-tag>
-                <el-tag type="warning" v-if="form.end_type==1">养护转办</el-tag>
-                <el-tag type="warning" v-if="form.end_type==2">违法转办</el-tag>
-              </el-form-item>
-            </el-col>
-            <el-col :span="24" v-if="form.end_type==1">
-              <el-form-item label="养护转办类型" prop="type">
-                <div v-for="item in yhtypeList">
-                  <div v-if="form.maintain_type==item.id">
-                    {{item.name}}
-                  </div>
-                </div>
-              </el-form-item>
-            </el-col>
-            <el-col :span="24" v-if="form.end_type==1">
-              <el-form-item label="要求完成时间" prop="end_time">
-                {{form.end_time}}
-              </el-form-item>
-            </el-col>
-            <el-col :span="24" v-if="form.end_type==1">
-              <el-form-item label="备注" prop="remark">
-                {{form.remark}}
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="处理日志" prop="">
-
-              </el-form-item>
-              <el-table :data="form.rainInspectionLogs" style="width: 90%;margin: 0 auto;">
-                <el-table-column prop="created_at" label="日期" width="180">
-                </el-table-column>
-                <el-table-column prop="content" label="内容">
-                </el-table-column>
-                <el-table-column prop="type_name" label="操作结果">
-                </el-table-column>
-
-                <el-table-column prop="adminName" label="操作人" width="180">
-                </el-table-column>
-              </el-table>
-
-            </el-col>
-          </div>
-
-          <!-- 审核 auditform 办结-->
-          <div v-if="formType=='auditform'||formType=='endform'">
-            <el-col :span="24">
-              <el-form-item label="备注" prop="content">
-                <el-input type="textarea" v-model="formdetail.content" placeholder="请填写备注"></el-input>
-              </el-form-item>
-            </el-col>
+<template>
+  <div>
+    <!-- 日常雨水设施查看 -->
+      <dialogShow :title="title" :is-show.sync="isShow" :width="width">
+        <template v-slot:content>
+          <el-form :model="formdetail" :rules="{}" ref="formdetail" label-position="right" :label-width="labelwidth">
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="所属道路" prop="road_id">
+                  {{form.roadName}}
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="巡查内容" prop="ask_content_id">
+                  {{form.ask_content_detail?form.ask_content_detail:""}}
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="所在位置" prop="address">
+                  {{form.address}}
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="经度" prop="longitude">
+                  {{form.longitude}}
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="纬度" prop="latitude">
+                  {{form.latitude}}
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="现场照片" prop="files_list" class="files_check">
+                  <el-upload multiple action="/api/admin/upload-file" list-type="picture-card" :file-list="filesList"
+                    ref="pictureUploads">
+                    <div slot="file" slot-scope="{file}">
+                      <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
+                      <span class="el-upload-list__item-actions">
+                        <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
+                          <i class="el-icon-zoom-in"></i>
+                        </span>
+                      </span>
+                    </div>
+                  </el-upload>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="24">
+                <el-form-item label="是否异常" prop="is_unusual">
+                  <el-tag v-if="form.is_unusual==0">否</el-tag>
+                  <el-tag type="warning" v-if="form.is_unusual==1">是</el-tag>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="12" v-if="form.is_unusual==0">
+                <el-form-item label="巡查开始点位" prop="start_address">
+                  {{form.start_address?form.start_address:""}}
+                </el-form-item>
+              </el-col>
+              <el-col :span="12" v-if="form.is_unusual==0">
+                <el-form-item label="巡查结束点位" prop="address">
+                  {{form.end_address?form.end_address:""}}
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" v-if="form.is_unusual!=0">
+                <el-form-item label="异常类型" prop="unusual_type_detail">
+                  {{form.unusual_type_detail?form.unusual_type_detail.value:""}}
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" v-if="form.is_unusual!=0">
+                <el-form-item label="异常处置建议" prop="tip">
+                  {{form.tip}}
+                </el-form-item>
+              </el-col>
+              <el-col :span="10">
+                <el-form-item label="是否现场处理" prop="is_scene">
+                  <el-tag v-if="form.is_scene==0">否</el-tag>
+                  <el-tag type="success" v-if="form.is_scene==1">是</el-tag>
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" v-if="form.is_scene==1">
+                <el-form-item label="现场处理结果" prop="result">
+                  {{form.result}}
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" v-if="form.is_scene==1">
+                <el-form-item label="处理后照片" prop="files_end_list" class="files_check">
+                  <el-upload multiple action="/api/admin/upload-file" list-type="picture-card" :file-list="dealFilesList"
+                    ref="pictureUploads">
+                    <div slot="file" slot-scope="{file}">
+                      <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
+                      <span class="el-upload-list__item-actions">
+                        <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
+                          <i class="el-icon-zoom-in"></i>
+                        </span>
+                      </span>
+                    </div>
+                  </el-upload>
+
+                </el-form-item>
+              </el-col>
+
+
+              <!-- 查看 -->
+              <div v-if="formType=='showform'">
+                <el-col :span="24">
+                  <el-form-item label="有无违法转办">
+                    <el-tag v-if="form.end_type==0">无</el-tag>
+                    <el-tag type="warning" v-if="form.end_type==1">养护转办</el-tag>
+                    <el-tag type="warning" v-if="form.end_type==2">违法转办</el-tag>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24" v-if="form.end_type==1">
+                  <el-form-item label="养护转办类型" prop="type">
+                    <div v-for="item in yhtypeList">
+                      <div v-if="form.maintain_type==item.id">
+                        {{item.name}}
+                      </div>
+                    </div>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24" v-if="form.end_type==1">
+                  <el-form-item label="要求完成时间" prop="end_time">
+                    {{form.end_time}}
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24" v-if="form.end_type==1">
+                  <el-form-item label="备注" prop="remark">
+                    {{form.remark}}
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="处理日志" prop="">
+
+                  </el-form-item>
+                  <el-table :data="form.rainInspectionLogs" style="width: 90%;margin: 0 auto;">
+                    <el-table-column prop="created_at" label="日期" width="180">
+                    </el-table-column>
+                    <el-table-column prop="content" label="内容">
+                    </el-table-column>
+                    <el-table-column prop="type_name" label="操作结果">
+                    </el-table-column>
+
+                    <el-table-column prop="adminName" label="操作人" width="180">
+                    </el-table-column>
+                  </el-table>
+
+                </el-col>
+              </div>
+
+              <!-- 审核 auditform 办结-->
+              <div v-if="formType=='auditform'||formType=='endform'">
+                <el-col :span="24">
+                  <el-form-item label="备注" prop="content">
+                    <el-input type="textarea" v-model="formdetail.content" placeholder="请填写备注"></el-input>
+                  </el-form-item>
+                </el-col>
+              </div>
+
+              <div v-if="formType=='endform'">
+                <el-col :span="24">
+                  <el-form-item label="有无违法转办" prop="end_type">
+                    <el-radio-group v-model="formdetail.end_type">
+                      <el-radio :label="0">无</el-radio>
+                      <el-radio :label="1">养护转办</el-radio>
+                      <el-radio :label="2">违法转办</el-radio>
+                    </el-radio-group>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24" v-if="formdetail.end_type==1">
+                  <el-form-item label="养护转办类型" prop="type">
+                    <el-select class="width100" v-model="formdetail.maintain_type" placeholder="请选择养护转办类型">
+                      <el-option v-for="item in yhtypeList" :key="item.id" :label="item.name" :value="item.id">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24" v-if="formdetail.end_type==1">
+                  <el-form-item label="要求完成时间" prop="end_time">
+                    <el-date-picker style="width:100%" v-model="formdetail.end_time" type="datetime" placeholder="选择时间"
+                      value-format="yyyy-MM-dd HH:mm:ss">
+                    </el-date-picker>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="备注" prop="remark" v-if="formdetail.end_type==1">
+                    <el-input type="textarea" v-model="formdetail.remark" placeholder="请填写备注"></el-input>
+                  </el-form-item>
+                </el-col>
+              </div>
+
+            </el-row>
+          </el-form>
+        </template>
+
+        <template v-slot:footerbtn>
+          <el-button v-if="formType=='auditform'" type="primary" v-preventReClick @click="auditForm('formdetail','1')">审核</el-button>
+          <div v-if="formType=='endform'" style="display: inline-block;margin-left:10px">
+            <el-button v-if="formdetail.end_type!=2" type="primary" v-preventReClick @click="auditForm('formdetail','2')">办结
+            </el-button>
+            <el-button v-if="formdetail.end_type==2" type="primary" v-preventReClick @click="auditForm('formdetail','1')">保存
+            </el-button>
+            <el-button v-if="formdetail.end_type!=2" type="danger" v-preventReClick @click="auditForm('formdetail','3')">退回
+            </el-button>
           </div>
-          
-          <div v-if="formType=='endform'">
-            <el-col :span="24">
-              <el-form-item label="有无违法转办" prop="end_type">
-                <el-radio-group v-model="formdetail.end_type">
-                  <el-radio :label="0">无</el-radio>
-                  <el-radio :label="1">养护转办</el-radio>
-                  <el-radio :label="2">违法转办</el-radio>
-                </el-radio-group>
-              </el-form-item>
-            </el-col>
-            <el-col :span="24" v-if="formdetail.end_type==1">
-              <el-form-item label="养护转办类型" prop="type">
-                <el-select class="width100" v-model="formdetail.maintain_type" placeholder="请选择养护转办类型">
-                  <el-option v-for="item in yhtypeList" :key="item.id" :label="item.name" :value="item.id">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="24" v-if="formdetail.end_type==1">
-              <el-form-item label="要求完成时间" prop="end_time">
-                <el-date-picker style="width:100%" v-model="formdetail.end_time" type="datetime" placeholder="选择时间"
-                  value-format="yyyy-MM-dd HH:mm:ss">
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="备注" prop="remark" v-if="formdetail.end_type==1">
-                <el-input type="textarea" v-model="formdetail.remark" placeholder="请填写备注"></el-input>
-              </el-form-item>
-            </el-col>
-          </div>
-
-        </el-row>
-      </el-form>
-    </template>
-
-    <template v-slot:footerbtn>
-      <el-button v-if="formType=='auditform'" type="primary" v-preventReClick @click="auditForm('formdetail','1')">审核</el-button>
-      <div v-if="formType=='endform'" style="display: inline-block;margin-left:10px">
-        <el-button v-if="formdetail.end_type!=2" type="primary" v-preventReClick @click="auditForm('formdetail','2')">办结
-        </el-button>
-        <el-button v-if="formdetail.end_type==2" type="primary" v-preventReClick @click="auditForm('formdetail','1')">保存
-        </el-button>
-        <el-button v-if="formdetail.end_type!=2" type="danger" v-preventReClick @click="auditForm('formdetail','3')">退回
-        </el-button>
-      </div>
-    </template>
-
-  </dialogShow>
+        </template>
+
+      </dialogShow>
+      <div>
+        <el-dialog class="common-dialog" :visible.sync="dialogVisible">
+          <img width="100%" :src="dialogImageUrl" alt="">
+        </el-dialog>
+      </div>
+  </div>
 </template>
 
 <script>
@@ -226,7 +233,10 @@
         labelwidth: "120px",
         isShow: false,
         // diaShow:this.isShow,
-        infoId: "",
+        infoId: "",
+        dialogImageUrl: "",
+        dialogVisible: false,
+
         filesList: [],
         dealFilesList: [],
         yhtypeList: [{
@@ -298,6 +308,7 @@
             that.form.end_time = result.end_time
             that.form.remark = result.remark
             that.form.end_type = result.end_type
+            that.formdetail.end_type = result.end_type
             that.form.maintain_type = result.maintain_type
             let _files = [];
             for (var mod of result.rain_equipment_info.rain_equipment_files) {
@@ -336,7 +347,11 @@
         }).catch(error => {
           //reject(error)
         })
-      }
+      },
+      handlePictureCardPreview(file) {
+        this.dialogImageUrl = file.url;
+        this.dialogVisible = true;
+      },
 
     }
   }
diff --git a/src/views/rain/inspection/components/showRainSiteInfo.vue b/src/views/rain/inspection/components/showRainSiteInfo.vue
index cc611e4..7f3a0fa 100644
--- a/src/views/rain/inspection/components/showRainSiteInfo.vue
+++ b/src/views/rain/inspection/components/showRainSiteInfo.vue
@@ -1,218 +1,238 @@
-<template>
-  <!-- 工地巡查 -->
-  <dialogShow :title="title" :is-show.sync="isShow" :width="width">
-    <template v-slot:content>
-      <el-form :model="formdetail" :rules="{}" ref="formdetail" label-position="right" :label-width="labelwidth">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="所属道路" prop="roadName">
-              {{form.roadName}}
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="工地名称" prop="name">
-              {{form.name}}
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="所在位置" prop="address">
-              {{form.address}}
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="经度" prop="longitude">
-              {{form.longitude}}
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="纬度" prop="address">
-              {{form.latitude}}
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="工地编号" prop="number">
-              {{form.number}}
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="建设单位" prop="build_unit">
-              {{form.build_unit}}
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="施工单位" prop="carry_unit">
-              {{form.carry_unit}}
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="工地类型" prop="siteType">
-              <div v-for="item in siteType">
-                <div v-if="item.id==form.siteType">
-                  {{item.value}}
-                </div>
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="工地状态" prop="status">
-              <div v-for="item in siteStatus">
-                <el-tag v-if="item.id==form.status">{{item.value}}</el-tag>
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="备注" prop="remark">
-              {{form.siteRemark}}
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="现场照片" prop="files_list" class="files_check">
-              <el-upload multiple action="/api/admin/upload-file" list-type="picture-card" :file-list="filesList"
-                ref="pictureUploads">
-                <div slot="file" slot-scope="{file}">
-                  <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
-                  <span class="el-upload-list__item-actions">
-                    <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
-                      <i class="el-icon-zoom-in"></i>
-                    </span>
-                  </span>
-                </div>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="是否违法" prop="is_law">
-              <el-tag v-if="form.is_law==0">否</el-tag>
-              <el-tag v-if="form.is_law==1">是</el-tag>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24" v-if="form.is_law==1">
-            <el-form-item label="违规内容" prop="break_id">
-              <div v-for=" item in siteLaw">
-                <div v-if="item.id==form.break_id">
-                  {{item.value}}
-                </div>
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24" v-if="form.is_law==1">
-            <el-form-item label="描述" prop="content">
-              {{form.content}}
-            </el-form-item>
-          </el-col>
+<template>
+  <div>
+    <!-- 工地巡查 -->
+    <dialogShow :title="title" :is-show.sync="isShow" :width="width">
+      <template v-slot:content>
+        <el-form :model="formdetail" :rules="{}" ref="formdetail" label-position="right" :label-width="labelwidth">
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="所属道路" prop="roadName">
+                {{form.roadName}}
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="工地名称" prop="name">
+                {{form.name}}
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="所在位置" prop="address">
+                {{form.address}}
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="经度" prop="longitude">
+                {{form.longitude}}
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="纬度" prop="address">
+                {{form.latitude}}
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="工地编号" prop="number">
+                {{form.number}}
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="建设单位" prop="build_unit">
+                {{form.build_unit}}
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="施工单位" prop="carry_unit">
+                {{form.carry_unit}}
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="工地类型" prop="siteType">
+                <div v-for="item in siteType">
+                  <div v-if="item.id==form.siteType">
+                    {{item.value}}
+                  </div>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="工地状态" prop="status">
+                <div v-for="item in siteStatus">
+                  <el-tag v-if="item.id==form.status">{{item.value}}</el-tag>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="联系人" prop="link_name">
+                {{form.link_name}}
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="联系号码" prop="link_mobile">
+                {{form.link_mobile}}
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="备注" prop="remark">
+                {{form.siteRemark}}
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="现场照片" prop="files_list" class="files_check">
+                <el-upload multiple action="/api/admin/upload-file" list-type="picture-card" :file-list="filesList"
+                  ref="pictureUploads">
+                  <div slot="file" slot-scope="{file}">
+                    <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
+                    <span class="el-upload-list__item-actions">
+                      <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
+                        <i class="el-icon-zoom-in"></i>
+                      </span>
+                    </span>
+                  </div>
+                </el-upload>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="是否违法" prop="is_law">
+                <el-tag v-if="form.is_law==0">否</el-tag>
+                <el-tag v-if="form.is_law==1">是</el-tag>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24" v-if="form.is_law==1">
+              <el-form-item label="违规内容" prop="break_id">
+                <div v-for=" item in siteLaw">
+                  <div v-if="item.id==form.break_id">
+                    {{item.value}}
+                  </div>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24" v-if="form.is_law==1">
+              <el-form-item label="描述" prop="content">
+                {{form.content}}
+              </el-form-item>
+            </el-col>
+
+            <!-- 查看 -->
+            <div v-if="formType=='showform'">
+              <el-col :span="24">
+                <el-form-item label="有无违法转办">
+                  <el-tag v-if="form.end_type==0">无</el-tag>
+                  <el-tag type="warning" v-if="form.end_type==1">养护转办</el-tag>
+                  <el-tag type="warning" v-if="form.end_type==2">违法转办</el-tag>
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" v-if="form.end_type==1">
+                <el-form-item label="养护转办类型" prop="type">
+                  <div v-for="item in yhtypeList">
+                    <div v-if="form.maintain_type==item.id">
+                      {{item.name}}
+                    </div>
+                  </div>
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" v-if="form.end_type==1">
+                <el-form-item label="要求完成时间" prop="end_time">
+                  {{form.end_time}}
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" v-if="form.end_type==1">
+                <el-form-item label="备注" prop="remark">
+                  {{form.remark}}
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="处理日志" prop="">
+
+                </el-form-item>
+                <el-table :data="form.rainInspectionLogs" style="width: 90%;margin: 0 auto;">
+                  <el-table-column prop="created_at" label="日期" width="180">
+                  </el-table-column>
+                  <el-table-column prop="content" label="内容">
+                  </el-table-column>
+                  <el-table-column prop="type_name" label="操作结果">
+                  </el-table-column>
+
+                  <el-table-column prop="adminName" label="操作人" width="180">
+                  </el-table-column>
+                </el-table>
+
+              </el-col>
+            </div>
+
+
+
+
+            <!-- 审核 auditform 办结-->
+            <div v-if="formType!='showform'">
+              <el-col :span="24">
+                <el-form-item label="备注" prop="content">
+                  <el-input type="textarea" v-model="formdetail.content" placeholder="请填写备注"></el-input>
+                </el-form-item>
+              </el-col>
+            </div>
+            <div v-if="formType=='endform'">
+              <el-col :span="24">
+                <el-form-item label="有无违法转办" prop="end_type">
+                  <el-radio-group v-model="formdetail.end_type">
+                    <el-radio :label="0">无</el-radio>
+                    <el-radio :label="1">养护转办</el-radio>
+                    <el-radio :label="2">违法转办</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" v-if="formdetail.end_type==1">
+                <el-form-item label="养护转办类型" prop="type">
+                  <el-select class="width100" v-model="formdetail.maintain_type" placeholder="请选择养护转办类型">
+                    <el-option v-for="item in yhtypeList" :key="item.id" :label="item.name" :value="item.id">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" v-if="formdetail.end_type==1">
+                <el-form-item label="要求完成时间" prop="end_time">
+                  <el-date-picker style="width:100%" v-model="formdetail.end_time" type="datetime" placeholder="选择时间"
+                    value-format="yyyy-MM-dd HH:mm:ss">
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="备注" prop="remark" v-if="formdetail.end_type==1">
+                  <el-input type="textarea" v-model="formdetail.remark" placeholder="请填写备注"></el-input>
+                </el-form-item>
+              </el-col>
+            </div>
+
+
+          </el-row>
+
+        </el-form>
+
+      </template>
+
+      <template v-slot:footerbtn>
+        <el-button v-if="formType=='auditform'" type="primary" v-preventReClick @click="auditForm('formdetail','1')">审核</el-button>
+        <div v-if="formType=='endform'" style="display: inline-block;margin-left:10px">
+          <el-button v-if="formdetail.end_type!=2" type="primary" v-preventReClick
+            @click="auditForm('formdetail','2')">办结
+          </el-button>
+          <el-button v-if="formdetail.end_type==2" type="primary" v-preventReClick
+            @click="auditForm('formdetail','1')">保存
+          </el-button>
+          <el-button v-if="formdetail.end_type!=2" type="danger" v-preventReClick
+            @click="auditForm('formdetail','3')">退回</el-button>
+        </div>
+      </template>
+
+    </dialogShow>
+
+
+    <div>
+      <el-dialog class="common-dialog" :visible.sync="dialogVisible">
+        <img width="100%" :src="dialogImageUrl" alt="">
+      </el-dialog>
+    </div>
+  </div>
 
-          <!-- 查看 -->
-          <div v-if="formType=='showform'">
-            <el-col :span="24">
-              <el-form-item label="有无违法转办">
-                <el-tag v-if="form.end_type==0">无</el-tag>
-                <el-tag type="warning" v-if="form.end_type==1">养护转办</el-tag>
-                <el-tag type="warning" v-if="form.end_type==2">违法转办</el-tag>
-              </el-form-item>
-            </el-col>
-            <el-col :span="24" v-if="form.end_type==1">
-              <el-form-item label="养护转办类型" prop="type">
-                <div v-for="item in yhtypeList">
-                  <div v-if="form.maintain_type==item.id">
-                    {{item.name}}
-                  </div>
-                </div>
-              </el-form-item>
-            </el-col>
-            <el-col :span="24" v-if="form.end_type==1">
-              <el-form-item label="要求完成时间" prop="end_time">
-                {{form.end_time}}
-              </el-form-item>
-            </el-col>
-            <el-col :span="24" v-if="form.end_type==1">
-              <el-form-item label="备注" prop="remark">
-                {{form.remark}}
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="处理日志" prop="">
-
-              </el-form-item>
-              <el-table :data="form.rainInspectionLogs" style="width: 90%;margin: 0 auto;">
-                <el-table-column prop="created_at" label="日期" width="180">
-                </el-table-column>
-                <el-table-column prop="content" label="内容">
-                </el-table-column>
-                <el-table-column prop="type_name" label="操作结果">
-                </el-table-column>
-
-                <el-table-column prop="adminName" label="操作人" width="180">
-                </el-table-column>
-              </el-table>
-
-            </el-col>
-          </div>
-
-
-
-
-          <!-- 审核 auditform 办结-->
-          <div v-if="formType!='showform'">
-            <el-col :span="24">
-              <el-form-item label="备注" prop="content">
-                <el-input type="textarea" v-model="formdetail.content" placeholder="请填写备注"></el-input>
-              </el-form-item>
-            </el-col>
-          </div>
-          <div v-if="formType=='endform'">
-            <el-col :span="24">
-              <el-form-item label="有无违法转办" prop="end_type">
-                <el-radio-group v-model="formdetail.end_type">
-                  <el-radio :label="0">无</el-radio>
-                  <el-radio :label="1">养护转办</el-radio>
-                  <el-radio :label="2">违法转办</el-radio>
-                </el-radio-group>
-              </el-form-item>
-            </el-col>
-            <el-col :span="24" v-if="formdetail.end_type==1">
-              <el-form-item label="养护转办类型" prop="type">
-                <el-select class="width100" v-model="formdetail.maintain_type" placeholder="请选择养护转办类型">
-                  <el-option v-for="item in yhtypeList" :key="item.id" :label="item.name" :value="item.id">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="24" v-if="formdetail.end_type==1">
-              <el-form-item label="要求完成时间" prop="end_time">
-                <el-date-picker style="width:100%" v-model="formdetail.end_time" type="datetime" placeholder="选择时间"
-                  value-format="yyyy-MM-dd HH:mm:ss">
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="备注" prop="remark" v-if="formdetail.end_type==1">
-                <el-input type="textarea" v-model="formdetail.remark" placeholder="请填写备注"></el-input>
-              </el-form-item>
-            </el-col>
-          </div>
-
-
-        </el-row>
-
-      </el-form>
-
-    </template>
-
-    <template v-slot:footerbtn>
-      <el-button v-if="formType=='auditform'" type="primary" v-preventReClick @click="auditForm('formdetail','1')">审核</el-button>
-      <div v-if="formType=='endform'" style="display: inline-block;margin-left:10px">
-        <el-button v-if="formdetail.end_type!=2" type="primary" v-preventReClick
-          @click="auditForm('formdetail','2')">办结
-        </el-button>
-        <el-button v-if="formdetail.end_type==2" type="primary" v-preventReClick
-          @click="auditForm('formdetail','1')">保存
-        </el-button>
-        <el-button v-if="formdetail.end_type!=2" type="danger" v-preventReClick
-          @click="auditForm('formdetail','3')">退回</el-button>
-      </div>
-    </template>
-
-  </dialogShow>
 </template>
 
 <script>
@@ -235,7 +255,9 @@
         width: "60%",
         labelwidth: "120px",
         isShow: false,
-        infoId: "",
+        infoId: "",
+        dialogImageUrl: "",
+        dialogVisible: false,
         filesList: [],
         dealFilesList: [],
         siteType: [],
@@ -328,7 +350,7 @@
             that.form.end_time = result.end_time
             that.form.remark = result.remark
             that.form.end_type = result.end_type
-
+            that.formdetail.end_type = result.end_type
             let building_site = result.building_site_info.building_site
             that.form.address = building_site.address
             that.form.latitude = building_site.latitude
@@ -338,7 +360,9 @@
             that.form.siteRemark = building_site.remark
             that.form.status = building_site.status
             that.form.build_unit = building_site.build_unit
-            that.form.carry_unit = building_site.carry_unit
+            that.form.carry_unit = building_site.carry_unit
+            that.form.link_name = building_site.link_name
+            that.form.link_mobile = building_site.link_mobile
             that.form.siteType = parseInt(building_site.type)
             that.form.maintain_type = result.maintain_type
             let site_files = [];
@@ -369,7 +393,11 @@
         }).catch(error => {
           //reject(error)
         })
-      }
+      },
+      handlePictureCardPreview(file) {
+        this.dialogImageUrl = file.url;
+        this.dialogVisible = true;
+      },
 
     }
   }
diff --git a/src/views/rain/inspection/inspection copy.vue b/src/views/rain/inspection/inspection copy.vue
index b30295a..5ddd9bf 100644
--- a/src/views/rain/inspection/inspection copy.vue	
+++ b/src/views/rain/inspection/inspection copy.vue	
@@ -59,13 +59,14 @@
             :label="column.title" :width="column.width" :fixed="column.fixed">
             <template slot-scope="scope">
               <div v-if="column.type=='opt'">
-                <Button ghost size="small" @click="showInfo(scope.row,'showform')" type="primary" style="margin-left: 10px;"
+                <Button ghost size="small" @click="showInfo(scope.row,'showform')" type="primary"
+                  style="margin-left: 10px;"
                   v-if="scope.row['status']==2||scope.row['status']==3||scope.row['end_type']==2">查看</Button>
 
                 <Button v-if="scope.row['status']==0" ghost size="small" @click="edit(scope.row)" type="primary"
                   style="margin-left: 10px;">编辑</Button>
-                <Button v-if="scope.row['status']==0" ghost size="small" @click="showInfo(scope.row,'auditform')" type="primary"
-                  style="margin-left: 10px;">审核</Button>
+                <Button v-if="scope.row['status']==0" ghost size="small" @click="showInfo(scope.row,'auditform')"
+                  type="primary" style="margin-left: 10px;">审核</Button>
 
                 <Button v-if="scope.row['status']==1&&scope.row['end_type']!=2" ghost size="small"
                   @click="showInfo(scope.row,'endform')" type="primary" style="margin-left: 10px;">办结</Button>
@@ -129,569 +130,11 @@
         </div>
       </el-dialog>
 
-      <!-- 审核 -->
-      <el-dialog class="common-dialog" :title="rainTitle" :visible.sync="dialogFormDetailVisible" width="60%">
-        <div class="dialogConcent">
-          <el-scrollbar style="flex: 1">
-            <!-- 日常雨水设施 -->
-            <el-form v-if="rainType==1" :model="formdetail" :rules="{}" ref="formdetail" label-position="right"
-              :label-width="formLabelWidth">
-              <el-row>
-                <el-col :span="24">
-                  <el-form-item label="所属道路" prop="road_id">
-                    {{roadName}}
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="巡查内容" prop="ask_content_id">
-                    <div v-for="item in equiementList">
-                      <div v-if="item.id==form.ask_content_id">
-                        {{item.value}}
-                      </div>
-                    </div>
-                  </el-form-item>
-                </el-col>
-                <!-- <el-col :span="24">
-                  <el-form-item label="覆盖范围" prop="scope">
-                    {{form.scope}}米
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="所在点位" prop="point_name">
-                    {{form.point_name}}
-                  </el-form-item>
-                </el-col> -->
-                <el-col :span="24">
-                  <el-form-item label="所在位置" prop="address">
-                    {{form.address}}
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="经度" prop="longitude">
-                    {{form.longitude}}
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="纬度" prop="latitude">
-                    {{form.latitude}}
-                  </el-form-item>
-                </el-col>
-                <!-- <el-col :span="24">
-                  <el-form-item label="描述" prop="content">
-                    {{form.content}}
-                  </el-form-item>
-                </el-col> -->
-                <el-col :span="24">
-                  <el-form-item label="现场照片" prop="files_list" class="files_check">
-                    <el-upload multiple action="/api/admin/upload-file" list-type="picture-card" :file-list="filesList"
-                      ref="pictureUploads">
-                      <div slot="file" slot-scope="{file}">
-                        <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
-                        <span class="el-upload-list__item-actions">
-                          <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
-                            <i class="el-icon-zoom-in"></i>
-                          </span>
-                        </span>
-                      </div>
-                    </el-upload>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="24">
-                  <el-form-item label="是否异常" prop="is_unusual">
-                    <el-tag v-if="form.is_unusual==0">否</el-tag>
-                    <el-tag type="warning" v-if="form.is_unusual==1">是</el-tag>
-                    <!-- <el-tag type="success" v-if="form.is_unusual==2">破损</el-tag> -->
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="12" v-if="form.is_unusual==0">
-                  <el-form-item label="巡查开始点位" prop="start_address">
-                    {{form.start_address}}
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12" v-if="form.is_unusual==0">
-                  <el-form-item label="巡查结束点位" prop="address">
-                    {{form.end_address}}
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24" v-if="form.is_unusual!=0">
-                  <el-form-item label="异常类型" prop="unusual_type_detail">
-                    {{form.unusual_type_detail?form.unusual_type_detail.value:""}}
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24" v-if="form.is_unusual!=0">
-                  <el-form-item label="异常处置建议" prop="tip">
-                    {{form.tip}}
-                  </el-form-item>
-                </el-col>
-                <el-col :span="10">
-                  <el-form-item label="是否现场处理" prop="is_scene">
-                    <el-tag v-if="form.is_scene==0">否</el-tag>
-                    <el-tag type="success" v-if="form.is_scene==1">是</el-tag>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24" v-if="form.is_scene==1">
-                  <el-form-item label="现场处理结果" prop="result">
-                    {{form.result}}
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24" v-if="form.is_scene==1">
-                  <el-form-item label="处理后照片" prop="files_end_list" class="files_check">
-                    <el-upload multiple action="/api/admin/upload-file" list-type="picture-card"
-                      :file-list="dealFilesList" ref="pictureUploads">
-                      <div slot="file" slot-scope="{file}">
-                        <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
-                        <span class="el-upload-list__item-actions">
-                          <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
-                            <i class="el-icon-zoom-in"></i>
-                          </span>
-                        </span>
-                      </div>
-                    </el-upload>
-
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="24" v-if="nowstatus==0||nowstatus==1&&wf_type!=2">
-                  <el-form-item label="备注" prop="content">
-                    <el-input type="textarea" v-model="formdetail.content" placeholder="请填写备注"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24" v-if="nowstatus==1&&wf_type!=2">
-                  <el-form-item label="转办类型" prop="end_type">
-                    <el-radio-group v-model="formdetail.end_type">
-                      <el-radio :label="0">无</el-radio>
-                      <el-radio :label="1">养护转办</el-radio>
-                      <el-radio :label="2">违法转办</el-radio>
-                    </el-radio-group>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24" v-if="nowstatus==2||nowstatus==3||wf_type==2">
-                  <el-form-item label="转办类型">
-                    <el-tag v-if="end_types==0">无</el-tag>
-                    <el-tag type="warning" v-if="end_types==1">养护转办</el-tag>
-                    <el-tag type="warning" v-if="end_types==2">违法转办</el-tag>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24" v-if="wf_type==1">
-                  <el-form-item label="要求完成时间" prop="end_time">
-                    {{formdetail.end_time}}
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24" v-if="wf_type==1">
-                  <el-form-item label="备注" prop="remark">
-                    {{formdetail.remark}}
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24" v-if="nowstatus==1&&formdetail.end_type==1">
-                  <el-form-item label="养护转办类型" prop="type">
-                    <el-select class="width100" v-model="formdetail.type" placeholder="请选择养护转办类型">
-                      <el-option v-for="item in yhtypeList" :key="item.id" :label="item.name" :value="item.id">
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==1">
-                  <el-form-item label="要求完成时间" prop="end_time">
-                    <el-date-picker style="width:100%" v-model="formdetail.end_time" type="datetime" placeholder="选择时间"
-                      value-format="yyyy-MM-dd HH:mm:ss">
-                    </el-date-picker>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==1">
-                  <el-form-item label="备注" prop="remark">
-                    <el-input type="textarea" v-model="formdetail.remark" placeholder="请填写备注" autocomplete="off">
-                    </el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24" v-if="nowstatus==2||nowstatus==3||wf_type==2">
-                  <el-form-item label="处理日志" prop="">
-
-                  </el-form-item>
-                  <el-table :data="rainMaintainLogs" style="width: 90%;margin: 0 auto;">
-                    <el-table-column prop="created_at" label="日期" width="180">
-                    </el-table-column>
-                    <el-table-column prop="content" label="内容">
-                    </el-table-column>
-                    <!-- <el-table-column
-                              prop="end_type"
-                              label="有无违法转办"
-                              >
-
-                            </el-table-column> -->
-                    <el-table-column prop="type_name" label="操作结果">
-                    </el-table-column>
-
-                    <el-table-column prop="adminName" label="操作人" width="180">
-                    </el-table-column>
-                  </el-table>
-
-                </el-col>
-
-              </el-row>
-
-            </el-form>
-
-
-            <!-- 在建工地 -->
-            <el-form v-if="rainType==2" :model="formdetail" :rules="{}" ref="formdetail" label-position="right"
-              :label-width="formLabelWidth">
-              <el-row>
-                <el-col :span="24">
-                  <el-form-item label="所属道路" prop="road_id">
-                    {{roadName}}
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="工地名称" prop="name">
-                    {{form.name}}
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="所在位置" prop="address">
-                    {{form.address}}
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="经度" prop="longitude">
-                    {{form.longitude}}
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="纬度" prop="address">
-                    {{form.latitude}}
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="工地编号" prop="number">
-                    {{form.number}}
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="建设单位" prop="build_unit">
-                    {{form.build_unit}}
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="施工单位" prop="carry_unit">
-                    {{form.carry_unit}}
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="工地类型" prop="type">
-                    <div v-for="item in siteType">
-                      <div v-if="item.id==form.type">
-                        {{item.value}}
-                      </div>
-                    </div>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="工地状态" prop="status">
-                    <div v-for="item in siteStatus">
-                      <el-tag v-if="item.id==form.status">{{item.value}}</el-tag>
-                    </div>
-                  </el-form-item>
-                </el-col>
-                <!-- <el-col :span="24">
-                      <el-form-item label="工地类型" prop="type">
-                          <el-input v-model="form.type" placeholder="工地类型" autocomplete="off"></el-input>
-                      </el-form-item>
-
-                  </el-col> -->
-                <el-col :span="24">
-                  <el-form-item label="备注" prop="remark">
-                    {{form.remark}}
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="现场照片" prop="files_list" class="files_check">
-                    <el-upload multiple action="/api/admin/upload-file" list-type="picture-card" :file-list="filesList"
-                      ref="pictureUploads">
-                      <div slot="file" slot-scope="{file}">
-                        <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
-                        <span class="el-upload-list__item-actions">
-                          <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
-                            <i class="el-icon-zoom-in"></i>
-                          </span>
-                        </span>
-                      </div>
-                    </el-upload>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="是否违法" prop="is_law">
-                    <el-tag v-if="form.is_law==0">否</el-tag>
-                    <el-tag v-if="form.is_law==1">是</el-tag>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24" v-if="form.is_law==1">
-                  <el-form-item label="违规内容" prop="break_id">
-                    <div v-for=" item in siteLaw">
-                      <div v-if="item.id==form.break_id">
-                        {{item.value}}
-                      </div>
-                    </div>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="24" v-if="form.is_law==1">
-                  <el-form-item label="描述" prop="content">
-                    {{form.content}}
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="24" v-if="nowstatus==0||nowstatus==1&&wf_type!=2">
-                  <el-form-item label="备注" prop="content">
-                    <el-input type="textarea" v-model="formdetail.content" placeholder="请填写备注"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24" v-if="nowstatus==1&&wf_type!=2">
-                  <el-form-item label="有无违法转办" prop="end_type">
-                    <el-radio-group v-model="formdetail.end_type">
-                      <el-radio :label="0">无</el-radio>
-                      <el-radio :label="1">养护转办</el-radio>
-                      <el-radio :label="2">违法转办</el-radio>
-                    </el-radio-group>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24" v-if="nowstatus==1&&formdetail.end_type==1">
-                  <el-form-item label="养护转办类型" prop="type">
-                    <el-select class="width100" v-model="formdetail.type" placeholder="请选择养护转办类型">
-                      <el-option v-for="item in yhtypeList" :key="item.id" :label="item.name" :value="item.id">
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==1">
-                  <el-form-item label="要求完成时间" prop="end_time">
-                    <el-date-picker style="width:100%" v-model="formdetail.end_time" type="datetime" placeholder="选择时间"
-                      value-format="yyyy-MM-dd HH:mm:ss">
-                    </el-date-picker>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24" v-if="nowstatus==1&&wf_type!=2">
-                  <el-form-item label="备注" prop="remark">
-                    <el-input type="textarea" v-model="formdetail.remark" placeholder="请填写备注" autocomplete="off">
-                    </el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24" v-if="nowstatus==2||nowstatus==3||wf_type==2">
-                  <el-form-item label="有无违法转办">
-                    <el-tag v-if="end_types==0">无</el-tag>
-                    <el-tag type="warning" v-if="end_types==1">养护转办</el-tag>
-                    <el-tag type="warning" v-if="end_types==2">违法转办</el-tag>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24" v-if="wf_type==1">
-                  <el-form-item label="要求完成时间" prop="end_time">
-                    {{formdetail.end_time}}
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24" v-if="wf_type==1">
-                  <el-form-item label="备注" prop="remark">
-                    {{formdetail.remark}}
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24" v-if="nowstatus==2||nowstatus==3||formdetail.end_type==2">
-                  <el-form-item label="处理日志" prop="">
-
-                  </el-form-item>
-                  <el-table :data="rainMaintainLogs" style="width: 90%;margin: 0 auto;">
-                    <el-table-column prop="created_at" label="日期" width="180">
-                    </el-table-column>
-                    <el-table-column prop="content" label="内容">
-                    </el-table-column>
-                    <el-table-column prop="type_name" label="操作结果">
-                    </el-table-column>
-
-                    <el-table-column prop="adminName" label="操作人" width="180">
-                    </el-table-column>
-                  </el-table>
-
-                </el-col>
-
-
-              </el-row>
-
-            </el-form>
-          </el-scrollbar>
-        </div>
-
-        <div slot="footer" class="dialog-footer">
-          <el-button @click="resetFormDetail('formdetail')">取 消</el-button>
-          <el-button v-if="nowstatus==0" type="primary" v-preventReClick @click="submitFormDetail('formdetail','1')">审核
-          </el-button>
-          <el-button v-if="nowstatus==1&&formdetail.end_type!=2" type="primary" v-preventReClick
-            @click="submitFormDetail('formdetail','2')">办结
-          </el-button>
-          <el-button v-if="nowstatus==1&&formdetail.end_type==2&&wf_type!=2" type="primary" v-preventReClick
-            @click="submitFormDetail('formdetail','1')">保存
-          </el-button>
-          <el-button v-if="nowstatus==1&&formdetail.end_type!=2&&wf_type!=2" type="danger" v-preventReClick
-            @click="submitFormDetail('formdetail','3')">退回
-          </el-button>
-        </div>
-      </el-dialog>
-
-
-
 
       <!-- 编辑 -->
       <el-dialog class="common-dialog" :title="rainTitle" :visible.sync="dialogFormVisible" width="60%">
         <div class="dialogConcent">
           <el-scrollbar style="flex: 1">
-            <!-- 日常雨水设施 -->
-            <el-form v-if="rainType==1" :model="form" :rules="rules" ref="form" label-position="right"
-              :label-width="formLabelWidth">
-              <el-row>
-                <el-col :span="12">
-                  <el-form-item label="所属道路" prop="road_id">
-                    <el-select class="width100" v-model="roadName" filterable remote @change="chooseRoad"
-                      :disabled="roaddisabled" reserve-keyword placeholder="请输入关键词查找道路信息" clearable @focus="remoteRoad"
-                      :remote-method="remoteMethod" :loading="roadloading">
-                      <el-option v-for="item in roadsList" :key="item.id" :label="item.name" :value="item.id">
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="巡查内容" prop="ask_content_id">
-                    <el-select class="width100" v-model="form.ask_content_id" placeholder="请选择巡查内容">
-                      <el-option v-for="item in equiementList" :key="item.id" :label="item.value" :value="item.id">
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-
-                <!-- <el-col :span="12">
-                  <el-form-item label="覆盖范围(米)" prop="scope">
-                    <el-input v-model="form.scope" type="number" placeholder="请填写覆盖范围" autocomplete="off"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="点位名称" prop="point_name">
-                    <el-input required v-model="form.point_name" placeholder="请填写点位名称" autocomplete="off"></el-input>
-                  </el-form-item>
-                </el-col> -->
-                <el-col :span="24">
-                  <el-form-item label="所在位置" prop="address">
-                    <avue-input-map :params="mapparams" placeholder="请选择地图" v-model="mapform"></avue-input-map>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="经度" prop="longitude">
-                    <el-input disabled="" v-model="form.longitude" placeholder="经度" autocomplete="off"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="纬度" prop="latitude">
-                    <el-input disabled="" v-model="form.latitude" placeholder="纬度" autocomplete="off"></el-input>
-                  </el-form-item>
-                </el-col>
-                <!-- <el-col :span="24">
-                  <el-form-item label="描述" prop="content">
-                    <el-input type="textarea" v-model="form.content" placeholder="请填写描述" autocomplete="off"></el-input>
-                  </el-form-item>
-                </el-col> -->
-                <el-col :span="24">
-                  <el-form-item label="现场照片" prop="files_list">
-                    <el-upload multiple action="/api/admin/upload-file" list-type="picture-card" :file-list="filesList"
-                      ref="pictureUpload" :auto-upload="true" :data="uploadOther" :on-error="handleError"
-                      :on-success="function(responsose,file,fileList) {return handlesuccess(responsose,file,fileList,1)}">
-                      <i slot="default" class="el-icon-plus"></i>
-                      <div slot="file" slot-scope="{file}">
-                        <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
-                        <span class="el-upload-list__item-actions">
-                          <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
-                            <i class="el-icon-zoom-in"></i>
-                          </span>
-                          <span v-if="!disabled" class="el-upload-list__item-delete" @click="handleRemove(file)">
-                            <i class="el-icon-delete"></i>
-                          </span>
-                        </span>
-                      </div>
-                    </el-upload>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="是否异常" prop="is_unusual">
-                    <el-radio-group v-model="form.is_unusual">
-                      <el-radio :label="0">否</el-radio>
-                      <el-radio :label="1">是</el-radio>
-                      <!-- <el-radio :label="2">破损</el-radio> -->
-                    </el-radio-group>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12" v-if="form.is_unusual==0">
-                  <el-form-item label="巡查开始点位" prop="start_mapform">
-                    <avue-input-map :params="mapparams" placeholder="请选择地图" v-model="start_mapform"></avue-input-map>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12" v-if="form.is_unusual==0">
-                  <el-form-item label="巡查结束点位" prop="end_mapform">
-                    <avue-input-map :params="mapparams" placeholder="请选择地图" v-model="end_mapform"></avue-input-map>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24" v-if="form.is_unusual!=0">
-                  <el-form-item label="异常类型" prop="unusual_type_id">
-                    <el-select class="width100" v-model="form.unusual_type_id" placeholder="请选择异常类型">
-                      <el-option v-for="item in unusualList" :key="item.id" :label="item.value" :value="item.id">
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="24" v-if="form.is_unusual!=0">
-                  <el-form-item label="异常处置建议" prop="tip">
-                    <el-input type="textarea" v-model="form.tip" placeholder="请填写异常处置建议" autocomplete="off"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="10">
-                  <el-form-item label="是否现场处理" prop="is_scene">
-                    <el-radio-group v-model="form.is_scene">
-                      <el-radio :label="0">否</el-radio>
-                      <el-radio :label="1">是</el-radio>
-                    </el-radio-group>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24" v-if="form.is_scene==1">
-                  <el-form-item label="现场处理结果" prop="result">
-                    <el-input type="textarea" v-model="form.result" placeholder="请填写现场处理结果" autocomplete="off">
-                    </el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24" v-if="form.is_scene==1">
-                  <el-form-item label="处理后照片" prop="files_end_list">
-                    <el-upload multiple action="/api/admin/upload-file" list-type="picture-card"
-                      :file-list="dealFilesList" ref="pictureUploads" :limit="3" :auto-upload="true" :data="uploadOther"
-                      :on-error="handleError"
-                      :on-success="function(responsose,file,fileList) {return handlesuccess(responsose,file,fileList,2)}">
-                      <i slot="default" class="el-icon-plus"></i>
-                      <div slot="file" slot-scope="{file}">
-                        <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
-                        <span class="el-upload-list__item-actions">
-                          <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
-                            <i class="el-icon-zoom-in"></i>
-                          </span>
-                          <span v-if="!disabled" class="el-upload-list__item-delete" @click="handleRemove(file)">
-                            <i class="el-icon-delete"></i>
-                          </span>
-                        </span>
-                      </div>
-                    </el-upload>
-                  </el-form-item>
-                </el-col>
-
-
-              </el-row>
-
-            </el-form>
-
 
             <!-- 在建工地 -->
             <el-form v-if="rainType==2" :model="form" :rules="rules" ref="form" label-position="right"
@@ -868,12 +311,12 @@
       </el-dialog>
 
 
-
-
-<!-- 查看 -->
-<showRainEquipmentInfo ref="showRainEquipmentInfo" @auditSuccess="load"></showRainEquipmentInfo>
-<showRainSiteInfo ref="showRainSiteInfo" @auditSuccess="load"></showRainSiteInfo>
-
+      <!-- 新增 编辑 -->
+      <editEquipment ref="editEquipment" @auditSuccess="load"></editEquipment>
+      <editSite ref="editSite" @auditSuccess="load"></editSite>
+      <!-- 查看 -->
+      <showRainEquipmentInfo ref="showRainEquipmentInfo" @auditSuccess="load"></showRainEquipmentInfo>
+      <showRainSiteInfo ref="showRainSiteInfo" @auditSuccess="load"></showRainSiteInfo>
 
     </div>
   </div>
@@ -906,14 +349,18 @@
   } from '../../../api/basic/road.js'
   import LxHeader from "@/components/LxHeader/index.vue";
   import AvueMap from 'avue-plugin-map'
-  import showRainEquipmentInfo from '@/views/rain/inspection/components/showRainEquipmentInfo'
-  import showRainSiteInfo from '@/views/rain/inspection/components/showRainSiteInfo'
+  import showRainEquipmentInfo from '@/views/rain/inspection/components/showRainEquipmentInfo'
+  import showRainSiteInfo from '@/views/rain/inspection/components/showRainSiteInfo'
+  import editEquipment from '@/views/rain/inspection/components/editEquipment'
+  import editSite from '@/views/rain/inspection/components/editSite'
   export default {
     components: {
       LxHeader,
-      AvueMap,
-      showRainEquipmentInfo,
-      showRainSiteInfo
+      AvueMap,
+      showRainEquipmentInfo,
+      showRainSiteInfo,
+      editEquipment,
+      editSite
     },
     data() {
       return {
@@ -961,6 +408,7 @@
           // ask_content_id:""
         },
         unusualList: [],
+        askContentArr: [],
         yhtypeList: [{
           id: 1,
           name: "雨水管道疏挖"
@@ -1260,6 +708,17 @@
         console.log(val)
         this.reviewList = val
       },
+      returnAskContentId(arr) {
+        if (arr.length == 0) {
+          return
+        }
+        let getArr = ""
+        for (var m of arr) {
+          getArr += m + ","
+        }
+        getArr = getArr.substring(0, getArr.length - 1)
+        return getArr
+      },
       review() {
         let data = this.reviewList
         let idsArr = [];
@@ -1401,6 +860,7 @@
         that.load(true)
       },
       load(is_export) {
+        // return
         listall({
           page: this.paginations.page,
           page_size: this.paginations.page_size,
@@ -1420,8 +880,8 @@
           }
           for (var m of response.data) {
             if (m.rain_equipment_info) {
-              m.askName = m.rain_equipment_info.ask_content_detail ? m.rain_equipment_info.ask_content_detail
-                .value : ""
+              m.askName = m.rain_equipment_info.ask_content_detail ? m.rain_equipment_info.ask_content_detail :
+                ""
             }
           }
           this.tableData = response.data;
@@ -1459,8 +919,14 @@
               that.form = result.rain_equipment_info;
               that.form.rain_equipment_id = result.rain_equipment_id;
               that.roaddisabled = true
-              that.form.ask_content_id = result.rain_equipment_info.ask_content_id ? parseInt(result
-                .rain_equipment_info.ask_content_id) : ""
+              that.form.ask_content_id = result.rain_equipment_info.ask_content_id ? result
+                .rain_equipment_info.ask_content_id : ""
+              let askArr = result.rain_equipment_info.ask_content_id ? result.rain_equipment_info.ask_content_id
+                .split(",") : []
+              for (var m of askArr) {
+                that.askContentArr.push(parseInt(m))
+              }
+
               that.roadName = result.rain_equipment_info.road ? result.rain_equipment_info.road.name : ""
               that.idname = "rain_equipment_id"
               that.mapform = [result.rain_equipment_info.longitude, result.rain_equipment_info.latitude, result
@@ -1540,44 +1006,59 @@
       },
 
       show(obj) {
-        this.dialogFormDetailVisible = true;
+        this.dialogFormDetailVisible = true;
         // this.$refs.showRainEquipmentInfo.isShow = true
         this.info(obj)
       },
-
-      showInfo(obj,formtype){
-        // 日常雨水设施
-        if(obj.type==1){
-          this.$refs.showRainEquipmentInfo.isShow = true
-          this.$refs.showRainEquipmentInfo.getEquipmentInfo(obj.id)
-          this.$refs.showRainEquipmentInfo.infoId = obj.id
-          this.$refs.showRainEquipmentInfo.formType = formtype
-        }
-        // 工地
-        if(obj.type==2){
-          this.$refs.showRainSiteInfo.isShow = true
-          this.$refs.showRainSiteInfo.getSiteInfo(obj.id)
-          this.$refs.showRainSiteInfo.siteid = obj.id
-          this.$refs.showRainSiteInfo.formType = formtype
-        }
-
-      },
+
+      // 审核 办结 查看
+      showInfo(obj, formtype) {
+        // 日常雨水设施
+        if (obj.type == 1) {
+          this.$refs.showRainEquipmentInfo.isShow = true
+          this.$refs.showRainEquipmentInfo.getEquipmentInfo(obj.id)
+          this.$refs.showRainEquipmentInfo.infoId = obj.id
+          this.$refs.showRainEquipmentInfo.formType = formtype
+        }
+        // 工地
+        if (obj.type == 2) {
+          this.$refs.showRainSiteInfo.isShow = true
+          this.$refs.showRainSiteInfo.getSiteInfo(obj.id)
+          this.$refs.showRainSiteInfo.infoId = obj.id
+          this.$refs.showRainSiteInfo.formType = formtype
+        }
+
+      },
+      // 编辑
       edit(obj) {
         var that = this;
-        this.form = this.$options.data().form
-        that.filesList = [];
-        that.dealFilesList = [];
-        that.mapform = ['', '', ''];
-        that.start_mapform = ['', '', ''];
-        that.end_mapform = ['', '', ''];
-        that.roadName = ""
-        that.roaddisabled = false
-        if (obj) {
-          that.info(obj);
-          this.dialogFormVisible = true;
+        // this.form = this.$options.data().form
+        // that.filesList = [];
+        // that.dealFilesList = [];
+        // that.mapform = ['', '', ''];
+        // that.start_mapform = ['', '', ''];
+        // that.end_mapform = ['', '', ''];
+        // that.roadName = ""
+        // that.roaddisabled = false
+        // that.askContentArr = []
+        if (obj) {
+          if(obj.type==1){
+            this.$refs.editEquipment.infoId = obj.id
+            this.$refs.editEquipment.getEquipmentInfo(obj.id)
+            this.$refs.editEquipment.isShow = true
+          }
+          if(obj.type==2){
+            this.$refs.editSite.infoId = obj.id
+            this.$refs.editSite.getSiteInfo(obj.id)
+            this.$refs.editSite.isShow = true
+          }
+
+
+          // that.info(obj);
+          // this.dialogFormVisible = true;
         } else {
-          this.roaddisabled = false
-          this.dialogFormVisible = false
+          // this.roaddisabled = false
+          // this.dialogFormVisible = false
           this.rainTypeVisible = true
         }
 
@@ -1630,6 +1111,7 @@
             });
         }
         this.form.files_end_list = listUrlafter
+        that.form.ask_content_id = this.returnAskContentId(that.askContentArr)
         this.$refs[formName].validate((valid) => {
           if (valid) {
             that.submitAll(that.rainType, that.form[this.idname])
@@ -1640,19 +1122,6 @@
           }
         });
       },
-      submitFormDetail(formName, status) {
-        var that = this;
-        that.formdetail.status = status
-        console.log(that.formdetail);
-        update(that.formdetail).then(response => {
-          this.$Message.success('操作成功');
-          that.load();
-          that.dialogFormDetailVisible = false;
-        }).catch(error => {
-          //reject(error)
-        })
-
-      },
       resetForm(formName) {
         var that = this;
         that.filesList = [];
@@ -1664,26 +1133,6 @@
         that.dialogFormVisible = false;
         that.dialogFormDetailVisible = false;
       },
-      resetFormDetail(formName) {
-        var that = this;
-        that.filesList = [];
-        that.dealFilesList = [];
-        that.mapform = ['', '', ''];
-        that.start_mapform = ['', '', ''];
-        that.end_mapform = ['', '', ''];
-        that.form = {};
-        that.rainMaintainLogs = []
-        that.end_types = 0;
-        that.formdetail = {
-          status: 0,
-          end_type: 0,
-          content: "",
-          end_time: "",
-          remark: ""
-        }
-        that.dialogFormVisible = false;
-        that.dialogFormDetailVisible = false;
-      },
       handleRemove(file) {
         if (file.photoType == "before") {
           for (var i = 0; i < this.filesList.length; i++) {
@@ -1731,11 +1180,17 @@
         var that = this
         this.rainTypeVisible = false
         if (that.rainType == 1) {
-          that.rainTitle = "日常雨水设施"
+          that.rainTitle = "日常雨水设施"
+           this.$refs.editEquipment.getEquipmentInfo()
+          this.$refs.editEquipment.isShow = true
+
         } else if (that.rainType == 2) {
-          that.rainTitle = "在建工地"
+          that.rainTitle = "在建工地"
+          this.$refs.editSite.getSiteInfo()
+          this.$refs.editSite.isShow = true
+          this.dialogFormVisible = true;
         }
-        this.dialogFormVisible = true;
+
       },
 
 
@@ -1745,7 +1200,7 @@
         // return
         // that.form.type = type;
         console.log("that.form", that.form);
-        // return;
+        // return
         switch (parseInt(type)) {
           case 1:
             if (id) {
diff --git a/src/views/rain/inspection/inspection.vue b/src/views/rain/inspection/inspection.vue
index 65dc024..b5f232b 100644
--- a/src/views/rain/inspection/inspection.vue
+++ b/src/views/rain/inspection/inspection.vue
@@ -35,7 +35,7 @@
               </el-select>
 
               <el-select class="vm10" filterable v-model="searchFields.ask_content_id" placeholder="请选择巡查内容">
-                <el-option v-for="item in sequiementList" :key="item.id" :label="item.value" :value="item.id">
+                <el-option v-for="item in selects.sequiementList" :key="item.id" :label="item.value" :value="item.id">
                 </el-option>
               </el-select>
 
@@ -59,13 +59,14 @@
             :label="column.title" :width="column.width" :fixed="column.fixed">
             <template slot-scope="scope">
               <div v-if="column.type=='opt'">
-                <Button ghost size="small" @click="showInfo(scope.row,'showform')" type="primary" style="margin-left: 10px;"
+                <Button ghost size="small" @click="showInfo(scope.row,'showform')" type="primary"
+                  style="margin-left: 10px;"
                   v-if="scope.row['status']==2||scope.row['status']==3||scope.row['end_type']==2">查看</Button>
 
                 <Button v-if="scope.row['status']==0" ghost size="small" @click="edit(scope.row)" type="primary"
                   style="margin-left: 10px;">编辑</Button>
-                <Button v-if="scope.row['status']==0" ghost size="small" @click="showInfo(scope.row,'auditform')" type="primary"
-                  style="margin-left: 10px;">审核</Button>
+                <Button v-if="scope.row['status']==0" ghost size="small" @click="showInfo(scope.row,'auditform')"
+                  type="primary" style="margin-left: 10px;">审核</Button>
 
                 <Button v-if="scope.row['status']==1&&scope.row['end_type']!=2" ghost size="small"
                   @click="showInfo(scope.row,'endform')" type="primary" style="margin-left: 10px;">办结</Button>
@@ -117,10 +118,12 @@
           </el-pagination>
         </div>
       </div>
+
+      <!-- 初始选择 -->
       <el-dialog title="雨管养护类型选择" :visible.sync="rainTypeVisible" width="60%">
         <div class="dialogConcent">
-          <el-radio v-model="rainType" label="1">日常雨水设施</el-radio>
-          <el-radio v-model="rainType" label="2">在建工地</el-radio>
+          <el-radio v-model="rainType" :label="1">日常雨水设施</el-radio>
+          <el-radio v-model="rainType" :label="2">在建工地</el-radio>
         </div>
 
         <div slot="footer" class="dialog-footer">
@@ -129,303 +132,14 @@
         </div>
       </el-dialog>
 
+      <!-- 新增 编辑 -->
+      <editEquipment ref="editEquipment" @auditSuccess="load"></editEquipment>
+      <editSite ref="editSite" @auditSuccess="load"></editSite>
+      <!-- 查看 审核 办结 -->
+      <showRainEquipmentInfo ref="showRainEquipmentInfo" @auditSuccess="load"></showRainEquipmentInfo>
+      <showRainSiteInfo ref="showRainSiteInfo" @auditSuccess="load"></showRainSiteInfo>
 
-      <!-- 编辑 -->
-      <el-dialog class="common-dialog" :title="rainTitle" :visible.sync="dialogFormVisible" width="60%">
-        <div class="dialogConcent">
-          <el-scrollbar style="flex: 1">
-            <!-- 日常雨水设施 -->
-            <el-form v-if="rainType==1" :model="form" :rules="rules" ref="form" label-position="right"
-              :label-width="formLabelWidth">
-              <el-row>
-                <el-col :span="12">
-                  <el-form-item label="所属道路" prop="road_id">
-                    <el-select class="width100" v-model="roadName" filterable remote @change="chooseRoad"
-                      :disabled="roaddisabled" reserve-keyword placeholder="请输入关键词查找道路信息" clearable @focus="remoteRoad"
-                      :remote-method="remoteMethod" :loading="roadloading">
-                      <el-option v-for="item in roadsList" :key="item.id" :label="item.name" :value="item.id">
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="巡查内容" prop="ask_content_id">
-                    <el-select multiple class="width100" v-model="askContentArr" placeholder="请选择巡查内容">
-                      <el-option v-for="item in equiementList" :key="item.id" :label="item.value" :value="item.id">
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-
-                <!-- <el-col :span="12">
-                  <el-form-item label="覆盖范围(米)" prop="scope">
-                    <el-input v-model="form.scope" type="number" placeholder="请填写覆盖范围" autocomplete="off"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="点位名称" prop="point_name">
-                    <el-input required v-model="form.point_name" placeholder="请填写点位名称" autocomplete="off"></el-input>
-                  </el-form-item>
-                </el-col> -->
-                <el-col :span="24">
-                  <el-form-item label="所在位置" prop="address">
-                    <avue-input-map :params="mapparams" placeholder="请选择地图" v-model="mapform"></avue-input-map>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="经度" prop="longitude">
-                    <el-input disabled="" v-model="form.longitude" placeholder="经度" autocomplete="off"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="纬度" prop="latitude">
-                    <el-input disabled="" v-model="form.latitude" placeholder="纬度" autocomplete="off"></el-input>
-                  </el-form-item>
-                </el-col>
-                <!-- <el-col :span="24">
-                  <el-form-item label="描述" prop="content">
-                    <el-input type="textarea" v-model="form.content" placeholder="请填写描述" autocomplete="off"></el-input>
-                  </el-form-item>
-                </el-col> -->
-                <el-col :span="24">
-                  <el-form-item label="现场照片" prop="files_list">
-                    <el-upload multiple action="/api/admin/upload-file" list-type="picture-card" :file-list="filesList"
-                      ref="pictureUpload" :auto-upload="true" :data="uploadOther" :on-error="handleError"
-                      :on-success="function(responsose,file,fileList) {return handlesuccess(responsose,file,fileList,1)}">
-                      <i slot="default" class="el-icon-plus"></i>
-                      <div slot="file" slot-scope="{file}">
-                        <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
-                        <span class="el-upload-list__item-actions">
-                          <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
-                            <i class="el-icon-zoom-in"></i>
-                          </span>
-                          <span v-if="!disabled" class="el-upload-list__item-delete" @click="handleRemove(file)">
-                            <i class="el-icon-delete"></i>
-                          </span>
-                        </span>
-                      </div>
-                    </el-upload>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="是否异常" prop="is_unusual">
-                    <el-radio-group v-model="form.is_unusual">
-                      <el-radio :label="0">否</el-radio>
-                      <el-radio :label="1">是</el-radio>
-                      <!-- <el-radio :label="2">破损</el-radio> -->
-                    </el-radio-group>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12" v-if="form.is_unusual==0">
-                  <el-form-item label="巡查开始点位" prop="start_mapform">
-                    <avue-input-map :params="mapparams" placeholder="请选择地图" v-model="start_mapform"></avue-input-map>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12" v-if="form.is_unusual==0">
-                  <el-form-item label="巡查结束点位" prop="end_mapform">
-                    <avue-input-map :params="mapparams" placeholder="请选择地图" v-model="end_mapform"></avue-input-map>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24" v-if="form.is_unusual!=0">
-                  <el-form-item label="异常类型" prop="unusual_type_id">
-                    <el-select class="width100" v-model="form.unusual_type_id" placeholder="请选择异常类型">
-                      <el-option v-for="item in unusualList" :key="item.id" :label="item.value" :value="item.id">
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="24" v-if="form.is_unusual!=0">
-                  <el-form-item label="异常处置建议" prop="tip">
-                    <el-input type="textarea" v-model="form.tip" placeholder="请填写异常处置建议" autocomplete="off"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="10">
-                  <el-form-item label="是否现场处理" prop="is_scene">
-                    <el-radio-group v-model="form.is_scene">
-                      <el-radio :label="0">否</el-radio>
-                      <el-radio :label="1">是</el-radio>
-                    </el-radio-group>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24" v-if="form.is_scene==1">
-                  <el-form-item label="现场处理结果" prop="result">
-                    <el-input type="textarea" v-model="form.result" placeholder="请填写现场处理结果" autocomplete="off">
-                    </el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24" v-if="form.is_scene==1">
-                  <el-form-item label="处理后照片" prop="files_end_list">
-                    <el-upload multiple action="/api/admin/upload-file" list-type="picture-card"
-                      :file-list="dealFilesList" ref="pictureUploads" :limit="3" :auto-upload="true" :data="uploadOther"
-                      :on-error="handleError"
-                      :on-success="function(responsose,file,fileList) {return handlesuccess(responsose,file,fileList,2)}">
-                      <i slot="default" class="el-icon-plus"></i>
-                      <div slot="file" slot-scope="{file}">
-                        <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
-                        <span class="el-upload-list__item-actions">
-                          <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
-                            <i class="el-icon-zoom-in"></i>
-                          </span>
-                          <span v-if="!disabled" class="el-upload-list__item-delete" @click="handleRemove(file)">
-                            <i class="el-icon-delete"></i>
-                          </span>
-                        </span>
-                      </div>
-                    </el-upload>
-                  </el-form-item>
-                </el-col>
-
-
-              </el-row>
-
-            </el-form>
-
-
-            <!-- 在建工地 -->
-            <el-form v-if="rainType==2" :model="form" :rules="rules" ref="form" label-position="right"
-              :label-width="formLabelWidth">
-              <el-row>
-                <el-col :span="12">
-                  <el-form-item label="所属道路" prop="road_id">
-                    <el-select class="width100" v-model="roadName" filterable remote @change="chooseRoad"
-                      :disabled="roaddisabled" reserve-keyword placeholder="请输入关键词查找道路信息" clearable @focus="remoteRoad"
-                      :remote-method="remoteMethod" :loading="roadloading">
-                      <el-option v-for="item in roadsList" :key="item.id" :label="item.name" :value="item.id">
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="工地名称" prop="name">
-                    <el-select v-model="form.name" allow-create filterable @change="buildchange" class="width100"
-                      placeholder="请选择工地或新建工地">
-                      <el-option v-for="item in buildList" :key="item.id" :label="item.name" :value="item">
-                      </el-option>
-                    </el-select>
-                    <!-- <el-input disabled="" v-model="form.name" placeholder="工地名称" autocomplete="off"></el-input> -->
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="所在位置" prop="address">
-                    <avue-input-map :params="mapparams" placeholder="请选择地图" v-model="mapform"></avue-input-map>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="经度" prop="longitude">
-                    <el-input disabled="" v-model="form.longitude" placeholder="经度" autocomplete="off"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="纬度" prop="address">
-                    <el-input disabled="" v-model="form.latitude" placeholder="纬度" autocomplete="off"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="工地编号" prop="number">
-                    <el-input v-model="form.number" disabled placeholder="工地编号" autocomplete="off"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="建设单位" prop="build_unit">
-                    <el-input v-model="form.build_unit" placeholder="请填写建设单位" autocomplete="off"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="施工单位" prop="carry_unit">
-                    <el-input v-model="form.carry_unit" placeholder="请填写施工单位" autocomplete="off"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="工地类型" prop="type">
-                    <el-select class="width100" v-model="form.type" placeholder="请选择">
-                      <el-option v-for="item in siteType" :key="item.id" :label="item.value" :value="item.id">
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="工地状态" prop="status">
-                    <el-radio v-model="form.status" v-for="item in siteStatus" :label="item.id">{{item.value}}
-                    </el-radio>
-                  </el-form-item>
-                </el-col>
-                <!-- <el-col :span="24">
-                      <el-form-item label="工地类型" prop="type">
-                          <el-input v-model="form.type" placeholder="工地类型" autocomplete="off"></el-input>
-                      </el-form-item>
-
-                  </el-col> -->
-                <el-col :span="24">
-                  <el-form-item label="备注" prop="remark">
-                    <el-input type="textarea" v-model="form.remark" placeholder="备注" autocomplete="off"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="现场照片" prop="files_list">
-                    <el-upload class="upload-demo" multiple drag action="/api/admin/upload-file"
-                      list-type="picture-card" :file-list="filesList" ref="pictureUpload" :auto-upload="true"
-                      :data="uploadOther" :on-error="handleError"
-                      :on-success="function(responsose,file,fileList) {return handlesuccess(responsose,file,fileList,1)}">
-                      <i slot="default" class="el-icon-plus"></i>
-                      <div slot="file" slot-scope="{file}">
-                        <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
-                        <span class="el-upload-list__item-actions">
-                          <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
-                            <i class="el-icon-zoom-in"></i>
-                          </span>
-                          <span v-if="!disabled" class="el-upload-list__item-delete" @click="handleRemove(file)">
-                            <i class="el-icon-delete"></i>
-                          </span>
-                        </span>
-                      </div>
-                    </el-upload>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="是否违法" prop="is_law">
-                    <el-radio-group v-model="form.is_law">
-                      <el-radio :label="0">否</el-radio>
-                      <el-radio :label="1">是</el-radio>
-                    </el-radio-group>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24" v-if="form.is_law==1">
-                  <el-form-item label="违规内容" prop="break_id">
-                    <el-select class="width100" v-model="form.break_id" placeholder="请选择违规内容">
-                      <el-option v-for="item in siteLaw" :key="item.id" :label="item.value" :value="item.id">
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24" v-if="form.is_law==1">
-                  <el-form-item label="描述" prop="content">
-                    <el-input type="textarea" v-model="form.content" placeholder="备注" autocomplete="off"></el-input>
-                  </el-form-item>
-                </el-col>
-
-
-
-
-              </el-row>
-
-            </el-form>
-
-          </el-scrollbar>
-        </div>
-
-        <div slot="footer" class="dialog-footer">
-          <el-button @click="resetForm('form')">取 消</el-button>
-          <el-button type="primary" v-preventReClick @click="submitForm('form')">保存</el-button>
-        </div>
-      </el-dialog>
-
-      <el-dialog class="common-dialog" :visible.sync="dialogVisible">
-        <img width="100%" :src="dialogImageUrl" alt="">
-      </el-dialog>
-
+      <!-- 复核 -->
       <el-dialog class="common-dialog" title="批量复核" :visible.sync="reviewFormVisible" width="40%">
         <div class="dialogConcent">
           <el-scrollbar style="flex: 1">
@@ -458,14 +172,6 @@
         </div>
       </el-dialog>
 
-
-
-
-<!-- 查看 -->
-<showRainEquipmentInfo ref="showRainEquipmentInfo" @auditSuccess="load"></showRainEquipmentInfo>
-<showRainSiteInfo ref="showRainSiteInfo" @auditSuccess="load"></showRainSiteInfo>
-
-
     </div>
   </div>
 </template>
@@ -473,14 +179,7 @@
 <script>
   import {
     listall,
-    get,
     del,
-    update,
-    getbuilding,
-    storeequipment,
-    saveequipment,
-    storebuilding,
-    savebuilding,
     review
   } from '../../../api/rain/inspection.js'
   import {
@@ -496,85 +195,40 @@
     listroad
   } from '../../../api/basic/road.js'
   import LxHeader from "@/components/LxHeader/index.vue";
-  import AvueMap from 'avue-plugin-map'
-  import showRainEquipmentInfo from '@/views/rain/inspection/components/showRainEquipmentInfo'
+  import showRainEquipmentInfo from '@/views/rain/inspection/components/showRainEquipmentInfo'
   import showRainSiteInfo from '@/views/rain/inspection/components/showRainSiteInfo'
+  import editEquipment from '@/views/rain/inspection/components/editEquipment'
+  import editSite from '@/views/rain/inspection/components/editSite'
   export default {
     components: {
       LxHeader,
-      AvueMap,
-      showRainEquipmentInfo,
-      showRainSiteInfo
+      showRainEquipmentInfo,
+      showRainSiteInfo,
+      editEquipment,
+      editSite
     },
     data() {
       return {
-        reviewFormVisible: false,
-        reviewList: [],
-        reviewForm: {
-          ids: [],
-          audit_status: 0,
-          audit_reamrk: ""
-        },
-        reviewStatusList: [{
-          id: 0,
-          value: "待复核"
-        }, {
-          id: 1,
-          value: "已复核"
-        }],
-        datesearch: "",
-        tableHeight: 0,
+        tableHeight: 0,
+        formLabelWidth: "120px",
+        baseurl: "",
         rainTypeVisible: false,
-        rainType: "1",
-        dialogFormVisible: false,
-        dialogFormDetailVisible: false,
-        formLabelWidth: "120px",
-        dialogImageUrl: "",
-        dialogVisible: false,
-        rainTitle: "日常雨水设施",
-        tableData: [],
-        mapparams: {
-          zoom: 11,
+        rainType: 1,
+
+        tableData: [],
+        paginations: {
+          page: 1,
+          page_size: 15,
+          total: 0
         },
-        mapform: [],
-        start_mapform: [],
-        end_mapform: [],
-        tableHeight: 0,
+
         searchFields: {
           is_export: 0
-          // area_id: "",
-          // type:"",
-          // status:"",
-          // end_type:0,
-          // start_date:"",
-          // end_date:"",
-          // road_id:"",
-          // ask_content_id:""
-        },
-        unusualList: [],
-        askContentArr:[],
-        yhtypeList: [{
-          id: 1,
-          name: "雨水管道疏挖"
-        }, {
-          id: 2,
-          name: "雨水管道疏通"
-        }, {
-          id: 3,
-          name: "汛期助排"
-        }, {
-          id: 4,
-          name: "污泥外运"
-        }, {
-          id: 5,
-          name: "出水口排查"
-        }, {
-          id: 6,
-          name: "专项处理"
-        }, {
-          id: 7,
-          name: "维修"
-        }],
+        },
+        datesearch: "",
+        roadsList: [],
+        roaddisabled: false,
+        roadloading: false,
         selects: {
           sunusualList: [{
             id: "",
@@ -588,127 +242,61 @@
             id: "",
             name: "所有"
           }, {
-            id: "1",
+            id: 1,
             name: "日常雨水设施"
           }, {
-            id: "2",
+            id: 2,
             name: "在建工地"
           }],
           statusList: [{
             id: "",
             name: "所有"
           }, {
-            id: "0",
+            id: 0,
             name: "未审核"
           }, {
-            id: "1",
+            id: 1,
             name: "已审核"
           }, {
-            id: "2",
+            id: 2,
             name: "已办结"
           }, {
-            id: "3",
+            id: 3,
             name: "已退回"
           }],
           endTypeList: [{
-            id: '0',
+            id: 0,
             name: "所有"
           }, {
-            id: "1",
+            id: 1,
             name: "养护转办"
           }, {
-            id: "2",
+            id: 2,
             name: "违法转办"
-          }]
-        },
-        paginations: {
-          page: 1,
-          page_size: 15,
-          total: 0
-        },
-        baseurl: "",
-        filesList: [],
-        dealFilesList: [],
-        rainMaintainLogs: [],
-        end_types: 0,
-        disabled: false,
-        uploadOther: {
-          token: ""
+          }],
+          sequiementList: [{
+            id: "",
+            value: "所有"
+          }],
         },
-        idname: "",
-        nowstatus: 0,
-        buildList: [],
-        siteType: [],
-        siteLaw: [],
-        equiementList: [],
-        sequiementList: [{
-          id: "",
-          value: "所有"
-        }],
-        siteStatus: [{
-          id: 1,
-          value: "在建"
-        }, {
-          id: 2,
-          value: "完工"
-        }],
-        form: {
-          content: "",
-          ask_content_id: "",
-          is_unusual: 0,
-          unusual_type_id: "",
 
-          is_scene: 0,
-          // point_name: "",
-          // scope: "",
-          result: "",
-          tip: "",
-          longitude: "",
-          latitude: "",
-          address: "",
-          files_list: [],
-          files_end_list: [],
-          building_site_id: "",
-          name: "",
-          number: "",
-          type: "",
-          status: 0,
-          remark: "",
-          is_law: 0,
-          break_id: "",
-          road_id: "",
-          carry_unit: "",
-          build_unit: ""
-        },
-        roadsList: [],
-        roadName: "",
-        roaddisabled: false,
-        roadloading: false,
-        wf_type: 0,
-        formdetail: {
-          status: 0,
-          end_type: 0,
-          content: "",
-          end_time: "",
-          remark: ''
-        },
+        reviewFormVisible: false,
+        reviewList: [],
+        reviewForm: {
+          ids: [],
+          audit_status: 0,
+          audit_reamrk: ""
+        },
+        reviewStatusList: [{
+          id: 0,
+          value: "待复核"
+        }, {
+          id: 1,
+          value: "已复核"
+        }],
 
         rules: {
-          // scope: [{
-          //   required: true,
-          //   message: '请填写覆盖范围',
-          //   trigger: 'blur',
-          // }],
-          // point_name: [{
-          //   required: true,
-          //   message: '请填写点位名称',
-          //   trigger: 'blur',
-          // }],
-          // content: [{
-          //   required: true,
-          //   message: '请填写描述',
-          //   trigger: 'blur',
-          // }]
+
         },
 
         columns: [{
@@ -791,30 +379,7 @@
 
     },
     watch: {
-      mapform(newVal, oldVal) {
-        this.form.longitude = newVal[0];
-        this.form.latitude = newVal[1];
-        // if(this.rainType!=4){
-        this.form.address = newVal[2];
-        // }
-      },
-      start_mapform(newVal, oldVal) {
-        this.form.start_longitude = newVal[0];
-        this.form.start_latitude = newVal[1];
-        // if(this.rainType!=4){
-        this.form.start_address = newVal[2];
-        // }
-      },
-      end_mapform(newVal, oldVal) {
-        this.form.end_longitude = newVal[0];
-        this.form.end_latitude = newVal[1];
-        // if(this.rainType!=4){
-        this.form.end_address = newVal[2];
-        // }
-      },
-      rainType() {
-        this.roadsList = []
-      },
+
       datesearch(newVal, oldVal) {
         if (newVal) {
           this.searchFields.start_date = newVal[0]
@@ -824,45 +389,159 @@
           this.searchFields.end_date = ""
         }
 
-      },
-
-      'form.is_unusual': function(val) {
-        if (val == 1) {
-          this.start_mapform = []
-          this.end_mapform = []
-        }
-        if (val == 0) {
-          this.form.unusual_type_id = ""
-          this.form.tip = ""
-        }
       }
     },
-    methods: {
-      getUserName(row) {
-        if (row.admin) {
-          return row.admin.name;
-        } else if (row.user) {
-          return row.user.name;
-        } else {
-          return "未知";
-        }
-
-      },
-      handleSelectionChange(val) {
-        console.log(val)
-        this.reviewList = val
+    methods: {
+      initLoad() {
+        var that = this;
+        var clientHeight = document.documentElement.clientHeight
+        var lxHeader_height = 96.5; //查询 头部
+        var paginationHeight = 37; //分页的高度
+        var topHeight = 50; //页面 头部
+        let tableHeight = clientHeight - lxHeader_height - topHeight - paginationHeight - 60;
+        that.tableHeight = tableHeight;
+
+        that.baseurl = location.host;
+
+        getparameteritem('equiementList').then(res => {
+          for (var m of res.detail) {
+            that.selects.sequiementList.push(m)
+          }
+        })
+        getparameteritem('unusualList').then(res => {
+          for (var m of res.detail) {
+            that.selects.sunusualList.push(m)
+          }
+        })
+
+        listarea({
+          page: 1,
+          page_size: 999
+        }).then(res => {
+          for (var m of res.data) {
+            that.selects.areasList.push({
+              id: m.id,
+              name: m.name
+            })
+          }
+        })
+      },
+      load(is_export) {
+        // return
+        listall({
+          page: this.paginations.page,
+          page_size: this.paginations.page_size,
+          ...this.searchFields
+        }).then(response => {
+          let tokens = getToken();
+          if (is_export) {
+            var url = "/api/admin/rain-maintains/index?token=" + tokens
+            for (var m in this.searchFields) {
+              url += "&" + m + "=" + this.searchFields[m]
+            }
+            url = this.baseurl + url
+            console.log(url)
+            window.open("http://" + url, '_blank')
+            this.searchFields.is_export = 0
+            return;
+          }
+          for (var m of response.data) {
+            if (m.rain_equipment_info) {
+              m.askName = m.rain_equipment_info.ask_content_detail ? m.rain_equipment_info.ask_content_detail :
+                ""
+            }
+          }
+          this.tableData = response.data;
+          this.paginations.total = response.total;
+        }).catch(error => {
+          console.log(error)
+          reject(error)
+        });
+      },
+      handleCurrentChange(page) {
+        this.paginations.page = page;
+        this.load();
+      },
+ // 新增 编辑
+      edit(obj) {
+        var that = this;
+        if (obj) {
+          if (obj.type == 1) {
+            this.$refs.editEquipment.infoId = obj.id
+            this.$refs.editEquipment.getEquipmentInfo(obj.id)
+            this.$refs.editEquipment.isShow = true
+          }
+          if (obj.type == 2) {
+            this.$refs.editSite.infoId = obj.id
+            this.$refs.editSite.getSiteInfo(obj.id)
+            this.$refs.editSite.isShow = true
+          }
+        } else {
+          this.rainTypeVisible = true
+        }
+
+      },
+      submitRainType() {
+        var that = this
+        this.rainTypeVisible = false
+        if (that.rainType == 1) {
+          this.$refs.editEquipment.getEquipmentInfo()
+          this.$refs.editEquipment.isShow = true
+
+        } else if (that.rainType == 2) {
+          this.$refs.editSite.getSiteInfo()
+          this.$refs.editSite.isShow = true
+        }
+      },
+      resetrainType() {
+        this.rainTypeVisible = false
+        this.rainType = 1
       },
-      returnAskContentId(arr){
-        if(arr.length==0){
-          return
+      // 审核 办结 查看
+      showInfo(obj, formtype) {
+        // 日常雨水设施
+        if (obj.type == 1) {
+          this.$refs.showRainEquipmentInfo.isShow = true
+          this.$refs.showRainEquipmentInfo.getEquipmentInfo(obj.id)
+          this.$refs.showRainEquipmentInfo.infoId = obj.id
+          this.$refs.showRainEquipmentInfo.formType = formtype
+        }
+        // 工地
+        if (obj.type == 2) {
+          this.$refs.showRainSiteInfo.isShow = true
+          this.$refs.showRainSiteInfo.getSiteInfo(obj.id)
+          this.$refs.showRainSiteInfo.infoId = obj.id
+          this.$refs.showRainSiteInfo.formType = formtype
         }
-        let getArr = ""
-        for(var m of arr){
-          getArr+= m+","
+
+      },
+
+      del(obj) {
+        var that = this;
+        if (obj) {
+          this.$Modal.confirm({
+            title: '确认要删除数据？',
+            onOk: () => {
+              del(obj.id).then(response => {
+                this.$Message.success('操作成功');
+                that.load();
+              }).catch(error => {
+                console.log(error)
+                reject(error)
+              })
+            },
+            onCancel: () => {
+              //this.$Message.info('Clicked cancel');
+            }
+          });
         }
-        getArr = getArr.substring(0,getArr.length-1)
-        return getArr
+      },
+      //  复核
+      handleSelectionChange(val) {
+        console.log(val)
+        this.reviewList = val
       },
+
       review() {
         let data = this.reviewList
         let idsArr = [];
@@ -897,8 +576,21 @@
           reject(error)
         });
       },
-      chooseRoad(val) {
-        this.form.road_id = val
+
+      exportExcel() {
+        var that = this
+        that.searchFields.is_export = 1
+        that.load(true)
+      },
+      getUserName(row) {
+        if (row.admin) {
+          return row.admin.name;
+        } else if (row.user) {
+          return row.user.name;
+        } else {
+          return "未知";
+        }
+
       },
       remoteRoad() {
         this.roadsList = []
@@ -916,464 +608,7 @@
         } else {
           this.roadsList = []
         }
-      },
-      buildchange(val) {
-        if (Object.prototype.toString.call(val) != '[object Object]') {
-          this.mapform = ['', '', ''];
-          this.$refs['form'].resetFields();
-          this.form.name = val
-          this.form.type = ""
-
-          let timeNumber = new Date().getTime()
-          this.form.number = timeNumber
-        }
-        if (Object.prototype.toString.call(val) === '[object Object]') {
-          console.log(val)
-          this.mapform = [val.longitude, val.latitude, val.address]
-          this.form.longitude = val.longitude
-          this.form.latitude = val.latitude
-          this.form.address = val.address
-          this.form.number = val.number
-          this.form.type = parseInt(val.type)
-          this.form.status = val.status
-          this.form.remark = val.remark
-          this.form.building_site_id = val.id
-          this.form.name = val.name
-          this.form.build_unit = val.build_unit
-          this.form.carry_unit = val.carry_unit
-
-        }
-        //判断对象
-
-      },
-      initLoad() {
-        var that = this;
-        var clientHeight = document.documentElement.clientHeight
-        var lxHeader_height = 96.5; //查询 头部
-        var paginationHeight = 37; //分页的高度
-        var topHeight = 50; //页面 头部
-        let tableHeight = clientHeight - lxHeader_height - topHeight - paginationHeight - 20;
-        that.tableHeight = tableHeight;
-
-        this.uploadOther.token = getToken();
-        that.baseurl = location.host;
-        getparameteritem('siteType').then(res => {
-          that.siteType = res.detail
-        })
-        getparameteritem('siteLaw').then(res => {
-          that.siteLaw = res.detail
-        })
-        getparameteritem('equiementList').then(res => {
-          that.equiementList = res.detail
-          for (var m of res.detail) {
-            that.sequiementList.push(m)
-          }
-        })
-        getparameteritem('unusualList').then(res => {
-          that.unusualList = res.detail
-          for (var m of res.detail) {
-            that.selects.sunusualList.push(m)
-          }
-        })
-
-        getbuilding().then(res => {
-          this.buildList = res
-        })
-
-        listarea({
-          page: 1,
-          page_size: 999
-        }).then(res => {
-          for (var m of res.data) {
-            that.selects.areasList.push({
-              id: m.id,
-              name: m.name
-            })
-          }
-        })
-
-
-      },
-      handleCurrentChange(page) {
-        this.paginations.page = page;
-        this.load();
-      },
-      exportExcel() {
-        var that = this
-        that.searchFields.is_export = 1
-        that.load(true)
-      },
-      load(is_export) {
-        // return
-        listall({
-          page: this.paginations.page,
-          page_size: this.paginations.page_size,
-          ...this.searchFields
-        }).then(response => {
-          let tokens = getToken();
-          if (is_export) {
-            var url = "/api/admin/rain-maintains/index?token=" + tokens
-            for (var m in this.searchFields) {
-              url += "&" + m + "=" + this.searchFields[m]
-            }
-            url = this.baseurl + url
-            console.log(url)
-            window.open("http://" + url, '_blank')
-            this.searchFields.is_export = 0
-            return;
-          }
-          for (var m of response.data) {
-            if (m.rain_equipment_info) {
-              m.askName = m.rain_equipment_info.ask_content_detail ? m.rain_equipment_info.ask_content_detail
-                 : ""
-            }
-          }
-          this.tableData = response.data;
-          this.paginations.total = response.total;
-        }).catch(error => {
-          console.log(error)
-          reject(error)
-        });
-
-
-
-      },
-      info(obj) {
-        var that = this;
-        get(obj.id).then(res => {
-          let result = Object.assign(that.form, res);
-          // this.$set(that.form,res)
-          that.rainType = result.type;
-          that.nowstatus = result.status;
-
-          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 = "日常雨水设施"
-          } else if (that.rainType == 2) {
-            that.rainTitle = "在建工地"
-          }
-          switch (result.type) {
-            case 1:
-              that.form = result.rain_equipment_info;
-              that.form.rain_equipment_id = result.rain_equipment_id;
-              that.roaddisabled = true
-              that.form.ask_content_id = result.rain_equipment_info.ask_content_id ? result
-                .rain_equipment_info.ask_content_id : ""
-              let askArr = result.rain_equipment_info.ask_content_id ? result.rain_equipment_info.ask_content_id.split(","):[]
-              for(var m of askArr){
-                that.askContentArr.push(parseInt(m))
-              }
-
-              that.roadName = result.rain_equipment_info.road ? result.rain_equipment_info.road.name : ""
-              that.idname = "rain_equipment_id"
-              that.mapform = [result.rain_equipment_info.longitude, result.rain_equipment_info.latitude, result
-                .rain_equipment_info.address
-              ]
-              if (result.rain_equipment_info.is_unusual == 0) {
-                that.start_mapform = [result.rain_equipment_info.start_longitude, result.rain_equipment_info
-                  .start_latitude, result.rain_equipment_info.start_address
-                ]
-                that.end_mapform = [result.rain_equipment_info.end_longitude, result.rain_equipment_info
-                  .end_latitude, result.rain_equipment_info.end_address
-                ]
-              }
-              let _files = [];
-              for (var mod of result.rain_equipment_info.rain_equipment_files) {
-                let m = Object.assign({}, mod);
-                m.url = mod.files.url;
-                m.id = mod.files.id;
-                m.photoType = "before";
-                _files.push(m);
-              }
-              that.filesList = _files;
-
-              let _filesafter = [];
-              for (var mod of result.rain_equipment_info.rain_equipment_end_files) {
-                let m = Object.assign({}, mod);
-                m.url = mod.files.url;
-                m.id = mod.files.id;
-                m.photoType = "after";
-                _filesafter.push(m);
-              }
-              that.dealFilesList = _filesafter;
-              break;
-            case 2:
-              that.roaddisabled = true
-              that.form = result.building_site_info;
-              that.roadName = result.building_site_info.road ? result.building_site_info.road.name : ""
-              let building_site = result.building_site_info.building_site
-              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
-              that.form.name = building_site.name
-              that.form.number = building_site.number
-              that.form.remark = building_site.remark
-              that.form.status = building_site.status
-              that.form.build_unit = building_site.build_unit
-              that.form.carry_unit = building_site.carry_unit
-              that.form.type = parseInt(building_site.type)
-              that.form.building_site_id = building_site.id
-              that.form.building_site_content_id = result.building_site_content_id;
-              that.idname = "building_site_content_id"
-              that.mapform = [building_site.longitude, building_site.latitude, building_site.address]
-              let discharge_files = [];
-              for (var mod of result.building_site_info.building_site_content_files) {
-                let m = Object.assign({}, mod);
-                m.url = mod.files.url;
-                m.id = mod.files.id;
-                m.photoType = "before";
-                discharge_files.push(m);
-              }
-              that.filesList = discharge_files;
-
-              break;
-
-          }
-          that.formdetail.id = result.id
-          that.wf_type = result.end_type
-          that.formdetail.end_type = result.end_type
-          that.formdetail.end_time = result.end_time
-          that.formdetail.remark = result.remark
-          console.log("detail", that.filesList)
-
-        }).catch(error => {
-          //reject(error)
-        })
-      },
-
-      show(obj) {
-        this.dialogFormDetailVisible = true;
-        // this.$refs.showRainEquipmentInfo.isShow = true
-        this.info(obj)
-      },
-
-// 审核 办结 查看
-      showInfo(obj,formtype){
-        // 日常雨水设施
-        if(obj.type==1){
-          this.$refs.showRainEquipmentInfo.isShow = true
-          this.$refs.showRainEquipmentInfo.getEquipmentInfo(obj.id)
-          this.$refs.showRainEquipmentInfo.infoId = obj.id
-          this.$refs.showRainEquipmentInfo.formType = formtype
-        }
-        // 工地
-        if(obj.type==2){
-          this.$refs.showRainSiteInfo.isShow = true
-          this.$refs.showRainSiteInfo.getSiteInfo(obj.id)
-          this.$refs.showRainSiteInfo.infoId = obj.id
-          this.$refs.showRainSiteInfo.formType = formtype
-        }
-
-      },
-      edit(obj) {
-        var that = this;
-        this.form = this.$options.data().form
-        that.filesList = [];
-        that.dealFilesList = [];
-        that.mapform = ['', '', ''];
-        that.start_mapform = ['', '', ''];
-        that.end_mapform = ['', '', ''];
-        that.roadName = ""
-        that.roaddisabled = false
-        that.askContentArr=[]
-        if (obj) {
-          that.info(obj);
-          this.dialogFormVisible = true;
-        } else {
-          this.roaddisabled = false
-          this.dialogFormVisible = false
-          this.rainTypeVisible = true
-        }
-
-      },
-      del(obj) {
-        var that = this;
-        if (obj) {
-          this.$Modal.confirm({
-            title: '确认要删除数据？',
-            onOk: () => {
-              del(obj.id).then(response => {
-                this.$Message.success('操作成功');
-                that.load();
-              }).catch(error => {
-                console.log(error)
-                reject(error)
-              })
-            },
-            onCancel: () => {
-              //this.$Message.info('Clicked cancel');
-            }
-          });
-        }
-      },
-
-      submitForm(formName) {
-        var that = this;
-        var listUrlbefore = []
-        for (var m of this.filesList) {
-          m.photoType = "before";
-          if (m.response)
-            listUrlbefore.push({
-              "upload_id": m.response.id
-            });
-          else
-            listUrlbefore.push({
-              "upload_id": m.id
-            });
-        }
-        this.form.files_list = listUrlbefore;
-        let listUrlafter = [];
-        for (var m of this.dealFilesList) {
-          if (m.response)
-            listUrlafter.push({
-              "upload_id": m.response.id
-            });
-          else
-            listUrlafter.push({
-              "upload_id": m.upload_id
-            });
-        }
-        this.form.files_end_list = listUrlafter
-        that.form.ask_content_id = this.returnAskContentId(that.askContentArr)
-        this.$refs[formName].validate((valid) => {
-          if (valid) {
-            that.submitAll(that.rainType, that.form[this.idname])
-          } else {
-            this.$Message.error('数据校验失败');
-            console.log('error submit!!');
-            return false;
-          }
-        });
-      },
-      resetForm(formName) {
-        var that = this;
-        that.filesList = [];
-        that.dealFilesList = [];
-        that.mapform = ['', '', ''];
-        that.start_mapform = ['', '', ''];
-        that.end_mapform = ['', '', ''];
-        this.$refs[formName].resetFields();
-        that.dialogFormVisible = false;
-        that.dialogFormDetailVisible = false;
-      },
-      handleRemove(file) {
-        if (file.photoType == "before") {
-          for (var i = 0; i < this.filesList.length; i++) {
-            if (this.filesList[i].url == file.url) {
-              this.filesList.splice(i, 1)
-            }
-          }
-        } else if (file.photoType == "after") {
-          for (var i = 0; i < this.dealFilesList.length; i++) {
-            if (this.dealFilesList[i].url == file.url) {
-              this.dealFilesList.splice(i, 1)
-            }
-          }
-
-        }
-      },
-      handlePictureCardPreview(file) {
-        this.dialogImageUrl = file.url;
-        this.dialogVisible = true;
-      },
-      handlesuccess(response, file, fileList, index) {
-        if (index == 1) {
-          file.photoType = "before"
-          this.filesList = fileList;
-          // this.form.files_list = listUrl;
-        } else {
-
-          file.photoType = "after"
-          this.dealFilesList = fileList
-        }
-        this.$message({
-          message: '上传成功',
-          type: 'success'
-        });
-      },
-
-      handleError(err, file, fileList) {
-        this.$message.error('上传失败，重新上传');
-      },
-
-      resetrainType() {
-        this.rainTypeVisible = false
-      },
-      submitRainType() {
-        var that = this
-        this.rainTypeVisible = false
-        if (that.rainType == 1) {
-          that.rainTitle = "日常雨水设施"
-        } else if (that.rainType == 2) {
-          that.rainTitle = "在建工地"
-        }
-        this.dialogFormVisible = true;
-      },
-
-
-      submitAll(type, id) {
-        var that = this;
-
-        // return
-        // that.form.type = type;
-        console.log("that.form", that.form);
-        // return
-        switch (parseInt(type)) {
-          case 1:
-            if (id) {
-              saveequipment(that.form).then(response => {
-                this.$Message.success('操作成功');
-                that.load();
-                that.dialogFormVisible = false;
-              }).catch(error => {
-                //reject(error)
-              })
-            } else {
-              storeequipment(that.form).then(response => {
-                this.$Message.success('操作成功');
-                that.load();
-                that.dialogFormVisible = false;
-              }).catch(error => {
-                //reject(error)
-              })
-            }
-            break;
-          case 2:
-            if (id) {
-              savebuilding(that.form).then(response => {
-                this.$Message.success('操作成功');
-                that.load();
-                that.dialogFormVisible = false;
-              }).catch(error => {
-                //reject(error)
-              })
-            } else {
-              storebuilding(that.form).then(response => {
-                this.$Message.success('操作成功');
-                that.load();
-                that.dialogFormVisible = false;
-              }).catch(error => {
-                //reject(error)
-              })
-            }
-            break;
-
-
-
-        }
-
-
-
-
-
-      }
+      }
 
     }
   }
diff --git a/src/views/rain/inspection/law copy.vue b/src/views/rain/inspection/law copy.vue
new file mode 100644
index 0000000..379b969
--- /dev/null
+++ b/src/views/rain/inspection/law copy.vue	
@@ -0,0 +1,980 @@
+<template>
+  <div class="container">
+    <div style="padding: 0px 20px">
+      <div ref="lxHeader">
+        <LxHeader icon="md-apps" text="雨管巡查管理" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
+          <div slot="content"></div>
+          <slot>
+            <div>
+              <Input class="vm10" style="width: 200px; margin-right: 10px" v-model="searchFields.keyword"
+                placeholder="关键字搜索" />
+              <el-select class="vm10" v-model="searchFields.road_id" filterable remote reserve-keyword clearable
+                @focus="remoteRoad" placeholder="请输入关键词查找道路" :remote-method="remoteMethod" :loading="roadloading">
+                <el-option v-for="item in roadsList" :key="item.id" :label="item.name" :value="item.id">
+                </el-option>
+              </el-select>
+              <el-select class="vm10" filterable v-model="searchFields.area_id" placeholder="请选择所属片区">
+                <el-option v-for="item in selects.areasList" :key="item.id" :label="item.name" :value="item.id">
+                </el-option>
+              </el-select>
+              <el-select class="vm10" filterable v-model="searchFields.status_id" placeholder="请选择状态">
+                <el-option v-for="item in selects.statusList" :key="item.id" :label="item.name" :value="item.id">
+                </el-option>
+              </el-select>
+              <el-select class="vm10" filterable v-model="searchFields.type_id" placeholder="请选择类型">
+                <el-option v-for="item in selects.typeList" :key="item.id" :label="item.name" :value="item.id">
+                </el-option>
+              </el-select>
+              <el-select class="vm10" filterable v-model="searchFields.ask_content_id" placeholder="请选择巡查内容">
+                <el-option v-for="item in sequiementList" :key="item.id" :label="item.value" :value="item.id">
+                </el-option>
+              </el-select>
+
+              <el-date-picker class="vm10" v-model="datesearch" type="daterange" range-separator="至"
+                start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd">
+              </el-date-picker>
+              <Button type="primary" @click="load" style="margin-left: 10px">查询</Button>
+            </div>
+          </slot>
+        </LxHeader>
+      </div>
+      <div ref="lxTable">
+        <el-table :data="tableData" class="v-table" :height="tableHeight" style="width: 100%">
+          <el-table-column type="index" width="50" fixed label="序号" align="center"> </el-table-column>
+          <el-table-column :prop="column.field" :align="column.align" v-for="(column,index) in columns"
+            :label="column.title" :width="column.width" :fixed="column.fixed">
+            <template slot-scope="scope">
+              <div v-if="column.type=='opt'">
+                <Button v-if="scope.row['status']==2||scope.row['status']==3" ghost size="small"
+                  @click="show(scope.row)" type="primary" style="margin-left: 10px;">查看</Button>
+                <Button v-if="scope.row['status']==1&&scope.row['end_type']==2" ghost size="small"
+                  @click="show(scope.row)" type="primary" style="margin-left: 10px;">办结</Button>
+                <Button ghost size="small"
+                  @click="goorder" type="primary" style="margin-left: 10px;">新建工单</Button>
+                <Button ghost size="small" @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>
+                <el-tag v-if="scope.row[column.field]==2">在建工地巡查</el-tag>
+              </div>
+              <div v-else-if="column.type=='end_type'">
+                <el-tag v-if="scope.row[column.field]==2" type="warning">有</el-tag>
+                <el-tag v-else>无</el-tag>
+              </div>
+              <div v-else-if="column.type=='status'">
+                <el-tag v-if="scope.row[column.field]==0">待审核</el-tag>
+                <el-tag type="success" v-if="scope.row[column.field]==1">已审核</el-tag>
+                <el-tag type="warning" v-if="scope.row[column.field]==2">已办结</el-tag>
+                <el-tag type="info" v-if="scope.row[column.field]==3">已退回</el-tag>
+              </div>
+              <div v-else-if="column.type=='format'">
+                {{scope.row[column.field]?scope.row[column.field].name:""}}
+                <!-- <div v-if="column.field=='ask_content_detail'">{{scope.row[column.field]?scope.row[column.field].value:""}}</div>
+                <div v-else></div> -->
+              </div>
+              <div v-else-if="column.type=='admin'">
+                {{getUserName(scope.row)}}
+              </div>
+              <!-- <div v-else-if="column.type=='end_type'">
+                    <el-tag v-if="scope.row[column.field]==0">无</el-tag>
+                    <el-tag  type="danger" v-if="scope.row[column.field]==1" >违法转办</el-tag>
+                </div> -->
+              <div v-else>{{scope.row[column.field]}}</div>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="pagination">
+          <el-pagination @current-change="handleCurrentChange" :current-page="paginations.page"
+            :page-size="paginations.page_size" background layout="prev, pager, next" :total="paginations.total">
+          </el-pagination>
+        </div>
+      </div>
+
+      <!-- 审核 -->
+      <el-dialog class="common-dialog" :title="rainTitle" :visible.sync="dialogFormDetailVisible" width="60%">
+        <div class="dialogConcent">
+          <el-scrollbar style="flex: 1">
+            <!-- 日常雨水设施 -->
+            <el-form v-if="rainType==1" :model="formdetail" :rules="{}" ref="formdetail" label-position="right"
+              :label-width="formLabelWidth">
+              <el-row>
+                <el-col :span="24">
+                  <el-form-item label="所属道路" prop="road_id">
+                    {{roadName}}
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="巡查内容" prop="ask_content_id">
+                    <div v-for="item in equiementList">
+                      <div v-if="item.id==form.ask_content_id">
+                        {{item.value}}
+                      </div>
+                    </div>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="覆盖范围" prop="scope">
+                    {{form.scope}}米
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="所在点位" prop="point_name">
+                    {{form.point_name}}
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="所在位置" prop="address">
+                    {{form.address}}
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="经度" prop="longitude">
+                    {{form.longitude}}
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="纬度" prop="latitude">
+                    {{form.latitude}}
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="描述" prop="content">
+                    {{form.content}}
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="现场照片" prop="files_list" class="files_check">
+                    <el-upload multiple action="/api/admin/upload-file" list-type="picture-card" :file-list="filesList"
+                      ref="pictureUploads">
+                      <div slot="file" slot-scope="{file}">
+                        <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
+                        <span class="el-upload-list__item-actions">
+                          <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
+                            <i class="el-icon-zoom-in"></i>
+                          </span>
+                        </span>
+                      </div>
+                    </el-upload>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="24">
+                  <el-form-item label="是否异常" prop="is_unusual">
+                    <el-tag v-if="form.is_unusual==0">否</el-tag>
+                    <el-tag type="warning" v-if="form.is_unusual==1">丢失</el-tag>
+                    <el-tag type="success" v-if="form.is_unusual==2">破损</el-tag>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24" v-if="form.is_unusual!=0">
+                  <el-form-item label="异常处置建议" prop="tip">
+                    {{form.tip}}
+                  </el-form-item>
+                </el-col>
+                <el-col :span="10">
+                  <el-form-item label="是否现场处理" prop="is_scene">
+                    <el-tag v-if="form.is_scene==0">否</el-tag>
+                    <el-tag type="success" v-if="form.is_scene==1">丢失</el-tag>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24" v-if="form.is_scene==1">
+                  <el-form-item label="现场处理结果" prop="result">
+                    {{form.result}}
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24" v-if="form.is_scene==1">
+                  <el-form-item label="处理后照片" prop="files_end_list" class="files_check">
+                    <el-upload multiple action="/api/admin/upload-file" list-type="picture-card"
+                      :file-list="dealFilesList" ref="pictureUploads">
+                      <div slot="file" slot-scope="{file}">
+                        <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
+                        <span class="el-upload-list__item-actions">
+                          <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
+                            <i class="el-icon-zoom-in"></i>
+                          </span>
+                        </span>
+                      </div>
+                    </el-upload>
+
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="24" v-if="nowstatus==1">
+                  <el-form-item label="备注" prop="content">
+                    <el-input type="textarea" v-model="formdetail.content" placeholder="请填写备注"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24" v-if="nowstatus==1">
+                  <el-form-item label="转办类型" prop="end_type">
+                    <el-radio-group v-model="formdetail.end_type">
+                      <el-radio :label="0">无</el-radio>
+                      <el-radio :label="1">养护转办</el-radio>
+                      <el-radio :label="2">违法转办</el-radio>
+                    </el-radio-group>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24" v-if="nowstatus==2||nowstatus==3">
+                  <el-form-item label="转办类型">
+                    <el-tag v-if="end_types==0">无</el-tag>
+                    <el-tag type="warning" v-if="end_types==1">养护转办</el-tag>
+                    <el-tag type="warning" v-if="end_types==2">违法转办</el-tag>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==1">
+                  <el-form-item label="要求完成时间" prop="end_time">
+                    <el-date-picker style="width:100%" v-model="formdetail.end_time" type="datetime" placeholder="选择时间"
+                      value-format="yyyy-MM-dd HH:mm:ss">
+                    </el-date-picker>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==1">
+                  <el-form-item label="备注" prop="remark">
+                    <el-input type="textarea" v-model="formdetail.remark" placeholder="请填写备注" autocomplete="off">
+                    </el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24" v-if="nowstatus==2||nowstatus==3">
+                  <el-form-item label="处理日志" prop="">
+
+                  </el-form-item>
+                  <el-table :data="rainMaintainLogs" style="width: 90%;margin: 0 auto;">
+                    <el-table-column prop="created_at" label="日期" width="180">
+                    </el-table-column>
+                    <el-table-column prop="content" label="内容">
+                    </el-table-column>
+                    <!-- <el-table-column
+                              prop="end_type"
+                              label="有无违法转办"
+                              >
+
+                            </el-table-column> -->
+                    <el-table-column prop="type_name" label="操作结果">
+                    </el-table-column>
+
+                    <el-table-column prop="adminName" label="操作人" width="180">
+                    </el-table-column>
+                  </el-table>
+
+                </el-col>
+
+              </el-row>
+
+            </el-form>
+
+
+            <!-- 在建工地 -->
+            <el-form v-if="rainType==2" :model="formdetail" :rules="{}" ref="formdetail" label-position="right"
+              :label-width="formLabelWidth">
+              <el-row>
+                <el-col :span="24">
+                  <el-form-item label="所属道路" prop="road_id">
+                    {{roadName}}
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="工地名称" prop="name">
+                    {{form.name}}
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="所在位置" prop="address">
+                    {{form.address}}
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="经度" prop="longitude">
+                    {{form.longitude}}
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="纬度" prop="address">
+                    {{form.latitude}}
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="工地编号" prop="number">
+                    {{form.number}}
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="工地类型" prop="type">
+                    <div v-for="item in siteType">
+                      <div v-if="item.id==form.type">
+                        {{item.value}}
+                      </div>
+                    </div>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="工地状态" prop="status">
+                    <div v-for="item in siteStatus">
+                      <el-tag v-if="item.id==form.status">{{item.value}}</el-tag>
+                    </div>
+                  </el-form-item>
+                </el-col>
+                <!-- <el-col :span="24">
+                      <el-form-item label="工地类型" prop="type">
+                          <el-input v-model="form.type" placeholder="工地类型" autocomplete="off"></el-input>
+                      </el-form-item>
+
+                  </el-col> -->
+                <el-col :span="24">
+                  <el-form-item label="备注" prop="remark">
+                    {{form.remark}}
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="描述" prop="content">
+                    {{form.content}}
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="现场照片" prop="files_list" class="files_check">
+                    <el-upload multiple action="/api/admin/upload-file" list-type="picture-card" :file-list="filesList"
+                      ref="pictureUploads">
+                      <div slot="file" slot-scope="{file}">
+                        <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
+                        <span class="el-upload-list__item-actions">
+                          <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
+                            <i class="el-icon-zoom-in"></i>
+                          </span>
+                        </span>
+                      </div>
+                    </el-upload>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="是否违法" prop="is_law">
+                    <el-tag v-if="form.is_law==0">否</el-tag>
+                    <el-tag v-if="form.is_law==1">是</el-tag>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24" v-if="form.is_law==1">
+                  <el-form-item label="违规内容" prop="break_id">
+                    <div v-for=" item in siteLaw">
+                      <div v-if="item.id==form.break_id">
+                        {{item.value}}
+                      </div>
+                    </div>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="24">
+                  <el-form-item label="备注" prop="content">
+                    <el-input type="textarea" v-model="formdetail.content" placeholder="请填写备注"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24" v-if="nowstatus==1">
+                  <el-form-item label="有无违法转办" prop="end_type">
+                    <el-radio-group v-model="formdetail.end_type">
+                      <el-radio :label="0">无</el-radio>
+                      <el-radio :label="1">养护转办</el-radio>
+                      <el-radio :label="2">违法转办</el-radio>
+                    </el-radio-group>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==1">
+                  <el-form-item label="要求完成时间" prop="complete_date">
+                    <el-date-picker style="width:100%" v-model="formdetail.end_time" type="datetime" placeholder="选择时间"
+                      value-format="yyyy-MM-dd HH:mm:ss">
+                    </el-date-picker>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==1">
+                  <el-form-item label="备注" prop="remark">
+                    <el-input type="textarea" v-model="formdetail.remark" placeholder="请填写备注" autocomplete="off">
+                    </el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24" v-if="nowstatus==2||nowstatus==3">
+                  <el-form-item label="有无违法转办">
+                    <el-tag v-if="end_types==0">无</el-tag>
+                    <el-tag type="warning" v-if="end_types==1">养护转办</el-tag>
+                    <el-tag type="warning" v-if="end_types==2">违法转办</el-tag>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24" v-if="nowstatus==2||nowstatus==3">
+                  <el-form-item label="处理日志" prop="">
+
+                  </el-form-item>
+                  <el-table :data="rainMaintainLogs" style="width: 90%;margin: 0 auto;">
+                    <el-table-column prop="created_at" label="日期" width="180">
+                    </el-table-column>
+                    <el-table-column prop="content" label="内容">
+                    </el-table-column>
+                    <el-table-column prop="type_name" label="操作结果">
+                    </el-table-column>
+
+                    <el-table-column prop="adminName" label="操作人" width="180">
+                    </el-table-column>
+                  </el-table>
+
+                </el-col>
+
+
+              </el-row>
+
+            </el-form>
+          </el-scrollbar>
+        </div>
+
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="resetFormDetail('formdetail')">取 消</el-button>
+          <el-button v-if="nowstatus==1" type="primary" v-preventReClick @click="submitFormDetail('formdetail','2')">办结
+          </el-button>
+          <el-button v-if="nowstatus==1" type="danger" v-preventReClick @click="submitFormDetail('formdetail','3')">退回
+          </el-button>
+
+        </div>
+      </el-dialog>
+
+      <el-dialog class="common-dialog" :visible.sync="dialogVisible">
+        <img width="100%" :src="dialogImageUrl" alt="">
+      </el-dialog>
+
+
+
+
+
+    </div>
+  </div>
+</template>
+
+<script>
+  import {
+    listall,
+    get,
+    del,
+    update,
+  } from '../../../api/rain/inspection.js'
+  import {
+    storeclue
+  } from '../../../api/assess/clue.js'
+  import {
+    getToken
+  } from '@/utils/auth'
+  import {
+    getparameteritem
+  } from '../../../api/system/dictionary.js'
+  import {
+    listarea
+  } from '../../../api/basic/area.js'
+  import {
+    listroad
+  } from '../../../api/basic/road.js'
+  import LxHeader from "@/components/LxHeader/index.vue";
+
+  export default {
+    components: {
+      LxHeader
+    },
+    data() {
+      return {
+        datesearch: "",
+        tableHeight: 0,
+        rainTypeVisible: false,
+        rainType: "1",
+        dialogFormVisible: false,
+        dialogFormDetailVisible: false,
+        formLabelWidth: "120px",
+        dialogImageUrl: "",
+        dialogVisible: false,
+        rainTitle: "日常雨水设施",
+        tableData: [],
+        mapparams: {
+          zoom: 11,
+        },
+        mapform: [],
+        tableHeight: 0,
+        searchFields: {
+          end_type: 2,
+          is_export:0
+        },
+        selects: {
+          areasList: [{
+            id: "",
+            name: "所有"
+          }],
+          typeList: [{
+            id: "",
+            name: "所有"
+          }, {
+            id: "1",
+            name: "日常雨水设施"
+          }, {
+            id: "2",
+            name: "在建工地"
+          }],
+          statusList: [{
+            id: "",
+            name: "所有"
+          }, {
+            id: "1",
+            name: "未审核"
+          }, {
+            id: "2",
+            name: "已审核"
+          }, {
+            id: "3",
+            name: "已办结"
+          }],
+        },
+        paginations: {
+          page: 1,
+          page_size: 15,
+          total: 0
+        },
+        filesList: [],
+        dealFilesList: [],
+        rainMaintainLogs: [],
+        end_types: 0,
+        disabled: false,
+        uploadOther: {
+          token: ""
+        },
+        idname: "",
+        nowstatus: 0,
+        buildList: [],
+        siteType: [],
+        siteLaw: [],
+        equiementList: [],
+        sequiementList: [{
+          id: "",
+          value: "所有"
+        }],
+        siteStatus: [{
+          id: 1,
+          value: "在建"
+        }, {
+          id: 2,
+          value: "完工"
+        }],
+        form: {
+          content: "",
+          ask_content_id: "",
+          is_unusual: 0,
+          is_scene: 0,
+          point_name: "",
+          scope: "",
+          result: "",
+          tip: "",
+          longitude: "",
+          latitude: "",
+          address: "",
+          files_list: [],
+          files_end_list: [],
+          building_site_id: "",
+          name: "",
+          number: "",
+          type: "",
+          status: 0,
+          remark: "",
+          is_law: 0,
+          break_id: "",
+          road_id: ""
+        },
+        roadloading: false,
+        roadsList: [],
+        roadName: "",
+        roaddisabled: false,
+        formdetail: {
+          status: 0,
+          end_type: 0,
+          content: ""
+        },
+        formclue: {
+          type: 5,
+          rain_inspection_id: "",
+        },
+
+        columns: [{
+            field: "address",
+            title: "地址",
+            type: "string",
+            align: "left",
+            width: 360
+          },
+          {
+            field: "area_info",
+            title: "所属片区",
+            type: "format",
+            align: "center",
+            width: 180
+          },
+          {
+            field: "askName",
+            title: "巡查内容",
+            type: "string",
+            align: "center",
+            width: 180
+          },
+          {
+            field: "type",
+            title: "类型",
+            type: "type",
+            align: "center",
+            width: 180
+          },
+          {
+            field: "end_type",
+            title: "是否违法转办",
+            type: "end_type",
+            align: "center",
+            width: 180
+          },
+          {
+            field: "status",
+            title: "状态",
+            type: "status",
+            align: "center",
+            width: 180
+          },
+          {
+            field: "userName",
+            title: "提交人",
+            type: "admin",
+            align: "center",
+            width: 180
+          },
+          {
+            field: "created_at",
+            title: "提交日期",
+            type: "string",
+            align: "center",
+            width: 180
+          },
+          {
+            field: "操作",
+            title: "操作",
+            width: 220,
+            type: "opt",
+            fixed: "right"
+          }
+        ],
+      }
+    },
+    created() {
+      this.initLoad();
+      this.load();
+
+    },
+    watch: {
+      datesearch(newVal, oldVal) {
+        console.log(newVal)
+        if (newVal) {
+          this.searchFields.start_date = newVal[0]
+          this.searchFields.end_date = newVal[1]
+        } else {
+          this.searchFields.start_date = ""
+          this.searchFields.end_date = ""
+        }
+
+      }
+    },
+    methods: {
+      getUserName(row) {
+        if (row.admin) {
+          return row.admin.name;
+        } else if (row.user) {
+          return row.user.name;
+        } else {
+          return "未知";
+        }
+
+      },
+      goorder(){
+        this.$router.push({path:'/rain/order/order',query:{isnew:true}});
+      },
+      initLoad() {
+        var that = this;
+        var clientHeight = document.documentElement.clientHeight
+        var lxHeader_height = 96.5; //查询 头部
+        var paginationHeight = 37; //分页的高度
+        var topHeight = 50; //页面 头部
+        let tableHeight = clientHeight - lxHeader_height - topHeight - paginationHeight - 20;
+        that.tableHeight = tableHeight;
+
+        getparameteritem('siteType').then(res => {
+          that.siteType = res.detail
+        })
+        getparameteritem('siteLaw').then(res => {
+          that.siteLaw = res.detail
+        })
+        getparameteritem('equiementList').then(res => {
+          that.equiementList = res.detail
+          for (var m of res.detail) {
+            that.sequiementList.push(m)
+          }
+        })
+
+        listarea({
+          page: 1,
+          page_size: 99
+        }).then(res => {
+          for (var m of res.data) {
+            that.selects.areasList.push({
+              id: m.id,
+              name: m.name
+            })
+          }
+        })
+
+
+      },
+      handleCurrentChange(page) {
+        this.paginations.page = page;
+        this.load();
+      },
+      load() {
+        listall({
+          page: this.paginations.page,
+          page_size: this.paginations.page_size,
+          ...this.searchFields
+        }).then(response => {
+          for (var m of response.data) {
+            if (m.rain_equipment_info) {
+              m.askName = m.rain_equipment_info.ask_content_detail ? m.rain_equipment_info.ask_content_detail
+                .value : ""
+            }
+          }
+          this.tableData = response.data;
+          this.paginations.total = response.total;
+        }).catch(error => {
+          console.log(error)
+          reject(error)
+        });
+
+
+
+      },
+      remoteRoad() {
+        this.roadsList = []
+      },
+      remoteMethod(query) {
+
+        if (query != '') {
+          this.roadloading = true
+          listroad({
+            name: query
+          }).then(res => {
+            this.roadloading = false
+            this.roadsList = res.data
+          })
+        } else {
+          this.roadsList = []
+        }
+      },
+      info(obj) {
+        var that = this;
+        get(obj.id).then(res => {
+          let result = Object.assign(that.form, res);
+          // this.$set(that.form,res)
+          that.rainType = result.type;
+          that.nowstatus = result.status;
+          that.formclue.rain_inspection_id = result.id
+          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 = "日常雨水设施"
+          } else if (that.rainType == 2) {
+            that.rainTitle = "在建工地"
+          }
+          switch (result.type) {
+            case 1:
+              that.form = result.rain_equipment_info;
+              that.form.rain_equipment_id = result.rain_equipment_id;
+              that.roaddisabled = true
+              that.roadName = result.rain_equipment_info.road ? result.rain_equipment_info.road.name : ""
+              that.idname = "rain_equipment_id"
+              that.mapform = [result.rain_equipment_info.longitude, result.rain_equipment_info.latitude, result
+                .rain_equipment_info.address
+              ]
+              let _files = [];
+              let clue_files = []
+              for (var mod of result.rain_equipment_info.rain_equipment_files) {
+                let m = Object.assign({}, mod);
+                m.url = mod.files.url;
+                m.id = mod.files.id;
+                m.photoType = "before";
+                _files.push(m);
+                clue_files.push({
+                  upload_id: mod.files.id
+                })
+              }
+              that.filesList = _files;
+
+              let _filesafter = [];
+              for (var mod of result.rain_equipment_info.rain_equipment_end_files) {
+                let m = Object.assign({}, mod);
+                m.url = mod.files.url;
+                m.id = mod.files.id;
+                m.photoType = "after";
+                _filesafter.push(m);
+              }
+              that.dealFilesList = _filesafter;
+              that.formclue.area_id = result.area_id
+              that.formclue.content = result.rain_equipment_info.content
+              that.formclue.files_list = clue_files
+              that.formclue.date = result.created_at
+              that.formclue.longitude = result.rain_equipment_info.longitude
+              that.formclue.latitude = result.rain_equipment_info.latitude
+              that.formclue.address = result.rain_equipment_info.address
+              break;
+            case 2:
+              that.form = result.building_site_info;
+              that.roadName = result.building_site_info.road ? result.building_site_info.road.name : ""
+              let building_site = result.building_site_info.building_site
+              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
+              that.form.name = building_site.name
+              that.form.number = building_site.number
+              that.form.remark = building_site.remark
+              that.form.status = building_site.status
+              that.form.type = parseInt(building_site.type)
+              that.form.building_site_id = building_site.id
+              that.form.building_site_content_id = result.building_site_content_id;
+              that.idname = "building_site_content_id"
+              that.mapform = [building_site.longitude, building_site.latitude, building_site.address]
+              let discharge_files = [];
+              let build_files = [];
+              for (var mod of result.building_site_info.building_site_content_files) {
+                let m = Object.assign({}, mod);
+                m.url = mod.files.url;
+                m.id = mod.files.id;
+                m.photoType = "before";
+                discharge_files.push(m);
+                build_files.push({
+                  upload_id: mod.files.id
+                })
+              }
+              that.filesList = discharge_files;
+              that.formclue.area_id = result.area_id
+              that.formclue.content = result.building_site_info.content
+              that.formclue.files_list = build_files
+              that.formclue.date = result.created_at
+              that.formclue.address = building_site.address
+              that.formclue.latitude = building_site.latitude
+              that.formclue.longitude = building_site.longitude
+              break;
+
+          }
+          that.formdetail.id = result.id
+          that.formdetail.end_type = result.end_type
+
+        }).catch(error => {
+          //reject(error)
+        })
+      },
+
+      show(obj) {
+        this.dialogFormDetailVisible = true;
+        this.info(obj)
+      },
+      del(obj) {
+        var that = this;
+        if (obj) {
+          this.$Modal.confirm({
+            title: '确认要删除数据？',
+            onOk: () => {
+              del(obj.id).then(response => {
+                this.$Message.success('操作成功');
+                that.load();
+              }).catch(error => {
+                console.log(error)
+                reject(error)
+              })
+            },
+            onCancel: () => {
+              //this.$Message.info('Clicked cancel');
+            }
+          });
+        }
+      },
+
+      submitFormDetail(formName, status) {
+
+        var that = this;
+        that.formdetail.status = status
+        console.log(that.formdetail);
+
+        if (that.formdetail.end_type == 2 && that.formdetail.status == 2) {
+          storeclue(that.formclue).then(response => {
+            this.$Message.success('新增线索处办成功');
+          }).catch(error => {
+            //reject(error)
+          })
+        }
+        update(that.formdetail).then(response => {
+          this.$Message.success('操作成功');
+          that.load();
+          that.dialogFormDetailVisible = false;
+        }).catch(error => {
+          //reject(error)
+        })
+
+
+      },
+      resetFormDetail(formName) {
+        var that = this;
+        that.filesList = [];
+        that.dealFilesList = [];
+        that.form = {};
+        that.rainMaintainLogs = []
+        that.end_types = 0;
+        that.formdetail = {
+          status: 0,
+          end_type: 0,
+          content: ""
+        }
+        that.dialogFormDetailVisible = false;
+      },
+
+      handlePictureCardPreview(file) {
+        this.dialogImageUrl = file.url;
+        this.dialogVisible = true;
+      }
+    }
+  }
+</script>
+
+<style>
+  .dialogConcent {
+    overflow-y: auto;
+  }
+
+  .width100 {
+    width: 100%;
+  }
+
+  .files_check .el-upload.el-upload--picture-card {
+    display: none;
+  }
+
+  .vm10{
+    margin-right:10px;
+    margin-bottom:10px;
+    height: 32px;
+    vertical-align: bottom;
+  }
+  .vm10 input {
+    height: 32px;
+    vertical-align: middle;
+  }
+
+  .vm10 .el-select__caret.el-input__icon.el-icon-arrow-up {
+    line-height: 30px;
+  }
+  .vm10 .el-input__icon.el-range__icon.el-icon-date,.vm10 .el-range-separator{
+    line-height: 25px;
+  }
+  .selerchcontent button{
+    vertical-align: top;
+  }
+</style>
diff --git a/src/views/rain/inspection/law.vue b/src/views/rain/inspection/law.vue
index 379b969..5c28453 100644
--- a/src/views/rain/inspection/law.vue
+++ b/src/views/rain/inspection/law.vue
@@ -17,16 +17,25 @@
                 <el-option v-for="item in selects.areasList" :key="item.id" :label="item.name" :value="item.id">
                 </el-option>
               </el-select>
-              <el-select class="vm10" filterable v-model="searchFields.status_id" placeholder="请选择状态">
+              <el-select class="vm10" filterable v-model="searchFields.status" placeholder="请选择状态">
                 <el-option v-for="item in selects.statusList" :key="item.id" :label="item.name" :value="item.id">
                 </el-option>
               </el-select>
-              <el-select class="vm10" filterable v-model="searchFields.type_id" placeholder="请选择类型">
+              <el-select class="vm10" filterable v-model="searchFields.unusual_type_id" placeholder="请选择异常类型">
+                <el-option v-for="item in selects.sunusualList" :key="item.id" :label="item.value" :value="item.id">
+                </el-option>
+              </el-select>
+              <el-select class="vm10" filterable v-model="searchFields.type" placeholder="请选择类型">
                 <el-option v-for="item in selects.typeList" :key="item.id" :label="item.name" :value="item.id">
                 </el-option>
               </el-select>
+              <el-select class="vm10" filterable v-model="searchFields.end_type" placeholder="请选择结办类型">
+                <el-option v-for="item in selects.endTypeList" :key="item.id" :label="item.name" :value="item.id">
+                </el-option>
+              </el-select>
+
               <el-select class="vm10" filterable v-model="searchFields.ask_content_id" placeholder="请选择巡查内容">
-                <el-option v-for="item in sequiementList" :key="item.id" :label="item.value" :value="item.id">
+                <el-option v-for="item in selects.sequiementList" :key="item.id" :label="item.value" :value="item.id">
                 </el-option>
               </el-select>
 
@@ -39,20 +48,21 @@
         </LxHeader>
       </div>
       <div ref="lxTable">
-        <el-table :data="tableData" class="v-table" :height="tableHeight" style="width: 100%">
+        <el-table :data="tableData" class="v-table" :height="tableHeight"
+          style="width: 100%">
           <el-table-column type="index" width="50" fixed label="序号" align="center"> </el-table-column>
           <el-table-column :prop="column.field" :align="column.align" v-for="(column,index) in columns"
             :label="column.title" :width="column.width" :fixed="column.fixed">
             <template slot-scope="scope">
               <div v-if="column.type=='opt'">
-                <Button v-if="scope.row['status']==2||scope.row['status']==3" ghost size="small"
-                  @click="show(scope.row)" type="primary" style="margin-left: 10px;">查看</Button>
-                <Button v-if="scope.row['status']==1&&scope.row['end_type']==2" ghost size="small"
-                  @click="show(scope.row)" type="primary" style="margin-left: 10px;">办结</Button>
-                <Button ghost size="small"
-                  @click="goorder" type="primary" style="margin-left: 10px;">新建工单</Button>
-                <Button ghost size="small" @click="del(scope.row)" type="error" style="margin-left: 10px;">删除</Button>
-              </div>
+                <Button v-if="scope.row['status']==2||scope.row['status']==3" ghost size="small"
+                    @click="showInfo(scope.row,'showform')" type="primary" style="margin-left: 10px;">查看</Button>
+                  <Button v-if="scope.row['status']==1&&scope.row['end_type']==2" ghost size="small"
+                    @click="showInfo(scope.row,'endform')" type="primary" style="margin-left: 10px;">办结</Button>
+                  <Button ghost size="small"
+                    @click="goorder" type="primary" style="margin-left: 10px;">新建工单</Button>
+                  <Button ghost size="small" @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>
                 <el-tag v-if="scope.row[column.field]==2">在建工地巡查</el-tag>
@@ -67,6 +77,14 @@
                 <el-tag type="warning" v-if="scope.row[column.field]==2">已办结</el-tag>
                 <el-tag type="info" v-if="scope.row[column.field]==3">已退回</el-tag>
               </div>
+              <div v-else-if="column.type=='audit_status' && scope.row['status']==2">
+                <el-tag v-if="scope.row[column.field]==0">待复核</el-tag>
+                <el-tag type="success" v-if="scope.row[column.field]==1">已复核</el-tag>
+                <!-- <el-tag type="warning" v-if="scope.row[column.field]==2">未通过</el-tag> -->
+              </div>
+              <div v-else-if="column.type=='audit_status' && scope.row['status']!=2">
+                无
+              </div>
               <div v-else-if="column.type=='format'">
                 {{scope.row[column.field]?scope.row[column.field].name:""}}
                 <!-- <div v-if="column.field=='ask_content_detail'">{{scope.row[column.field]?scope.row[column.field].value:""}}</div>
@@ -90,328 +108,47 @@
         </div>
       </div>
 
-      <!-- 审核 -->
-      <el-dialog class="common-dialog" :title="rainTitle" :visible.sync="dialogFormDetailVisible" width="60%">
+      <!-- 初始选择 -->
+      <el-dialog title="雨管养护类型选择" :visible.sync="rainTypeVisible" width="60%">
         <div class="dialogConcent">
-          <el-scrollbar style="flex: 1">
-            <!-- 日常雨水设施 -->
-            <el-form v-if="rainType==1" :model="formdetail" :rules="{}" ref="formdetail" label-position="right"
-              :label-width="formLabelWidth">
-              <el-row>
-                <el-col :span="24">
-                  <el-form-item label="所属道路" prop="road_id">
-                    {{roadName}}
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="巡查内容" prop="ask_content_id">
-                    <div v-for="item in equiementList">
-                      <div v-if="item.id==form.ask_content_id">
-                        {{item.value}}
-                      </div>
-                    </div>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="覆盖范围" prop="scope">
-                    {{form.scope}}米
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="所在点位" prop="point_name">
-                    {{form.point_name}}
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="所在位置" prop="address">
-                    {{form.address}}
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="经度" prop="longitude">
-                    {{form.longitude}}
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="纬度" prop="latitude">
-                    {{form.latitude}}
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="描述" prop="content">
-                    {{form.content}}
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="现场照片" prop="files_list" class="files_check">
-                    <el-upload multiple action="/api/admin/upload-file" list-type="picture-card" :file-list="filesList"
-                      ref="pictureUploads">
-                      <div slot="file" slot-scope="{file}">
-                        <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
-                        <span class="el-upload-list__item-actions">
-                          <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
-                            <i class="el-icon-zoom-in"></i>
-                          </span>
-                        </span>
-                      </div>
-                    </el-upload>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="24">
-                  <el-form-item label="是否异常" prop="is_unusual">
-                    <el-tag v-if="form.is_unusual==0">否</el-tag>
-                    <el-tag type="warning" v-if="form.is_unusual==1">丢失</el-tag>
-                    <el-tag type="success" v-if="form.is_unusual==2">破损</el-tag>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24" v-if="form.is_unusual!=0">
-                  <el-form-item label="异常处置建议" prop="tip">
-                    {{form.tip}}
-                  </el-form-item>
-                </el-col>
-                <el-col :span="10">
-                  <el-form-item label="是否现场处理" prop="is_scene">
-                    <el-tag v-if="form.is_scene==0">否</el-tag>
-                    <el-tag type="success" v-if="form.is_scene==1">丢失</el-tag>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24" v-if="form.is_scene==1">
-                  <el-form-item label="现场处理结果" prop="result">
-                    {{form.result}}
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24" v-if="form.is_scene==1">
-                  <el-form-item label="处理后照片" prop="files_end_list" class="files_check">
-                    <el-upload multiple action="/api/admin/upload-file" list-type="picture-card"
-                      :file-list="dealFilesList" ref="pictureUploads">
-                      <div slot="file" slot-scope="{file}">
-                        <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
-                        <span class="el-upload-list__item-actions">
-                          <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
-                            <i class="el-icon-zoom-in"></i>
-                          </span>
-                        </span>
-                      </div>
-                    </el-upload>
-
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="24" v-if="nowstatus==1">
-                  <el-form-item label="备注" prop="content">
-                    <el-input type="textarea" v-model="formdetail.content" placeholder="请填写备注"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24" v-if="nowstatus==1">
-                  <el-form-item label="转办类型" prop="end_type">
-                    <el-radio-group v-model="formdetail.end_type">
-                      <el-radio :label="0">无</el-radio>
-                      <el-radio :label="1">养护转办</el-radio>
-                      <el-radio :label="2">违法转办</el-radio>
-                    </el-radio-group>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24" v-if="nowstatus==2||nowstatus==3">
-                  <el-form-item label="转办类型">
-                    <el-tag v-if="end_types==0">无</el-tag>
-                    <el-tag type="warning" v-if="end_types==1">养护转办</el-tag>
-                    <el-tag type="warning" v-if="end_types==2">违法转办</el-tag>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==1">
-                  <el-form-item label="要求完成时间" prop="end_time">
-                    <el-date-picker style="width:100%" v-model="formdetail.end_time" type="datetime" placeholder="选择时间"
-                      value-format="yyyy-MM-dd HH:mm:ss">
-                    </el-date-picker>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==1">
-                  <el-form-item label="备注" prop="remark">
-                    <el-input type="textarea" v-model="formdetail.remark" placeholder="请填写备注" autocomplete="off">
-                    </el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24" v-if="nowstatus==2||nowstatus==3">
-                  <el-form-item label="处理日志" prop="">
-
-                  </el-form-item>
-                  <el-table :data="rainMaintainLogs" style="width: 90%;margin: 0 auto;">
-                    <el-table-column prop="created_at" label="日期" width="180">
-                    </el-table-column>
-                    <el-table-column prop="content" label="内容">
-                    </el-table-column>
-                    <!-- <el-table-column
-                              prop="end_type"
-                              label="有无违法转办"
-                              >
-
-                            </el-table-column> -->
-                    <el-table-column prop="type_name" label="操作结果">
-                    </el-table-column>
-
-                    <el-table-column prop="adminName" label="操作人" width="180">
-                    </el-table-column>
-                  </el-table>
+          <el-radio v-model="rainType" :label="1">日常雨水设施</el-radio>
+          <el-radio v-model="rainType" :label="2">在建工地</el-radio>
+        </div>
 
-                </el-col>
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="resetrainType()">取 消</el-button>
+          <el-button type="primary" v-preventReClick @click="submitRainType()">确认</el-button>
+        </div>
+      </el-dialog>
 
-              </el-row>
-
-            </el-form>
+      <!-- 新增 编辑 -->
+      <editEquipment ref="editEquipment" @auditSuccess="load"></editEquipment>
+      <editSite ref="editSite" @auditSuccess="load"></editSite>
+      <!-- 查看 审核 办结 -->
+      <showRainEquipmentInfo ref="showRainEquipmentInfo" @auditSuccess="load"></showRainEquipmentInfo>
+      <showRainSiteInfo ref="showRainSiteInfo" @auditSuccess="load"></showRainSiteInfo>
 
+      <!-- 复核 -->
+      <el-dialog class="common-dialog" title="批量复核" :visible.sync="reviewFormVisible" width="40%">
+        <div class="dialogConcent">
+          <el-scrollbar style="flex: 1">
 
-            <!-- 在建工地 -->
-            <el-form v-if="rainType==2" :model="formdetail" :rules="{}" ref="formdetail" label-position="right"
-              :label-width="formLabelWidth">
+            <el-form :model="reviewForm" ref="reviewForm" label-position="right" :label-width="formLabelWidth">
               <el-row>
                 <el-col :span="24">
-                  <el-form-item label="所属道路" prop="road_id">
-                    {{roadName}}
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="工地名称" prop="name">
-                    {{form.name}}
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="所在位置" prop="address">
-                    {{form.address}}
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="经度" prop="longitude">
-                    {{form.longitude}}
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="纬度" prop="address">
-                    {{form.latitude}}
+                  <el-form-item label="复核状态" prop="audit_status">
+                    <el-select class="width100" v-model="reviewForm.audit_status" placeholder="请选择复核状态">
+                      <el-option v-for="item in reviewStatusList" :key="item.id" :label="item.value" :value="item.id">
+                      </el-option>
+                    </el-select>
                   </el-form-item>
                 </el-col>
                 <el-col :span="24">
-                  <el-form-item label="工地编号" prop="number">
-                    {{form.number}}
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="工地类型" prop="type">
-                    <div v-for="item in siteType">
-                      <div v-if="item.id==form.type">
-                        {{item.value}}
-                      </div>
-                    </div>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="工地状态" prop="status">
-                    <div v-for="item in siteStatus">
-                      <el-tag v-if="item.id==form.status">{{item.value}}</el-tag>
-                    </div>
-                  </el-form-item>
-                </el-col>
-                <!-- <el-col :span="24">
-                      <el-form-item label="工地类型" prop="type">
-                          <el-input v-model="form.type" placeholder="工地类型" autocomplete="off"></el-input>
-                      </el-form-item>
-
-                  </el-col> -->
-                <el-col :span="24">
-                  <el-form-item label="备注" prop="remark">
-                    {{form.remark}}
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="描述" prop="content">
-                    {{form.content}}
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="现场照片" prop="files_list" class="files_check">
-                    <el-upload multiple action="/api/admin/upload-file" list-type="picture-card" :file-list="filesList"
-                      ref="pictureUploads">
-                      <div slot="file" slot-scope="{file}">
-                        <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
-                        <span class="el-upload-list__item-actions">
-                          <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
-                            <i class="el-icon-zoom-in"></i>
-                          </span>
-                        </span>
-                      </div>
-                    </el-upload>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="是否违法" prop="is_law">
-                    <el-tag v-if="form.is_law==0">否</el-tag>
-                    <el-tag v-if="form.is_law==1">是</el-tag>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24" v-if="form.is_law==1">
-                  <el-form-item label="违规内容" prop="break_id">
-                    <div v-for=" item in siteLaw">
-                      <div v-if="item.id==form.break_id">
-                        {{item.value}}
-                      </div>
-                    </div>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="24">
-                  <el-form-item label="备注" prop="content">
-                    <el-input type="textarea" v-model="formdetail.content" placeholder="请填写备注"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24" v-if="nowstatus==1">
-                  <el-form-item label="有无违法转办" prop="end_type">
-                    <el-radio-group v-model="formdetail.end_type">
-                      <el-radio :label="0">无</el-radio>
-                      <el-radio :label="1">养护转办</el-radio>
-                      <el-radio :label="2">违法转办</el-radio>
-                    </el-radio-group>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==1">
-                  <el-form-item label="要求完成时间" prop="complete_date">
-                    <el-date-picker style="width:100%" v-model="formdetail.end_time" type="datetime" placeholder="选择时间"
-                      value-format="yyyy-MM-dd HH:mm:ss">
-                    </el-date-picker>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==1">
-                  <el-form-item label="备注" prop="remark">
-                    <el-input type="textarea" v-model="formdetail.remark" placeholder="请填写备注" autocomplete="off">
+                  <el-form-item label="备注" prop="audit_reamrk">
+                    <el-input type="textarea" v-model="reviewForm.audit_reamrk" placeholder="请填写备注" autocomplete="off">
                     </el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="24" v-if="nowstatus==2||nowstatus==3">
-                  <el-form-item label="有无违法转办">
-                    <el-tag v-if="end_types==0">无</el-tag>
-                    <el-tag type="warning" v-if="end_types==1">养护转办</el-tag>
-                    <el-tag type="warning" v-if="end_types==2">违法转办</el-tag>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24" v-if="nowstatus==2||nowstatus==3">
-                  <el-form-item label="处理日志" prop="">
-
-                  </el-form-item>
-                  <el-table :data="rainMaintainLogs" style="width: 90%;margin: 0 auto;">
-                    <el-table-column prop="created_at" label="日期" width="180">
-                    </el-table-column>
-                    <el-table-column prop="content" label="内容">
-                    </el-table-column>
-                    <el-table-column prop="type_name" label="操作结果">
-                    </el-table-column>
-
-                    <el-table-column prop="adminName" label="操作人" width="180">
-                    </el-table-column>
-                  </el-table>
-
-                </el-col>
-
-
               </el-row>
 
             </el-form>
@@ -419,23 +156,11 @@
         </div>
 
         <div slot="footer" class="dialog-footer">
-          <el-button @click="resetFormDetail('formdetail')">取 消</el-button>
-          <el-button v-if="nowstatus==1" type="primary" v-preventReClick @click="submitFormDetail('formdetail','2')">办结
-          </el-button>
-          <el-button v-if="nowstatus==1" type="danger" v-preventReClick @click="submitFormDetail('formdetail','3')">退回
-          </el-button>
-
+          <el-button @click="reviewFormVisible=false">取 消</el-button>
+          <el-button type="primary" v-preventReClick @click="submitReviewForm('reviewForm')">确认</el-button>
         </div>
       </el-dialog>
 
-      <el-dialog class="common-dialog" :visible.sync="dialogVisible">
-        <img width="100%" :src="dialogImageUrl" alt="">
-      </el-dialog>
-
-
-
-
-
     </div>
   </div>
 </template>
@@ -443,13 +168,9 @@
 <script>
   import {
     listall,
-    get,
     del,
-    update,
+    review
   } from '../../../api/rain/inspection.js'
-  import {
-    storeclue
-  } from '../../../api/assess/clue.js'
   import {
     getToken
   } from '@/utils/auth'
@@ -463,34 +184,46 @@
     listroad
   } from '../../../api/basic/road.js'
   import LxHeader from "@/components/LxHeader/index.vue";
-
+  import showRainEquipmentInfo from '@/views/rain/inspection/components/showRainEquipmentInfo'
+  import showRainSiteInfo from '@/views/rain/inspection/components/showRainSiteInfo'
+  import editEquipment from '@/views/rain/inspection/components/editEquipment'
+  import editSite from '@/views/rain/inspection/components/editSite'
   export default {
     components: {
-      LxHeader
+      LxHeader,
+      showRainEquipmentInfo,
+      showRainSiteInfo,
+      editEquipment,
+      editSite
     },
     data() {
       return {
-        datesearch: "",
-        tableHeight: 0,
+        tableHeight: 0,
+        formLabelWidth: "120px",
+        baseurl: "",
         rainTypeVisible: false,
-        rainType: "1",
-        dialogFormVisible: false,
-        dialogFormDetailVisible: false,
-        formLabelWidth: "120px",
-        dialogImageUrl: "",
-        dialogVisible: false,
-        rainTitle: "日常雨水设施",
-        tableData: [],
-        mapparams: {
-          zoom: 11,
-        },
-        mapform: [],
-        tableHeight: 0,
-        searchFields: {
-          end_type: 2,
-          is_export:0
+        rainType: 1,
+
+        tableData: [],
+        paginations: {
+          page: 1,
+          page_size: 15,
+          total: 0
         },
+
+        searchFields: {
+          is_export: 0,
+          end_type:2
+        },
+        datesearch: "",
+        roadsList: [],
+        roaddisabled: false,
+        roadloading: false,
         selects: {
+          sunusualList: [{
+            id: "",
+            value: "所有"
+          }],
           areasList: [{
             id: "",
             name: "所有"
@@ -499,92 +232,61 @@
             id: "",
             name: "所有"
           }, {
-            id: "1",
+            id: 1,
             name: "日常雨水设施"
           }, {
-            id: "2",
+            id: 2,
             name: "在建工地"
           }],
           statusList: [{
             id: "",
             name: "所有"
           }, {
-            id: "1",
+            id: 0,
             name: "未审核"
           }, {
-            id: "2",
+            id: 1,
             name: "已审核"
           }, {
-            id: "3",
+            id: 2,
             name: "已办结"
+          }, {
+            id: 3,
+            name: "已退回"
+          }],
+          endTypeList: [{
+            id: 0,
+            name: "所有"
+          }, {
+            id: 1,
+            name: "养护转办"
+          }, {
+            id: 2,
+            name: "违法转办"
+          }],
+          sequiementList: [{
+            id: "",
+            value: "所有"
           }],
         },
-        paginations: {
-          page: 1,
-          page_size: 15,
-          total: 0
-        },
-        filesList: [],
-        dealFilesList: [],
-        rainMaintainLogs: [],
-        end_types: 0,
-        disabled: false,
-        uploadOther: {
-          token: ""
-        },
-        idname: "",
-        nowstatus: 0,
-        buildList: [],
-        siteType: [],
-        siteLaw: [],
-        equiementList: [],
-        sequiementList: [{
-          id: "",
-          value: "所有"
-        }],
-        siteStatus: [{
-          id: 1,
-          value: "在建"
-        }, {
-          id: 2,
-          value: "完工"
+
+        reviewFormVisible: false,
+        reviewList: [],
+        reviewForm: {
+          ids: [],
+          audit_status: 0,
+          audit_reamrk: ""
+        },
+        reviewStatusList: [{
+          id: 0,
+          value: "待复核"
+        }, {
+          id: 1,
+          value: "已复核"
         }],
-        form: {
-          content: "",
-          ask_content_id: "",
-          is_unusual: 0,
-          is_scene: 0,
-          point_name: "",
-          scope: "",
-          result: "",
-          tip: "",
-          longitude: "",
-          latitude: "",
-          address: "",
-          files_list: [],
-          files_end_list: [],
-          building_site_id: "",
-          name: "",
-          number: "",
-          type: "",
-          status: 0,
-          remark: "",
-          is_law: 0,
-          break_id: "",
-          road_id: ""
-        },
-        roadloading: false,
-        roadsList: [],
-        roadName: "",
-        roaddisabled: false,
-        formdetail: {
-          status: 0,
-          end_type: 0,
-          content: ""
-        },
-        formclue: {
-          type: 5,
-          rain_inspection_id: "",
+
+        rules: {
+
         },
 
         columns: [{
@@ -617,7 +319,7 @@
           },
           {
             field: "end_type",
-            title: "是否违法转办",
+            title: "是否有违法转办",
             type: "end_type",
             align: "center",
             width: 180
@@ -629,6 +331,14 @@
             align: "center",
             width: 180
           },
+          {
+            field: "audit_status",
+            title: "复核状态",
+            type: "audit_status",
+            align: "center",
+            width: 180
+          },
+
           {
             field: "userName",
             title: "提交人",
@@ -659,8 +369,8 @@
 
     },
     watch: {
+
       datesearch(newVal, oldVal) {
-        console.log(newVal)
         if (newVal) {
           this.searchFields.start_date = newVal[0]
           this.searchFields.end_date = newVal[1]
@@ -671,81 +381,163 @@
 
       }
     },
-    methods: {
-      getUserName(row) {
-        if (row.admin) {
-          return row.admin.name;
-        } else if (row.user) {
-          return row.user.name;
-        } else {
-          return "未知";
-        }
-
+    methods: {
+      initLoad() {
+        var that = this;
+        var clientHeight = document.documentElement.clientHeight
+        var lxHeader_height = 96.5; //查询 头部
+        var paginationHeight = 37; //分页的高度
+        var topHeight = 50; //页面 头部
+        let tableHeight = clientHeight - lxHeader_height - topHeight - paginationHeight - 60;
+        that.tableHeight = tableHeight;
+
+        that.baseurl = location.host;
+
+        getparameteritem('equiementList').then(res => {
+          for (var m of res.detail) {
+            that.selects.sequiementList.push(m)
+          }
+        })
+        getparameteritem('unusualList').then(res => {
+          for (var m of res.detail) {
+            that.selects.sunusualList.push(m)
+          }
+        })
+
+        listarea({
+          page: 1,
+          page_size: 999
+        }).then(res => {
+          for (var m of res.data) {
+            that.selects.areasList.push({
+              id: m.id,
+              name: m.name
+            })
+          }
+        })
+      },
+      load(is_export) {
+        // return
+        listall({
+          page: this.paginations.page,
+          page_size: this.paginations.page_size,
+          ...this.searchFields
+        }).then(response => {
+          let tokens = getToken();
+          if (is_export) {
+            var url = "/api/admin/rain-maintains/index?token=" + tokens
+            for (var m in this.searchFields) {
+              url += "&" + m + "=" + this.searchFields[m]
+            }
+            url = this.baseurl + url
+            console.log(url)
+            window.open("http://" + url, '_blank')
+            this.searchFields.is_export = 0
+            return;
+          }
+          for (var m of response.data) {
+            if (m.rain_equipment_info) {
+              m.askName = m.rain_equipment_info.ask_content_detail ? m.rain_equipment_info.ask_content_detail :
+                ""
+            }
+          }
+          this.tableData = response.data;
+          this.paginations.total = response.total;
+        }).catch(error => {
+          console.log(error)
+          reject(error)
+        });
+      },
+      handleCurrentChange(page) {
+        this.paginations.page = page;
+        this.load();
+      },
+ // 新增 编辑
+      edit(obj) {
+        var that = this;
+        if (obj) {
+          if (obj.type == 1) {
+            this.$refs.editEquipment.infoId = obj.id
+            this.$refs.editEquipment.getEquipmentInfo(obj.id)
+            this.$refs.editEquipment.isShow = true
+          }
+          if (obj.type == 2) {
+            this.$refs.editSite.infoId = obj.id
+            this.$refs.editSite.getSiteInfo(obj.id)
+            this.$refs.editSite.isShow = true
+          }
+        } else {
+          this.rainTypeVisible = true
+        }
+
+      },
+      submitRainType() {
+        var that = this
+        this.rainTypeVisible = false
+        if (that.rainType == 1) {
+          this.$refs.editEquipment.getEquipmentInfo()
+          this.$refs.editEquipment.isShow = true
+
+        } else if (that.rainType == 2) {
+          this.$refs.editSite.getSiteInfo()
+          this.$refs.editSite.isShow = true
+        }
+      },
+      resetrainType() {
+        this.rainTypeVisible = false
+        this.rainType = 1
+      },
+      // 审核 办结 查看
+      showInfo(obj, formtype) {
+        // 日常雨水设施
+        if (obj.type == 1) {
+          this.$refs.showRainEquipmentInfo.isShow = true
+          this.$refs.showRainEquipmentInfo.getEquipmentInfo(obj.id)
+          this.$refs.showRainEquipmentInfo.infoId = obj.id
+          this.$refs.showRainEquipmentInfo.formType = formtype
+        }
+        // 工地
+        if (obj.type == 2) {
+          this.$refs.showRainSiteInfo.isShow = true
+          this.$refs.showRainSiteInfo.getSiteInfo(obj.id)
+          this.$refs.showRainSiteInfo.infoId = obj.id
+          this.$refs.showRainSiteInfo.formType = formtype
+        }
+
+      },
+
+      del(obj) {
+        var that = this;
+        if (obj) {
+          this.$Modal.confirm({
+            title: '确认要删除数据？',
+            onOk: () => {
+              del(obj.id).then(response => {
+                this.$Message.success('操作成功');
+                that.load();
+              }).catch(error => {
+                console.log(error)
+                reject(error)
+              })
+            },
+            onCancel: () => {
+              //this.$Message.info('Clicked cancel');
+            }
+          });
+        }
       },
       goorder(){
         this.$router.push({path:'/rain/order/order',query:{isnew:true}});
-      },
-      initLoad() {
-        var that = this;
-        var clientHeight = document.documentElement.clientHeight
-        var lxHeader_height = 96.5; //查询 头部
-        var paginationHeight = 37; //分页的高度
-        var topHeight = 50; //页面 头部
-        let tableHeight = clientHeight - lxHeader_height - topHeight - paginationHeight - 20;
-        that.tableHeight = tableHeight;
-
-        getparameteritem('siteType').then(res => {
-          that.siteType = res.detail
-        })
-        getparameteritem('siteLaw').then(res => {
-          that.siteLaw = res.detail
-        })
-        getparameteritem('equiementList').then(res => {
-          that.equiementList = res.detail
-          for (var m of res.detail) {
-            that.sequiementList.push(m)
-          }
-        })
-
-        listarea({
-          page: 1,
-          page_size: 99
-        }).then(res => {
-          for (var m of res.data) {
-            that.selects.areasList.push({
-              id: m.id,
-              name: m.name
-            })
-          }
-        })
-
-
-      },
-      handleCurrentChange(page) {
-        this.paginations.page = page;
-        this.load();
-      },
-      load() {
-        listall({
-          page: this.paginations.page,
-          page_size: this.paginations.page_size,
-          ...this.searchFields
-        }).then(response => {
-          for (var m of response.data) {
-            if (m.rain_equipment_info) {
-              m.askName = m.rain_equipment_info.ask_content_detail ? m.rain_equipment_info.ask_content_detail
-                .value : ""
-            }
-          }
-          this.tableData = response.data;
-          this.paginations.total = response.total;
-        }).catch(error => {
-          console.log(error)
-          reject(error)
-        });
-
-
-
+      },
+      getUserName(row) {
+        if (row.admin) {
+          return row.admin.name;
+        } else if (row.user) {
+          return row.user.name;
+        } else {
+          return "未知";
+        }
+
       },
       remoteRoad() {
         this.roadsList = []
@@ -763,183 +555,8 @@
         } else {
           this.roadsList = []
         }
-      },
-      info(obj) {
-        var that = this;
-        get(obj.id).then(res => {
-          let result = Object.assign(that.form, res);
-          // this.$set(that.form,res)
-          that.rainType = result.type;
-          that.nowstatus = result.status;
-          that.formclue.rain_inspection_id = result.id
-          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 = "日常雨水设施"
-          } else if (that.rainType == 2) {
-            that.rainTitle = "在建工地"
-          }
-          switch (result.type) {
-            case 1:
-              that.form = result.rain_equipment_info;
-              that.form.rain_equipment_id = result.rain_equipment_id;
-              that.roaddisabled = true
-              that.roadName = result.rain_equipment_info.road ? result.rain_equipment_info.road.name : ""
-              that.idname = "rain_equipment_id"
-              that.mapform = [result.rain_equipment_info.longitude, result.rain_equipment_info.latitude, result
-                .rain_equipment_info.address
-              ]
-              let _files = [];
-              let clue_files = []
-              for (var mod of result.rain_equipment_info.rain_equipment_files) {
-                let m = Object.assign({}, mod);
-                m.url = mod.files.url;
-                m.id = mod.files.id;
-                m.photoType = "before";
-                _files.push(m);
-                clue_files.push({
-                  upload_id: mod.files.id
-                })
-              }
-              that.filesList = _files;
-
-              let _filesafter = [];
-              for (var mod of result.rain_equipment_info.rain_equipment_end_files) {
-                let m = Object.assign({}, mod);
-                m.url = mod.files.url;
-                m.id = mod.files.id;
-                m.photoType = "after";
-                _filesafter.push(m);
-              }
-              that.dealFilesList = _filesafter;
-              that.formclue.area_id = result.area_id
-              that.formclue.content = result.rain_equipment_info.content
-              that.formclue.files_list = clue_files
-              that.formclue.date = result.created_at
-              that.formclue.longitude = result.rain_equipment_info.longitude
-              that.formclue.latitude = result.rain_equipment_info.latitude
-              that.formclue.address = result.rain_equipment_info.address
-              break;
-            case 2:
-              that.form = result.building_site_info;
-              that.roadName = result.building_site_info.road ? result.building_site_info.road.name : ""
-              let building_site = result.building_site_info.building_site
-              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
-              that.form.name = building_site.name
-              that.form.number = building_site.number
-              that.form.remark = building_site.remark
-              that.form.status = building_site.status
-              that.form.type = parseInt(building_site.type)
-              that.form.building_site_id = building_site.id
-              that.form.building_site_content_id = result.building_site_content_id;
-              that.idname = "building_site_content_id"
-              that.mapform = [building_site.longitude, building_site.latitude, building_site.address]
-              let discharge_files = [];
-              let build_files = [];
-              for (var mod of result.building_site_info.building_site_content_files) {
-                let m = Object.assign({}, mod);
-                m.url = mod.files.url;
-                m.id = mod.files.id;
-                m.photoType = "before";
-                discharge_files.push(m);
-                build_files.push({
-                  upload_id: mod.files.id
-                })
-              }
-              that.filesList = discharge_files;
-              that.formclue.area_id = result.area_id
-              that.formclue.content = result.building_site_info.content
-              that.formclue.files_list = build_files
-              that.formclue.date = result.created_at
-              that.formclue.address = building_site.address
-              that.formclue.latitude = building_site.latitude
-              that.formclue.longitude = building_site.longitude
-              break;
+      }
 
-          }
-          that.formdetail.id = result.id
-          that.formdetail.end_type = result.end_type
-
-        }).catch(error => {
-          //reject(error)
-        })
-      },
-
-      show(obj) {
-        this.dialogFormDetailVisible = true;
-        this.info(obj)
-      },
-      del(obj) {
-        var that = this;
-        if (obj) {
-          this.$Modal.confirm({
-            title: '确认要删除数据？',
-            onOk: () => {
-              del(obj.id).then(response => {
-                this.$Message.success('操作成功');
-                that.load();
-              }).catch(error => {
-                console.log(error)
-                reject(error)
-              })
-            },
-            onCancel: () => {
-              //this.$Message.info('Clicked cancel');
-            }
-          });
-        }
-      },
-
-      submitFormDetail(formName, status) {
-
-        var that = this;
-        that.formdetail.status = status
-        console.log(that.formdetail);
-
-        if (that.formdetail.end_type == 2 && that.formdetail.status == 2) {
-          storeclue(that.formclue).then(response => {
-            this.$Message.success('新增线索处办成功');
-          }).catch(error => {
-            //reject(error)
-          })
-        }
-        update(that.formdetail).then(response => {
-          this.$Message.success('操作成功');
-          that.load();
-          that.dialogFormDetailVisible = false;
-        }).catch(error => {
-          //reject(error)
-        })
-
-
-      },
-      resetFormDetail(formName) {
-        var that = this;
-        that.filesList = [];
-        that.dealFilesList = [];
-        that.form = {};
-        that.rainMaintainLogs = []
-        that.end_types = 0;
-        that.formdetail = {
-          status: 0,
-          end_type: 0,
-          content: ""
-        }
-        that.dialogFormDetailVisible = false;
-      },
-
-      handlePictureCardPreview(file) {
-        this.dialogImageUrl = file.url;
-        this.dialogVisible = true;
-      }
     }
   }
 </script>
@@ -957,24 +574,28 @@
     display: none;
   }
 
-  .vm10{
-    margin-right:10px;
-    margin-bottom:10px;
-    height: 32px;
-    vertical-align: bottom;
-  }
-  .vm10 input {
-    height: 32px;
-    vertical-align: middle;
-  }
-
-  .vm10 .el-select__caret.el-input__icon.el-icon-arrow-up {
-    line-height: 30px;
-  }
-  .vm10 .el-input__icon.el-range__icon.el-icon-date,.vm10 .el-range-separator{
-    line-height: 25px;
-  }
-  .selerchcontent button{
-    vertical-align: top;
+  .vm10 {
+    margin-right: 10px;
+    margin-bottom: 10px;
+    height: 32px;
+    vertical-align: bottom;
+  }
+
+  .vm10 input {
+    height: 32px;
+    vertical-align: middle;
+  }
+
+  .vm10 .el-select__caret.el-input__icon.el-icon-arrow-up {
+    line-height: 30px;
+  }
+
+  .vm10 .el-input__icon.el-range__icon.el-icon-date,
+  .vm10 .el-range-separator {
+    line-height: 25px;
+  }
+
+  .selerchcontent button {
+    vertical-align: top;
   }
 </style>
diff --git a/src/views/rain/maintain/maintain.vue b/src/views/rain/maintain/maintain.vue
index dde28a3..e950d95 100644
--- a/src/views/rain/maintain/maintain.vue
+++ b/src/views/rain/maintain/maintain.vue
@@ -6,41 +6,41 @@
           <div slot="content"></div>
           <slot>
             <div>
-              <Input class="vm10" style="width: 200px; margin-right: 10px" v-model="searchFields.keyword" placeholder="关键字搜索" />
-              <el-select class="vm10" v-model="searchFields.road_id" filterable remote
-                reserve-keyword clearable @focus="remoteRoad" placeholder="请输入关键词查找道路" :remote-method="remoteMethod"
-                :loading="roadloading">
-                <el-option v-for="item in roadsList" :key="item.id" :label="item.name" :value="item.id">
-                </el-option>
-              </el-select>
-              <el-select class="vm10" filterable v-model="searchFields.area_id" placeholder="请选择所属片区">
-                <el-option v-for="item in selects.areasList" :key="item.id" :label="item.name" :value="item.id">
-                </el-option>
-              </el-select>
-              <el-select class="vm10" filterable v-model="searchFields.status" placeholder="请选择状态">
-                <el-option v-for="item in selects.statusList" :key="item.id" :label="item.name" :value="item.id">
-                </el-option>
-              </el-select>
-              <el-select class="vm10" filterable v-model="searchFields.type" placeholder="请选择类型">
-                <el-option v-for="item in selects.typeList" :key="item.id" :label="item.name" :value="item.id">
-                </el-option>
-              </el-select>
-              <el-select class="vm10" filterable v-model="searchFields.end_type" placeholder="请选择结办类型">
-                <el-option v-for="item in selects.endTypeList" :key="item.id" :label="item.name" :value="item.id">
-                </el-option>
-              </el-select>
-
-              <el-select class="vm10" filterable v-model="searchFields.title_id" placeholder="请选择养护内容">
-                <el-option v-for="item in allmaintaninList" :key="item.id" :label="item.value" :value="item.id">
-                </el-option>
-              </el-select>
-
-              <el-date-picker class="vm10" v-model="datesearch" type="daterange" range-separator="至"
-                start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd">
+              <Input class="vm10" style="width: 200px; margin-right: 10px" v-model="searchFields.keyword"
+                placeholder="关键字搜索" />
+              <el-select class="vm10" v-model="searchFields.road_id" filterable remote reserve-keyword clearable
+                @focus="remoteRoad" placeholder="请输入关键词查找道路" :remote-method="remoteMethod" :loading="roadloading">
+                <el-option v-for="item in roadsList" :key="item.id" :label="item.name" :value="item.id">
+                </el-option>
+              </el-select>
+              <el-select class="vm10" filterable v-model="searchFields.area_id" placeholder="请选择所属片区">
+                <el-option v-for="item in selects.areasList" :key="item.id" :label="item.name" :value="item.id">
+                </el-option>
+              </el-select>
+              <el-select class="vm10" filterable v-model="searchFields.status" placeholder="请选择状态">
+                <el-option v-for="item in selects.statusList" :key="item.id" :label="item.name" :value="item.id">
+                </el-option>
+              </el-select>
+              <el-select class="vm10" filterable v-model="searchFields.type" placeholder="请选择类型">
+                <el-option v-for="item in selects.typeList" :key="item.id" :label="item.name" :value="item.id">
+                </el-option>
+              </el-select>
+              <el-select class="vm10" filterable v-model="searchFields.end_type" placeholder="请选择结办类型">
+                <el-option v-for="item in selects.endTypeList" :key="item.id" :label="item.name" :value="item.id">
+                </el-option>
+              </el-select>
+
+              <el-select class="vm10" filterable v-model="searchFields.title_id" placeholder="请选择养护内容">
+                <el-option v-for="item in allmaintaninList" :key="item.id" :label="item.value" :value="item.id">
+                </el-option>
+              </el-select>
+
+              <el-date-picker class="vm10" v-model="datesearch" type="daterange" range-separator="至"
+                start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd">
               </el-date-picker>
               <Button type="primary" @click="load(false)" style="margin-left: 10px">查询</Button>
               <Button type="primary" @click="edit()" style="margin-left: 10px">新增</Button>
-              <Button type="primary" @click="review()" style="margin-left: 10px">批量复核</Button>
+              <Button type="primary" @click="review()" style="margin-left: 10px">批量复核</Button>
               <Button type="primary" @click="exportExcel()" style="margin-left: 10px">导出</Button>
             </div>
           </slot>
@@ -77,8 +77,8 @@
                 <el-tag v-if="scope.row[column.field]==2">雨水管道疏通</el-tag>
                 <el-tag v-if="scope.row[column.field]==3">汛期助排</el-tag>
                 <el-tag v-if="scope.row[column.field]==4">污泥外运</el-tag>
-                <el-tag v-if="scope.row[column.field]==5">出水口排查</el-tag>
-                <el-tag v-if="scope.row[column.field]==6">专项处理</el-tag>
+                <el-tag v-if="scope.row[column.field]==5">出水口排查</el-tag>
+                <el-tag v-if="scope.row[column.field]==6">专项处理</el-tag>
                 <el-tag v-if="scope.row[column.field]==7">维修</el-tag>
               </div>
               <div v-else-if="column.type=='status'">
@@ -124,8 +124,8 @@
           <el-radio v-model="rainType" label="2">雨水管道疏通</el-radio>
           <el-radio v-model="rainType" label="3">汛期助排</el-radio>
           <el-radio v-model="rainType" label="4">污泥外运</el-radio>
-          <el-radio v-model="rainType" label="5">出水口排查</el-radio>
-          <el-radio v-model="rainType" label="6">专项处理</el-radio>
+          <el-radio v-model="rainType" label="5">出水口排查</el-radio>
+          <el-radio v-model="rainType" label="6">专项处理</el-radio>
           <el-radio v-model="rainType" label="7">维修</el-radio>
         </div>
 
@@ -140,8 +140,8 @@
         <div class="dialogConcent">
           <el-scrollbar style="flex: 1">
             <!-- 疏通疏挖 -->
-            <el-form v-if="rainType==1||rainType==2||rainType==5||rainType==6||rainType==7" :model="formdetail" :rules="{}" ref="formdetail"
-              label-position="right" :label-width="formLabelWidth">
+            <el-form v-if="rainType==1||rainType==2||rainType==5||rainType==6||rainType==7" :model="formdetail"
+              :rules="{}" ref="formdetail" label-position="right" :label-width="formLabelWidth">
               <el-row>
                 <el-col :span="24">
                   <el-form-item label="所属道路" prop="road_id">
@@ -149,7 +149,7 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="24">
-                  <el-form-item label="养护内容" prop="title_id">
+                  <el-form-item label="养护内容" prop="title_id">
                     {{form.title_detail}}
                     <!-- <div v-for="item in maintaninList">
                       <div v-if="item.id==form.title_id">
@@ -255,36 +255,36 @@
                   <el-form-item label="有无违法转办" prop="end_type">
                     <el-radio-group v-model="formdetail.end_type">
                       <el-radio :label="0">无</el-radio>
-                      <el-radio :label="1">有</el-radio>
+                      <el-radio :label="1">有</el-radio>
                       <el-radio :label="2">养护转办</el-radio>
                     </el-radio-group>
                   </el-form-item>
-                </el-col>
-                <el-col :span="24" v-if="nowstatus==1&&formdetail.end_type==2">
-                  <el-form-item label="养护转办类型" prop="end_type">
-                    <el-select class="width100" v-model="formdetail.type" placeholder="请选择养护转办类型">
-                      <el-option v-for="item in yhtypeList" :key="item.id" :label="item.name" :value="item.id">
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==2">
-                  <el-form-item label="要求完成时间" prop="end_time">
-                    <el-date-picker style="width:100%" v-model="formdetail.end_time" type="datetime" placeholder="选择时间"
-                      value-format="yyyy-MM-dd HH:mm:ss">
-                    </el-date-picker>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==2">
-                  <el-form-item label="备注" prop="remark">
-                    <el-input type="textarea" v-model="formdetail.remark" placeholder="请填写备注" autocomplete="off">
-                    </el-input>
-                  </el-form-item>
+                </el-col>
+                <el-col :span="24" v-if="nowstatus==1&&formdetail.end_type==2">
+                  <el-form-item label="养护转办类型" prop="end_type">
+                    <el-select class="width100" v-model="formdetail.type" placeholder="请选择养护转办类型">
+                      <el-option v-for="item in yhtypeList" :key="item.id" :label="item.name" :value="item.id">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==2">
+                  <el-form-item label="要求完成时间" prop="end_time">
+                    <el-date-picker style="width:100%" v-model="formdetail.end_time" type="datetime" placeholder="选择时间"
+                      value-format="yyyy-MM-dd HH:mm:ss">
+                    </el-date-picker>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==2">
+                  <el-form-item label="备注" prop="remark">
+                    <el-input type="textarea" v-model="formdetail.remark" placeholder="请填写备注" autocomplete="off">
+                    </el-input>
+                  </el-form-item>
                 </el-col>
                 <el-col :span="24" v-if="nowstatus==2||nowstatus==3||nowstatus==4||wf_type==1">
                   <el-form-item label="有无违法转办">
                     <el-tag v-if="end_types==0">无</el-tag>
-                    <el-tag type="success" v-if="end_types==1">有</el-tag>
+                    <el-tag type="success" v-if="end_types==1">有</el-tag>
                     <el-tag type="success" v-if="end_types==2">养护转办</el-tag>
                   </el-form-item>
                 </el-col>
@@ -403,36 +403,36 @@
                   <el-form-item label="有无违法转办" prop="end_type">
                     <el-radio-group v-model="formdetail.end_type">
                       <el-radio :label="0">无</el-radio>
-                      <el-radio :label="1">有</el-radio>
+                      <el-radio :label="1">有</el-radio>
                       <el-radio :label="2">养护转办</el-radio>
                     </el-radio-group>
                   </el-form-item>
-                </el-col>
-                <el-col :span="24" v-if="nowstatus==1&&formdetail.end_type==2">
-                  <el-form-item label="养护转办类型" prop="end_type">
-                    <el-select class="width100" v-model="formdetail.type" placeholder="请选择养护转办类型">
-                      <el-option v-for="item in yhtypeList" :key="item.id" :label="item.name" :value="item.id">
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==2">
-                  <el-form-item label="要求完成时间" prop="end_time">
-                    <el-date-picker style="width:100%" v-model="formdetail.end_time" type="datetime" placeholder="选择时间"
-                      value-format="yyyy-MM-dd HH:mm:ss">
-                    </el-date-picker>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==2">
-                  <el-form-item label="备注" prop="remark">
-                    <el-input type="textarea" v-model="formdetail.remark" placeholder="请填写备注" autocomplete="off">
-                    </el-input>
-                  </el-form-item>
+                </el-col>
+                <el-col :span="24" v-if="nowstatus==1&&formdetail.end_type==2">
+                  <el-form-item label="养护转办类型" prop="end_type">
+                    <el-select class="width100" v-model="formdetail.type" placeholder="请选择养护转办类型">
+                      <el-option v-for="item in yhtypeList" :key="item.id" :label="item.name" :value="item.id">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==2">
+                  <el-form-item label="要求完成时间" prop="end_time">
+                    <el-date-picker style="width:100%" v-model="formdetail.end_time" type="datetime" placeholder="选择时间"
+                      value-format="yyyy-MM-dd HH:mm:ss">
+                    </el-date-picker>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==2">
+                  <el-form-item label="备注" prop="remark">
+                    <el-input type="textarea" v-model="formdetail.remark" placeholder="请填写备注" autocomplete="off">
+                    </el-input>
+                  </el-form-item>
                 </el-col>
                 <el-col :span="24" v-if="nowstatus==2||nowstatus==3||nowstatus==4||wf_type==1">
                   <el-form-item label="有无违法转办">
                     <el-tag v-if="end_types==0">无</el-tag>
-                    <el-tag type="success" v-if="end_types==1">有</el-tag>
+                    <el-tag type="success" v-if="end_types==1">有</el-tag>
                     <el-tag type="success" v-if="end_types==2">养护转办</el-tag>
                   </el-form-item>
                 </el-col>
@@ -511,39 +511,39 @@
                   <el-form-item label="有无违法转办" prop="end_type">
                     <el-radio-group v-model="formdetail.end_type">
                       <el-radio :label="0">无</el-radio>
-                      <el-radio :label="1">有</el-radio>
+                      <el-radio :label="1">有</el-radio>
                       <el-radio :label="2">养护转办</el-radio>
                     </el-radio-group>
                   </el-form-item>
-                </el-col>
-                <el-col :span="24" v-if="nowstatus==1&&formdetail.end_type==2">
-                  <el-form-item label="养护转办类型" prop="end_type">
-                    <el-select class="width100" v-model="formdetail.type" placeholder="请选择养护转办类型">
-                      <el-option v-for="item in yhtypeList" :key="item.id" :label="item.name" :value="item.id">
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==2">
-                  <el-form-item label="要求完成时间" prop="end_time">
-                    <el-date-picker style="width:100%" v-model="formdetail.end_time" type="datetime" placeholder="选择时间"
-                      value-format="yyyy-MM-dd HH:mm:ss">
-                    </el-date-picker>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==0">
-                  <el-form-item label="备注" prop="remark">
-                    <el-input type="textarea" v-model="formdetail.remark" placeholder="请填写备注" autocomplete="off">
-                    </el-input>
-                  </el-form-item>
+                </el-col>
+                <el-col :span="24" v-if="nowstatus==1&&formdetail.end_type==2">
+                  <el-form-item label="养护转办类型" prop="end_type">
+                    <el-select class="width100" v-model="formdetail.type" placeholder="请选择养护转办类型">
+                      <el-option v-for="item in yhtypeList" :key="item.id" :label="item.name" :value="item.id">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==2">
+                  <el-form-item label="要求完成时间" prop="end_time">
+                    <el-date-picker style="width:100%" v-model="formdetail.end_time" type="datetime" placeholder="选择时间"
+                      value-format="yyyy-MM-dd HH:mm:ss">
+                    </el-date-picker>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==0">
+                  <el-form-item label="备注" prop="remark">
+                    <el-input type="textarea" v-model="formdetail.remark" placeholder="请填写备注" autocomplete="off">
+                    </el-input>
+                  </el-form-item>
                 </el-col>
                 <el-col :span="24" v-if="nowstatus==2||nowstatus==3||nowstatus==4||wf_type==1">
                   <el-form-item label="有无违法转办">
                     <el-tag v-if="end_types==0">无</el-tag>
                     <el-tag type="success" v-if="end_types==1">有</el-tag>
                   </el-form-item>
-                </el-col>
-
+                </el-col>
+
 
                 <el-col :span="24" v-if="nowstatus==2||nowstatus==3||nowstatus==4||wf_type==1">
                   <el-form-item label="处理日志" prop="">
@@ -596,14 +596,14 @@
         <div class="dialogConcent">
           <el-scrollbar style="flex: 1">
             <!-- 疏通疏挖 -->
-            <el-form v-if="rainType==1||rainType==2||rainType==5||rainType==6||rainType==7" :model="form" :rules="rules" ref="form"
-              label-position="right" :label-width="formLabelWidth">
+            <el-form v-if="rainType==1||rainType==2||rainType==5||rainType==6||rainType==7" :model="form" :rules="rules"
+              ref="form" label-position="right" :label-width="formLabelWidth">
               <el-row>
                 <el-col :span="12">
                   <el-form-item label="所属道路" prop="road_id">
                     <el-select class="width100" v-model="roadName" filterable remote @change="chooseRoad"
-                      :disabled="roaddisabled" clearable @focus="remoteRoad" reserve-keyword placeholder="请输入关键词查找道路信息" :remote-method="remoteMethod"
-                      :loading="roadloading">
+                      :disabled="roaddisabled" clearable @focus="remoteRoad" reserve-keyword placeholder="请输入关键词查找道路信息"
+                      :remote-method="remoteMethod" :loading="roadloading">
                       <el-option v-for="item in roadsList" :key="item.id" :label="item.name" :value="item.id">
                       </el-option>
                     </el-select>
@@ -736,8 +736,8 @@
                 <el-col :span="12">
                   <el-form-item label="所属道路" prop="road_id">
                     <el-select class="width100" v-model="roadName" filterable remote @change="chooseRoad"
-                      :disabled="roaddisabled" reserve-keyword clearable @focus="remoteRoad" placeholder="请输入关键词查找道路信息" :remote-method="remoteMethod"
-                      :loading="roadloading">
+                      :disabled="roaddisabled" reserve-keyword clearable @focus="remoteRoad" placeholder="请输入关键词查找道路信息"
+                      :remote-method="remoteMethod" :loading="roadloading">
                       <el-option v-for="item in roadsList" :key="item.id" :label="item.name" :value="item.id">
                       </el-option>
                     </el-select>
@@ -840,8 +840,8 @@
                 <el-col :span="12">
                   <el-form-item label="所属道路" prop="road_id">
                     <el-select class="width100" v-model="roadName" filterable remote @change="chooseRoad"
-                      :disabled="roaddisabled" clearable @focus="remoteRoad" reserve-keyword placeholder="请输入关键词查找道路信息" :remote-method="remoteMethod"
-                      :loading="roadloading">
+                      :disabled="roaddisabled" clearable @focus="remoteRoad" reserve-keyword placeholder="请输入关键词查找道路信息"
+                      :remote-method="remoteMethod" :loading="roadloading">
                       <el-option v-for="item in roadsList" :key="item.id" :label="item.name" :value="item.id">
                       </el-option>
                     </el-select>
@@ -968,8 +968,10 @@
     getparameteritem
   } from '../../../api/system/dictionary.js'
   import LxHeader from "@/components/LxHeader/index.vue";
-  import AvueMap from 'avue-plugin-map'
-  import { ElMapExportTable } from "table-excel";
+  import AvueMap from 'avue-plugin-map'
+  import {
+    ElMapExportTable
+  } from "table-excel";
 
   export default {
     components: {
@@ -1006,89 +1008,89 @@
           zoom: 11,
         },
         mapform: [],
-        tableHeight: 0,
-        datesearch:"",
-        baseurl:"",
-        searchFields: {
-          is_export:0
-        },
-        yhtypeList: [{
-          id: 1,
-          name: "雨水管道疏挖"
-        }, {
-          id: 2,
-          name: "雨水管道疏通"
-        },{
-          id: 3,
-          name: "汛期助排"
-        },{
-          id: 4,
-          name: "污泥外运"
-        },{
-          id: 5,
-          name: "出水口排查"
-        },{
-          id: 6,
-          name: "专项处理"
-        },{
-          id: 7,
-          name: "维修"
+        tableHeight: 0,
+        datesearch: "",
+        baseurl: "",
+        searchFields: {
+          is_export: 0
+        },
+        yhtypeList: [{
+          id: 1,
+          name: "雨水管道疏挖"
+        }, {
+          id: 2,
+          name: "雨水管道疏通"
+        }, {
+          id: 3,
+          name: "汛期助排"
+        }, {
+          id: 4,
+          name: "污泥外运"
+        }, {
+          id: 5,
+          name: "出水口排查"
+        }, {
+          id: 6,
+          name: "专项处理"
+        }, {
+          id: 7,
+          name: "维修"
         }],
         selects: {
-          areasList: [{
-            id: "",
-            name: "所有"
-          }],
-          typeList: [{
-            id: "",
-            name: "所有"
-          }, {
-            id: 1,
-            name: "雨水管道疏挖"
-          }, {
-            id: 2,
-            name: "雨水管道疏通"
-          },{
-            id: 3,
-            name: "汛期助排"
-          },{
-            id: 4,
-            name: "污泥外运"
-          },{
-            id: 5,
-            name: "出水口排查"
-          },{
-            id: 6,
-            name: "专项处理"
-          },{
-            id: 7,
-            name: "维修"
-          }],
-          statusList: [{
-            id: "",
-            name: "所有"
-          }, {
-            id: 0,
-            name: "未审核"
-          }, {
-            id: 1,
-            name: "已审核"
-          }, {
-            id: 2,
-            name: "已办结"
-          }, {
-            id: 3,
-            name: "已退回"
-          }],
-          endTypeList: [{
-            id: 0,
-            name: "所有"
-          }, {
-            id: 1,
-            name: "养护转办"
-          }, {
-            id: 2,
-            name: "违法转办"
+          areasList: [{
+            id: "",
+            name: "所有"
+          }],
+          typeList: [{
+            id: "",
+            name: "所有"
+          }, {
+            id: 1,
+            name: "雨水管道疏挖"
+          }, {
+            id: 2,
+            name: "雨水管道疏通"
+          }, {
+            id: 3,
+            name: "汛期助排"
+          }, {
+            id: 4,
+            name: "污泥外运"
+          }, {
+            id: 5,
+            name: "出水口排查"
+          }, {
+            id: 6,
+            name: "专项处理"
+          }, {
+            id: 7,
+            name: "维修"
+          }],
+          statusList: [{
+            id: "",
+            name: "所有"
+          }, {
+            id: 0,
+            name: "未审核"
+          }, {
+            id: 1,
+            name: "已审核"
+          }, {
+            id: 2,
+            name: "已办结"
+          }, {
+            id: 3,
+            name: "已退回"
+          }],
+          endTypeList: [{
+            id: 0,
+            name: "所有"
+          }, {
+            id: 1,
+            name: "养护转办"
+          }, {
+            id: 2,
+            name: "违法转办"
           }]
         },
         paginations: {
@@ -1124,10 +1126,10 @@
           date: "",
           address: "",
           road_id: ""
-        },
-        allmaintaninList:[{
-          id:"",
-          value:"所有"
+        },
+        allmaintaninList: [{
+          id: "",
+          value: "所有"
         }],
         roadsList: [],
         roadName: "",
@@ -1136,23 +1138,23 @@
         formdetail: {
           status: 0,
           end_type: 0,
-          content: "",
-          end_time:"",
-          remark:"",
-          type:0
+          content: "",
+          end_time: "",
+          remark: "",
+          type: 0
         },
         wf_type: 0,
-titleArr:[],
-        rules: {
-          // scope: [{
-          //   required: true,
-          //   message: '请填写覆盖范围',
-          //   trigger: 'blur',
-          // }],
-          // point_name: [{
-          //   required: true,
-          //   message: '请填写点位名称',
-          //   trigger: 'blur',
+        titleArr: [],
+        rules: {
+          // scope: [{
+          //   required: true,
+          //   message: '请填写覆盖范围',
+          //   trigger: 'blur',
+          // }],
+          // point_name: [{
+          //   required: true,
+          //   message: '请填写点位名称',
+          //   trigger: 'blur',
           // }],
           // content: [{
           //   required: true,
@@ -1251,31 +1253,31 @@ titleArr:[],
       },
       rainType() {
         this.roadsList = []
-      },
-      datesearch(newVal, oldVal) {
-        console.log(newVal)
-        if (newVal) {
-          this.searchFields.start_date = newVal[0]
-          this.searchFields.end_date = newVal[1]
-        } else {
-          this.searchFields.start_date = ""
-          this.searchFields.end_date = ""
-        }
-
-      },
-      'searchFields.type':function(val){
-        if(val==1||val==2||val==5||val==6||val==7){
-          getparameteritem('maintainContent_'+val).then(res => {
-            for(var m of res.detail){
-              this.allmaintaninList.push(m)
-            }
-          })
-        }else{
-          this.allmaintaninList=[{
-            id:"",
-            value:"所有"
-          }]
-        }
+      },
+      datesearch(newVal, oldVal) {
+        console.log(newVal)
+        if (newVal) {
+          this.searchFields.start_date = newVal[0]
+          this.searchFields.end_date = newVal[1]
+        } else {
+          this.searchFields.start_date = ""
+          this.searchFields.end_date = ""
+        }
+
+      },
+      'searchFields.type': function(val) {
+        if (val == 1 || val == 2 || val == 5 || val == 6 || val == 7) {
+          getparameteritem('maintainContent_' + val).then(res => {
+            for (var m of res.detail) {
+              this.allmaintaninList.push(m)
+            }
+          })
+        } else {
+          this.allmaintaninList = [{
+            id: "",
+            value: "所有"
+          }]
+        }
       }
     },
     methods: {
@@ -1288,11 +1290,11 @@ titleArr:[],
           return "未知";
         }
 
-      },
-      exportExcel(){
-        var that = this
-        that.searchFields.is_export = 1
-        that.load(true)
+      },
+      exportExcel() {
+        var that = this
+        that.searchFields.is_export = 1
+        that.load(true)
       },
       handleSelectionChange(val) {
         console.log(val)
@@ -1334,9 +1336,9 @@ titleArr:[],
       },
       chooseRoad(val) {
         this.form.road_id = val
-      },
-      remoteRoad() {
-        this.roadsList = []
+      },
+      remoteRoad() {
+        this.roadsList = []
       },
       remoteMethod(query) {
         if (query != '') {
@@ -1385,18 +1387,18 @@ titleArr:[],
           page: this.paginations.page,
           page_size: this.paginations.page_size,
           ...this.searchFields
-        }).then(response => {
-          let tokens = getToken();
-          if (is_export) {
-            var url = "/api/admin/rain-maintains/index?token=" + tokens
-            for (var m in this.searchFields) {
-              url += "&" + m + "=" + this.searchFields[m]
-            }
-            url = this.baseurl + url
-            console.log(url)
-            window.open("http://" + url, '_blank')
-            this.searchFields.is_export = 0
-            return;
+        }).then(response => {
+          let tokens = getToken();
+          if (is_export) {
+            var url = "/api/admin/rain-maintains/index?token=" + tokens
+            for (var m in this.searchFields) {
+              url += "&" + m + "=" + this.searchFields[m]
+            }
+            url = this.baseurl + url
+            console.log(url)
+            window.open("http://" + url, '_blank')
+            this.searchFields.is_export = 0
+            return;
           }
           this.tableData = response.data;
           this.paginations.total = response.total;
@@ -1413,7 +1415,7 @@ titleArr:[],
           that.rainType = result.type;
           that.nowstatus = result.status;
           that.formdetail.id = result.id
-          that.formdetail.end_type = result.end_type
+          that.formdetail.end_type = result.end_type
           // that.formdetail.type = parseInt(result.type)
           that.wf_type = result.end_type
           if (result.rain_maintain_logs) {
@@ -1433,17 +1435,17 @@ titleArr:[],
             that.rainTitle = "污泥外运"
           } else if (that.rainType == 5) {
             that.rainTitle = "出水口排查"
-          }else if (that.rainType == 6) {
+          } else if (that.rainType == 6) {
             that.rainTitle = "专项处理"
-          }else if (that.rainType == 7) {
+          } else if (that.rainType == 7) {
             that.rainTitle = "维修"
           } else {
             that.rainTitle = "雨管养护"
           }
           switch (result.old_type) {
             case 1:
-            case 2:
-            case 6:
+            case 2:
+            case 6:
             case 7:
               that.form = result.circulation_info;
               that.form.circulation_id = result.circulation_id;
@@ -1452,10 +1454,10 @@ titleArr:[],
               that.idname = "circulation_id"
               that.mapform = [result.circulation_info.longitude, result.circulation_info.latitude, result
                 .circulation_info.address
-              ]
-              let cir_arrs = result.circulation_info.title_id ? result.circulation_info.title_id.split(","):[]
-              for(var m of cir_arrs){
-                that.titleArr.push(parseInt(m))
+              ]
+              let cir_arrs = result.circulation_info.title_id ? result.circulation_info.title_id.split(",") : []
+              for (var m of cir_arrs) {
+                that.titleArr.push(parseInt(m))
               }
               let _files = [];
               for (var mod of result.circulation_info.circulation_files) {
@@ -1531,10 +1533,10 @@ titleArr:[],
               that.roadName = result.out_water_info.road ? result.out_water_info.road.name : ""
               that.mapform = [result.out_water_info.longitude, result.out_water_info.latitude, result.out_water_info
                 .address
-              ]
-              let water_arrs = result.circulation_info.title_id ? result.circulation_info.title_id.split(","):[]
-              for(var m of water_arrs){
-                that.titleArr.push(parseInt(m))
+              ]
+              let water_arrs = result.circulation_info.title_id ? result.circulation_info.title_id.split(",") : []
+              for (var m of water_arrs) {
+                that.titleArr.push(parseInt(m))
               }
               let water_files = [];
               for (var mod of result.out_water_info.out_water_files) {
@@ -1573,9 +1575,9 @@ titleArr:[],
         this.form = this.$options.data().form
         that.filesList = [];
         that.dealFilesList = [];
-        that.mapform = ['', '', ''];
-        that.roadName = ""
-        that.titleArr = []
+        that.mapform = ['', '', ''];
+        that.roadName = ""
+        that.titleArr = []
         that.roaddisabled = false
         if (obj) {
           that.info(obj);
@@ -1606,16 +1608,16 @@ titleArr:[],
           });
         }
       },
-      returnTitleId(arr){
-        if(arr.length==0){
-          return
-        }
-        let getArr = ""
-        for(var m of arr){
-          getArr+= m+","
-        }
-        getArr = getArr.substring(0,getArr.length-1)
-        return getArr
+      returnTitleId(arr) {
+        if (arr.length == 0) {
+          return
+        }
+        let getArr = ""
+        for (var m of arr) {
+          getArr += m + ","
+        }
+        getArr = getArr.substring(0, getArr.length - 1)
+        return getArr
       },
       submitForm(formName) {
         var that = this;
@@ -1642,9 +1644,9 @@ titleArr:[],
             listUrlafter.push({
               "upload_id": m.upload_id
             });
-        }
+        }
 
-        this.form.files_deal_list = listUrlafter
+        this.form.files_deal_list = listUrlafter
         that.form.title_id = this.returnTitleId(that.titleArr)
         this.$refs[formName].validate((valid) => {
           if (valid) {
@@ -1659,7 +1661,7 @@ titleArr:[],
       submitFormDetail(formName, status) {
 
         var that = this;
-        that.formdetail.status = status
+        that.formdetail.status = status
         console.log(that.formdetail)
         // return
 
@@ -1689,8 +1691,8 @@ titleArr:[],
         that.mapform = ['', '', ''];
         that.form = {};
         that.rainMaintainLogs = []
-        that.end_types = 0;
-        that.formdetail.type=""
+        that.end_types = 0;
+        that.formdetail.type = ""
         this.$refs[formName].resetFields();
         that.dialogFormVisible = false;
         that.dialogFormDetailVisible = false;
@@ -1740,32 +1742,33 @@ titleArr:[],
       submitRainType() {
         var that = this
         this.rainTypeVisible = false
-        if (that.rainType == 1||that.rainType == 2||that.rainType == 5||that.rainType == 6||that.rainType == 7) {
-          if (that.rainType == 1) {
-            that.rainTitle = "雨水管道疏挖"
-          } else if (that.rainType == 2) {
-            that.rainTitle = "雨水管道疏通"
-          } else if (that.rainType == 5) {
-            that.rainTitle = "出水口排查"
-          }else if (that.rainType == 6) {
-            that.rainTitle = "专项处理"
-          }else if (that.rainType == 7) {
-            that.rainTitle = "维修"
-          } else {
-            that.rainTitle = "雨管养护"
-          }
-          getparameteritem('maintainContent_'+that.rainType).then(res => {
-            that.maintaninList = res.detail
+        if (that.rainType == 1 || that.rainType == 2 || that.rainType == 5 || that.rainType == 6 || that.rainType ==
+          7) {
+          if (that.rainType == 1) {
+            that.rainTitle = "雨水管道疏挖"
+          } else if (that.rainType == 2) {
+            that.rainTitle = "雨水管道疏通"
+          } else if (that.rainType == 5) {
+            that.rainTitle = "出水口排查"
+          } else if (that.rainType == 6) {
+            that.rainTitle = "专项处理"
+          } else if (that.rainType == 7) {
+            that.rainTitle = "维修"
+          } else {
+            that.rainTitle = "雨管养护"
+          }
+          getparameteritem('maintainContent_' + that.rainType).then(res => {
+            that.maintaninList = res.detail
           })
-        }  else if (that.rainType == 3) {
-          that.rainTitle = "汛期助排"
+        } else if (that.rainType == 3) {
+          that.rainTitle = "汛期助排"
           that.maintaninList = []
         } else if (that.rainType == 4) {
-          that.rainTitle = "污泥外运"
+          that.rainTitle = "污泥外运"
           that.maintaninList = []
-        }else {
+        } else {
           that.rainTitle = "雨水管道疏挖"
-        }
+        }
 
         this.dialogFormVisible = true;
       },
@@ -1779,8 +1782,8 @@ titleArr:[],
         console.log(that.form.type)
         switch (parseInt(type)) {
           case 1:
-          case 2:
-          case 6:
+          case 2:
+          case 6:
           case 7:
             if (id) {
               savecirculation(that.form).then(response => {
@@ -1883,12 +1886,14 @@ titleArr:[],
   .files_check .el-upload.el-upload--picture-card {
     display: none;
   }
-  .vm10{
-    margin-right:10px;
-    margin-bottom:10px;
-    height: 32px;
-    vertical-align: bottom;
+
+  .vm10 {
+    margin-right: 10px;
+    margin-bottom: 10px;
+    height: 32px;
+    vertical-align: bottom;
   }
+
   .vm10 input {
     height: 32px;
     vertical-align: middle;
@@ -1896,11 +1901,14 @@ titleArr:[],
 
   .vm10 .el-select__caret.el-input__icon.el-icon-arrow-up {
     line-height: 30px;
-  }
-  .vm10 .el-input__icon.el-range__icon.el-icon-date,.vm10 .el-range-separator{
-    line-height: 25px;
-  }
-  .selerchcontent button{
-    vertical-align: top;
+  }
+
+  .vm10 .el-input__icon.el-range__icon.el-icon-date,
+  .vm10 .el-range-separator {
+    line-height: 25px;
+  }
+
+  .selerchcontent button {
+    vertical-align: top;
   }
 </style>