diff --git a/src/assets/scss/modules/management/detail-main.scss b/src/assets/scss/modules/management/detail-main.scss
index e79c35498..31f16237f 100644
--- a/src/assets/scss/modules/management/detail-main.scss
+++ b/src/assets/scss/modules/management/detail-main.scss
@@ -17,7 +17,7 @@
 }
 
 .div-btn{
-  margin-top:50px;
+  margin-top:30px;
   // margin-bottom:20px;
   display: flex;
   justify-content: center;
diff --git a/src/assets/scss/pages/loginWork.scss b/src/assets/scss/pages/loginWork.scss
index 534cccba9..7f5689f2f 100644
--- a/src/assets/scss/pages/loginWork.scss
+++ b/src/assets/scss/pages/loginWork.scss
@@ -64,6 +64,7 @@
 
         .input {
           width: 85%;
+          margin-bottom: 0;
 
           input {
             display: block;
diff --git a/src/utils/index.js b/src/utils/index.js
index 8cd1c35cb..9567f50d6 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -1,17 +1,18 @@
-import store from '@/js/store'
+import store from "@/js/store";
+import JSEncrypt from "jsencrypt"; //引入加密
 
 /**
  * 获取字典数据列表
  * @param dictType  字典类型
  */
 export function getDictDataList(dictType) {
-  const type = window.SITE_CONFIG['dictList'].find(
+  const type = window.SITE_CONFIG["dictList"].find(
     (element) => element.dictType === dictType
-  )
+  );
   if (type) {
-    return type.dataList
+    return type.dataList;
   } else {
-    return []
+    return [];
   }
 }
 
@@ -21,20 +22,20 @@ export function getDictDataList(dictType) {
  * @param dictValue  字典值
  */
 export function getDictLabel(dictType, dictValue) {
-  const type = window.SITE_CONFIG['dictList'].find(
+  const type = window.SITE_CONFIG["dictList"].find(
     (element) => element.dictType === dictType
-  )
+  );
   if (type) {
     const val = type.dataList.find(
       (element) => element.dictValue === dictValue.toString()
-    )
+    );
     if (val) {
-      return val.dictLabel
+      return val.dictLabel;
     } else {
-      return dictValue
+      return dictValue;
     }
   } else {
-    return dictValue
+    return dictValue;
   }
 }
 
@@ -42,29 +43,31 @@ export function getDictLabel(dictType, dictValue) {
  * 清除登录信息
  */
 export function clearLoginInfo() {
-  store.commit('resetStore')
-  localStorage.removeItem('token')
-  window.SITE_CONFIG['dynamicMenuRoutesHasAdded'] = false
+  store.commit("resetStore");
+  localStorage.removeItem("token");
+  window.SITE_CONFIG["dynamicMenuRoutesHasAdded"] = false;
 }
 
 /**
  * 获取uuid
  */
 export function getUUID() {
-  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, (c) => {
-    return (c === 'x' ? (Math.random() * 16) | 0 : 'r&0x3' | '0x8').toString(16)
-  })
+  return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, (c) => {
+    return (c === "x" ? (Math.random() * 16) | 0 : "r&0x3" | "0x8").toString(
+      16
+    );
+  });
 }
 
 /**
  * 获取svg图标(id)列表
  */
 export function getIconList() {
-  var res = []
-  document.querySelectorAll('svg symbol').forEach((item) => {
-    res.push(item.id)
-  })
-  return res
+  var res = [];
+  document.querySelectorAll("svg symbol").forEach((item) => {
+    res.push(item.id);
+  });
+  return res;
 }
 
 /**
@@ -73,46 +76,49 @@ export function getIconList() {
  * @param {*} id
  * @param {*} pid
  */
-export function treeDataTranslate(data, id = 'id', pid = 'pid') {
-  var res = []
-  var temp = {}
+export function treeDataTranslate(data, id = "id", pid = "pid") {
+  var res = [];
+  var temp = {};
   for (var i = 0; i < data.length; i++) {
-    temp[data[i][id]] = data[i]
+    temp[data[i][id]] = data[i];
   }
   for (var k = 0; k < data.length; k++) {
     if (!temp[data[k][pid]] || data[k][id] === data[k][pid]) {
-      res.push(data[k])
-      continue
+      res.push(data[k]);
+      continue;
     }
-    if (!temp[data[k][pid]]['children']) {
-      temp[data[k][pid]]['children'] = []
+    if (!temp[data[k][pid]]["children"]) {
+      temp[data[k][pid]]["children"] = [];
     }
-    temp[data[k][pid]]['children'].push(data[k])
-    data[k]['_level'] = (temp[data[k][pid]]._level || 0) + 1
+    temp[data[k][pid]]["children"].push(data[k]);
+    data[k]["_level"] = (temp[data[k][pid]]._level || 0) + 1;
   }
-  return res
+  return res;
 }
 
 // 时间格式化
 export function dateFormats(fmt, date) {
-  let ret
-  const _date = new Date(date)
+  let ret;
+  const _date = new Date(date);
   const opt = {
-    'Y+': _date.getFullYear().toString(), // 年
-    'm+': (_date.getMonth() + 1).toString(), // 月
-    'd+': _date.getDate().toString(), // 日
-    'H+': _date.getHours().toString(), // 时
-    'M+': _date.getMinutes().toString(), // 分
-    'S+': _date.getSeconds().toString() // 秒
+    "Y+": _date.getFullYear().toString(), // 年
+    "m+": (_date.getMonth() + 1).toString(), // 月
+    "d+": _date.getDate().toString(), // 日
+    "H+": _date.getHours().toString(), // 时
+    "M+": _date.getMinutes().toString(), // 分
+    "S+": _date.getSeconds().toString(), // 秒
     // 有其他格式化字符需求可以继续添加，必须转化成字符串
-  }
+  };
   for (const k in opt) {
-    ret = new RegExp('(' + k + ')').exec(fmt)
+    ret = new RegExp("(" + k + ")").exec(fmt);
     if (ret) {
-      fmt = fmt.replace(ret[1], (ret[1].length === 1) ? (opt[k]) : (opt[k].padStart(ret[1].length, '0')))
+      fmt = fmt.replace(
+        ret[1],
+        ret[1].length === 1 ? opt[k] : opt[k].padStart(ret[1].length, "0")
+      );
     }
   }
-  return fmt
+  return fmt;
 }
 //  根据身份证计算出生日期，性别，年龄
 export function computedCard(idCard) {
@@ -123,49 +129,78 @@ export function computedCard(idCard) {
   let day = myDate.getDate();
   let age = 0;
 
-  if(idCard.length===18){
+  if (idCard.length === 18) {
     age = myDate.getFullYear() - idCard.substring(6, 10) - 1;
-    sex = idCard.substring(16,17);
-    birth = idCard.substring(6,10)+"-"+idCard.substring(10,12)+"-"+idCard.substring(12,14);
-    if (idCard.substring(10, 12) < month || idCard.substring(10, 12) === month && idCard.substring(12, 14) <= day) age++;
-
+    sex = idCard.substring(16, 17);
+    birth =
+      idCard.substring(6, 10) +
+      "-" +
+      idCard.substring(10, 12) +
+      "-" +
+      idCard.substring(12, 14);
+    if (
+      idCard.substring(10, 12) < month ||
+      (idCard.substring(10, 12) === month && idCard.substring(12, 14) <= day)
+    )
+      age++;
   }
-  if(idCard.length===15){
+  if (idCard.length === 15) {
     age = myDate.getFullYear() - idCard.substring(6, 8) - 1901;
-    sex = idCard.substring(13,14);
-    birth = "19"+idCard.substring(6,8)+"-"+idCard.substring(8,10)+"-"+idCard.substring(10,12);
-    if (idCard.substring(8, 10) < month || idCard.substring(8, 10) === month && idCard.substring(10, 12) <= day) age++;
+    sex = idCard.substring(13, 14);
+    birth =
+      "19" +
+      idCard.substring(6, 8) +
+      "-" +
+      idCard.substring(8, 10) +
+      "-" +
+      idCard.substring(10, 12);
+    if (
+      idCard.substring(8, 10) < month ||
+      (idCard.substring(8, 10) === month && idCard.substring(10, 12) <= day)
+    )
+      age++;
   }
 
-  if(sex%2 === 0)
-    sex = '0';  // 性别代码 1代表男，0代表女，暂时不涉及其他类型性别
-  else
-    sex = '1';
-  return  {age , sex, birth}
+  if (sex % 2 === 0)
+    sex = "0"; // 性别代码 1代表男，0代表女，暂时不涉及其他类型性别
+  else sex = "1";
+  return { age, sex, birth };
 }
 // 将数组分成小块数组的集合
 export function spliceIntoChunks(arr, chunkSize) {
   const res = [];
   while (arr.length > 0) {
-      const chunk = arr.splice(0, chunkSize);
-      res.push(chunk);
+    const chunk = arr.splice(0, chunkSize);
+    res.push(chunk);
   }
   return res;
 }
+
 // 获取当前时间 如果有指定time则按指定的来
-export function getCurrentDate(hour,min,sec) {
-  console.log(hour,min,sec)
+export function getCurrentDate(hour, min, sec) {
+  console.log(hour, min, sec);
   let date = new Date();
-  if (hour){
+  if (hour) {
     date.setHours(hour);
-    console.log(hour)
-  }if (min!==undefined){
+    console.log(hour);
+  }
+  if (min !== undefined) {
     date.setMinutes(min);
-    console.log(min)
-  }if (sec!==undefined){
+    console.log(min);
+  }
+  if (sec !== undefined) {
     date.setSeconds(sec);
-    console.log(sec)
+    console.log(sec);
   }
   return date;
 }
 
+// 加密
+export function encryptedData(key, data) {
+  // 新建JSEncrypt对象
+  let encryptor = new JSEncrypt();
+  // 设置公钥
+  encryptor.setPublicKey(key);
+  // 加密数据
+  return encryptor.encrypt(data);
+}
diff --git a/src/views/main-navbar-update-password-work.vue b/src/views/main-navbar-update-password-work.vue
index c29715ba6..e90d92ab7 100644
--- a/src/views/main-navbar-update-password-work.vue
+++ b/src/views/main-navbar-update-password-work.vue
@@ -16,13 +16,13 @@
       <el-form-item :label="$t('updatePassword.username')">
         <span>{{ $store.state.user.realName }}</span>
       </el-form-item>
-      <!-- <el-form-item prop="password" :label="$t('updatePassword.password')">
+      <el-form-item prop="password" :label="$t('updatePassword.password')">
         <el-input
           v-model="dataForm.password"
           type="password"
           :placeholder="$t('updatePassword.password')"
         ></el-input>
-      </el-form-item> -->
+      </el-form-item>
       <el-form-item
         prop="newPassword"
         :label="$t('updatePassword.newPassword')"
@@ -30,7 +30,7 @@
         <el-input
           v-model="dataForm.newPassword"
           type="password"
-          :placeholder="$t('updatePassword.newPassword')"
+          placeholder="密码必须8-20个字符，而且同时包含大小写字母和数字"
         ></el-input>
       </el-form-item>
       <el-form-item
@@ -45,104 +45,143 @@
       </el-form-item>
     </el-form>
     <template slot="footer">
-      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button @click="visible = false">{{ $t("cancel") }}</el-button>
       <el-button type="primary" @click="dataFormSubmitHandle()">{{
-        $t('confirm')
+        $t("confirm")
       }}</el-button>
     </template>
   </el-dialog>
 </template>
 
 <script>
-import debounce from 'lodash/debounce'
-import { clearLoginInfo } from '@/utils'
+import debounce from "lodash/debounce";
+import { clearLoginInfo, encryptedData } from "@/utils";
+
 export default {
   data() {
     return {
       visible: false,
+      pubKey: "",
       dataForm: {
-        password: '',
-        newPassword: '',
-        confirmPassword: ''
-      }
-    }
+        password: "",
+        newPassword: "",
+        confirmPassword: "",
+      },
+    };
   },
   computed: {
     dataRule() {
       var validateConfirmPassword = (rule, value, callback) => {
         if (this.dataForm.newPassword !== value) {
           return callback(
-            new Error(this.$t('updatePassword.validate.confirmPassword'))
-          )
+            new Error(this.$t("updatePassword.validate.confirmPassword"))
+          );
         }
-        callback()
-      }
+        callback();
+      };
       return {
-        // password: [
-        //   {
-        //     required: true,
-        //     message: this.$t('validate.required'),
-        //     trigger: 'blur'
-        //   }
-        // ],
+        password: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
         newPassword: [
           {
             required: true,
-            message: this.$t('validate.required'),
-            trigger: 'blur'
-          }
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
         ],
         confirmPassword: [
           {
             required: true,
-            message: this.$t('validate.required'),
-            trigger: 'blur'
+            message: this.$t("validate.required"),
+            trigger: "blur",
           },
-          { validator: validateConfirmPassword, trigger: 'blur' }
-        ]
-      }
-    }
+          { validator: validateConfirmPassword, trigger: "blur" },
+        ],
+      };
+    },
   },
   methods: {
     init() {
-      this.visible = true
+      this.visible = true;
       this.$nextTick(() => {
-        this.$refs['dataForm'].resetFields()
-      })
+        this.$refs["dataForm"].resetFields();
+      });
+
+      //获取公钥
+      this.getPubKey();
     },
+    // 获取公钥
+    getPubKey() {
+      this.$http
+        .post("/auth/govweb/getKey")
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          }
+
+          this.pubKey = res.data; // 获取到公钥;
+        })
+        .catch(() => {});
+    },
+
+    validateComplexity(pwd) {
+      let regex = new RegExp("(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z]).{8,20}");
+
+      if (!regex.test(pwd)) {
+        this.$message({
+          message:
+            "密码必须8-20个字符，而且同时包含大小写字母和数字",
+          type: "error",
+        });
+        return false;
+      }
+      return true;
+    },
+
     // 表单提交
     dataFormSubmitHandle: debounce(
       function () {
-        this.$refs['dataForm'].validate((valid) => {
-          if (!valid) {
-            return false
-          }
+        this.$refs["dataForm"].validate((valid) => {
+          if (!valid) return false;
+
+          if (!this.validateComplexity(this.dataForm.newPassword)) return false;
+
+          const { pubKey } = this;
           this.$http
-            .post('/gov/mine/mine/resetpassword', {
-              newPassword: this.dataForm.newPassword,
-              confirmNewPassword: this.dataForm.confirmPassword
+            .post("/gov/mine/mine/resetpassword", {
+              oldPassword: encryptedData(pubKey, this.dataForm.password),
+              newPassword: encryptedData(pubKey, this.dataForm.newPassword),
+              confirmNewPassword: encryptedData(
+                pubKey,
+                this.dataForm.confirmPassword
+              ),
             })
             .then(({ data: res }) => {
               if (res.code !== 0) {
-                return this.$message.error(res.msg)
+                return this.$message.error(res.msg);
               }
               this.$message({
-                message: this.$t('prompt.success'),
-                type: 'success',
+                message: this.$t("prompt.success"),
+                type: "success",
                 duration: 500,
                 onClose: () => {
-                  this.visible = false
-                  clearLoginInfo()
-                  this.$router.replace({ name: 'loginWork' })
-                }
-              })
+                  this.visible = false;
+                  clearLoginInfo();
+                  this.$router.replace({ name: "login" });
+                },
+              });
             })
-            .catch(() => {})
-        })
+            .catch(() => {});
+        });
       },
       1000,
       { leading: true, trailing: false }
-    )
-  }
-}
+    ),
+  },
+};
 </script>
diff --git a/src/views/main-shuju/main-navbar-update-password-work.vue b/src/views/main-shuju/main-navbar-update-password-work.vue
deleted file mode 100644
index c29715ba6..000000000
--- a/src/views/main-shuju/main-navbar-update-password-work.vue
+++ /dev/null
@@ -1,148 +0,0 @@
-<template>
-  <el-dialog
-    :visible.sync="visible"
-    :title="$t('updatePassword.title')"
-    :close-on-click-modal="false"
-    :close-on-press-escape="false"
-    :append-to-body="true"
-  >
-    <el-form
-      :model="dataForm"
-      :rules="dataRule"
-      ref="dataForm"
-      @keyup.enter.native="dataFormSubmitHandle()"
-      label-width="120px"
-    >
-      <el-form-item :label="$t('updatePassword.username')">
-        <span>{{ $store.state.user.realName }}</span>
-      </el-form-item>
-      <!-- <el-form-item prop="password" :label="$t('updatePassword.password')">
-        <el-input
-          v-model="dataForm.password"
-          type="password"
-          :placeholder="$t('updatePassword.password')"
-        ></el-input>
-      </el-form-item> -->
-      <el-form-item
-        prop="newPassword"
-        :label="$t('updatePassword.newPassword')"
-      >
-        <el-input
-          v-model="dataForm.newPassword"
-          type="password"
-          :placeholder="$t('updatePassword.newPassword')"
-        ></el-input>
-      </el-form-item>
-      <el-form-item
-        prop="confirmPassword"
-        :label="$t('updatePassword.confirmPassword')"
-      >
-        <el-input
-          v-model="dataForm.confirmPassword"
-          type="password"
-          :placeholder="$t('updatePassword.confirmPassword')"
-        ></el-input>
-      </el-form-item>
-    </el-form>
-    <template slot="footer">
-      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
-      <el-button type="primary" @click="dataFormSubmitHandle()">{{
-        $t('confirm')
-      }}</el-button>
-    </template>
-  </el-dialog>
-</template>
-
-<script>
-import debounce from 'lodash/debounce'
-import { clearLoginInfo } from '@/utils'
-export default {
-  data() {
-    return {
-      visible: false,
-      dataForm: {
-        password: '',
-        newPassword: '',
-        confirmPassword: ''
-      }
-    }
-  },
-  computed: {
-    dataRule() {
-      var validateConfirmPassword = (rule, value, callback) => {
-        if (this.dataForm.newPassword !== value) {
-          return callback(
-            new Error(this.$t('updatePassword.validate.confirmPassword'))
-          )
-        }
-        callback()
-      }
-      return {
-        // password: [
-        //   {
-        //     required: true,
-        //     message: this.$t('validate.required'),
-        //     trigger: 'blur'
-        //   }
-        // ],
-        newPassword: [
-          {
-            required: true,
-            message: this.$t('validate.required'),
-            trigger: 'blur'
-          }
-        ],
-        confirmPassword: [
-          {
-            required: true,
-            message: this.$t('validate.required'),
-            trigger: 'blur'
-          },
-          { validator: validateConfirmPassword, trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  methods: {
-    init() {
-      this.visible = true
-      this.$nextTick(() => {
-        this.$refs['dataForm'].resetFields()
-      })
-    },
-    // 表单提交
-    dataFormSubmitHandle: debounce(
-      function () {
-        this.$refs['dataForm'].validate((valid) => {
-          if (!valid) {
-            return false
-          }
-          this.$http
-            .post('/gov/mine/mine/resetpassword', {
-              newPassword: this.dataForm.newPassword,
-              confirmNewPassword: this.dataForm.confirmPassword
-            })
-            .then(({ data: res }) => {
-              if (res.code !== 0) {
-                return this.$message.error(res.msg)
-              }
-              this.$message({
-                message: this.$t('prompt.success'),
-                type: 'success',
-                duration: 500,
-                onClose: () => {
-                  this.visible = false
-                  clearLoginInfo()
-                  this.$router.replace({ name: 'loginWork' })
-                }
-              })
-            })
-            .catch(() => {})
-        })
-      },
-      1000,
-      { leading: true, trailing: false }
-    )
-  }
-}
-</script>
diff --git a/src/views/main-shuju/main-navbar.vue b/src/views/main-shuju/main-navbar.vue
index e0715272f..2672b6952 100644
--- a/src/views/main-shuju/main-navbar.vue
+++ b/src/views/main-shuju/main-navbar.vue
@@ -139,7 +139,7 @@
 import { messages } from "@/i18n";
 import { mapGetters } from "vuex";
 import screenfull from "screenfull";
-import UpdatePasswordWork from "./main-navbar-update-password-work";
+import UpdatePasswordWork from "@/views/main-navbar-update-password-work";
 import { clearLoginInfo } from "@/utils";
 export default {
   inject: ["refresh"],
diff --git a/src/views/modules/base/community/buildDetail.vue b/src/views/modules/base/community/buildDetail.vue
index 31039d156..270e0ae72 100644
--- a/src/views/modules/base/community/buildDetail.vue
+++ b/src/views/modules/base/community/buildDetail.vue
@@ -68,7 +68,11 @@
       </div>
 
     </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
 
+    </div>
   </div>
 </template>
 
@@ -120,6 +124,11 @@ export default {
   },
 
   methods: {
+    handleCancle () {
+      this.diaDestroy()
+      this.$emit('diaDetailClose')
+
+    },
     diaDestroy () {
       if (map) {
         map.destroy()
diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue
index 97fd4eb2f..b8d5ecafc 100644
--- a/src/views/modules/base/community/buildTable.vue
+++ b/src/views/modules/base/community/buildTable.vue
@@ -14,7 +14,8 @@
                    size="small"
                    @click="handleExportModule('building')">下载楼栋模板</el-button>
 
-        <el-upload :headers="$getElUploadHeaders()"  style=""
+        <el-upload :headers="$getElUploadHeaders()"
+                   style=""
                    ref="upload_building"
                    :multiple='false'
                    :show-file-list='false'
@@ -31,7 +32,8 @@
                    size="small"
                    @click="handleExportModule('room')">下载房屋模板</el-button>
 
-        <el-upload :headers="$getElUploadHeaders()"  style=""
+        <el-upload :headers="$getElUploadHeaders()"
+                   style=""
                    ref="upload_room"
                    :multiple='false'
                    :show-file-list='false'
@@ -206,7 +208,8 @@
                width="900px"
                class="dialog-h"
                @closed="detailFormCancle">
-      <build-detail ref="ref_form_detail"></build-detail>
+      <build-detail ref="ref_form_detail"
+                    @diaDetailClose="detailFormCancle"></build-detail>
     </el-dialog>
 
     <baobiao ref="baobiao" />
diff --git a/src/views/modules/base/community/communityDetail.vue b/src/views/modules/base/community/communityDetail.vue
index b04e4f30f..26367608e 100644
--- a/src/views/modules/base/community/communityDetail.vue
+++ b/src/views/modules/base/community/communityDetail.vue
@@ -61,7 +61,11 @@
       </div>
 
     </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
 
+    </div>
   </div>
 </template>
 
@@ -106,6 +110,11 @@ export default {
   },
 
   methods: {
+    handleCancle () {
+      this.diaDestroy()
+      this.$emit('diaDetailClose')
+
+    },
     diaDestroy () {
       if (map) {
         map.destroy()
diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index ede5b04ce..519ffa792 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -26,7 +26,8 @@
                    size="small"
                    @click="handleExportModule('community')">下载小区模板</el-button>
 
-        <el-upload :headers="$getElUploadHeaders()"  ref="upload_community"
+        <el-upload :headers="$getElUploadHeaders()"
+                   ref="upload_community"
                    style=""
                    :multiple='false'
                    :show-file-list='false'
@@ -44,7 +45,8 @@
                    size="small"
                    @click="handleExportModule('building')">下载楼栋模板</el-button>
 
-        <el-upload :headers="$getElUploadHeaders()"  style=""
+        <el-upload :headers="$getElUploadHeaders()"
+                   style=""
                    ref="upload_building"
                    :multiple='false'
                    :show-file-list='false'
@@ -61,7 +63,8 @@
                    size="small"
                    @click="handleExportModule('room')">下载房屋模板</el-button>
 
-        <el-upload :headers="$getElUploadHeaders()"  style=""
+        <el-upload :headers="$getElUploadHeaders()"
+                   style=""
                    ref="upload_room"
                    :multiple='false'
                    :show-file-list='false'
@@ -193,7 +196,8 @@
                top="5vh"
                class="dialog-h"
                @closed="detailFormCancle">
-      <community-detail ref="ref_form_detail"></community-detail>
+      <community-detail ref="ref_form_detail"
+                        @diaDetailClose="detailFormCancle"></community-detail>
     </el-dialog>
 
     <!-- 修改弹出框 -->
diff --git a/src/views/modules/base/community/roomDetail.vue b/src/views/modules/base/community/roomDetail.vue
index fe7d74547..45bc21fc3 100644
--- a/src/views/modules/base/community/roomDetail.vue
+++ b/src/views/modules/base/community/roomDetail.vue
@@ -66,7 +66,11 @@
       </div>
 
     </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
 
+    </div>
   </div>
 </template>
 
@@ -117,7 +121,11 @@ export default {
   },
 
   methods: {
+    handleCancle () {
+      // this.diaDestroy()
+      this.$emit('diaDetailClose')
 
+    },
     diaDestroy () {
       if (map) {
         map.destroy()
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index a0b92e4ce..354b3684d 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -8,7 +8,8 @@
                  @click="handleAdd">新增房屋</el-button>
       <div class="btn_upload"
            v-if="showImportBtn">
-        <el-button :headers="$getElUploadHeaders()" style="float: left"
+        <el-button :headers="$getElUploadHeaders()"
+                   style="float: left"
                    class="diy-button--export"
                    size="small"
                    @click="handleExportModule">下载房屋模板</el-button>
@@ -196,7 +197,8 @@
                top="5vh"
                class="dialog-h"
                @closed="detailFormCancle">
-      <room-detail ref="ref_form_detail"></room-detail>
+      <room-detail ref="ref_form_detail"
+                   @diaDetailClose="detailFormCancle"></room-detail>
     </el-dialog>
 
     <baobiao ref="baobiao" />
diff --git a/src/views/modules/base/huji/chusheng/cpts/detail.vue b/src/views/modules/base/huji/chusheng/cpts/detail.vue
index 95a0f4058..b68fae161 100644
--- a/src/views/modules/base/huji/chusheng/cpts/detail.vue
+++ b/src/views/modules/base/huji/chusheng/cpts/detail.vue
@@ -71,7 +71,11 @@
       </div>
 
     </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
 
+    </div>
   </div>
 </template>
 
@@ -132,7 +136,11 @@ export default {
 
   methods: {
 
+    handleCancle () {
+
+      this.$emit('diaDetailClose')
 
+    },
     async initForm (row) {
 
       await this.getInfo(row.id);
diff --git a/src/views/modules/base/huji/chusheng/index.vue b/src/views/modules/base/huji/chusheng/index.vue
index 659071823..a4112360a 100644
--- a/src/views/modules/base/huji/chusheng/index.vue
+++ b/src/views/modules/base/huji/chusheng/index.vue
@@ -168,7 +168,8 @@
                    class="diy-button--export"
                    size="small"
                    @click="handleExportModule('room')">下载模板</el-button>
-        <el-upload :headers="$getElUploadHeaders()" v-if="false"
+        <el-upload :headers="$getElUploadHeaders()"
+                   v-if="false"
                    ref="upload"
                    class="upload-btn"
                    action="uploadUlr"
@@ -350,7 +351,9 @@
                top="5vh"
                class="dialog-h"
                @closed="detailFormCancle">
-      <detail-form ref="ref_form_detail"></detail-form>
+      <detail-form ref="ref_form_detail"
+                   @diaDetailClose="detailFormCancle"></detail-form>
+
     </el-dialog>
   </div>
 </template>
diff --git a/src/views/modules/base/huji/immigration/detail.vue b/src/views/modules/base/huji/immigration/detail.vue
index 84e595d76..fcdafa994 100644
--- a/src/views/modules/base/huji/immigration/detail.vue
+++ b/src/views/modules/base/huji/immigration/detail.vue
@@ -71,7 +71,11 @@
       </div>
 
     </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
 
+    </div>
   </div>
 </template>
 
@@ -99,7 +103,11 @@ export default {
   },
 
   methods: {
+    handleCancle () {
+
+      this.$emit('diaDetailClose')
 
+    },
     async initForm (id) {
 
       await this.getDatail(id)
diff --git a/src/views/modules/base/huji/immigration/index.vue b/src/views/modules/base/huji/immigration/index.vue
index be5ccf66f..a15e65ba0 100644
--- a/src/views/modules/base/huji/immigration/index.vue
+++ b/src/views/modules/base/huji/immigration/index.vue
@@ -357,7 +357,8 @@
                class="dialog-h"
                @closed="detailFormCancle">
       <detail-form v-if="detailShow"
-                   ref="ref_form_detail"></detail-form>
+                   ref="ref_form_detail"
+                   @diaDetailClose="detailFormCancle"></detail-form>
     </el-dialog>
   </div>
 </template>
diff --git a/src/views/modules/communityParty/elegant/detail.vue b/src/views/modules/communityParty/elegant/detail.vue
index bcddf5b3d..9586d16c1 100644
--- a/src/views/modules/communityParty/elegant/detail.vue
+++ b/src/views/modules/communityParty/elegant/detail.vue
@@ -43,7 +43,11 @@
       </div>
 
     </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
 
+    </div>
   </div>
 </template>
 
@@ -73,6 +77,11 @@ export default {
   },
 
   methods: {
+    handleCancle () {
+
+      this.$emit('diaDetailClose')
+
+    },
 
     async initForm (row) {
 
diff --git a/src/views/modules/communityParty/elegant/index.vue b/src/views/modules/communityParty/elegant/index.vue
index 292ca37ac..0a26f120f 100644
--- a/src/views/modules/communityParty/elegant/index.vue
+++ b/src/views/modules/communityParty/elegant/index.vue
@@ -290,7 +290,8 @@
                top="5vh"
                class="dialog-h"
                @closed="detailFormCancle">
-      <detail-form ref="ref_form_detail"></detail-form>
+      <detail-form ref="ref_form_detail"
+                   @diaDetailClose="detailFormCancle"></detail-form>
     </el-dialog>
 
   </div>
diff --git a/src/views/modules/communityParty/heart/heartDetail.vue b/src/views/modules/communityParty/heart/heartDetail.vue
index 6832a618c..b9b2869bf 100644
--- a/src/views/modules/communityParty/heart/heartDetail.vue
+++ b/src/views/modules/communityParty/heart/heartDetail.vue
@@ -171,7 +171,11 @@
       </div>
 
     </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
 
+    </div>
   </div>
 </template>
 
@@ -435,8 +439,8 @@ export default {
 
     handleCancle () {
 
-      this.resetData()
-      this.$emit('dialogCancle')
+
+      this.$emit('diaDetailClose')
 
     },
 
diff --git a/src/views/modules/communityParty/heart/heartList.vue b/src/views/modules/communityParty/heart/heartList.vue
index e1c0432d7..7b5dff515 100644
--- a/src/views/modules/communityParty/heart/heartList.vue
+++ b/src/views/modules/communityParty/heart/heartList.vue
@@ -243,7 +243,8 @@
                top="5vh"
                class="dialog-h"
                @closed="detailFormCancle">
-      <heart-detail ref="ref_form_detail"></heart-detail>
+      <heart-detail ref="ref_form_detail"
+                    @diaDetailClose="detailFormCancle"></heart-detail>
     </el-dialog>
 
     <!-- 活动取消原因 -->
diff --git a/src/views/modules/communityParty/members/detailForm.vue b/src/views/modules/communityParty/members/detailForm.vue
index bcf6a3fc3..e0648dbb1 100644
--- a/src/views/modules/communityParty/members/detailForm.vue
+++ b/src/views/modules/communityParty/members/detailForm.vue
@@ -1,109 +1,116 @@
 <template>
-  <div class="dialog-h-content scroll-h pd0">
-    <div class="div-tip">本模块主要为添加非本社区居住党员，本社区居住党员建议到居民信息页面添加</div>
-
-    <div v-if="initLoading"
-         class="m-row">
-      <div class="m-row-2">
-        <div class="info-prop">
-          <span class="info-title-2">所属党组织：</span>
-          <span>{{ info.orgName }}</span>
+  <div>
+    <div class="dialog-h-content scroll-h pd0">
+      <div class="div-tip">本模块主要为添加非本社区居住党员，本社区居住党员建议到居民信息页面添加</div>
+
+      <div v-if="initLoading"
+           class="m-row">
+        <div class="m-row-2">
+          <div class="info-prop">
+            <span class="info-title-2">所属党组织：</span>
+            <span>{{ info.orgName }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-2">党员中心户：</span>
+            <span>{{ info.isDyzxh==='1'?'是':'否' }}</span>
+          </div>
         </div>
 
-        <div class="info-prop">
-          <span class="info-title-2">党员中心户：</span>
-          <span>{{ info.isDyzxh==='1'?'是':'否' }}</span>
-        </div>
-      </div>
-
-      <div class="m-row-2">
+        <div class="m-row-2">
 
-        <div class="info-prop">
-          <span class="info-title-2">姓名：</span>
-          <span>{{ info.name}}</span>
-        </div>
+          <div class="info-prop">
+            <span class="info-title-2">姓名：</span>
+            <span>{{ info.name}}</span>
+          </div>
 
-        <div class="info-prop">
-          <span class="info-title-2">免学习：</span>
-          <span>{{info.isMxx==='1'?'是':'否'}}</span>
+          <div class="info-prop">
+            <span class="info-title-2">免学习：</span>
+            <span>{{info.isMxx==='1'?'是':'否'}}</span>
+          </div>
         </div>
-      </div>
 
-      <div class="m-row-2">
+        <div class="m-row-2">
 
-        <div class="info-prop">
-          <span class="info-title-2">手机号：</span>
-          <span>{{ info.mobile?info.mobile:'--'}}</span>
-        </div>
-        <div class="info-prop">
-          <span class="info-title-2">职务：</span>
-          <span>{{info.partyZwShow?info.partyZwShow:'--' }}</span>
+          <div class="info-prop">
+            <span class="info-title-2">手机号：</span>
+            <span>{{ info.mobile?info.mobile:'--'}}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">职务：</span>
+            <span>{{info.partyZwShow?info.partyZwShow:'--' }}</span>
+          </div>
         </div>
-      </div>
 
-      <div class="m-row-2">
+        <div class="m-row-2">
 
-        <div class="info-prop">
-          <span class="info-title-2">身份证：</span>
-          <span>{{ info.idCard?info.idCard:'--' }}</span>
-        </div>
-        <div class="info-prop">
-          <span class="info-title-2">文化程度：</span>
-          <span>{{ info.cultureName?info.cultureName:'--' }}</span>
+          <div class="info-prop">
+            <span class="info-title-2">身份证：</span>
+            <span>{{ info.idCard?info.idCard:'--' }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">文化程度：</span>
+            <span>{{ info.cultureName?info.cultureName:'--' }}</span>
+          </div>
         </div>
-      </div>
 
-      <div class="m-row-2">
+        <div class="m-row-2">
 
-        <div class="info-prop">
-          <span class="info-title-2">地址：</span>
-          <span>{{ info.address?info.address:'--' }}</span>
+          <div class="info-prop">
+            <span class="info-title-2">地址：</span>
+            <span>{{ info.address?info.address:'--' }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">入党时间：</span>
+            <span>{{ info.rdsj?info.rdsj:'--' }}</span>
+          </div>
         </div>
-        <div class="info-prop">
-          <span class="info-title-2">入党时间：</span>
-          <span>{{ info.rdsj?info.rdsj:'--' }}</span>
-        </div>
-      </div>
 
-      <div class="m-row-2">
+        <div class="m-row-2">
 
-        <div class="info-prop">
-          <span class="info-title-2">流动党员：</span>
-          <span>{{ info.isLd==='1'?'是':'否'}}</span>
-        </div>
-        <div class="info-prop">
-          <span class="info-title-2">流动党员号：</span>
-          <span>{{ info.ldzh?info.ldzh:'--' }}</span>
+          <div class="info-prop">
+            <span class="info-title-2">流动党员：</span>
+            <span>{{ info.isLd==='1'?'是':'否'}}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">流动党员号：</span>
+            <span>{{ info.ldzh?info.ldzh:'--' }}</span>
+
+          </div>
 
         </div>
 
-      </div>
+        <div class="m-row-2">
 
-      <div class="m-row-2">
+          <div class="info-prop">
+            <span class="info-title-2">备注：</span>
+            <span>{{ info.remark? info.remark:'--'  }}</span>
+          </div>
 
-        <div class="info-prop">
-          <span class="info-title-2">备注：</span>
-          <span>{{ info.remark? info.remark:'--'  }}</span>
         </div>
-
       </div>
-    </div>
 
-    <div class="pdl40">
-      <el-tabs v-model="activesName">
-        <el-tab-pane label="量化积分"
-                     name="first">
-          <pointsDetail :partyId="partymenberid" />
-        </el-tab-pane>
-        <el-tab-pane label="缴费记录"
-                     name="second">
-          <record :partyId="partymenberid"
-                  :disabled="disabled" />
-        </el-tab-pane>
-      </el-tabs>
+      <div class="pdl40">
+        <el-tabs v-model="activesName">
+          <el-tab-pane label="量化积分"
+                       name="first">
+            <pointsDetail :partyId="partymenberid" />
+          </el-tab-pane>
+          <el-tab-pane label="缴费记录"
+                       name="second">
+            <record :partyId="partymenberid"
+                    :disabled="disabled" />
+          </el-tab-pane>
+        </el-tabs>
+
+      </div>
 
     </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
 
+    </div>
   </div>
 </template>
 
@@ -187,7 +194,11 @@ export default {
     // this.$refs['ruleForm'].resetFields()
   },
   methods: {
+    handleCancle () {
 
+      this.$emit('diaDetailClose')
+
+    },
     async saveRecord (form) {
       const params = {
         ...form,
diff --git a/src/views/modules/communityParty/members/index.vue b/src/views/modules/communityParty/members/index.vue
index ea47281fc..f5a710ed3 100644
--- a/src/views/modules/communityParty/members/index.vue
+++ b/src/views/modules/communityParty/members/index.vue
@@ -335,7 +335,8 @@
       <detail-form v-if="detailShow"
                    :info="detailInfo"
                    :partyList="optionsG"
-                   :disabled="disabled" />
+                   :disabled="disabled"
+                   @diaDetailClose="handlerCancle" />
     </el-dialog>
 
   </div>
diff --git a/src/views/modules/communityParty/orgActivity/activivityList/activivityList.vue b/src/views/modules/communityParty/orgActivity/activivityList/activivityList.vue
index fa88d16a6..fb2782f0b 100644
--- a/src/views/modules/communityParty/orgActivity/activivityList/activivityList.vue
+++ b/src/views/modules/communityParty/orgActivity/activivityList/activivityList.vue
@@ -265,7 +265,8 @@
                @closed="detailShow = false">
       <detail-activity ref="ref_add_form"
                        :formType="formType"
-                       :icPartyActId="icPartyActId"></detail-activity>
+                       :icPartyActId="icPartyActId"
+                       @diaDetailClose="detailShow = false"></detail-activity>
     </el-dialog>
     <el-dialog v-if="showSchedule"
                :visible.sync="showSchedule"
diff --git a/src/views/modules/communityParty/orgActivity/activivityList/detailActivity.vue b/src/views/modules/communityParty/orgActivity/activivityList/detailActivity.vue
index 00130bd1d..5b422701c 100644
--- a/src/views/modules/communityParty/orgActivity/activivityList/detailActivity.vue
+++ b/src/views/modules/communityParty/orgActivity/activivityList/detailActivity.vue
@@ -50,7 +50,7 @@
           </div>
           <div class="info-prop">
             <span class="info-title-3">附件：</span>
-            <file-list v-if="formData.attachmentList.length>0"
+            <file-list v-if="formData.attachmentList&&formData.attachmentList.length>0"
                        :fileList="formData.attachmentList"></file-list>
             <span v-else>--</span>
 
@@ -60,7 +60,11 @@
       </div>
 
     </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
 
+    </div>
   </div>
 </template>
 
@@ -275,8 +279,8 @@ export default {
 
     },
     handleCancle () {
-      this.resetData()
-      this.$emit('handleClose')
+
+      this.$emit('diaDetailClose')
 
     },
 
diff --git a/src/views/modules/communityParty/regionalParty/activitys.vue b/src/views/modules/communityParty/regionalParty/activitys.vue
index 9a12e535c..e9785bebb 100644
--- a/src/views/modules/communityParty/regionalParty/activitys.vue
+++ b/src/views/modules/communityParty/regionalParty/activitys.vue
@@ -245,7 +245,7 @@
       <activitys-detail ref="ref_detail"
                         :serviceList="serviceList"
                         :gridList="gridList"
-                        @diaClose="diaClose"></activitys-detail>
+                        @diaDetailClose="detailClosed"></activitys-detail>
     </el-dialog>
 
   </div>
diff --git a/src/views/modules/communityParty/regionalParty/activitysDetail.vue b/src/views/modules/communityParty/regionalParty/activitysDetail.vue
index af98c885f..744bb1be6 100644
--- a/src/views/modules/communityParty/regionalParty/activitysDetail.vue
+++ b/src/views/modules/communityParty/regionalParty/activitysDetail.vue
@@ -58,11 +58,11 @@
 
     </div>
 
-    <!-- <div class="div-btn">
+    <div class="div-btn">
       <el-button size="small"
                  @click="handleCancle">关 闭</el-button>
 
-    </div> -->
+    </div>
 
   </div>
 </template>
@@ -94,7 +94,7 @@ export default {
 
     handleCancle () {
       this.diaDestroy()
-      this.$emit('diaClose')
+      this.$emit('diaDetailClose')
 
     },
 
diff --git a/src/views/modules/communityParty/stas/index.vue b/src/views/modules/communityParty/stas/index.vue
index 04efa189a..afc0660cc 100644
--- a/src/views/modules/communityParty/stas/index.vue
+++ b/src/views/modules/communityParty/stas/index.vue
@@ -4,23 +4,24 @@
       <el-form :inline="true"
                :model="form"
                ref="ref_searchform"
-               :label-width="'100px'">
+               :label-width="'110px'">
         <div>
-          <el-form-item prop="mySelectOrg" label-width="130px" label="参加活动党组织">
-            <el-cascader
-                    class="list_item_width_1"
-                    v-model="joinOrgIds"
-                    size="small"
-                    :options="orgList"
-                    placeholder="请选择党组织"
-                    :props="{
+          <el-form-item prop="mySelectOrg"
+                        label-width="130px"
+                        label="参加活动党组织">
+            <el-cascader class="list_item_width_1"
+                         v-model="joinOrgIds"
+                         size="small"
+                         :options="orgList"
+                         placeholder="请选择党组织"
+                         :props="{
                       checkStrictly: true,
                       label: 'partyOrgName',
                       value: 'id',
                       children: 'children'
                     }"
-                    @change="handleChangeOrg"
-                    clearable/>
+                         @change="handleChangeOrg"
+                         clearable />
           </el-form-item>
           <el-form-item label="活动开始时间"
                         prop="serviceTimeArea">
@@ -47,10 +48,10 @@
     </div>
     <div class="div_table">
       <div class="div_btn">
-      <el-button style="margin-left:10px"
-                 class="diy-button--reset"
-                 size="small"
-                 @click="handleExport">导出</el-button>
+        <el-button style="margin-left:10px"
+                   class="diy-button--reset"
+                   size="small"
+                   @click="handleExport">导出</el-button>
       </div>
       <el-table class="table"
                 :data="tableData"
@@ -74,43 +75,37 @@
         <el-table-column prop="dydhNum"
                          header-align="center"
                          align="center"
-                         label="支部党员大会(次)"
-                         >
+                         label="支部党员大会(次)">
         </el-table-column>
         <el-table-column prop="wyhNum"
                          header-align="center"
                          align="center"
                          label="支部委员会(次)"
-                         show-overflow-tooltip
-                         >
+                         show-overflow-tooltip>
         </el-table-column>
         <el-table-column prop="dxzhNum"
                          header-align="center"
                          show-overflow-tooltip
                          align="center"
-                         label="党小组会(次)"
-                         >
+                         label="党小组会(次)">
         </el-table-column>
         <el-table-column prop="dkNum"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip
-                         label="党课(次)"
-                         >
+                         label="党课(次)">
         </el-table-column>
         <el-table-column prop="ztdrNum"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip
-                         label="主题党日(次)"
-                         >
+                         label="主题党日(次)">
         </el-table-column>
         <el-table-column prop="wmfwNum"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip
-                         label="为民服务活动(次)"
-                         >
+                         label="为民服务活动(次)">
         </el-table-column>
       </el-table>
     </div>
@@ -168,25 +163,25 @@ export default {
         this.form.joinOrgId = ''
       }
     },
-    getOrgList() {
+    getOrgList () {
       return this.$http
-          .get('/resi/partymember/icPartyOrg/getSearchTreelist', {
-            params: { agencyId: localStorage.getItem('agencyId') }
-          })
-          .then(({ data: res }) => {
-            if (res.code !== 0) {
-              return this.$message.error(res.msg)
-            }else {
-              this.orgList = this.deepArrTOnull(res.data)
-            }
-          }).catch(() => {return this.$message.error("网络错误");})
+        .get('/resi/partymember/icPartyOrg/getSearchTreelist', {
+          params: { agencyId: localStorage.getItem('agencyId') }
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.orgList = this.deepArrTOnull(res.data)
+          }
+        }).catch(() => { return this.$message.error("网络错误"); })
     },
-    deepArrTOnull(arr) {
+    deepArrTOnull (arr) {
       let a = []
       a = arr.map(item => {
         return {
           ...item,
-          children: (item.children.length > 0 && this.deepArrTOnull(item.children) )|| null
+          children: (item.children.length > 0 && this.deepArrTOnull(item.children)) || null
         }
       })
       return a
@@ -196,17 +191,17 @@ export default {
       if (Array.isArray(this.serviceTimeArea) && this.serviceTimeArea.length > 0) {
         this.form.startTime = this.serviceTimeArea[0];
         this.form.endTime = this.serviceTimeArea[1];
-      }else {
+      } else {
         this.form.startTime = '';
         this.form.endTime = '';
       }
 
-      if (this.form.joinOrgId === '' || this.form.joinOrgId === null || this.form.joinOrgId === undefined){
+      if (this.form.joinOrgId === '' || this.form.joinOrgId === null || this.form.joinOrgId === undefined) {
         let a = this.orgList[0]
         this.form.joinOrgId = a.id;
         this.joinOrgIds = this.form.joinOrgId
-      }else {
-        if (Array.isArray(this.joinOrgIds)){
+      } else {
+        if (Array.isArray(this.joinOrgIds)) {
           this.form.joinOrgId = this.joinOrgIds[this.joinOrgIds.length - 1];
         }
       }
diff --git a/src/views/modules/communityService/fuwujilu/detailForm.vue b/src/views/modules/communityService/fuwujilu/detailForm.vue
index 40665e62b..be802b46c 100644
--- a/src/views/modules/communityService/fuwujilu/detailForm.vue
+++ b/src/views/modules/communityService/fuwujilu/detailForm.vue
@@ -100,15 +100,11 @@
 
     </div>
 
-    <!-- <div class="div_btn">
+    <div class="div-btn">
       <el-button size="small"
-                 @click="handleCancle">取 消</el-button>
-      <el-button size="small"
-                 v-if="formType != 'detail'"
-                 type="primary"
-                 :disabled="btnDisable"
-                 @click="handleComfirm">确 定</el-button>
-    </div> -->
+                 @click="handleCancle">关 闭</el-button>
+
+    </div>
 
     <el-dialog v-if="showPersonList"
                :visible.sync="showPersonList"
@@ -318,7 +314,7 @@ export default {
 
     handleCancle () {
       this.resetData()
-      this.$emit('handleClose')
+      this.$emit('diaDetailClose')
 
     },
 
diff --git a/src/views/modules/communityService/fuwujilu/fuwuList.vue b/src/views/modules/communityService/fuwujilu/fuwuList.vue
index 490acfb20..7ff0282b0 100644
--- a/src/views/modules/communityService/fuwujilu/fuwuList.vue
+++ b/src/views/modules/communityService/fuwujilu/fuwuList.vue
@@ -278,7 +278,8 @@
                    :serviceRecordId="serviceRecordId"
                    :serviceOrgName="serviceOrgName"
                    :satisfyArray="satisfyArray"
-                   :statusArray="statusArray">
+                   :statusArray="statusArray"
+                   @diaDetailClose="diaDetailClose">
       </detail-form>
     </el-dialog>
     <el-dialog v-if="showPersonList"
diff --git a/src/views/modules/communityService/fuwuxiangmu/cpts/detail.vue b/src/views/modules/communityService/fuwuxiangmu/cpts/detail.vue
index 861ea418e..5686967ac 100644
--- a/src/views/modules/communityService/fuwuxiangmu/cpts/detail.vue
+++ b/src/views/modules/communityService/fuwuxiangmu/cpts/detail.vue
@@ -42,7 +42,11 @@
       </div>
 
     </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
 
+    </div>
   </div>
 </template>
 
@@ -145,7 +149,7 @@ export default {
 
 
     handleCancle () {
-      this.$emit("close");
+      this.$emit("diaDetailClose");
     },
   },
 };
diff --git a/src/views/modules/communityService/fuwuxiangmu/index.vue b/src/views/modules/communityService/fuwuxiangmu/index.vue
index 2f5820a8f..a55231b0e 100644
--- a/src/views/modules/communityService/fuwuxiangmu/index.vue
+++ b/src/views/modules/communityService/fuwuxiangmu/index.vue
@@ -187,7 +187,8 @@
                class="dialog-h"
                @closed="handleClose">
       <detail-form ref="ref_form_detail"
-                   :formId="formId"></detail-form>
+                   :formId="formId"
+                   @diaDetailClose="handleClose"></detail-form>
     </el-dialog>
   </div>
 </template>
diff --git a/src/views/modules/communityService/fuwuzuzhi/cpts/detail.vue b/src/views/modules/communityService/fuwuzuzhi/cpts/detail.vue
index 8b00db98a..2b9322af5 100644
--- a/src/views/modules/communityService/fuwuzuzhi/cpts/detail.vue
+++ b/src/views/modules/communityService/fuwuzuzhi/cpts/detail.vue
@@ -53,17 +53,11 @@
 
     </div>
 
-    <!-- <div class="div_btn resi-btns">
-      <el-button size="small" @click="handleCancle">取 消</el-button>
-      <el-button
-        v-if="formType != 'watch'"
-        type="primary"
-        size="small"
-        :disabled="btnDisable"
-        @click="handleComfirm"
-        >确 定</el-button
-      >
-    </div> -->
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
+
+    </div>
   </div>
 </template>
 
@@ -112,6 +106,17 @@ export default {
   },
 
   methods: {
+    handleCancle () {
+      this.diaDestroy()
+      this.$emit('diaDetailClose')
+
+    },
+
+    diaDestroy () {
+      if (map) {
+        map.destroy()
+      }
+    },
     async initForm () {
 
       this.startLoading()
@@ -258,9 +263,7 @@ export default {
     },
 
 
-    handleCancle () {
-      this.$emit("close");
-    },
+
     // 开启加载动画
     startLoading () {
       loading = Loading.service({
diff --git a/src/views/modules/communityService/fuwuzuzhi/index.vue b/src/views/modules/communityService/fuwuzuzhi/index.vue
index 6294dd3e4..93e340ddc 100644
--- a/src/views/modules/communityService/fuwuzuzhi/index.vue
+++ b/src/views/modules/communityService/fuwuzuzhi/index.vue
@@ -193,7 +193,8 @@
                class="dialog-h"
                @closed="diaDetailClose">
       <detail-form ref="ref_detail"
-                   :formId="formId"></detail-form>
+                   :formId="formId"
+                   @diaDetailClose="diaDetailClose"></detail-form>
     </el-dialog>
   </div>
 </template>
diff --git a/src/views/modules/communityService/measure/detail.vue b/src/views/modules/communityService/measure/detail.vue
index 62200acdc..cc51d946f 100644
--- a/src/views/modules/communityService/measure/detail.vue
+++ b/src/views/modules/communityService/measure/detail.vue
@@ -86,7 +86,11 @@
 
       </div>
     </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
 
+    </div>
   </div>
 </template>
 
@@ -123,6 +127,11 @@ export default {
   },
 
   methods: {
+    handleCancle () {
+
+      this.$emit('diaDetailClose')
+
+    },
     initForm (row) {
       this.dataForm = JSON.parse(JSON.stringify(row))
       console.log(' this.dataForm', this.dataForm)
diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue
index 9487c8665..349dd7bf8 100644
--- a/src/views/modules/communityService/measure/index.vue
+++ b/src/views/modules/communityService/measure/index.vue
@@ -507,7 +507,8 @@
                class="dialog-h"
                :close-on-click-modal="false"
                :before-close="detailFormCancle">
-      <detail ref="ref_form_detail"></detail>
+      <detail ref="ref_form_detail"
+              @diaDetailClose="detailFormCancle"></detail>
     </el-dialog>
   </div>
 </template>
@@ -959,7 +960,7 @@ export default {
     },
     async handleLook (row, type) {
       this.detailShow = true
-      console.log('row',row)
+      console.log('row', row)
       this.$nextTick(() => {
         this.$refs.ref_form_detail.initForm(row)
       })
diff --git a/src/views/modules/communityService/ninePlaces/inspect/inspect.vue b/src/views/modules/communityService/ninePlaces/inspect/inspect.vue
index 6b2d90f6d..936672819 100644
--- a/src/views/modules/communityService/ninePlaces/inspect/inspect.vue
+++ b/src/views/modules/communityService/ninePlaces/inspect/inspect.vue
@@ -253,7 +253,7 @@
                       :gridList="gridList"
                       :resultList="resultList"
                       :placeTypeList="placeTypeList"
-                      @dialogCancle="addFormCancle"></inspect-detail>
+                      @diaDetailClose="diaDetailClose"></inspect-detail>
     </el-dialog>
 
     <!-- 复查记录弹出框 -->
diff --git a/src/views/modules/communityService/ninePlaces/inspect/inspectDetail.vue b/src/views/modules/communityService/ninePlaces/inspect/inspectDetail.vue
index a6fa53fff..ff7e19445 100644
--- a/src/views/modules/communityService/ninePlaces/inspect/inspectDetail.vue
+++ b/src/views/modules/communityService/ninePlaces/inspect/inspectDetail.vue
@@ -1,61 +1,59 @@
 <template>
+  <div>
+    <div class="dialog-h-content scroll-h">
+      <div v-if="initLoading"
+           class="m-row">
+        <div class="m-info">
+          <div class="info-prop">
+            <span class="info-title-4">场所区域：</span>
+            <span>{{ formData.gridName||'--'  }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-4">场所类型：</span>
+            <span>{{ formData.placeOrgName||'--' }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-4">场所名称：</span>
+            <span>{{ formData.ninePlaceName||'--'}}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-4">分队名称：</span>
+            <span>{{ formData.placePatrolTeamName||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-4">检查人员：</span>
+            <span>{{ formData.inspectorsNames||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-4">首次巡查时间：</span>
+            <span>{{ formData.firstTime||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-4">隐患明细：</span>
+            <span>{{ formData.detailed||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-4">首次检查结论：</span>
+            <span>{{ formData.firstResult==='0'?'合格':'不合格'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-4">拟复查时间：</span>
+            <span>{{ formData.reviewTime||'--'  }}</span>
+          </div>
 
-  <div class="dialog-h-content scroll-h">
-    <div v-if="initLoading"
-         class="m-row">
-      <div class="m-info">
-        <div class="info-prop">
-          <span class="info-title-4">场所区域：</span>
-          <span>{{ formData.gridName||'--'  }}</span>
-        </div>
-
-        <div class="info-prop">
-          <span class="info-title-4">场所类型：</span>
-          <span>{{ formData.placeOrgName||'--' }}</span>
-        </div>
-
-        <div class="info-prop">
-          <span class="info-title-4">场所名称：</span>
-          <span>{{ formData.ninePlaceName||'--'}}</span>
-        </div>
-
-        <div class="info-prop">
-          <span class="info-title-4">分队名称：</span>
-          <span>{{ formData.placePatrolTeamName||'--'  }}</span>
-        </div>
-        <div class="info-prop">
-          <span class="info-title-4">检查人员：</span>
-          <span>{{ formData.inspectorsNames||'--'  }}</span>
-        </div>
-        <div class="info-prop">
-          <span class="info-title-4">首次巡查时间：</span>
-          <span>{{ formData.firstTime||'--'  }}</span>
-        </div>
-        <div class="info-prop">
-          <span class="info-title-4">隐患明细：</span>
-          <span>{{ formData.detailed||'--'  }}</span>
-        </div>
-        <div class="info-prop">
-          <span class="info-title-4">首次检查结论：</span>
-          <span>{{ formData.firstResult==='0'?'合格':'不合格'  }}</span>
-        </div>
-        <div class="info-prop">
-          <span class="info-title-4">拟复查时间：</span>
-          <span>{{ formData.reviewTime||'--'  }}</span>
         </div>
 
       </div>
 
     </div>
-    <!-- <div class="div_btn">
+    <div class="div-btn">
       <el-button size="small"
-                 @click="handleCancle">取 消</el-button>
-      <el-button size="small"
-                 v-if="formType != 'detail'"
-                 type="primary"
-                 :disabled="btnDisable"
-                 @click="handleComfirm">确 定</el-button>
-    </div> -->
+                 @click="handleCancle">关 闭</el-button>
+
+    </div>
   </div>
 </template>
 
@@ -138,7 +136,7 @@ export default {
     handleCancle () {
 
       this.resetData()
-      this.$emit('dialogCancle')
+      this.$emit('diaDetailClose')
 
     },
 
diff --git a/src/views/modules/communityService/ninePlaces/places/places.vue b/src/views/modules/communityService/ninePlaces/places/places.vue
index 36c6af69f..f97837131 100644
--- a/src/views/modules/communityService/ninePlaces/places/places.vue
+++ b/src/views/modules/communityService/ninePlaces/places/places.vue
@@ -208,7 +208,7 @@
                      :agencyId="agencyId"
                      :scaleList="scaleList"
                      :placeTypeList="placeTypeList"
-                     @dialogCancle="addFormCancle"></places-detail>
+                     @diaDetailClose="diaDetailClose"></places-detail>
     </el-dialog>
 
   </div>
diff --git a/src/views/modules/communityService/ninePlaces/places/placesDetail.vue b/src/views/modules/communityService/ninePlaces/places/placesDetail.vue
index dbac5af92..2c0a3e1e8 100644
--- a/src/views/modules/communityService/ninePlaces/places/placesDetail.vue
+++ b/src/views/modules/communityService/ninePlaces/places/placesDetail.vue
@@ -40,15 +40,11 @@
       </div>
 
     </div>
-    <!-- <div class="div_btn">
+    <div class="div-btn">
       <el-button size="small"
-                 @click="handleCancle">取 消</el-button>
-      <el-button size="small"
-                 v-if="formType != 'detail'"
-                 type="primary"
-                 :disabled="btnDisable"
-                 @click="handleComfirm">确 定</el-button>
-    </div> -->
+                 @click="handleCancle">关 闭</el-button>
+
+    </div>
   </div>
 </template>
 
@@ -142,8 +138,8 @@ export default {
 
     handleCancle () {
 
-      this.resetData()
-      this.$emit('dialogCancle')
+
+      this.$emit('diaDetailClose')
 
     },
 
diff --git a/src/views/modules/communityService/ninePlaces/team/team.vue b/src/views/modules/communityService/ninePlaces/team/team.vue
index 37791495d..ce4691412 100644
--- a/src/views/modules/communityService/ninePlaces/team/team.vue
+++ b/src/views/modules/communityService/ninePlaces/team/team.vue
@@ -196,7 +196,7 @@
       <team-detail ref="ref_detail"
                    :gridList="gridList"
                    :placeTypeList="placeTypeList"
-                   @dialogCancle="addFormCancle"></team-detail>
+                   @diaDetailClose="diaDetailClose"></team-detail>
     </el-dialog>
 
   </div>
@@ -344,7 +344,7 @@ export default {
       // this.formTitle = '详情'
       this.detailShow = true
       this.$nextTick(() => {
-        this.$refs.ref_detail.initForm( row.teamId, this.agencyId)
+        this.$refs.ref_detail.initForm(row.teamId, this.agencyId)
       })
     },
 
diff --git a/src/views/modules/communityService/ninePlaces/team/teamDetail.vue b/src/views/modules/communityService/ninePlaces/team/teamDetail.vue
index 3ddad9351..3082c700e 100644
--- a/src/views/modules/communityService/ninePlaces/team/teamDetail.vue
+++ b/src/views/modules/communityService/ninePlaces/team/teamDetail.vue
@@ -51,15 +51,11 @@
       </div>
 
     </div>
-    <!-- <div class="div_btn">
+    <div class="div-btn">
       <el-button size="small"
-                 @click="handleCancle">取 消</el-button>
-      <el-button size="small"
-                 v-if="formType != 'detail'"
-                 type="primary"
-                 :disabled="btnDisable"
-                 @click="handleComfirm">确 定</el-button>
-    </div> -->
+                 @click="handleCancle">关 闭</el-button>
+
+    </div>
   </div>
 </template>
 
@@ -256,8 +252,7 @@ export default {
 
     handleCancle () {
 
-      this.resetData()
-      this.$emit('dialogCancle')
+      this.$emit('diaDetailClose')
 
     },
 
diff --git a/src/views/modules/communityService/worklog/workLog.vue b/src/views/modules/communityService/worklog/workLog.vue
index 51b59c910..9584d9954 100644
--- a/src/views/modules/communityService/worklog/workLog.vue
+++ b/src/views/modules/communityService/worklog/workLog.vue
@@ -258,7 +258,7 @@
                class="dialog-h"
                @closed="diaClose">
       <work-log-detail ref="ref_detail"
-                       @diaClose="diaClose"></work-log-detail>
+                       @diaDetailClose="diaClose"></work-log-detail>
     </el-dialog>
 
   </div>
diff --git a/src/views/modules/communityService/worklog/workLogDetail.vue b/src/views/modules/communityService/worklog/workLogDetail.vue
index 568510f7c..28e63cdc2 100644
--- a/src/views/modules/communityService/worklog/workLogDetail.vue
+++ b/src/views/modules/communityService/worklog/workLogDetail.vue
@@ -50,7 +50,11 @@
       </div>
 
     </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
 
+    </div>
   </div>
 </template>
 
@@ -74,7 +78,7 @@ export default {
   methods: {
     handleCancle () {
 
-      this.$emit('diaClose')
+      this.$emit('diaDetailClose')
 
     },
 
diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
index 066bb6756..fd7901f0b 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
@@ -3,6 +3,7 @@
     <div class="div_search">
       <el-form :inline="true"
                :model="dataForm"
+               label-width="110px"
                @keyup.enter.native="loadTable()">
         <el-form-item label="疫苗接种点名称"
                       prop="name">
@@ -178,7 +179,7 @@
                @closed="diaDetailClose"
                custom-class="dialog-h">
       <detail ref="ref_detail"
-                     @closeDialog="diaDetailClose"></detail>
+              @closeDialog="diaDetailClose"></detail>
     </el-dialog>
     <!-- 发送通知弹出框 -->
     <el-dialog :visible.sync="sendNoticeFormShow"
diff --git a/src/views/modules/shequzhili/csgltc/csglDetail.vue b/src/views/modules/shequzhili/csgltc/csglDetail.vue
index 6220087e6..acc1443a2 100644
--- a/src/views/modules/shequzhili/csgltc/csglDetail.vue
+++ b/src/views/modules/shequzhili/csgltc/csglDetail.vue
@@ -48,11 +48,11 @@
 
         </div>
       </div>
-      <!-- <div class="div-btn">
+      <div class="div-btn">
         <el-button size="small"
                    @click="handleCancle">关 闭</el-button>
 
-      </div> -->
+      </div>
     </div>
 
   </div>
diff --git a/src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue b/src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue
index d486aa828..e1a66f803 100644
--- a/src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue
+++ b/src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue
@@ -51,11 +51,11 @@
       </div>
 
     </div>
-    <!-- <div class="div_btn">
+    <div class="div-btn">
       <el-button size="small"
-                 @click="handleCancle">取 消</el-button>
+                 @click="handleCancle">关 闭</el-button>
 
-    </div> -->
+    </div>
   </div>
 </template>
 
diff --git a/src/views/modules/sys/icvaccineprarmeter.vue b/src/views/modules/sys/icvaccineprarmeter.vue
index acaea1f56..a64c8d934 100644
--- a/src/views/modules/sys/icvaccineprarmeter.vue
+++ b/src/views/modules/sys/icvaccineprarmeter.vue
@@ -8,7 +8,7 @@
         <div>
           <el-form-item prop="gridId"
                         label="所属网格"
-                        label-width="70px">
+                        label-width="80px">
             <div class="resi-cell-value">
               <el-select v-model.trim="dataForm.gridId"
                          placeholder="请选择网格"
@@ -92,7 +92,7 @@
         <div>
           <el-form-item label="姓名"
                         prop="name"
-                        label-width="70px">
+                        label-width="80px">
             <el-input v-model="dataForm.name"
                       placeholder="姓名"
                       clearable></el-input>
diff --git a/src/views/pages/login.vue b/src/views/pages/login.vue
index 10cf96a93..8e39a89e2 100644
--- a/src/views/pages/login.vue
+++ b/src/views/pages/login.vue
@@ -16,35 +16,35 @@
                 <div class="ico">
                   <img src="@/assets/img/login/zhanghao.png" alt="" />
                 </div>
-                <div class="input">
+                <el-form-item prop="phone" class="input">
                   <input
                     type="text"
                     v-model="dataForm.phone"
                     placeholder="账号"
                   />
-                </div>
+                </el-form-item>
               </div>
               <div class="fm-item">
                 <div class="ico">
                   <img src="@/assets/img/login/mima.png" alt="" />
                 </div>
-                <div class="input">
+                <el-form-item prop="password" class="input">
                   <input
                     type="password"
                     v-model="dataForm.password"
                     :placeholder="$t('login.password')"
                   />
-                </div>
+                </el-form-item>
               </div>
               <div class="fm-captcha">
                 <div class="fm-item">
-                  <div class="input">
+                  <el-form-item prop="captcha" class="input">
                     <input
                       type="text"
                       v-model="dataForm.captcha"
                       placeholder="验证码"
                     />
-                  </div>
+                  </el-form-item>
                 </div>
                 <div class="captcha">
                   <img :src="captchaPath" @click="getCaptcha()" />
@@ -95,9 +95,8 @@ import Cookies from "js-cookie";
 import CDialog from "@c/CDialog";
 import debounce from "lodash/debounce";
 import { messages } from "@/i18n";
-import { getUUID } from "@/utils";
+import { getUUID, encryptedData } from "@/utils";
 import { Loading } from "element-ui"; // 引入Loading服务
-import JSEncrypt from "jsencrypt"; //引入加密
 
 let loading; // 加载动画
 export default {
@@ -176,35 +175,16 @@ export default {
     // 表单提交
     dataFormSubmitHandle() {
       this.$refs["dataForm"].validate((valid, messageObj) => {
+        console.log(valid, messageObj);
         if (!valid) {
           app.util.validateRule(messageObj);
+          return;
         }
         this.startLoading();
-        // const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/epmetuser/customerstaff/customerlist'
         const url = "/epmetuser/customerstaff/customerlist";
         const params = {
-          phone: this.dataForm.phone,
+          phone: encryptedData(this.pubKey, this.dataForm.phone),
         };
-        // this.$http
-        // .post(url, params).then(({ data })=> {
-        //   console.log('res--comll', data)
-        //   if (data.data.length === 0) {
-        //     //没有客户，提示无法登录
-        //     this.$message.error('账号不存在')
-        //     this.endLoading()
-        //   } else if (data.data.length === 1) {
-        //     this.selectCustomer(data.data[0])
-        //   } else {
-        //     this.endLoading()
-        //     this.diaVisible = true
-        //     this.$nextTick(() => {
-        //       this.tableData = data.data
-        //     })
-        //   }
-        // }).catch((err) => {
-        //   this.endLoading()
-        //   this.$message.error(err)
-        // })
         window.app.ajax.post(
           url,
           params,
@@ -262,7 +242,8 @@ export default {
       this.dataForm.customerId = row.customerId;
       let param = {};
       Object.assign(param, this.dataForm);
-      param.password = this.encryptedData(this.pubKey, this.dataForm.password);
+      param.phone = encryptedData(this.pubKey, this.dataForm.phone);
+      param.password = encryptedData(this.pubKey, this.dataForm.password);
       this.$http
         .post(url, param)
         .then(({ data: res }) => {
@@ -301,15 +282,6 @@ export default {
         loading.close();
       }
     },
-    // 加密
-    encryptedData(key, data) {
-      // 新建JSEncrypt对象
-      let encryptor = new JSEncrypt();
-      // 设置公钥
-      encryptor.setPublicKey(key);
-      // 加密数据
-      return encryptor.encrypt(data);
-    },
   },
 };
 </script>