From eb2b7498357eff8c0065df13c3c1437f90403834 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Fri, 24 Jun 2022 10:25:45 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9B=A8=E9=A6=86=E5=85=BB=E6=8A=A4=EF=BC=8C?=
 =?UTF-8?q?=E9=80=9A=E7=94=A8=E5=B7=A1=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/basic/group.js              |   41 +
 src/api/maintainmanagement/index.js |   12 +-
 src/api/rain/inspection.js          |   76 ++
 src/api/rain/maintain.js            |   82 ++
 src/main.js                         |   23 +-
 src/views/assess/wade.vue           |    9 +-
 src/views/basic/account.vue         |   29 +-
 src/views/basic/area.vue            |    9 +-
 src/views/basic/group.vue           |  300 +++++++
 src/views/basic/site.vue            |   32 +-
 src/views/basic/unit.vue            |    2 +-
 src/views/common/index.vue          |   41 +-
 src/views/maintain/plan.vue         |    2 +-
 src/views/rain/inspection.vue       |    9 +
 src/views/rain/maintain.vue         | 1260 +++++++++++++++++++++++++++
 15 files changed, 1881 insertions(+), 46 deletions(-)
 create mode 100644 src/api/basic/group.js
 create mode 100644 src/api/rain/inspection.js
 create mode 100644 src/api/rain/maintain.js
 create mode 100644 src/views/basic/group.vue
 create mode 100644 src/views/rain/inspection.vue
 create mode 100644 src/views/rain/maintain.vue

diff --git a/src/api/basic/group.js b/src/api/basic/group.js
new file mode 100644
index 0000000..2b90058
--- /dev/null
+++ b/src/api/basic/group.js
@@ -0,0 +1,41 @@
+import request from '@/utils/request'
+
+export function listgroup(data) {
+  return request({
+    url: '/api/admin/group/index',
+    method: 'get',
+    data
+  })
+}
+
+export function get(id) {
+  return request({
+    url: '/api/admin/group/show',
+    method: 'post',
+    params: { id }
+  })
+}
+
+export function save(data) {
+  return request({
+    url: '/api/admin/group/save',
+    method: 'post',
+    data
+  })
+}
+
+export function store(data) {
+  return request({
+    url: '/api/admin/group/store',
+    method: 'post',
+    data
+  })
+}
+
+export function del(id) {
+  return request({
+    url: '/api/admin/group/destroy',
+    method: 'get',
+    params:{ id }
+  })
+}
diff --git a/src/api/maintainmanagement/index.js b/src/api/maintainmanagement/index.js
index ea534c2..88d6628 100644
--- a/src/api/maintainmanagement/index.js
+++ b/src/api/maintainmanagement/index.js
@@ -1,8 +1,8 @@
 import request from '@/utils/request'
 
-export function listcommon(data) {
+export function listplan(data) {
   return request({
-    url: '/api/admin/common-inspection/index',
+    url: '/api/admin/plan/index',
     method: 'get',
     data
   })
@@ -10,7 +10,7 @@ export function listcommon(data) {
 
 export function get(id) {
   return request({
-    url: '/api/admin/common-inspection/show',
+    url: '/api/admin/plan/show',
     method: 'post',
     params: { id }
   })
@@ -18,7 +18,7 @@ export function get(id) {
 
 export function save(data) {
   return request({
-    url: '/api/admin/common-inspection/save',
+    url: '/api/admin/plan/save',
     method: 'post',
     data
   })
@@ -26,7 +26,7 @@ export function save(data) {
 
 export function update(data) {
   return request({
-    url: '/api/admin/common-inspection/update-status',
+    url: '/api/admin/plan/update-status',
     method: 'post',
     data
   })
@@ -34,7 +34,7 @@ export function update(data) {
 
 export function del(id) {
   return request({
-    url: '/api/admin/common-inspection/destroy',
+    url: '/api/admin/plan/destroy',
     method: 'get',
     params:{ id }
   })
diff --git a/src/api/rain/inspection.js b/src/api/rain/inspection.js
new file mode 100644
index 0000000..3d0b17e
--- /dev/null
+++ b/src/api/rain/inspection.js
@@ -0,0 +1,76 @@
+import request from '@/utils/request'
+
+export function listall(data) {
+  return request({
+    url: '/api/admin/rain-inspection/index',
+    method: 'get',
+    data
+  })
+}
+
+export function get(id) {
+  return request({
+    url: '/api/admin/rain-inspection/show',
+    method: 'get',
+    params: { id }
+  })
+}
+
+export function del(id) {
+  return request({
+    url: '/api/admin/rain-inspection/destroy',
+    method: 'get',
+    params:{ id }
+  })
+}
+
+export function update(data) {
+  return request({
+    url: '/api/admin/rain-inspection/audit',
+    method: 'get',
+    params:data
+
+  })
+}
+
+export function getbuilding(data) {
+  return request({
+    url: '/api/admin/rain-inspection/all-building-site',
+    method: 'get',
+    data
+  })
+}
+
+export function storeequipment(data) {
+  return request({
+    url: '/api/admin/rain-inspection/rain-equipment-store',
+    method: 'post',
+    data
+  })
+}
+
+export function saveequipment(data) {
+  return request({
+    url: '/api/admin/rain-inspection/rain-equipment-save',
+    method: 'post',
+    data
+  })
+}
+
+export function storebuilding(data) {
+  return request({
+    url: '/api/admin/rain-inspection/building-site-content-store',
+    method: 'post',
+    data
+  })
+}
+
+export function savebuilding(data) {
+  return request({
+    url: '/api/admin/rain-inspection/building-site-content-save',
+    method: 'post',
+    data
+  })
+}
+
+
diff --git a/src/api/rain/maintain.js b/src/api/rain/maintain.js
new file mode 100644
index 0000000..e838462
--- /dev/null
+++ b/src/api/rain/maintain.js
@@ -0,0 +1,82 @@
+import request from '@/utils/request'
+
+export function listall(data) {
+  return request({
+    url: '/api/admin/rain-maintains/index',
+    method: 'get',
+    data
+  })
+}
+
+export function get(id) {
+  return request({
+    url: '/api/admin/rain-maintains/show',
+    method: 'get',
+    params: { id }
+  })
+}
+
+export function del(id) {
+  return request({
+    url: '/api/admin/rain-maintains/destroy',
+    method: 'get',
+    params:{ id }
+  })
+}
+
+export function update(data) {
+  return request({
+    url: '/api/admin/rain-maintains/audit',
+    method: 'get',
+    params:data
+    
+  })
+}
+
+export function storecirculation(data) {
+  return request({
+    url: '/api/admin/rain-maintains/circulation-store',
+    method: 'post',
+    data
+  })
+}
+
+export function savecirculation(data) {
+  return request({
+    url: '/api/admin/rain-maintains/circulation-save',
+    method: 'post',
+    data
+  })
+}
+
+export function storedischarge(data) {
+  return request({
+    url: '/api/admin/rain-maintains/help-discharge-store',
+    method: 'post',
+    data
+  })
+}
+
+export function savedischarge(data) {
+  return request({
+    url: '/api/admin/rain-maintains/help-discharge-save',
+    method: 'post',
+    data
+  })
+}
+
+export function storemire(data) {
+  return request({
+    url: '/api/admin/rain-maintains/mire-store',
+    method: 'post',
+    data
+  })
+}
+
+export function savemire(data) {
+  return request({
+    url: '/api/admin/rain-maintains/mire-save',
+    method: 'post',
+    data
+  })
+}
diff --git a/src/main.js b/src/main.js
index 25112dc..f6ff37a 100644
--- a/src/main.js
+++ b/src/main.js
@@ -30,11 +30,28 @@ Vue.use(ViewUI);
 //}
 // set ElementUI lang to EN
 //Vue.use(ElementUI, { locale })
-// 如果想要中文版 element-ui，按如下方式声明
+// 如果想要中文版 element-ui，按如下方式声明
+const preventReClick = Vue.directive('preventReClick', {
+  inserted: function (el, binding) {
+    el.addEventListener('click', () => {
+      if (!el.disabled) {
+        el.disabled = true;
+        setTimeout(() => {
+          el.disabled = false;
+        }, binding.value || 300);
+      }
+    });
+  }
+});
+
+
 Vue.use(ElementUI)
+Vue.use(preventReClick)
 
-  import Avue from '@smallwei/avue';
-  import '@smallwei/avue/lib/index.css';
+import Avue from '@smallwei/avue';
+import '@smallwei/avue/lib/index.css';
+
+
 Vue.use(Avue);
 Vue.config.productionTip = false
 
diff --git a/src/views/assess/wade.vue b/src/views/assess/wade.vue
index 7ce2a68..d435915 100644
--- a/src/views/assess/wade.vue
+++ b/src/views/assess/wade.vue
@@ -275,14 +275,15 @@ import AvueMap from 'avue-plugin-map'
           let result = Object.assign(that.form, res);
           // this.$set(that.form,res);
           that.form = result;
+          that.mapform = [result.longitude,result.latitude,result.address]
          let _files = [];
-         for (var mod of result.files) {
+         for (var mod of result.water_item_files) {
            let m = Object.assign({}, mod);
-           m.name = mod.original_name;
-           m.url = mod.url
+           m.name = mod.files.original_name;
+           m.url = mod.files.url
            _files.push(m);
          }
-         that.fileList = _files;
+         that.filesList = _files;
 
 
         }).catch(error => {
diff --git a/src/views/basic/account.vue b/src/views/basic/account.vue
index f74af24..de6e87b 100644
--- a/src/views/basic/account.vue
+++ b/src/views/basic/account.vue
@@ -83,7 +83,14 @@
                 </el-col>
                 <el-col :span="24">
                   <el-form-item label="巡查养护组" prop="group_id">
-                    <el-input v-model="form.group_id" placeholder="请填写巡查养护组" autocomplete="off"></el-input>
+                    <el-select style="width:100%" v-model="form.group_id" placeholder="请选择巡查养护组">
+                        <el-option
+                          v-for="item in groupList"
+                          :key="item.id"
+                          :label="item.name"
+                          :value="item.id">
+                        </el-option>
+                      </el-select>
                   </el-form-item>
                 </el-col>
 
@@ -116,7 +123,10 @@
   } from '../../api/basic/area.js'
   import {
     listmaintain
-  } from '../../api/basic/unit.js'
+  } from '../../api/basic/unit.js'
+  import {
+    listgroup
+  } from '../../api/basic/group.js'
   import LxHeader from "@/components/LxHeader/index.vue";
 
   export default {
@@ -131,6 +141,7 @@
         tableData: [],
         areaList:[],
         maintainList:[],
+        groupList:[],
         tableHeight: 0,
         searchFields: {
           KeyWord: ""
@@ -199,13 +210,13 @@
             align: "center"
           },
           {
-            field: "person",
+            field: "admin_id",
             title: "提交人",
             type: "string",
             align: "center"
           },
           {
-            field: "date",
+            field: "created_at",
             title: "提交日期",
             type: "string",
             align: "center"
@@ -271,6 +282,16 @@
           reject(error)
         });
 
+        listgroup({
+          page: 1,
+          page_size: 999,
+        }).then(response => {
+          this.groupList = response.data;
+        }).catch(error => {
+          console.log(error)
+          reject(error)
+        });
+
 
 
       },
diff --git a/src/views/basic/area.vue b/src/views/basic/area.vue
index 5fe903b..0444697 100644
--- a/src/views/basic/area.vue
+++ b/src/views/basic/area.vue
@@ -158,13 +158,13 @@
             align: "center"
           },
           {
-            field: "person",
+            field: "admin_id",
             title: "提交人",
             type: "string",
             align: "center"
           },
           {
-            field: "date",
+            field: "created_at",
             title: "提交日期",
             type: "string",
             align: "center"
@@ -211,11 +211,6 @@
         });
 
       },
-      show(obj) {
-        // this.clientHeight = document.documentElement.clientHeight - 84 - 110;
-        this.dialogViewVisible = false;
-        this.info(obj);
-      },
       info(obj) {
         var that = this;
         get(obj.id).then(res => {
diff --git a/src/views/basic/group.vue b/src/views/basic/group.vue
new file mode 100644
index 0000000..f3d8ad6
--- /dev/null
+++ b/src/views/basic/group.vue
@@ -0,0 +1,300 @@
+<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 style="width: 200px; margin-right: 10px" v-model="searchFields.KeyWord" placeholder="关键字搜索" />
+              <Button type="primary" @click="load" style="margin-left: 10px">查询</Button>
+              <Button type="primary" @click="edit()" style="margin-left: 10px">新增</Button>
+            </div>
+          </slot>
+        </LxHeader>
+      </div>
+      <div ref="lxTable">
+        <el-table :data="tableData" :height="tableHeight" style="width: 100%">
+          <el-table-column type="index" width="50" 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">
+              <template slot-scope="scope">
+                <div v-if="column.type=='opt'">
+                  <Button ghost size="small" @click="edit(scope.row)" 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>{{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 title="巡查养护组编辑" :visible.sync="dialogFormVisible" width="40%">
+        <div class="dialogConcent">
+          <el-scrollbar style="flex: 1">
+
+            <el-form :model="form" :rules="rules" ref="form" label-position="right" :label-width="formLabelWidth">
+              <el-row>
+                <el-col :span="24">
+                  <el-form-item label="名称" prop="name">
+                    <el-input v-model="form.name" placeholder="请填写名称" autocomplete="off"></el-input>
+                  </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-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>
+
+    </div>
+  </div>
+</template>
+
+<script>
+  import {
+    listgroup,
+    get,
+    store,
+    save,
+    del
+  } from '../../api/basic/group.js'
+  import LxHeader from "@/components/LxHeader/index.vue";
+
+  export default {
+    components: {
+      LxHeader
+    },
+    data() {
+      return {
+        tableHeight: 0,
+        dialogFormVisible: false,
+        formLabelWidth: "120px",
+        tableData: [],
+        tableHeight: 0,
+        searchFields: {
+          KeyWord: ""
+        },
+        paginations: {
+          page: 1,
+          page_size: 15,
+          total: 0
+        },
+        form: {
+          name:"",
+          link_name:"",
+          link_mobile:"",
+          remark:"",
+          department_id:1,
+          admin_id:1
+        },
+
+        rules: {
+          name:[{
+            required: true,
+            message: '请填写片区名称',
+            trigger: 'blur',
+          }],
+          link_name:[{
+            required: true,
+            message: '请填写联系人',
+            trigger: 'blur',
+          }],
+          link_mobile:[{
+            required: true,
+            message: '请填写联系号码',
+            trigger: 'blur',
+          },{ pattern: /^1[3456789]\d{9}$/,
+              message: '手机号码格式不正确',
+              trigger: 'blur' ,
+          }],
+
+
+        },
+
+        columns: [{
+            field: "name",
+            title: "名称",
+            type: "string",
+            align: "center"
+          },
+
+          {
+            field: "link_name",
+            title: "联系人",
+            type: "string",
+            align: "center"
+          },
+          {
+            field: "link_mobile",
+            title: "联系号码",
+            type: "string",
+            align: "center"
+          },
+          {
+            field: "admin_id",
+            title: "提交人",
+            type: "string",
+            align: "center"
+          },
+          {
+            field: "created_at",
+            title: "提交日期",
+            type: "string",
+            align: "center"
+          },
+          {
+            field: "操作",
+            title: "操作",
+            width: 220,
+            type: "opt",
+          }
+        ],
+      }
+    },
+    created() {
+      this.initLoad();
+      this.load();
+
+    },
+    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 - 20;
+        that.tableHeight = tableHeight;
+      },
+      handleCurrentChange(page) {
+        this.paginations.page = page;
+        this.load();
+      },
+      load() {
+        listgroup({
+          page: this.paginations.page,
+          page_size: this.paginations.page_size,
+          keyword: this.searchFields.KeyWord
+        }).then(response => {
+          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.form = result;
+
+        }).catch(error => {
+          //reject(error)
+        })
+      },
+
+     edit(obj) {
+       this.form = this.$options.data().form
+       if (obj) {
+         var result = Object.assign(this.form, obj)
+         this.form = result;
+       }
+       this.dialogFormVisible = 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;
+        this.$refs[formName].validate((valid) => {
+          if (valid) {
+            if (that.form.id) {
+              save(that.form).then(response => {
+                this.$Message.success('操作成功');
+                that.load();
+                that.dialogFormVisible = false;
+              }).catch(error => {
+                //reject(error)
+              })
+            } else {
+              store(that.form).then(response => {
+                this.$Message.success('操作成功');
+                that.load();
+                that.dialogFormVisible = false;
+              }).catch(error => {
+                //reject(error)
+              })
+            }
+          } else {
+            this.$Message.error('数据校验失败');
+            console.log('error submit!!');
+            return false;
+          }
+        });
+      },
+      resetForm(formName) {
+        var that = this;
+        this.$refs[formName].resetFields();
+        that.dialogFormVisible = false;
+
+      }
+    }
+  }
+</script>
+
+<style>
+  .dialogConcent {
+    overflow-y: auto;
+  }
+  .width100{
+    width:100%;
+  }
+</style>
diff --git a/src/views/basic/site.vue b/src/views/basic/site.vue
index f2e2752..753156d 100644
--- a/src/views/basic/site.vue
+++ b/src/views/basic/site.vue
@@ -24,6 +24,11 @@
                     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'">
+                  <div v-for="item in siteType" v-if="scope.row[column.field]==item.id">
+                      {{item.value}}
+                  </div>
+                </div>
                 <div v-else>{{scope.row[column.field]}}</div>
               </template>
           </el-table-column>
@@ -53,7 +58,14 @@
                 </el-col>
                 <el-col :span="24">
                   <el-form-item label="工地类型" prop="type">
-                    <el-input v-model="form.type" placeholder="请填写工地类型" autocomplete="off"></el-input>
+                    <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">
@@ -114,7 +126,11 @@
     store,
     save,
     del
-  } from '../../api/basic/site.js'
+  } from '../../api/basic/site.js'
+  import {
+    getparameteritem
+  } from '../../api/system/dictionary.js'
+
   import LxHeader from "@/components/LxHeader/index.vue";
   import AvueMap from 'avue-plugin-map'
 
@@ -130,6 +146,7 @@
         formLabelWidth: "120px",
         tableData: [],
         tableHeight: 0,
+        siteType:[],
         searchFields: {
           KeyWord: ""
         },
@@ -201,7 +218,7 @@
           {
             field: "type",
             title: "工地类型",
-            type: "string",
+            type: "type",
             align: "center"
           },
           {
@@ -225,7 +242,7 @@
             width:100
           },
           {
-            field: "person",
+            field: "admin_id",
             title: "提交人",
             type: "string",
             align: "center"
@@ -270,7 +287,10 @@
         var paginationHeight = 37; //分页的高度
         var topHeight = 50; //页面 头部
         let tableHeight = clientHeight - lxHeader_height - topHeight - paginationHeight - 20;
-        that.tableHeight = tableHeight;
+        that.tableHeight = tableHeight;
+        getparameteritem('siteType').then(res => {
+          that.siteType = res.detail
+        })
       },
       handleCurrentChange(page) {
         this.paginations.page = page;
@@ -290,6 +310,8 @@
               item.statusName = "完工"
             }
           }
+
+
           this.tableData = response.data;
           this.paginations.total = response.total;
         }).catch(error => {
diff --git a/src/views/basic/unit.vue b/src/views/basic/unit.vue
index f54561f..3fd6b93 100644
--- a/src/views/basic/unit.vue
+++ b/src/views/basic/unit.vue
@@ -156,7 +156,7 @@
             align: "center"
           },
           {
-            field: "person",
+            field: "admin_id",
             title: "提交人",
             type: "string",
             align: "center"
diff --git a/src/views/common/index.vue b/src/views/common/index.vue
index 65ff17d..e784c09 100644
--- a/src/views/common/index.vue
+++ b/src/views/common/index.vue
@@ -13,10 +13,10 @@
         </LxHeader>
       </div>
       <div ref="lxTable">
-        <el-table :data="tableData" :height="tableHeight" style="width: 100%">
-          <el-table-column type="index" width="50" label="序号" align="center"> </el-table-column>
+        <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">
+            :label="column.title" :width="column.width" :fixed="column.fixed">
               <template slot-scope="scope">
                 <div v-if="column.type=='opt'">
                   <Button ghost size="small" @click="edit(scope.row)" type="primary"
@@ -31,9 +31,9 @@
                   <Button ghost size="small" @click="del(scope.row)" type="error" style="margin-left: 10px;">删除</Button>
                 </div>
                 <div v-else-if="column.type=='status'">
-                  <div v-if="scope.row[column.field]==1">已提交</div>
-                  <div v-if="scope.row[column.field]==2">已审核</div>
-                  <div v-if="scope.row[column.field]==3">已办结</div>
+                  <el-tag v-if="scope.row[column.field]==1">已提交</el-tag>
+                  <el-tag type="success" v-if="scope.row[column.field]==2">已审核</el-tag>
+                  <el-tag type="warning" v-if="scope.row[column.field]==3">已办结</el-tag>
                 </div>
                 <div v-else-if="column.type=='feedback_department_id'">
                     <div v-for="item in selects.departments" v-if="scope.row[column.field] == item.id">
@@ -382,43 +382,51 @@
         columns: [{
             field: "feedback_department_id",
             title: "反馈科室",
-            type: "feedback_department_id"
+            type: "feedback_department_id",
+             width:140
           },
           {
             field: "ask_type_id",
             title: "类型",
             type: "ask_type_id",
-            align: "center"
+            align: "center",
+             width:140
           },
           {
             field: "ask_content_id",
             title: "内容",
             type: "string",
-            align: "center"
+            align: "center",
+             width:140
           },
           {
             field: "address",
             title: "地址",
             type: "string",
-            align: "center"
+            align: "lefft",
+             width:400
+
           },
           {
             field: "status",
             title: "状态",
             type: "status",
-            align: "center"
+            align: "center",
+             width:140
           },
           {
             field: "username",
             title: "提交人",
             type: "user",
-            align: "center"
+            align: "center",
+             width:140
           },
           {
             field: "department_id",
             title: "提交科室",
             type: "string",
-            align: "center"
+            align: "center",
+             width:140
           },
           {
             field: "created_at",
@@ -431,7 +439,8 @@
             field: "操作",
             title: "操作",
             width: 200,
-            type: "opt",
+            type: "opt",
+            fixed:"right"
           }
         ],
         uploadOther: {
@@ -503,7 +512,7 @@
               m.username = m.user.name
             }
           }
-            
+
           this.tableData = response.data;
           this.paginations.total = response.total;
         }).catch(error => {
@@ -550,6 +559,7 @@
 
           that.form = result
           that.formdetail.id = result.id;
+          that.formdetail.feedback_department_id = result.feedback_department_id;
           console.log(that.formdetail);
           console.log(that.commonInspectionFiles);
 
@@ -594,6 +604,7 @@
 
       submitForm(formName, status) {
         var that = this;
+
 
         if (status == "2") {
           that.formdetail.type = status;
diff --git a/src/views/maintain/plan.vue b/src/views/maintain/plan.vue
index f806d28..7e06615 100644
--- a/src/views/maintain/plan.vue
+++ b/src/views/maintain/plan.vue
@@ -2,7 +2,7 @@
   <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">
+        <LxHeader icon="md-apps" text="养护计划" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
           <div slot="content"></div>
           <slot>
             <div>
diff --git a/src/views/rain/inspection.vue b/src/views/rain/inspection.vue
new file mode 100644
index 0000000..ba76b25
--- /dev/null
+++ b/src/views/rain/inspection.vue
@@ -0,0 +1,9 @@
+<template>
+  
+</template>
+<script>
+  
+</script>
+<style>
+  
+</style>
\ No newline at end of file
diff --git a/src/views/rain/maintain.vue b/src/views/rain/maintain.vue
new file mode 100644
index 0000000..704cc40
--- /dev/null
+++ b/src/views/rain/maintain.vue
@@ -0,0 +1,1260 @@
+<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 style="width: 200px; margin-right: 10px" v-model="searchFields.KeyWord" placeholder="关键字搜索" />
+              <Button type="primary" @click="load" style="margin-left: 10px">查询</Button>
+              <Button type="primary" @click="edit()" 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 ghost size="small" @click="show(scope.row)" type="primary"
+                    style="margin-left: 10px;" v-if="scope.row['status']==2||scope.row['status']==3||scope.row['status']==4">查看</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="show(scope.row)" type="primary"
+                    style="margin-left: 10px;">审核</Button>
+                  <Button v-if="scope.row['status']==1" ghost size="small" @click="show(scope.row)" type="primary"
+                    style="margin-left: 10px;">办结</Button>
+                  <Button ghost size="small" @click="del(scope.row)" type="error" style="margin-left: 10px;">删除</Button>
+                </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>
+                    <el-tag v-if="scope.row[column.field]==3">汛期助排</el-tag>
+                    <el-tag v-if="scope.row[column.field]==4">污泥外运</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>
+                  <el-tag type="danger" v-if="scope.row[column.field]==4">缺陷办结</el-tag>
+
+                </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 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="3">汛期助排</el-radio>
+          <el-radio v-model="rainType" label="4">污泥外运</el-radio>
+        </div>
+
+        <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-dialog :title="rainTitle" :visible.sync="dialogFormDetailVisible" width="60%">
+        <div class="dialogConcent">
+          <el-scrollbar style="flex: 1">
+            <!-- 疏通疏挖 -->
+            <el-form v-if="rainType==1||rainType==2" :model="formdetail" :rules="{}" ref="formdetail" label-position="right" :label-width="formLabelWidth">
+                <el-row>
+                  <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 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="10">
+                    <el-form-item label="是否解决" prop="is_solve">
+                        <el-tag v-if="form.is_solve==0">否</el-tag>
+                        <el-tag type="success" v-if="form.is_solve==1">是</el-tag>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="10">
+                    <el-form-item label="是否违法" prop="is_law">
+                      <el-tag v-if="form.is_law==0">否</el-tag>
+                      <el-tag type="success" v-if="form.is_law==1">是</el-tag>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="24">
+                    <el-form-item label="临时处理办法" prop="deal_content">
+                      {{form.deal_content}}
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="24" v-if="form.is_solve==1">
+                    <el-form-item label="处理结果" prop="deal_result">
+                      {{form.deal_result}}
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="24" v-if="form.is_solve==1">
+                    <el-form-item label="处理后照片" prop="files_deal_list" class="files_check">
+                      <el-upload 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">
+                    <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-group>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="24" v-if="nowstatus==2||nowstatus==3||nowstatus==4">
+                    <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 :span="24" v-if="nowstatus==2||nowstatus==3||nowstatus==4">
+                      <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="admin_id"
+                              label="操作人"
+                              width="180">
+                            </el-table-column>
+                          </el-table>
+
+                  </el-col>
+
+                </el-row>
+
+              </el-form>
+
+
+            <!-- 汛期助排 -->
+            <el-form v-if="rainType==3" :model="formdetail" :rules="{}" ref="formdetail" label-position="right" :label-width="formLabelWidth">
+                <el-row>
+                  <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 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="10">
+                    <el-form-item label="是否解决" prop="is_solve">
+                        <el-tag v-if="form.is_solve==0">否</el-tag>
+                        <el-tag type="success" v-if="form.is_solve==1">是</el-tag>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="24">
+                    <el-form-item label="临时处理办法" prop="deal_content">
+                      {{form.deal_content}}
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="24" v-if="form.is_solve==1">
+                    <el-form-item label="处理结果" prop="deal_result">
+                      {{form.deal_result}}
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="24" v-if="form.is_solve==1">
+                   <el-form-item label="处理后照片" prop="files_deal_list" class="files_check">
+                     <el-upload 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">
+                    <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-group>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="24" v-if="nowstatus==2||nowstatus==3||nowstatus==4">
+                    <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 :span="24" v-if="nowstatus==2||nowstatus==3||nowstatus==4">
+                      <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="admin_id"
+                              label="操作人"
+                              width="180">
+                            </el-table-column>
+                          </el-table>
+
+                  </el-col>
+
+
+                </el-row>
+
+              </el-form>
+
+
+
+
+
+            <!-- 污泥外运 -->
+            <el-form v-if="rainType==4" :model="formdetail" :rules="{}" ref="formdetail" label-position="right" :label-width="formLabelWidth">
+              <el-row>
+                <el-col :span="24">
+                  <el-form-item label="外运时间" prop="date">
+                    {{form.date}}
+                  </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="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 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="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-group>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24" v-if="nowstatus==2||nowstatus==3||nowstatus==4">
+                  <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 :span="24" v-if="nowstatus==2||nowstatus==3||nowstatus==4">
+                    <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="admin_id"
+                            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" type="warning" v-preventReClick @click="submitFormDetail('formdetail','4')">缺陷办结</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 :title="rainTitle" :visible.sync="dialogFormVisible" width="60%">
+        <div class="dialogConcent">
+          <el-scrollbar style="flex: 1">
+            <!-- 疏通疏挖 -->
+            <el-form v-if="rainType==1||rainType==2" :model="form" :rules="rules" ref="form" label-position="right" :label-width="formLabelWidth">
+                <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="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="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 action="/api/admin/upload-file" list-type="picture-card" :file-list="filesList" ref="pictureUpload"
+                        :auto-upload="true" :data="uploadOther"
+                        :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="10">
+                    <el-form-item label="是否解决" prop="is_solve">
+                        <el-radio-group v-model="form.is_solve">
+                          <el-radio :label="0" >否</el-radio>
+                          <el-radio :label="1" >是</el-radio>
+                        </el-radio-group>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="10">
+                    <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">
+                    <el-form-item label="临时处理办法" prop="deal_content">
+                      <el-input type="textarea" v-model="form.deal_content" placeholder="请填写临时处理办法" autocomplete="off"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="24" v-if="form.is_solve==1">
+                    <el-form-item label="处理结果" prop="deal_result">
+                      <el-input type="textarea" v-model="form.deal_result" placeholder="请填写处理结果" autocomplete="off"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="24" v-if="form.is_solve==1">
+                    <el-form-item label="处理后照片" prop="files_deal_list">
+                      <el-upload action="/api/admin/upload-file" list-type="picture-card" :file-list="dealFilesList"
+                        ref="pictureUploads" :limit="3" :auto-upload="true" :data="uploadOther"
+                        :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==3" :model="form" :rules="rules" ref="form" label-position="right" :label-width="formLabelWidth">
+                <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="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="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 action="/api/admin/upload-file" list-type="picture-card" :file-list="filesList" ref="pictureUpload"
+                        :auto-upload="true" :data="uploadOther"
+                        :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="10">
+                    <el-form-item label="是否解决" prop="is_solve">
+                        <el-radio-group v-model="form.is_solve">
+                          <el-radio :label="0" >否</el-radio>
+                          <el-radio :label="1" >是</el-radio>
+                        </el-radio-group>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="24">
+                    <el-form-item label="临时处理办法" prop="deal_content">
+                      <el-input type="textarea" v-model="form.deal_content" placeholder="请填写临时处理办法" autocomplete="off"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="24" v-if="form.is_solve==1">
+                    <el-form-item label="处理结果" prop="deal_result">
+                      <el-input type="textarea" v-model="form.deal_result" placeholder="请填写处理结果" autocomplete="off"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="24" v-if="form.is_solve==1">
+                    <el-form-item label="处理后照片" prop="files_deal_list">
+                      <el-upload action="/api/admin/upload-file" list-type="picture-card" :file-list="dealFilesList"
+                        ref="pictureUploads" :limit="3" :auto-upload="true" :data="uploadOther"
+                        :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==4" :model="form" :rules="rules" ref="form" label-position="right" :label-width="formLabelWidth">
+              <el-row>
+                <el-col :span="24">
+                  <el-form-item label="外运时间" prop="date">
+                    <el-date-picker
+                          class="width100"
+                          v-model="form.date"
+                          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="address">
+                    <el-input type="text" v-model="form.address" 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 action="/api/admin/upload-file" list-type="picture-card" :file-list="filesList" ref="pictureUpload"
+                      :auto-upload="true" :data="uploadOther"
+                      :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-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 :visible.sync="dialogVisible">
+        <img width="100%" :src="dialogImageUrl" alt="">
+      </el-dialog>
+
+
+
+
+
+    </div>
+  </div>
+</template>
+
+<script>
+  import {
+    listall,
+    get,
+    del,
+    update,
+    storecirculation,
+    savecirculation,
+    storedischarge,
+    savedischarge,
+    storemire,
+    savemire
+  } from '../../api/rain/maintain.js'
+  import {
+    getToken
+  } from '@/utils/auth'
+  import LxHeader from "@/components/LxHeader/index.vue";
+  import AvueMap from 'avue-plugin-map'
+
+  export default {
+    components: {
+      LxHeader,
+      AvueMap
+    },
+    data() {
+      return {
+        tableHeight: 0,
+        rainTypeVisible:false,
+        rainType:"1",
+        dialogFormVisible: false,
+        dialogFormDetailVisible:false,
+        formLabelWidth: "120px",
+        dialogImageUrl:"",
+        dialogVisible: false,
+        rainTitle:"雨水管道疏挖",
+        tableData: [],
+        mapparams:{
+            zoom: 11,
+        },
+        mapform:[],
+        tableHeight: 0,
+        searchFields: {
+          KeyWord: ""
+        },
+        paginations: {
+          page: 1,
+          page_size: 15,
+          total: 0
+        },
+        filesList:[],
+        dealFilesList:[],
+        rainMaintainLogs:[],
+        end_types:0,
+        disabled:false,
+        uploadOther:{
+          token:""
+        },
+        idname:"",
+        nowstatus:0,
+        form: {
+          content:"",
+          is_solve:"",
+          is_law:"",
+          deal_content:"",
+          deal_result:"",
+          address:"",
+          longitude:"",
+          latitude:"",
+          files_list:[],
+          files_deal_list:[],
+          date:"",
+          address:"",
+          files_list:[],
+
+        },
+        formdetail:{
+          status:0,
+          end_type:0,
+          content:""
+        },
+
+        rules: {
+          content:[{
+            required: true,
+            message: '请填写描述',
+            trigger: 'blur',
+          }]
+        },
+
+        columns: [{
+            field: "address",
+            title: "地址/排放点",
+            type: "string",
+            align: "left",
+            width:400
+          },
+          {
+              field: "type",
+              title: "类型",
+              type: "type",
+              align: "left",
+              width:160
+          },
+          {
+              field: "status",
+              title: "状态",
+              type: "status",
+              align: "center",
+              width:160
+          },
+          // {
+          //   field: "end_type",
+          //   title: "结办类型",
+          //   type: "end_type",
+          //   align: "center",
+          //   width:160
+          // },
+          {
+            field: "admin_id",
+            title: "提交人",
+            type: "string",
+            align: "center",
+            width:160
+          },
+          {
+            field: "created_at",
+            title: "提交日期",
+            type: "string",
+            align: "center",
+            width:200
+          },
+          {
+            field: "操作",
+            title: "操作",
+            width: 220,
+            type: "opt",
+            fixed:"right"
+          }
+        ],
+      }
+    },
+    created() {
+      this.initLoad();
+      this.load();
+
+    },
+    watch:{
+      mapform(newVal, oldVal) {
+        this.form.longitude = newVal[0];
+        this.form.latitude = newVal[1];
+        // if(this.rainType!=4){
+           this.form.address = newVal[2];
+        // }
+      }
+    },
+    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 - 20;
+        that.tableHeight = tableHeight;
+
+        this.uploadOther.token = getToken();
+      },
+      handleCurrentChange(page) {
+        this.paginations.page = page;
+        this.load();
+      },
+      load() {
+        listall({
+          page: this.paginations.page,
+          page_size: this.paginations.page_size,
+          keyword: this.searchFields.KeyWord
+        }).then(response => {
+          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)
+          console.log(result)
+          that.rainType = result.type;
+          that.nowstatus = result.status;
+          that.formdetail.id = result.id
+          that.rainMaintainLogs = result.rain_maintain_logs;
+          that.end_types = result.end_type
+          if(that.rainType==1){
+            that.rainTitle = "雨水管道疏挖"
+          }else if(that.rainType==2){
+            that.rainTitle = "雨水管道疏通"
+          }else if(that.rainType==3){
+            that.rainTitle = "汛期助排"
+          }else if(that.rainType==4){
+            that.rainTitle = "污泥外运"
+          }else{
+            that.rainTitle = "雨水管道疏挖"
+          }
+          switch(result.type){
+            case 1:
+            case 2:
+              that.form = result.circulation_info;
+              that.form.circulation_id = result.circulation_id;
+              that.idname = "circulation_id"
+              that.mapform = [result.circulation_info.longitude,result.circulation_info.latitude,result.circulation_info.address]
+              let _files = [];
+              for (var mod of result.circulation_info.circulation_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.circulation_info.circulation_deal_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 3:
+              that.form = result.help_discharge_info;
+              that.form.help_discharge_id = result.help_discharge_id;
+              that.idname = "help_discharge_id"
+              that.mapform = [result.help_discharge_info.longitude,result.help_discharge_info.latitude,result.help_discharge_info.address]
+              let discharge_files = [];
+              for (var mod of result.help_discharge_info.help_discharge_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;
+
+              let discharge_filesafter = [];
+              for (var mod of result.help_discharge_info.help_discharge_deal_files) {
+                let m = Object.assign({}, mod);
+                m.url = mod.files.url;
+                m.id = mod.files.id;
+                m.photoType = "after";
+                discharge_filesafter.push(m);
+              }
+              that.dealFilesList = discharge_filesafter;
+
+              break;
+            case 4:
+              that.form = result.mire_info;
+              that.form.mire_id = result.mire_id;
+              that.idname = "mire_id";
+              let mire_files = [];
+              for (var mod of result.mire_info.mire_files) {
+                let m = Object.assign({}, mod);
+                m.url = mod.files.url;
+                m.id = mod.files.id;
+                m.photoType = "before";
+                mire_files.push(m);
+              }
+              that.filesList =mire_files;
+              break;
+          }
+
+        }).catch(error => {
+          //reject(error)
+        })
+      },
+
+      show(obj){
+        this.dialogFormDetailVisible = true;
+        this.info(obj)
+      },
+
+     edit(obj) {
+       var that = this;
+       this.form = this.$options.data().form
+       that.filesList = [];
+       that.dealFilesList = [];
+       that.mapform = ['','',''];
+       if (obj) {
+         that.info(obj);
+         this.dialogFormVisible = true;
+       }else{
+         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_deal_list = listUrlafter
+        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;
+          }
+        });
+      },
+      submitFormDetail(formName,status){
+
+        var that = this;
+        that.formdetail.status = status
+        console.log(that.formdetail);
+        // return
+
+
+        update(that.formdetail).then(response => {
+          this.$Message.success('操作成功');
+          that.load();
+          that.dialogFormDetailVisible = false;
+        }).catch(error => {
+          //reject(error)
+        })
+
+      },
+      resetForm(formName) {
+        var that = this;
+        that.filesList = [];
+        that.dealFilesList = [];
+        that.mapform = ['','',''];
+        this.$refs[formName].resetFields();
+        that.dialogFormVisible = false;
+        that.dialogFormDetailVisible = false;
+      },
+      resetFormDetail(formName){
+        var that = this;
+        that.filesList = [];
+        that.dealFilesList = [];
+        that.mapform = ['','',''];
+        that.form = {};
+        that.rainMaintainLogs = []
+        that.end_types = 0;
+        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) {
+        console.log("file",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
+          }
+      },
+
+      resetrainType(){
+        this.rainTypeVisible = false
+      },
+      submitRainType(){
+        var that = this
+        this.rainTypeVisible = false
+        console.log(this.rainType);
+        if(that.rainType==1){
+          that.rainTitle = "雨水管道疏挖"
+        }else if(that.rainType==2){
+          that.rainTitle = "雨水管道疏通"
+        }else if(that.rainType==3){
+          that.rainTitle = "汛期助排"
+        }else if(that.rainType==4){
+          that.rainTitle = "污泥外运"
+        }else{
+          that.rainTitle = "雨水管道疏挖"
+        }
+        this.dialogFormVisible = true;
+      },
+
+
+      submitAll(type,id){
+        var that = this;
+
+        // return
+        that.form.type = type;
+
+        switch(parseInt(type)){
+          case 1:
+          case 2:
+            console.log("789")
+            if (id) {
+              console.log("456");
+              savecirculation(that.form).then(response => {
+                this.$Message.success('操作成功');
+                that.load();
+                that.dialogFormVisible = false;
+              }).catch(error => {
+                //reject(error)
+              })
+            } else {
+              console.log("123")
+              storecirculation(that.form).then(response => {
+                this.$Message.success('操作成功');
+                that.load();
+                that.dialogFormVisible = false;
+              }).catch(error => {
+                //reject(error)
+              })
+            }
+            break;
+          case 3:
+              if (id) {
+                savedischarge(that.form).then(response => {
+                  this.$Message.success('操作成功');
+                  that.load();
+                  that.dialogFormVisible = false;
+                }).catch(error => {
+                  //reject(error)
+                })
+              } else {
+                storedischarge(that.form).then(response => {
+                  this.$Message.success('操作成功');
+                  that.load();
+                  that.dialogFormVisible = false;
+                }).catch(error => {
+                  //reject(error)
+                })
+              }
+              break;
+            case 4:
+                  if (id) {
+                    savemire(that.form).then(response => {
+                      this.$Message.success('操作成功');
+                      that.load();
+                      that.dialogFormVisible = false;
+                    }).catch(error => {
+                      //reject(error)
+                    })
+                  } else {
+                    storemire(that.form).then(response => {
+                      this.$Message.success('操作成功');
+                      that.load();
+                      that.dialogFormVisible = false;
+                    }).catch(error => {
+                      //reject(error)
+                    })
+                  }
+                  break;
+
+
+        }
+
+
+
+
+
+      }
+
+    }
+  }
+</script>
+
+<style>
+  .dialogConcent {
+    overflow-y: auto;
+  }
+  .width100{
+    width:100%;
+  }
+  .files_check .el-upload.el-upload--picture-card{
+    display: none;
+  }
+</style>