diff --git a/src/assets/scss/modules/visual/basicInfoMain.scss b/src/assets/scss/modules/visual/basicInfoMain.scss
index 321545768..70c4e5d9a 100644
--- a/src/assets/scss/modules/visual/basicInfoMain.scss
+++ b/src/assets/scss/modules/visual/basicInfoMain.scss
@@ -51,21 +51,35 @@
     .div_search {
       width: 100%;
       height: 56px;
-      background: #011168;
-      border-radius: 4px;
       text-align: center;
+      background-color: #011168;
+      border-radius: 4px 0 0 4px;
+      border: none;
+      box-shadow: 0 0 10px inset #1a5afd;
+      font-size: 18px;
+      font-family: PingFang SC;
+      font-weight: 400;
+      color: #ffffff;
+      opacity: 0.7;
       display: flex;
-      justify-content: flex-end;
-
-      .icon {
+      justify-content: space-between;
+      .div_search_left {
         display: flex;
-        align-items: center;
-        margin-left: 29px;
-        margin-top: 16px;
+        justify-content: flex-start;
+        .icon {
+          display: flex;
+          align-items: center;
+          margin-left: 29px;
+
+          > img {
+            width: 24px;
+            height: 24px;
+          }
+        }
 
-        > img {
-          width: 24px;
-          height: 24px;
+        > span {
+          line-height: 56px;
+          margin-left: 10px;
         }
       }
 
@@ -83,6 +97,10 @@
       }
     }
 
+    .div_search:hover {
+      cursor: pointer;
+    }
+
     .div_info {
       box-sizing: border-box;
       width: 100%;
diff --git a/src/views/modules/base/community/buildForm.vue b/src/views/modules/base/community/buildForm.vue
index 7ae2ff1ce..d144e2706 100644
--- a/src/views/modules/base/community/buildForm.vue
+++ b/src/views/modules/base/community/buildForm.vue
@@ -168,13 +168,16 @@ export default {
       this.dataForm.gridId = agencyObj.gridId
       this.dataForm.neighborHoodId = agencyObj.id
 
-      map.setCenter(new TMap.LatLng(agencyObj.latitude, agencyObj.longitude))
-
       this.formType = type
       if (row) {
         this.dataForm = JSON.parse(JSON.stringify(row))
         this.buildingId = this.dataForm.buildingId
         this.buildType = this.dataForm.buildingTypeKey
+
+        map.setCenter(new TMap.LatLng(this.dataForm.latitude, this.dataForm.longitude))
+        this.setMarker(this.dataForm.latitude, this.dataForm.longitude)
+      } else {
+        map.setCenter(new TMap.LatLng(agencyObj.latitude, agencyObj.longitude))
       }
 
 
diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue
index afe06e31e..18c4a1574 100644
--- a/src/views/modules/base/community/buildTable.vue
+++ b/src/views/modules/base/community/buildTable.vue
@@ -118,7 +118,7 @@
         <el-pagination @size-change="handleSizeChange"
                        @current-change="handleCurrentChange"
                        :current-page.sync="pageNo"
-                       :page-sizes="[10, 20, 50]"
+                       :page-sizes="[20, 50, 100, 200]"
                        :page-size="pageSize"
                        layout="sizes, prev, pager, next, total"
                        :total="total">
diff --git a/src/views/modules/base/community/communityForm.vue b/src/views/modules/base/community/communityForm.vue
index c6875c5e6..6dec5775b 100644
--- a/src/views/modules/base/community/communityForm.vue
+++ b/src/views/modules/base/community/communityForm.vue
@@ -277,14 +277,16 @@ export default {
     async initForm (type, row, agencyObj) {
       this.$refs.ref_form.resetFields();
       this.agencyObj = agencyObj
-      // debugger
-      map.setCenter(new TMap.LatLng(agencyObj.latitude, agencyObj.longitude))
 
       this.formType = type
       if (row) {
-
         this.dataForm = JSON.parse(JSON.stringify(row))
         this.neighborHoodId = this.dataForm.neighborHoodId
+        map.setCenter(new TMap.LatLng(this.dataForm.latitude, this.dataForm.longitude))
+        this.setMarker(this.dataForm.latitude, this.dataForm.longitude)
+
+      } else {
+        map.setCenter(new TMap.LatLng(agencyObj.latitude, agencyObj.longitude))
       }
 
 
diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index 8c6f09364..4fc23e5ed 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -119,7 +119,7 @@
         <el-pagination @size-change="handleSizeChange"
                        @current-change="handleCurrentChange"
                        :current-page.sync="pageNo"
-                       :page-sizes="[10, 20, 50]"
+                       :page-sizes="[20, 50, 100, 200]"
                        :page-size="pageSize"
                        layout="sizes, prev, pager, next, total"
                        :total="total">
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index 7fb5197fb..8a065fb7e 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -129,7 +129,7 @@
         <el-pagination @size-change="handleSizeChange"
                        @current-change="handleCurrentChange"
                        :current-page.sync="pageNo"
-                       :page-sizes="[10, 20, 50]"
+                       :page-sizes="[20, 50, 100, 200]"
                        :page-size="pageSize"
                        layout="sizes, prev, pager, next, total"
                        :total="total">
diff --git a/src/views/modules/communityParty/regionalParty/units.vue b/src/views/modules/communityParty/regionalParty/units.vue
index b8849d202..792c22440 100644
--- a/src/views/modules/communityParty/regionalParty/units.vue
+++ b/src/views/modules/communityParty/regionalParty/units.vue
@@ -151,7 +151,7 @@
                          label="分类"
                          width="180">
         </el-table-column>
-        <el-table-column prop="serviceMatter"
+        <el-table-column prop="serviceMatterShow"
                          header-align="center"
                          align="center"
                          label="服务事项"
@@ -404,6 +404,14 @@ export default {
       if (code === 0) {
         this.total = data.total
         this.tableData = data.list
+        this.tableData.forEach(item => {
+          item.serviceMatterShow = ''
+          if (item.serviceMatterList.length > 0) {
+            item.serviceMatterShow = item.serviceMatterList.jone('')
+
+          }
+
+        });
       } else {
         this.$message.error(msg)
       }
diff --git a/src/views/modules/communityParty/regionalParty/unitsForm.vue b/src/views/modules/communityParty/regionalParty/unitsForm.vue
index 383174ba6..0f9371a13 100644
--- a/src/views/modules/communityParty/regionalParty/unitsForm.vue
+++ b/src/views/modules/communityParty/regionalParty/unitsForm.vue
@@ -54,12 +54,12 @@
 
           </el-form-item>
           <el-form-item label="服务事项"
-                        prop="serviceMatter"
+                        prop="serviceMatterList"
                         label-width="150px"
                         style="display: block">
             <el-checkbox-group class="item_width_1"
                                style="display:flex;flex-wrap:wrap"
-                               v-model="formData.serviceMatter">
+                               v-model="formData.serviceMatterList">
               <el-checkbox v-for="item in serviceList"
                            :key="item.value"
                            :label="item.value">{{item.label}}</el-checkbox>
@@ -197,7 +197,7 @@ export default {
       formData: {
         gridId: '',
         unitName: '',
-        serviceMatter: [],
+        serviceMatterList: [],
         type: '',
         contact: '',
         contactMobile: '',
@@ -429,7 +429,7 @@ export default {
       this.formData = {
         gridId: '',
         unitName: '',
-        serviceMatter: [],
+        serviceMatterList: [],
         type: '',
         contact: '',
         contactMobile: '',
diff --git a/src/views/modules/communityService/ninePlaces/inspect/inspect.vue b/src/views/modules/communityService/ninePlaces/inspect/inspect.vue
new file mode 100644
index 000000000..b8849d202
--- /dev/null
+++ b/src/views/modules/communityService/ninePlaces/inspect/inspect.vue
@@ -0,0 +1,694 @@
+<template>
+  <div class="div_main">
+    <div class="div_search">
+      <el-form :inline="true"
+               :model="formData"
+               ref="ref_searchform"
+               :label-width="'100px'">
+        <div>
+          <el-form-item label="所属网格"
+                        prop="gridId">
+            <el-select class="item_width_1"
+                       v-model="formData.gridId"
+                       placeholder="全部"
+                       clearable>
+              <el-option v-for="item in gridList"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+
+          </el-form-item>
+          <el-form-item label="单位名称"
+                        prop="unitName">
+            <el-input v-model="formData.unitName"
+                      class="item_width_1"
+                      size="small"
+                      clearable
+                      placeholder="请输入内容">
+            </el-input>
+
+          </el-form-item>
+          <el-form-item label="服务事项"
+                        prop="serviceMatter">
+            <el-select class="item_width_1"
+                       v-model="formData.serviceMatter"
+                       placeholder="请选择"
+                       clearable>
+              <el-option v-for="item in serviceList"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="分类"
+                        prop="type">
+            <el-select class="item_width_1"
+                       v-model="formData.type"
+                       placeholder="请选择"
+                       clearable>
+              <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="contact">
+            <el-input v-model="formData.contact"
+                      class="item_width_1"
+                      size="small"
+                      clearable
+                      placeholder="请输入内容">
+            </el-input>
+
+          </el-form-item>
+
+          <el-form-item label="联系电话"
+                        prop="contactMobile">
+            <el-input v-model="formData.contactMobile"
+                      class="item_width_1"
+                      size="small"
+                      clearable
+                      placeholder="请输入内容">
+            </el-input>
+
+          </el-form-item>
+
+          <el-button style="margin-left:10px"
+                     type="primary"
+                     size="small"
+                     @click="handleSearch">查询</el-button>
+          <el-button style="margin-left:10px"
+                     type="yellow"
+                     size="small"
+                     @click="resetSearch">重置</el-button>
+        </div>
+      </el-form>
+    </div>
+    <div class="div_table">
+      <div class="div_btn">
+        <el-button style="float:left"
+                   type="green"
+                   size="small"
+                   @click="handleAdd">新增</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"
+                     type="red">导入</el-button>
+
+          <el-button style="float:left"
+                     type="yellow"
+                     size="small"
+                     @click="handleExport">导出</el-button>
+
+        </el-upload>
+
+      </div>
+
+      <el-table class="table"
+                :data="tableData"
+                border
+                :height="tableHeight"
+                v-loading="tableLoading"
+                :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="gridName"
+                         header-align="center"
+                         align="center"
+                         label="所属网格"
+                         width="180">
+        </el-table-column>
+        <el-table-column prop="unitName"
+                         header-align="center"
+                         align="center"
+                         label="单位名称"
+                         width="180">
+        </el-table-column>
+        <el-table-column prop="type"
+                         header-align="center"
+                         align="center"
+                         label="分类"
+                         width="180">
+        </el-table-column>
+        <el-table-column prop="serviceMatter"
+                         header-align="center"
+                         align="center"
+                         label="服务事项"
+                         width="180">
+        </el-table-column>
+        <el-table-column prop="contact"
+                         header-align="center"
+                         align="center"
+                         label="联系人"
+                         width="100">
+        </el-table-column>
+        <el-table-column prop="contactMobile"
+                         header-align="center"
+                         align="center"
+                         label="联系电话"
+                         width="110">
+        </el-table-column>
+        <el-table-column prop="memberCount"
+                         header-align="center"
+                         align="center"
+                         label="在职党员数"
+                         width="150">
+        </el-table-column>
+        <el-table-column prop="satisfaction"
+                         header-align="center"
+                         align="center"
+                         label="群众满意度"
+                         width="150">
+        </el-table-column>
+        <el-table-column prop="remark"
+                         header-align="center"
+                         align="center"
+                         label="备注"
+                         :show-overflow-tooltip="true"
+                         width="150">
+        </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:#1C6AFD;text-decoration: underline;"
+                       size="small"
+                       @click="handleDetail(scope.row)">查看</el-button>
+            <el-button type="text"
+                       style="color:#00A7A9;text-decoration: underline;"
+                       size="small"
+                       @click="handleEdit(scope.row)">修改</el-button>
+
+            <el-button type="text"
+                       style="color:#D51010;text-decoration: underline;"
+                       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="[10, 20, 50]"
+                       :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"
+               @closed="diaClose">
+      <units-form ref="ref_form"
+                  :gridList="gridList"
+                  :serviceList="serviceList"
+                  :typeList="typeList"
+                  @dialogCancle="addFormCancle"
+                  @dialogOk="addFormOk"></units-form>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+
+import unitsForm from './unitsForm'
+
+import { requestPost } from "@/js/dai/request";
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      loading: false,
+      total: 0,
+      pageSize: 10,
+      pageNo: 0,
+      tableLoading: false,
+      agencyId: '',
+      gridList: [],//所属网格list
+      unitList: [],//单位list
+      serviceList: [
+        {
+          id: "1",
+          name: '积极配合社区安全巡查员进行场所消防、安全等方面的检查。'
+        },
+        {
+          id: "2",
+          name: '积极配合'
+        },
+        {
+          id: "3",
+          name: '积极配合社区安全巡查员进行'
+        },
+        {
+          id: "4",
+          name: '积极配合社区安全巡查员进行场所消防、安全等方面的检查。并具备安全意识及设备设施'
+        },
+      ],//服务list
+      typeList: [],//分类list
+
+      unitId: '',
+      formData: {
+        gridId: '',
+        unitName: '',
+        serviceMatter: '',
+        type: '',
+        contact: '',
+        contactMobile: ''
+      },
+
+      tableData: [],
+
+      //form相关
+      formShow: false,
+      formTitle: '新增单位',
+
+      files: "",
+      fileName: "",
+      uploadUlr: window.SITE_CONFIG['apiURL'] + '/gov/org/neighborhood/import'
+
+    }
+  },
+  components: {
+    unitsForm
+  },
+  async created () {
+
+  },
+  async mounted () {
+    //获取服务事项
+    await this.loadService()
+
+    //获取分类
+    await this.loadType()
+
+    const { user } = this.$store.state
+    this.agencyId = user.agencyId
+    //获取网格下拉框数据
+    await this.loadGrid()
+
+    await this.loadTable()
+  },
+
+  methods: {
+    handleSearch () {
+      this.loadTable()
+    },
+
+    async loadGrid () {
+      const url = "/gov/org/customergrid/gridoption"
+
+      let params = {
+        agencyId: this.agencyId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.gridList = data
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+
+    //获取服务事项下拉框
+    async loadService () {
+      // const url = "/heart/icresidemanddict/subcodelist"
+      const url = "http://yapi.elinkservice.cn/mock/245/heart/icresidemanddict/subcodelist"
+
+      let params = {
+        parentCategoryCode: '1010'
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.serviceList = data
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+    //获取分类
+    async loadType () {
+      const url = "/sys/dict/data/dictlist"
+
+      let params = {
+        dictType: 'party_unit_type'
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.typeList = data
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+
+    async loadTable () {
+      this.tableLoading = true
+
+      // const url = "/heart/icpartyunit/list"
+      const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/list"
+      let params = {
+        pageSize: this.pageSize,
+        pageNo: this.pageNo,
+        agencyId: this.agencyId,
+        ...this.formData
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.total = data.total
+        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.id)
+      })
+    },
+
+    handleAdd () {
+      this.formTitle = '新增'
+      this.formShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_form.initForm('add', null)
+      })
+    },
+
+    handleEdit (row) {
+      this.formTitle = '修改'
+      this.formShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_form.initForm('edit', row.id)
+      })
+    },
+
+    addFormCancle () {
+      this.formShow = false
+    },
+    addFormOk () {
+      this.formShow = false
+      this.loadTable()
+
+    },
+
+    async handleDelete (row) {
+
+      this.$confirm("确认删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.deleteUnit(row)
+        })
+        .catch(err => {
+          if (err == "cancel") {
+
+          }
+
+        });
+    },
+
+    async deleteUnit (row) {
+      // const url = "/heart/icpartyunit/delete"
+      const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/delete"
+
+      let params = {
+        id: row.id
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.$message({
+          type: "success",
+          message: "删除成功"
+        });
+
+        this.loadTable()
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    //重置搜索条件
+    resetSearch () {
+      this.formData = {
+        gridId: '',
+        unitName: '',
+        serviceMatter: '',
+        type: '',
+        contact: '',
+        contactMobile: ''
+      }
+    },
+
+    //导出表格
+    async handleExport () {
+      let title = '联建单位列表'
+
+
+      const url = "/partyunit/export"
+      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, 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);
+      }
+
+    },
+
+    // 上传文件之前的钩子
+    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 () {
+      this.loading = true
+
+      if (this.fileName == "") {
+        this.$message.warning('请选择要上传的文件！')
+        return false
+      }
+
+      //清空上传列表
+      this.$refs['upload'].clearFiles()
+
+      var url = '/partyunit/import'
+      let fileFormData = new FormData();
+      fileFormData.append('file', this.files);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+
+      const { data, code, msg } = await requestPost(url, fileFormData)
+      if (code === 0) {
+        this.$message({
+          type: "success",
+          message: "导入成功"
+        });
+
+        this.loadTable()
+      } else {
+        this.$message.error(msg)
+      }
+
+
+    },
+
+    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()
+      }
+    }
+  },
+  computed: {
+    tableHeight () {
+
+      return (this.clientHeight - 460)
+
+    },
+    rowHeight () {
+      return (this.clientHeight - 200) + 'px'
+    },
+    ...mapGetters(['clientHeight'])
+  },
+  watch: {
+
+  },
+  props: {
+
+  }
+}
+</script>
+<style lang="scss" scoped >
+@import "@/assets/scss/buttonstyle.scss";
+
+.div_main {
+  width: 100%;
+}
+
+.div_search {
+  background: #ffffff;
+  border-radius: 4px;
+  padding: 35px 20px;
+  box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+}
+
+.item_width_1 {
+  width: 260px;
+}
+
+.div_table {
+  background: #ffffff;
+  box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+  border-radius: 4px;
+  margin-top: 20px;
+  padding: 23px 30px 10px;
+
+  .table {
+    margin-top: 20px;
+  }
+}
+
+.div_btn {
+}
+
+.el-row {
+  /* margin-bottom: 20px; */
+  display: flex;
+  flex-wrap: wrap;
+  margin-top: 10px;
+  margin-right: 50px;
+}
+</style>
diff --git a/src/views/modules/communityService/ninePlaces/inspect/unitsForm.vue b/src/views/modules/communityService/ninePlaces/inspect/unitsForm.vue
new file mode 100644
index 000000000..383174ba6
--- /dev/null
+++ b/src/views/modules/communityService/ninePlaces/inspect/unitsForm.vue
@@ -0,0 +1,553 @@
+<template>
+  <div>
+    <div>
+      <div>
+        <el-form ref="ref_form"
+                 :inline="true"
+                 :model="formData"
+                 :rules="dataRule"
+                 :disabled="formType === 'detail'"
+                 class="form">
+
+          <el-form-item label="所属网格"
+                        prop="gridId"
+                        label-width="150px"
+                        style="display: block">
+            <el-select class="item_width_1"
+                       v-model="formData.gridId"
+                       placeholder="全部"
+                       clearable>
+              <el-option v-for="item in gridList"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="单位名称"
+                        prop="unitName"
+                        label-width="150px"
+                        style="display: block">
+            <el-input class="item_width_1"
+                      maxlength="50"
+                      show-word-limit
+                      placeholder="请输入单位名称"
+                      v-model="formData.unitName">
+            </el-input>
+          </el-form-item>
+          <el-form-item label="分类"
+                        prop="type"
+                        label-width="150px"
+                        style="display: block">
+            <el-select class="item_width_1"
+                       v-model="formData.type"
+                       placeholder="请选择"
+                       filterable
+                       clearable>
+              <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="serviceMatter"
+                        label-width="150px"
+                        style="display: block">
+            <el-checkbox-group class="item_width_1"
+                               style="display:flex;flex-wrap:wrap"
+                               v-model="formData.serviceMatter">
+              <el-checkbox v-for="item in serviceList"
+                           :key="item.value"
+                           :label="item.value">{{item.label}}</el-checkbox>
+
+            </el-checkbox-group>
+
+          </el-form-item>
+          <el-form-item label="联系人"
+                        prop="contact"
+                        label-width="150px"
+                        style="display: block">
+            <el-input class="item_width_1"
+                      placeholder="请输入联系人姓名"
+                      v-model="formData.contact">
+            </el-input>
+          </el-form-item>
+          <el-form-item label="联系电话"
+                        prop="contactMobile"
+                        label-width="150px"
+                        style="display: block">
+            <el-input class="item_width_1"
+                      placeholder="请输入联系人电话"
+                      v-model="formData.contactMobile">
+            </el-input>
+          </el-form-item>
+          <el-form-item label="在职党员"
+                        style="display: block"
+                        prop="memberCount"
+                        label-width="150px">
+            <el-input-number class="item_width_1"
+                             v-model="formData.memberCount"
+                             :min="1"
+                             label="单元数"></el-input-number>
+          </el-form-item>
+          <el-form-item label="备注"
+                        prop="remark"
+                        label-width="150px"
+                        style="display: block">
+            <el-input class="item_width_1"
+                      type="textarea"
+                      maxlength="500"
+                      show-word-limit
+                      :rows="3"
+                      placeholder="请输入备注，不超过500字"
+                      v-model="formData.remark"></el-input>
+          </el-form-item>
+          <el-form-item label="位置坐标"
+                        prop="longitude"
+                        label-width="150px"
+                        style="display: block">
+            <div style="width:500px">
+
+              <div class="div_map">
+                <div id="app">
+
+                </div>
+                <div class="div_searchmap">
+                  <el-input class="item_width_4"
+                            maxlength="50"
+                            size="mini"
+                            placeholder="请输入关键字"
+                            v-model="keyWords">
+                  </el-input>
+                  <el-button style="margin-left: 10px"
+                             type="primary"
+                             size="mini"
+                             @click="handleSearchMap">查询</el-button>
+                </div>
+              </div>
+
+              <div style="margin-top: 10px">
+                <span>经度</span>
+                <el-input class="item_width_3"
+                          maxlength="50"
+                          placeholder="请输入经度"
+                          v-model="formData.longitude">
+                </el-input>
+                <span style="margin-left: 20px">纬度</span>
+                <el-input class="item_width_3"
+                          maxlength="50"
+                          placeholder="请输入纬度"
+                          v-model="formData.latitude">
+                </el-input>
+              </div>
+            </div>
+          </el-form-item>
+
+          <el-form-item label="地理位置"
+                        prop="address"
+                        label-width="150px"
+                        style="display: block">
+
+            <el-input class="item_width_1"
+                      v-model="formData.address">
+            </el-input>
+
+          </el-form-item>
+        </el-form>
+      </div>
+
+    </div>
+    <div class="div_btn">
+      <el-button @click="handleCancle">取 消</el-button>
+      <el-button v-if="formType != 'detail'"
+                 type="primary"
+                 :disabled="btnDisable"
+                 @click="handleComfirm">确 定</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } from '@/js/dai/request'
+
+
+
+var map
+var search
+var markers
+var infoWindowList
+var geocoder // 新建一个正逆地址解析类
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+
+      btnDisable: false,
+
+      unitId: '',
+      keyWords: '',
+      formData: {
+        gridId: '',
+        unitName: '',
+        serviceMatter: [],
+        type: '',
+        contact: '',
+        contactMobile: '',
+        memberCount: 0,
+        remark: '', //备注【最大500字】
+        address: '', //详细地址
+        longitude: 36.0722275, //经度
+        latitude: 120.38945519 //纬度
+      },
+
+    }
+  },
+  components: {},
+  mounted () {
+    this.initMap()
+  },
+
+  methods: {
+
+    async initForm (type, unitId) {
+      this.$refs.ref_form.resetFields();
+
+      // debugger
+      // map.setCenter(new TMap.LatLng(agencyObj.latitude, agencyObj.longitude))
+
+      this.formType = type
+      if (unitId) {
+        this.unitId = unitId
+        this.formData.id = unitId
+        await this.loadFormData()
+      }
+
+    },
+
+    //加载组织
+    async loadFormData () {
+      // const url = '/heart/icpartyunit/detail'
+      const url = 'http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/detail'
+      let params = {
+        id: this.unitId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.formData = data
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+
+
+    async handleComfirm () {
+
+      this.btnDisable = true
+      setTimeout(() => {
+        this.btnDisable = false
+      }, 10000)
+      this.$refs['ref_form'].validate((valid, messageObj) => {
+        if (!valid) {
+          app.util.validateRule(messageObj)
+          this.btnDisable = false
+        } else {
+          this.addUnit()
+        }
+
+      })
+
+
+    },
+    async addUnit () {
+      // const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+      // if (regPhone.test(this.formData.contactMobile) === false) {
+      //   this.btnDisable = false
+      //   this.$message({
+      //     type: 'warning',
+      //     message: '请输入正确的手机号码'
+      //   })
+      //   return false;
+      // }
+
+      // let url = '/heart/icpartyunit/save'
+      let url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/save"
+      // if (this.formType === 'edit') {
+      //  this.formData.id = this.unitId
+      // } 
+
+      const { data, code, msg } = await requestPost(url, this.formData)
+
+      if (code === 0) {
+        this.$message({
+          type: 'success',
+          message: '新增联建单位成功'
+        })
+        this.resetData()
+        this.$emit('dialogOk')
+        this.btnDisable = false
+      } else {
+        this.btnDisable = false
+        this.$message.error(msg)
+      }
+
+    },
+
+    handleCancle () {
+
+      this.resetData()
+      this.$emit('dialogCancle')
+
+    },
+
+    // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
+    initMap () {
+      // 定义地图中心点坐标
+      var center = new window.TMap.LatLng(36.0722275, 120.38945519)
+      // 定义map变量，调用 TMap.Map() 构造函数创建地图
+      map = new window.TMap.Map(document.getElementById('app'), {
+        center: center, // 设置地图中心点坐标
+        zoom: 17.2, // 设置地图缩放级别
+        pitch: 43.5, // 设置俯仰角
+        rotation: 45 // 设置地图旋转角度
+      })
+
+      search = new window.TMap.service.Search({ pageSize: 10 })
+      // 新建一个地点搜索类
+      markers = new TMap.MultiMarker({
+        map: map,
+        geometries: []
+      })
+      infoWindowList = Array(10)
+
+      geocoder = new TMap.service.Geocoder(); // 新建一个正逆地址解析类
+
+      // 监听地图平移结束
+      map.on('panend', () => {
+        this.handleMoveCenter()
+      })
+      this.handleMoveCenter()
+      this.convert()
+    },
+
+    setMarker (lat, lng) {
+      markers.setGeometries([])
+      markers.add([
+        {
+          id: '4',
+          styleId: 'marker',
+          position: new TMap.LatLng(lat, lng),
+          properties: {
+            title: 'marker4'
+          }
+        }
+      ])
+    },
+
+    handleSearchMap () {
+      infoWindowList.forEach((infoWindow) => {
+        infoWindow.close()
+      })
+      infoWindowList.length = 0
+      markers.setGeometries([])
+      // 在地图显示范围内以给定的关键字搜索地点
+      search
+        .searchRectangle({
+          keyword: this.keyWords,
+          bounds: map.getBounds()
+        })
+        .then((result) => {
+          let { data } = result
+          if (Array.isArray(data) && data.length > 0) {
+            const {
+              location: { lat, lng }
+            } = data[0]
+
+
+            map.setCenter(new TMap.LatLng(lat, lng))
+            this.setMarker(lat, lng)
+            this.formData.latitude = lat
+            this.formData.longitude = lng
+            this.convert()
+          } else {
+            this.$message.error('未检索到相关位置坐标')
+          }
+        })
+    },
+
+    handleMoveCenter () {
+      //修改地图中心点
+      const center = map.getCenter()
+      const lat = center.getLat()
+      const lng = center.getLng()
+      this.formData.latitude = lat
+      this.formData.longitude = lng
+      this.setMarker(lat, lng)
+      this.convert(lat, lng)
+    },
+
+    convert (lat, lng) {
+      markers.setGeometries([]);
+      // var input = document.getElementById('location').value.split(',');
+      let location
+      if (lat && lng) {
+        location = new TMap.LatLng(lat, lng);
+      } else {
+        location = new TMap.LatLng(this.formData.latitude, this.formData.longitude);
+      }
+
+      // map.setCenter(location);
+      markers.updateGeometries([
+        {
+          id: 'main', // 点标注数据数组
+          position: location,
+        },
+      ]);
+      geocoder
+        .getAddress({ location: location }) // 将给定的坐标位置转换为地址
+        .then((result) => {
+          this.formData.address = result.result.address
+          // 显示搜索到的地址
+        });
+    },
+
+
+    resetData () {
+      this.unitId = ''
+      this.keyWords = ''
+      this.formData = {
+        gridId: '',
+        unitName: '',
+        serviceMatter: [],
+        type: '',
+        contact: '',
+        contactMobile: '',
+        memberCount: 0,
+        remark: '', //备注【最大500字】
+        address: '', //详细地址
+        longitude: '', //经度
+        latitude: '' //纬度
+      }
+    },
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        gridId: [
+          { required: true, message: '所属网格不能为空', trigger: 'blur' }
+        ],
+        unitName: [
+          { required: true, message: '单位名称不能为空', trigger: 'blur' },
+        ],
+        type: [
+          { required: true, message: '分类不能为空', trigger: 'blur' }
+        ],
+
+        contact: [
+          { required: true, message: '联系人不能为空', trigger: 'blur' }
+        ],
+        contactMobile: [
+          { required: true, message: '联系电话不能为空', trigger: 'blur' }
+        ],
+        memberCount: [
+          { required: true, message: '在职党员数不能为空', trigger: 'blur' }
+        ],
+        address: [
+          { required: true, message: '详细地址不能为空', trigger: 'blur' }
+        ],
+        longitude: [
+          { required: true, message: '坐标不能为空', trigger: 'blur' }
+        ]
+      }
+    },
+
+  },
+  props: {
+
+    gridList: {
+      type: Array,
+      default: []
+    },
+    typeList: {
+      type: Array,
+      default: []
+    },
+    serviceList: {
+      type: Array,
+      default: []
+    },
+  }
+}
+</script>
+<style scoped>
+.item_width_1 {
+  width: 500px;
+}
+.item_width_2 {
+  width: 400px;
+}
+.item_width_3 {
+  margin-left: 10px;
+  width: 200px;
+}
+.item_width_4 {
+  width: 200px;
+}
+
+.div_map {
+  position: relative;
+}
+.div_searchmap {
+  z-index: 5000;
+  position: absolute;
+  top: 5px;
+  left: 5px;
+}
+
+.div_btn {
+  display: flex;
+  justify-content: flex-end;
+}
+.el-tabs {
+  margin: 0 20px;
+}
+.el-upload__tip {
+  color: rgb(155, 155, 155);
+  margin: 0;
+}
+.form {
+  margin-top: 30px;
+}
+</style>
+
+<style lang=scss>
+.el-dialog__body {
+  padding: 0 10px 20px !important;
+}
+</style>
diff --git a/src/views/modules/communityService/ninePlaces/places/places.vue b/src/views/modules/communityService/ninePlaces/places/places.vue
new file mode 100644
index 000000000..0d0dd69fc
--- /dev/null
+++ b/src/views/modules/communityService/ninePlaces/places/places.vue
@@ -0,0 +1,515 @@
+<template>
+  <div class="div_main">
+    <div class="div_search">
+      <el-form :inline="true"
+               :model="formData"
+               ref="ref_searchform"
+               :label-width="'100px'">
+        <div>
+
+          <el-form-item label="场所名称"
+                        prop="placeOrgName">
+            <el-input v-model="formData.placeOrgName"
+                      class="item_width_1"
+                      size="small"
+                      clearable
+                      placeholder="请输入九小场所名称">
+            </el-input>
+
+          </el-form-item>
+
+          <el-form-item label="联系电话"
+                        prop="mobile">
+            <el-input v-model="formData.mobile"
+                      class="item_width_1"
+                      size="small"
+                      clearable
+                      placeholder="请输入电话">
+            </el-input>
+
+          </el-form-item>
+
+          <el-form-item label="场所区域"
+                        prop="gridId">
+            <el-select class="item_width_1"
+                       v-model="formData.gridId"
+                       placeholder="全部"
+                       clearable>
+              <el-option v-for="item in gridList"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+
+          </el-form-item>
+
+        </div>
+        <div>
+          <el-form-item label="规模"
+                        prop="scale">
+            <el-select class="item_width_1"
+                       v-model="formData.scale"
+                       placeholder="请选择"
+                       clearable>
+              <el-option v-for="item in scaleList"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+
+          </el-form-item>
+          <el-form-item label="场所类型"
+                        prop="ninePlacsVal">
+            <el-select class="item_width_1"
+                       v-model="formData.ninePlacsVal"
+                       placeholder="请选择"
+                       clearable>
+              <el-option v-for="item in placeTypeList"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+
+          </el-form-item>
+
+          <el-button style="margin-left:10px"
+                     type="primary"
+                     size="small"
+                     @click="handleSearch">查询</el-button>
+          <el-button style="margin-left:10px"
+                     type="yellow"
+                     size="small"
+                     @click="resetSearch">重置</el-button>
+        </div>
+      </el-form>
+    </div>
+    <div class="div_table">
+      <el-button type="green"
+                 size="small"
+                 @click="handleAdd">新增</el-button>
+
+      <el-table class="table"
+                :data="tableData"
+                border
+                :height="tableHeight"
+                v-loading="tableLoading"
+                :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="placeOrgName"
+                         header-align="center"
+                         align="center"
+                         label="场所名称"
+                         min-width="280">
+        </el-table-column>
+        <el-table-column prop="address"
+                         header-align="center"
+                         align="center"
+                         label="场所地址"
+                         min-width="280">
+        </el-table-column>
+        <el-table-column prop="ninePlaceName"
+                         header-align="center"
+                         align="center"
+                         label="场所类型"
+                         min-width="180">
+        </el-table-column>
+        <el-table-column prop="scale"
+                         header-align="center"
+                         align="center"
+                         label="规模"
+                         min-width="180">
+        </el-table-column>
+        <el-table-column prop="personInCharge"
+                         header-align="center"
+                         align="center"
+                         label="负责人"
+                         min-width="100">
+        </el-table-column>
+        <el-table-column prop="mobile"
+                         header-align="center"
+                         align="center"
+                         label="联系电话"
+                         min-width="110">
+        </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:#00A7A9;text-decoration: underline;"
+                       size="small"
+                       @click="handleEdit(scope.row)">修改</el-button>
+
+            <el-button type="text"
+                       style="color:#D51010;text-decoration: underline;"
+                       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"
+               @closed="diaClose">
+      <places-form ref="ref_form"
+                   :gridList="gridList"
+                   :scaleList="scaleList"
+                   :placeTypeList="placeTypeList"
+                   @dialogCancle="addFormCancle"
+                   @dialogOk="addFormOk"></places-form>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+
+import placesForm from './placesForm'
+
+import { requestPost } from "@/js/dai/request";
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      loading: false,
+      total: 0,
+      pageSize: 10,
+      pageNo: 0,
+      tableLoading: false,
+
+      agencyId: '',
+      gridList: [],//所属网格list--场所区域
+      scaleList: [],//规模list
+      placeTypeList: [],//场所类型list
+
+      formData: {
+        placeOrgName: '',//场所名称	
+        mobile: '',//联系电话	
+        scale: '',//场所规模【 0:10人以下 1:10-20人 2:21-40人 3:41-100人 4:100人以上】	
+        gridId: '',//场所区域【网格Id】	
+        ninePlacsVal: '',//场所类型【九小场所Value值】	
+        isPage: true,//是否分页(是:true 否:false) 有这个参数是给新增巡查记录时用的，默认是	
+      },
+
+      tableData: [],
+
+      //form相关
+      formShow: false,
+      formTitle: '新增场所',
+
+    }
+  },
+  components: {
+    placesForm
+  },
+  async created () {
+
+  },
+  async mounted () {
+    //获取规格
+    await this.loadScale()
+
+    //获取场所类型
+    await this.loadPlaceType()
+
+    const { user } = this.$store.state
+    this.agencyId = user.agencyId
+    //获取网格下拉框数据
+    await this.loadGrid()
+
+    await this.loadTable()
+  },
+
+  methods: {
+    handleSearch () {
+      this.loadTable()
+    },
+
+    async loadGrid () {
+      const url = "/gov/org/customergrid/gridoption"
+
+      let params = {
+        agencyId: this.agencyId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.gridList = data
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+
+    //获取场所类型
+    async loadScale () {
+      const url = "/sys/dict/data/dictlist"
+
+      let params = {
+        dictType: 'scale'
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.scaleList = data
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+    //获取场所类型
+    async loadPlaceType () {
+      const url = "/sys/dict/data/dictlist"
+
+      let params = {
+        dictType: 'nine_small_places'
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.placeTypeList = data
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+
+    async loadTable () {
+      this.tableLoading = true
+
+      // const url = "/gov/org/placeorg/getlist"
+      const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/getlist"
+      let params = {
+        pageSize: this.pageSize,
+        pageNo: this.pageNo,
+        ...this.formData
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.total = data.total
+        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.id)
+      })
+    },
+
+    handleAdd () {
+      this.formTitle = '新增'
+      this.formShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_form.initForm('add', null)
+      })
+    },
+
+    handleEdit (row) {
+      this.formTitle = '修改'
+      this.formShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_form.initForm('edit', row.placeOrgId)
+      })
+    },
+
+    addFormCancle () {
+      this.formShow = false
+    },
+    addFormOk () {
+      this.formShow = false
+      this.loadTable()
+
+    },
+
+    async handleDelete (row) {
+
+      this.$confirm("确认删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.deletePlace(row)
+        })
+        .catch(err => {
+          if (err == "cancel") {
+
+          }
+
+        });
+    },
+
+    async deletePlace (row) {
+      // const url = "/gov/org/placeorg/del"
+      const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/del"
+
+      let params = {
+        placeOrgId: row.placeOrgId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.$message({
+          type: "success",
+          message: "删除成功"
+        });
+
+        this.loadTable()
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    //重置搜索条件
+    resetSearch () {
+      this.formData = {
+        placeOrgName: '',//场所名称	
+        mobile: '',//联系电话	
+        scale: '',//场所规模【 0:10人以下 1:10-20人 2:21-40人 3:41-100人 4:100人以上】	
+        gridId: '',//场所区域【网格Id】	
+        ninePlacsVal: '',//场所类型【九小场所Value值】	
+        isPage: true,//是否分页(是:true 否:false) 有这个参数是给新增巡查记录时用的，默认是	
+      }
+    },
+
+
+    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()
+      }
+    }
+  },
+  computed: {
+    tableHeight () {
+
+      return (this.clientHeight - 460)
+
+    },
+    rowHeight () {
+      return (this.clientHeight - 200) + 'px'
+    },
+    ...mapGetters(['clientHeight'])
+  },
+  watch: {
+
+  },
+  props: {
+
+  }
+}
+</script>
+<style lang="scss" scoped >
+@import "@/assets/scss/buttonstyle.scss";
+
+.div_main {
+  width: 100%;
+}
+
+.div_search {
+  background: #ffffff;
+  border-radius: 4px;
+  padding: 35px 20px;
+  box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+}
+
+.item_width_1 {
+  width: 260px;
+}
+
+.div_table {
+  background: #ffffff;
+  box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+  border-radius: 4px;
+  margin-top: 20px;
+  padding: 23px 30px 10px;
+
+  .table {
+    margin-top: 20px;
+  }
+}
+
+.div_btn {
+}
+
+.el-row {
+  /* margin-bottom: 20px; */
+  display: flex;
+  flex-wrap: wrap;
+  margin-top: 10px;
+  margin-right: 50px;
+}
+</style>
diff --git a/src/views/modules/communityService/ninePlaces/places/placesForm.vue b/src/views/modules/communityService/ninePlaces/places/placesForm.vue
new file mode 100644
index 000000000..8b3fbe1c1
--- /dev/null
+++ b/src/views/modules/communityService/ninePlaces/places/placesForm.vue
@@ -0,0 +1,363 @@
+<template>
+  <div>
+    <div>
+      <div>
+        <el-form ref="ref_form"
+                 :inline="true"
+                 :model="formData"
+                 :rules="dataRule"
+                 :disabled="formType === 'detail'"
+                 class="form">
+
+          <el-form-item label="场所类型"
+                        label-width="150px"
+                        prop="ninePlacsVal">
+            <el-select class="item_width_1"
+                       v-model="formData.ninePlacsVal"
+                       placeholder="请选择"
+                       clearable>
+              <el-option v-for="item in placeTypeList"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+
+          </el-form-item>
+
+          <el-form-item label="场所区域"
+                        prop="gridId"
+                        label-width="150px"
+                        style="display: block">
+            <el-select class="item_width_1"
+                       v-model="formData.gridId"
+                       placeholder="全部"
+                       clearable>
+              <el-option v-for="item in gridList"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="场所名称"
+                        label-width="150px"
+                        prop="placeOrgName">
+            <el-input v-model="formData.placeOrgName"
+                      class="item_width_1"
+                      clearable
+                      placeholder="请输入九小场所名称">
+            </el-input>
+
+          </el-form-item>
+          <el-form-item label="场所地址"
+                        label-width="150px"
+                        prop="address">
+            <el-input v-model="formData.address"
+                      class="item_width_1"
+                      clearable
+                      placeholder="请输入场所地址">
+            </el-input>
+
+          </el-form-item>
+
+          <el-form-item label="规模"
+                        label-width="150px"
+                        prop="scale">
+            <el-select class="item_width_1"
+                       v-model="formData.scale"
+                       placeholder="请选择"
+                       clearable>
+              <el-option v-for="item in scaleList"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+
+          </el-form-item>
+          <el-form-item label="负责人"
+                        label-width="150px"
+                        prop="personInCharge">
+            <el-input v-model="formData.personInCharge"
+                      class="item_width_1"
+                      clearable
+                      placeholder="请输入负责人姓名">
+            </el-input>
+
+          </el-form-item>
+          <el-form-item label="联系电话"
+                        label-width="150px"
+                        prop="mobile">
+            <el-input v-model="formData.mobile"
+                      class="item_width_1"
+                      type='number'
+                      clearable
+                      placeholder="请输入电话">
+            </el-input>
+
+          </el-form-item>
+        </el-form>
+      </div>
+
+    </div>
+    <div class="div_btn">
+      <el-button @click="handleCancle">取 消</el-button>
+      <el-button v-if="formType != 'detail'"
+                 type="primary"
+                 :disabled="btnDisable"
+                 @click="handleComfirm">确 定</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } from '@/js/dai/request'
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+
+      btnDisable: false,
+
+      placeOrgId: '',
+      formData: {
+        gridId: '',
+        ninePlacsVal: '',
+        placeOrgName: '',
+        address: '',
+        scale: '',
+        personInCharge: '',
+        mobile: ''
+      },
+
+    }
+  },
+  components: {},
+  mounted () {
+
+  },
+
+  methods: {
+
+    async initForm (type, placeOrgId) {
+      this.$refs.ref_form.resetFields();
+
+      this.formType = type
+      if (placeOrgId) {
+        this.placeOrgId = placeOrgId
+        this.formData.placeOrgId = placeOrgId
+        await this.loadFormData()
+      }
+
+    },
+
+    //加载组织
+    async loadFormData () {
+      // const url = '/gov/org/placeorg/detail'
+      const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/detail'
+      let params = {
+        placeOrgId: this.placeOrgId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.formData = data
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+
+
+    async handleComfirm () {
+
+      this.btnDisable = true
+      setTimeout(() => {
+        this.btnDisable = false
+      }, 10000)
+      this.$refs['ref_form'].validate((valid, messageObj) => {
+        if (!valid) {
+          app.util.validateRule(messageObj)
+          this.btnDisable = false
+        } else {
+          this.addPlace()
+        }
+
+      })
+
+
+    },
+    async addPlace () {
+      // const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+      // if (regPhone.test(this.formData.mobile) === false) {
+      //   this.btnDisable = false
+      //   this.$message({
+      //     type: 'warning',
+      //     message: '请输入正确的手机号码'
+      //   })
+      //   return false;
+      // }
+
+      let url = ''
+
+      if (this.formType === 'edit') {
+        // url = '/gov/org/placeorg/edit'
+        url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/edit'
+
+      } else {
+        // url = "/gov/org/placeorg/add"
+        url = "http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/add"
+      }
+
+      const { data, code, msg } = await requestPost(url, this.formData)
+
+      if (code === 0) {
+        this.$message({
+          type: 'success',
+          message: '操作成功'
+        })
+        this.resetData()
+        this.$emit('dialogOk')
+        this.btnDisable = false
+      } else {
+        this.btnDisable = false
+        this.$message.error(msg)
+      }
+
+    },
+
+    handleCancle () {
+
+      this.resetData()
+      this.$emit('dialogCancle')
+
+    },
+
+    resetData () {
+      this.placeOrgId = ''
+      this.formData = {
+        gridId: '',
+        ninePlacsVal: '',
+        placeOrgName: '',
+        address: '',
+        scale: '',
+        personInCharge: '',
+        mobile: ''
+      }
+    },
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        gridId: [
+          { required: true, message: '所属网格不能为空', trigger: 'blur' }
+        ],
+        ninePlacsVal: [
+          { required: true, message: '场所类型不能为空', trigger: 'blur' },
+        ],
+        placeOrgName: [
+          { required: true, message: '场所名称不能为空', trigger: 'blur' }
+        ],
+
+        address: [
+          { required: true, message: '场所地址不能为空', trigger: 'blur' }
+        ],
+        scale: [
+          { required: true, message: '场所规模不能为空', trigger: 'blur' }
+        ],
+        personInCharge: [
+          { required: true, message: '负责人不能为空', trigger: 'blur' }
+        ],
+        mobile: [
+          { required: true, message: '联系电话不能为空', trigger: 'blur' }
+        ]
+      }
+    },
+
+  },
+  props: {
+
+    gridList: {
+      type: Array,
+      default: []
+    },
+    scaleList: {
+      type: Array,
+      default: []
+    },
+    placeTypeList: {
+      type: Array,
+      default: []
+    },
+  }
+}
+</script>
+<style scoped>
+.item_width_1 {
+  width: 500px;
+}
+.item_width_2 {
+  width: 400px;
+}
+.item_width_3 {
+  margin-left: 10px;
+  width: 200px;
+}
+.item_width_4 {
+  width: 200px;
+}
+
+.div_map {
+  position: relative;
+}
+.div_searchmap {
+  z-index: 5000;
+  position: absolute;
+  top: 5px;
+  left: 5px;
+}
+
+.div_btn {
+  display: flex;
+  justify-content: flex-end;
+}
+.el-tabs {
+  margin: 0 20px;
+}
+.el-upload__tip {
+  color: rgb(155, 155, 155);
+  margin: 0;
+}
+.form {
+  margin-top: 30px;
+}
+</style>
+
+<style lang=scss>
+.el-dialog__body {
+  padding: 0 10px 20px !important;
+}
+</style>
diff --git a/src/views/modules/communityService/ninePlaces/team/team.vue b/src/views/modules/communityService/ninePlaces/team/team.vue
new file mode 100644
index 000000000..615cd8e02
--- /dev/null
+++ b/src/views/modules/communityService/ninePlaces/team/team.vue
@@ -0,0 +1,486 @@
+<template>
+  <div class="div_main">
+    <div class="div_search">
+      <el-form :inline="true"
+               :model="formData"
+               ref="ref_searchform"
+               :label-width="'100px'">
+        <div>
+
+          <el-form-item label="负责人"
+                        prop="personInCharge">
+            <el-input v-model="formData.personInCharge"
+                      class="item_width_1"
+                      size="small"
+                      clearable
+                      placeholder="请输入负责人姓名">
+            </el-input>
+
+          </el-form-item>
+
+          <el-form-item label="联系电话"
+                        prop="mobile">
+            <el-input v-model="formData.mobile"
+                      class="item_width_1"
+                      size="small"
+                      clearable
+                      placeholder="请输入电话">
+            </el-input>
+
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="负责区域"
+                        prop="gridId">
+            <el-select class="item_width_1"
+                       v-model="formData.gridId"
+                       placeholder="全部"
+                       clearable>
+              <el-option v-for="item in gridList"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+
+          </el-form-item>
+
+          <el-form-item label="场所类型"
+                        prop="ninePlacsVal">
+            <el-select class="item_width_1"
+                       v-model="formData.ninePlacsVal"
+                       placeholder="请选择"
+                       clearable>
+              <el-option v-for="item in placeTypeList"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+
+          </el-form-item>
+
+          <el-button style="margin-left:10px"
+                     type="primary"
+                     size="small"
+                     @click="handleSearch">查询</el-button>
+          <el-button style="margin-left:10px"
+                     type="yellow"
+                     size="small"
+                     @click="resetSearch">重置</el-button>
+        </div>
+      </el-form>
+    </div>
+    <div class="div_table">
+      <el-button type="green"
+                 size="small"
+                 @click="handleAdd">新增</el-button>
+
+      <el-table class="table"
+                :data="tableData"
+                border
+                :height="tableHeight"
+                v-loading="tableLoading"
+                :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="placeOrgName"
+                         header-align="center"
+                         align="center"
+                         label="分队名称"
+                         min-width="180">
+        </el-table-column>
+        <el-table-column prop="address"
+                         header-align="center"
+                         align="center"
+                         label="负责人"
+                         min-width="180">
+        </el-table-column>
+        <el-table-column prop="ninePlaceName"
+                         header-align="center"
+                         align="center"
+                         label="联系电话"
+                         min-width="110">
+        </el-table-column>
+        <el-table-column prop="scale"
+                         header-align="center"
+                         align="center"
+                         label="负责区域"
+                         min-width="280">
+        </el-table-column>
+        <el-table-column prop="personInCharge"
+                         header-align="center"
+                         align="center"
+                         label="负责场所类型"
+                         min-width="180">
+        </el-table-column>
+        <el-table-column prop="mobile"
+                         header-align="center"
+                         align="center"
+                         label="监察计划"
+                         min-width="180">
+        </el-table-column>
+        <el-table-column prop="mobile"
+                         header-align="center"
+                         align="center"
+                         label="创建时间"
+                         min-width="120">
+        </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:#1C6AFD;text-decoration: underline;"
+                       size="small"
+                       @click="handleDetail(scope.row)">查看</el-button>
+            <el-button type="text"
+                       style="color:#00A7A9;text-decoration: underline;"
+                       size="small"
+                       @click="handleEdit(scope.row)">修改</el-button>
+
+            <el-button type="text"
+                       style="color:#D51010;text-decoration: underline;"
+                       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"
+               @closed="diaClose">
+      <team-form ref="ref_form"
+                 :gridList="gridList"
+                 :placeTypeList="placeTypeList"
+                 @dialogCancle="addFormCancle"
+                 @dialogOk="addFormOk"></team-form>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+
+import teamForm from './teamForm'
+
+import { requestPost } from "@/js/dai/request";
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      loading: false,
+      total: 0,
+      pageSize: 10,
+      pageNo: 0,
+      tableLoading: false,
+
+      agencyId: '',
+      gridList: [],//所属网格list--场所区域
+      scaleList: [],//规模list
+      placeTypeList: [],//场所类型list
+
+      formData: {
+        personInCharge: '',//负责人		
+        mobile: '',//联系电话	
+        gridId: '',//负责区域【网格Id】	
+        ninePlacsVal: '',//场所类型【九小场所Value值】	
+        isPage: true,//是否分页(是:true 否:false) 有这个参数是给新增巡查记录时用的，默认是	
+      },
+
+      tableData: [],
+
+      //form相关
+      formShow: false,
+      formTitle: '新增巡查人员',
+
+    }
+  },
+  components: {
+    teamForm
+  },
+  async created () {
+
+  },
+  async mounted () {
+    //获取场所类型
+    await this.loadPlaceType()
+
+    const { user } = this.$store.state
+    this.agencyId = user.agencyId
+    //获取网格下拉框数据
+    await this.loadGrid()
+
+    await this.loadTable()
+  },
+
+  methods: {
+    handleSearch () {
+      this.loadTable()
+    },
+
+    async loadGrid () {
+      const url = "/gov/org/customergrid/gridoption"
+
+      let params = {
+        agencyId: this.agencyId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.gridList = data
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+
+    //获取场所类型
+    async loadPlaceType () {
+      const url = "/sys/dict/data/dictlist"
+
+      let params = {
+        dictType: 'nine_small_places'
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.placeTypeList = data
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+
+    async loadTable () {
+      this.tableLoading = true
+
+      // const url = "/gov/org/placeorg/getlist"
+      const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/getlist"
+      let params = {
+        pageSize: this.pageSize,
+        pageNo: this.pageNo,
+        ...this.formData
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.total = data.total
+        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.teamId, this.agencyId)
+      })
+    },
+
+    handleAdd () {
+      this.formTitle = '新增'
+      this.formShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_form.initForm('add', null, this.agencyId)
+      })
+    },
+
+    handleEdit (row) {
+      this.formTitle = '修改'
+      this.formShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_form.initForm('edit', row.teamId, this.agencyId)
+      })
+    },
+
+    addFormCancle () {
+      this.formShow = false
+    },
+    addFormOk () {
+      this.formShow = false
+      this.loadTable()
+
+    },
+
+    async handleDelete (row) {
+
+      this.$confirm("确认删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.deleteTeam(row)
+        })
+        .catch(err => {
+          if (err == "cancel") {
+
+          }
+
+        });
+    },
+
+    async deleteTeam (row) {
+      // const url = "/gov/org/placepatrolteam/del"
+      const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/del"
+
+      let params = {
+        teamId: row.teamId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.$message({
+          type: "success",
+          message: "删除成功"
+        });
+
+        this.loadTable()
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    //重置搜索条件
+    resetSearch () {
+      this.formData = {
+        personInCharge: '',//负责人		
+        mobile: '',//联系电话	
+        gridId: '',//负责区域【网格Id】	
+        ninePlacsVal: '',//场所类型【九小场所Value值】	
+        isPage: true,//是否分页(是:true 否:false) 有这个参数是给新增巡查记录时用的，默认是	
+      }
+    },
+
+
+    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()
+      }
+    }
+  },
+  computed: {
+    tableHeight () {
+
+      return (this.clientHeight - 460)
+
+    },
+    rowHeight () {
+      return (this.clientHeight - 200) + 'px'
+    },
+    ...mapGetters(['clientHeight'])
+  },
+  watch: {
+
+  },
+  props: {
+
+  }
+}
+</script>
+<style lang="scss" scoped >
+@import "@/assets/scss/buttonstyle.scss";
+
+.div_main {
+  width: 100%;
+}
+
+.div_search {
+  background: #ffffff;
+  border-radius: 4px;
+  padding: 35px 20px;
+  box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+}
+
+.item_width_1 {
+  width: 260px;
+}
+
+.div_table {
+  background: #ffffff;
+  box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+  border-radius: 4px;
+  margin-top: 20px;
+  padding: 23px 30px 10px;
+
+  .table {
+    margin-top: 20px;
+  }
+}
+
+.div_btn {
+}
+
+.el-row {
+  /* margin-bottom: 20px; */
+  display: flex;
+  flex-wrap: wrap;
+  margin-top: 10px;
+  margin-right: 50px;
+}
+</style>
diff --git a/src/views/modules/communityService/ninePlaces/team/teamForm.vue b/src/views/modules/communityService/ninePlaces/team/teamForm.vue
new file mode 100644
index 000000000..534afb1fe
--- /dev/null
+++ b/src/views/modules/communityService/ninePlaces/team/teamForm.vue
@@ -0,0 +1,440 @@
+<template>
+  <div>
+    <div>
+      <div>
+        <el-form ref="ref_form"
+                 :inline="true"
+                 :model="formData"
+                 :rules="dataRule"
+                 :disabled="formType === 'detail'"
+                 class="form">
+
+          <el-form-item label="分队名称"
+                        label-width="150px"
+                        prop="teamName">
+            <el-input v-model="formData.teamName"
+                      class="item_width_1"
+                      clearable
+                      placeholder="请输入分队名称">
+            </el-input>
+          </el-form-item>
+
+          <el-form-item label="负责区域"
+                        prop="gridIdArray"
+                        label-width="150px"
+                        style="display: block">
+            <el-select class="item_width_1"
+                       v-model="formData.gridIdArray"
+                       placeholder="全部"
+                       multiple
+                       clearable>
+              <el-option v-for="item in gridList"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="负责场所类型"
+                        prop="ninePlacsArray"
+                        label-width="150px"
+                        style="display: block">
+            <el-checkbox-group class="item_width_1"
+                               style="display:flex;flex-wrap:wrap"
+                               v-model="formData.ninePlacsArray">
+              <el-checkbox v-for="item in placeTypeList"
+                           :key="item.value"
+                           :label="item.value">{{item.label}}</el-checkbox>
+
+            </el-checkbox-group>
+
+          </el-form-item>
+
+          <el-form-item label="巡查计划"
+                        prop="plan"
+                        label-width="150px"
+                        style="display: block">
+            <el-input class="item_width_1"
+                      type="textarea"
+                      maxlength="500"
+                      show-word-limit
+                      :rows="3"
+                      placeholder="请输入备注，不超过500字"
+                      v-model="formData.plan"></el-input>
+          </el-form-item>
+
+          <el-form-item label="创建时间"
+                        style="display: block"
+                        prop="time"
+                        label-width="150px">
+            <el-date-picker v-model="formData.time"
+                            value-format="yyyyMMdd"
+                            type="date"
+                            placeholder="选择日期">
+            </el-date-picker>
+          </el-form-item>
+
+          <el-form-item label="负责人"
+                        label-width="150px"
+                        prop="personInCharge">
+            <el-input v-model="formData.personInCharge"
+                      class="item_width_1"
+                      clearable
+                      placeholder="请输入负责人姓名">
+            </el-input>
+
+          </el-form-item>
+          <el-form-item label="联系电话"
+                        label-width="150px"
+                        prop="mobile">
+            <el-input v-model="formData.mobile"
+                      class="item_width_1"
+                      type='number'
+                      clearable
+                      placeholder="请输入电话">
+            </el-input>
+
+          </el-form-item>
+
+          <el-form-item label="成员"
+                        label-width="150px"
+                        prop="member">
+            <el-button v-if="formType != 'detail'"
+                       type="primary"
+                       :disabled="btnDisable"
+                       size="mini"
+                       icon="el-icon-plus"
+                       @click="handleAddPerson"></el-button>
+            <div v-for="(item,index) in memberList"
+                 :key="index"
+                 class="div_person_list">
+              <span style="font-weight: bold">姓名</span>
+              <el-input v-if="item.isEdit"
+                        v-model="item.name"
+                        class="item_width_3"
+                        clearable
+                        placeholder="请输入电话">
+              </el-input>
+              <span class="item_width_span_3"
+                    v-if="!item.isEdit">{{item.name}}</span>
+
+              <span style="font-weight: bold;margin-left:20px">联系电话</span>
+              <el-input v-if="item.isEdit"
+                        v-model="item.mobile"
+                        class="item_width_4"
+                        clearable
+                        placeholder="请输入电话">
+              </el-input>
+              <span class="item_width_span_4"
+                    v-if="!item.isEdit">{{item.mobile}}</span>
+
+              <el-button style="margin-left:30px"
+                         type="red"
+                         size="mini"
+                         @click="handleDelPerson(index)">删除</el-button>
+            </div>
+
+          </el-form-item>
+        </el-form>
+      </div>
+
+    </div>
+    <div class="div_btn">
+      <el-button @click="handleCancle">取 消</el-button>
+      <el-button v-if="formType != 'detail'"
+                 type="primary"
+                 :disabled="btnDisable"
+                 @click="handleComfirm">确 定</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } from '@/js/dai/request'
+
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+
+      btnDisable: false,
+
+      teamId: '',
+      formData: {
+        agencyId: '',//组织Id
+        teamName: '',//分队名称	
+        gridIds: '',//负责区域，多个值逗号分隔	
+        gridIdArray: [],
+        ninePlacsVals: '',//负责场所类型，多个值逗号分隔	
+        ninePlacsArray: [],
+        plan: '',//巡查计划	
+        time: '',//时间
+        personInCharge: '',//负责人	
+        mobile: '',//联系电话	
+        memberList: ''//成员信息集合	
+      },
+
+      memberList: [
+        {
+          name: '成吉思汗',
+          mobile: '19999999999',
+          isEdit: false,
+        },
+        {
+          name: '成吉思汗',
+          mobile: '17465666567',
+          isEdit: true,
+        }
+      ],
+
+    }
+  },
+  components: {},
+  mounted () {
+
+  },
+
+  methods: {
+
+    async initForm (type, teamId, agencyId) {
+      this.$refs.ref_form.resetFields();
+      this.formData.agencyId = agencyId
+      this.formType = type
+      if (teamId) {
+        this.teamId = teamId
+        this.formData.teamId = teamId
+        await this.loadFormData()
+      }
+
+    },
+
+    //加载组织
+    async loadFormData () {
+      // const url = '/gov/org/placepatrolteam/detail'
+      const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/detail'
+      let params = {
+        placePatrolTeamId: this.teamId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.formData = data
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+
+
+    async handleComfirm () {
+
+      this.btnDisable = true
+      setTimeout(() => {
+        this.btnDisable = false
+      }, 10000)
+      this.$refs['ref_form'].validate((valid, messageObj) => {
+        if (!valid) {
+          app.util.validateRule(messageObj)
+          this.btnDisable = false
+        } else {
+          this.addTeam()
+        }
+
+      })
+
+
+    },
+    handleAddPerson () {
+      let obj = {
+        name: '',
+        mobile: '',
+        isEdit: true
+      }
+
+      this.memberList.push(obj)
+    },
+    handleDelPerson (index) {
+      this.memberList.splice(index, 1)
+    },
+    async addTeam () {
+      // const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+      // if (regPhone.test(this.formData.mobile) === false) {
+      //   this.btnDisable = false
+      //   this.$message({
+      //     type: 'warning',
+      //     message: '请输入正确的手机号码'
+      //   })
+      //   return false;
+      // }
+      if (this.formData.gridIdArray.length > 0) {
+        this.formData.gridIds = this.formData.gridIdArray.join(',')
+      } else {
+        return false
+      }
+      if (this.formData.ninePlacsArray.length > 0) {
+        this.formData.ninePlacsVals = this.formData.ninePlacsArray.join(',')
+      } else {
+        return false
+      }
+
+      let url = ''
+
+      if (this.formType === 'edit') {
+        // url = '/gov/org/placeorg/edit'
+        url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/edit'
+
+      } else {
+        // url = "/gov/org/placepatrolteam/add"
+        url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/add"
+      }
+
+      const { data, code, msg } = await requestPost(url, this.formData)
+
+      if (code === 0) {
+        this.$message({
+          type: 'success',
+          message: '操作成功'
+        })
+        this.resetData()
+        this.$emit('dialogOk')
+        this.btnDisable = false
+      } else {
+        this.btnDisable = false
+        this.$message.error(msg)
+      }
+
+    },
+
+    handleCancle () {
+
+      this.resetData()
+      this.$emit('dialogCancle')
+
+    },
+
+    resetData () {
+      this.teamId = ''
+      this.formData = {
+        agencyId: '',//组织Id
+        teamName: '',//分队名称	
+        gridIds: '',//负责区域，多个值逗号分隔	
+        gridIdArray: [],
+        ninePlacsVals: '',//负责场所类型，多个值逗号分隔	
+        ninePlacsArray: [],
+        plan: '',//巡查计划	
+        time: '',//时间
+        personInCharge: '',//负责人	
+        mobile: '',//联系电话	
+        member: '1'//成员信息集合	
+      }
+    },
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        teamName: [
+          { required: true, message: '分队名称不能为空', trigger: 'blur' }
+        ],
+        gridIdArray: [
+          { required: true, message: '负责区域不能为空', trigger: 'blur' },
+        ],
+        ninePlacsArray: [
+          { required: true, message: '场所类型不能为空', trigger: 'blur' }
+        ],
+
+        plan: [
+          { required: true, message: '巡查计划	不能为空', trigger: 'blur' }
+        ],
+        personInCharge: [
+          { required: true, message: '负责人不能为空', trigger: 'blur' }
+        ],
+        mobile: [
+          { required: true, message: '联系电话不能为空', trigger: 'blur' }
+        ],
+        member: [
+          { required: true, message: '成员不能为空', trigger: 'blur' }
+        ]
+      }
+    },
+
+  },
+  props: {
+    gridList: {
+      type: Array,
+      default: []
+    },
+
+    placeTypeList: {
+      type: Array,
+      default: []
+    },
+  }
+}
+</script>
+<style lang="scss"  scoped>
+@import "@/assets/scss/buttonstyle.scss";
+.item_width_1 {
+  width: 500px;
+}
+.item_width_2 {
+  width: 400px;
+}
+.item_width_3 {
+  margin-left: 10px;
+  width: 120px;
+}
+.item_width_4 {
+  margin-left: 10px;
+  width: 150px;
+}
+.item_width_span_3 {
+  margin-left: 10px;
+  width: 120px;
+}
+.item_width_span_4 {
+  margin-left: 10px;
+  width: 150px;
+}
+
+.div_btn {
+  display: flex;
+  justify-content: flex-end;
+}
+
+.form {
+  margin-top: 30px;
+}
+.div_person_list {
+  margin-top: 10px;
+  width: 500px;
+  display: flex;
+}
+</style>
+
+<style lang=scss>
+.el-dialog__body {
+  padding: 0 10px 20px !important;
+}
+</style>
diff --git a/src/views/modules/visual/basicinfo/basicInfoCommunity.vue b/src/views/modules/visual/basicinfo/basicInfoCommunity.vue
index 78b8f751b..50f54367a 100644
--- a/src/views/modules/visual/basicinfo/basicInfoCommunity.vue
+++ b/src/views/modules/visual/basicinfo/basicInfoCommunity.vue
@@ -11,11 +11,11 @@
         <el-select v-model="selBuildingId"
                    :popper-append-to-body="false"
                    placeholder="请选择">
-          <el-option v-for="item in buildingArray"
+          <el-option v-for="(item,index) in buildingArray"
                      :key="item.buildingId"
                      :label="item.buildingName"
                      :value="item.buildingId"
-                     @click="handleClickBuilding(index)">
+                     @click.native="handleClickBuilding(index)">
           </el-option>
         </el-select>
       </div>
@@ -393,10 +393,14 @@ export default {
     },
 
     //切换楼栋
-    handleClickBuilding (index) {
+    async handleClickBuilding (index) {
+
       this.selBuildingId = this.buildingArray[index].buildingId
       this.selBuildingName = this.buildingArray[index].buildingName
 
+      await this.loadRoom()
+      this.roomLoaded = true
+
       this.$emit('refreshInfoList', this.selBuildingId, 'building')
     },
     //选择房间
diff --git a/src/views/modules/visual/basicinfo/basicInfoMain.vue b/src/views/modules/visual/basicinfo/basicInfoMain.vue
index 8341e9a0a..fffed07dc 100644
--- a/src/views/modules/visual/basicinfo/basicInfoMain.vue
+++ b/src/views/modules/visual/basicinfo/basicInfoMain.vue
@@ -38,20 +38,18 @@
       </div>
 
       <div class="div_data">
-        <div class="div_search">
-          <el-input size="mini"
-                    @focus="handleSearch"
-                    WarningColor='warning'
-                    placeholder="请输入姓名">
+        <div @click="handleSearch"
+             class="div_search">
+          <div class="div_search_left">
             <i slot="prefix"
                class="icon">
               <img src="../../../../assets/img/modules/visual/sousuo.png"
                    alt />
             </i>
-          </el-input>
+            <span>请输入姓名</span>
+          </div>
 
-          <div class="btn"
-               @click="handleSearch">搜索</div>
+          <div class="btn">搜索</div>
 
         </div>
 
@@ -291,11 +289,12 @@ const vueGis = {
 
     //下钻到下一级 type点击的类型:polygon 点击多边形（分为点击组织/小区）   search 点击搜索  people 点击详情
     async toSubAgency (type, e, searchName) {
-      //点击小区neighborHood显示楼栋，点击非小区，进入下一级地图
+      console.log(e)
       this.runNum++
       this.runAgencyArray.push(this.orgData)
-
+      //点击小区neighborHood显示楼栋，点击非小区，进入下一级地图
       if (type === 'people') {
+
         this.orgLevel = 'people'
         this.selUserId = e
         this.orgId = ''
@@ -307,6 +306,8 @@ const vueGis = {
         this.searchName = searchName
 
       } else if (type === 'search') {
+
+
         this.orgLevel = 'search'
         this.orgId = ''
         this.orgData = {
@@ -320,7 +321,8 @@ const vueGis = {
 
       } else {
         this.subAgencyArray.forEach(item => {
-          if (item.id === e.selected[0].id_) {
+
+          if (item.id === e.selected[0].values_.id) {
             this.orgId = item.id
             this.orgLevel = item.level
             this.orgData = item
@@ -338,6 +340,7 @@ const vueGis = {
         } else {
           this.refreshMap(true)
         }
+
       }
 
 
@@ -365,7 +368,6 @@ const vueGis = {
 
     //返回所选组织
     handleClickAgency (index) {
-
       const cutNum = this.runAgencyArray.length - index//要减去的长度
       this.runNum = this.runNum - cutNum
       this.orgData = this.runAgencyArray[index]
@@ -379,10 +381,8 @@ const vueGis = {
 
       if (this.orgLevel === 'people') {
 
-
       } else if (this.orgLevel === 'search') {
         this.$nextTick(() => {
-
           this.$refs.ref_search.loadByName(this.searchName);
         });
 
@@ -430,7 +430,8 @@ const vueGis = {
 
     //加载当前园区的标注
     loadPolygon (subAgencyArray) {
-      polygonSource.clear()//清空变电站标注
+      polygonSource.clear()//清空多边形标注
+      iconSource.clear()//清空多边形标注
 
       let featureData = []//标注数据
       if (subAgencyArray && subAgencyArray.length > 0) {//判断是否存在下级标注
@@ -473,9 +474,7 @@ const vueGis = {
             oneData.geometry.coordinates.push(polygonArray)
             featureData.push(oneData)
           }
-
         });
-
       }
 
       if (featureData && featureData.length > 0) {
@@ -489,6 +488,7 @@ const vueGis = {
 
         let iconFeatures = [];
         feature.forEach(oneIcon => {
+
           var extent = boundingExtent(oneIcon.getGeometry().getCoordinates()[0]); //获取一个坐标数组的边界，格式为[minx,miny,maxx,maxy]
           // var center = getCenter(extent);   //获取边界区域的中心位置
           //添加标注
@@ -497,19 +497,17 @@ const vueGis = {
 
           let oneArray = [x, y]
           this.iconCoordinators.push(oneArray)
-
+          // debugger
           //视频监控样式
           let oneCctv = new Feature({
             geometry: new Point([x, y]),
-            id: oneIcon.id,
+            id: oneIcon.id_,
             properties: {
               type: "icon",
-              id: oneIcon.id
+              id: oneIcon.id_
             }
           });
 
-          console.log(oneIcon.values_)
-
           let iconStyle = new Style({
             image: new Icon({
               // anchor: [0.5, 0.5],
@@ -525,9 +523,7 @@ const vueGis = {
           iconFeatures.push(oneCctv);
 
         });
-        console.log(iconFeatures)
 
-        iconSource.clear(); //清空cctyv标注
         iconSource.addFeatures(iconFeatures);
       }
 
@@ -591,7 +587,7 @@ const vueGis = {
       })
 
       map.on('singleclick', function (e) {
-        console.log(e.coordinate)
+        // console.log(e.coordinate)
         // console.log(transform(e.coordinate, 'EPSG:3857', 'EPSG:4326'));
       })
 
@@ -745,19 +741,7 @@ export default vueGis;
 .ol-overlaycontainer-stopevent {
   display: none;
 }
-.el-input__inner[WarningColor="warning"] {
-  background-color: #011168;
-  border-radius: 4px 0 0 4px;
-  height: 56px;
-  border: none;
-  box-shadow: 0 0 10px inset #1a5afd;
-  padding-left: 70px;
-  font-size: 18px;
-  font-family: PingFang SC;
-  font-weight: 400;
-  color: #ffffff;
-  opacity: 0.7;
-}
+
 .el-scrollbar__wrap {
   overflow-x: hidden !important;
 }
diff --git a/src/views/modules/workSys/demandCate.vue b/src/views/modules/workSys/demandCate.vue
index 62357f83d..7221bb214 100644
--- a/src/views/modules/workSys/demandCate.vue
+++ b/src/views/modules/workSys/demandCate.vue
@@ -4,7 +4,14 @@
       <div class="resi-row-btn">
         <el-form :inline="true" :model="form" class="demo-form-inline">
           <el-form-item label="需求分类">
-            <el-input v-model="form.categoryName" placeholder="需求分类" clearable=""></el-input>
+            <el-select v-model="form.firstCategoryCode" filterable placeholder="请选择" clearable>
+              <el-option
+                v-for="item in demandOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
           </el-form-item>
           <el-form-item>
             <el-button type="primary" @click="handleSearch">查询</el-button>
@@ -12,12 +19,12 @@
         </el-form>
       </div>
       <div class="resi-row-btn">
-        <el-button type="success" @click="handleSearch">新增分类</el-button>
+        <el-button type="success" @click="handleAdd('1', 'add')">新增分类</el-button>
       </div>
       
       <el-table
         :data="tableData"
-        row-key="id"
+        row-key="categoryId"
         v-loading="tableLoading"
         border
         max-height="800"
@@ -31,7 +38,7 @@
           :key="item.columnName"
           :prop="item.columnName"
           :label="item.label"
-          align="center"
+          :align="item.align"
         >
           <template slot-scope="scope">
             <span>{{ handleFilterSpan(scope.row, item) }}</span>
@@ -40,6 +47,7 @@
         <el-table-column label="操作" align="center" width="200">
           <template slot-scope="scope">
             <el-button
+              v-if="scope.row.hasBtn"
               @click="handleLook(scope.row)"
               type="text"
               size="small"
@@ -47,7 +55,15 @@
               >{{(scope.row.usableFlag&&'禁用') || '启用'}}</el-button
             >
             <el-button
-                @click="handleEdit(scope.row)"
+                v-if="scope.row.level == 1"
+                @click="handleAdd('2', 'add', scope.row)"
+                type="text"
+                size="small"
+                class="btn-color-del"
+                >添加二级分类</el-button
+              >
+            <el-button
+                @click="handleEdit(scope.row, 'edit')"
                 type="text"
                 size="small"
                 class="btn-color-edit"
@@ -80,13 +96,13 @@
     >
       <el-form label-width="100px" :model="form" :rules="rules" ref="ruleForm">
         <el-form-item label="分类名称" prop="categoryName">
-          <el-input v-model="form.categoryName" size="small" style="width: 180px;" disabled></el-input>
+          <el-input v-model="form.categoryName" size="small" style="width: 180px;"></el-input>
         </el-form-item>
         
-        <el-form-item label="状态">
+        <!-- <el-form-item label="状态">
           <el-switch v-model="form.usableFlag"></el-switch>
-        </el-form-item>
-        <el-form-item label="奖励积分">
+        </el-form-item> -->
+        <el-form-item v-if="addLevel == '2'" label="奖励积分">
           <el-input-number v-model="form.awardPoint" :min="0" size="small" label="描述文字"></el-input-number>
         </el-form-item>
       </el-form>
@@ -119,8 +135,9 @@ export default {
       currentPage: 1,
       pageSize: 20,
       total: null,
-      conditions: [],
       tableData: [],
+      addLevel: '1',
+      addType: 'add',
       value: '',
       options: [
         {
@@ -131,13 +148,16 @@ export default {
           value: 2
         }
       ],
+      demandOptions: [],
       tableHeader: [
         {
           label: '分类名称',
+          align: 'left',
           columnName: 'categoryName'
         }, {
           label: '状态',
           columnName: 'usableFlag',
+          align: 'center',
           options: [{
             value: true,
             label: '启用'
@@ -149,6 +169,7 @@ export default {
       ],
       customerId: '',
       form: {
+        firstCategoryCode: '',
         categoryName: '',
         awardPoint: '',
         usableFlag: false
@@ -161,6 +182,7 @@ export default {
   async created() {
     this.customerId = localStorage.getItem('customerId')
     this.getTableData()
+    this.getOptions()
     this.pageLoading = true
   },
   mounted() {
@@ -188,24 +210,24 @@ export default {
     handleSearch(val) {
       console.log('searchhh--', val)
       this.currentPage = 1
-      this.conditions = val
       this.getTableData()
     },
-    
+    handleAdd(type, addType, row) {
+      this.addLevel = type
+      this.addType = addType
+      if (type == '2') this.form = { ...row, categoryName: '' }
+      this.dialogVisible = true
+    },
     handlerCancle() {
       this.dialogVisible = false
     },
     async handleLook(row) {
-      const _show = {
-        show: 'hidden',
-        hidden: 'show'
-      }
       const params = {
-        id: row.id,
-        status: _show[row.status]
+        categoryId: row.categoryId,
+        usableFlag: !row.usableFlag
       }
       this.$http
-        .post('/oper/customize/resicategorystatsconfig/updatestatus', params)
+        .post('/heart/icresidemanddict/updatestatus', params)
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
@@ -217,33 +239,87 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    async handleEdit(row) {
+    async handleEdit(row, addType) {
       
       this.form = { ...row }
+      this.addLevel = row.level
+      this.addType = addType
       this.dialogVisible = true
     },
-    async handleSUbmit() {
+    async addLevelFirst() {
+      const _form = {
+        customerId: localStorage.getItem('customerId'),
+        categoryName: this.form.categoryName
+      }
+      await this.$http
+        .post('/heart/icresidemanddict/addfirst', _form)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.dialogVisible = false
+            this.getTableData()
+          } 
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+        this.btnLoading = false
+    },
+    async addLevelChild () {
+      const _form = {
+        customerId: localStorage.getItem('customerId'),
+        categoryName: this.form.categoryName,
+        parentCategoryCode: this.form.categoryCode,
+        awardPoint: this.form.awardPoint
+      }
+      await this.$http
+        .post('/heart/icresidemanddict/addchild', _form)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.dialogVisible = false
+            this.getTableData()
+          } 
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+        this.btnLoading = false
+    },
+    async editCate() {
+      const _form = {
+        customerId: localStorage.getItem('customerId'),
+        categoryName: this.form.categoryName,
+        categoryId: this.form.categoryId,
+        level: this.form.level,
+        awardPoint: this.form.awardPoint
+      }
+      await this.$http
+        .post('/heart/icresidemanddict/update', _form)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.dialogVisible = false
+            this.getTableData()
+          } 
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+        this.btnLoading = false
+    },
+    handleSUbmit() {
       this.$refs.ruleForm.validate(async (valid) => {
         if (valid) {
           this.btnLoading = true
-          const _form = {
-            ...this.form,
-            warn: (this.form.warn && 1) || 0
-          }
-          await this.$http
-            .post('/oper/customize/resicategorystatsconfig/update', _form)
-            .then(({ data: res }) => {
-              if (res.code !== 0) {
-                return this.$message.error(res.msg)
-              } else {
-                this.dialogVisible = false
-                this.getTableData()
-              } 
-            })
-            .catch(() => {
-              return this.$message.error('网络错误')
-            })
-            this.btnLoading = false
+          if (this.addType == 'add') {
+            if (this.addLevel == '1') this.addLevelFirst()
+            else this.addLevelChild()
+          } else this.editCate()
+          
         } else {
           console.log('error submit!!');
           return false;
@@ -295,20 +371,50 @@ export default {
           return this.$message.error('网络错误')
         })
     },
+    async getOptions() {
+      const params = {
+        parentCategoryCode: 0
+      }
+      this.$http
+        .post('/heart/icresidemanddict/subcodelist', params)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.demandOptions = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
     async getTableData() {
       this.tableLoading = true
       let params = {
         // formCode: 'resi_base_info',
+        customerId: localStorage.getItem('customerId'),
         pageNo: this.currentPage,
-        pageSize: this.pageSize
+        pageSize: this.pageSize,
+        firstCategoryCode: this.form.firstCategoryCode
       }
       await this.$http
-        .post('/epmetuser/icresidemanddict/pagelist', params)
+        .post('/heart/icresidemanddict/pagelist', params)
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           } else {
-            this.tableData = res.data.list
+            this.tableData = res.data.list.map(item => {
+              return {
+                ...item,
+                hasBtn: true,
+                children: item.children.map(n => {
+                  return {
+                    ...n,
+                    hasBtn: item.usableFlag
+                  }
+                })
+              }
+            })
             this.total = res.data.total
           }
         })
diff --git a/src/views/modules/workSys/mapConfig.vue b/src/views/modules/workSys/mapConfig.vue
index c8114b35b..267b19fc6 100644
--- a/src/views/modules/workSys/mapConfig.vue
+++ b/src/views/modules/workSys/mapConfig.vue
@@ -4,7 +4,7 @@
     <div class="div_search">
 
       <el-select v-model="selAgencyId"
-                 placeholder="无下级组织">
+                 placeholder="请选择或点击区域选择">
         <el-option @click.native="orgChange(index)"
                    v-for="(item,index) in subAgencyArray"
                    :key="item.id"
@@ -12,7 +12,7 @@
                    :value="item.id">
         </el-option>
       </el-select>
-      <div v-if="subAgencyArray.length>0">
+      <div v-if="selAgencyId && subAgencyArray.length>0">
         <el-button v-if="showBtn&&!hasPolygon"
                    style="margin-left:10px"
                    type="primary"
@@ -198,7 +198,7 @@ const vueGis = {
       await this.loadOrgData()
 
       //加载当前园区的标注
-      await this.loadPolygon(this.subAgencyArray)
+      this.loadPolygon(this.subAgencyArray)
 
       //重置地图中心点
       if (isRefreshView) {
@@ -210,7 +210,7 @@ const vueGis = {
 
     //返回上一级组织
     handleBack () {
-
+      this.selAgencyId = ''
       this.runNum--
       this.runAgency.pop()
       if (this.runNum === 0) {
@@ -241,14 +241,15 @@ const vueGis = {
         this.subAgencyArray = []
         if (this.runNum === 0) {//第一次进入，绘制本级
           this.subAgencyArray.push(data)
-          this.selAgencyId = data.id
+          // this.selAgencyId = data.id
         } else {
+
           if (data.children && data.children.length > 0) {
             this.subAgencyArray = data.children
-            this.selAgencyId = this.subAgencyArray[0].id
+            // this.selAgencyId = this.subAgencyArray[0].id
           } else {
             this.subAgencyArray = []
-            this.selAgencyId = ''
+            // this.selAgencyId = ''
           }
         }
 
@@ -300,9 +301,7 @@ const vueGis = {
             oneData.geometry.coordinates.push(polygonArray)
             featureData.push(oneData)
           }
-
         });
-
       }
 
       if (featureData && featureData.length > 0) {
@@ -320,23 +319,26 @@ const vueGis = {
     //选择feature
     selectFeature (e) {
 
-      if (this.method === undefined || this.method === '') {
-        this.selAgencyId = e.selected[0].id_
-        this.subAgencyArray.forEach((element, index) => {
-          if (element.id === e.selected[0].id_) {
-            this.selAgencyIndex = index
-            this.orgChange(index)
-          }
+      if (e.selected.length > 0) {
+        console.log("selectFeature22222222222222222222222")
+        if (this.method === undefined || this.method === '') {
+          this.selAgencyId = e.selected[0].id_
+          this.subAgencyArray.forEach((element, index) => {
+            if (element.id === e.selected[0].id_) {
+              this.selAgencyIndex = index
+              this.orgChange(index)
+            }
 
-        });
+          });
+        }
       }
 
-
     },
     //下钻到下一级
     toSubAgency (e) {
 
       if (this.method != 'mAddPolygon' && this.level != 'neighborHood') {
+        this.selAgencyId = ''
         //下钻到下一级
         this.subAgencyArray.forEach(item => {
           if (item.id === e.selected[0].id_) {
@@ -359,10 +361,12 @@ const vueGis = {
 
     //高亮某个标注
     highlightPolygon () {
+
       let features = polygonSource.getFeatures()
       features.forEach(element => {
 
         if (element.id_ === this.selAgencyId) {
+
           selectedFeatures.push(element)
         }
       });
@@ -383,11 +387,11 @@ const vueGis = {
     //根据组织层级设置缩放级别
     setZoom (agencyLevel) {
       if (agencyLevel === 'district') {
-        this.zoom = 14
+        this.zoom = 13
       } else if (agencyLevel === 'street') {
-        this.zoom = 15
+        this.zoom = 14
       } else if (agencyLevel === 'community') {
-        this.zoom = 16
+        this.zoom = 15
       }
 
     },
diff --git a/src/views/modules/workSys/resiCate.vue b/src/views/modules/workSys/resiCate.vue
index 9c83dea44..32d6becbc 100644
--- a/src/views/modules/workSys/resiCate.vue
+++ b/src/views/modules/workSys/resiCate.vue
@@ -1,45 +1,50 @@
 <template>
   <div v-if="pageLoading" class="resi-container">
     <el-card class="resi-card-table">
-      <!-- <div class="resi-row-btn">
-        <div class="btn-label">是否预警</div>
-        <el-select
-        v-model="value"
-          placeholder="请选择"
-          size="small"
-          clearable
-        >
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-        <div class="btn-label">预警类型</div>
-        <el-select
-        v-model="value"
-          placeholder="请选择"
-          size="small"
-          clearable
-        >
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-        <el-button type="primary" size="mini" @click="handleSearch">查询</el-button>
-      </div> -->
+      <div class="resi-row-btn">
+        <el-form :inline="true" :model="form" class="demo-form-inline">
+          <el-form-item label="是否预警">
+            <el-select
+              v-model="isWarn"
+              placeholder="请选择"
+              size="small"
+              clearable
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+                </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="预警类型">
+            <el-select
+              v-model="level"
+              placeholder="请选择"
+              size="small"
+              clearable
+            >
+              <el-option
+                v-for="item in optionsType"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+                </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="handleSearch">查询</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
       <el-table
         :data="tableData"
         row-key="id"
         v-loading="tableLoading"
         border
-        max-height="800"
         style="width: 100%"
         class="resi-table"
       >
@@ -153,10 +158,10 @@
           <el-switch v-model="form.warn"></el-switch>
         </el-form-item>
         <el-form-item label="黄色预警">
-          <el-input-number v-model="form.level1" :min="0" size="small" label="描述文字"></el-input-number> 人/楼宇
+          <el-input-number v-model="form.level1" :min="0" size="small" label="描述文字" @change="handleLevelChange"></el-input-number> 人/楼宇
         </el-form-item>
         <el-form-item label="红色预警">
-          <el-input-number v-model="form.level2" :min="0" size="small" label="描述文字"></el-input-number> 人/楼宇
+          <el-input-number v-model="form.level2" :min="form.level1" size="small" label="描述文字" ></el-input-number> 人/楼宇
         </el-form-item>
       </el-form>
       <div class="resi-btns">
@@ -191,13 +196,23 @@ export default {
       total: null,
       conditions: [],
       tableData: [],
-      value: '',
+      isWarn: null,
+      level: null,
       options: [
         {
           label: '是',
           value: 1
         },{
           label: '否',
+          value: 0
+        }
+      ],
+      optionsType: [
+        {
+          label: '黄色预警',
+          value: 1
+        },{
+          label: '红色预警',
           value: 2
         }
       ],
@@ -249,8 +264,9 @@ export default {
         managementIcon: '',
         houseShowIcon: '',
         warn: '',
-        level1: '',
-        level2: ''
+        level1: 0,
+        level2: 0,
+        level3: 0
       },
       rules: {
         managementIcon: [{ required: true, message: '管理平台图标不能为空', trigger: 'blur' }],
@@ -314,6 +330,9 @@ export default {
       this.conditions = val
       this.getTableData()
     },
+    handleLevelChange(val) {
+      if (val > this.form.level2) this.form.level2 = val
+    },
     
     handlerCancle() {
       this.dialogVisible = false
@@ -365,12 +384,21 @@ export default {
     },
     async handleEdit(row) {
       
-      this.form = { ...row }
+      this.form = { 
+        ...row, 
+        warn: row.warn == '1' ? true : false, 
+        level1: row.level1 || 0, 
+        level2: row.level2 || 0,
+        level3: row.level3 || 0 
+      }
       this.dialogVisible = true
     },
     async handleSUbmit() {
       this.$refs.ruleForm.validate(async (valid) => {
         if (valid) {
+          if (this.form.warn) {
+            if (!this.form.level1) return this.$message.error('黄色预警不能为0')
+          }
           this.btnLoading = true
           const _form = {
             ...this.form,
@@ -461,6 +489,8 @@ export default {
       this.tableLoading = true
       let params = {
         // formCode: 'resi_base_info',
+        isWarn: this.isWarn,
+        level: this.level,
         pageNo: this.currentPage,
         pageSize: this.pageSize
       }
@@ -509,11 +539,7 @@ export default {
 <style lang="scss" scoped>
 .resi-row-btn {
   display: flex;
-  align-items: center;
   margin-bottom: 13px;
-  .btn-label {
-    margin-right: 10px;
-  }
   ::v-deep .el-button {
     // margin-left: 10px;
     border: 0;