diff --git a/package-lock.json b/package-lock.json
index 0e4ae24..3433587 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2098,7 +2098,7 @@
       "dependencies": {
         "isarray": {
           "version": "1.0.0",
-          "resolved": "https://registry.npm.taobao.org/isarray/download/isarray-1.0.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/isarray/download/isarray-1.0.0.tgz?cache=0&sync_timestamp=1562592096220&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fisarray%2Fdownload%2Fisarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
         },
         "readable-stream": {
@@ -2707,6 +2707,16 @@
       "integrity": "sha1-wteA9T1Fu6gxeokC1M7q86Y4WxQ=",
       "dev": true
     },
+    "bindings": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmmirror.com/bindings/-/bindings-1.5.0.tgz",
+      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "file-uri-to-path": "1.0.0"
+      }
+    },
     "block-stream": {
       "version": "0.0.9",
       "resolved": "https://registry.npm.taobao.org/block-stream/download/block-stream-0.0.9.tgz",
@@ -4687,7 +4697,7 @@
     },
     "echarts": {
       "version": "4.9.0",
-      "resolved": "https://registry.nlark.com/echarts/download/echarts-4.9.0.tgz?cache=0&sync_timestamp=1623167264935&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fecharts%2Fdownload%2Fecharts-4.9.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/echarts/download/echarts-4.9.0.tgz?cache=0&sync_timestamp=1605024616494&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fecharts%2Fdownload%2Fecharts-4.9.0.tgz",
       "integrity": "sha1-qbm6oD8Doqcx5jQMVb77V6nhNH0=",
       "requires": {
         "zrender": "4.3.2"
@@ -5788,6 +5798,13 @@
         "schema-utils": "^0.4.5"
       }
     },
+    "file-uri-to-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+      "dev": true,
+      "optional": true
+    },
     "filename-regex": {
       "version": "2.0.1",
       "resolved": "http://r.cnpmjs.org/filename-regex/download/filename-regex-2.0.1.tgz",
@@ -6751,7 +6768,7 @@
     },
     "gauge": {
       "version": "2.7.4",
-      "resolved": "https://registry.nlark.com/gauge/download/gauge-2.7.4.tgz?cache=0&sync_timestamp=1627307755867&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fgauge%2Fdownload%2Fgauge-2.7.4.tgz",
+      "resolved": "https://registry.npm.taobao.org/gauge/download/gauge-2.7.4.tgz",
       "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
       "requires": {
         "aproba": "^1.0.3",
@@ -8451,7 +8468,7 @@
     },
     "in-publish": {
       "version": "2.0.1",
-      "resolved": "https://registry.npm.taobao.org/in-publish/download/in-publish-2.0.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/in-publish/download/in-publish-2.0.1.tgz?cache=0&sync_timestamp=1584389407092&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fin-publish%2Fdownload%2Fin-publish-2.0.1.tgz",
       "integrity": "sha1-lIsaU1yAMFYc6lIvc/ePS+NX4Aw="
     },
     "indent-string": {
@@ -10576,7 +10593,7 @@
     },
     "npmlog": {
       "version": "4.1.2",
-      "resolved": "https://registry.nlark.com/npmlog/download/npmlog-4.1.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnpmlog%2Fdownload%2Fnpmlog-4.1.2.tgz",
+      "resolved": "https://registry.npm.taobao.org/npmlog/download/npmlog-4.1.2.tgz",
       "integrity": "sha1-CKfyqL9zRgR3mp76StXMcXq7lUs=",
       "requires": {
         "are-we-there-yet": "~1.1.2",
@@ -13322,7 +13339,7 @@
     },
     "psl": {
       "version": "1.8.0",
-      "resolved": "https://registry.npm.taobao.org/psl/download/psl-1.8.0.tgz?cache=0&sync_timestamp=1585143522654&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpsl%2Fdownload%2Fpsl-1.8.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/psl/download/psl-1.8.0.tgz?cache=0&sync_timestamp=1585142991033&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpsl%2Fdownload%2Fpsl-1.8.0.tgz",
       "integrity": "sha1-kyb4vPsBOtzABf3/BWrM4CDlHCQ="
     },
     "public-encrypt": {
@@ -14757,7 +14774,7 @@
       "dependencies": {
         "isarray": {
           "version": "1.0.0",
-          "resolved": "https://registry.npm.taobao.org/isarray/download/isarray-1.0.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/isarray/download/isarray-1.0.0.tgz?cache=0&sync_timestamp=1562592096220&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fisarray%2Fdownload%2Fisarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
         },
         "readable-stream": {
@@ -16313,6 +16330,21 @@
       "resolved": "http://r.cnpmjs.org/upper-case/download/upper-case-1.1.3.tgz",
       "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg="
     },
+    "uppercamelcase": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/uppercamelcase/-/uppercamelcase-1.1.0.tgz",
+      "integrity": "sha512-C7YEMvhgrvTEKEEVqA7LXNID/1TvvIwYZqNIKLquS6y/MGSkRQAav9LnTTILlC1RqUM8eTVBOe1U/fnB652PRA==",
+      "requires": {
+        "camelcase": "^1.2.1"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmmirror.com/camelcase/-/camelcase-1.2.1.tgz",
+          "integrity": "sha512-wzLkDa4K/mzI1OSITC+DUyjgIl/ETNHE9QvYgy6J6Jvqyyz4C0Xfd+lQhb19sX2jMpZV4IssUn0VDVmglV+s4g=="
+        }
+      }
+    },
     "uri-js": {
       "version": "4.2.2",
       "resolved": "http://r.cnpmjs.org/uri-js/download/uri-js-4.2.2.tgz",
@@ -16574,6 +16606,14 @@
       "resolved": "http://r.cnpmjs.org/vue/download/vue-2.5.17.tgz",
       "integrity": "sha1-D4eJrXGL5oyhhyYpgy7VM1icato="
     },
+    "vue-amap": {
+      "version": "0.5.10",
+      "resolved": "https://registry.npmmirror.com/vue-amap/-/vue-amap-0.5.10.tgz",
+      "integrity": "sha512-9ViNCev1vx32+zZ5RvF/TmUZNbwL9QrdA2/OnD2GlXMfQBkJy7D08Vb7379t6guqnopDPtWJ8K6gg72h9+4GUg==",
+      "requires": {
+        "uppercamelcase": "^1.1.0"
+      }
+    },
     "vue-eslint-parser": {
       "version": "2.0.3",
       "resolved": "http://r.cnpmjs.org/vue-eslint-parser/download/vue-eslint-parser-2.0.3.tgz",
@@ -17654,6 +17694,8 @@
           "dev": true,
           "optional": true,
           "requires": {
+            "bindings": "^1.5.0",
+            "nan": "^2.12.1",
             "node-pre-gyp": "*"
           },
           "dependencies": {
@@ -18399,6 +18441,13 @@
             "brace-expansion": "^1.1.7"
           }
         },
+        "nan": {
+          "version": "2.16.0",
+          "resolved": "https://registry.npmmirror.com/nan/-/nan-2.16.0.tgz",
+          "integrity": "sha512-UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA==",
+          "dev": true,
+          "optional": true
+        },
         "negotiator": {
           "version": "0.6.2",
           "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
@@ -19227,7 +19276,7 @@
     },
     "zrender": {
       "version": "4.3.2",
-      "resolved": "https://registry.nlark.com/zrender/download/zrender-4.3.2.tgz",
+      "resolved": "https://registry.npm.taobao.org/zrender/download/zrender-4.3.2.tgz",
       "integrity": "sha1-7HQy+UFcgsc1hLa3uMR+GwFiCcY="
     }
   }
diff --git a/package.json b/package.json
index e4c14ab..d3c3d69 100644
--- a/package.json
+++ b/package.json
@@ -28,13 +28,14 @@
     "js-cookie": "^2.2.0",
     "jsonp": "^0.2.1",
     "lodash": "^4.17.11",
-    "node-sass": "^4.14.1",
+    "node-sass": "^4.12.0",
     "qs": "^6.5.2",
     "quill": "^1.3.7",
     "sass-loader": "^7.1.0",
     "screenfull": "^3.3.3",
     "svg-sprite-loader": "^4.2.1",
     "vue": "^2.5.17",
+    "vue-amap": "^0.5.10",
     "vue-i18n": "^8.1.0",
     "vue-quill-editor": "^3.0.6",
     "vue-router": "^3.0.1",
diff --git a/src/views/modules/personroom/epidemicbuildingunit.vue b/src/views/modules/personroom/epidemicbuildingunit.vue
index 3c83b82..8e91604 100644
--- a/src/views/modules/personroom/epidemicbuildingunit.vue
+++ b/src/views/modules/personroom/epidemicbuildingunit.vue
@@ -29,6 +29,31 @@
         <el-form-item>
           <el-button v-if="$hasPermission(':epidemicbuildingunit:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
+        <el-form-item label="导入网格"
+                      label-width="90px">
+          <el-cascader v-model="deptIdListUpload"
+                       ref="deptTree"
+                       :options="options"
+                       :props="{ checkStrictly: false }"
+                       clearable>
+          </el-cascader>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary"
+                     @click="beforeImportUser">导入</el-button>
+        </el-form-item>
+
+        <el-form-item>
+          <el-upload ref="upload"
+                     :action="uploadUrl"
+                     :limit="1"
+                     :on-success='uploadSuccess'
+                     :on-error='errorExceed'>
+            <el-button id="importBut"
+                       style="display: none"
+                       type="primary">导入</el-button>
+          </el-upload>
+        </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
@@ -69,6 +94,7 @@
 <script>
 import mixinViewModule from '@/mixins/view-module'
 import AddOrUpdate from './epidemicbuildingunit-add-or-update'
+import Cookies from "js-cookie";
 export default {
   mixins: [mixinViewModule],
   data () {
@@ -79,6 +105,8 @@ export default {
         deleteURL: '/custom/epidemicbuildingunit',
         deleteIsBatch: true
       },
+      options: [],
+      deptIdListUpload: [],
       roomTypeArr: [],
       roomUseArr: [],
       dataForm: {
@@ -89,11 +117,31 @@ export default {
   components: {
     AddOrUpdate
   },
+  watch: {
+    'deptIdListUpload': function (val) {
+      if (val.length > 0) {
+        this.gridIdImport = val[val.length - 1]
+        this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/custom/epidemicuserinfo/importExcel?token=
+           ${Cookies.get('token')}&gridId=` + val[val.length - 1]
+      } else {
+        this.gridIdImport = ''
+      }
+    }
+  },
   created: function () {
     this.getOptions()
   },
   methods: {
     getOptions () {
+      this.$http
+              .get(`/sys/user/deptOptions/getByLoginUser`)
+              .then(({ data: res }) => {
+                if (res.code !== 0) {
+                  return this.$message.error(res.msg)
+                }
+                this.options = res.data.options
+              })
+              .catch(() => { })
       this.$http.get(`/sys/dict/listSimple/room_type`).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
@@ -131,6 +179,49 @@ export default {
         }
       }
       return ''
+    },
+    uploadSuccess (response, file, fileList) {
+      this.uploeadLoeading = false
+      this.$refs.upload.clearFiles()
+      if (response.code !== 0 || (response.data !== null && response.data.length > 0)) {
+        this.errordataList = response.data
+        if (this.errordataList != null && this.errordataList.length > 0) {
+          this.faultDataVisible = true
+        } else {
+          this.$message.error(response.msg)
+        }
+        this.getDataList()
+        return
+      }
+      this.$message({
+        message: '导入成功',
+        type: 'success',
+        duration: 1000,
+        onClose: () => {
+          this.getDataList()
+        }
+      })
+    },
+    errorExceed (file, fileList) {
+      this.uploeadLoeading = false
+      this.$message.error('上传失败请重试')
+    },
+    beforeImportUser () {
+      //所属组织全都不选，直接上传
+      if (this.gridIdImport === '') {
+        document.getElementById('importBut').click()
+        return false
+      }
+      //选中网格
+      let selectGird = this.$refs['deptTree'].getCheckedNodes()[0].label
+
+      this.$confirm(`确定将用户导入到${selectGird}?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        document.getElementById('importBut').click()
+      }).catch(() => { })
     }
   }
 }