diff --git a/package.json b/package.json
index 3deef137b..840ad1a86 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "et:list": "gulp themes"
   },
   "dependencies": {
-    "@tinymce/tinymce-vue": "^4.0.4",
+    "@tinymce/tinymce-vue": "^3.2.8",
     "axios": "^0.19.0",
     "babel-eslint": "^8.0.1",
     "babel-plugin-component": "^1.1.1",
@@ -45,6 +45,7 @@
     "throttle-debounce": "^3.0.1",
     "v-distpicker": "^1.2.2",
     "vue": "^2.6.11",
+    "vue-baidu-map": "^0.21.22",
     "vue-i18n": "^8.12.0",
     "vue-quill-editor": "^3.0.6",
     "vue-router": "^3.0.7",
@@ -53,6 +54,7 @@
   },
   "devDependencies": {
     "@antv/f2": "^3.8.10-beta.1",
+    "@tinymce/tinymce-vue": "^3.2.8",
     "@vue/cli-plugin-babel": "^3.10.0",
     "@vue/cli-plugin-eslint": "^3.10.0",
     "@vue/cli-service": "^3.10.0",
@@ -62,6 +64,7 @@
     "natives": "^1.1.6",
     "ol": "^6.9.0",
     "script-loader": "^0.7.2",
+    "tinymce": "^5.8.2",
     "vue-template-compiler": "^2.6.11"
   },
   "eslintConfig": {
diff --git a/public/index.html b/public/index.html
index 6581742cd..012587ee5 100644
--- a/public/index.html
+++ b/public/index.html
@@ -8,6 +8,7 @@
 
   <link rel="shortcut icon" href="<%= BASE_URL %>favicon.ico" />
   <script charset="utf-8" src="https://map.qq.com/api/gljs?v=1.exp&libraries=service&key=LWBBZ-TIGC3-VFP3L-YNMWH-FJB7T-JFBLO"></script>
+  <script charset="utf-8" src="https://map.qq.com/api/gljs?v=1.exp&key=OB4BZ-D4W3U-B7VVO-4PJWW-6TKDJ-WPB77"></script>
   <!-- f2图表 -->
   <!-- <script src="https://gw.alipayobjects.com/os/lib/antv/f2/3.8.1/dist/f2.min.js"></script> -->
 
diff --git a/src/assets/img/shuju/measure/jijin.png b/src/assets/img/shuju/measure/jijin.png
index 78cdcf288..b051139cd 100644
Binary files a/src/assets/img/shuju/measure/jijin.png and b/src/assets/img/shuju/measure/jijin.png differ
diff --git a/src/assets/img/shuju/measure/minban.png b/src/assets/img/shuju/measure/minban.png
index b99bb7677..735fea832 100644
Binary files a/src/assets/img/shuju/measure/minban.png and b/src/assets/img/shuju/measure/minban.png differ
diff --git a/src/assets/img/shuju/measure/other.png b/src/assets/img/shuju/measure/other.png
index bfa3e2352..d5791f0ee 100644
Binary files a/src/assets/img/shuju/measure/other.png and b/src/assets/img/shuju/measure/other.png differ
diff --git a/src/assets/scss/modules/visual/houseStatic.scss b/src/assets/scss/modules/visual/houseStatic.scss
index 4d9c6da68..b46923af8 100644
--- a/src/assets/scss/modules/visual/houseStatic.scss
+++ b/src/assets/scss/modules/visual/houseStatic.scss
@@ -114,7 +114,7 @@
       width: 100%;
       .echart-wr{
         flex-shrink: 0;
-        height: 420px;
+        height: 380px;
         width: 70%;
       }
       .div-tip{
@@ -169,7 +169,7 @@
             margin-top:2px;
             width: 20px;
             height: 10px;
-            background: #1B51FF;
+            background: #ff7800;
             border-radius: 4px;
           } 
 
diff --git a/src/assets/scss/modules/visual/people.scss b/src/assets/scss/modules/visual/people.scss
index b18adc627..f9379e7f8 100644
--- a/src/assets/scss/modules/visual/people.scss
+++ b/src/assets/scss/modules/visual/people.scss
@@ -263,9 +263,10 @@
       }
 
       .tab {
+        @include toe;
         margin: 0 5px;
         min-width: 80px;
-        padding: 0 10px;
+        padding: 0 8px;
         height: 36px;
         background: rgba(255, 255, 255, 0);
         border: 1px solid #1257c9;
diff --git a/src/assets/scss/modules/visual/warning-people-list.scss b/src/assets/scss/modules/visual/warning-people-list.scss
new file mode 100644
index 000000000..a6b960ece
--- /dev/null
+++ b/src/assets/scss/modules/visual/warning-people-list.scss
@@ -0,0 +1,71 @@
+@import "../../c/config";
+@import "../../c/function";
+@import "./c/common";
+
+.m-pop {
+    @include shield;
+    background-color: rgba(#000, 0.9);
+    overflow-y: auto;
+
+    .wrap {
+        position: relative;
+        margin: 120px auto;
+        width: 1180px;
+
+        .title {
+            padding: 10px;
+            font-size: 22px;
+            font-family: PingFang SC;
+            font-weight: 800;
+            color: #ffffff;
+            display: flex;
+            align-items: center;
+
+            img {
+                display: block;
+                margin-right: 5px;
+            }
+            span {
+                display: block;
+            }
+        }
+
+        .btn-close {
+            position: absolute;
+            top: -15px;
+            right: -15px;
+            cursor: pointer;
+        }
+
+        .content {
+            margin-top: 20px;
+            min-height: 500px;
+        }
+    }
+}
+
+.m-pagination {
+    box-sizing: border-box;
+    margin-top: 20px;
+    width: 100%;
+    height: 40px;
+    display: flex;
+    justify-content: flex-end;
+
+    /deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {
+        background: #0266d1;
+        color: #000d3f;
+    }
+
+    /deep/ .el-pagination .el-pager li {
+        background: #002e74;
+    }
+
+    /deep/ .el-pagination .btn-prev {
+        background: #002e74;
+    }
+
+    /deep/ .el-pagination .btn-next {
+        background: #002e74;
+    }
+}
diff --git a/src/assets/scss/people-info.scss b/src/assets/scss/people-info.scss
index 12bfae150..f54b2e248 100644
--- a/src/assets/scss/people-info.scss
+++ b/src/assets/scss/people-info.scss
@@ -104,9 +104,10 @@
             }
 
             .tab {
+                @include toe;
                 margin: 0 5px;
                 min-width: 80px;
-                padding: 0 10px;
+                padding: 0 8px;
                 height: 36px;
                 background: #fff;
                 border: 1px solid #eee;
diff --git a/src/views/components/tinymce/index.vue b/src/views/components/tinymce/index.vue
index 73c48e26a..19e710b9a 100644
--- a/src/views/components/tinymce/index.vue
+++ b/src/views/components/tinymce/index.vue
@@ -1,154 +1,157 @@
 /* eslint-disable */
 <template>
-  <textarea :id="tinymceId"
-            style="visibility: hidden;" />
+  <textarea :id="tinymceId" style="visibility: hidden" />
 </template>
 
 <script>
-import loadTinymce from '@/utils/loadTinymce'
-import { plugins, toolbar } from './config'
-import { debounce } from 'throttle-debounce'
-import Cookie from 'js-cookie'
+import loadTinymce from "@/utils/loadTinymce";
+import { plugins, toolbar } from "./config";
+import { debounce } from "throttle-debounce";
+import Cookie from "js-cookie";
 // import constants from '@/utils/constants'
+import nextTick from "dai-js/tools/nextTick";
 
-let num = 1
+let num = 1;
 
 export default {
-  name: 'Tinymce',
+  name: "Tinymce",
   props: {
     id: {
       type: String,
       default: () => {
-        num === 10000 && (num = 1)
-        return `tinymce${+new Date()}${num++}`
-      }
+        num === 10000 && (num = 1);
+        return `tinymce${+new Date()}${num++}`;
+      },
     },
     value: {
-      default: ''
+      default: "",
     },
     customerId: {
       type: String,
-      default: ''
-    }
+      default: "",
+    },
   },
-  data () {
+  data() {
     return {
-      tinymceId: this.id
-    }
+      tinymceId: this.id,
+    };
   },
-  mounted () {
-
-    loadTinymce(tinymce => {
-      let token = this.getUserToken()
+  mounted() {
+    loadTinymce((tinymce) => {
+      let token = this.getUserToken();
       // let uploadUrl = '1111'
-      let uploadUrl = window.SITE_CONFIG['apiURL'] + '/oss/file/function/upload'
+      let uploadUrl =
+        window.SITE_CONFIG["apiURL"] + "/oss/file/function/upload";
 
       // :data="{customerId:customerId}"
       // let uploadUrl = constants.userUploadUrl
       // eslint-disable-next-line global-require
-      require('./zh_CN')
+      require("./zh_CN");
       let conf = {
         selector: `#${this.tinymceId}`,
-        language: 'zh_CN',
-        menubar: 'false',
-        skin_url: '/' + process.env.VUE_APP_PUBLIC_PATH + '/tinymce/skins/ui/tduck',
-        content_style: 'p {margin:3px 0; border:0px; padding:0px}',
-        content_css: '/' + process.env.VUE_APP_PUBLIC_PATH + '/tinymce/skins/content/tduck',
-        cache_suffix: '?v=0.0.1',
+        language: "zh_CN",
+        menubar: "false",
+        skin_url:
+          "/" + process.env.VUE_APP_PUBLIC_PATH + "/tinymce/skins/ui/tduck",
+        content_style: "p {margin:3px 0; border:0px; padding:0px}",
+        content_css:
+          "/" +
+          process.env.VUE_APP_PUBLIC_PATH +
+          "/tinymce/skins/content/tduck",
+        cache_suffix: "?v=0.0.1",
         plugins,
         toolbar,
-        toolbar_drawer: 'sliding',
-        toolbar_mode: 'sliding',
+        toolbar_drawer: "sliding",
+        toolbar_mode: "sliding",
         height: 400,
         // fontsize_formats: "8pt 10pt 12pt 14pt 18pt 24pt 36pt",
         branding: false,
         object_resizing: false,
         end_container_on_empty_block: true,
-        powerpaste_word_import: 'clean',
+        powerpaste_word_import: "clean",
         // code_dialog_height: 450,
         // code_dialog_width: 1000,
         // autoresize_max_height: 450, // 编辑区域的最大高度
         // autoresize_min_height: 350, //编辑区域的最小高度
-        advlist_bullet_styles: 'square',
-        advlist_number_styles: 'default',
-        default_link_target: '_blank',
+        advlist_bullet_styles: "square",
+        advlist_number_styles: "default",
+        default_link_target: "_blank",
         link_title: false,
         statusbar: false,
         nonbreaking_force_tab: true,
         // images_upload_url: uploadUrl,
         images_upload_handler: function (blobInfo, succFun, failFun) {
-          var xhr, formData
-          var file = blobInfo.blob()// 转化为易于理解的file对象
-          xhr = new XMLHttpRequest()
-          xhr.withCredentials = false
-          xhr.open('POST', uploadUrl)
-          xhr.setRequestHeader('token', token)
+          var xhr, formData;
+          var file = blobInfo.blob(); // 转化为易于理解的file对象
+          xhr = new XMLHttpRequest();
+          xhr.withCredentials = false;
+          xhr.open("POST", uploadUrl);
+          xhr.setRequestHeader("token", token);
           xhr.onload = function () {
-
-            var json
+            var json;
             if (xhr.status != 200) {
-              failFun('HTTP Error: ' + xhr.status)
-              return
+              failFun("HTTP Error: " + xhr.status);
+              return;
             }
-            json = JSON.parse(xhr.responseText)
-            if (!json || typeof json.data.url != 'string') {
-              failFun('Invalid JSON: ' + xhr.responseText)
-              return
+            json = JSON.parse(xhr.responseText);
+            if (!json || typeof json.data.url != "string") {
+              failFun("Invalid JSON: " + xhr.responseText);
+              return;
             }
 
-            succFun(json.data.url)
-          }
-          formData = new FormData()
+            succFun(json.data.url);
+          };
+          formData = new FormData();
 
-          formData.append('file', file, file.name)// 此处与源文档不一样
+          formData.append("file", file, file.name); // 此处与源文档不一样
           // formData.append('customerId', '111')
-          xhr.send(formData)
-        }
-      }
-      conf = Object.assign(conf, this.$attrs)
-      conf.init_instance_callback = editor => {
-
-        if (this.value) editor.setContent(this.value)
-        this.vModel(editor)
-      }
+          xhr.send(formData);
+        },
+      };
+      conf = Object.assign(conf, this.$attrs);
+      conf.init_instance_callback = (editor) => {
+        if (this.value) editor.setContent(this.value);
+        this.vModel(editor);
+      };
 
-      tinymce.init(conf)
-    })
+      tinymce.init(conf);
+    });
   },
-  destroyed () {
-    this.destroyTinymce()
+  destroyed() {
+    this.destroyTinymce();
   },
   methods: {
-    vModel (editor) {
+    vModel(editor) {
       // 控制连续写入时setContent的触发频率
-      const debounceSetContent = debounce(250, editor.setContent)
-      this.$watch('value', (val, prevVal) => {
+      const debounceSetContent = debounce(250, editor.setContent);
+      this.$watch("value", (val, prevVal) => {
         if (editor && val !== prevVal && val !== editor.getContent()) {
-          if (typeof val !== 'string') val = val.toString()
-          debounceSetContent.call(editor, val)
+          if (typeof val !== "string") val = val.toString();
+          debounceSetContent.call(editor, val);
         }
-      })
+      });
 
-      editor.on('change keyup undo redo', () => {
-        this.$emit('input', editor.getContent())
-      })
-      editor.on('blur', () => {
-        this.$emit('blur')
-      })
+      editor.on("change keyup undo redo", () => {
+        this.$emit("input", editor.getContent());
+      });
+      editor.on("blur", () => {
+        this.$emit("blur");
+      });
+        console.log('init_instance_callback1111111111')
     },
-    getUserToken () {
-      let token = localStorage.getItem('token')
+    getUserToken() {
+      let token = localStorage.getItem("token");
       // console.log('获取token', token)
       // return this.$store.getters['user/isLogin']
-      return token
+      return token;
     },
-    destroyTinymce () {
-      if (!window.tinymce) return
-      const tinymce = window.tinymce.get(this.tinymceId)
+    destroyTinymce() {
+      if (!window.tinymce) return;
+      const tinymce = window.tinymce.get(this.tinymceId);
       if (tinymce) {
-        tinymce.destroy()
+        tinymce.destroy();
       }
-    }
-  }
-}
+    },
+  },
+};
 </script>
diff --git a/src/views/components/tinymce2/index.vue b/src/views/components/tinymce2/index.vue
new file mode 100644
index 000000000..8bb48f017
--- /dev/null
+++ b/src/views/components/tinymce2/index.vue
@@ -0,0 +1,185 @@
+<template>
+  <editor v-model="content" tag-name="div" :init="init" />
+</template>
+
+<script>
+import tinymce from "tinymce/tinymce";
+import Editor from "@tinymce/tinymce-vue";
+import "tinymce/themes/silver/theme"; // 引用主题文件
+import "tinymce/icons/default"; // 引用图标文件
+import "tinymce/plugins/link";
+import "tinymce/plugins/code";
+import "tinymce/plugins/table";
+import "tinymce/plugins/lists";
+import "tinymce/plugins/advlist";
+import "tinymce/plugins/anchor";
+import "tinymce/plugins/autolink"; //锚点
+import "tinymce/plugins/autoresize";
+import "tinymce/plugins/autosave";
+import "tinymce/plugins/charmap"; //特殊字符
+import "tinymce/plugins/code"; //查看源码
+import "tinymce/plugins/codesample"; //插入代码
+import "tinymce/plugins/directionality"; //
+import "tinymce/plugins/fullpage"; //页面属性编辑
+import "tinymce/plugins/fullscreen"; //全屏
+import "tinymce/plugins/help"; //帮助
+import "tinymce/plugins/hr"; //横线
+import "tinymce/plugins/image"; //图片
+import "tinymce/plugins/imagetools"; //图片工具
+import "tinymce/plugins/importcss"; //图片工具
+import "tinymce/plugins/insertdatetime"; //时间插入
+import "tinymce/plugins/media"; //媒体插入
+import "tinymce/plugins/nonbreaking"; //
+import "tinymce/plugins/noneditable"; //不间断空格
+import "tinymce/plugins/pagebreak"; //分页
+import "tinymce/plugins/paste"; //粘贴
+import "tinymce/plugins/preview"; //预览
+import "tinymce/plugins/print"; //打印
+import "tinymce/plugins/quickbars"; //快捷菜单
+import "tinymce/plugins/save"; //保存
+import "tinymce/plugins/searchreplace"; //查询替换
+import "tinymce/plugins/spellchecker"; //拼写检查
+import "tinymce/plugins/tabfocus"; //
+import "tinymce/plugins/template"; //插入模板
+import "tinymce/plugins/textpattern"; //
+import "tinymce/plugins/toc"; //
+import "tinymce/plugins/visualblocks"; //
+import "tinymce/plugins/visualchars"; //
+import "tinymce/plugins/wordcount"; //数字统计
+import { debounce } from "throttle-debounce";
+
+export default {
+  props: {
+    value: {
+      default: "",
+    },
+    height: {
+      default: 400,
+    },
+  },
+  components: {
+    editor: Editor,
+  },
+  data() {
+    let uploadUrl =
+      window.SITE_CONFIG["apiURL"] + "/oss/file/upload-resi-event-file";
+    let token = this.getUserToken();
+
+    let init = {
+      language_url: require("./zh_CN.js"), // 中文语言包路径
+      language: "zh_CN",
+      skin_url: require("tinymce/skins/ui/oxide/skin.css"), // 编辑器皮肤样式
+      menubar: false, // 隐藏菜单栏
+      autoresize_bottom_margin: 50,
+      max_height: this.height,
+      min_height: this.height,
+      //   height: this.height || 500,
+      //   height: 320,
+      toolbar_mode: "none",
+      toolbar_drawer: "sliding",
+      toolbar_mode: "sliding",
+      plugins:
+        "wordcount visualchars visualblocks toc textpattern template tabfocus spellchecker searchreplace save quickbars print preview paste pagebreak noneditable nonbreaking media insertdatetime importcss imagetools image hr help fullscreen fullpage directionality codesample code charmap link code table lists advlist anchor autolink autoresize autosave", // 插件需要import进来
+      toolbar:
+        "formats undo redo paste print fontsizeselect fontselect template fullpage|wordcount ltr rtl visualchars visualblocks toc spellchecker searchreplace|save preview pagebreak nonbreaking|media image|outdent indent aligncenter alignleft alignright alignjustify lineheight  underline quicklink h2 h3 blockquote numlist bullist table removeformat forecolor backcolor bold italic  strikethrough hr charmap link insertdatetime|subscript superscript cut codesample code |anchor preview fullscreen|help",
+      content_style: "p {margin: 5px 0; font-size: 14px}",
+      fontsize_formats: "12px 14px 16px 18px 24px 36px 48px 56px 72px",
+      font_formats:
+        "微软雅黑=Microsoft YaHei,Helvetica Neue,PingFang SC,sans-serif;苹果苹方=PingFang SC,Microsoft YaHei,sans-serif;宋体=simsun,serif;仿宋体=FangSong,serif;黑体=SimHei,sans-serif;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;",
+      branding: false,
+      elementpath: false,
+      resize: false, // 禁止改变大小
+      statusbar: false, // 隐藏底部状态栏
+      object_resizing: false,
+      end_container_on_empty_block: true,
+      powerpaste_word_import: "clean",
+      // code_dialog_height: 450,
+      // code_dialog_width: 1000,
+      // autoresize_max_height: 450, // 编辑区域的最大高度
+      // autoresize_min_height: 350, //编辑区域的最小高度
+      advlist_bullet_styles: "square",
+      advlist_number_styles: "default",
+      default_link_target: "_blank",
+      link_title: false,
+      nonbreaking_force_tab: true,
+      //   图片上传
+      images_upload_handler: function (blobInfo, succFun, failFun) {
+        var xhr, formData;
+        var file = blobInfo.blob(); // 转化为易于理解的file对象
+        xhr = new XMLHttpRequest();
+        xhr.withCredentials = false;
+        xhr.open("POST", uploadUrl);
+        xhr.setRequestHeader("token", token);
+        xhr.onload = function () {
+          var json;
+          if (xhr.status != 200) {
+            failFun("HTTP Error: " + xhr.status);
+            return;
+          }
+          json = JSON.parse(xhr.responseText);
+          if (!json || typeof json.data.url != "string") {
+            failFun("Invalid JSON: " + xhr.responseText);
+            return;
+          }
+
+          succFun(json.data.url);
+        };
+        formData = new FormData();
+
+        formData.append("file", file, file.name); // 此处与源文档不一样
+        formData.append("customerId", localStorage.getItem("customerId"));
+        xhr.send(formData);
+      },
+    };
+
+    // init = Object.assign(init, this.$attrs);
+    init.init_instance_callback = (editor) => {
+      if (this.value) editor.setContent(this.value);
+      this.vModel(editor);
+    };
+
+    // tinymce.init; // 初始化
+
+    const revert_data = (content) => {
+      this.$emit("input", content);
+    };
+
+    return {
+      content: this.value,
+      init,
+      revert_data,
+    };
+  },
+  mounted() {},
+  methods: {
+    vModel(editor) {
+      // 控制连续写入时setContent的触发频率
+      const debounceSetContent = debounce(250, editor.setContent);
+      this.$watch("value", (val, prevVal) => {
+        if (editor && val !== prevVal && val !== editor.getContent()) {
+          if (typeof val !== "string") val = val.toString();
+          debounceSetContent.call(editor, val);
+        }
+      });
+
+      editor.on("change keyup undo redo", () => {
+        this.$emit("input", editor.getContent());
+      });
+      editor.on("blur", () => {
+        this.$emit("blur");
+      });
+    },
+    getUserToken() {
+      return localStorage.getItem("token");
+    },
+    destroyTinymce() {
+      tinymce.destroy();
+    },
+  },
+  watch: {
+    content() {
+      this.revert_data(this.content);
+    },
+  },
+};
+</script>
diff --git a/src/views/components/tinymce2/zh_CN.js b/src/views/components/tinymce2/zh_CN.js
new file mode 100644
index 000000000..925d7f202
--- /dev/null
+++ b/src/views/components/tinymce2/zh_CN.js
@@ -0,0 +1,418 @@
+import tinymce from "tinymce/tinymce";
+tinymce.addI18n('zh_CN', {
+    "Redo": "恢复",
+    "Undo": "撤销",
+    "Cut": "剪切",
+    "Copy": "复制",
+    "Paste": "粘贴",
+    "Select all": "全选",
+    "New document": "新建文档",
+    "Ok": "确定",
+    "Cancel": "取消",
+    "Visual aids": "网格线",
+    "Bold": "粗体",
+    "Italic": "斜体",
+    "Underline": "下划线",
+    "Strikethrough": "删除线",
+    "Superscript": "上标",
+    "Subscript": "下标",
+    "Clear formatting": "清除格式",
+    "Align left": "左对齐",
+    "Align center": "居中",
+    "Align right": "右对齐",
+    "Justify": "两端对齐",
+    "Bullet list": "符号列表",
+    "Numbered list": "数字列表",
+    "Decrease indent": "减少缩进",
+    "Increase indent": "增加缩进",
+    "Close": "关闭",
+    "Formats": "格式",
+    "Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X/C/V keyboard shortcuts instead.": "当前浏览器不支持访问剪贴板，请使用快捷键Ctrl+X/C/V复制粘贴",
+    "Headers": "标题",
+    "Header 1": "标题1",
+    "Header 2": "标题2",
+    "Header 3": "标题3",
+    "Header 4": "标题4",
+    "Header 5": "标题5",
+    "Header 6": "标题6",
+    "Headings": "标题",
+    "Heading 1": "标题1",
+    "Heading 2": "标题2",
+    "Heading 3": "标题3",
+    "Heading 4": "标题4",
+    "Heading 5": "标题5",
+    "Heading 6": "标题6",
+    "Preformatted": "预格式化",
+    "Div": "Div区块",
+    "Pre": "预格式文本",
+    "Code": "代码",
+    "Paragraph": "段落",
+    "Blockquote": "引用",
+    "Inline": "文本",
+    "Blocks": "区块",
+    "Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "当前为纯文本粘贴模式，再次点击可以回到普通粘贴模式。",
+    "Fonts": "字体",
+    "Font Sizes": "字号",
+    "Class": "Class",
+    "Browse for an image": "浏览图像",
+    "OR": "或",
+    "Drop an image here": "拖放一张图片文件至此",
+    "Upload": "上传",
+    "Block": "块",
+    "Align": "对齐",
+    "Default": "默认",
+    "Circle": "空心圆",
+    "Disc": "实心圆",
+    "Square": "方块",
+    "Lower Alpha": "小写英文字母",
+    "Lower Greek": "小写希腊字母",
+    "Lower Roman": "小写罗马字母",
+    "Upper Alpha": "大写英文字母",
+    "Upper Roman": "大写罗马字母",
+    "Anchor...": "锚点...",
+    "Name": "名称",
+    "Id": "id",
+    "Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "id应该以字母开头，后跟字母、数字、横线、点、冒号或下划线。",
+    "You have unsaved changes are you sure you want to navigate away?": "你对文档的修改尚未保存，确定离开吗？",
+    "Restore last draft": "恢复上次的草稿",
+    "Special characters...": "特殊字符...",
+    "Source code": "HTML源码",
+    "Insert/Edit code sample": "插入/编辑代码示例",
+    "Language": "语言",
+    "Code sample...": "代码示例...",
+    "Color Picker": "选取颜色",
+    "R": "R",
+    "G": "G",
+    "B": "B",
+    "Left to right": "从左到右",
+    "Right to left": "从右到左",
+    "Emoticons...": "表情符号...",
+    "Metadata and Document Properties": "元数据和文档属性",
+    "Title": "标题",
+    "Keywords": "关键词",
+    "Description": "描述",
+    "Robots": "机器人",
+    "Author": "作者",
+    "Encoding": "编码",
+    "Fullscreen": "全屏",
+    "Action": "操作",
+    "Shortcut": "快捷键",
+    "Help": "帮助",
+    "Address": "地址",
+    "Focus to menubar": "移动焦点到菜单栏",
+    "Focus to toolbar": "移动焦点到工具栏",
+    "Focus to element path": "移动焦点到元素路径",
+    "Focus to contextual toolbar": "移动焦点到上下文菜单",
+    "Insert link (if link plugin activated)": "插入链接 (如果链接插件已激活)",
+    "Save (if save plugin activated)": "保存(如果保存插件已激活)",
+    "Find (if searchreplace plugin activated)": "查找(如果查找替换插件已激活)",
+    "Plugins installed ({0}):": "已安装插件 ({0})：",
+    "Premium plugins:": "优秀插件：",
+    "Learn more...": "了解更多...",
+    "You are using {0}": "你正在使用 {0}",
+    "Plugins": "插件",
+    "Handy Shortcuts": "快捷键",
+    "Horizontal line": "水平分割线",
+    "Insert/edit image": "插入/编辑图片",
+    "Image description": "图片描述",
+    "Source": "地址",
+    "Dimensions": "大小",
+    "Constrain proportions": "保持宽高比",
+    "General": "常规",
+    "Advanced": "高级",
+    "Style": "样式",
+    "Vertical space": "垂直边距",
+    "Horizontal space": "水平边距",
+    "Border": "边框",
+    "Insert image": "插入图片",
+    "Image...": "图片...",
+    "Image list": "图片列表",
+    "Rotate counterclockwise": "逆时针旋转",
+    "Rotate clockwise": "顺时针旋转",
+    "Flip vertically": "垂直翻转",
+    "Flip horizontally": "水平翻转",
+    "Edit image": "编辑图片",
+    "Image options": "图片选项",
+    "Zoom in": "放大",
+    "Zoom out": "缩小",
+    "Crop": "裁剪",
+    "Resize": "调整大小",
+    "Orientation": "方向",
+    "Brightness": "亮度",
+    "Sharpen": "锐化",
+    "Contrast": "对比度",
+    "Color levels": "色阶",
+    "Gamma": "伽马值",
+    "Invert": "反转",
+    "Apply": "应用",
+    "Back": "后退",
+    "Insert date/time": "插入日期/时间",
+    "Date/time": "日期/时间",
+    "Insert/Edit Link": "插入/编辑链接",
+    "Insert/edit link": "插入/编辑链接",
+    "Text to display": "显示文字",
+    "Url": "地址",
+    "Open link in...": "链接打开方式...",
+    "Current window": "当前窗口打开",
+    "None": "在当前窗口/框架打开",
+    "New window": "在新窗口打开",
+    "Remove link": "删除链接",
+    "Anchors": "锚点",
+    "Link...": "链接...",
+    "Paste or type a link": "粘贴或输入链接",
+    "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "你所填写的URL地址为邮件地址，需要加上mailto:前缀吗？",
+    "The URL you entered seems to be an external link. Do you want to add the required http:// prefix?": "你所填写的URL地址属于外部链接，需要加上http://:前缀吗？",
+    "Link list": "链接列表",
+    "Insert video": "插入视频",
+    "Insert/edit video": "插入/编辑视频",
+    "Insert/edit media": "插入/编辑媒体",
+    "Alternative source": "替代资源",
+    "Alternative image URL": "资源备用地址",
+    "Media poster (Image URL)": "封面(图片地址)",
+    "Paste your embed code below:": "将内嵌代码粘贴在下面:",
+    "Embed": "内嵌",
+    "Media...": "多媒体...",
+    "Nonbreaking space": "不间断空格",
+    "Page break": "分页符",
+    "Paste as text": "粘贴为文本",
+    "Preview": "预览",
+    "Print...": "打印...",
+    "Save": "保存",
+    "Find": "查找",
+    "Replace with": "替换为",
+    "Replace": "替换",
+    "Replace all": "替换全部",
+    "Previous": "上一个",
+    "Next": "下一个",
+    "Find and replace...": "查找并替换...",
+    "Could not find the specified string.": "未找到搜索内容。",
+    "Match case": "区分大小写",
+    "Find whole words only": "全单词匹配",
+    "Spell check": "拼写检查",
+    "Ignore": "忽略",
+    "Ignore all": "忽略全部",
+    "Finish": "完成",
+    "Add to Dictionary": "添加到字典",
+    "Insert table": "插入表格",
+    "Table properties": "表格属性",
+    "Delete table": "删除表格",
+    "Cell": "单元格",
+    "Row": "行",
+    "Column": "列",
+    "Cell properties": "单元格属性",
+    "Merge cells": "合并单元格",
+    "Split cell": "拆分单元格",
+    "Insert row before": "在上方插入",
+    "Insert row after": "在下方插入",
+    "Delete row": "删除行",
+    "Row properties": "行属性",
+    "Cut row": "剪切行",
+    "Copy row": "复制行",
+    "Paste row before": "粘贴到上方",
+    "Paste row after": "粘贴到下方",
+    "Insert column before": "在左侧插入",
+    "Insert column after": "在右侧插入",
+    "Delete column": "删除列",
+    "Cols": "列",
+    "Rows": "行",
+    "Width": "宽",
+    "Height": "高",
+    "Cell spacing": "单元格外间距",
+    "Cell padding": "单元格内边距",
+    "Show caption": "显示标题",
+    "Left": "左对齐",
+    "Center": "居中",
+    "Right": "右对齐",
+    "Cell type": "单元格类型",
+    "Scope": "范围",
+    "Alignment": "对齐方式",
+    "H Align": "水平对齐",
+    "V Align": "垂直对齐",
+    "Top": "顶部对齐",
+    "Middle": "垂直居中",
+    "Bottom": "底部对齐",
+    "Header cell": "表头单元格",
+    "Row group": "行组",
+    "Column group": "列组",
+    "Row type": "行类型",
+    "Header": "表头",
+    "Body": "表体",
+    "Footer": "表尾",
+    "Border color": "边框颜色",
+    "Insert template...": "插入模板...",
+    "Templates": "模板",
+    "Template": "模板",
+    "Text color": "文字颜色",
+    "Background color": "背景色",
+    "Custom...": "自定义...",
+    "Custom color": "自定义颜色",
+    "No color": "无",
+    "Remove color": "删除颜色",
+    "Table of Contents": "目录",
+    "Show blocks": "显示区块边框",
+    "Show invisible characters": "显示不可见字符",
+    "Word count": "字数统计",
+    "Words: {0}": "字数：{0}",
+    "{0} words": "{0} 个字",
+    "File": "文件",
+    "Edit": "编辑",
+    "Insert": "插入",
+    "View": "查看",
+    "Format": "格式",
+    "Table": "表格",
+    "Tools": "工具",
+    "Powered by {0}": "Powered by {0}",
+    "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "在编辑区按ALT+F9打开菜单，按ALT+F10打开工具栏，按ALT+0查看帮助",
+    "Image title": "图片标题",
+    "Border width": "边框宽度",
+    "Border style": "边框样式",
+    "Error": "错误",
+    "Warn": "警告",
+    "Valid": "有效",
+    "To open the popup, press Shift+Enter": "此快捷为软回车（插入<br>）",
+    "Rich Text Area. Press ALT-0 for help.": "编辑区. 按Alt+0键打开帮助",
+    "System Font": "默认字体",
+    "Failed to upload image: {0}": "图片上传失败: {0}",
+    "Failed to load plugin: {0} from url {1}": "插件加载失败: {0} - {1}",
+    "Failed to load plugin url: {0}": "插件加载失败: {0}",
+    "Failed to initialize plugin: {0}": "插件初始化失败: {0}",
+    "example": "示例",
+    "Search": "查找",
+    "All": "全部",
+    "Currency": "货币",
+    "Text": "文本",
+    "Quotations": "引用",
+    "Mathematical": "数学运算符",
+    "Extended Latin": "拉丁语扩充",
+    "Symbols": "符号",
+    "Arrows": "箭头",
+    "User Defined": "自定义",
+    "dollar sign": "美元",
+    "currency sign": "货币",
+    "euro-currency sign": "欧元",
+    "colon sign": "冒号",
+    "cruzeiro sign": "克鲁赛罗币",
+    "french franc sign": "法郎",
+    "lira sign": "里拉",
+    "mill sign": "密尔",
+    "naira sign": "奈拉",
+    "peseta sign": "比塞塔",
+    "rupee sign": "卢比",
+    "won sign": "韩元",
+    "new sheqel sign": "新谢克尔",
+    "dong sign": "越南盾",
+    "kip sign": "老挝基普",
+    "tugrik sign": "图格里克",
+    "drachma sign": "德拉克马",
+    "german penny symbol": "德国便士",
+    "peso sign": "比索",
+    "guarani sign": "瓜拉尼",
+    "austral sign": "澳元",
+    "hryvnia sign": "格里夫尼亚",
+    "cedi sign": "塞地",
+    "livre tournois sign": "里弗弗尔",
+    "spesmilo sign": "一千spesoj的货币符号，该货币未使用",
+    "tenge sign": "坚戈",
+    "indian rupee sign": "印度卢比",
+    "turkish lira sign": "土耳其里拉",
+    "nordic mark sign": "北欧马克",
+    "manat sign": "马纳特",
+    "ruble sign": "卢布",
+    "yen character": "日元",
+    "yuan character": "人民币元",
+    "yuan character, in hong kong and taiwan": "元的繁体字",
+    "yen/yuan character variant one": "元（大写）",
+    "Loading emoticons...": "正在加载表情文字...",
+    "Could not load emoticons": "不能加载表情文字",
+    "People": "人类",
+    "Animals and Nature": "动物和自然",
+    "Food and Drink": "食物和饮品",
+    "Activity": "活动",
+    "Travel and Places": "旅游和地点",
+    "Objects": "物件",
+    "Flags": "旗帜",
+    "Characters": "字数",
+    "Characters (no spaces)": "字数（不含空格）",
+    "Error: Form submit field collision.": "错误: 表单提交字段冲突.",
+    "Error: No form element found.": "错误: 未找到可用的form.",
+    "Update": "更新",
+    "Color swatch": "颜色样本",
+    "Turquoise": "青绿",
+    "Green": "绿色",
+    "Blue": "蓝色",
+    "Purple": "紫色",
+    "Navy Blue": "海军蓝",
+    "Dark Turquoise": "深蓝绿色",
+    "Dark Green": "暗绿",
+    "Medium Blue": "中蓝",
+    "Medium Purple": "中紫",
+    "Midnight Blue": "深蓝",
+    "Yellow": "黄色",
+    "Orange": "橙色",
+    "Red": "红色",
+    "Light Gray": "浅灰",
+    "Gray": "灰色",
+    "Dark Yellow": "暗黄",
+    "Dark Orange": "暗橙",
+    "Dark Red": "暗红",
+    "Medium Gray": "中灰",
+    "Dark Gray": "深灰",
+    "Black": "黑色",
+    "White": "白色",
+    "Switch to or from fullscreen mode": "切换全屏模式",
+    "Open help dialog": "打开帮助对话框",
+    "history": "历史",
+    "styles": "样式",
+    "formatting": "格式化",
+    "alignment": "对齐",
+    "indentation": "缩进",
+    "permanent pen": "记号笔",
+    "comments": "注释",
+    "Anchor": "锚点",
+    "Special character": "特殊字符",
+    "Code sample": "代码示例",
+    "Color": "颜色",
+    "Emoticons": "表情",
+    "Document properties": "文档属性",
+    "Image": "图片",
+    "Insert link": "插入链接",
+    "Target": "目标",
+    "Link": "链接",
+    "Poster": "封面",
+    "Media": "音视频",
+    "Print": "打印",
+    "Prev": "上一个",
+    "Find and replace": "查找并替换",
+    "Whole words": "全字匹配",
+    "Spellcheck": "拼写检查",
+    "Caption": "标题",
+    "Insert template": "插入模板",
+    //以下为补充汉化内容 by 莫若卿
+    "Code view": "代码区域",
+    "Select...": "选择...",
+    "Format Painter": "格式刷",
+    "No templates defined.": "无内置模板",
+    "Special character...": "特殊字符...",
+    "Open link": "打开链接",
+    // "None": "无",
+    "Count": "统计",
+    "Document": "整个文档",
+    "Selection": "选取部分",
+    "Words": "字词数",
+    "{0} characters": "{0} 个字符",
+    "Alternative source URL": "替代资源地址",
+    "Alternative description": "替代说明文字",
+    "Accessibility": "可访问性",
+    "Image is decorative": "仅用于装饰",
+    //5.6新增
+    "Line height": "行高",
+    "Cut column": "剪切列",
+    "Copy column": "复制列",
+    "Paste column before": "粘贴到前方",
+    "Paste column after": "粘贴到后方",
+    // "Copy column": "复制列",
+    //帮助窗口内的文字
+    "Version": "版本",
+    "Keyboard Navigation": "键盘导航",
+    "Open popup menu for split buttons": "该组合键的作用是软回车（插入br）",
+});
\ No newline at end of file
diff --git a/src/views/modules/base/community/buildForm.vue b/src/views/modules/base/community/buildForm.vue
index 5966fa846..5a9c703f2 100644
--- a/src/views/modules/base/community/buildForm.vue
+++ b/src/views/modules/base/community/buildForm.vue
@@ -73,6 +73,26 @@
                            :max="9999"
                            label="总户数"></el-input-number>
         </el-form-item>
+        <el-form-item label="楼长姓名"
+                      prop="buildingLeaderName"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    placeholder="请输入楼长姓名"
+                    v-model="dataForm.buildingLeaderName">
+          </el-input>
+        </el-form-item>
+
+        <el-form-item label="楼长电话"
+                      prop="buildingLeaderMobile"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    type='number'
+                    placeholder="请输入楼长电话"
+                    v-model="dataForm.buildingLeaderMobile">
+          </el-input>
+        </el-form-item>
 
         <el-form-item label="位置坐标"
                       prop="longitude"
@@ -149,6 +169,8 @@ export default {
         totalUnitNum: 1,//单元数	
         totalFloorNum: 0,//层数	
         totalHouseNum: 0,//总户数	
+        buildingLeaderName: '',//楼长姓名
+        buildingLeaderMobile: '',//楼长电话
         type: '',//房屋类型
         location: '', //坐标位置
         longitude: '', //经度
@@ -205,6 +227,17 @@ export default {
       })
     },
     async addBuild () {
+      if (this.dataForm.buildingLeaderMobile) {
+        const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+        if (this.dataForm.buildingLeaderMobile && regPhone.test(this.dataForm.buildingLeaderMobile) === false) {
+          this.btnDisable = false
+          this.$message({
+            type: 'warning',
+            message: '请输入正确的楼主手机'
+          })
+          return false;
+        }
+      }
 
       let url = ''
       if (this.formType === 'add') {
@@ -330,6 +363,8 @@ export default {
         totalUnitNum: 1,//单元数	
         totalFloorNum: 0,//层数	
         totalHouseNum: 0,//总户数	
+        buildingLeaderName: '',//楼长姓名
+        buildingLeaderMobile: '',//楼长电话
         type: '',//房屋类型
         location: '', //坐标位置
         longitude: '', //经度
diff --git a/src/views/modules/base/community/buildTable copy.vue b/src/views/modules/base/community/buildTable copy.vue
deleted file mode 100644
index 658cb3bd5..000000000
--- a/src/views/modules/base/community/buildTable copy.vue	
+++ /dev/null
@@ -1,685 +0,0 @@
-<template>
-  <div>
-    <div class="div_search">
-      <div class="resi-cell">
-        <div class="resi-cell-label">房主姓名</div>
-        <div class="resi-cell-value">
-          <el-input v-model="ownerName"
-                    class="resi-cell-input"
-                    size="small"
-                    clearable
-                    placeholder="请输入内容">
-          </el-input>
-
-        </div>
-      </div>
-      <div class="resi-cell">
-        <div class="resi-cell-label">房主手机</div>
-        <div class="resi-cell-value">
-          <el-input v-model="ownerPhone"
-                    class="resi-cell-input"
-                    size="small"
-                    clearable
-                    placeholder="请输入内容">
-          </el-input>
-
-        </div>
-      </div>
-      <el-button style="margin-left:10px"
-                 class="diy-button--search"
-                 size="small"
-                 @click="handleSearch">查询</el-button>
-      <el-button style="margin-left:10px"
-                 class="diy-button--reset"
-                 size="small"
-                 @click="resetSearch">重置</el-button>
-    </div>
-    <div class="div_btn">
-
-      <el-button style="float:left"
-                 class="diy-button--add"
-                 size="small"
-                 @click="handleAdd">新增楼栋</el-button>
-      <div class="btn_upload"
-           v-if="showImportBtn">
-        <el-button style=";margin-left:10px"
-                   class="diy-button--export"
-                   size="small"
-                   @click="handleExportModule('building')">下载楼栋模板</el-button>
-
-        <el-upload style=""
-                   ref="upload_building"
-                   :multiple='false'
-                   :show-file-list='false'
-                   :before-upload="((file)=>{beforeUpload(file, 'building')})"
-                   action=""
-                   accept=".xls,.xlsx"
-                   :http-request="(()=>{uploadFile( 'building')})">
-          <el-button style="margin-left:10px"
-                     size="small"
-                     class="diy-button--delete">导入楼栋数据</el-button>
-        </el-upload>
-        <el-button style=";margin-left:10px"
-                   class="diy-button--export"
-                   size="small"
-                   @click="handleExportModule('room')">下载房屋模板</el-button>
-
-        <el-upload style=""
-                   ref="upload_room"
-                   :multiple='false'
-                   :show-file-list='false'
-                   :before-upload="((file)=>{beforeUpload(file, 'room')})"
-                   action=""
-                   accept=".xls,.xlsx"
-                   :http-request="(()=>{uploadFile( 'room')})">
-          <el-button style="margin-left:10px"
-                     size="small"
-                     class="diy-button--delete">导入房屋数据</el-button>
-        </el-upload>
-      </div>
-      <el-button style="float:left;margin-left:10px"
-                 class="diy-button--reset"
-                 size="small"
-                 @click="handleExport">导出</el-button>
-      <el-button style="float:left;margin-left:10px"
-                 class="diy-button--more"
-                 size="small"
-                 @click="deleteBatch">批量删除</el-button>
-    </div>
-
-    <div class="div_table">
-      <el-table ref="ref_table"
-                :data="tableData"
-                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
-                border
-                :height="tableHeight"
-                v-loading="tableLoading"
-                style="width: 100%"
-                @select-all="selectAll"
-                @selection-change="selectionChange">
-        <el-table-column type="selection"
-                         :selectable="checkSelect"
-                         width="55">
-        </el-table-column>
-        <el-table-column prop="buildingName"
-                         label="楼栋名称"
-                         min-width="180">
-        </el-table-column>
-        <el-table-column prop="neighborHoodName"
-                         label="所属小区"
-                         min-width="160">
-        </el-table-column>
-        <el-table-column prop="buildingType"
-                         label="楼栋类型"
-                         min-width="140">
-        </el-table-column>
-        <el-table-column prop="totalUnitNum"
-                         label="单元数">
-        </el-table-column>
-        <el-table-column prop="totalFloorNum"
-                         label="层数">
-        </el-table-column>
-        <el-table-column prop="totalHouseNum"
-                         label="总户数">
-        </el-table-column>
-
-        <el-table-column label="操作"
-                         fixed="right"
-                         width="140"
-                         header-align="center"
-                         align="center"
-                         class="operate">
-          <template slot-scope="scope">
-            <!-- <el-button type="text"
-                       style="color:#feb349;text-decoration: underline;"
-                       size="small"
-                       @click="handleToNextLevel(scope.row)">进入</el-button> -->
-            <el-button type="text"
-                       class="div-table-button--detail"
-                       size="small"
-                       @click="handleDetail(scope.row)">查看</el-button>
-            <el-button v-if="scope.row.showBtn"
-                       type="text"
-                       class="div-table-button--edit"
-                       size="small"
-                       @click="handleEdit(scope.row)">修改</el-button>
-
-            <el-button v-if="scope.row.showBtn"
-                       type="text"
-                       class="div-table-button--delete"
-                       size="small"
-                       @click="handleDelete(scope.row)">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div>
-        <el-pagination @size-change="handleSizeChange"
-                       @current-change="handleCurrentChange"
-                       :current-page.sync="pageNo"
-                       :page-sizes="[20, 50, 100, 200]"
-                       :page-size="pageSize"
-                       layout="sizes, prev, pager, next, total"
-                       :total="total">
-        </el-pagination>
-      </div>
-
-    </div>
-
-    <!-- 修改弹出框 -->
-    <el-dialog :visible.sync="formShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="formTitle"
-               top="5vh"
-               width="900px"
-               class="dialog-h"
-               @closed="diaClose">
-      <build-form ref="ref_form"
-                  @dialogCancle="addFormCancle"
-                  @dialogOk="addFormOk"></build-form>
-    </el-dialog>
-
-  </div>
-</template>
-
-<script>
-
-import BuildForm from './buildForm'
-
-import { requestPost } from "@/js/dai/request";
-import { mapGetters } from 'vuex'
-import { Loading } from 'element-ui' // 引入Loading服务
-
-let loading // 加载动画
-export default {
-  data () {
-    return {
-      importBuildingLoading: false,
-      importRoomLoading: false,
-      total: 0,
-      pageSize: 20,
-      pageNo: 0,
-      tableLoading: true,
-
-
-      agencyObj: {},//树所选的小区对象
-      ownerName: '',
-      ownerPhone: '',
-      validTableDataNum: 0,//有效的数据数量，即有权限操作的数据数量
-      selection: [],
-
-
-      //form相关
-      formShow: false,
-      formTitle: '新增楼栋',
-
-    }
-  },
-  components: {
-    BuildForm
-  },
-  async mounted () {
-    console.log('building11111111111111111111111111')
-  },
-  computed: {
-    tableHeight () {
-
-      return this.$store.state.inIframe ? this.clientHeight - 300 + this.iframeHeight : this.clientHeight - 300
-
-    },
-
-    ...mapGetters(['clientHeight', 'iframeHeight'])
-  },
-  methods: {
-    //重置搜索条件
-    resetSearch () {
-      this.ownerName = ''
-      this.ownerPhone = ''
-
-      this.pageSize = 10
-      this.pageNo = 0
-      // this.loadTable()
-    },
-    handleSearch () {
-      this.loadTable()
-    },
-
-    checkSelect (row, index) {
-      let isChecked = false;
-      if (row.showBtn) { // 判断里面是否存在某个参数
-        isChecked = true
-      } else {
-        isChecked = false
-      }
-      return isChecked
-    },
-
-    async loadTable (fromTree, treeObj) {
-      this.tableLoading = true
-      if (fromTree) {
-
-        this.agencyObj = treeObj
-
-        // if (this.agencyObj.pid === this.staffAgencyId) {//如果所选树的父级组织id和登录人员id相同，有权限
-        //   this.showImportBtn = true
-        // } else {
-        //   this.showImportBtn = false
-        // }
-      }
-
-
-      console.log(this.agencyObj)
-      const url = "/gov/org/building/buildinglist"
-      let params = {
-        pageSize: this.pageSize,
-        pageNo: this.pageNo,
-        ownerName: this.ownerName,
-        ownerPhone: this.ownerPhone,
-        neighborHoodId: this.agencyObj.id
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.validTableDataNum = 0
-        this.total = data.total
-        data.list.forEach(item => {
-          if (item.agencyId === this.staffAgencyId) {
-            item.showBtn = true
-            this.validTableDataNum++
-          } else {
-            item.showBtn = false
-          }
-
-        });
-        this.tableData = data.list
-      } else {
-        this.$message.error(msg)
-      }
-      this.tableLoading = false
-    },
-
-    diaClose () {
-      this.$refs.ref_form.resetData()
-      this.formShow = false
-    },
-
-    handleDetail (row) {
-      this.formTitle = '楼栋详情'
-      this.formShow = true
-      this.$nextTick(() => {
-        this.$refs.ref_form.initForm('detail', row, this.agencyObj)
-      })
-    },
-
-    handleAdd () {
-      this.formTitle = '新增楼栋'
-      this.formShow = true
-      this.$nextTick(() => {
-        this.$refs.ref_form.initForm('add', null, this.agencyObj)
-      })
-    },
-
-    handleEdit (row) {
-      this.formTitle = '修改楼栋'
-      this.formShow = true
-      this.$nextTick(() => {
-        this.$refs.ref_form.initForm('edit', row, this.agencyObj)
-      })
-    },
-
-    handleToNextLevel (row) {
-      this.$emit('toNextLevel', row, 'building')
-    },
-
-    addFormCancle () {
-      this.formShow = false
-    },
-    addFormOk () {
-      this.formShow = false
-      this.loadTable()
-      this.$emit('refreshTree')
-    },
-
-
-    deleteBatch () {
-      if (this.selection.length > 0) {
-        this.$confirm("确认删除选择的楼栋?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            this.deleteCommunityBatch()
-          })
-          .catch(err => {
-            if (err == "cancel") {
-              // this.$message({
-              //   type: "info",
-              //   message: "已取消删除"
-              // });
-            }
-
-          });
-      } else {
-        this.$message.warning('请先选择要删除的楼栋')
-      }
-    },
-    selectAll (selection) {
-      this.selection = selection
-
-    },
-    selectionChange (selection) {
-      this.selection = selection
-
-    },
-    async handleDelete (row) {
-
-      this.$confirm("确认删除?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      })
-        .then(() => {
-          this.deleteBuild(row)
-        })
-        .catch(err => {
-          if (err == "cancel") {
-            // this.$message({
-            //   type: "info",
-            //   message: "已取消删除"
-            // });
-          }
-
-        });
-
-
-    },
-
-    async deleteCommunityBatch () {
-      let ids = []
-      this.selection.forEach(element => {
-
-        ids.push(element.buildingId)
-      });
-
-      const url = "/gov/org/house/delete"
-
-      let params = {
-        type: 'building',
-        ids: ids
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.$message({
-          type: "success",
-          message: "删除成功"
-        });
-        this.$emit('refreshTree')
-        this.loadTable()
-      } else if (code > 8000) {
-        this.$message({
-          showClose: true,
-          message: msg,
-          duration: 0
-        })
-        this.$emit('refreshTree')
-        this.loadTable()
-      } else {
-        this.$message.error(msg)
-      }
-    },
-
-    async deleteBuild (row) {
-      const url = "/gov/org/building/buildingdel"
-
-      let params = {
-        buildingId: row.buildingId
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.$message({
-          type: "success",
-          message: "删除成功"
-        });
-        this.$emit('refreshTree')
-        this.loadTable()
-      } else {
-        this.$message.error(msg)
-      }
-    },
-
-    //导出表格
-    async handleExport () {
-      let title = this.agencyObj.label
-      title = title + '—楼栋列表'
-
-      const url = "/gov/org/building/exportbuildinginfo"
-      let params = {
-        ownerName: this.ownerName,
-        ownerPhone: this.ownerPhone,
-        neighborHoodId: this.agencyObj.id
-      }
-
-      app.ajax.exportFilePost(
-        url,
-        params,
-        (data, rspMsg) => {
-
-          this.download(data, title + '.xls')
-        },
-        (rspMsg, data) => {
-          this.$message.error(rspMsg);
-        }
-      );
-
-    },
-
-    // 下载文件
-    download (data, fileName) {
-      if (!data) {
-        return
-      }
-
-      var csvData = new Blob([data])
-
-      if (window.navigator && window.navigator.msSaveOrOpenBlob) {
-        window.navigator.msSaveOrOpenBlob(csvData, fileName);
-      }
-      // for Non-IE (chrome, firefox etc.)
-      else {
-        var a = document.createElement('a');
-        document.body.appendChild(a);
-        a.style = 'display: none';
-        var url = window.URL.createObjectURL(csvData);
-        a.href = url;
-        a.download = fileName;
-        a.click();
-        a.remove();
-        window.URL.revokeObjectURL(url);
-      }
-
-    },
-
-    handleExportModule (type) {
-
-      let title = ''
-      let url = ""
-      if (type === 'building') {
-        title = '楼栋导入模板'
-        url = '/gov/org/building/exporttemplate'
-
-      } else if (type === 'room') {
-        title = '房屋导入模板'
-        url = '/gov/org/house/exporttemplate'
-      }
-
-
-      let params = {}
-
-      app.ajax.exportFilePost(
-        url,
-        params,
-        (data, rspMsg) => {
-
-          this.download(data, title + '.xls')
-        },
-        (rspMsg, data) => {
-          this.$message.error(rspMsg);
-        }
-      );
-    },
-
-
-    // 上传文件之前的钩子
-    beforeUpload (file, type) {
-      this.files = file;
-
-      const isText = file.type === 'application/vnd.ms-excel'
-      const isTextComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-
-      if (!isText && !isTextComputer) {
-        this.$message.error('请选择正确格式的文件')
-        this.files = null
-        this.fileName = ''
-        return false
-      } else {
-        this.fileName = file.name;
-        return true
-      }
-
-    },
-    // 上传文件个数超过定义的数量
-    handleExceed (files, fileList) {
-      this.$message.warning(`当前限制选择 1 个文件，请删除后继续上传`)
-    },
-
-    async uploadFile (type) {
-      if (this.fileName == "") {
-        this.$message.warning('请选择要上传的文件！')
-        return false
-      }
-      this.$message({
-        showClose: true,
-        message: '导入中，请到系统管理-导入记录中查看进度',
-        duration: 0
-      })
-
-
-      //清空上传列表
-      let url = ''
-      let params = {}
-      let fileFormData = new FormData();
-      fileFormData.append('file', this.files);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
-      fileFormData.append('orgId', this.agencyObj.id);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
-      fileFormData.append('orgType', this.agencyObj.level);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
-
-      // params.file = fileFormData
-      // params.orgId = this.agencyObj.id
-      // params.orgType = this.agencyObj.level
-
-      if (type === 'building') {
-        this.$refs['upload_building'].clearFiles()
-        // url = 'http://192.168.51.26:8080/api/gov/org/building/buildingimport'
-        url = '/gov/org/building/buildingimport'
-        this.importBuildingLoading = true
-
-      } else if (type === 'room') {
-        this.$refs['upload_room'].clearFiles()
-        // url = 'http://192.168.51.26:8080/api/gov/org/house/houseimport'
-        url = '/gov/org/house/houseimport'
-        this.importRoomLoading = true
-      }
-
-      window.app.ajax.post2(url, fileFormData,
-        (data, rspMsg) => {
-
-          if (data.code === 0 && data.msg == 'success') {
-            // this.$message.success('导入成功')
-          } else {
-            // this.$message({
-            //   showClose: true,
-            //   message: rspMsg,
-            //   duration: 0,
-            //   type: "error"
-            // })
-            // this.$message.error(rspMsg)
-          }
-          this.$emit('refreshTree')
-          this.loadTable()
-          if (type === 'building') {
-            this.importBuildingLoading = false
-
-          } else if (type === 'room') {
-            this.importRoomLoading = false
-          }
-        },
-        (rspMsg, data) => {
-          if (type === 'building') {
-            this.importBuildingLoading = false
-
-          } else if (type === 'room') {
-            this.importRoomLoading = false
-          }
-        }, { headers: { 'Content-Type': 'multipart/form-data' } })
-
-    },
-
-    showMessage (msg) {
-      this.$alert(msg, '操作结果', {
-        confirmButtonText: '关闭',
-        callback: action => {
-          this.$emit('refreshTree')
-          this.loadTable()
-        }
-      });
-    },
-
-    handleSizeChange (val) {
-      this.pageSize = val
-      this.pageNo = 1
-      this.loadTable()
-    },
-    handleCurrentChange (val) {
-      this.pageNo = val
-      this.loadTable()
-    },
-
-    // 开启加载动画
-    startLoading () {
-      loading = Loading.service({
-        lock: true, // 是否锁定
-        text: '正在加载……', // 加载中需要显示的文字
-        background: 'rgba(0,0,0,.7)' // 背景颜色
-      })
-    },
-    // 结束加载动画
-    endLoading () {
-      // clearTimeout(timer);
-      if (loading) {
-        loading.close()
-      }
-    }
-  },
-  watch: {
-
-  },
-  props: {
-    staffAgencyId: {
-      type: String,
-      default: '',
-    },
-    showImportBtn: {
-      type: Boolean,
-      default: false,
-    },
-  }
-}
-</script>
-<style lang="scss" scoped >
-@import "@/assets/scss/modules/visual/communityManage.scss";
-</style>
diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue
index dc67bf6a9..43afa3dfb 100644
--- a/src/views/modules/base/community/buildTable.vue
+++ b/src/views/modules/base/community/buildTable.vue
@@ -86,6 +86,14 @@
                          label="楼栋类型"
                          min-width="140">
         </el-table-column>
+        <el-table-column prop="buildingLeaderName"
+                         label="楼长姓名"
+                         min-width="90">
+        </el-table-column>
+        <el-table-column prop="buildingLeaderMobile"
+                         label="楼长电话"
+                         min-width="110">
+        </el-table-column>
         <el-table-column prop="totalUnitNum"
                          label="单元数">
         </el-table-column>
diff --git a/src/views/modules/base/community/community copy.vue b/src/views/modules/base/community/community copy.vue
deleted file mode 100644
index 2812b0d7c..000000000
--- a/src/views/modules/base/community/community copy.vue	
+++ /dev/null
@@ -1,341 +0,0 @@
-<template>
-  <div class="div_main">
-
-    <div :style="{height:rowHeight}"
-         class="div_tree">
-      <el-input placeholder="输入关键字进行过滤"
-                v-model="filterText">
-      </el-input>
-      <el-scrollbar :style="{height:treeHeight}"
-                    class="scrollar">
-        <el-tree ref="ref_tree"
-                 v-loading="treeLoading"
-                 class="filter_tree"
-                 :data="treeData"
-                 :props="defaultProps"
-                 :highlight-current="true"
-                 node-key="id"
-                 :expand-on-click-node="false"
-                 default-expand-all
-                 :filter-node-method="filterNode"
-                 @node-click="handleNodeClick">
-        </el-tree>
-      </el-scrollbar>
-
-    </div>
-
-    <div :style="{height:rowHeight}"
-         class="div_table">
-
-      <build-table v-if="selTreeObj.level==='neighborHood'"
-                   ref="ref_neighTable"
-                   :staffAgencyId="staffAgencyId"
-                   :showImportBtn="showImportBtn"
-                   @toNextLevel="toNextLevel"
-                   @refreshTree="refreshTree"></build-table>
-      <room-table v-else-if="selTreeObj.level==='building'"
-                  :staffAgencyId="staffAgencyId"
-                  :showImportBtn="showImportBtn"
-                  ref="ref_buildingTable"
-                  @refreshTree="refreshTree"></room-table>
-      <community-table v-else
-                       @toNextLevel="toNextLevel"
-                       :staffAgencyId="staffAgencyId"
-                       ref="ref_communityTable"
-                       @refreshTree="refreshTree"></community-table>
-
-    </div>
-
-  </div>
-</template>
-
-<script>
-import CDialog from '@c/CDialog'
-import communityTable from './communityTable'
-import buildTable from './buildTable'
-import roomTable from './roomTable'
-import { requestPost } from "@/js/dai/request";
-import { mapGetters } from 'vuex'
-import { Loading } from 'element-ui' // 引入Loading服务
-
-let loading // 加载动画
-export default {
-  data () {
-    return {
-      filterText: '',
-      treeLoading: true,
-      treeData: [],
-      defaultProps: {
-        children: 'children',
-        label: 'showName'
-      },
-
-      selTreeObj: {},
-
-      centerPoint: [],
-      staffAgencyId: localStorage.getItem("agencyId"),
-      showImportBtn: false
-
-    }
-  },
-  components: {
-    CDialog
-  },
-  async mounted () {
-    this.treeLoading = true
-    await this.loadOrgData()
-    await this.loadTree()
-
-    await this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj)
-    if (this.treeData.length > 0) {
-      this.$nextTick(() => {
-        // ref_tree 元素的ref   value 绑定的node-key
-        this.$refs.ref_tree.setCurrentKey(this.treeData[0].id);
-      });
-    }
-    this.treeLoading = false
-
-  },
-  computed: {
-    rowHeight () {
-
-      return this.$store.state.inIframe ? this.clientHeight - 120 + this.iframeHeight + 'px' : this.clientHeight - 120 + 'px'
-
-    },
-    treeHeight () {
-      return this.$store.state.inIframe ? this.clientHeight - 200 + this.iframeHeight + 'px' : this.clientHeight - 200 + 'px'
-
-    },
-
-    ...mapGetters(['clientHeight', 'iframeHeight'])
-  },
-  methods: {
-    async loadTree (isRefresh) {
-      const url = "/gov/org/building/treelist"
-      let params = {}
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-
-        this.treeData = data
-        if (!isRefresh && data.length > 0) {
-
-          this.selTreeObj = data[0]
-          if (!this.selTreeObj.latitude) {
-            this.selTreeObj.latitude = this.centerPoint[0]
-          }
-
-          if (!this.selTreeObj.longitude) {
-            this.selTreeObj.longitude = this.centerPoint[1]
-          }
-        }
-
-      } else {
-        this.$message.error(msg)
-      }
-    },
-
-    //加载组织数据
-    async loadOrgData () {
-      const url = "/gov/org/agency/maporg"
-      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/agency/maporg"
-      let params = {}
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.centerPoint = []
-
-        this.centerPoint.push(data.latitude)
-        this.centerPoint.push(data.longitude)
-
-      } else {
-        this.$message.error(msg)
-      }
-
-    },
-
-    handleNodeClick (obj) {
-      this.getTreeObj(obj)
-
-      this.$nextTick(() => {
-
-        if (obj.level === 'building') {//点击楼栋
-          this.$refs['ref_buildingTable'].loadTable(true, this.selTreeObj)
-
-        } else if (obj.level === 'neighborHood') {//点击小区
-          this.$refs['ref_neighTable'].loadTable(true, this.selTreeObj)
-
-        } else {
-          this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj)
-        }
-      })
-
-    },
-
-    //添加小区结束
-    async refreshTree () {
-      this.treeLoading = true
-      await this.loadTree(this.selTreeObj.id)
-      this.$nextTick(() => {
-        // ref_tree 元素的ref   value 绑定的node-key
-        this.$refs.ref_tree.setCurrentKey(this.selTreeObj.id);
-      });
-      this.treeLoading = false
-    },
-
-    //进入下一级
-    toNextLevel (row, level) {
-
-      if (level === 'community') {
-        this.selTreeObj = this.$refs.ref_tree.getNode(row.neighborHoodId).data
-      } else {
-        this.selTreeObj = this.$refs.ref_tree.getNode(row.buildingId).data
-      }
-
-      this.handleNodeClick(this.selTreeObj)
-      this.$nextTick(() => {
-        // ref_tree 元素的ref   value 绑定的node-key
-        this.$refs.ref_tree.setCurrentKey(this.selTreeObj.id);
-      });
-
-    },
-
-    //解析树数据
-    getTreeObj (obj) {
-      // 树接口：
-      // 组织：组织id、组织名称、type、经度、纬度
-      // 小区：小区id、小区名称、type、所属网格id、所属网格名称、所属组织id、所属组织名称、经度、纬度
-      // 楼：楼id、楼名称、type、所属小区id、所属小区名称
-      if (obj.level === 'building') {//点击楼栋
-        let neighborHoodNode = this.$refs.ref_tree.getNode(obj.pid)//所属小区
-
-        let gridNode = this.$refs.ref_tree.getNode(neighborHoodNode.data.pid)//所属网格
-        let agencyNode = this.$refs.ref_tree.getNode(gridNode.data.pid)//所属社区
-        obj.agencyId = agencyNode.data.id
-        obj.agencyName = agencyNode.data.label
-        obj.gridId = gridNode.data.id
-        obj.gridName = gridNode.data.label
-        obj.neighborHoodId = neighborHoodNode.data.id
-        obj.neighborHoodName = neighborHoodNode.data.label
-        if (obj.agencyId === this.staffAgencyId) {
-          this.showImportBtn = true
-        } else {
-          this.showImportBtn = false
-        }
-
-      } else if (obj.level === 'neighborHood') {//点击小区
-        let gridNode = this.$refs.ref_tree.getNode(obj.pid)
-        let agencyNode = this.$refs.ref_tree.getNode(gridNode.data.pid)
-        obj.gridId = gridNode.data.id
-        obj.gridName = gridNode.data.label
-        obj.agencyId = agencyNode.data.id
-        obj.agencyName = agencyNode.data.label
-        if (obj.agencyId === this.staffAgencyId) {
-          this.showImportBtn = true
-        } else {
-          this.showImportBtn = false
-        }
-
-      } else {
-
-      }
-
-      if (!obj.latitude) {
-        obj.latitude = this.centerPoint[0]
-      }
-
-      if (!obj.longitude) {
-        obj.longitude = this.centerPoint[1]
-      }
-      this.selTreeObj = obj
-      console.log(this.selTreeObj)
-
-    },
-
-    filterNode (value, data) {
-      if (!value) return true;
-      return data.label.indexOf(value) !== -1;
-    },
-
-    // 开启加载动画
-    startLoading () {
-      loading = Loading.service({
-        lock: true, // 是否锁定
-        text: '正在加载……', // 加载中需要显示的文字
-        background: 'rgba(0,0,0,.7)' // 背景颜色
-      })
-    },
-    // 结束加载动画
-    endLoading () {
-      // clearTimeout(timer);
-      if (loading) {
-        loading.close()
-      }
-    }
-  },
-  watch: {
-    filterText (val) {
-      this.$refs.ref_tree.filter(val);
-    }
-  },
-  components: {
-    communityTable, buildTable, roomTable
-  }
-}
-</script>
-<style lang="scss" scoped >
-.div_main {
-  display: flex;
-}
-.scrollar {
-  margin-top: 10px;
-}
-
-.div_tree {
-  flex: 0 0 280px;
-  background-color: #ffffff;
-  border-radius: 5px;
-  padding: 10px;
-  overflow-y: hidden;
-}
-.filter_tree {
-  overflow-x: auto;
-}
-
-.div_table {
-  margin-left: 15px;
-  // flex: 1;
-  width: calc(100% - 300px);
-  background-color: #ffffff;
-  border-radius: 5px;
-  padding: 10px;
-}
-
-.div_btn {
-  margin-top: 20px;
-}
-
-.row {
-  padding: 10px;
-}
-</style>
-
-<style>
-/* .aui-content > .el-tabs > .el-tabs__content {
-  padding: 0px;
-} */
-
-.el-tree-node:focus > .el-tree-node__content {
-  /* background-color: #ccc !important; */
-  color: #2195fe;
-}
-</style>
-<style lang="scss" scoped>
-.div_tree {
-  /deep/ .el-scrollbar__wrap {
-    overflow-x: hidden !important;
-  }
-}
-</style>
diff --git a/src/views/modules/base/community/communityTable copy.vue b/src/views/modules/base/community/communityTable copy.vue
deleted file mode 100644
index 7edd74bff..000000000
--- a/src/views/modules/base/community/communityTable copy.vue	
+++ /dev/null
@@ -1,793 +0,0 @@
-<template>
-  <div>
-    <div class="div_search">
-      <div class="resi-cell">
-        <div class="resi-cell-label">房主姓名</div>
-        <div class="resi-cell-value">
-          <el-input v-model="ownerName"
-                    class="resi-cell-input"
-                    size="small"
-                    clearable
-                    placeholder="请输入内容">
-          </el-input>
-
-        </div>
-      </div>
-      <div class="resi-cell">
-        <div class="resi-cell-label">房主手机</div>
-        <div class="resi-cell-value">
-          <el-input v-model="ownerPhone"
-                    class="resi-cell-input"
-                    size="small"
-                    clearable
-                    placeholder="请输入内容">
-          </el-input>
-
-        </div>
-      </div>
-      <el-button style="margin-left:10px"
-                 class="diy-button--search"
-                 size="small"
-                 @click="handleSearch">查询</el-button>
-      <el-button style="margin-left:10px"
-                 class="diy-button--reset"
-                 size="small"
-                 @click="resetSearch">重置</el-button>
-      <!-- <el-button style="margin-left:10px"
-                 class="diy-button--reset"
-                 size="small"
-                 @click="resetSearch">重置</el-button> -->
-    </div>
-    <div class="div_btn">
-      <el-button style=""
-                 class="diy-button--add"
-                 size="small"
-                 @click="handleAdd">新增小区</el-button>
-
-      <div class="btn_upload"
-           v-if="showImportBtn">
-        <el-button style=""
-                   class="diy-button--export"
-                   size="small"
-                   @click="handleExportModule('community')">下载小区模板</el-button>
-
-        <el-upload ref="upload_community"
-                   style=""
-                   :multiple='false'
-                   :show-file-list='false'
-                   :before-upload="((file)=>{beforeUpload(file, 'community')})"
-                   action=""
-                   accept=".xls,.xlsx"
-                   :http-request="(()=>{uploadFile( 'community')})">
-          <el-button style="margin-left:10px"
-                     size="small"
-                     class="diy-button--delete">导入小区数据</el-button>
-        </el-upload>
-
-        <el-button style=";margin-left:10px"
-                   class="diy-button--export"
-                   size="small"
-                   @click="handleExportModule('building')">下载楼栋模板</el-button>
-
-        <el-upload style=""
-                   ref="upload_building"
-                   :multiple='false'
-                   :show-file-list='false'
-                   :before-upload="((file)=>{beforeUpload(file, 'building')})"
-                   action=""
-                   accept=".xls,.xlsx"
-                   :http-request="(()=>{uploadFile( 'building')})">
-          <el-button style="margin-left:10px"
-                     size="small"
-                     class="diy-button--delete">导入楼栋数据</el-button>
-        </el-upload>
-        <el-button style=";margin-left:10px"
-                   class="diy-button--export"
-                   size="small"
-                   @click="handleExportModule('room')">下载房屋模板</el-button>
-
-        <el-upload style=""
-                   ref="upload_room"
-                   :multiple='false'
-                   :show-file-list='false'
-                   :before-upload="((file)=>{beforeUpload(file, 'room')})"
-                   action=""
-                   accept=".xls,.xlsx"
-                   :http-request="(()=>{uploadFile( 'room')})">
-          <el-button style="margin-left:10px"
-                     size="small"
-                     class="diy-button--delete">导入房屋数据</el-button>
-        </el-upload>
-      </div>
-      <el-button style="margin-left:10px"
-                 class="diy-button--reset"
-                 size="small"
-                 @click="handleExport">导出</el-button>
-      <el-button v-if="agencyObj.level == 'community'"
-                 style="margin-left:10px"
-                 class="diy-button--qrcode"
-                 size="small"
-                 @click="handleDownQr(agencyObj, 'community')">社区二维码</el-button>
-      <el-button style="float:left;margin-left:10px"
-                 class="diy-button--more"
-                 size="small"
-                 @click="deleteBatch">批量删除</el-button>
-
-    </div>
-
-    <div class="div_table">
-      <el-table ref="ref_table"
-                :data="tableData"
-                border
-                :height="tableHeight"
-                v-loading="tableLoading"
-                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
-                style="width: 100%"
-                :show-overflow-tooltip="true"
-                @select-all="selectAll"
-                @selection-change="selectionChange">
-        <el-table-column type="selection"
-                         :selectable="checkSelect"
-                         width="55">
-        </el-table-column>
-        <el-table-column prop="neighborHoodName"
-                         label="小区名称"
-                         min-width="100">
-          <!-- <template slot-scope="scope">
-            <a class="name-a" @click="handleDetail(scope.row)">
-              {{ scope.row.neighborHoodName }}
-            </a>
-          </template> -->
-        </el-table-column>
-        <el-table-column prop="agencyName"
-                         label="所属组织"
-                         min-width="100">
-        </el-table-column>
-        <el-table-column prop="gridName"
-                         label="所属网格"
-                         min-width="120">
-        </el-table-column>
-        <!-- <el-table-column prop="总单元数"
-                         label="所属网格"
-                         min-width="80">
-        </el-table-column>
-        <el-table-column prop="总户数"
-                         label="所属网格"
-                         min-width="80">
-        </el-table-column> -->
-        <el-table-column prop="address"
-                         label="详细地址"
-                         min-width="180">
-        </el-table-column>
-
-        <el-table-column label="操作"
-                         fixed="right"
-                         width="140"
-                         header-align="center"
-                         align="center"
-                         class="operate">
-          <template slot-scope="scope">
-
-            <!-- <el-button type="text"
-                       style="color:#feb349;text-decoration: underline;"
-                       size="small"
-                       @click="handleToNextLevel(scope.row)">进入</el-button> -->
-            <!-- <el-button type="text"
-                       class="div-table-button--qr"
-                       size="small"
-                       @click="handleDownQr(scope.row, 'neighborHood')">二维码</el-button> -->
-            <el-button type="text"
-                       class="div-table-button--detail"
-                       size="small"
-                       @click="handleDetail(scope.row)">查看</el-button>
-            <el-button v-if="scope.row.showBtn"
-                       type="text"
-                       class="div-table-button--edit"
-                       size="small"
-                       @click="handleEdit(scope.row)">修改</el-button>
-
-            <el-button v-if="scope.row.showBtn"
-                       type="text"
-                       class="div-table-button--delete"
-                       size="small"
-                       @click="handleDelete(scope.row)">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div>
-        <el-pagination @size-change="handleSizeChange"
-                       @current-change="handleCurrentChange"
-                       :current-page.sync="pageNo"
-                       :page-sizes="[20, 50, 100, 200]"
-                       :page-size="pageSize"
-                       layout="sizes, prev, pager, next, total"
-                       :total="total">
-        </el-pagination>
-      </div>
-
-    </div>
-
-    <!-- 修改弹出框 -->
-    <el-dialog :visible.sync="formShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="formTitle"
-               width="850px"
-               top="5vh"
-               class="dialog-h"
-               @closed="diaClose">
-      <community-form ref="ref_form"
-                      @dialogCancle="addFormCancle"
-                      @dialogOk="addFormOk"></community-form>
-    </el-dialog>
-
-  </div>
-</template>
-
-<script>
-
-import CommunityForm from './communityForm'
-
-import { requestPost } from "@/js/dai/request";
-import { mapGetters } from 'vuex'
-import { Loading } from 'element-ui' // 引入Loading服务
-import axios from 'axios'
-
-let loading // 加载动画
-export default {
-  data () {
-    return {
-      importBuildingLoading: false,
-      importRoomLoading: false,
-      importCommunityLoading: false,
-      total: 0,
-      pageSize: 20,
-      pageNo: 0,
-      tableLoading: true,
-
-      showImportBtn: false,//是否显示操作按钮，根据登录人所属组织判断
-
-      agencyObj: {},//树所选的组织对象
-      ownerName: '',
-      ownerPhone: '',
-      tableData: [],
-      validTableDataNum: 0,//有效的数据数量，即有权限操作的数据数量
-      selection: [],
-      showDeletBtn: false,
-
-
-      //form相关
-      formShow: false,
-      formTitle: '新增小区',
-
-      files: "",
-      fileName: "",
-      uploadUlr: window.SITE_CONFIG['apiURL'] + '/gov/org/neighborhood/import'
-
-    }
-  },
-  components: {
-    CommunityForm
-  },
-  async mounted () {
-
-  },
-  computed: {
-    tableHeight () {
-
-      return this.$store.state.inIframe ? this.clientHeight - 300 + this.iframeHeight : this.clientHeight - 300
-
-
-    },
-
-    ...mapGetters(['clientHeight', 'iframeHeight'])
-  },
-  methods: {
-    //重置搜索条件
-    resetSearch () {
-      this.ownerName = ''
-      this.ownerPhone = ''
-
-      this.pageSize = 10
-      this.pageNo = 0
-      // this.loadTable()
-    },
-    handleSearch () {
-      this.loadTable()
-    },
-    async loadTable (fromTree, treeObj) {
-      console.log(111, this.staffAgencyId)
-
-      this.tableLoading = true
-      if (fromTree) {
-        this.agencyObj = treeObj
-        if (this.agencyObj.level === 'community') {//只有社区和网格显示操作按钮
-          if (this.agencyObj.id === this.staffAgencyId) {//如果所选树的组织id和登录人员id相同，有权限
-            this.showImportBtn = true
-          } else {
-            this.showImportBtn = false
-          }
-        } else if (this.agencyObj.level === 'grid') {//网格下
-          if (this.agencyObj.pid === this.staffAgencyId) {//如果所选树的父级组织id和登录人员id相同，有权限
-            this.showImportBtn = true
-          } else {
-            this.showImportBtn = false
-          }
-        } else {
-          this.showImportBtn = false
-        }
-      }
-
-      const url = "/gov/org/neighborhood/neighborhoodlist"
-
-      let params = {
-        pageSize: this.pageSize,
-        pageNo: this.pageNo,
-        ownerName: this.ownerName,
-        ownerPhone: this.ownerPhone,
-        level: this.agencyObj.level,
-        id: this.agencyObj.id
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.validTableDataNum = 0
-        this.total = data.total
-        data.list.forEach(item => {
-          if (item.agencyId === this.staffAgencyId) {
-            item.showBtn = true
-            this.validTableDataNum++
-          } else {
-            item.showBtn = false
-          }
-
-        });
-        this.tableData = data.list
-      } else {
-        this.$message.error(msg)
-      }
-      this.tableLoading = false
-    },
-
-    checkSelect (row, index) {
-      let isChecked = false;
-      if (row.showBtn) { // 判断里面是否存在某个参数
-        isChecked = true
-      } else {
-        isChecked = false
-      }
-      return isChecked
-    },
-
-
-    diaClose () {
-      this.$refs.ref_form.resetData()
-      this.formShow = false
-    },
-
-    handleDetail (row) {
-      this.formTitle = '小区详情'
-      this.formShow = true
-      this.$nextTick(() => {
-        this.$refs.ref_form.initForm('detail', row, this.agencyObj)
-      })
-    },
-
-    handleAdd () {
-      this.formTitle = '新增小区'
-      this.formShow = true
-      this.$nextTick(() => {
-        this.$refs.ref_form.initForm('add', null, this.agencyObj)
-      })
-    },
-
-    handleEdit (row) {
-      this.formTitle = '修改小区'
-      this.formShow = true
-      this.$nextTick(() => {
-        this.$refs.ref_form.initForm('edit', row, this.agencyObj)
-      })
-    },
-
-    handleToNextLevel (row) {
-      this.$emit('toNextLevel', row, 'community')
-    },
-
-    addFormCancle () {
-      this.formShow = false
-    },
-    addFormOk () {
-      this.formShow = false
-      this.loadTable()
-      this.$emit('refreshTree')
-    },
-
-
-    deleteBatch () {
-      if (this.selection.length > 0) {
-        this.$confirm("确认删除选择的小区?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            this.deleteCommunityBatch()
-          })
-          .catch(err => {
-            if (err == "cancel") {
-              // this.$message({
-              //   type: "info",
-              //   message: "已取消删除"
-              // });
-            }
-
-          });
-      } else {
-        this.$message.warning('请先选择要删除的小区')
-      }
-    },
-    selectAll (selection) {
-
-      this.selection = selection
-
-
-    },
-    selectionChange (selection) {
-      this.selection = selection
-
-    },
-
-    async handleDelete (row) {
-
-      this.$confirm("确认删除?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      })
-        .then(() => {
-          this.deleteCommunity(row)
-        })
-        .catch(err => {
-          if (err == "cancel") {
-            // this.$message({
-            //   type: "info",
-            //   message: "已取消删除"
-            // });
-          }
-
-        });
-    },
-
-    async deleteCommunityBatch () {
-      let ids = []
-      console.log(this.selection)
-      this.selection.forEach(element => {
-
-        ids.push(element.neighborHoodId)
-      });
-
-      const url = "/gov/org/house/delete"
-
-      let params = {
-        type: 'neighborHood',
-        ids: ids
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.$message({
-          type: "success",
-          message: "删除成功"
-        });
-        this.$emit('refreshTree')
-        this.loadTable()
-      } else if (code > 8000) {
-        this.$message({
-          showClose: true,
-          message: msg,
-          duration: 0
-        })
-        this.$emit('refreshTree')
-        this.loadTable()
-      } else {
-        this.$message.error(msg)
-      }
-    },
-    async deleteCommunity (row) {
-      const url = "/gov/org/neighborhood/neighborhooddel"
-
-      let params = {
-        neighborHoodId: row.neighborHoodId
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.$message({
-          type: "success",
-          message: "删除成功"
-        });
-        this.$emit('refreshTree')
-        this.loadTable()
-      } else {
-        this.$message.error(msg)
-      }
-    },
-    async handleDownQr (row, type) {
-      // const url = window.SITE_CONFIG['apiURL'] + `/gov/org/icneighborhood/createQrCode/${row.neighborHoodId}`
-      const url = '/gov/org/agency/create-qrcode'
-      const _id = type == 'community' ? row.id : row.neighborHoodId
-      const params = {
-        id: _id,
-        type
-      }
-      await axios({
-        method: 'POST',
-        url: window.SITE_CONFIG['apiURL'] + url,
-        data: params,
-        responseType: 'blob'
-      }).then(res => {
-        console.log('res----1r', res)
-        if (res.headers["content-disposition"]) {
-          let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
-          console.log('filename', fileName)
-          this.download(res.data, fileName) //释放掉blob对象
-        } else this.$message.error('下载失败')
-        // this.download(res.data, '1.png')
-      })
-    },
-    //导出表格
-    async handleExport () {
-      let title = this.agencyObj.label
-      title = title + '—小区列表'
-
-      const url = "/gov/org/neighborhood/exportneighborhoodinfo"
-      let params = {
-        ownerName: this.ownerName,
-        ownerPhone: this.ownerPhone,
-        level: this.agencyObj.level,
-        id: this.agencyObj.id
-      }
-
-      app.ajax.exportFilePost(
-        url,
-        params,
-        (data, rspMsg) => {
-
-          this.download(data, title + '.xls')
-        },
-        (rspMsg, data) => {
-          this.$message.error(rspMsg);
-        }
-      );
-
-    },
-
-    // 下载文件
-    download (data, downFileName) {
-      if (!data) {
-        return
-      }
-
-      var csvData = new Blob([data])
-
-      if (window.navigator && window.navigator.msSaveOrOpenBlob) {
-        window.navigator.msSaveOrOpenBlob(csvData, downFileName);
-      }
-      // for Non-IE (chrome, firefox etc.)
-      else {
-        var a = document.createElement('a');
-        document.body.appendChild(a);
-        a.style = 'display: none';
-        var url = window.URL.createObjectURL(csvData);
-        a.href = url;
-        a.download = downFileName;
-        a.click();
-        a.remove();
-        window.URL.revokeObjectURL(url);
-      }
-
-    },
-
-    handleExportModule (type) {
-      let title = ''
-      let url = ""
-      if (type === 'community') {
-        title = '小区导入模板'
-        url = '/gov/org/neighborhood/exporttemplate'
-
-      } else if (type === 'building') {
-        title = '楼栋导入模板'
-        url = '/gov/org/building/exporttemplate'
-
-      } else if (type === 'room') {
-        title = '房间导入模板'
-        url = '/gov/org/house/exporttemplate'
-      }
-
-      let params = {}
-
-      app.ajax.exportFilePost(
-        url,
-        params,
-        (data, rspMsg) => {
-
-          this.download(data, title + '.xls')
-        },
-        (rspMsg, data) => {
-          this.$message.error(rspMsg);
-        }
-      );
-    },
-
-    // 上传文件之前的钩子
-    beforeUpload (file, type) {
-      this.files = file;
-
-      const isText = file.type === 'application/vnd.ms-excel'
-      const isTextComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-
-      if (!isText && !isTextComputer) {
-        this.$message.error('请选择正确格式的文件')
-        this.files = null
-        this.fileName = ''
-        return false
-      } else {
-        this.fileName = file.name;
-        return true
-      }
-
-    },
-    // 上传文件个数超过定义的数量
-    handleExceed (files, fileList) {
-      this.$message.warning(`当前限制选择 1 个文件，请删除后继续上传`)
-    },
-
-    async uploadFile (type) {
-
-      if (this.fileName == "") {
-        this.$message.warning('请选择要上传的文件！')
-        return false
-      }
-
-      this.$message({
-        showClose: true,
-        message: '导入中，请到系统管理-导入记录中查看进度',
-        duration: 0
-      })
-
-
-      //清空上传列表
-      let url = ''
-
-      let fileFormData = new FormData();
-      fileFormData.append('file', this.files);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
-      fileFormData.append('orgId', this.agencyObj.id);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
-      fileFormData.append('orgType', this.agencyObj.level === 'grid' ? 'grid' : 'agency');//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
-
-      if (type === 'community') {
-        this.importCommunityLoading = true
-        this.$refs['upload_community'].clearFiles()
-        url = '/gov/org/icneighborhood/neighborhoodimport'
-
-
-      } else if (type === 'building') {
-        this.$refs['upload_building'].clearFiles()
-        url = '/gov/org/building/buildingimport'
-        this.importBuildingLoading = true
-
-      } else if (type === 'room') {
-        this.$refs['upload_room'].clearFiles()
-        url = '/gov/org/house/houseimport'
-        this.importRoomLoading = true
-      }
-
-      window.app.ajax.post2(url, fileFormData,
-        (data, rspMsg) => {
-
-          if (data.code === 0 && data.msg == 'success') {
-            // this.$message.success('导入成功')
-          } else {
-            // this.$message({
-            //   showClose: true,
-            //   message: rspMsg,
-            //   duration: 0,
-            //   type: "error"
-            // })
-            // this.$message.error(rspMsg)
-          }
-          this.$emit('refreshTree')
-          this.loadTable()
-          // this.showMessage(rspMsg)
-          if (type === 'community') {
-            this.importCommunityLoading = false
-
-          } else if (type === 'building') {
-            this.importBuildingLoading = false
-
-          } else if (type === 'room') {
-            this.importRoomLoading = false
-          }
-        },
-        (rspMsg, data) => {
-          if (type === 'community') {
-            this.importCommunityLoading = false
-
-          } else if (type === 'building') {
-            this.importBuildingLoading = false
-
-          } else if (type === 'room') {
-            this.importRoomLoading = false
-          }
-          // this.$message.error(rspMsg)
-        }, { headers: { 'Content-Type': 'multipart/form-data' } })
-
-
-    },
-
-    showMessage (msg) {
-      this.$alert(msg, '操作结果', {
-        confirmButtonText: '关闭',
-        callback: action => {
-          this.$emit('refreshTree')
-          this.loadTable()
-        }
-      });
-    },
-    handleSizeChange (val) {
-      this.pageSize = val
-      this.pageNo = 1
-      this.loadTable()
-    },
-    handleCurrentChange (val) {
-      this.pageNo = val
-      this.loadTable()
-    },
-
-    // 开启加载动画
-    startLoading () {
-      loading = Loading.service({
-        lock: true, // 是否锁定
-        text: '正在加载……', // 加载中需要显示的文字
-        background: 'rgba(0,0,0,.7)' // 背景颜色
-      })
-    },
-    // 结束加载动画
-    endLoading () {
-      // clearTimeout(timer);
-      if (loading) {
-        loading.close()
-      }
-    }
-  },
-  watch: {
-    selection (val) {
-
-      if (val.length > 0) {
-        this.showDeletBtn = true
-      } else {
-        this.showDeletBtn = false
-      }
-    }
-  },
-  props: {
-    staffAgencyId: {
-      type: String,
-      default: '',
-    },
-
-  }
-}
-</script>
-<style lang="scss" scoped >
-@import "@/assets/scss/modules/visual/communityManage.scss";
-</style>
-
-<style >
-.el-message.is-closable .el-message__content {
-  line-height: 20px;
-}
-</style>
-
diff --git a/src/views/modules/base/community/roomForm.vue b/src/views/modules/base/community/roomForm.vue
index be192eee1..37316861c 100644
--- a/src/views/modules/base/community/roomForm.vue
+++ b/src/views/modules/base/community/roomForm.vue
@@ -11,7 +11,7 @@
         <el-form-item label="所属楼栋"
                       label-width="150px"
                       style="display: block">
-          <span>{{ agencyObj.neighborHoodName }}{{agencyObj.buildingName}}</span>
+          <span>{{ agencyObj.neighborHoodName }}{{agencyObj.label}}</span>
         </el-form-item>
 
         <el-form-item label="单元号"
@@ -127,7 +127,8 @@
 <script>
 import { mapGetters } from 'vuex'
 import { Loading } from 'element-ui' // 引入Loading服务
-import { requestPost } from '@/js/dai/request'
+import { requestPost, requestGet } from '@/js/dai/request'
+
 
 let loading // 加载动画
 export default {
@@ -165,29 +166,28 @@ export default {
   },
 
   methods: {
-    async initForm (type, row) {
+    async initForm (type, row, agencyObj) {
 
       this.$refs.ref_form.resetFields();
-      this.agencyObj = row
-      this.dataForm.neighborHoodId = this.agencyObj.neighborHoodId
-      this.dataForm.buildingId = this.agencyObj.buildingId
-
+      this.agencyObj = agencyObj
       this.formType = type
       if (row) {
-        this.dataForm = JSON.parse(JSON.stringify(row))
-        this.houseId = this.dataForm.houseId
-
-        this.dataForm.buildingUnitId = this.dataForm.unitNumKey
-        this.dataForm = { ...  this.dataForm }
-        this.houseType = this.dataForm.houseTypeKey
-        this.purpose = this.dataForm.purposeKey
-        this.rentFlag = parseInt(this.dataForm.rentFlagKey)
-        // if (this.dataForm.rentFlagKey==='2') {
-        //   this.rentFlag = parseInt(this.dataForm.rentFlagKey)
-        // } else {
-        //   this.rentFlag = 0
-        // }
 
+        this.houseId = row.houseId
+        await this.loadHouseInfo()
+        // this.dataForm = JSON.parse(JSON.stringify(row))
+        // this.houseId = this.dataForm.houseId
+
+        // this.dataForm.buildingUnitId = this.dataForm.unitNumKey
+        // this.dataForm = { ...  this.dataForm }
+        // this.houseType = this.dataForm.houseTypeKey
+        // this.purpose = this.dataForm.purposeKey
+        // this.rentFlag = parseInt(this.dataForm.rentFlagKey)
+
+      } else {
+
+        this.dataForm.neighborHoodId = this.agencyObj.neighborHoodId
+        this.dataForm.buildingId = this.agencyObj.id
       }
 
 
@@ -195,12 +195,33 @@ export default {
 
     },
 
+    async loadHouseInfo () {
+
+      const url = "/gov/org/ichouse/" + this.houseId
+
+      const { data, code, msg } = await requestGet(url)
+
+      if (code === 0) {
+        // debugger
+        this.dataForm = { ...data }
+
+        this.houseType = this.dataForm.houseType
+        this.purpose = this.dataForm.purpose
+        this.rentFlag = parseInt(this.dataForm.rentFlag)
+
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+
     //加载单元
     async loadUnitList () {
       const url = '/gov/org/building/buildingunitlist'
 
       let params = {
-        buildingId: this.agencyObj.buildingId
+        buildingId: this.dataForm.buildingId
       }
 
       const { data, code, msg } = await requestPost(url, params)
diff --git a/src/views/modules/base/community/roomTable copy.vue b/src/views/modules/base/community/roomTable copy.vue
deleted file mode 100644
index ecc109bb6..000000000
--- a/src/views/modules/base/community/roomTable copy.vue	
+++ /dev/null
@@ -1,716 +0,0 @@
-<template>
-  <div>
-    <div class="div_search">
-      <div class="resi-cell">
-        <div class="resi-cell-label">房主姓名</div>
-        <div class="resi-cell-value">
-          <el-input v-model="ownerName"
-                    class="resi-cell-input"
-                    size="small"
-                    clearable
-                    placeholder="请输入内容">
-          </el-input>
-
-        </div>
-      </div>
-      <div class="resi-cell">
-        <div class="resi-cell-label">房主手机</div>
-        <div class="resi-cell-value">
-          <el-input v-model="ownerPhone"
-                    class="resi-cell-input"
-                    size="small"
-                    clearable
-                    placeholder="请输入内容">
-          </el-input>
-
-        </div>
-      </div>
-      <div class="resi-cell">
-        <div class="resi-cell-label">房屋状态</div>
-        <div class="resi-cell-value">
-
-          <el-select class="item_width_1"
-                     v-model="rentState"
-                     placeholder="请选择"
-                     size="small"
-                     clearable>
-            <el-option v-for="item in rentList"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
-            </el-option>
-          </el-select>
-
-        </div>
-      </div>
-      <el-button style="margin-left:10px"
-                 class="diy-button--search"
-                 size="small"
-                 @click="handleSearch">查询</el-button>
-      <el-button style="margin-left:10px"
-                 class="diy-button--reset"
-                 size="small"
-                 @click="resetSearch">重置</el-button>
-    </div>
-    <div class="div_btn">
-
-      <el-button style="float:left"
-                 class="diy-button--add"
-                 size="small"
-                 @click="handleAdd">新增房屋</el-button>
-      <div class="btn_upload"
-           v-if="showImportBtn">
-        <el-button style="float:left"
-                   class="diy-button--export"
-                   size="small"
-                   @click="handleExportModule">下载房屋模板</el-button>
-        <el-upload ref="upload"
-                   :multiple='false'
-                   :show-file-list='false'
-                   :before-upload="beforeUpload"
-                   action=""
-                   accept=".xls,.xlsx"
-                   :limit="1"
-                   :on-exceed="handleExceed"
-                   :http-request="uploadFile">
-          <el-button style="margin-left:10px"
-                     size="small"
-                     class="diy-button--delete">导入房屋数据</el-button>
-        </el-upload>
-      </div>
-      <el-button style="float:left;margin-left:10px"
-                 class="diy-button--reset"
-                 size="small"
-                 @click="handleExport">导出</el-button>
-      <el-button style="float:left;margin-left:10px"
-                 class="diy-button--more"
-                 size="small"
-                 @click="deleteBatch">批量删除</el-button>
-    </div>
-
-    <div class="div_table">
-      <el-table ref="ref_table"
-                :data="tableData"
-                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
-                v-loading="tableLoading"
-                border
-                :height="tableHeight"
-                style="width: 100%"
-                @select-all="selectAll"
-                @selection-change="selectionChange">
-        <el-table-column type="selection"
-                         :selectable="checkSelect"
-                         width="55">
-        </el-table-column>
-        <el-table-column prop="houseNameShow"
-                         label="房屋名称"
-                         min-width="160">
-        </el-table-column>
-        <el-table-column prop="neighborHoodName"
-                         label="所属小区"
-                         min-width="150">
-        </el-table-column>
-        <el-table-column prop="buildingName"
-                         label="所属楼栋"
-                         width="80">
-        </el-table-column>
-        <el-table-column prop="unitNumShow"
-                         label="单元号"
-                         width="70">
-        </el-table-column>
-        <el-table-column prop="doorName"
-                         label="门牌号"
-                         width="70">
-        </el-table-column>
-        <el-table-column prop="houseType"
-                         label="类型"
-                         width="50">
-        </el-table-column>
-        <el-table-column prop="purpose"
-                         label="用途"
-                         width="50">
-        </el-table-column>
-        <el-table-column prop="rentFlag"
-                         label="房屋状态"
-                         width="80">
-        </el-table-column>
-        <el-table-column prop="ownerName"
-                         label="房主姓名"
-                         width="90">
-        </el-table-column>
-        <el-table-column prop="ownerPhone"
-                         label="房主电话"
-                         width="110">
-        </el-table-column>
-        <el-table-column prop="ownerIdCard"
-                         label="身份证"
-                         width="170">
-        </el-table-column>
-        <el-table-column label="操作"
-                         fixed="right"
-                         width="140"
-                         header-align="center"
-                         align="center"
-                         class="operate">
-          <template slot-scope="scope">
-
-            <el-button type="text"
-                       class="div-table-button--detail"
-                       size="small"
-                       @click="handleDetail(scope.row)">查看</el-button>
-            <el-button v-if="scope.row.showBtn"
-                       type="text"
-                       class="div-table-button--edit"
-                       size="small"
-                       @click="handleEdit(scope.row)">修改</el-button>
-
-            <el-button v-if="scope.row.showBtn"
-                       type="text"
-                       class="div-table-button--delete"
-                       size="small"
-                       @click="handleDelete(scope.row)">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div>
-        <el-pagination @size-change="handleSizeChange"
-                       @current-change="handleCurrentChange"
-                       :current-page.sync="pageNo"
-                       :page-sizes="[20, 50, 100, 200]"
-                       :page-size="pageSize"
-                       layout="sizes, prev, pager, next, total"
-                       :total="total">
-        </el-pagination>
-      </div>
-
-    </div>
-
-    <!-- 修改弹出框 -->
-    <el-dialog :visible.sync="formShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="formTitle"
-               width="900px"
-               top="5vh"
-               class="dialog-h"
-               @closed="diaClose">
-      <room-form ref="ref_form"
-                 @dialogCancle="addFormCancle"
-                 @dialogOk="addFormOk"></room-form>
-    </el-dialog>
-
-  </div>
-</template>
-
-<script>
-
-import roomForm from './roomForm'
-
-import { requestPost } from "@/js/dai/request";
-import { mapGetters } from 'vuex'
-import { Loading } from 'element-ui' // 引入Loading服务
-
-let loading // 加载动画
-export default {
-  data () {
-    return {
-      importRoomLoading: false,
-      total: 0,
-      pageSize: 20,
-      pageNo: 0,
-      tableLoading: true,
-
-      // showImportBtn: false,//是否显示操作按钮，根据登录人所属组织判断
-
-      agencyObj: {},//树所选的小区对象
-      ownerName: '',
-      ownerPhone: '',
-      rentState: '',
-      validTableDataNum: 0,//有效的数据数量，即有权限操作的数据数量
-      selection: [],
-      showDeletBtn: false,
-
-      tableData: [],
-
-      //form相关
-      formShow: false,
-      formTitle: '新增房屋',
-
-      rentList: [
-        {
-          value: '1',
-          label: '出租'
-        },
-        {
-          value: '2',
-          label: '闲置'
-        },
-        {
-          value: '0',
-          label: '自住'
-        },
-      ]
-
-
-    }
-  },
-  components: {
-    roomForm
-  },
-  async mounted () {
-
-  },
-  computed: {
-    tableHeight () {
-      return this.$store.state.inIframe ? this.clientHeight - 300 + this.iframeHeight : this.clientHeight - 300
-
-    },
-
-    ...mapGetters(['clientHeight', 'iframeHeight'])
-  },
-  methods: {
-    //重置搜索条件
-    resetSearch () {
-      this.ownerName = ''
-      this.ownerPhone = ''
-      this.rentState = ''
-
-      this.pageSize = 10
-      this.pageNo = 0
-      // this.loadTable()
-    },
-
-    handleSearch () {
-      this.loadTable()
-    },
-
-    checkSelect (row, index) {
-      let isChecked = false;
-      if (row.showBtn) { // 判断里面是否存在某个参数
-        isChecked = true
-      } else {
-        isChecked = false
-      }
-      return isChecked
-    },
-
-    async loadTable (fromTree, treeObj, ownerName, ownerPhone, rentState) {
-
-      this.tableLoading = true
-      this.ownerName = ownerName
-      this.ownerPhone = ownerPhone
-      this.rentState = rentState
-      let params = {
-        pageSize: this.pageSize,
-        pageNo: this.pageNo,
-
-        buildingId: this.agencyObj.id
-      }
-      if (fromTree) {
-        this.agencyObj = treeObj
-        // if (this.agencyObj.level === 'community') {//只有社区和网格显示操作按钮
-        //   if (this.agencyObj.id === this.staffAgencyId) {//如果所选树的组织id和登录人员id相同，有权限
-        //     this.showImportBtn = true
-        //   } else {
-        //     this.showImportBtn = false
-        //   }
-        // } else if (this.agencyObj.level === 'grid') {//网格下
-        //   if (this.agencyObj.pid === this.staffAgencyId) {//如果所选树的父级组织id和登录人员id相同，有权限
-        //     this.showImportBtn = true
-        //   } else {
-        //     this.showImportBtn = false
-        //   }
-        // } else {
-        //   this.showImportBtn = false
-        // }
-      } else {
-
-        params.ownerName = ownerName
-        params.ownerPhone = ownerPhone
-        params.rentState = rentState
-      }
-
-      const url = "/gov/org/house/houselist"
-
-
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.total = data.total
-        this.validTableDataNum = 0
-        data.list.forEach(item => {
-          item.houseNameShow = item.neighborHoodName + item.buildingName + item.unitNum + '单元' + item.doorName
-          item.unitNumShow = item.unitNum + '单元'
-          if (item.agencyId === this.staffAgencyId) {
-            item.showBtn = true
-            this.validTableDataNum++
-          } else {
-            item.showBtn = false
-          }
-
-        });
-        this.tableData = data.list
-      } else {
-        this.$message.error(msg)
-      }
-      this.tableLoading = false
-    },
-
-    diaClose () {
-      this.$refs.ref_form.resetData()
-      this.formShow = false
-    },
-
-    handleDetail (row) {
-      this.formTitle = '房屋详情'
-      this.formShow = true
-      this.$nextTick(() => {
-        this.$refs.ref_form.initForm('detail', row, this.agencyObj)
-      })
-    },
-
-    handleAdd () {
-
-      this.formTitle = '新增房屋'
-      this.formShow = true
-      this.$nextTick(() => {
-        this.$refs.ref_form.initForm('add', null, this.agencyObj)
-      })
-    },
-
-    handleEdit (row) {
-      this.formTitle = '修改房屋'
-      this.formShow = true
-      this.$nextTick(() => {
-        this.$refs.ref_form.initForm('edit', row, this.agencyObj)
-      })
-    },
-
-    addFormCancle () {
-      this.formShow = false
-    },
-    addFormOk () {
-      this.formShow = false
-      this.loadTable()
-    },
-
-
-    deleteBatch () {
-      if (this.selection.length > 0) {
-        this.$confirm("确认删除选择的房屋?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            this.deleteCommunityBatch()
-          })
-          .catch(err => {
-            if (err == "cancel") {
-              // this.$message({
-              //   type: "info",
-              //   message: "已取消删除"
-              // });
-            }
-
-          });
-      } else {
-        this.$message.warning('请先选择要删除的房屋')
-      }
-    },
-    selectAll (selection) {
-      this.selection = selection
-
-    },
-    selectionChange (selection) {
-      this.selection = selection
-
-    },
-
-    async handleDelete (row) {
-
-      this.$confirm("确认删除?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      })
-        .then(() => {
-          this.deleteRoom(row)
-        })
-        .catch(err => {
-          if (err == "cancel") {
-            // this.$message({
-            //   type: "info",
-            //   message: "已取消删除"
-            // });
-          }
-
-        });
-
-
-    },
-
-    async deleteCommunityBatch () {
-      let ids = []
-      this.selection.forEach(element => {
-
-        ids.push(element.houseId)
-      });
-
-      const url = "/gov/org/house/delete"
-
-      let params = {
-        type: 'house',
-        ids: ids
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.$message({
-          type: "success",
-          message: "删除成功"
-        });
-        this.$emit('refreshTree')
-        this.loadTable()
-      } else if (code > 8000) {
-        this.$message({
-          showClose: true,
-          message: msg,
-          duration: 0
-        })
-        this.$emit('refreshTree')
-        this.loadTable()
-      } else {
-        this.$message.error(msg)
-      }
-    },
-
-    async deleteRoom (row) {
-      const url = "/gov/org/house/housedel"
-
-      let params = {
-        houseId: row.houseId
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.$message({
-          type: "success",
-          message: "删除成功"
-        });
-        this.$emit('refreshTree')
-        this.loadTable()
-      } else {
-        this.$message.error(msg)
-      }
-    },
-
-    //导出表格
-    async handleExport () {
-      let title = this.agencyObj.label
-      title = title + '—房屋列表'
-
-      const url = "/gov/org/house/exporthouseinfo"
-      let params = {
-        ownerName: this.ownerName,
-        ownerPhone: this.ownerPhone,
-        rentState: this.rentState,
-        buildingId: this.agencyObj.id
-      }
-
-      app.ajax.exportFilePost(
-        url,
-        params,
-        (data, rspMsg) => {
-
-          this.download(data, title + '.xls')
-        },
-        (rspMsg, data) => {
-          this.$message.error(rspMsg);
-        }
-      );
-
-    },
-
-    // 下载文件
-    download (data, fileName) {
-      if (!data) {
-        return
-      }
-
-      var csvData = new Blob([data])
-
-      if (window.navigator && window.navigator.msSaveOrOpenBlob) {
-        window.navigator.msSaveOrOpenBlob(csvData, fileName);
-      }
-      // for Non-IE (chrome, firefox etc.)
-      else {
-        var a = document.createElement('a');
-        document.body.appendChild(a);
-        a.style = 'display: none';
-        var url = window.URL.createObjectURL(csvData);
-        a.href = url;
-        a.download = fileName;
-        a.click();
-        a.remove();
-        window.URL.revokeObjectURL(url);
-      }
-
-    },
-
-    handleExportModule () {
-      let title = ''
-      title = '房屋模板'
-
-      const url = "/gov/org/house/exporttemplate"
-      let params = {}
-
-      app.ajax.exportFilePost(
-        url,
-        params,
-        (data, rspMsg) => {
-
-          this.download(data, title + '.xls')
-        },
-        (rspMsg, data) => {
-          this.$message.error(rspMsg);
-        }
-      );
-    },
-
-    // 上传文件之前的钩子
-    beforeUpload (file) {
-      this.files = file;
-
-      const isText = file.type === 'application/vnd.ms-excel'
-      const isTextComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-
-      if (!isText && !isTextComputer) {
-        this.$message.error('请选择正确格式的文件')
-        return false
-      } else {
-        this.fileName = file.name;
-        return true
-      }
-
-    },
-    // 上传文件个数超过定义的数量
-    handleExceed (files, fileList) {
-      this.$message.warning(`当前限制选择 1 个文件，请删除后继续上传`)
-    },
-
-    async uploadFile () {
-
-
-      if (this.fileName == "") {
-        this.$message.warning('请选择要上传的文件！')
-        return false
-      }
-
-      this.$message({
-        showClose: true,
-        message: '导入中，请到系统管理-导入记录中查看进度',
-        duration: 0
-      })
-
-      //清空上传列表
-      this.$refs['upload'].clearFiles()
-
-      var url = '/gov/org/house/houseimport'
-
-      let fileFormData = new FormData();
-      fileFormData.append('file', this.files);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
-      fileFormData.append('orgId', this.agencyObj.id);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
-      fileFormData.append('orgType', this.agencyObj.level);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
-
-      this.importRoomLoading = true
-      window.app.ajax.post2(url, fileFormData,
-        (data, rspMsg) => {
-
-          if (data.code === 0 && data.msg == 'success') {
-            // this.$message.success('导入成功')
-          } else {
-            // this.$message({
-            //   showClose: true,
-            //   message: rspMsg,
-            //   duration: 0,
-            //   type: "error"
-            // })
-            // this.$message.error(rspMsg)
-          }
-          this.$emit('refreshTree')
-          this.loadTable()
-          this.importRoomLoading = false
-        },
-        (rspMsg, data) => {
-          this.importRoomLoading = false
-        }, { headers: { 'Content-Type': 'multipart/form-data' } })
-
-
-    },
-
-    showMessage (msg) {
-      this.$alert(msg, '操作结果', {
-        confirmButtonText: '关闭',
-        callback: action => {
-          this.$emit('refreshTree')
-          this.loadTable()
-
-        }
-      });
-    },
-
-    handleSizeChange (val) {
-      this.pageSize = val
-      this.pageNo = 1
-      this.loadTable()
-    },
-    handleCurrentChange (val) {
-      this.pageNo = val
-      this.loadTable()
-    },
-
-    // 开启加载动画
-    startLoading () {
-      loading = Loading.service({
-        lock: true, // 是否锁定
-        text: '正在加载……', // 加载中需要显示的文字
-        background: 'rgba(0,0,0,.7)' // 背景颜色
-      })
-    },
-    // 结束加载动画
-    endLoading () {
-      // clearTimeout(timer);
-      if (loading) {
-        loading.close()
-      }
-    }
-  },
-  watch: {
-    selection (val) {
-
-      if (val.length > 0) {
-        this.showDeletBtn = true
-      } else {
-        this.showDeletBtn = false
-      }
-    }
-  },
-  props: {
-    staffAgencyId: {
-      type: String,
-      default: '',
-    },
-    showImportBtn: {
-      type: Boolean,
-      default: false,
-    },
-  }
-}
-</script>
-<style lang="scss" scoped >
-@import "@/assets/scss/modules/visual/communityManage.scss";
-</style>
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index 70066d410..3b771eca2 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -2,7 +2,8 @@
   <div>
     <div class="div_btn">
 
-      <el-button style="float:left"
+      <el-button v-if="agencyObj.level==='building'||source!=='search'"
+                 style="float:left"
                  class="diy-button--add"
                  size="small"
                  @click="handleAdd">新增房屋</el-button>
@@ -162,6 +163,7 @@ let loading // 加载动画
 export default {
   data () {
     return {
+      source: 'tree',//来源  
       importRoomLoading: false,
       total: 0,
       pageSize: 20,
@@ -236,6 +238,7 @@ export default {
 
     async loadTable (source, treeObj, ownerName, ownerPhone, rentFlag) {
 
+      this.source = source
       this.tableLoading = true
 
       if (source === 'tree') {//来源于tree，查询数据清空
@@ -272,8 +275,8 @@ export default {
         this.total = data.total
         this.validTableDataNum = 0
         data.list.forEach(item => {
-          item.houseNameShow = item.neighborHoodName + item.buildingName + item.unitNum + '单元' + item.doorName
-          item.unitNumShow = item.unitNum + '单元'
+          item.houseNameShow = item.neighborHoodName + item.buildingName + item.unitNum + item.doorName
+
           if (item.agencyId === this.staffAgencyId) {
             item.showBtn = true
             this.validTableDataNum++
@@ -298,6 +301,7 @@ export default {
       this.formTitle = '房屋详情'
       this.formShow = true
       this.$nextTick(() => {
+
         this.$refs.ref_form.initForm('detail', row, this.agencyObj)
       })
     },
@@ -307,6 +311,7 @@ export default {
       this.formTitle = '新增房屋'
       this.formShow = true
       this.$nextTick(() => {
+        console.log(this.agencyObj)
         this.$refs.ref_form.initForm('add', null, this.agencyObj)
       })
     },
diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
new file mode 100644
index 000000000..0e42a655c
--- /dev/null
+++ b/src/views/modules/base/organization/organization.vue
@@ -0,0 +1,2195 @@
+<template>
+    <div class="app-container">
+        <el-row>
+            <el-col :span="24" style="margin-left: 10px;margin-top: 10px;margin-bottom: 20px;">
+                <el-breadcrumb separator-class="el-icon-arrow-right">
+                    <el-breadcrumb-item v-for="(breadcrumb, index) in breadcrumbArr" :key="breadcrumb.id">
+                        <el-link v-if="breadcrumb.id === currentBreadcrumbKey" type="primary" @click.native="refreshThisPage(index)">{{ breadcrumb.name }}</el-link>
+                        <el-link v-else type="info" @click.native="refreshThisPage(index)">{{ breadcrumb.name }}</el-link>
+                        <el-link v-if="index === breadcrumbArr.length - 1" type="primary" @click.native="modifyOrgInfo" style="margin-left:10px;margin-top:0px;color:#3E8EF7;cursor:pointer" icon="el-icon-edit">修改</el-link>
+                    </el-breadcrumb-item>
+                </el-breadcrumb>
+            </el-col>
+            
+        </el-row>
+        <!-- 组织列表 -->
+        <el-table v-show="agencyTableFlag"
+        height="250"
+        :data="agencyTableListData"
+        style="width: 100%">
+            <el-table-column prop="agencyName" label="下级组织"></el-table-column>
+            <el-table-column prop="contacts" label="联系人"></el-table-column>
+            <el-table-column prop="mobile" label="联系人电话"></el-table-column>
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                <template slot="header" slot-scope="scope">
+                    <el-button size="mini"
+                        type="primary"
+                        icon="el-icon-plus"
+                        @click="addAgency(scope.row)"
+                    >新增</el-button>
+                </template>
+                <template slot-scope="scope">
+                <el-button size="mini"
+                    type="warning"
+                    icon="el-icon-arrow-right"
+                    @click="entryAgency(scope.row.agencyId)"
+                >进入</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        
+         <!-- 下级机关单位/基层科室列表 -->
+        <el-table v-show="departmentTableFlag"
+        height="250"
+        :data="departmentTableListData"
+        style="width: 100%">
+            <el-table-column prop="departmentName" label="下级机关单位/基层科室"></el-table-column>
+            <el-table-column prop="contacts" label="联系人"></el-table-column>
+            <el-table-column prop="mobile" label="联系人电话"></el-table-column>
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                <template slot="header" slot-scope="scope">
+                    <el-button size="mini"
+                        type="primary"
+                        icon="el-icon-plus"
+                        @click="addCommunity(scope.row)"
+                    >新增</el-button>
+                </template>
+                <template slot-scope="scope">
+                    <el-button 
+                        size="mini"
+                        type="warning"
+                        icon="el-icon-arrow-right"
+                        @click="entryDepartment(scope.row.departmentId)"
+                    >进入</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <!-- 网格列表 -->
+        <el-table v-show="gridTableFlag"
+        height="250"
+        :data="gridTableListData"
+        style="width: 100%">
+            <el-table-column prop="gridName" label="直属网格"></el-table-column>
+            <el-table-column prop="gridTypeName" label="网格类型"></el-table-column>
+            <el-table-column prop="contacts" label="联系人"></el-table-column>
+            <el-table-column prop="mobile" label="联系人电话"></el-table-column>
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                <template slot="header" slot-scope="scope">
+                    <el-button size="mini"
+                        type="primary"
+                        icon="el-icon-plus"
+                        @click="addGrid(scope.row)"
+                    >新增</el-button>
+                </template>
+                <template slot-scope="scope">
+                    <el-button 
+                        size="mini"
+                        type="warning"
+                        icon="el-icon-arrow-right"
+                        @click="entryGrid(scope.row.gridId)"
+                    >进入</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <!-- 本级工作人员 -->
+        <el-table v-show="currentAgencyStaffTableFlag"
+        :data="agencyStaffTableListData"
+        style="width: 100%"
+        height="250">
+            <el-table-column prop="name" label="本级工作人员名字" width="260"></el-table-column>
+            <el-table-column prop="roles" label="本级工作人员职责" width="260">
+                <template slot-scope="scope">
+                    <el-tag type="primary" size="mini" v-for="(role, index) in scope.row.roles" :key="index" disable-transitions>{{ role }}</el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
+                <template slot="header" slot-scope="scope">
+                <el-button size="mini"
+                    type="primary"
+                    icon="el-icon-plus"
+                    @click="addPeo(scope.row)"
+                >新增</el-button>
+                </template>
+                <template slot-scope="scope">
+                <el-button 
+                    size="mini"
+                    type="warning"
+                    icon="el-icon-edit"
+                    @click="xiuPeo(scope.row)"
+                >修改</el-button>
+                <el-button 
+                    size="mini"
+                    type="success"
+                    icon="el-icon-view"
+                    @click="lookAngency(scope.row)"
+                >查看</el-button>
+                <el-button 
+                    size="mini"
+                    type="info"
+                    icon="el-icon-rank"
+                    @click="transfer(scope.row)"
+                >调动</el-button>
+                <el-button 
+                    size="mini"
+                    type="danger"
+                    icon="el-icon-circle-close"
+                    @click="DisablePeo(scope.row)"
+                >禁用</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <!-- 下级机关单位/基层科室工作人员 -->
+        <el-table height="250" v-show="departmentStaffTableFlag"
+        :data="departmentStaffTableListData"
+        style="width: 100%">
+            <el-table-column prop="name" label="下级机关单位/基层科室工作人员" width="260"></el-table-column>
+            <el-table-column prop="roles" label="下级机关单位/基层科室工作人员职责" width="260">
+                <template slot-scope="scope">
+                    <el-tag type="primary" size="mini" v-for="(role, index) in scope.row.roles" :key="index" disable-transitions>{{ role }}</el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                <template slot="header" slot-scope="scope">
+                    <el-button size="mini" type="primary" icon="el-icon-plus" @click="addCommunityPeo(scope.row)">新增</el-button>
+                </template>
+                <template slot-scope="scope">
+                    <el-button size="mini" type="warning" icon="el-icon-edit" @click="xiuCommunityPeo(scope.row)">修改</el-button>
+                    <el-button size="mini" type="success" icon="el-icon-view" @click="lookAngency(scope.row)">查看</el-button>
+                    <el-button size="mini" type="info" icon="el-icon-rank" @click="transfer(scope.row)">调动</el-button>
+                    <el-button size="mini" type="danger" icon="el-icon-circle-close" @click="DisablePeo(scope.row)">禁用</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <!-- 网格工作人员 -->
+        <el-table v-show="gridStaffTableFlag"
+        :data="gridStaffTableListData"
+        style="width: 100%"
+        height="250">
+            <el-table-column prop="name" label="网格工作人员名字" width="260"></el-table-column>
+            <el-table-column prop="roles" label="网格工作人员职责" width="260">
+                <template slot-scope="scope">
+                    <el-tag type="primary" size="mini" v-for="(role, index) in scope.row.roles" :key="index" disable-transitions>{{ role }}</el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                <template slot="header" slot-scope="scope">
+                    <el-button size="mini" type="primary" icon="el-icon-plus" @click="addGridPeo(scope.row)">新增</el-button>
+                </template>
+                <template slot-scope="scope">
+                    <el-button size="mini" type="warning" icon="el-icon-edit" @click="xiuGridPeo(scope.row)">修改</el-button>
+                    <el-button size="mini" type="success" icon="el-icon-view" @click="lookAngency(scope.row)">查看</el-button>
+                    <el-button size="mini" type="info" icon="el-icon-rank" @click="transfer(scope.row)">调动</el-button>
+                    <el-button size="mini" type="danger" icon="el-icon-circle-close" @click="DisablePeo(scope.row)">禁用</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+  
+        <!-- 新增下级机关单位/基层科室 -->
+        <el-dialog 
+        title="新增部门"
+        :visible.sync="dialogVisible"
+        width="30%"
+        :before-close="handleClose">
+            <el-form :rules="rules">
+                <el-form-item label="部门名称" prop="departmentName">
+                    <el-input v-model="insertForm.departmentName" placeholder="请输入部门名称"></el-input>
+                </el-form-item>
+                <el-form-item label="组织编码" prop="code">
+                    <el-input v-model="insertForm.code" placeholder="请输入组织编码"></el-input>
+                </el-form-item>
+                <el-form-item label="联系人" prop="contacts">
+                    <el-input  v-model="insertForm.contacts" placeholder="请输入联系人姓名"></el-input>
+                </el-form-item>
+                <el-form-item label="联系电话" prop="mobile">
+                    <el-input v-model="insertForm.mobile" placeholder="请输入联系电话"></el-input>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" >
+                <el-button @click="cancel">取 消</el-button>
+                <el-button type="primary" @click="submit">确 定</el-button>
+            </div>
+        </el-dialog>
+
+
+        <!-- 新增网格 -->
+        <div v-if="dialogVisibleGrid">
+            <el-dialog 
+            title="新增网格"
+            :visible.sync="dialogVisibleGrid"
+            width="60%"
+            :before-close="handleClose">
+                <el-form :rules="rules">
+                    <el-form-item label="网格名称" prop="gridName">
+                        <el-input v-model="GridForm.gridName" placeholder="请输入部门名称"></el-input>
+                    </el-form-item>
+                    <el-form-item label="网格编码" prop="GridCode">
+                        <el-input v-model="GridForm.code" placeholder="请输入网格编码"></el-input>
+                    </el-form-item>
+
+                    <!-- 网格类型，下拉框 -->
+                    <el-form-item label="网格类型" prop="typeTag">
+                        <el-select v-model="GridForm.gridType" clearable placeholder="网格类型">
+                            <el-option v-for="item in typeList" 
+                                :key="item.value" 
+                                :label="item.label" 
+                                :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+
+                    <el-form-item label="联系人" prop="GridContacts">
+                        <el-input  v-model="GridForm.contacts" placeholder="请输入联系人姓名"></el-input>
+                    </el-form-item>
+                    <el-form-item label="联系电话" prop="GridMobile">
+                        <el-input v-model="GridForm.mobile" placeholder="请输入联系电话"></el-input>
+                    </el-form-item>
+
+                    <!-- 组织位置 -->
+                    <el-form-item>
+                        <div id="container">当前点击坐标为：<span id="position"></span></div>
+                    </el-form-item>
+
+                </el-form>
+
+                <div slot="footer" >
+                    <el-button @click="cancelGrid">取 消</el-button>
+                    <el-button type="primary" @click="submitGrid">确 定</el-button>
+                </div>
+            </el-dialog>
+        </div>
+
+        <!-- 新增人员 -->
+        <div v-if="dialogVisiblePeo">
+            <el-dialog 
+            title="新增人员"
+            :visible.sync="dialogVisiblePeo"
+            width="30%"
+            :before-close="handleClose">
+                <el-form>
+                    <el-form-item label="姓名" prop="peoName">
+                        <el-input v-model="peoForm.name" placeholder="请输入姓名"></el-input>
+                    </el-form-item>
+                    <el-form-item label="手机号" prop="mobile">
+                        <el-input v-model="peoForm.mobile" placeholder="请输入手机号"></el-input>
+                    </el-form-item>
+                    <!-- 性别下拉框 -->
+                    <el-form-item label="性别" prop="gender">
+                        <el-select v-model="peoForm.gender" clearable placeholder="性别">
+                            <el-option v-for="item in genderList" 
+                                :key="item.value" 
+                                :label="item.label" 
+                                :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <!-- 专兼职下拉框 -->
+                    <el-form-item label="专兼职" prop="post">
+                        <el-select v-model="peoForm.post" clearable placeholder="专兼职">
+                            <el-option v-for="item in postList" 
+                                :key="item.value" 
+                                :label="item.label" 
+                                :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <!-- 职责下拉框 -->
+                    <el-form-item label="职责" prop="duty">
+                        <el-select v-model="peoForm.duty" multiple placeholder="请选择">
+                            <el-option
+                            v-for="item in dutyList"
+                            :key="item.roleId"
+                            :label="item.roleName"
+                            :value="item.roleId"
+                            :disabled="item.disabled">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+
+                </el-form>
+                <div slot="footer" >
+                    <el-button @click="cancelPeo">取 消</el-button>
+                    <el-button type="primary" @click="submitPeo">确 定</el-button>
+                </div>
+            </el-dialog>
+        </div>
+
+        <!-- 人员修改 -->
+        <el-dialog 
+        title="人员修改"
+        :visible.sync="modifyPeo"
+        width="30%"
+        :before-close="handleClose">
+            <el-form >
+                <el-form-item label="姓名" prop="peoName">
+                    <el-input v-model="peoForm.name" placeholder="请输入姓名"></el-input>
+                </el-form-item>
+                <el-form-item label="手机号" prop="mobile">
+                    <el-input v-model="peoForm.mobile" placeholder="请输入手机号"></el-input>
+                </el-form-item>
+                <el-form-item label="性别" prop="gender">
+                    <el-select v-model="peoForm.gender" clearable placeholder="性别">
+                        <el-option v-for="item in genderList" 
+                            :key="item.value" 
+                            :label="item.label" 
+                            :value="item.value">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="专兼职" prop="post">
+                    <el-select v-model="peoForm.post" clearable placeholder="专兼职">
+                        <el-option v-for="item in postList" 
+                            :key="item.value" 
+                            :label="item.label" 
+                            :value="item.value">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="职责" prop="duty">
+                    <el-select v-model="peoForm.duty" multiple placeholder="请选择">
+                        <el-option
+                        v-for="item in dutyList"
+                        :key="item.roleId"
+                        :label="item.roleName"
+                        :value="item.roleId"
+                        :disabled="item.disabled">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+
+            </el-form>
+            <div slot="footer" >
+                <el-button @click="cancelXiugai">取 消</el-button>
+                <el-button type="primary" @click="updatePeo">确 定</el-button>
+            </div>
+        </el-dialog>
+
+        <!-- 禁用弹窗 -->
+        <el-dialog 
+        title="确认禁用"
+        :visible.sync="Disable"
+        width="30%"
+        :before-close="handleClose"
+        >
+            <span>禁用后该用户将无法登录系统，是否继续？</span>
+            <div slot="footer" >
+                <el-button @click="cancelDisable">取 消</el-button>
+                <el-button type="primary" @click="submitDisable">确 定</el-button>
+            </div>
+        </el-dialog>
+
+
+        <!-- 人员查看 -->
+        <el-dialog
+        title="人员详情"
+        :visible.sync="details"
+        width="30%"
+        :before-close="handleClose">
+            <el-form>
+                <el-form-item label="姓名" >
+                    <el-input  v-model="peoForm.name" placeholder="姓名" :disabled="true"></el-input>
+                </el-form-item>
+                <el-form-item label="手机号" >
+                    <el-input  v-model="peoForm.mobile" placeholder="手机号" :disabled="true"></el-input>
+                </el-form-item>
+                <el-form-item label="组织/部门" >
+                    <el-input  v-model="peoForm.zuzhi" placeholder="组织/部门" :disabled="true"></el-input>
+                </el-form-item>
+                <el-form-item label="激活时间" >
+                    <el-input  v-model="peoForm.activeTime" placeholder="激活时间" :disabled="true"></el-input>
+                </el-form-item>
+                <el-form-item label="职位" >
+                    <el-input  v-model="peoForm.duty" placeholder="职位" :disabled="true"></el-input>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" >
+                <el-button type="primary" style="margin-right:170px" @click="cancelDetails">关 闭</el-button>
+            </div>
+        </el-dialog>
+
+        <!-- 人员调动 -->
+        <el-dialog 
+        title="人员调动"
+        :visible.sync="transferPeo"
+        width="30%"
+        :before-close="handleClose">
+            <el-form :model="agencyForm">
+                <el-form-item label="姓名">
+                    <el-input v-model="transferForm.name" placeholder="姓名"></el-input>
+                </el-form-item>
+                <el-form-item label="调动至">
+                    <el-cascader 
+                        clearable
+                        :props="{ checkStrictly: true }"
+                        v-model="selectValue"
+                        :options="options"
+                        @change="handleChange">
+                    </el-cascader>
+                </el-form-item>
+                <el-form-item label="调动原因">
+                    <el-input
+                    type="textarea"
+                    :rows="2"
+                    placeholder="请输入内容"
+                    maxlength="500"
+                    show-word-limit
+                    v-model="transferForm.remarks">
+                    </el-input>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" >
+                <el-button @click="cancelTransfer">取 消</el-button>
+                <el-button type="primary" @click="submitTransfer">确 定</el-button>
+            </div>
+        </el-dialog>
+
+        <!-- 新增组织 -->
+        <el-dialog
+        title="新增组织"
+        :visible.sync="createAgencyDialogFlag"
+        width="60%"
+        :before-close="handleClose">
+            <el-form>
+                <el-form-item label="组织名称">
+                    <el-input v-model="agencyForm.agencyName" placeholder="请输入组织名称"></el-input>
+                </el-form-item>
+
+                <!-- 组织区划 -->
+                <el-form-item label="组织区划">
+                    <el-select v-model="zonings.areaCode" placeholder="请选择组织区划" @change="handelZoing">
+                        <el-option 
+                        v-for="item in zonings"
+                        :key="item.areaCode"
+                        :label="item.areaName"
+                        :value="item">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item label="组织编码">
+                    <el-input v-model="agencyForm.code" placeholder="请输入组织编码"></el-input>
+                </el-form-item>
+                <el-form-item label="负责人">
+                    <el-input v-model="agencyForm.contacts" placeholder="请输入负责人名字"></el-input>
+                </el-form-item>
+                <el-form-item label="联系电话">
+                    <el-input v-model="agencyForm.mobile" placeholder="请输入联系电话"></el-input>
+                </el-form-item>
+                <el-form-item>
+                    <div id="con"></div>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" >
+                <el-button @click="canceladdNewAgency">取 消</el-button>
+                <el-button type="primary" @click="submitaddNewAgency">确 定</el-button>
+            </div>
+        </el-dialog>
+
+
+        <!-- 修改市区级组织 -->
+        <el-dialog
+        title="修改组织"
+        :visible.sync="modifyCityOrgPop"
+        width="60%"
+        :before-close="handleClose">
+            <el-form>
+                <el-form-item label="组织名称">
+                    <el-input v-model="OrgDetailsForm.agencyName" placeholder="请输入组织名称"></el-input>
+                </el-form-item>
+
+                <el-form-item label="组织编码">
+                    <el-input v-model="OrgDetailsForm.code" placeholder="请输入组织编码"></el-input>
+                </el-form-item>
+                <el-form-item label="负责人">
+                    <el-input v-model="OrgDetailsForm.contacts" placeholder="请输入负责人名字"></el-input>
+                </el-form-item>
+                <el-form-item label="联系电话">
+                    <el-input v-model="OrgDetailsForm.mobile" placeholder="请输入联系电话"></el-input>
+                </el-form-item>
+                <el-form-item>
+                    <div id="con"></div>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" >
+                <el-button @click="cancelModifyCityOrgPop">取 消</el-button>
+                <el-button type="primary" @click="sunmitModifyCityOrgPop">确 定</el-button>
+            </div>
+        </el-dialog>
+
+
+        <!-- 修改街道/社区级组织 -->
+        <el-dialog
+        title="修改组织"
+        :visible.sync="streetOrCommunity"
+        width="60%"
+        :before-close="handleClose">
+            <el-form>
+                <el-form-item label="组织名称">
+                    <el-input v-model="OrgDetailsForm.agencyName" placeholder="请输入组织名称"></el-input>
+                </el-form-item>
+
+                 <!-- 组织区划 -->
+                <el-form-item label="组织区划">
+                    <el-select v-model="OrgDetailsForm.areaName" placeholder="请选择组织区划" @change="handelStreeOrCommunityZoing">
+                        <el-option 
+                        v-for="item in zonings"
+                        :key="item.areaCode"
+                        :label="item.areaName"
+                        :value="item">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item label="组织编码">
+                    <el-input v-model="OrgDetailsForm.code" placeholder="请输入组织编码"></el-input>
+                </el-form-item>
+                <el-form-item label="负责人">
+                    <el-input v-model="OrgDetailsForm.contacts" placeholder="请输入负责人名字"></el-input>
+                </el-form-item>
+                <el-form-item label="联系电话">
+                    <el-input v-model="OrgDetailsForm.mobile" placeholder="请输入联系电话"></el-input>
+                </el-form-item>
+                <el-form-item>
+                    <div id="con"></div>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" >
+                <el-button @click="cancelstreetOrCommunity">取 消</el-button>
+                <el-button type="primary" @click="sunmitModifyCityOrgPop">确 定</el-button>
+            </div>
+        </el-dialog>
+
+
+        <!-- 修改下级机关单位 -->
+        <el-dialog
+        title="修改部门"
+        :visible.sync="OrgUnitPop"
+        width="60%"
+        :before-close="handleClose">
+            <el-form>
+                <el-form-item label="部门名称">
+                    <el-input v-model="OrgUnitDetailsForm.departmentName" placeholder="请输入组织名称"></el-input>
+                </el-form-item>
+
+                <el-form-item label="组织编码">
+                    <el-input v-model="OrgUnitDetailsForm.code" placeholder="请输入组织编码"></el-input>
+                </el-form-item>
+                <el-form-item label="负责人">
+                    <el-input v-model="OrgUnitDetailsForm.contacts" placeholder="请输入负责人名字"></el-input>
+                </el-form-item>
+                <el-form-item label="联系电话">
+                    <el-input v-model="OrgUnitDetailsForm.mobile" placeholder="请输入联系电话"></el-input>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" >
+                <el-button @click="cancelOrgUnitPop">取 消</el-button>
+                <el-button type="primary" @click="sunmitOrgUnitForm">确 定</el-button>
+            </div>
+        </el-dialog>
+
+
+        <!-- 修改网格 -->
+        <el-dialog
+        title="修改网格"
+        :visible.sync="modifyGridPop"
+        width="60%"
+        :before-close="handleClose">
+            <el-form>
+                <el-form-item label="网格名称">
+                    <el-input v-model="modifyGridFrom.gridName" placeholder="请输入组织名称"></el-input>
+                </el-form-item>
+
+                <el-form-item label="组织编码">
+                    <el-input v-model="modifyGridFrom.code" placeholder="请输入组织编码"></el-input>
+                </el-form-item>
+
+                <!-- 网格类型下拉框 -->
+                <el-form-item label="网格类型" prop="typeTag">
+                        <el-select v-model="modifyGridFrom.gridType" clearable placeholder="网格类型">
+                            <el-option v-for="item in typeList" 
+                                :key="item.value" 
+                                :label="item.label" 
+                                :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+
+                <el-form-item label="负责人">
+                    <el-input v-model="modifyGridFrom.contacts" placeholder="请输入负责人名字"></el-input>
+                </el-form-item>
+                <el-form-item label="联系电话">
+                    <el-input v-model="modifyGridFrom.mobile" placeholder="请输入联系电话"></el-input>
+                </el-form-item>
+
+                <!-- 组织位置,地图 -->
+                <el-form-item>
+                    <div id="con"></div>
+                </el-form-item>
+
+            </el-form>
+            <div slot="footer" >
+                <el-button @click="cancelModifyGridPop">取 消</el-button>
+                <el-button type="primary" @click="submitModifyGrid">确 定</el-button>
+            </div>
+        </el-dialog>
+
+    </div>
+</template>
+
+<script>
+
+import { requestPost } from "@/js/dai/request";
+
+export default {
+    data(){
+        return{
+            // 新增组织弹窗
+            createAgencyDialogFlag: false,
+            // 修改市区级组织弹窗
+            modifyCityOrgPop:false,
+            // 修改街道/社区级组织弹窗
+            streetOrCommunity:false,
+            // 修改下级机关单位弹窗
+            OrgUnitPop:false,
+            // 修改网格弹窗
+            modifyGridPop:false,
+            // 组织列表展示标识
+            agencyTableFlag: true,
+            // 组织工作人员列表展示标识
+            currentAgencyStaffTableFlag: true,
+            // 组织列表数据
+            agencyTableListData: [],
+            // 组织工作人员列表数据
+            agencyStaffTableListData:[],
+
+            // 部门列表（机关、科室列表）列表展示标识
+            departmentTableFlag: true,
+            // 部门人员列表展示标识
+            departmentStaffTableFlag: false,
+            // 部门列表数据
+            departmentTableListData: [],
+            // 部门工作人员列表数据
+            departmentStaffTableListData:[],
+
+            // 网格列表展示标识
+            gridTableFlag:true,
+            // 网格人员列表展示标识
+            gridStaffTableFlag: false,
+            // 网格列表数据
+            gridTableListData: [],
+            // 网格工作人员列表数据
+            gridStaffTableListData:[],
+
+            // 用户所属组织ID
+            userAgencyId: localStorage.getItem("agencyId"),
+            // 修改时操作的用户staffId
+            userStaffId: '',
+            // 当前被操作的组织的ID
+            currentAgencyId: localStorage.getItem("agencyId"),
+            // 当前被操作的部门的ID
+            currentDepartmentId:'14f572e724eecf7668b655505d789cab',
+            // 当前被操作的网格的ID
+            currentGridOrgId:'63d5ff92ea981b1c58e4914ac894c610',
+           
+            // 经纬度坐标
+            lat:'11',
+            lng:'11',
+            latitude:'11',
+            longitude:'11',
+            Navigation:'',
+            // 查询参数
+            queryParams: {
+                deptName: undefined,
+                status: undefined
+            },
+            // 状态列表
+            dictList:[],
+            // 重新渲染表格状态
+            refreshTable: true,
+            // 是否展开，默认全部展开
+            isExpandAll: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 遮罩层
+            loading: true,
+            // 表格树数据
+            deptList: [],
+
+            // 弹窗开关
+            dialogVisible: false,
+            dialogVisibleGrid: false,
+            dialogVisiblePeo: false,
+            Disable: false,
+            details: false,
+            transferPeo: false,
+            // 社区添加表单项
+            insertForm:{
+                departmentName:'',
+                code:'',
+                contacts:'',
+                mobile:'',
+                agencyId:'',
+                departmentDuty:'123'
+            },
+            // 网格添加表单项
+            GridForm:{
+                gridName:'',
+                code:'',
+                contacts:'',
+                mobile:'',
+                agencyId:'',
+                manageDistrict:'',
+                gridType:'',
+                location: '', //坐标位置
+                longitude: '11', //经度
+                latitude: '11' ,//纬度
+                centerAddress:''
+            },
+            // 新增组织
+            agencyForm:{
+                parentAgencyId:'',
+                agencyName:'',
+                level:'',
+                areaCodeSwitch:'',
+                areaCode:'',
+                areaName:'',
+                contacts:'',
+                mobile:'',
+                code:''
+            },
+            // 树
+            tree:[],
+            // 新增人员表单项
+            peoForm:{
+                name:'',
+                mobile:'',
+                gender:'',
+                post:'',
+                duty:[],
+                orgType:'',
+                activeTime:'',
+                zuzhi:'',
+            },
+            // 人员调动
+            transferForm:{
+                name:'',
+                remarks:'',
+                transferTo:'',
+                staffId:'',
+                orgId:'',
+                orgType:''
+            },
+            // 人员禁用
+            DisableForm:{
+                staffId:'',
+                agencyId:'',
+                customerId:''
+            },
+            // 当前用户信息,用于获取组织区划
+            userForm:{
+                areaCode:'',
+                level:'',
+                parentAgencyId:''
+            },
+            // 组织详细信息
+            OrgDetailsForm:{
+                level:'',
+                agencyName:'',
+                code:'',
+                contacts:'',
+                mobile:'',
+                centerAddress:'',
+                areaCode:'',
+                agencyId:'',
+                areaName:''
+            },
+            // 下级机关单位
+            OrgUnitDetailsForm:{
+                code:'',
+                contacts:'',
+                departmentId:'',
+                departmentName:'',
+                mobile:''
+            },
+            // 网格修改表单
+            modifyGridFrom:{
+                gridName:'',
+                code:'',
+                gridTypeName:'',
+                contacts:'',
+                mobile:'',
+                latitude:'',
+                longitude:'',
+                agencyId:'',
+                gridType:'',
+                manageDistrict:'',
+                griId:''
+            },
+            judgeOrgInfoLevel:[],
+            keyWords: '',
+            typeList:[],
+            // 性别字典
+            genderList: [
+                {value: '1', label: '男'},
+                {value: '2', label: '女'},
+            ],
+            // 专兼职字典
+            postList:[
+                {value: 'fulltime' , label: '专职'},
+                {value: 'parttime' , label: '兼职'}
+            ],
+            // 职责字典
+            dutyList:[],
+            // 修改操作是否展示
+            modifyPeo:false,
+            submitOrgid:'',
+            // 级联数据
+            options:[
+                {
+                    value:'',
+                    label:'',
+                    children:[
+                        {
+                            value:'',
+                            label:'',
+                            children:[]
+                        },
+                        {
+                            value:'',
+                            label:'',
+                            children:[]
+                        }
+                    ],
+                }
+            ],
+            selectValue: [],
+            // 顶部 面包屑
+            breadcrumbArr: [],
+            // 面包屑 当前所属机构ID
+            currentBreadcrumbKey: '',
+            // 组织区划数据
+            zonings:[],
+            // 校验
+            rules: {
+                departmentName:[
+                    { required: true, message: '社区名称必填', trigger: 'blur' }
+                ],
+                gridName:[
+                    { required: true, message: '网格名称必填', trigger: 'blur' }
+                ]
+            }
+        }
+    },
+    created(){
+        this.getAgencyList()
+        this.getDepartmentList()
+        this.getGridList()
+        this.getAgencyStaffListData()
+        this.getRoleList()
+        // this.getNavigation()
+        // 更新顶部面包屑
+        this.assembleBreadcrumbArr(localStorage.getItem('agencyId'), 'agency')
+    },
+    
+    watch: {
+        dialogVisibleGrid(val) {
+            if (val) {
+                setTimeout(() => {
+                    let _that = this
+                    this.initMap(_that)
+                }, 1000);
+            }
+        },
+        createAgencyDialogFlag(val) {
+            if (val) {
+                setTimeout(() => {
+                    let _t = this
+                    this.createMap(_t)
+                }, 1000);
+            }
+        },
+        modifyCityOrgPop(val){
+            if (val) {
+                setTimeout(() => {
+                    let _t = this
+                    this.createMap(_t)
+                }, 1000);
+            }
+        },
+        streetOrCommunity(val){
+            if (val) {
+                setTimeout(() => {
+                    let _t = this
+                    this.createMap(_t)
+                }, 1000);
+            }
+        },
+        modifyGridPop(val){
+            if (val) {
+                setTimeout(() => {
+                    let _t = this
+                    this.createMap(_t)
+                }, 1000);
+            }
+        }
+    },
+    mounted(){
+        // this.initMap()
+    },
+    methods:{
+        // 点击后获取id
+        handleChange (e) {
+            this.transferForm.orgId = e[1]
+            if(this.transferForm.orgId != null || ''){
+                if(this.transferForm.orgId === 0){
+                    this.transferForm.orgId = e[2]
+                    this.transferForm.orgType = 'dept'
+                } else {
+                    this.transferForm.orgId = e[2]
+                    this.transferForm.orgType = 'grid'
+                }
+            }else{
+                this.transferForm.orgId = e[0]
+                this.transferForm.orgType = 'agency'
+            }
+        },
+        /** 查询系统工作人员角色（职责） */
+        async getRoleList () {
+            const url = "/gov/org/staff/rolelist"
+            let params = {
+                agencyId: this.currentAgencyId
+            }
+            const { data, code, msg } = await requestPost(url,params)
+            if(code === 0){
+                this.dutyList = data
+            }else{
+                this.$message.error(msg)
+            }
+        },
+        /** 查询组织列表 */
+        async getAgencyList(){
+            const url = "/gov/org/agency/agencylist"
+            let params = {
+                agencyId: this.currentAgencyId
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.agencyTableListData = data
+            }else{
+                this.$message.error(msg)
+            }
+        },
+        /** 查询社区列表 */
+        async getDepartmentList(){
+            const url = "/gov/org/department/departmentlist"
+
+            let params = {
+                agencyId: this.currentAgencyId
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.departmentTableListData = data
+            }else{
+                this.$message.error(msg)
+                
+            }
+        },
+        /** 查询网格列表 */
+        async getGridList(){
+            const url = "/gov/org/grid/allgrids"
+
+            let params = {
+                agencyId: this.currentAgencyId
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.gridTableListData = data
+            }else{
+                this.$message.error(msg)
+            }
+        },
+
+        // 查询网格人员列表
+        async getGridStaffListData(){
+           const url = "/data/aggregator/org/stafflist"
+
+           let params = {
+               orgId:this.currentGridOrgId,
+               orgType:'grid',
+               pageNo:1,
+               pageSize:100
+           }
+
+           const { data, code, msg } = await requestPost(url,params)
+
+           if(code === 0){
+               this.gridStaffTableListData = data.staffList
+           } else {
+               this.$message.error(msg)
+           }
+        },
+        // 查询组织工作人员
+        async getAgencyStaffListData(){
+            const url = "/data/aggregator/org/stafflist"
+
+            let params = {
+                orgId: this.currentAgencyId,
+                orgType:'agency',
+                pageNo:1,
+                pageSize:100
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0) {
+                this.agencyStaffTableListData = data.staffList
+            } else {
+                this.$message.error(msg)
+            }
+        },
+
+        // 查询部门人员
+        async getDepartmentStaffListData(){
+            const url = "/data/aggregator/org/stafflist"
+
+            let params = {
+               orgId:this.currentDepartmentId,
+               orgType:'dept',
+               pageNo:1,
+               pageSize:100
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.departmentStaffTableListData = data.staffList
+            } else {
+                this.$message.error(msg)
+            }
+        },
+        // 添加组织
+        async submit(){
+            
+            const url = "/gov/org/department/adddepartment"
+
+            let params = {
+                agencyId:this.insertForm.agencyId,
+                departmentName:this.insertForm.departmentName,
+                departmentDuty:this.insertForm.departmentDuty,
+                contacts:this.insertForm.contacts,
+                mobile:this.insertForm.mobile,
+                code:this.insertForm.code
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.$message.success("添加成功")
+                this.dialogVisible = false
+                this.insertForm = []
+                this.getAgencyList()
+                this.getDepartmentList()
+                this.getGridList()
+                this.getAgencyStaffListData()
+            }else{
+                this.$message.error(msg)
+            }
+        },
+        // 添加网格
+        async submitGrid(){
+            const url = "/gov/org/grid/addgrid"
+
+            let params = {
+                agencyId:this.GridForm.agencyId,
+                gridName:this.GridForm.gridName,
+                contacts:this.GridForm.contacts,
+                mobile:this.GridForm.mobile,
+                code:this.GridForm.code,
+                manageDistrict:this.GridForm.manageDistrict,
+                gridType:this.GridForm.gridType,
+                latitude:this.lat,
+                longitude:this.lng
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.$message.success("添加成功")
+                this.dialogVisibleGrid = false
+                this.GridForm = []
+                this.getAgencyList()
+                this.getDepartmentList()
+                this.getGridList()
+                this.getAgencyStaffListData()
+            } else {
+                this.$message.error(msg)
+            }
+        },
+
+        // 添加人员
+        async submitPeo(){
+            const url = "/gov/org/staff/addstaffv2"
+
+            let params = {
+                orgType:this.peoForm.orgType,
+                name:this.peoForm.name,
+                mobile:this.peoForm.mobile,
+                gender:this.peoForm.gender,
+                workType:this.peoForm.post,
+                roles:this.peoForm.duty,
+                orgId:this.submitOrgid
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                
+                this.$message.success("添加成功")
+                this.dialogVisiblePeo = false
+                this.peoForm = []
+                this.getAgencyList()
+                this.getDepartmentList()
+                this.getGridList()
+                this.getAgencyStaffListData()
+            } else {
+                this.$message.error(msg)
+            }
+        },
+
+        // 人员修改
+        async updatePeo(){
+            const url = "/gov/org/staff/editstaff"
+
+            let params = {
+                staffId:this.userStaffId,
+                name:this.peoForm.name,
+                mobile:this.peoForm.mobile,
+                gender:this.peoForm.gender === '男' ? 1 : 0,
+                workType:this.peoForm.post,
+                roles:this.peoForm.duty,
+                agencyId:this.userAgencyId,
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0) {
+                this.$message.success("修改成功")
+                this.modifyPeo = false
+                
+                this.getAgencyList()
+                this.getDepartmentList()
+                this.getGridList()
+                this.getAgencyStaffListData()
+                this.getDepartmentStaffListData()
+                this.getGridStaffListData()
+                
+            } else {
+                this.$message.error(msg)
+            }
+        },
+
+        // 字典
+        async getDictionaries(){
+            const url = "/sys/dict/data/dictlist"
+
+            let params = {
+                dictType:'grid_type'
+            }
+            
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.typeList = data
+            } else {
+                this.$message.error(msg)
+            }
+        },
+
+        /** 搜索按钮操作 */
+        handleQuery(){
+            this.getList()
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.queryParams.deptName = undefined
+            this.queryParams.status = undefined
+            this.handleQuery();
+        },
+        /** 新增按钮操作 */
+        handleAdd(row){
+            this.dialogVisible=true
+        },
+        // 社区弹框关闭函数
+        handleClose(done) {
+        this.$confirm('确认关闭？')
+          .then(_ => {
+            this.insertFormRest()
+            done();
+          })
+          .catch(_ => {});
+        },
+        // 社区新增弹框重置函数
+        insertFormRest(){
+            this.insertForm.name = '',
+            this.insertForm.contacts = '',
+            this.insertForm.code = '',
+            this.insertForm.phone = ''
+        },
+        // 网格新增弹框重置函数
+        GridFormRest(){
+            this.GridForm.gridName = '',
+            this.GridForm.code = '',
+            this.GridForm.centerAddress = '',
+            this.GridForm.contacts = '',
+            this.GridForm.mobile = '',
+            this.GridForm.agencyId = '',
+            this.GridForm.manageDistrict = '',
+            this.GridForm.gridType = '',
+            this.GridForm.location = '',
+            this.GridForm.longitude = '',
+            this.GridForm.latitude = ''
+        },
+        /** 人员清空 */
+        peoFormRest(){
+            this.peoForm.name = '',
+            this.peoForm.mobile = '',
+            this.peoForm.gender = '',
+            this.peoForm.post = '',
+            this.peoForm.duty = ''
+            
+        },
+        // 人员调动
+        transferRest(){
+            this.transferForm.name = '',
+            this.transferForm.remarks = '',
+            this.transferForm.transferTo = ''
+            this.transferForm.staffId = '',
+            this.transferForm.orgId = '',
+            this.transferForm.orgType = ''
+            this.selectValue = ''
+            
+        },
+        // 新增组织
+        addNewAgencyRest(){
+            this.agencyForm.parentAgencyId = '',
+            this.agencyForm.agencyName = '',
+            this.agencyForm.level = '', 
+            this.agencyForm.areaCodeSwitch = '',
+            this.agencyForm.areaCode = '',
+            this.agencyForm.areaName = '',
+            this.agencyForm.contacts = '',
+            this.agencyForm.mobile = '',
+            this.agencyForm.code = '',
+            this.latitude = '',
+            this.longitude = ''
+        },
+        // 修改市级组织
+        cancelModifyCityOrgPopRest(){
+            this.OrgDetailsForm.level = '',
+            this.OrgDetailsForm.agencyName = '',
+            this.OrgDetailsForm.code = '',
+            this.OrgDetailsForm.contacts = '',
+            this.OrgDetailsForm.mobile = '',
+            this.OrgDetailsForm.centerAddress = '',
+            this.OrgDetailsForm.areaCode = ''
+            this.OrgDetailsForm.agencyId = ''
+            this.latitude = '',
+            this.longitude = ''
+        },
+        // 修改下级机关单位
+        OrgUnitDetailsRest(){
+            this.OrgUnitDetailsForm.code = '',
+            this.OrgUnitDetailsForm.contacts = '',
+            this.OrgUnitDetailsForm.departmentId = '',
+            this.OrgUnitDetailsForm.departmentName = '',
+            this.OrgUnitDetailsForm.mobile = ''
+        },
+        // 修改网格清空
+        ModifyGridPopRest(){
+            this.modifyGridFrom.gridName = '',
+            this.modifyGridFrom.code = '',
+            this.modifyGridFrom.gridTypeName = '',
+            this.modifyGridFrom.contacts = '',
+            this.modifyGridFrom.mobile = '',
+            this.latitude = '',
+            this.longitude = '',
+            this.modifyGridFrom.agencyId = '',
+            this.modifyGridFrom.gridType = '',
+            this.modifyGridFrom.manageDistrict = '',
+            this.modifyGridFrom.griId = ''
+        },
+        // 社区新增弹框取消按钮
+        cancel(){
+            this.dialogVisible = false
+            this.insertFormRest()
+        },
+        // 网格新增弹框取消按钮
+        cancelGrid(){
+            this.dialogVisibleGrid = false
+            this.GridFormRest()
+            
+        },
+        /** 取消按钮 */
+        cancelPeo(){
+            this.dialogVisiblePeo = false
+            this.peoFormRest()
+        },
+        // 修改取消
+        cancelXiugai(){
+            this.modifyPeo = false
+            this.peoFormRest()
+        },
+        // 查看弹窗
+        cancelDetails(){
+            this.details = false
+        },
+        /** 人员调动取消按钮 */
+        cancelTransfer(){
+            this.transferRest()
+            this.transferPeo = false
+        },
+        // 新增组织取消按钮
+        canceladdNewAgency(){
+            this.addNewAgencyRest()
+            this.createAgencyDialogFlag = false
+        },
+        // 修改市级组织取消按钮
+        cancelModifyCityOrgPop(){
+            this.cancelModifyCityOrgPopRest()
+            this.modifyCityOrgPop = false
+        },
+        // 修改街道/社区级取消按钮
+        cancelstreetOrCommunity(){
+            this.cancelModifyCityOrgPopRest()
+            this.streetOrCommunity = false
+        },
+        // 取消修改下级机关单位按钮
+        cancelOrgUnitPop(){
+            this.OrgUnitPop = false
+            this.OrgUnitDetailsRest()
+        },
+        // 取消修改网格按钮
+        cancelModifyGridPop(){
+            this.modifyGridPop = false
+            this.ModifyGridPopRest()
+        },
+        // 进入网格，查询网格所属人员
+        entryGrid(gridId){
+            this.gridStaffTableListData = []
+            this.departmentStaffTableListData =[]
+            this.agencyStaffTableListData = []
+            this.currentGridOrgId = gridId
+            this.gridStaffTableFlag = true
+            this.departmentStaffTableFlag = false
+            this.currentAgencyStaffTableFlag = false
+            this.agencyTableFlag = false
+            this.departmentTableFlag = false
+            this.gridTableFlag = false
+            this.getGridStaffListData()
+            this.assembleBreadcrumbArr(gridId, 'grid')
+        },
+        // 进入部门，查询部门所属人员
+        entryDepartment(departmentId){
+            this.gridStaffTableListData = []
+            this.departmentStaffTableListData = []
+            this.agencyStaffTableListData = []
+            this.currentDepartmentId = departmentId
+            this.departmentStaffTableFlag = true
+            this.currentAgencyStaffTableFlag = false
+            this.gridStaffTableFlag = false
+            this.gridTableFlag = false
+            this.agencyTableFlag = false
+            this.departmentTableFlag = false
+            this.getDepartmentStaffListData()
+            this.assembleBreadcrumbArr(departmentId, 'department')
+        },
+
+        // 进入组织，重新渲染
+        entryAgency(agencyId){
+
+            this.currentAgencyId = agencyId
+
+            this.agencyTableListData = []
+            this.departmentTableListData = []
+            this.gridTableListData = []
+            this.gridStaffTableListData = []
+            this.agencyStaffTableListData = []
+            this.departmentStaffTableListData = []
+
+            this.getDepartmentList()
+            this.getGridList()
+            this.getAgencyStaffListData()
+            this.getAgencyList()
+            this.assembleBreadcrumbArr(agencyId, 'agency')
+        },
+        // 新增组织
+        addCommunity(row){
+            this.insertForm.agencyId = this.currentAgencyId
+            this.dialogVisible = true
+        },
+        // 新增网格
+        addGrid(row){
+            this.GridForm.agencyId = this.currentAgencyId
+            this.getDictionaries()
+            this.dialogVisibleGrid = true
+        },
+
+        // 新增人员
+        addPeo(row){
+            this.dialogVisiblePeo = true
+            this.peoForm.orgType = 'agency'
+            this.submitOrgid = this.currentAgencyId
+        },
+        
+        // 新增社区人员
+        addCommunityPeo(){
+            this.dialogVisiblePeo = true
+            this.peoForm.orgType = 'dept'
+            this.submitOrgid = this.currentDepartmentId
+        },
+
+        // 新增网格人员
+        addGridPeo(){
+            this.dialogVisiblePeo = true
+            this.peoForm.orgType = 'grid'
+            this.submitOrgid = this.currentGridOrgId
+        },
+        // 修改网格人员
+        async xiuGridPeo(row){
+            this.modifyPeo = true
+            this.peoForm.orgType = 'grid'
+            this.submitOrgid = this.currentGridOrgId
+            this.userStaffId = row.staffId
+
+            const url = "/gov/org/staff/editstaffinit"
+            let params = {
+                staffId: row.staffId,
+                agencyId: this.currentAgencyId
+            }
+            const { data, code, msg } = await requestPost(url,params)
+            if(code === 0){
+                
+                this.peoForm.name = data.name
+                this.peoForm.mobile = data.mobile
+                this.peoForm.gender = data.gender === 1 ? '男' : '女'
+                this.peoForm.post = data.workType
+                // 已有的权限（职责）
+                let existedRoleArr = []
+                data.roleList.forEach(function (sysRole) {
+                    if (sysRole.selected === true) {
+                        existedRoleArr.push(sysRole.roleId)
+                    }
+                })
+                this.peoForm.duty = existedRoleArr
+            } else {
+                this.$message.error(msg)
+            }
+        },
+        // 修改人员
+        async xiuPeo(row){
+            this.modifyPeo = true
+            this.peoForm.orgType = 'agency'
+            this.submitOrgid = this.currentAgencyId
+            this.userStaffId = row.staffId
+
+            const url = "/gov/org/staff/editstaffinit"
+
+            let params = {
+                staffId:row.staffId,
+                agencyId:this.currentAgencyId
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.peoForm.name = data.name
+                this.peoForm.mobile = data.mobile
+                this.peoForm.post = data.workType
+                this.peoForm.gender = data.gender === 1 ? '男' : '女'
+                // 已有的权限（职责）
+                let existedRoleArr = []
+                data.roleList.forEach(function (sysRole) {
+                    if (sysRole.selected === true) {
+                        existedRoleArr.push(sysRole.roleId)
+                    }
+                })
+                this.peoForm.duty = existedRoleArr
+            } else {
+                this.$message.error(msg)
+            }
+
+            
+        },
+        // 修改社区人员
+        async xiuCommunityPeo(row){
+            this.modifyPeo = true
+            this.peoForm.orgType = 'dept'
+            this.submitOrgid = this.currentDepartmentId
+            this.userStaffId = row.staffId
+
+            const url = '/gov/org/staff/editstaffinit'
+
+            let params = {
+                staffId:row.staffId,
+                agencyId:this.currentAgencyId
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.peoForm.name = data.name
+                this.peoForm.mobile = data.mobile
+                this.peoForm.gender = data.gender === 1 ? '男' : '女'
+                this.peoForm.post = data.workType
+                // 已有的权限（职责）
+                let existedRoleArr = []
+                data.roleList.forEach(function (sysRole) {
+                    if (sysRole.selected === true) {
+                        existedRoleArr.push(sysRole.roleId)
+                    }
+                })
+                this.peoForm.duty = existedRoleArr
+            }else {
+                this.$message.error(msg)
+            }
+
+            
+        },
+        // 取消禁用按钮
+        cancelDisable(){
+            this.Disable = false
+        },
+        // 人员禁用
+        DisablePeo(row){
+            this.DisableForm.staffId = row.staffId
+            this.Disable = true
+        },
+        // 确定禁用
+        async submitDisable(){
+            const url = "/epmetuser/customerstaff/disabledstaff"
+
+            let params = {
+                staffId:this.DisableForm.staffId,
+                agencyId:this.DisableForm.agencyId,
+                customerId:this.DisableForm.customerId
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.$message.success("禁用成功")
+                this.Disable = false
+                this.getAgencyList()
+                this.getDepartmentList()
+                this.getGridList()
+                this.getAgencyStaffListData()
+            } else {
+                this.$message.error(msg)
+            }
+        },
+        // 查看按钮
+        async lookAngency(row){
+            const url = "/data/aggregator/org/staffdetailv2"
+
+            let params = {
+                staffId:row.staffId
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.peoForm.name = data.name
+                this.peoForm.mobile = data.mobile
+                this.peoForm.activeTime = data.activeTime
+                this.peoForm.duty = data.roles
+                this.peoForm.zuzhi = data.orgName
+            }
+            this.details = true
+        },
+        
+        // 人员调动
+        async transfer(row){
+
+            this.transferForm.name = row.name
+            this.transferForm.staffId = row.staffId
+
+            this.transferPeo = true
+            const url = "/gov/org/customeragency/orgtree"
+
+            let params = {
+
+            }
+            
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.options[0].label = data.agencyName
+                this.options[0].value = data.agencyId
+
+                    console.log('--------',this.options)
+                let depart = Array.from(data.departmentList)
+                let gr = Array.from(data.gridList)
+
+                depart.forEach(item => {
+                    const ob = {
+                        value:item.deptId,
+                        label:item.deptName                        
+                    }
+                    this.options[0].children[0].children.push(ob)
+                })
+                    this.options[0].children[0].value = 0
+                    this.options[0].children[0].label = "部门"
+                    this.options[0].children[1].value = 1
+                    this.options[0].children[1].label = "网格"
+                gr.forEach(item => {
+                    const obj = {
+                        value:item.gridId,
+                        label:item.gridName                        
+                    }
+                    this.options[0].children[1].children.push(obj)
+                })
+            }else{
+                this.$message.error("树查询失败",msg)
+            }
+            
+        },
+        // 人员调动确定
+        async submitTransfer(){
+            const url = "/gov/org/staff/stafftransferv2"
+
+            let params = {
+                staffId:this.transferForm.staffId,
+                orgId:this.transferForm.orgId,
+                orgType:this.transferForm.orgType,
+                remarks:this.transferForm.remarks
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.$message.success("调动成功")
+                this.transferRest()
+                this.transferPeo = false
+                this.getAgencyList()
+                this.getDepartmentList()
+                this.getGridList()
+                this.getAgencyStaffListData()
+
+            } else {
+                this.$message.error(msg)
+            }
+        },
+
+        // 获取导航
+        // async getNavigation(){
+
+        //     const url = "/gov/org/customeragency/orgtree"
+
+        //     let params = {
+
+        //     }
+            
+        //     const { data, code, msg } = await requestPost(url,params)
+
+        //     if(code === 0){
+        //         this.Navigation = data.agencyName
+        //     }
+        // 组装顶部面包屑数组
+        async assembleBreadcrumbArr (id, orgType) {
+            this.currentBreadcrumbKey = id
+            if (orgType === 'agency') {
+                const url = '/gov/org/agency/agencydetail'
+                let params = {
+                    agencyId : id,
+                }
+                const { data, code, msg } = await requestPost(url, params)
+                if(code === 0){
+                    // 社区级为最低级组织，不展示下级组织列表
+                    if (data.level === 'community') {
+                        this.agencyTableFlag = false
+                    } else {
+                        this.agencyTableFlag = true
+                    }
+                    if (this.breadcrumbArr.length === 0) {
+                        this.breadcrumbArr = [{id: data.agencyId, name: data.agencyName, type: orgType}]
+                    } else {
+                        let hasBreadcrumbArr = false
+                        this.breadcrumbArr.forEach(function (bc) {
+                            if (bc.id === id) {
+                                hasBreadcrumbArr = true
+                            }
+                        })
+                        if (hasBreadcrumbArr === false) {
+                            let breadcrumb = {id: data.agencyId, name: data.agencyName, type: orgType}
+                            this.breadcrumbArr.push(breadcrumb)
+                        } 
+                    }
+                } else {
+                    this.$message.error(msg)
+                }
+            } else if (orgType === 'department') {
+                const url = '/gov/org/department/departmentdetail'
+                let params = {
+                    departmentId : id,
+                }
+                const { data, code, msg } = await requestPost(url, params)
+                if(code === 0){
+                    if (this.breadcrumbArr.length === 0) {
+                        this.breadcrumbArr = [{id: data.departmentId, name: data.departmentName, type: orgType}]
+                    } else {
+                        let hasBreadcrumbArr = false
+                        this.breadcrumbArr.forEach(function (bc) {
+                            if (bc.id === id) {
+                                hasBreadcrumbArr = true
+                            }
+                        })
+                        if (hasBreadcrumbArr === false) {
+                            let breadcrumb = {id: data.departmentId, name: data.departmentName, type: orgType}
+                            this.breadcrumbArr.push(breadcrumb)
+                        } 
+                    }
+                } else {
+                    this.$message.error(msg)
+                }
+            } else if (orgType === 'grid') {
+                const url = '/gov/org/grid/griddetail'
+                let params = {
+                    gridId : id,
+                }
+                const { data, code, msg } = await requestPost(url, params)
+                if(code === 0){
+                    if (this.breadcrumbArr.length === 0) {
+                        this.breadcrumbArr = [{id: data.grid, name: data.gridName, type: orgType}]
+                    } else {
+                        let hasBreadcrumbArr = false
+                        this.breadcrumbArr.forEach(function (bc) {
+                            if (bc.id === id) {
+                                hasBreadcrumbArr = true
+                            }
+                        })
+                        if (hasBreadcrumbArr === false) {
+                            let breadcrumb = {id: data.grid, name: data.gridName, type: orgType}
+                            this.breadcrumbArr.push(breadcrumb)
+                        } 
+                    }
+                } else {
+                    this.$message.error(msg)
+                }
+            }
+        },
+
+        async refreshThisPage (index) {
+
+            // 点击最后一级不触发响应
+            if (index === this.breadcrumbArr.length - 1) {
+                return
+            }
+
+            const selectOrg = this.breadcrumbArr[index]
+            this.breadcrumbArr = this.breadcrumbArr.slice(0, index + 1)
+
+            const orgId = selectOrg.id
+            const orgType = selectOrg.type
+
+            if (orgType === 'agency') {
+                this.agencyTableListData = []
+                this.agencyStaffTableListData = []
+                this.departmentTableListData = []
+                this.departmentStaffTableListData = []
+                this.gridTableListData = []
+                this.gridStaffTableListData = []
+                this.userAgencyId = orgId
+                this.currentAgencyId = orgId
+
+                this.agencyTableFlag = true
+                this.currentAgencyStaffTableFlag = true
+                this.departmentTableFlag = true
+                this.departmentStaffTableFlag = false
+                this.gridTableFlag = true
+                this.gridStaffTableFlag = false
+
+                this.assembleBreadcrumbArr(orgId, 'agency')
+                this.getAgencyList()
+                this.getDepartmentList()
+                this.getGridList()
+                this.getAgencyStaffListData()
+            } 
+            // 当点击最后一级不触发响应
+            // 其父级及以上，只可能属于组织，而非部门或网格，注释以下代码即可
+            // 若需要点击最后一级触发刷新，可释放以下代码
+            /* else if (orgType === 'department') {
+                this.agencyStaffTableListData = []
+                this.departmentStaffTableListData = []
+                this.gridStaffTableListData = []
+
+                this.currentDepartmentId = orgId
+
+                this.agencyTableFlag = false
+                this.currentAgencyStaffTableFlag = false
+                this.departmentTableFlag = false
+                this.departmentStaffTableFlag = true
+                this.gridTableFlag = false
+                this.gridStaffTableFlag = false
+
+                this.getDepartmentStaffListData()
+                this.assembleBreadcrumbArr(orgId, 'department')
+            } else if (orgType === 'grid') {
+                this.agencyStaffTableListData = []
+                this.departmentStaffTableListData =[]
+                this.gridStaffTableListData = []
+
+                this.currentGridOrgId = orgId
+
+                this.agencyTableFlag = false
+                this.currentAgencyStaffTableFlag = false
+                this.departmentTableFlag = false
+                this.departmentStaffTableFlag = false
+                this.gridTableFlag = false
+                this.gridStaffTableFlag = true
+                this.getGridStaffListData()
+                this.assembleBreadcrumbArr(orgId, 'grid')
+            } */
+        },
+        // 获取当前用户信息
+        async getUser(){
+            const url = '/gov/org/agency/agencydetail'
+
+            let params = {
+                agencyId: localStorage.getItem('agencyId')
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.userForm.areaCode = data.areaCode
+                this.userForm.level = data.level
+                this.userForm.parentAgencyId = data.agencyId
+                this.getZoning()
+            }else{
+                this.$message.error(msg)
+            }
+        },
+        // 获取组织区划信息
+        async getZoning(){
+            const url = '/data/aggregator/org/nextlevelareacodelist'
+
+            let params = {
+                areaCode:this.userForm.areaCode,
+                level:this.userForm.level,
+                parentAgencyId:this.userForm.parentAgencyId
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.zonings = data
+            }else{
+                this.$message.error(msg)
+            }
+
+        },
+
+        handelZoing(val){
+            this.agencyForm.level = val.level
+            this.agencyForm.areaName = val.areaName
+            this.agencyForm.areaCode = val.areaCode
+            
+        },
+        handelStreeOrCommunityZoing(val){
+            console.log(val)
+            this.OrgDetailsForm.level = val.level
+            this.OrgDetailsForm.areaName = val.areaName
+            this.OrgDetailsForm.areaCode = val.areaCode
+        },
+
+        addAgency(row){
+            this.createAgencyDialogFlag = true
+            this.getUser()
+        },
+        // 新增组织确定按钮
+        async submitaddNewAgency(){
+            const url = '/gov/org/agency/addagency-v2'
+
+            let params = {
+                parentAgencyId:this.userForm.parentAgencyId,
+                agencyName:this.agencyForm.agencyName,
+                level:this.agencyForm.level,
+                areaCodeSwitch:'closed',
+                areaCode:this.agencyForm.areaCode,
+                areaName:this.agencyForm.areaName,
+                contacts:this.agencyForm.contacts,
+                mobile:this.agencyForm.mobile,
+                code:this.agencyForm.code,
+                latitude:this.latitude,
+                longitude:this.longitude
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.$message.success("添加成功")
+                this.createAgencyDialogFlag = false
+                this.getAgencyList()
+                this.getDepartmentList()
+                this.getGridList()
+                this.getAgencyStaffListData()
+            }else {
+                this.$message.error(msg)
+            }
+        },
+
+        // 修改面包屑
+        modifyOrgInfo(){
+            this.judgeOrgInfoLevel = this.breadcrumbArr[this.breadcrumbArr.length-1]
+            console.log(this.judgeOrgInfoLevel)
+            if(this.judgeOrgInfoLevel.type === "agency"){
+                this.getOrgDetailsById()
+                setTimeout(() => {
+                    if(this.OrgDetailsForm.level === "district"){
+                    /** 修改市区级弹窗 */
+                    this.modifyCityOrgPop = true
+                    }else {
+                        /** 街道级和社区级弹窗 */
+                        this.getUser()
+                        this.streetOrCommunity = true
+                    }
+                }, 1000);
+            } else if(this.judgeOrgInfoLevel.type === "department"){
+                /** 下级机关单位修改 */
+                this.OrgUnitPop = true
+                this.getOrgUnitDetailsById()
+            } else {
+                /** 网格修改 */
+                this.getDictionaries()
+                this.modifyGridPop = true
+                this.getGridDetailsById()
+            }
+        },
+
+        // 根据id获取组织机构详细信息
+        async getOrgDetailsById(){
+            const url = '/gov/org/agency/agencydetail'
+
+            let params = {
+                agencyId:this.judgeOrgInfoLevel.id
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.OrgDetailsForm.level = data.level
+                this.OrgDetailsForm.agencyName = data.agencyName
+                this.OrgDetailsForm.code = data.code
+                this.OrgDetailsForm.contacts = data.contacts
+                this.OrgDetailsForm.centerAddress = data.centerAddress
+                this.OrgDetailsForm.areaCode = data.areaCode
+                this.OrgDetailsForm.mobile = data.mobile
+                this.latitude = data.latitude
+                this.longitude = data.longitude
+                this.OrgDetailsForm.agencyId = data.agencyId
+            }else {
+                this.$message.error(msg)
+            }
+        },
+
+        // 根据id获取下级机关单位详情
+        async getOrgUnitDetailsById(){
+            const url = '/gov/org/department/departmentdetail'
+
+            let params = {
+                departmentId:this.judgeOrgInfoLevel.id
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.OrgUnitDetailsForm.code = data.code
+                this.OrgUnitDetailsForm.contacts = data.contacts
+                this.OrgUnitDetailsForm.departmentId = data.departmentId
+                this.OrgUnitDetailsForm.departmentName = data.departmentName
+                this.OrgUnitDetailsForm.mobile = data.mobile
+            }else {
+                this.$message.error(msg)
+            }
+        },
+
+        // 根据id获取网格详情
+        async getGridDetailsById(){
+            const url = '/gov/org/grid/griddetail'
+
+            let params = {
+                gridId: this.judgeOrgInfoLevel.id
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.modifyGridFrom.gridName = data.gridName
+                this.modifyGridFrom.code = data.code
+                this.modifyGridFrom.gridTypeName = data.gridTypeName
+                this.modifyGridFrom.contacts = data.contacts
+                this.modifyGridFrom.mobile = data.mobile
+                this.modifyGridFrom.agencyId = data.agencyId
+                this.modifyGridFrom.gridType = data.gridType
+                this.modifyGridFrom.manageDistrict = data.manageDistrict
+                this.modifyGridFrom.griId = data.griId
+            }else {
+                this.$message.error(msg)
+            }
+        },  
+
+        // 市级/街道/社区级组织修改确定按钮
+        async sunmitModifyCityOrgPop(){
+            const url = '/gov/org/agency/editagency'
+
+            let params = {
+                agencyId: this.OrgDetailsForm.agencyId,
+                agencyName: this.OrgDetailsForm.agencyName,
+                contacts: this.OrgDetailsForm.contacts,
+                mobile: this.OrgDetailsForm.mobile,
+                code: this.OrgDetailsForm.code,
+                latitude: this.latitude,
+                longitude: this.longitude
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.$message.success("修改成功")
+                this.modifyCityOrgPop = false
+                this.streetOrCommunity = false
+                this.getAgencyList()
+                this.getDepartmentList()
+                this.getGridList()
+                this.agencyPeo()
+            }else{
+                this.$message.error(msg)
+            }
+        },
+        // 修改下级机关单位确定按钮
+        async sunmitOrgUnitForm(){
+            const url = '/gov/org/department/editdepartment'
+
+            let params = {
+                code: this.OrgUnitDetailsForm.code,
+                contacts: this.OrgUnitDetailsForm.contacts,
+                departmentId: this.OrgUnitDetailsForm.departmentId,
+                departmentName: this.OrgUnitDetailsForm.departmentName,
+                mobile: this.OrgUnitDetailsForm.mobile
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.$message.success("修改成功")
+                this.OrgUnitPop = false
+                this.getAgencyList()
+                this.getDepartmentList()
+                this.getGridList()
+                this.agencyPeo()
+            } else {
+                this.$message.error(msg)
+            }
+        },
+        // 修改网格确定按钮
+        async submitModifyGrid(){
+            const url = '/gov/org/grid/editgrid'
+
+            let params = {
+                gridId: this.modifyGridFrom.griId,
+                gridName: this.modifyGridFrom.gridName,
+                manageDistrict: this.modifyGridFrom.manageDistrict,
+                contacts: this.modifyGridFrom.contacts,
+                mobile: this.modifyGridFrom.mobile,
+                code: this.modifyGridFrom.code,
+                gridType: this.modifyGridFrom.gridType
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.$message.success("修改成功")
+                this.modifyGridPop = false
+                this.getAgencyList()
+                this.getDepartmentList()
+                this.getGridList()
+                this.agencyPeo()
+            }else {
+                this.$message.error(msg)
+            }
+        },
+
+       /** 地图初始化 */
+       initMap(_that) {
+           
+            var position = document.getElementById("position");
+
+            var center = new window.TMap.LatLng(39.984104, 116.307503);//设置中心点坐标
+            //初始化地图
+            var map = new window.TMap.Map("container", {
+                center: center
+            });
+            
+            //绑定点击事件
+            map.on("click",function(evt){
+                _that.lat = evt.latLng.getLat().toFixed(6);
+                _that.lng = evt.latLng.getLng().toFixed(6);
+                position.innerHTML = _that.lat + "," + _that.lng;
+            })
+        },
+        createMap(_t){
+            document.getElementById("con").innerHTML = ''
+            document.getElementById("con").innerHTML = '当前点击坐标为：<span id="pos"></span>'
+            var position = document.getElementById("pos");
+
+            var center = new window.TMap.LatLng(this.latitude, this.longitude);//设置中心点坐标
+            //初始化地图
+            var map = new window.TMap.Map("con", {
+                center: center
+            });
+            
+            //绑定点击事件
+            map.on("click",function(evt){
+                _t.latitude = evt.latLng.getLat().toFixed(6);
+                _t.longitude = evt.latLng.getLng().toFixed(6);
+                position.innerHTML = _t.latitude + "," + _t.longitude;
+            })
+
+        }
+        
+    }
+}
+</script>
+
+<style scoped>
+    #container {
+        width: 100%;
+        height: 100%;
+    }
+    #info{
+        left: 20px;
+        top: 20px;
+        font-size: 14px;
+        background: #fff;
+        width: 270px;
+        padding: 10px;
+        border-radius: 3px;
+    }
+    #con {
+        width: 100%;
+        height: 100%;
+    }
+    .el-tag + .el-tag {
+        margin-left: 10px;
+    }
+</style>
\ No newline at end of file
diff --git a/src/views/modules/shequ/cpts/fangwu-info.vue b/src/views/modules/shequ/cpts/fangwu-info.vue
index 15babd2f4..272489744 100644
--- a/src/views/modules/shequ/cpts/fangwu-info.vue
+++ b/src/views/modules/shequ/cpts/fangwu-info.vue
@@ -9,7 +9,7 @@
         class="form"
       >
         <el-form-item
-          label="所属小区"
+          label="所属小区："
           label-width="150px"
           style="display: block"
         >
@@ -17,7 +17,7 @@
         </el-form-item>
 
         <el-form-item
-          label="所属楼栋"
+          label="所属楼栋："
           label-width="150px"
           style="display: block"
         >
@@ -25,7 +25,7 @@
         </el-form-item>
 
         <el-form-item
-          label="单元号"
+          label="单元号："
           prop="buildingUnitId"
           label-width="150px"
           style="display: block"
@@ -34,7 +34,7 @@
         </el-form-item>
 
         <el-form-item
-          label="门牌号"
+          label="门牌号："
           prop="doorName"
           label-width="150px"
           style="display: block"
@@ -43,7 +43,7 @@
         </el-form-item>
 
         <el-form-item
-          label="房屋类型"
+          label="房屋类型："
           prop="houseType"
           label-width="150px"
           style="display: block"
@@ -52,7 +52,7 @@
         </el-form-item>
 
         <el-form-item
-          label="房屋用途"
+          label="房屋用途："
           prop="purpose"
           label-width="150px"
           style="display: block"
@@ -61,7 +61,7 @@
         </el-form-item>
 
         <el-form-item
-          label="是否出租"
+          label="房屋状态："
           prop="rentFlag"
           label-width="150px"
           style="display: block"
@@ -70,7 +70,7 @@
         </el-form-item>
 
         <el-form-item
-          label="房主姓名"
+          label="房主姓名："
           prop="ownerName"
           label-width="150px"
           style="display: block"
@@ -78,7 +78,7 @@
           <span>{{ dataForm.ownerName }}</span>
         </el-form-item>
         <el-form-item
-          label="房主电话"
+          label="房主电话："
           prop="ownerPhone"
           label-width="150px"
           style="display: block"
@@ -86,7 +86,7 @@
           <span>{{ dataForm.ownerPhone }}</span>
         </el-form-item>
         <el-form-item
-          label="房主身份证"
+          label="房主身份证："
           prop="ownerIdCard"
           label-width="150px"
           style="display: block"
@@ -118,7 +118,7 @@ export default {
         doorName: "", //门牌号
         houseType: "", //房屋类型【楼房，平房，别墅】
         purpose: "", //房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】
-        rentFlag: 1, //是否出租【是：1，否：0】
+        rentFlag: 1, //房屋状态【是：1，否：0】
         ownerPhone: "", //房主电话
         ownerName: "", //房主名字
         ownerIdCard: "", //房主身份证
@@ -151,7 +151,7 @@ export default {
         doorName: "", //门牌号
         houseType: "1", //房屋类型【楼房，平房，别墅】
         purpose: "1", //房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】
-        rentFlag: 1, //是否出租【是：1，否：0】
+        rentFlag: 1, //房屋状态【是：1，否：0】
         ownerPhone: "", //房主电话
         ownerName: "", //房主名字
         ownerIdCard: "", //房主身份证
@@ -191,7 +191,7 @@ export default {
 
 .div_btn {
   display: flex;
-  justify-content: flex-end;
+  justify-content: center;
 }
 .el-tabs {
   margin: 0 20px;
diff --git a/src/views/modules/shequ/cpts/people-more.vue b/src/views/modules/shequ/cpts/people-more.vue
index 00f8f9158..49d0755de 100644
--- a/src/views/modules/shequ/cpts/people-more.vue
+++ b/src/views/modules/shequ/cpts/people-more.vue
@@ -136,86 +136,161 @@
               </div>
             </div>
           </div>
-          <div v-if="group.tableName == 'ic_hs'" style="margin-top:10px; padding: 0 20px;">
-            <el-table class="table"
-                  :data="natList"
-                  border
-                  height="400"
-                  :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
-                  style="width: 100%">
-                <el-table-column label="序号"
-                                header-align="center"
-                                align="center"
-                                type="index"
-                                width="50"></el-table-column>
-
-                <el-table-column prop="testTime"
-                                header-align="center"
-                                align="center"
-                                label="检测时间"
-                                width="150">
-                </el-table-column>
-                <el-table-column prop="address"
-                                header-align="center"
-                                align="center"
-                                label="检测机构"
-                                show-overflow-tooltip
-                                min-width="180">
-                </el-table-column>
-                <el-table-column prop="result"
-                                header-align="center"
-                                align="center"
-                                label="检测结果"
-                                width="240">
-                </el-table-column>
-              </el-table>
+          <div
+            v-else-if="group.tableName == 'ic_hs'"
+            style="margin-top: 10px; padding: 0 20px"
+          >
+            <el-table
+              class="table"
+              :data="natList"
+              border
+              height="400"
+              :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
+              style="width: 100%"
+            >
+              <el-table-column
+                label="序号"
+                header-align="center"
+                align="center"
+                type="index"
+                width="50"
+              ></el-table-column>
+
+              <el-table-column
+                prop="testTime"
+                header-align="center"
+                align="center"
+                label="检测时间"
+                width="150"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="address"
+                header-align="center"
+                align="center"
+                label="检测机构"
+                show-overflow-tooltip
+                min-width="180"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="result"
+                header-align="center"
+                align="center"
+                label="检测结果"
+                width="240"
+              >
+              </el-table-column>
+            </el-table>
+          </div>
+          <div
+            v-else-if="group.tableName == 'ic_xc'"
+            style="margin-top: 10px; padding: 0 20px"
+          >
+            <el-table
+              class="table"
+              :data="tripList"
+              border
+              height="400"
+              :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
+              style="width: 100%"
+            >
+              <el-table-column
+                label="序号"
+                header-align="center"
+                align="center"
+                type="index"
+                width="50"
+              ></el-table-column>
+
+              <el-table-column
+                prop="fromRegion"
+                header-align="center"
+                align="center"
+                label="来自地区"
+                show-overflow-tooltip
+                min-width="100"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="arrivalTime"
+                header-align="center"
+                align="center"
+                label="来到本地时间"
+                width="140"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="leaveTime"
+                header-align="center"
+                align="center"
+                label="离开本地时间"
+                width="140"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="noticeTime"
+                header-align="center"
+                align="center"
+                label="最近一次通知时间"
+                width="140"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="remark"
+                header-align="center"
+                align="center"
+                label="备注"
+                show-overflow-tooltip
+                width="120"
+              >
+              </el-table-column>
+            </el-table>
           </div>
-          <div v-if="group.tableName == 'ic_xc'" style="margin-top:10px; padding: 0 20px;">
-            <el-table class="table"
-                  :data="tripList"
-                  border
-                  height="400"
-                  :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
-                  style="width: 100%">
-                <el-table-column label="序号"
-                                header-align="center"
-                                align="center"
-                                type="index"
-                                width="50"></el-table-column>
-
-                <el-table-column prop="fromRegion"
-                                header-align="center"
-                                align="center"
-                                label="来自地区"
-                                show-overflow-tooltip
-                                min-width="100">
-                </el-table-column>
-                <el-table-column prop="arrivalTime"
-                                header-align="center"
-                                align="center"
-                                label="来到本地时间"
-                                width="140">
-                </el-table-column>
-                <el-table-column prop="leaveTime"
-                                header-align="center"
-                                align="center"
-                                label="离开本地时间"
-                                width="140">
-                </el-table-column>
-                <el-table-column prop="noticeTime"
-                                header-align="center"
-                                align="center"
-                                label="最近一次通知时间"
-                                width="140">
-                </el-table-column>
-                <el-table-column prop="remark"
-                                header-align="center"
-                                align="center"
-                                label="备注"
-                                show-overflow-tooltip
-                                width="120">
-                </el-table-column>
-              </el-table>
+          <div
+            v-else-if="group.tableName == 'ic_ym'"
+            style="margin-top: 10px; padding: 0 20px"
+          >
+            <el-table
+              class="table"
+              :data="vaccineList"
+              border
+              height="400"
+              :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
+              style="width: 100%"
+            >
+              <el-table-column
+                label="序号"
+                header-align="center"
+                align="center"
+                type="index"
+                width="50"
+              ></el-table-column>
+
+              <el-table-column
+                prop="vaccinateTime"
+                header-align="center"
+                align="center"
+                label="接种时间"
+                show-overflow-tooltip
+                min-width="100"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="address"
+                header-align="center"
+                align="center"
+                label="接种地点"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="manufactor"
+                header-align="center"
+                align="center"
+                label="疫苗厂家"
+              >
+              </el-table-column>
+            </el-table>
           </div>
           <div class="list" v-else>
             <div
@@ -398,7 +473,7 @@ export default {
     async getApiData() {
       await this.getField();
       await this.getInfo();
-      this.getDetailList()
+      this.getDetailList();
       this.getXiaoquList();
       this.getLouList();
       this.getDanyuanList();
@@ -448,7 +523,6 @@ export default {
       });
 
       if (code === 0) {
-        
         this.groupList = data.groupList;
         this.fieldList = (function (arr) {
           let col = [];
@@ -514,22 +588,33 @@ export default {
             }
           });
         });
-        const arr = [{
-          groupId: "hs123",
-          itemList: [],
-          label: "核酸检测信息",
-          sort: 998,
-          supportAdd: false,
-          tableName: "ic_hs",
-        }, {
-          groupId: "hs124",
-          itemList: [],
-          label: "行程信息",
-          sort: 999,
-          supportAdd: false,
-          tableName: "ic_xc",
-        }]
-        this.groupList = [...this.groupList, ...arr]
+        const arr = [
+          {
+            groupId: "hs123",
+            itemList: [],
+            label: "核酸检测信息",
+            sort: 998,
+            supportAdd: false,
+            tableName: "ic_hs",
+          },
+          {
+            groupId: "hs124",
+            itemList: [],
+            label: "行程信息",
+            sort: 999,
+            supportAdd: false,
+            tableName: "ic_xc",
+          },
+          {
+            groupId: "hs125",
+            itemList: [],
+            label: "疫苗信息",
+            sort: 999,
+            supportAdd: false,
+            tableName: "ic_ym",
+          },
+        ];
+        this.groupList = [...this.groupList, ...arr];
       } else {
         this.$message.error(msg);
       }
@@ -601,22 +686,21 @@ export default {
         this.$message.error(msg);
       }
     },
-    async getDetailList () {
-
-      const url = "/epmetuser/epidemicPrevention/info"
+    async getDetailList() {
+      const url = "/epmetuser/epidemicPrevention/info";
       let params = {
-        id: this.userId
-      }
+        id: this.userId,
+      };
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        const { vaccineList, natList, tripList } = data
-        this.vaccineList = vaccineList
-        this.natList = natList
-        this.tripList = tripList
+        const { vaccineList, natList, tripList } = data;
+        this.vaccineList = vaccineList;
+        this.natList = natList;
+        this.tripList = tripList;
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
     },
   },
diff --git a/src/views/modules/shequ/cpts/xuqiu-info.vue b/src/views/modules/shequ/cpts/xuqiu-info.vue
index 2c378f739..c34a56397 100644
--- a/src/views/modules/shequ/cpts/xuqiu-info.vue
+++ b/src/views/modules/shequ/cpts/xuqiu-info.vue
@@ -8,12 +8,12 @@
         :disabled="formType === 'detail'"
         class="form"
       >
-        <el-form-item label="状态" label-width="150px" style="display: block">
+        <el-form-item label="状态：" label-width="150px" style="display: block">
           <span>{{ dataForm.statusName }}</span>
         </el-form-item>
 
         <el-form-item
-          label="所属网格"
+          label="所属网格："
           label-width="150px"
           style="display: block"
         >
@@ -21,7 +21,7 @@
         </el-form-item>
 
         <el-form-item
-          label="需求类型"
+          label="需求类型："
           label-width="150px"
           style="display: block"
         >
@@ -29,7 +29,7 @@
         </el-form-item>
 
         <el-form-item
-          label="需求内容"
+          label="需求内容："
           label-width="150px"
           style="display: block"
         >
@@ -37,32 +37,32 @@
         </el-form-item>
 
         <el-form-item
-          label="上报类型"
+          label="上报类型："
           label-width="150px"
           style="display: block"
         >
           <span>{{ dataForm.reportTypeName }}</span>
         </el-form-item>
 
-        <el-form-item label="上报人" label-width="150px" style="display: block">
+        <el-form-item label="上报人：" label-width="150px" style="display: block">
           <span>{{ dataForm.reportUserName }}</span>
         </el-form-item>
 
         <el-form-item
-          label="上报时间"
+          label="上报时间："
           label-width="150px"
           style="display: block"
         >
           <span>{{ dataForm.reportTime }}</span>
         </el-form-item>
 
-        <el-form-item label="需求人" label-width="150px" style="display: block">
+        <el-form-item label="需求人：" label-width="150px" style="display: block">
           <span>{{ dataForm.demandUserName }}</span>
         </el-form-item>
 
         <el-form-item
           v-if="dataForm.serviceShowName"
-          label="服务方"
+          label="服务方："
           label-width="150px"
           style="display: block"
         >
@@ -71,7 +71,7 @@
 
         <el-form-item
           v-if="dataForm.wantServiceTime"
-          label="服务时间"
+          label="服务时间："
           label-width="150px"
           style="display: block"
         >
@@ -84,7 +84,7 @@
             dataForm.serviceEndTime &&
             dataForm.status == 'finished'
           "
-          label="实际服务时间"
+          label="实际服务时间："
           label-width="150px"
           style="display: block"
         >
@@ -97,7 +97,7 @@
 
         <el-form-item
           v-if="dataForm.finishResult && dataForm.status == 'finished'"
-          label="完成情况"
+          label="完成情况："
           label-width="150px"
           style="display: block"
         >
@@ -108,7 +108,7 @@
 
         <el-form-item
           v-if="dataForm.score && dataForm.status == 'finished'"
-          label="评价得分"
+          label="评价得分："
           label-width="150px"
           style="display: block"
         >
@@ -117,7 +117,7 @@
 
         <el-form-item
           v-if="dataForm.finishDesc && dataForm.status == 'finished'"
-          label="评价备注"
+          label="评价备注："
           label-width="150px"
           style="display: block"
         >
@@ -126,7 +126,7 @@
 
         <el-form-item
           v-if="dataForm.cancelTime && dataForm.status == 'canceled'"
-          label="取消时间"
+          label="取消时间："
           label-width="150px"
           style="display: block"
         >
@@ -208,7 +208,7 @@ export default {
 
 .div_btn {
   display: flex;
-  justify-content: flex-end;
+  justify-content: center;
 }
 .el-tabs {
   margin: 0 20px;
diff --git a/src/views/modules/shequ/index.vue b/src/views/modules/shequ/index.vue
index 3eed29d44..44e86cca3 100644
--- a/src/views/modules/shequ/index.vue
+++ b/src/views/modules/shequ/index.vue
@@ -138,7 +138,7 @@
                                    label="用途">
                   </el-table-column>
                   <el-table-column prop="rentFlag"
-                                   label="是否出租">
+                                   label="房屋状态">
                   </el-table-column>
                   <el-table-column prop="ownerName"
                                    label="房主姓名">
diff --git a/src/views/modules/visual/basicinfo/cpts/people-more.vue b/src/views/modules/visual/basicinfo/cpts/people-more.vue
index bd8bb9f04..ce45fea94 100644
--- a/src/views/modules/visual/basicinfo/cpts/people-more.vue
+++ b/src/views/modules/visual/basicinfo/cpts/people-more.vue
@@ -7,45 +7,42 @@
           <span>更多信息</span>
         </div>
 
-        <div class="btn-close"
-             @click="handleClose">
+        <div class="btn-close" @click="handleClose">
           <img src="@/assets/img/shuju/people/close.png" />
         </div>
 
-        <div :key="'fieldSubList' + index"
-             v-for="(fieldSubList, index) in fieldList">
+        <div
+          :key="'fieldSubList' + index"
+          v-for="(fieldSubList, index) in fieldList"
+        >
           <div class="list">
-            <div class="item"
-                 v-if="index == 0">
+            <div class="item" v-if="index == 0">
               <span class="item-field">所属网格：</span>
               <span>{{ gridName }}</span>
             </div>
-            <div class="item"
-                 v-if="index == 0">
+            <div class="item" v-if="index == 0">
               <span class="item-field">所属小区：</span>
               <span>{{ xiaoquName }}</span>
             </div>
-            <div class="item"
-                 v-if="index == 0">
+            <div class="item" v-if="index == 0">
               <span class="item-field">所属楼栋：</span>
               <span>{{ louName }}-{{ danyuanName }}</span>
             </div>
-            <div class="item"
-                 v-if="index == 0">
+            <div class="item" v-if="index == 0">
               <span class="item-field">所属家庭：</span>
               <span>{{ homeName }}</span>
             </div>
-            <div class="item"
-                 :key="field.itemId"
-                 v-for="field in fieldSubList">
+            <div class="item" :key="field.itemId" v-for="field in fieldSubList">
               <span class="item-field">{{ field.label }}：</span>
 
-              <span v-if="
+              <span
+                v-if="
                   field.itemType == 'select' ||
                   field.itemType == 'radio' ||
                   field.itemType == 'checkbox' ||
                   field.itemType == 'cascader'
-                ">{{
+                "
+                >{{
                   info[field.columnName] == null
                     ? "--"
                     : getOptionLabel(
@@ -53,7 +50,8 @@
                         info[field.columnName],
                         field.itemType
                       )
-                }}</span>
+                }}</span
+              >
 
               <span v-else>{{
                 info[field.columnName] == null ? "--" : info[field.columnName]
@@ -65,43 +63,63 @@
         </div>
 
         <div class="tabs">
-          <div class="tab-btn"
-               @click="subStartGroupIndex"
-               v-if="groupList.length > 9">
+          <div
+            class="tab-btn"
+            @click="subStartGroupIndex"
+            v-if="groupList.length > 9"
+          >
             <img src="@/assets/img/shuju/people/arrow-double-left.png" />
           </div>
-          <div v-show="index >= startGroupIndex && index < startGroupIndex + 9"
-               class="tab"
-               :class="groupIndex % groupList.length == index ? 'z-on' : ''"
-               :key="'tab' + index"
-               @click="groupIndex = index"
-               v-for="(item, index) in groupList">
+          <div
+            v-show="index >= startGroupIndex && index < startGroupIndex + 9"
+            class="tab"
+            :class="groupIndex % groupList.length == index ? 'z-on' : ''"
+            :key="'tab' + index"
+            @click="groupIndex = index"
+            v-for="(item, index) in groupList"
+          >
             {{ item.label }}
           </div>
-          <div class="tab-btn"
-               @click="addStartGroupIndex"
-               v-if="groupList.length > 9">
+          <div
+            class="tab-btn"
+            @click="addStartGroupIndex"
+            v-if="groupList.length > 9"
+          >
             <img src="@/assets/img/shuju/people/arrow-double-right.png" />
           </div>
         </div>
 
-        <div :key="'group' + index"
-             v-show="groupIndex % groupList.length == index"
-             v-for="(group, index) in groupList">
-          <div v-if="group.tableName == 'ic_resi_demand' && Array.isArray(allInfo.ic_resi_demand) && allInfo.ic_resi_demand.length>0">
-            <div class="list"
-                 :key="'ic_resi_demand' + infoIndex"
-                 v-for="(infoItem, infoIndex) in allInfo.ic_resi_demand">
-              <div class="item"
-                   :key="field.itemId"
-                   v-for="field in group.itemList">
+        <div
+          :key="'group' + index"
+          v-show="groupIndex % groupList.length == index"
+          v-for="(group, index) in groupList"
+        >
+          <div
+            v-if="
+              group.tableName == 'ic_resi_demand' &&
+              Array.isArray(allInfo.ic_resi_demand) &&
+              allInfo.ic_resi_demand.length > 0
+            "
+          >
+            <div
+              class="list"
+              :key="'ic_resi_demand' + infoIndex"
+              v-for="(infoItem, infoIndex) in allInfo.ic_resi_demand"
+            >
+              <div
+                class="item"
+                :key="field.itemId"
+                v-for="field in group.itemList"
+              >
                 <span class="item-field">{{ field.label }}：</span>
-                <span v-if="
+                <span
+                  v-if="
                     field.itemType == 'select' ||
                     field.itemType == 'radio' ||
                     field.itemType == 'checkbox' ||
                     field.itemType == 'cascader'
-                  ">{{
+                  "
+                  >{{
                     infoItem[field.columnName] == null
                       ? "--"
                       : getOptionLabel(
@@ -109,7 +127,8 @@
                           infoItem[field.columnName],
                           field.itemType
                         )
-                  }}</span>
+                  }}</span
+                >
 
                 <span v-else>{{
                   infoItem[field.columnName] == null
@@ -119,39 +138,60 @@
               </div>
             </div>
           </div>
-          <div v-if="group.tableName == 'ic_hs'"
-               style="margin-top:10px; padding: 0 20px;">
+          <div
+            v-else-if="group.tableName == 'ic_hs'"
+            style="margin-top: 10px; padding: 0 20px"
+          >
             <div class="tb">
-              <cpt-tb :col-list="natDemand.colList"
-                      :loading="natDemand.loading"
-                      :header="natDemand.header"
-                      :list="natDemand.list"></cpt-tb>
-
+              <cpt-tb
+                :col-list="natDemand.colList"
+                :loading="natDemand.loading"
+                :header="natDemand.header"
+                :list="natDemand.list"
+              ></cpt-tb>
             </div>
-
           </div>
-          <div v-if="group.tableName == 'ic_xc'"
-               style="margin-top:10px; padding: 0 20px;">
+          <div
+            v-else-if="group.tableName == 'ic_xc'"
+            style="margin-top: 10px; padding: 0 20px"
+          >
             <div class="tb">
-              <cpt-tb :col-list="tripDemand.colList"
-                      :loading="tripDemand.loading"
-                      :header="tripDemand.header"
-                      :list="tripDemand.list"></cpt-tb>
-
+              <cpt-tb
+                :col-list="tripDemand.colList"
+                :loading="tripDemand.loading"
+                :header="tripDemand.header"
+                :list="tripDemand.list"
+              ></cpt-tb>
+            </div>
+          </div>
+          <div
+            v-else-if="group.tableName == 'ic_ym'"
+            style="margin-top: 10px; padding: 0 20px"
+          >
+            <div class="tb">
+              <cpt-tb
+                :col-list="vaccineDemand.colList"
+                :loading="vaccineDemand.loading"
+                :header="vaccineDemand.header"
+                :list="vaccineDemand.list"
+              ></cpt-tb>
             </div>
           </div>
-          <div class="list"
-               v-else>
-            <div class="item"
-                 :key="field.itemId"
-                 v-for="field in group.itemList">
+          <div class="list" v-else>
+            <div
+              class="item"
+              :key="field.itemId"
+              v-for="field in group.itemList"
+            >
               <span class="item-field">{{ field.label }}：</span>
-              <span v-if="
+              <span
+                v-if="
                   field.itemType == 'select' ||
                   field.itemType == 'radio' ||
                   field.itemType == 'checkbox' ||
                   field.itemType == 'cascader'
-                ">{{
+                "
+                >{{
                   !allInfo[group.tableName] ||
                   allInfo[group.tableName][0][field.columnName] == null
                     ? "--"
@@ -160,7 +200,8 @@
                         allInfo[group.tableName][0][field.columnName],
                         field.itemType
                       )
-                }}</span>
+                }}</span
+              >
 
               <span v-else>{{
                 !allInfo[group.tableName] ||
@@ -195,10 +236,11 @@ export default {
   },
 
   components: {
-    cptCard, cptTb
+    cptCard,
+    cptTb,
   },
 
-  data () {
+  data() {
     return {
       fieldList: [],
       groupList: [],
@@ -212,8 +254,8 @@ export default {
       danyuanList: [],
       homeList: [],
 
-      natList: [],//核酸信息
-      tripList: [],//行程信息
+      natList: [], //核酸信息
+      tripList: [], //行程信息
 
       natDemand: {
         loading: false,
@@ -267,17 +309,46 @@ export default {
             width: "15%",
           },
         ],
-        header: ["序号", "来自地区", "来到本地地区", "离开本地地区", "最近一次通知时间", "备注"],
+        header: [
+          "序号",
+          "来自地区",
+          "来到本地地区",
+          "离开本地地区",
+          "最近一次通知时间",
+          "备注",
+        ],
+        list: [],
+        srcList: [],
+      },
+      vaccineDemand: {
+        loading: false,
+        colList: [
+          {
+            align: "center",
+            width: "10%",
+          },
+          {
+            align: "center",
+            width: "20%",
+          },
+          {
+            align: "center",
+            width: "35%",
+          },
+          {
+            align: "center",
+            width: "35%",
+          },
+        ],
+        header: ["序号", "接种时间", "接种地点", "疫苗厂家"],
         list: [],
         srcList: [],
-
-
       },
     };
   },
 
   computed: {
-    xiaoquName () {
+    xiaoquName() {
       const {
         xiaoquList,
         info: { VILLAGE_ID },
@@ -290,7 +361,7 @@ export default {
       }
       return "";
     },
-    louName () {
+    louName() {
       const {
         louList,
         info: { BUILD_ID },
@@ -303,7 +374,7 @@ export default {
       }
       return "";
     },
-    danyuanName () {
+    danyuanName() {
       const {
         danyuanList,
         info: { UNIT_ID },
@@ -316,7 +387,7 @@ export default {
       }
       return "";
     },
-    danyuanName () {
+    danyuanName() {
       const {
         danyuanList,
         info: { UNIT_ID },
@@ -329,7 +400,7 @@ export default {
       }
       return "";
     },
-    homeName () {
+    homeName() {
       const {
         homeList,
         info: { HOME_ID },
@@ -345,17 +416,17 @@ export default {
   },
 
   watch: {
-    userId () {
+    userId() {
       this.getApiData();
     },
   },
 
-  mounted () {
+  mounted() {
     this.getApiData();
   },
 
   methods: {
-    addStartGroupIndex () {
+    addStartGroupIndex() {
       const { startGroupIndex, groupList } = this;
       if (startGroupIndex < groupList.length - 9) {
         this.startGroupIndex = startGroupIndex + 1;
@@ -363,7 +434,7 @@ export default {
         this.startGroupIndex = groupList.length - 9;
       }
     },
-    subStartGroupIndex () {
+    subStartGroupIndex() {
       const { startGroupIndex, groupList } = this;
       if (startGroupIndex > 0) {
         this.startGroupIndex = startGroupIndex - 1;
@@ -371,21 +442,21 @@ export default {
         this.startGroupIndex = 0;
       }
     },
-    handleClose () {
+    handleClose() {
       this.$emit("close");
     },
 
-    async getApiData () {
+    async getApiData() {
       await this.getField();
       await this.getInfo();
-      this.getDetailList()
+      this.getDetailList();
       this.getXiaoquList();
       this.getLouList();
       this.getDanyuanList();
       this.getHomeList();
     },
 
-    getOptionLabel (options, value, type = "") {
+    getOptionLabel(options, value, type = "") {
       if (Array.isArray(options)) {
         let valueArr = value.split(",");
         if (type == "cascader") {
@@ -419,7 +490,7 @@ export default {
     },
 
     //加载组织数据
-    async getField () {
+    async getField() {
       const url = "/oper/customize/icform/getcustomerform";
 
       const { data, code, msg } = await requestPost(url, {
@@ -459,7 +530,7 @@ export default {
     },
 
     //加载组织数据
-    async getInfo () {
+    async getInfo() {
       const url = "/epmetuser/icresiuser/detail";
 
       const { data, code, msg } = await requestPost(url, {
@@ -493,49 +564,54 @@ export default {
             }
           });
         });
-        const arr = [{
-          groupId: "hs123",
-          itemList: [],
-          label: "核酸检测信息",
-          sort: 998,
-          supportAdd: false,
-          tableName: "ic_hs",
-        }, {
-          groupId: "hs124",
-          itemList: [],
-          label: "行程信息",
-          sort: 999,
-          supportAdd: false,
-          tableName: "ic_xc",
-        }]
-        this.groupList = [...this.groupList, ...arr]
+        const arr = [
+          {
+            groupId: "hs123",
+            itemList: [],
+            label: "核酸检测信息",
+            sort: 998,
+            supportAdd: false,
+            tableName: "ic_hs",
+          },
+          {
+            groupId: "hs124",
+            itemList: [],
+            label: "行程信息",
+            sort: 999,
+            supportAdd: false,
+            tableName: "ic_xc",
+          },
+          {
+            groupId: "hs125",
+            itemList: [],
+            label: "疫苗信息",
+            sort: 999,
+            supportAdd: false,
+            tableName: "ic_ym",
+          },
+        ];
+        this.groupList = [...this.groupList, ...arr];
       } else {
         this.$message.error(msg);
       }
     },
 
-    async getDetailList () {
-
-      const url = "/epmetuser/epidemicPrevention/info"
+    async getDetailList() {
+      const url = "/epmetuser/epidemicPrevention/info";
       let params = {
-        id: this.userId
-      }
+        id: this.userId,
+      };
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        const { natList, tripList } = data
+        const { natList, tripList, vaccineList } = data;
 
-        this.natList = natList
-        this.tripList = tripList
+        this.natList = natList;
+        this.tripList = tripList;
 
         this.natDemand.list = natList.map((item) => {
-          return [
-            { type: "index" },
-            item.testTime,
-            item.address,
-            item.result,
-          ];
+          return [{ type: "index" }, item.testTime, item.address, item.result];
         });
         this.natDemand.srcList = natList;
 
@@ -551,13 +627,22 @@ export default {
         });
         this.tripDemand.srcList = tripList;
 
+        this.vaccineDemand.list = vaccineList.map((item) => {
+          return [
+            { type: "index" },
+            item.vaccinateTime,
+            item.address,
+            item.manufactor,
+          ];
+        });
+        this.vaccineDemand.srcList = vaccineList;
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
     },
 
     //加载组织数据
-    async getOptions (url) {
+    async getOptions(url) {
       if (!url) return [];
 
       const { data, code, msg } = await requestPost(url, {});
@@ -569,7 +654,7 @@ export default {
       }
     },
 
-    async getXiaoquList () {
+    async getXiaoquList() {
       const url = "/gov/org/icneighborhood/neighborhoodoption";
 
       const { data, code, msg } = await requestPost(url, {
@@ -583,7 +668,7 @@ export default {
         this.$message.error(msg);
       }
     },
-    async getLouList () {
+    async getLouList() {
       const url = "/gov/org/icbuilding/buildingoption";
 
       const { data, code, msg } = await requestPost(url, {
@@ -596,7 +681,7 @@ export default {
         this.$message.error(msg);
       }
     },
-    async getDanyuanList () {
+    async getDanyuanList() {
       const url = "/gov/org/icbuildingunit/unitoption";
 
       const { data, code, msg } = await requestPost(url, {
@@ -609,7 +694,7 @@ export default {
         this.$message.error(msg);
       }
     },
-    async getHomeList () {
+    async getHomeList() {
       const url = "/gov/org/ichouse/houseoption";
 
       const { data, code, msg } = await requestPost(url, {
@@ -626,4 +711,8 @@ export default {
 };
 </script>
 
-<style lang="scss" src="@/assets/scss/modules/visual/people.scss" scoped></style>
+<style
+  lang="scss"
+  src="@/assets/scss/modules/visual/people.scss"
+  scoped
+></style>
diff --git a/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue b/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue
index 85b3c7f9a..da717e6b4 100644
--- a/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue
+++ b/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue
@@ -262,7 +262,7 @@ export default {
         ldUserRatio: '5%',//流动居民总数占比	
 
       },
-      userColorArray: ['#1B51FF', '#00E5ED'],
+      userColorArray: ['#ff7800', '#00E5ED'],
       userPieData: [],
 
       subList: [],
@@ -285,10 +285,11 @@ export default {
   methods: {
     async getApiData () {
 
-
-      await this.getHousechart()
-      await this.getUserchart()
-      await this.getSubuserhouselist()
+      this.housePieInitState = false
+      this.userPieInitState = false
+      this.getHousechart()
+      this.getUserchart()
+      this.getSubuserhouselist()
 
       this.getHousePie()
       this.getUserPie()
@@ -296,13 +297,13 @@ export default {
     housePieInitOk (dom) {
       console.log('pie准备好了', dom)
       this.housePieChartS = dom
-      this.housePieInitState = true
+      // this.housePieInitState = true
 
     },
     userPieInitOk (dom) {
       console.log('pie准备好了', dom)
       this.userPieChartS = dom
-      this.userPieInitState = true
+      // this.userPieInitState = true
 
     },
 
@@ -330,6 +331,7 @@ export default {
         this.houseData = {}
         this.$message.error(msg);
       }
+      this.housePieInitState = true
     },
 
     getHousePie () {
@@ -411,6 +413,7 @@ export default {
         this.userData = {}
         this.$message.error(msg);
       }
+      this.userPieInitState = true
     },
 
     getUserPie () {
diff --git a/src/views/modules/visual/basicinfo/houseStatic/options.js b/src/views/modules/visual/basicinfo/houseStatic/options.js
index 180d3b55f..5b7e5f5e0 100644
--- a/src/views/modules/visual/basicinfo/houseStatic/options.js
+++ b/src/views/modules/visual/basicinfo/houseStatic/options.js
@@ -1,10 +1,10 @@
 
 export function housePieOption (_charts) {
-  const center= ['50%', '200px']
+  const center= ['50%', '150px']
     return {
       title: {
         text: '0',
-        top: 170,
+        top: 120,
         left: 'center',
         textStyle: {
           width: '100%',
@@ -57,7 +57,7 @@ export function housePieOption (_charts) {
             itemStyle: {
               color: 'rgba(40, 101, 250, 0)',
               width:0,
-              borderColor: 'rgba(40, 101, 250, 0.5)',
+              borderColor: 'rgba(40, 101, 250, 1)',
               borderWidth: 1,
               borderType: 'dotted'
             }
diff --git a/src/views/modules/visual/basicinfo/houseStatic/userOptions.js b/src/views/modules/visual/basicinfo/houseStatic/userOptions.js
index ba1eab7f6..54129ff2b 100644
--- a/src/views/modules/visual/basicinfo/houseStatic/userOptions.js
+++ b/src/views/modules/visual/basicinfo/houseStatic/userOptions.js
@@ -1,10 +1,10 @@
 
 export function userPieOption (_charts) {
-  const center= ['50%', '200px']
+  const center= ['50%', '150px']
     return {
       title: {
         text: '0',
-        top: 170,
+        top: 120,
         left: 'center',
         textStyle: {
           width: '100%',
@@ -59,7 +59,7 @@ export function userPieOption (_charts) {
             itemStyle: {
               color: 'rgba(40, 101, 250, 0)',
               width:0,
-              borderColor: 'rgba(40, 101, 250, 0.5)',
+              borderColor: 'rgba(40, 101, 250, 1)',
               borderWidth: 1,
               borderType: 'dotted'
             }
diff --git a/src/views/modules/visual/warning/components/screen-table/index.vue b/src/views/modules/visual/warning/components/screen-table/index.vue
index e5606ec92..b0e0df0d6 100644
--- a/src/views/modules/visual/warning/components/screen-table/index.vue
+++ b/src/views/modules/visual/warning/components/screen-table/index.vue
@@ -23,33 +23,10 @@
             :key="indexs"
             :style="tableContentStyle[indexs]"
           >
-            <div v-if="Array.isArray(item)">
-              <span
-                v-show="rIndex < 3"
-                :key="resi.userId"
-                v-for="(resi, rIndex) in item"
-              >
-                {{ rIndex != 0 ? "、" : "" }}
-                <a @click="toUserInfo(resi.userId)">{{ resi.residentName }}</a>
-              </span>
+            <div v-if="item.type && item.type == 'btn'">
+              <a @click="handleClickBtn(item)">{{ item.name }}</a>
             </div>
             <span v-else>{{ item }}</span>
-            <span
-              v-if="indexs + 1 == value.length && item.length > 3"
-              class="more"
-              @click.stop="onClickMorePop(index)"
-              ref="morePop"
-            >
-              更多>
-              <div class="more-pop" v-if="visiblePopList[index]">
-                <span :key="resi.userId" v-for="(resi, rIndex) in item">
-                  {{ rIndex != 0 ? "、" : "" }}
-                  <a @click="toUserInfo(resi.userId)">{{
-                    resi.residentName
-                  }}</a>
-                </span>
-              </div>
-            </span>
           </div>
         </div>
         <screen-loading v-if="visibleLoading">加载中</screen-loading>
@@ -63,16 +40,27 @@
         </div>
       </div>
     </div>
+
+    <people-list
+      v-if="showedPeopleList && buildingId"
+      :buildingId="buildingId"
+      :configId="configId"
+      :gridName="gridName"
+      @close="showedPeopleList = false"
+    />
   </div>
 </template>
 
 <script>
 import ScreenLoading from "../screen-loading/index";
 import Vue from "vue";
+import peopleList from "./people-list";
+
 export default {
   name: "warning-table",
   components: {
     ScreenLoading,
+    peopleList,
   },
   props: {
     headerList: {
@@ -84,7 +72,8 @@ export default {
           { title: "所属网格" },
           { title: "所属小区" },
           { title: "楼号" },
-          { title: "姓名" },
+          { title: "预警人数" },
+          { title: "操作" },
         ];
       },
     },
@@ -162,49 +151,29 @@ export default {
   },
   data() {
     return {
-      visiblePopList: [
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-      ],
+      // 显示人员详情
+      showedPeopleList: false,
+      buildingId: "",
+      configId: "",
+      gridName: "",
     };
   },
-  watch: {
-    tableData(arr) {
-      if (Array.isArray(arr)) {
-        this.visiblePopList = new Array(arr.length).fill(false);
-      }
-    },
-  },
+  watch: {},
 
-  mounted() {
-    window.addEventListener("click", (e) => {
-      this.visiblePopList = new Array(this.visiblePopList.length).fill(false);
-    });
-  },
+  mounted() {},
 
   created() {},
 
   methods: {
-    toUserInfo(uid) {
-      this.$router.push({ path: `/main-shuju/visual-basicinfo-people/${uid}` });
+    handleClickBtn(item) {
+      this.showedPeopleList = true;
+      this.buildingId = item.buildingId;
+      this.configId = item.configId;
+      this.gridName = item.gridName;
     },
 
-    onClickMorePop(index) {
-      this.visiblePopList.forEach((item, indexs) => {
-        if (index == indexs) {
-          Vue.set(this.visiblePopList, index, true);
-        } else {
-          Vue.set(this.visiblePopList, indexs, false);
-        }
-      });
+    toUserInfo(uid) {
+      this.$router.push({ path: `/main-shuju/visual-basicinfo-people/${uid}` });
     },
   },
 };
@@ -236,16 +205,19 @@ export default {
           width: 5%;
         }
         &:nth-child(2) {
-          width: 20%;
+          width: 25%;
         }
         &:nth-child(3) {
-          width: 20%;
+          width: 25%;
         }
         &:nth-child(4) {
           width: 15%;
         }
         &:nth-child(5) {
-          width: 40%;
+          width: 15%;
+        }
+        &:nth-child(6) {
+          width: 15%;
         }
       }
     }
@@ -275,16 +247,19 @@ export default {
             width: 5%;
           }
           &:nth-child(2) {
-            width: 20%;
+            width: 25%;
           }
           &:nth-child(3) {
-            width: 20%;
+            width: 25%;
           }
           &:nth-child(4) {
             width: 15%;
           }
           &:nth-child(5) {
-            width: 40%;
+            width: 15%;
+          }
+          &:nth-child(6) {
+            width: 15%;
           }
           a {
             cursor: pointer;
diff --git a/src/views/modules/visual/warning/components/screen-table/people-list.vue b/src/views/modules/visual/warning/components/screen-table/people-list.vue
new file mode 100644
index 000000000..8efffffa9
--- /dev/null
+++ b/src/views/modules/visual/warning/components/screen-table/people-list.vue
@@ -0,0 +1,213 @@
+<template>
+  <div class="m-pop">
+    <div class="wrap">
+      <cpt-card>
+        <div class="btn-close" @click="handleClose">
+          <img src="@/assets/img/shuju/people/close.png" />
+        </div>
+        <div class="wrap2">
+          <div class="title">
+            <span>人员列表</span>
+          </div>
+
+          <div class="content">
+            <div class="tb">
+              <cpt-tb
+                :col-list="colList"
+                :loading="loading"
+                :header="header"
+                :list="list"
+                @operate="toUserInfo"
+              ></cpt-tb>
+            </div>
+
+            <div class="m-pagination">
+              <el-pagination
+                :current-page="pageNo"
+                :page-size="pageSize"
+                background
+                layout="prev, pager, next"
+                @size-change="pageSizeChangeHandleNew"
+                @current-change="pageCurrentChangeHandleNew"
+                :total="total"
+              >
+              </el-pagination>
+            </div>
+          </div>
+        </div>
+      </cpt-card>
+    </div>
+
+    <people-more
+      v-if="showedPeopleInfo && currentPepeleId"
+      :userId="currentPepeleId"
+      :gridName="gridName"
+      @close="showedPeopleInfo = false"
+    />
+  </div>
+</template>
+
+<script>
+import cptCard from "@/views/modules/visual/cpts/card";
+import { requestPost } from "@/js/dai/request";
+import peopleMore from "@/views/modules/shequ/cpts/people-more";
+import cptTb from "@/views/modules/visual/cpts/tb";
+import { mapGetters } from "vuex";
+
+export default {
+  name: "people-list",
+  props: {
+    configId: {
+      type: String,
+      default: "",
+    },
+    buildingId: {
+      type: String,
+      default: "",
+    },
+    gridName: {
+      type: String,
+      default: "",
+    },
+  },
+
+  components: {
+    cptCard,
+    cptTb,
+    peopleMore,
+  },
+
+  data() {
+    return {
+      showedPeopleInfo: false,
+      currentPepeleId: "",
+      currentPepeleGridName: "",
+
+      colList: [
+        {
+          align: "center",
+          width: "5%",
+        },
+        {
+          align: "center",
+          width: "15%",
+        },
+        {
+          align: "center",
+          width: "10%",
+        },
+        {
+          align: "center",
+          width: "15%",
+        },
+        {
+          align: "center",
+          width: "20%",
+        },
+        {
+          align: "center",
+          width: "20%",
+        },
+        {
+          align: "center",
+          width: "10%",
+        },
+      ],
+      header: ["序号", "姓名", "单元", "门牌号", "手机", "身份证", "操作"],
+
+      loading: false,
+      pageNo: 0,
+      pageSize: 12,
+      total: 0,
+      list: [],
+      srcList: [],
+    };
+  },
+
+  computed: {
+    maxTableHeight() {
+      return this.clientHeight - 450;
+      return 420;
+    },
+    ...mapGetters(["clientHeight"]),
+  },
+
+  watch: {
+    userId() {
+      this.getApiData();
+    },
+  },
+
+  mounted() {
+    this.getApiData();
+  },
+
+  methods: {
+    pageSizeChangeHandleNew(val) {
+      this.pageNo = 1;
+      this.pageSize = val;
+    },
+    pageCurrentChangeHandleNew(val) {
+      this.pageNo = val;
+      this.getList();
+    },
+
+    handlePeopleItem(uid) {
+      console.log(uid);
+      this.currentPepeleId = uid;
+
+      this.showedPeopleInfo = true;
+    },
+
+    toUserInfo(index) {
+      let uid = this.srcList[index].userId;
+      this.$router.push({ path: `/main-shuju/visual-basicinfo-people/${uid}` });
+    },
+
+    handleClose() {
+      this.$emit("close");
+    },
+
+    async getApiData() {
+      this.getList();
+    },
+
+    async getList() {
+      const url = "/epmetuser/statsresiwarn/alluserwarnlist";
+      let params = {
+        buildingId: this.buildingId,
+        configId: this.configId,
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        const { list, total } = data;
+        this.list = list.map((item) => {
+          return [
+            { type: "index" },
+            item.residentName,
+            item.unitName,
+            item.doorName,
+            item.mobile,
+            item.idCard,
+            { type: "operate", list: ["查看更多"] },
+          ];
+        });
+        this.total = total;
+        this.srcList = list;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+  },
+};
+</script>
+
+<style
+  lang="scss"
+  src="@/assets/scss/modules/visual/warning-people-list.scss"
+  scoped
+></style>
diff --git a/src/views/modules/visual/warning/index.vue b/src/views/modules/visual/warning/index.vue
index 269a0369d..6be5ddbcd 100644
--- a/src/views/modules/visual/warning/index.vue
+++ b/src/views/modules/visual/warning/index.vue
@@ -89,7 +89,8 @@ export default {
         { title: "所属网格" },
         { title: "所属小区" },
         { title: "楼号" },
-        { title: "姓名" },
+        { title: "预警人数" },
+        { title: "操作" },
       ],
       tableData: [
         // [1,'商丘路社区第一网格','商丘路小区','2号楼','杨颖、王平、刘佳敏、丁辉、杨萍'],
@@ -133,7 +134,14 @@ export default {
             item.gridName,
             item.neighborhoodName,
             item.buildingName,
-            item.userList || '暂无',
+            item.count,
+            {
+              type: "btn",
+              name: "查看人员",
+              buildingId: item.buildingId,
+              configId: item.configId,
+              gridName: item.gridName,
+            },
           ]);
         });
         this.tableData = tableData;
diff --git a/src/views/modules/warning/components/screen-table/index.vue b/src/views/modules/warning/components/screen-table/index.vue
index 3aa871129..833245f6c 100644
--- a/src/views/modules/warning/components/screen-table/index.vue
+++ b/src/views/modules/warning/components/screen-table/index.vue
@@ -24,38 +24,10 @@
               :key="indexs"
               :style="tableContentStyle[indexs]"
             >
-              <div v-if="Array.isArray(item)">
-                <span
-                  v-show="rIndex < 3"
-                  :key="resi.userId"
-                  v-for="(resi, rIndex) in item"
-                >
-                  {{ rIndex != 0 ? "、" : "" }}
-                  <a @click="handlePeopleItem(resi.userId, value[1])">{{
-                    resi.residentName
-                  }}</a>
-                </span>
+              <div v-if="item.type && item.type == 'btn'">
+                <a @click="handleClickBtn(item)">{{ item.name }}</a>
               </div>
               <span v-else>{{ item }}</span>
-              <span
-                v-if="indexs + 1 == value.length && item.length > 3"
-                class="more"
-                @click.stop="onClickMorePop(index)"
-                ref="morePop"
-              >
-                更多>
-                <div class="more-pop" v-if="visiblePopList[index]">
-                  <span
-                    :key="index + rIndex + resi.userId"
-                    v-for="(resi, rIndex) in item"
-                  >
-                    {{ rIndex != 0 ? "、" : "" }}
-                    <a @click="handlePeopleItem(resi.userId, value[1])">{{
-                      resi.residentName
-                    }}</a>
-                  </span>
-                </div>
-              </span>
             </div>
           </div>
           <screen-loading v-if="visibleLoading">加载中</screen-loading>
@@ -66,11 +38,12 @@
       </div>
     </div>
 
-    <people-more
-      v-if="showedPeopleMoreInfo && currentPepeleId"
-      :userId="currentPepeleId"
-      :gridName="currentPepeleGridName"
-      @close="showedPeopleMoreInfo = false"
+    <people-list
+      v-if="showedPeopleList && buildingId"
+      :buildingId="buildingId"
+      :configId="configId"
+      :gridName="gridName"
+      @close="showedPeopleList = false"
     />
   </div>
 </template>
@@ -78,13 +51,13 @@
 <script>
 import ScreenLoading from "../screen-loading/index";
 import Vue from "vue";
-import peopleMore from "@/views/modules/shequ/cpts/people-more";
+import peopleList from "./people-list";
 
 export default {
   name: "warning-table",
   components: {
     ScreenLoading,
-    peopleMore,
+    peopleList,
   },
   props: {
     headerList: {
@@ -96,7 +69,8 @@ export default {
           { title: "所属网格" },
           { title: "所属小区" },
           { title: "楼号" },
-          { title: "姓名" },
+          { title: "预警人数" },
+          { title: "操作" },
         ];
       },
     },
@@ -156,80 +130,32 @@ export default {
       type: Boolean,
       default: true,
     },
-    // // 表格平均分的份数
-    // ava: {
-    //   type: Number,
-    //   default: 8
-    // },
-    // // 表头高度--默认占比10%
-    // headerHeightAva: {
-    //   type: String,
-    //   default: '10%'
-    // },
-    // // 表格主体平均分成的份数
-    // tableContentAva: {
-    //   type: Number,
-    //   default: 5
-    // },
   },
   data() {
     return {
       // 显示人员详情
-      showedPeopleMoreInfo: false,
-
-      currentPepeleId: "",
-      currentPepeleGridName: "",
-
-      visiblePopList: [
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-      ],
+      showedPeopleList: false,
+      buildingId: "",
+      configId: "",
+      gridName: "",
     };
   },
-  watch: {
-    tableData(arr) {
-      if (Array.isArray(arr)) {
-        this.visiblePopList = new Array(arr.length).fill(false);
-      }
-    },
-  },
+  watch: {},
 
-  mounted() {
-    window.addEventListener("click", (e) => {
-      this.visiblePopList = new Array(this.visiblePopList.length).fill(false);
-    });
-  },
+  mounted() {},
 
   created() {},
 
   methods: {
-    toUserInfo(uid) {
-      this.$router.push({ path: `/main-shuju/visual-basicinfo-people/${uid}` });
-    },
-
-    handlePeopleItem(uid, gridName) {
-      this.currentPepeleId = uid;
-      this.currentPepeleGridName = gridName;
-
-      this.showedPeopleMoreInfo = true;
+    handleClickBtn(item) {
+      this.showedPeopleList = true;
+      this.buildingId = item.buildingId;
+      this.configId = item.configId;
+      this.gridName = item.gridName;
     },
 
-    onClickMorePop(index) {
-      this.visiblePopList.forEach((item, indexs) => {
-        if (index == indexs) {
-          Vue.set(this.visiblePopList, index, true);
-        } else {
-          Vue.set(this.visiblePopList, indexs, false);
-        }
-      });
+    toUserInfo(uid) {
+      this.$router.push({ path: `/main-shuju/visual-basicinfo-people/${uid}` });
     },
   },
 };
@@ -263,16 +189,19 @@ export default {
           width: 5%;
         }
         &:nth-child(2) {
-          width: 20%;
+          width: 25%;
         }
         &:nth-child(3) {
-          width: 20%;
+          width: 25%;
         }
         &:nth-child(4) {
           width: 15%;
         }
         &:nth-child(5) {
-          width: 40%;
+          width: 15%;
+        }
+        &:nth-child(6) {
+          width: 15%;
         }
       }
     }
@@ -305,16 +234,19 @@ export default {
             width: 5%;
           }
           &:nth-child(2) {
-            width: 20%;
+            width: 25%;
           }
           &:nth-child(3) {
-            width: 20%;
+            width: 25%;
           }
           &:nth-child(4) {
             width: 15%;
           }
           &:nth-child(5) {
-            width: 40%;
+            width: 15%;
+          }
+          &:nth-child(6) {
+            width: 15%;
           }
           a {
             cursor: pointer;
diff --git a/src/views/modules/warning/components/screen-table/people-list.vue b/src/views/modules/warning/components/screen-table/people-list.vue
new file mode 100644
index 000000000..4ddde0608
--- /dev/null
+++ b/src/views/modules/warning/components/screen-table/people-list.vue
@@ -0,0 +1,184 @@
+<template>
+  <div class="m-pop">
+    <div class="wrap">
+      <div class="btn-close" @click="handleClose">
+        <img src="@/assets/img/shuju/people/close.png" />
+      </div>
+      <div class="wrap2">
+        <div class="title">
+          <span>人员列表</span>
+        </div>
+
+        <div class="content">
+          <div class="tb">
+            <el-table
+              :data="list"
+              border
+              style="width: 100%;margin-top:20px;"
+              class="resi-table"
+            >
+              <el-table-column
+                label="序号"
+                type="index"
+                align="center"
+                width="50"
+              />
+              <el-table-column prop="residentName" label="姓名">
+              </el-table-column>
+              <el-table-column prop="unitName" label="单元"> </el-table-column>
+              <el-table-column prop="doorName" label="门牌号" width="80">
+              </el-table-column>
+              <el-table-column prop="mobile" label="手机"> </el-table-column>
+              <el-table-column prop="idCard" label="身份证"> </el-table-column>
+              <el-table-column
+                fixed="right"
+                label="操作"
+                align="center"
+                width="120"
+              >
+                <template slot-scope="scope">
+                  <el-button
+                    @click="handlePeopleItem(scope.row.userId)"
+                    type="text"
+                    size="small"
+                    >查看更多</el-button
+                  >
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+
+          <div class="pagination">
+            <el-pagination
+              :current-page="pageNo"
+              :page-size="pageSize"
+              background
+              layout="prev, pager, next"
+              @size-change="pageSizeChangeHandleNew"
+              @current-change="pageCurrentChangeHandleNew"
+              :total="total"
+            >
+            </el-pagination>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <people-more
+      v-if="showedPeopleInfo && currentPepeleId"
+      :userId="currentPepeleId"
+      :gridName="gridName"
+      @close="showedPeopleInfo = false"
+    />
+  </div>
+</template>
+
+<script>
+import cptCard from "@/views/modules/visual/cpts/card";
+import { requestPost } from "@/js/dai/request";
+import peopleMore from "@/views/modules/shequ/cpts/people-more";
+import { mapGetters } from "vuex";
+
+export default {
+  name: "people-list",
+  props: {
+    configId: {
+      type: String,
+      default: "",
+    },
+    buildingId: {
+      type: String,
+      default: "",
+    },
+    gridName: {
+      type: String,
+      default: "",
+    },
+  },
+
+  components: {
+    cptCard,
+    peopleMore,
+  },
+
+  data() {
+    return {
+      showedPeopleInfo: false,
+      currentPepeleId: "",
+      currentPepeleGridName: "",
+
+      loading: false,
+      pageNo: 0,
+      pageSize: 12,
+      total: 0,
+      list: [],
+    };
+  },
+
+  computed: {
+    maxTableHeight() {
+      return this.clientHeight - 450;
+      return 420;
+    },
+    ...mapGetters(["clientHeight"]),
+  },
+
+  watch: {
+    userId() {
+      this.getApiData();
+    },
+  },
+
+  mounted() {
+    this.getApiData();
+  },
+
+  methods: {
+    pageSizeChangeHandleNew(val) {
+      this.pageNo = 1;
+      this.pageSize = val;
+    },
+    pageCurrentChangeHandleNew(val) {
+      this.pageNo = val;
+      this.getList();
+    },
+
+    handlePeopleItem(uid) {
+      console.log(uid);
+      this.currentPepeleId = uid;
+
+      this.showedPeopleInfo = true;
+    },
+
+    handleClose() {
+      this.$emit("close");
+    },
+
+    async getApiData() {
+      this.getList();
+    },
+
+    async getList() {
+      const url = "/epmetuser/statsresiwarn/alluserwarnlist";
+      let params = {
+        buildingId: this.buildingId,
+        configId: this.configId,
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        const { list, total } = data;
+        this.list = list;
+        this.total = total;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" src="@/assets/scss/people-info.scss" scoped></style>
diff --git a/src/views/modules/warning/index.vue b/src/views/modules/warning/index.vue
index 00121565a..aa668dc81 100644
--- a/src/views/modules/warning/index.vue
+++ b/src/views/modules/warning/index.vue
@@ -98,7 +98,8 @@ export default {
         { title: "所属网格" },
         { title: "所属小区" },
         { title: "楼号" },
-        { title: "姓名" },
+        { title: "预警人数" },
+        { title: "操作" },
       ],
       tableData: [
         // [1,'商丘路社区第一网格','商丘路小区','2号楼','杨颖、王平、刘佳敏、丁辉、杨萍'],
@@ -142,7 +143,14 @@ export default {
             item.gridName,
             item.neighborhoodName,
             item.buildingName,
-            item.userList || "暂无",
+            item.count,
+            {
+              type: "btn",
+              name: "查看人员",
+              buildingId: item.buildingId,
+              configId: item.configId,
+              gridName: item.gridName,
+            },
           ]);
         });
         this.tableData = tableData;
diff --git a/src/views/modules/workPc/guidance/DetailForm.vue b/src/views/modules/workPc/guidance/DetailForm.vue
index 4f5f7f3c5..5b3528ddb 100644
--- a/src/views/modules/workPc/guidance/DetailForm.vue
+++ b/src/views/modules/workPc/guidance/DetailForm.vue
@@ -133,7 +133,7 @@ import { Loading } from 'element-ui' // 引入Loading服务
 import { requestPost } from '@/js/dai/request'
 
 
-import Tinymce from '@c/tinymce/index.vue'
+import Tinymce from '@c/tinymce2/index.vue'
 // import tinymce from 'tinymce/tinymce'
 // import Editor from '@tinymce/tinymce-vue'
 // import 'tinymce/themes/silver'
diff --git a/src/views/pages/login.vue b/src/views/pages/login.vue
index 099b694e7..6db09b136 100644
--- a/src/views/pages/login.vue
+++ b/src/views/pages/login.vue
@@ -213,7 +213,7 @@ export default {
               //没有客户，提示无法登录
               this.$message.error("账号不存在");
               this.endLoading();
-            } else if (data.length === 10) {
+            } else if (data.length === 1) {
               this.selectCustomer(data[0]);
             } else {
               this.endLoading();