diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index cd1e8d7..6abb8d6 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -151,24 +151,25 @@
       <!--</el-row>-->
       <el-row :gutter="20">
         <el-col :span="15">
-          <el-form-item label="详细地址" prop="position">
-            <el-col :span="12" style="padding-left: 0px">
-              <!--<area-select-input :node="node" :need-full="true" placeholder="区域"/>-->
+          <el-col :span="12" style="padding-left: 0px">
+            <el-form-item label="详细地址" prop="area">
               <area-select-tree
-                v-model="wellForm.area"
+                v-model.trim="wellForm.area"
                 :need-top="false"
                 :dept-show="true"
                 placeholder="区域"
               />
-            </el-col>
-            <el-col :span="12">
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="" prop="position">
               <el-input
                 v-model.trim="wellForm.position"
                 type="text"
-                placeholder="必填"
+                placeholder="具体位置必填"
               />
-            </el-col>
-          </el-form-item>
+            </el-form-item>
+          </el-col>
         </el-col>
       </el-row>
       <el-row :gutter="20">
@@ -311,6 +312,7 @@
             trigger: ['blur', 'change']
           }
         ],
+
         position: [
           {
             required: true,
@@ -347,7 +349,7 @@
         ],
         qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }],
         area: [
-          { required: true, message: '所在街道/镇必选', trigger: 'change' }
+          { required: true, message: '区域不能为空', trigger: 'change' }
         ]
       },
       uploadPath: process.env.BASE_API + '/imageUpload', // 图片上传路径

diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index cd1e8d7..6abb8d6 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -151,24 +151,25 @@
       <!--</el-row>-->
       <el-row :gutter="20">
         <el-col :span="15">
-          <el-form-item label="详细地址" prop="position">
-            <el-col :span="12" style="padding-left: 0px">
-              <!--<area-select-input :node="node" :need-full="true" placeholder="区域"/>-->
+          <el-col :span="12" style="padding-left: 0px">
+            <el-form-item label="详细地址" prop="area">
               <area-select-tree
-                v-model="wellForm.area"
+                v-model.trim="wellForm.area"
                 :need-top="false"
                 :dept-show="true"
                 placeholder="区域"
               />
-            </el-col>
-            <el-col :span="12">
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="" prop="position">
               <el-input
                 v-model.trim="wellForm.position"
                 type="text"
-                placeholder="必填"
+                placeholder="具体位置必填"
               />
-            </el-col>
-          </el-form-item>
+            </el-form-item>
+          </el-col>
         </el-col>
       </el-row>
       <el-row :gutter="20">
@@ -311,6 +312,7 @@
             trigger: ['blur', 'change']
           }
         ],
+
         position: [
           {
             required: true,
@@ -347,7 +349,7 @@
         ],
         qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }],
         area: [
-          { required: true, message: '所在街道/镇必选', trigger: 'change' }
+          { required: true, message: '区域不能为空', trigger: 'change' }
         ]
       },
       uploadPath: process.env.BASE_API + '/imageUpload', // 图片上传路径
diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue
index f4e6065..9079847 100644
--- a/src/views/wellManage/editWell.vue
+++ b/src/views/wellManage/editWell.vue
@@ -128,7 +128,7 @@
                     max-height="400px;"
                     alt=""
                     style="margin: 0 auto"
-                  />
+                  >
                 </div>
               </el-dialog>
             </el-form-item>
@@ -186,7 +186,6 @@
           <el-col :span="10">
             <el-form-item label="" prop="position">
               <el-input
-                style="margin-left: 30px"
                 v-model.trim="wellForm.position"
                 type="text"
                 placeholder="具体位置必填"
@@ -232,7 +231,7 @@
               @click="saveData"
             >
               保存</el-button
-            >
+              >
           </el-col>
         </el-row>
       </el-form>
@@ -241,82 +240,82 @@
 </template>
 
 <script>
-import { toTreeList } from "@/utils/structure";
-import SelectTree from "@/components/SelectTree/singleSelect";
-import AreaSelectTree from "@/components/AreaSelect/areaSelectTree";
-import { getDeptTreeList } from "@/api/system/dept";
-import { getAreaList, getAreaByDept } from "@/api/system/area";
-import { getWellType, updateWell } from "@/api/well";
-import { Uploadimg } from "@/api/common";
-import DeptSelect from "@/components/DeptSelect";
+import { toTreeList } from '@/utils/structure'
+import SelectTree from '@/components/SelectTree/singleSelect'
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getAreaList, getAreaByDept } from '@/api/system/area'
+import { getWellType, updateWell } from '@/api/well'
+import { Uploadimg } from '@/api/common'
+import DeptSelect from '@/components/DeptSelect'
 
 export default {
-  name: "EditWell",
+  name: 'EditWell',
   components: { SelectTree, DeptSelect, AreaSelectTree },
   data() {
     const validateDeep = (rule, value, callback) => {
-      if (value !== "") {
+      if (value !== '') {
         if (/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/.test(value) === false) {
-          callback(new Error("请填写大于0的数字"));
+          callback(new Error('请填写大于0的数字'))
         } else {
-          const deep = parseFloat(value);
+          const deep = parseFloat(value)
           if (deep > 10 || deep < 0) {
-            callback(new Error("请填写0到10数值"));
+            callback(new Error('请填写0到10数值'))
           } else {
-            callback();
+            callback()
           }
         }
       } else {
-        callback();
+        callback()
       }
-    };
+    }
     const validateLng = (rule, value, callback) => {
-      if (value !== "") {
+      if (value !== '') {
         if (/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/.test(value) === false) {
-          callback(new Error("请填写大于0的数字"));
+          callback(new Error('请填写大于0的数字'))
         } else {
-          callback();
+          callback()
         }
       } else {
-        callback(new Error("经度不能为空"));
+        callback(new Error('经度不能为空'))
       }
-    };
+    }
     const validateLat = (rule, value, callback) => {
-      if (value !== "") {
+      if (value !== '') {
         if (/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/.test(value) === false) {
-          callback(new Error("请填写大于0的数字"));
+          callback(new Error('请填写大于0的数字'))
         } else {
-          callback();
+          callback()
         }
       } else {
-        callback(new Error("纬度不能为空"));
+        callback(new Error('纬度不能为空'))
       }
-    };
+    }
     return {
       dialogFormVisible: false, // 对话框是否显示
       wellForm: {
-        areaId: "",
+        areaId: '',
         id: null, // 井id
-        wellCode: "", // 井编号
-        wellName: "", // 井名称
-        wellType: "", // 井类型
-        deptid: "", // 权属单位
-        deep: "", // 井深，
-        position: "", // 位置描述
-        coordinateX: "", // 经度
-        coordinateY: "", // 纬度
-        photos: "", // 照片路径
-        notes: "", // 备注,
-        qu: "",
-        area: "", // 街道
-        responsibleDept: "", // 维护人员部门
-        responsibleDeptName: "", // 维护人员部门
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
+        wellType: '', // 井类型
+        deptid: '', // 权属单位
+        deep: '', // 井深，
+        position: '', // 位置描述
+        coordinateX: '', // 经度
+        coordinateY: '', // 纬度
+        photos: '', // 照片路径
+        notes: '', // 备注,
+        qu: '',
+        area: '', // 街道
+        responsibleDept: '', // 维护人员部门
+        responsibleDeptName: '' // 维护人员部门
       }, // 表单
       deptProps: {
-        parent: "pid",
-        value: "id",
-        label: "name",
-        children: "children",
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
       },
       hideUpload: false,
       imageList: [],
@@ -325,132 +324,131 @@
       quList: [],
       jiedaoList: [],
       textMap: {
-        update: "编辑",
-        create: "新增",
+        update: '编辑',
+        create: '新增'
       }, // 表头显示标题
       rules: {
         areaId: [
           {
             required: true,
-            message: "井编号不能为空",
-            trigger: ["blur", "change"],
-          },
+            message: '区域不能为空',
+            trigger: ['blur', 'change']
+          }
         ],
         wellCode: [
           {
             required: true,
-            message: "区域位置不能为空",
-            trigger: ["blur", "change"],
-          },
+            message: '区域位置不能为空',
+            trigger: ['blur', 'change']
+          }
         ],
         wellName: [
           {
             required: true,
-            message: "井名称不能为空",
-            trigger: ["blur", "change"],
-          },
+            message: '井名称不能为空',
+            trigger: ['blur', 'change']
+          }
         ],
         position: [
           {
             required: true,
-            message: "井详细地址不能为空",
-            trigger: ["blur", "change"],
-          },
+            message: '井详细地址不能为空',
+            trigger: ['blur', 'change']
+          }
         ],
         deep: [
           {
             required: false,
-            trigger: ["blur", "change"],
-            validator: validateDeep,
-          },
+            trigger: ['blur', 'change'],
+            validator: validateDeep
+          }
         ],
         coordinateX: [
           {
             required: true,
-            trigger: ["blur", "change"],
-            validator: validateLat,
-          },
+            trigger: ['blur', 'change'],
+            validator: validateLat
+          }
         ],
         coordinateY: [
           {
             required: true,
-            trigger: ["blur", "change"],
-            validator: validateLng,
-          },
+            trigger: ['blur', 'change'],
+            validator: validateLng
+          }
         ],
         deptid: [
-          { required: true, message: "权属单位必选", trigger: "change" },
+          { required: true, message: '权属单位必选', trigger: 'change' }
         ],
         wellType: [
-          { required: true, message: "井类型必选", trigger: "change" },
+          { required: true, message: '井类型必选', trigger: 'change' }
         ],
-        qu: [{ required: true, message: "所在区/县必选", trigger: "change" }],
+        qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }],
         area: [
-          { required: true, message: "所在街道/镇必选", trigger: "change" },
-        ],
+          { required: true, message: '所在街道/镇必选', trigger: 'change' }
+        ]
       },
       deptShowTop: false, // 权属单位下拉是否显示顶级
-      dialogImageUrl: "",
+      dialogImageUrl: '',
       dialogVisible: false,
-      labelPosition: "right",
+      labelPosition: 'right',
       responseAssignShow: false,
       isEditMode: true,
-      deptShow: true,
-    };
+      deptShow: true
+    }
   },
   computed: {
     showResponseDept() {
-      if (this.wellForm.deptid === "") {
-        return true;
+      if (this.wellForm.deptid === '') {
+        return true
       } else {
-        return false;
+        return false
       }
     },
     qu() {
       // 获取区
-      return this.wellForm.qu;
-    },
+      return this.wellForm.qu
+    }
   },
   watch: {
-    "wellForm.deptid"(val, oldVal) {
+    'wellForm.deptid'(val, oldVal) {
       // 监控权属单位变化
-      if (oldVal !== "" && val !== "") {
-        this.wellForm.responsibleDept = "";
-        this.wellForm.responsibleDeptName = "";
-        this.wellForm.area = "";
-        this.wellForm.qu = "";
-        this.fetchSecondDeptTree();
-        this.fetchArea1();
+      if (oldVal !== '' && val !== '') {
+        this.wellForm.responsibleDept = ''
+        this.wellForm.responsibleDeptName = ''
+        this.wellForm.area = ''
+        this.wellForm.qu = ''
+        this.fetchSecondDeptTree()
+        this.fetchArea1()
       } else {
-        if (val !== "") {
-          this.fetchSecondDeptTree();
-          this.fetchArea1();
+        if (val !== '') {
+          this.fetchSecondDeptTree()
+          this.fetchArea1()
         }
       }
     },
     qu(val) {
       // 监控区变化
-      if (val !== "") {
-        this.fetchArea2();
+      if (val !== '') {
+        this.fetchArea2()
       }
-    },
+    }
   },
-  mounted: function () {
-    this.fetchWellType();
-    this.imageList = [];
+  mounted: function() {
+    this.fetchWellType()
+    this.imageList = []
   },
   methods: {
     selectnode(node) {
-      this.wellForm.areaId = node.id;
+      this.wellForm.areaId = node.id
     },
     // 初始化对话框
-    initDialog: function (dialogFormVisible, row = null) {
-      this.imageList = [];
-      if (row.photos.length === 0 && this.$refs.upload)
-        this.$refs.upload.clearFiles();
-      this.dialogFormVisible = dialogFormVisible;
-      this.fetchWellType();
-      console.log(row, "===---098");
+    initDialog: function(dialogFormVisible, row = null) {
+      this.imageList = []
+      if (row.photos.length === 0 && this.$refs.upload) { this.$refs.upload.clearFiles() }
+      this.dialogFormVisible = dialogFormVisible
+      this.fetchWellType()
+      console.log(row, '===---098')
       this.wellForm = {
         id: row.id, // 井id
         areaId: row.areaId,
@@ -467,170 +465,170 @@
         qu: row.qu,
         area: row.area, // 街道
         responsibleDept: row.responsibleDept, // 维护人员部门
-        responsibleDeptName: row.responsibleDeptName, // 维护人员部门
-      };
-      if (row.deptid && row.deptid !== "") {
-        this.fetchArea1(row.deptid);
-        this.fetchArea2();
-        this.fetchSecondDeptTree();
-        this.loading = false;
+        responsibleDeptName: row.responsibleDeptName // 维护人员部门
+      }
+      if (row.deptid && row.deptid !== '') {
+        this.fetchArea1(row.deptid)
+        this.fetchArea2()
+        this.fetchSecondDeptTree()
+        this.loading = false
       }
       // 处理图片
-      const base_url = process.env.BASE_API + "/static/";
-      const urls = row.photos.split(";");
+      const base_url = process.env.BASE_API + '/static/'
+      const urls = row.photos.split(';')
       for (const url of urls) {
         if (url) {
-          this.imageList.push({ name: url, url: base_url + url });
+          this.imageList.push({ name: url, url: base_url + url })
         }
       }
-      this.handleChange(null, this.imageList);
+      this.handleChange(null, this.imageList)
     },
     // 加载组织机构树形下拉菜单
-    fetchSecondDeptTree: function () {
+    fetchSecondDeptTree: function() {
       const listQuery = {
         pid: this.wellForm.deptid,
-        deptType: "04",
-      };
+        deptType: '04'
+      }
       getDeptTreeList(listQuery).then((response) => {
-        console.log(response.data);
+        console.log(response.data)
         if (response.data.list) {
           this.secondDeptTreeList = toTreeList(
             response.data.list,
             this.wellForm.deptid
-          );
+          )
         }
-      });
+      })
     },
     // 获取井类型
     fetchWellType() {
       getWellType().then((response) => {
-        this.wellTypeList = [];
-        const wellTypes = this.$store.getters.wellTypes;
+        this.wellTypeList = []
+        const wellTypes = this.$store.getters.wellTypes
         for (const wellType of response.data) {
           if (wellTypes.indexOf(wellType.value) !== -1) {
-            this.wellTypeList.push(wellType);
+            this.wellTypeList.push(wellType)
           }
         }
         if (this.wellTypeList.length <= 1) {
-          this.showWellType = false;
+          this.showWellType = false
         }
-      });
+      })
     },
     // 获取区域1
     fetchArea1(deptid) {
       getAreaByDept(this.wellForm.deptid).then((response) => {
         if (response.code === 200) {
-          const pid = response.data.area;
+          const pid = response.data.area
           getAreaList(pid).then((response) => {
-            this.quList = response.data;
-          });
+            this.quList = response.data
+          })
         }
-      });
+      })
     },
     // 改变权属单位选项时
     deptChanged() {
-      console.log("deptChanged");
-      this.wellForm.responsibleDept = "";
-      this.wellForm.area = "";
-      this.wellForm.qu = "";
+      console.log('deptChanged')
+      this.wellForm.responsibleDept = ''
+      this.wellForm.area = ''
+      this.wellForm.qu = ''
     },
     // 改变区选项时的操作
     quChanged() {
-      this.wellForm.area = "";
+      this.wellForm.area = ''
     },
     // 获取区域2
     fetchArea2() {
       getAreaList(this.wellForm.qu).then((response) => {
-        this.jiedaoList = response.data;
-      });
+        this.jiedaoList = response.data
+      })
     },
     // 取消
     cancel() {
-      this.dialogFormVisible = false;
-      this.imageList = [];
-      this.wellForm.deptid = "";
-      this.$emit("watchChild");
+      this.dialogFormVisible = false
+      this.imageList = []
+      this.wellForm.deptid = ''
+      this.$emit('watchChild')
       // 清除验证
       this.$nextTick(() => {
-        this.$refs["dataForm"].clearValidate();
-      });
+        this.$refs['dataForm'].clearValidate()
+      })
     },
     // 保存数据
-    saveData: function () {
-      this.wellForm.photos = "";
-      if (this.wellForm.responsibleDept === "") {
+    saveData: function() {
+      this.wellForm.photos = ''
+      if (this.wellForm.responsibleDept === '') {
         if (this.secondDeptTreeList.length > 0) {
-          this.$message.warning("必须选择维护机构");
-          return;
+          this.$message.warning('必须选择维护机构')
+          return
         } else {
-          this.wellForm.responsibleDept = this.wellForm.deptid;
+          this.wellForm.responsibleDept = this.wellForm.deptid
         }
       }
       for (const image of this.imageList) {
-        let index = image.url.indexOf("/static/");
+        let index = image.url.indexOf('/static/')
         if (index !== -1) {
-          index += 8;
+          index += 8
         }
-        this.wellForm.photos += image.url.substring(index) + ";";
+        this.wellForm.photos += image.url.substring(index) + ';'
       }
-      this.$refs["dataForm"].validate((valid) => {
+      this.$refs['dataForm'].validate((valid) => {
         if (valid) {
           updateWell(this.wellForm).then((response) => {
-            console.log("修改井");
+            console.log('修改井')
             if (response.code === 200) {
-              this.$message.success("修改成功!");
-              this.$emit("watchChild");
-              this.dialogFormVisible = false;
-              this.imageList = [];
+              this.$message.success('修改成功!')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+              this.imageList = []
             }
             // 清除验证
             this.$nextTick(() => {
-              this.$refs["dataForm"].clearValidate();
-            });
-          });
+              this.$refs['dataForm'].clearValidate()
+            })
+          })
         }
-      });
+      })
     },
     uploadFile(file) {
-      console.log("uploadFile:" + file.file.name);
-      const base_url = process.env.BASE_API + "/static/";
+      console.log('uploadFile:' + file.file.name)
+      const base_url = process.env.BASE_API + '/static/'
       Uploadimg(file).then((res) => {
         if (res.code === 200) {
           this.imageList.push({
             name: file.file.name,
-            url: base_url + res.data,
-          });
+            url: base_url + res.data
+          })
         }
-      });
+      })
     },
     handleBeforeUpload(file) {
-      const isJPG = file.type === "image/jpeg" || file.type === "image/png";
-      let res = true;
-      const isLt2M = file.size / 1024 / 1024 < 5;
+      const isJPG = file.type === 'image/jpeg' || file.type === 'image/png'
+      let res = true
+      const isLt2M = file.size / 1024 / 1024 < 5
       if (!isJPG) {
-        this.$message.error("上传图片只能是 JPG 或 PNG 格式!");
-        res = false;
+        this.$message.error('上传图片只能是 JPG 或 PNG 格式!')
+        res = false
       }
       if (!isLt2M) {
-        this.$message.error("上传图片大小不能超过 5MB!");
-        res = false;
+        this.$message.error('上传图片大小不能超过 5MB!')
+        res = false
       }
       for (const i in this.fileList) {
         if (this.fileList[i].name === file.name) {
-          this.$message.error("该图片已上传过，请选择其他图片");
-          res = false;
+          this.$message.error('该图片已上传过，请选择其他图片')
+          res = false
         }
       }
-      return res;
+      return res
     },
     // 文件列表移除文件时的钩子
     handleRemove(file, fileList) {
-      console.log("handleRemove");
+      console.log('handleRemove')
       for (const i in this.imageList) {
         if (this.imageList[i].name === file.name) {
-          this.imageList.splice(i, 1);
-          this.hideUpload = this.imageList.length >= 4;
-          return;
+          this.imageList.splice(i, 1)
+          this.hideUpload = this.imageList.length >= 4
+          return
         }
       }
     },
@@ -639,24 +637,24 @@
         `限制选择 4 张图片，本次选择了 ${files.length} 张图片，共选择了 ${
           files.length + fileList.length
         } 张图片`
-      );
+      )
     },
     // 点击文件列表中已上传的文件时的钩子
     handlePictureCardPreview(file) {
-      console.log("handlePictureCardPreview");
-      this.dialogImageUrl = file.url;
-      this.dialogVisible = true;
+      console.log('handlePictureCardPreview')
+      this.dialogImageUrl = file.url
+      this.dialogVisible = true
     },
     handleChange(file, fileList) {
-      console.log("handleChange");
+      console.log('handleChange')
       if (fileList) {
-        this.hideUpload = fileList.length >= 4;
+        this.hideUpload = fileList.length >= 4
       } else {
-        this.hideUpload = false;
+        this.hideUpload = false
       }
-    },
-  },
-};
+    }
+  }
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss">