From f67dbe2cb82d33f3bad37a3ba49b96ac083a0116 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Mon, 20 Jun 2022 14:25:20 +0800
Subject: [PATCH] up

---
 src/api/basic/account.js    |  12 +-
 src/api/basic/site.js       |  12 +-
 src/api/basic/unit.js       |  14 +-
 src/views/assess/daily.vue  |   4 +
 src/views/basic/account.vue | 131 +++++++++++-----
 src/views/basic/site.vue    |  88 +++++++----
 src/views/basic/unit.vue    |  15 +-
 src/views/common/index.vue  | 300 ++++++++++++++++++++++++++++++------
 8 files changed, 427 insertions(+), 149 deletions(-)

diff --git a/src/api/basic/account.js b/src/api/basic/account.js
index 3136f51..1c5ae60 100644
--- a/src/api/basic/account.js
+++ b/src/api/basic/account.js
@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function listaccount(data) {
   return request({
-    url: '/api/admin/account/index',
+    url: '/api/admin/user/index',
     method: 'get',
     data
   })
@@ -10,15 +10,15 @@ export function listaccount(data) {
 
 export function get(id) {
   return request({
-    url: '/api/admin/account/show',
-    method: 'post',
+    url: '/api/admin/user/show',
+    method: 'get',
     params: { id }
   })
 }
 
 export function save(data) {
   return request({
-    url: '/api/admin/account/save',
+    url: '/api/admin/user/save',
     method: 'post',
     data
   })
@@ -26,7 +26,7 @@ export function save(data) {
 
 export function store(data) {
   return request({
-    url: '/api/admin/account/store',
+    url: '/api/admin/user/store',
     method: 'post',
     data
   })
@@ -34,7 +34,7 @@ export function store(data) {
 
 export function del(id) {
   return request({
-    url: '/api/admin/account/destroy',
+    url: '/api/admin/user/destroy',
     method: 'get',
     params:{ id }
   })
diff --git a/src/api/basic/site.js b/src/api/basic/site.js
index 0acc7ac..6af8df5 100644
--- a/src/api/basic/site.js
+++ b/src/api/basic/site.js
@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function listsite(data) {
   return request({
-    url: '/api/admin/site/index',
+    url: '/api/admin/building/index',
     method: 'get',
     data
   })
@@ -10,15 +10,15 @@ export function listsite(data) {
 
 export function get(id) {
   return request({
-    url: '/api/admin/site/show',
-    method: 'post',
+    url: '/api/admin/building/show',
+    method: 'get',
     params: { id }
   })
 }
 
 export function save(data) {
   return request({
-    url: '/api/admin/site/save',
+    url: '/api/admin/building/save',
     method: 'post',
     data
   })
@@ -26,7 +26,7 @@ export function save(data) {
 
 export function store(data) {
   return request({
-    url: '/api/admin/site/store',
+    url: '/api/admin/building/store',
     method: 'post',
     data
   })
@@ -34,7 +34,7 @@ export function store(data) {
 
 export function del(id) {
   return request({
-    url: '/api/admin/site/destroy',
+    url: '/api/admin/building/destroy',
     method: 'get',
     params:{ id }
   })
diff --git a/src/api/basic/unit.js b/src/api/basic/unit.js
index 6359089..091b056 100644
--- a/src/api/basic/unit.js
+++ b/src/api/basic/unit.js
@@ -1,8 +1,8 @@
 import request from '@/utils/request'
 
-export function listunit(data) {
+export function listmaintain(data) {
   return request({
-    url: '/api/admin/unit/index',
+    url: '/api/admin/maintain/index',
     method: 'get',
     data
   })
@@ -10,15 +10,15 @@ export function listunit(data) {
 
 export function get(id) {
   return request({
-    url: '/api/admin/unit/show',
-    method: 'post',
+    url: '/api/admin/maintain/show',
+    method: 'get',
     params: { id }
   })
 }
 
 export function save(data) {
   return request({
-    url: '/api/admin/unit/save',
+    url: '/api/admin/maintain/save',
     method: 'post',
     data
   })
@@ -26,7 +26,7 @@ export function save(data) {
 
 export function store(data) {
   return request({
-    url: '/api/admin/unit/store',
+    url: '/api/admin/maintain/store',
     method: 'post',
     data
   })
@@ -34,7 +34,7 @@ export function store(data) {
 
 export function del(id) {
   return request({
-    url: '/api/admin/unit/destroy',
+    url: '/api/admin/maintain/destroy',
     method: 'get',
     params:{ id }
   })
diff --git a/src/views/assess/daily.vue b/src/views/assess/daily.vue
index c197d96..9db32f1 100644
--- a/src/views/assess/daily.vue
+++ b/src/views/assess/daily.vue
@@ -345,6 +345,10 @@ import AvueMap from 'avue-plugin-map'
        if (obj) {
          var that = this;
          that.info(obj);
+       }else{
+         this.normalstatus=1
+         this.otherstatus=2
+         that.mapform = ['','',''];
        }
        this.dialogFormVisible = true;
      },
diff --git a/src/views/basic/account.vue b/src/views/basic/account.vue
index 7e4ee7f..f74af24 100644
--- a/src/views/basic/account.vue
+++ b/src/views/basic/account.vue
@@ -42,28 +42,48 @@
             <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 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 label="账号" prop="username">
+                    <el-input v-model="form.username" 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 label="密码" prop="password">
+                    <el-input v-model="form.password" placeholder="请填写密码" autocomplete="off"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="24">
+                  <el-form-item label="所属片区" prop="area_id">
+                    <el-select style="width:100%" v-model="form.area_id" placeholder="请选择所属片区">
+                        <el-option
+                          v-for="item in areaList"
+                          :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="link_mobile">
-                    <el-input v-model="form.link_mobile" placeholder="请填写所属片区" autocomplete="off"></el-input>
+                  <el-form-item label="所属养护单位" prop="maintain_id">
+                    <el-select style="width:100%" v-model="form.maintain_id" placeholder="请选择所属养护单位">
+                        <el-option
+                          v-for="item in maintainList"
+                          :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="link_mobile">
-                    <el-input v-model="form.link_mobile" placeholder="请填写所属养护单位" autocomplete="off"></el-input>
+                  <el-form-item label="巡查养护组" prop="group_id">
+                    <el-input v-model="form.group_id" placeholder="请填写巡查养护组" autocomplete="off"></el-input>
                   </el-form-item>
                 </el-col>
 
@@ -90,7 +110,13 @@
     store,
     save,
     del
-  } from '../../api/basic/account.js'
+  } from '../../api/basic/account.js'
+  import {
+    listarea
+  } from '../../api/basic/area.js'
+  import {
+    listmaintain
+  } from '../../api/basic/unit.js'
   import LxHeader from "@/components/LxHeader/index.vue";
 
   export default {
@@ -103,6 +129,8 @@
         dialogFormVisible: false,
         formLabelWidth: "120px",
         tableData: [],
+        areaList:[],
+        maintainList:[],
         tableHeight: 0,
         searchFields: {
           KeyWord: ""
@@ -114,58 +142,59 @@
         },
         form: {
           name:"",
-          link_name:"",
-          link_mobile:"",
-          remark:"",
-          department_id:1,
-          admin_id:1
+          username:"",
+          password:"",
+          area_id:"",
+          maintain_id:"",
+          group_id:""
         },
 
         rules: {
           name:[{
             required: true,
-            message: '请填写片区名称',
+            message: '请填写名字',
             trigger: 'blur',
           }],
-          link_name:[{
+          username:[{
             required: true,
-            message: '请填写联系人',
+            message: '请填写账号',
             trigger: 'blur',
           }],
-          link_mobile:[{
+          password:[{
             required: true,
-            message: '请填写联系号码',
+            message: '请填写密码',
             trigger: 'blur',
-          },{ pattern: /^1[3456789]\d{9}$/,
-              message: '手机号码格式不正确',
-              trigger: 'blur' ,
-          }],
-
-
+          }]
         },
 
         columns: [{
             field: "name",
-            title: "片区名称",
+            title: "名字",
             type: "string",
             align: "center"
           },
 
           {
-            field: "link_name",
-            title: "巡查养护单位",
+            field: "username",
+            title: "账号",
             type: "string",
             align: "center"
           },
           {
-            field: "link_mobile",
-            title: "账号",
+            field: "area_id",
+            title: "所属片区",
             type: "string",
             align: "center"
           },
           {
-            field: "link_mobile",
-            title: "巡查养护组",
+            field: "maintain_id",
+            title: "所属养护单位",
+            type: "string",
+            align: "center"
+          },
+          {
+            field: "group_id",
+            title: "所属巡查养护组",
             type: "string",
             align: "center"
           },
@@ -220,7 +249,29 @@
         }).catch(error => {
           console.log(error)
           reject(error)
-        });
+        });
+
+        listarea({
+          page: 1,
+          page_size: 999,
+        }).then(response => {
+          this.areaList = response.data;
+        }).catch(error => {
+          console.log(error)
+          reject(error)
+        });
+
+        listmaintain({
+          page: 1,
+          page_size: 999,
+        }).then(response => {
+          this.maintainList = response.data;
+        }).catch(error => {
+          console.log(error)
+          reject(error)
+        });
+
+
 
       },
       show(obj) {
@@ -243,8 +294,7 @@
      edit(obj) {
        this.form = this.$options.data().form
        if (obj) {
-         var result = Object.assign(this.form, obj)
-         this.form = result;
+         this.info(obj)
        }
        this.dialogFormVisible = true;
      },
@@ -267,10 +317,11 @@
             }
           });
         }
-      },
-
+      },
       submitForm(formName) {
-        var that = this;
+        var that = this;
+        console.log(that.form);
+        // return;
         this.$refs[formName].validate((valid) => {
           if (valid) {
             if (that.form.id) {
diff --git a/src/views/basic/site.vue b/src/views/basic/site.vue
index f8a6428..f2e2752 100644
--- a/src/views/basic/site.vue
+++ b/src/views/basic/site.vue
@@ -47,23 +47,23 @@
                   </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 label="工地编号" prop="number">
+                    <el-input v-model="form.number" placeholder="请填写工地编号" autocomplete="off"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="24">
-                  <el-form-item label="工地类型" prop="name">
-                    <el-input v-model="form.name" placeholder="请填写工地类型" autocomplete="off"></el-input>
+                  <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="link_name">
-                    <el-input v-model="form.link_name" placeholder="请填写工地状态" autocomplete="off"></el-input>
+                  <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_mobile">
-                    <el-input v-model="form.link_mobile" placeholder="请填写联系人" autocomplete="off"></el-input>
+                  <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">
@@ -141,20 +141,31 @@
         mapparams:{
             zoom: 11,
         },
-        mapform:[] ,
+        mapform:[] ,
+        siteStatus:[{
+          id:1,
+          value:"在建"
+        },{
+          id:2,
+          value:"完工"
+        }],
         form: {
           name:"",
+          number:"",
+          type:"",
+          longitude:"",
+          latitude:"",
+          address:"",
+          status:1,
           link_name:"",
           link_mobile:"",
-          remark:"",
-          department_id:1,
-          admin_id:1
+          remark:""
         },
 
         rules: {
           name:[{
             required: true,
-            message: '请填写片区名称',
+            message: '请填写工地名称',
             trigger: 'blur',
           }],
           link_name:[{
@@ -176,40 +187,42 @@
 
         columns: [{
             field: "name",
-            title: "工地地址",
+            title: "工地名称",
             type: "string",
             align: "center"
           },
 
           {
-            field: "link_name",
+            field: "number",
             title: "工地编号",
             type: "string",
             align: "center"
           },
           {
-            field: "link_mobile",
+            field: "type",
             title: "工地类型",
             type: "string",
             align: "center"
           },
           {
-            field: "person",
+            field: "link_name",
             title: "联系人",
             type: "string",
-            align: "center"
+            align: "center",
+            width:100
           },
           {
-            field: "person",
+            field: "link_mobile",
             title: "联系电话",
             type: "string",
             align: "center"
           },
           {
-            field: "date",
+            field: "statusName",
             title: "状态",
             type: "string",
-            align: "center"
+            align: "center",
+            width:100
           },
           {
             field: "person",
@@ -218,10 +231,11 @@
             align: "center"
           },
           {
-            field: "date",
+            field: "created_at",
             title: "提交日期",
             type: "string",
-            align: "center"
+            align: "center",
+            width:200
           },
           {
             field: "操作",
@@ -234,7 +248,7 @@
     },
     created() {
       this.initLoad();
-      // this.load();
+      this.load();
 
     },
     watch:{
@@ -268,6 +282,14 @@
           page_size: this.paginations.page_size,
           keyword: this.searchFields.KeyWord
         }).then(response => {
+
+          for(var item of response.data){
+            if(item.status==1){
+              item.statusName = "在建"
+            }else if(item.status==2){
+              item.statusName = "完工"
+            }
+          }
           this.tableData = response.data;
           this.paginations.total = response.total;
         }).catch(error => {
@@ -276,17 +298,14 @@
         });
 
       },
-      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 => {
           let result = Object.assign(that.form, res);
-          // this.$set(that.form,res);
-          that.form = result;
+          // this.$set(that.form,res)
+          console.log(result)
+          that.form = result;
+          that.mapform = [result.longitude,result.latitude,result.address]
 
         }).catch(error => {
           //reject(error)
@@ -295,9 +314,11 @@
 
      edit(obj) {
        this.form = this.$options.data().form
+        var that = this;
        if (obj) {
-         var result = Object.assign(this.form, obj)
-         this.form = result;
+         that.info(obj)
+       }else{
+          that.mapform = ['','',''];
        }
        this.dialogFormVisible = true;
      },
@@ -352,6 +373,7 @@
       },
       resetForm(formName) {
         var that = this;
+
         this.$refs[formName].resetFields();
         that.dialogFormVisible = false;
 
diff --git a/src/views/basic/unit.vue b/src/views/basic/unit.vue
index 6d38ee1..f54561f 100644
--- a/src/views/basic/unit.vue
+++ b/src/views/basic/unit.vue
@@ -79,7 +79,7 @@
 
 <script>
   import {
-    listunit,
+    listmaintain,
     get,
     store,
     save,
@@ -110,15 +110,13 @@
           name:"",
           link_name:"",
           link_mobile:"",
-          remark:"",
-          department_id:1,
-          admin_id:1
+          remark:"",
         },
 
         rules: {
           name:[{
             required: true,
-            message: '请填写片区名称',
+            message: '请填写单位名称',
             trigger: 'blur',
           }],
           link_name:[{
@@ -164,7 +162,7 @@
             align: "center"
           },
           {
-            field: "date",
+            field: "created_at",
             title: "提交日期",
             type: "string",
             align: "center"
@@ -198,7 +196,7 @@
         this.load();
       },
       load() {
-        listunit({
+        listmaintain({
           page: this.paginations.page,
           page_size: this.paginations.page_size,
           keyword: this.searchFields.KeyWord
@@ -231,8 +229,7 @@
      edit(obj) {
        this.form = this.$options.data().form
        if (obj) {
-         var result = Object.assign(this.form, obj)
-         this.form = result;
+         this.info(obj)
        }
        this.dialogFormVisible = true;
      },
diff --git a/src/views/common/index.vue b/src/views/common/index.vue
index 8ec98a6..844f4e7 100644
--- a/src/views/common/index.vue
+++ b/src/views/common/index.vue
@@ -20,14 +20,14 @@
               <template slot-scope="scope">
                 <div v-if="column.type=='opt'">
                   <Button ghost size="small" @click="view(scope.row)" type="primary"
-                    style="margin-left: 10px;">查看</Button>
+                    style="margin-left: 10px;" v-if="scope.row['status']==3">查看</Button>
 
+                  <Button v-if="scope.row['status']==1" 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="edit(scope.row)" type="primary"
                     style="margin-left: 10px;">审核</Button>
                   <Button v-if="scope.row['status']==2" ghost size="small" @click="edit(scope.row)" type="primary"
                     style="margin-left: 10px;">办结</Button>
-                    <Button v-if="scope.row['status']==3" 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-if="column.type=='status'">
@@ -54,9 +54,106 @@
             :page-size="paginations.page_size" background layout="prev, pager, next" :total="paginations.total">
           </el-pagination>
         </div>
-      </div>
+      </div>
+
+
+      <el-dialog title="通用巡查编辑" :visible.sync="showdialogFormVisible" width="60%">
+        <div class="dialogConcent" :style="{height:clientHeight+'px'}">
+          <el-scrollbar style="flex: 1">
+            <el-form :model="form" :rules="rules" ref="form" label-position="right" :label-width="formLabelWidth">
+              <el-row>
+                <el-col :span="10">
+                  <el-form-item label="类型" prop="ask_type_id">
+                    <el-select @change="showAskContentChange" class="width100" v-model="form.ask_type_id" placeholder="请选择类型">
+                      <el-option v-for="item in selects.ask_types" :key="item.id" :label="item.value"
+                        :value="item.id">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="10" :offset="4">
+                 <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 selects.ask_content" :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="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="common_inspection_files">
+                    <el-upload action="/api/admin/upload-file" list-type="picture-card" :file-list="commonInspectionFiles"
+                      ref="pictureUploads" :auto-upload="true" :data="uploadOther"
+                      :on-success="handlesuccess">
+                      <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="feedback_department_id">
+                    <el-select class="width100" v-model="form.feedback_department_id" placeholder="请选择反馈科室">
+                      <el-option v-for="item in selects.departments" :key="item.id" :label="item.name"
+                        :value="item.id">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+
+              </el-row>
+
+            </el-form>
+          </el-scrollbar>
+        </div>
+
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="resetEditForm('form')">取 消</el-button>
+          <el-button type="primary" v-preventReClick @click="submitEditForm('form')">保存</el-button>
+        </div>
+      </el-dialog>
+
+      <el-dialog :visible.sync="dialogVisible">
+        <img width="100%" :src="dialogImageUrl" alt="">
+      </el-dialog>
+
 
-      <el-dialog title="通用巡查编辑" :visible.sync="dialogFormVisible" fullscreen width="90%">
+
+
+
+
+      <el-dialog title="通用巡查编辑" :visible.sync="dialogFormVisible" width="60%">
         <div class="dialogConcent" :style="{height:clientHeight+'px'}">
           <el-scrollbar style="flex: 1">
             <el-form :model="formdetail" :rules="rules" ref="formdetail" label-position="right" :label-width="formLabelWidth">
@@ -82,11 +179,38 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="24">
-                  <el-form-item label="详情" prop="type_id">
-                    <el-input type="textarea" v-model="form.author" placeholder="请填写详情" autocomplete="off"></el-input>
+                  <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="formdetail.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="formdetail.latitude" placeholder="纬度" autocomplete="off"></el-input>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="详情" prop="content">
+                    {{formdetail.content}}
+                    <!-- <el-input type="textarea" v-model="formdetail.content" placeholder="请填写详情" autocomplete="off"></el-input> -->
                   </el-form-item>
                 </el-col>
                 <el-col :span="24">
+                  <el-form-item label="附件" prop="common_inspection_files">
+                    <img v-if="commonInspectionFiles.length>0" v-for="item in commonInspectionFiles" :src="item.files.url" alt="">
+                    <!-- <el-input type="textarea" v-model="formdetail.content" placeholder="请填写详情" autocomplete="off"></el-input> -->
+                  </el-form-item>
+                </el-col>
+
+
+
+
+
+                <el-col :span="24" v-if="form.status==1">
                   <el-form-item label="备注" prop="type_id">
                     <el-input type="textarea" v-model="form.author" placeholder="请填写备注" autocomplete="off"></el-input>
                   </el-form-item>
@@ -124,7 +248,7 @@
 
         <div slot="footer" class="dialog-footer">
           <el-button @click="resetForm('form')">取 消</el-button>
-          <el-button type="primary" v-preventReClick @click="submitForm('form', '2')">上 报</el-button>
+          <el-button type="primary" v-preventReClick @click="submitForm('form', '2')">审核</el-button>
         </div>
       </el-dialog>
 
@@ -140,6 +264,9 @@
     save,
     del
   } from '../../api/commonInspection/index.js'
+  import {
+    getToken
+  } from '@/utils/auth'
   import {
     listdept
   } from "../../api/system/department.js"
@@ -147,17 +274,20 @@
     getparameteritem,
     getparameter
   } from "../../api/system/dictionary.js"
-  import LxHeader from "@/components/LxHeader/index.vue";
+  import LxHeader from "@/components/LxHeader/index.vue";
+  import AvueMap from 'avue-plugin-map'
 
   export default {
     components: {
-      LxHeader
+      LxHeader,
+      AvueMap
     },
     data() {
       return {
 
         tableHeight: 0,
-        dialogFormVisible: false,
+        dialogFormVisible: false,
+        showdialogFormVisible:false,
         formLabelWidth: "120px",
         clientHeight: 0,
         tableData: [],
@@ -175,9 +305,19 @@
           ask_content:[],
           departments:[]
         },
+        mapparams:{
+            zoom: 11,
+        },
+        mapform:[] ,
+        commonInspectionFiles:[],
+        dialogImageUrl:"",
+        dialogVisible: false,
+        disabled: false,
         formdetail:{
           ask_type_detail:"",
           ask_content_detail:"",
+          content:"",
+          common_inspection_files:[],
         },
         form: {
           feedback_department_id:"",
@@ -191,7 +331,18 @@
         },
 
         rules: {
-
+          ask_type_id: [{
+          	required: true,
+          	message: '请选择类型',
+          	// 可以单个或者同时写两个触发验证方式
+          	trigger: ['change', 'blur'],
+          }],
+          ask_content_id: [{
+          	required: true,
+          	message: '请选择内容',
+          	// 可以单个或者同时写两个触发验证方式
+          	trigger: ['change', 'blur'],
+          }]
         },
 
         columns: [{
@@ -245,7 +396,7 @@
           {
             field: "操作",
             title: "操作",
-            width: 220,
+            width: 200,
             type: "opt",
           }
         ],
@@ -272,6 +423,13 @@
       this.initLoad();
       this.load();
 
+    },
+    watch:{
+      'mapform':function(val){
+        this.form.longitude = val[0];
+        this.form.latitude = val[1];
+        this.form.address = val[2];
+      }
     },
     methods: {
       initLoad() {
@@ -283,6 +441,8 @@
         let tableHeight = clientHeight - lxHeader_height - topHeight - paginationHeight - 20;
         that.tableHeight = tableHeight;
 
+        this.uploadOther.token = getToken();
+
         getparameteritem("general_type").then(res => {
           this.selects.ask_types = res.detail
         })
@@ -305,7 +465,9 @@
           keyword: this.searchFields.KeyWord
         }).then(response => {
           for(var m of response.data){
-            m.username = m.user.name
+            if(m.user){
+              m.username = m.user.name
+            }
           }
           this.tableData = response.data;
           this.paginations.total = response.total;
@@ -318,7 +480,7 @@
       show(obj) {
         this.clientHeight = document.documentElement.clientHeight - 84 - 110;
         this.dialogViewVisible = false;
-        this.dialogShowViewVisible = true;
+        this.showdialogFormVisible = true;
         this.info(obj);
       },
       info(obj) {
@@ -326,18 +488,24 @@
         get(obj.id).then(res => {
           let result = Object.assign(that.form, res);
           // this.$set(that.form,res);
-          // showAskContent(result.ask_type_id);
+          that.showAskContent(result.ask_type_id);
           // that.form = result;
+
+          that.mapform = [result.longitude,result.latitude,result.address]
+
+          let _files = [];
+          for (var mod of result.common_inspection_files) {
+            let m = Object.assign({}, mod);
+            m.name = mod.original_name;
+            m.url = mod.files.url
+            _files.push(m);
+          }
+          that.commonInspectionFiles = _files;
           that.formdetail = result;
+          that.form = result
           console.log(that.formdetail);
+          console.log(that.commonInspectionFiles);
 
-          // let _files = [];
-          // for (var mod of result.files) {
-          //   let m = Object.assign({}, mod);
-          //   m.name = mod.original_name;
-          //   _files.push(m);
-          // }
-          // that.fileList = _files;
         }).catch(error => {
           //reject(error)
         })
@@ -349,16 +517,7 @@
         if(obj){
           this.info(obj);
         }
-        // if (isnew) {
-        //   var that = this;
-        //   that.form.content = "";
-        //   that.info(obj);
-        //   this.isReportSave = true;
-        // } else {
-        //   this.clientHeight = document.documentElement.clientHeight - 84 - 110;
-        //   this.form.safety_task_id = obj.id;
-        //   this.isReportSave = false;
-        // }
+
         this.dialogFormVisible = true;
       },
 
@@ -422,6 +581,36 @@
         that.dialogFormVisible = false;
         that.dialogShowViewVisible = false;
 
+      },
+      submitEditForm(formName){
+        var that = this;
+        this.$refs[formName].validate((valid) => {
+          if (valid) {
+            console.log(that.form);
+            return
+            save(that.form).then(response => {
+              //console.log(response)
+              this.$Message.success('操作成功');
+              that.load();
+              that.showdialogFormVisible = false;
+            }).catch(error => {
+              //reject(error)
+            })
+          } else {
+            this.$Message.error('数据校验失败');
+            console.log('error submit!!');
+            return false;
+          }
+        });
+      },
+      resetEditForm(formName) {
+        var that = this;
+        // that.fileList = [];
+        this.$refs[formName].resetFields();
+        that.mapform = [];
+        that.dialogFormVisible = false;
+        that.showdialogFormVisible = false;
+
       },
       showAskContent(val){
         getparameter({
@@ -429,33 +618,48 @@
         }).then(res =>{
           this.selects.ask_content = res.detail
         })
+      },
+      showAskContentChange(val){
+        getparameter({
+          pid:val
+        }).then(res =>{
+          this.selects.ask_content = res.detail
+          this.form.ask_content_id = ""
+        })
       },
-      handleRemove(file, fileList) {
-        console.log(fileList);
+      handleRemove(file) {
+        console.log(file);
         let listUrl = [];
-        for (var m of fileList) {
+        for (var m of file) {
           if (m.response)
-            listUrl.push(m.response.id);
+            listUrl.push({
+              upload_id:m.response.id
+            });
           else
-            listUrl.push(m.id);
+            listUrl.push({
+              upload_id:m.id
+            });
         }
         this.form.file_list = listUrl;
-      },
-      handleExceed(files, fileList) {},
-      beforeRemove(file, fileList) {
-        return this.$confirm(`确定移除 ${ file.name }？`);
+      },
+      handlePictureCardPreview(file) {
+        this.dialogImageUrl = file.url;
+        this.dialogVisible = true;
       },
       handlesuccess(response, file, fileList) {
         console.log(fileList);
         let listUrl = [];
         for (var m of fileList) {
-          if (m.response)
-            listUrl.push(m.response.id);
-          else
-            listUrl.push(m.id);
-
+          if (m.response)
+            listUrl.push({
+              upload_id:m.response.id
+            });
+          else
+            listUrl.push({
+              upload_id:m.upload_id
+            });
         }
-        this.form.file_list = listUrl;
+        this.commonInspectionFiles = listUrl;
       },
 
     }