diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
index d9cd4d37b..6b3a98ca8 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="height: 600px; overflow: auto; padding: 20px" class="form-class">
+  <div style="overflow: auto; padding: 20px;max-height: 82vh;" class="form-class">
     <el-form
       :model="dataForm"
       :rules="dataRule"
diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
index e84251927..a4bbccfcf 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
@@ -4,9 +4,9 @@
       <el-form
         :inline="true"
         :model="dataForm"
-        @keyup.enter.native="getDataList()"
+        @keyup.enter.native="loadTable()"
       >
-        <el-form-item label="所属组织名称" prop="orgName" label-width="130px">
+        <el-form-item label="所属组织名称" prop="orgName">
           <el-cascader
             ref="org"
             v-model="orgIds"
@@ -36,7 +36,7 @@
           <el-button
             class="diy-button--search"
             size="small"
-            @click="getDataList()"
+            @click="loadTable()"
             >{{ $t("query") }}</el-button
           >
         </el-form-item>
@@ -114,7 +114,7 @@
         border
         :row-key="row => { return row.id.toString() }"
         :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
-        style="width: 100%; height: 564px"
+        style="width: 100%; height: 564px;overflow: auto;"
         ><el-table-column
           label="序号"
           header-align="center"
@@ -208,7 +208,7 @@
     >
       <add-or-update
         ref="addOrUpdate"
-        @refreshDataList="getDataList"
+        @refreshDataList="loadTable"
         @closeDialog="closeDialog"
         :dialogTitle="dialogTitle"
       ></add-or-update>
@@ -238,7 +238,7 @@
 import mixinViewModule from "@/mixins/view-module";
 import AddOrUpdate from "./icpointnucleicmonitoring-add-or-update";
 import icpointNoice from "./icpointNoice";
-import { requestPost } from "@/js/dai/request";
+import { requestPost , requestGet} from "@/js/dai/request";
 export default {
   mixins: [mixinViewModule],
   data() {
@@ -265,6 +265,7 @@ export default {
     icpointNoice,
   },
   created() {
+    this.loadTable()
     this.noticeFun();
     this.getFormInfo();
   },
@@ -275,6 +276,7 @@ export default {
       let params = {
         limit: this.pageSize,
         page: this.pageNo,
+        ...this.dataForm
       };
       const { data, code, msg } = await requestGet(url, params);
 
@@ -319,7 +321,7 @@ export default {
           type: "success",
           message: "删除成功",
         });
-        this.getDataList();
+        this.loadTable();
       } else {
         this.$message.error(msg);
       }
diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
index a8a513143..d33f449a2 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="height: 600px; overflow: auto; padding: 20px" class="form-class">
+  <div style="max-height: 82vh; overflow: auto; padding: 20px" class="form-class">
     <el-form
       :model="dataForm"
       :rules="dataRule"
diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
index 1bb5ea05b..a21032490 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
@@ -4,7 +4,7 @@
       <el-form
         :inline="true"
         :model="dataForm"
-        @keyup.enter.native="getDataList()"
+        @keyup.enter.native="loadTable()"
       >
         <el-form-item label="疫苗接种点名称" prop="name">
           <el-input
@@ -24,7 +24,7 @@
           <el-button
             class="diy-button--search"
             size="small"
-            @click="getDataList()"
+            @click="loadTable()"
             >{{ $t("query") }}</el-button
           >
         </el-form-item>
@@ -220,7 +220,7 @@
     >
       <add-or-update
         ref="addOrUpdate"
-        @refreshDataList="getDataList"
+        @refreshDataList="loadTable"
         @closeDialog="closeDialog"
         :dialogTitle="dialogTitle"
       ></add-or-update>
@@ -285,6 +285,7 @@ export default {
       let params = {
         limit: this.pageSize,
         page: this.pageNo,
+        ...this.dataForm
       };
       const { data, code, msg } = await requestGet(url, params);
       
@@ -329,7 +330,7 @@ export default {
           type: "success",
           message: "删除成功",
         });
-        this.getDataList();
+        this.loadTable();
       } else {
         this.$message.error(msg);
       }
diff --git a/src/views/modules/plugins/rent/hikerrorinfo-add-or-update.vue b/src/views/modules/plugins/rent/hikerrorinfo-add-or-update.vue
new file mode 100644
index 000000000..5ecc620f3
--- /dev/null
+++ b/src/views/modules/plugins/rent/hikerrorinfo-add-or-update.vue
@@ -0,0 +1,145 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+          <el-form-item label="删除标记 0：未删除，1：已删除" prop="delFlag">
+          <el-input v-model="dataForm.delFlag" placeholder="删除标记 0：未删除，1：已删除"></el-input>
+      </el-form-item>
+          <el-form-item label="乐观锁" prop="revision">
+          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
+      </el-form-item>
+          <el-form-item label="创建人" prop="createdBy">
+          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
+      </el-form-item>
+          <el-form-item label="创建时间" prop="createdTime">
+          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
+      </el-form-item>
+          <el-form-item label="更新人" prop="updatedBy">
+          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
+      </el-form-item>
+          <el-form-item label="更新时间" prop="updatedTime">
+          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
+      </el-form-item>
+          <el-form-item label="客户ID" prop="customerId">
+          <el-input v-model="dataForm.customerId" placeholder="客户ID"></el-input>
+      </el-form-item>
+          <el-form-item label="身份证号" prop="idCard">
+          <el-input v-model="dataForm.idCard" placeholder="身份证号"></el-input>
+      </el-form-item>
+          <el-form-item label="错误类型 0：token，1：人员，2权限" prop="errorType">
+          <el-input v-model="dataForm.errorType" placeholder="错误类型 0：token，1：人员，2权限"></el-input>
+      </el-form-item>
+          <el-form-item label="错误详情" prop="errorInfo">
+          <el-input v-model="dataForm.errorInfo" placeholder="错误详情"></el-input>
+      </el-form-item>
+      </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        delFlag: '',
+        revision: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: '',
+        customerId: '',
+        idCard: '',
+        errorType: '',
+        errorInfo: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        delFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        revision: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        customerId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        idCard: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        errorType: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        errorInfo: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/hik/hikErrorInfo/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/hik/hikErrorInfo/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>
diff --git a/src/views/modules/plugins/rent/hikerrorinfo.vue b/src/views/modules/plugins/rent/hikerrorinfo.vue
new file mode 100644
index 000000000..f6356981a
--- /dev/null
+++ b/src/views/modules/plugins/rent/hikerrorinfo.vue
@@ -0,0 +1,60 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-hik__hikErrorInfo}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item>
+          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
+        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column prop="idCard" label="身份证号" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="errorInfo" label="错误详情" header-align="center" align="center"></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+<!--            <el-button v-if="$hasPermission('hik:hikErrorInfo:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>-->
+<!--            <el-button v-if="$hasPermission('hik:hikErrorInfo:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>-->
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle">
+      </el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './hikerrorinfo-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/pli/power/hikErrorInfo/page',
+        getDataListIsPage: true,
+        deleteURL: '/pli/power/hikErrorInfo',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  }
+}
+</script>
diff --git a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
index 2cad16bd8..4586e0d26 100644
--- a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
+++ b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
@@ -116,18 +116,32 @@
                 </label>
             </template>
         </el-form-item>
+        <el-form-item label="审核原因" prop="reason" v-if="dataForm.flag === '1'">
+            <el-input v-model="dataForm.reason" placeholder="审核原因" disabled></el-input>
+        </el-form-item>
 
       </el-form>
     <template slot="footer">
         <div class="resi-btns">
         <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
-        <el-button v-if="dataForm.state === '0'" type="danger" @click="checkHandle('2')">{{ $t('checkBTGBtn') }}</el-button>
+        <el-button v-if="dataForm.state === '0'" type="danger" @click="openCheckReasonDialog">{{ $t('checkBTGBtn') }}</el-button>
         <el-button v-if="dataForm.state === '0'" type="primary" @click="checkHandle('1')">{{ $t('checkTGBtn') }}</el-button>
         </div>
     </template>
       <el-dialog :visible.sync="dialogVisible" :modal="false">
           <img width="100%" :src="dialogImageUrl" alt="">
       </el-dialog>
+      <el-dialog
+              title="审核不通过原因"
+              :visible.sync="checkVisible"
+              width="30%"
+              append-to-body>
+          <el-input v-model="checkReason" placeholder="请输入审核不通过原因"></el-input>
+          <span slot="footer" class="dialog-footer">
+            <el-button @click="checkVisible = false">取 消</el-button>
+            <el-button type="primary" @click="dialogCheckHandle" :disabled="disabledBtn">确 定</el-button>
+          </span>
+      </el-dialog>
   </el-dialog>
 </template>
 
@@ -176,7 +190,10 @@ export default {
             { dictValue: '孙子女', dictName: '孙子女' },
             { dictValue: '兄弟姐妹', dictName: '兄弟姐妹' },
             { dictValue: '中介', dictName: '中介' }
-        ]
+        ],
+        checkReason: '',
+        checkVisible: false,
+        disabledBtn: false
     }
   },
   computed: {
@@ -269,13 +286,28 @@ export default {
         }
       }).catch(() => {})
     },
+      // 打开审核不通过对话框
+      openCheckReasonDialog(){
+        this.checkVisible = true
+          this.checkReason = ''
+          this.disabledBtn = false
+      },
+      // 不通过审核意见提交
+      dialogCheckHandle(){
+        if(this.checkReason === ''){
+            return this.$message.error('请填写不通过原因')
+        }
+        this.checkHandle('2')
+          this.disabledBtn = true
+      },
       // 审核提交方法
       checkHandle: function (type) {
         const params = {
           id: this.dataForm.id,
           state: type,
           homeId: this.dataForm.homeId,
-          lessorRelation: this.dataForm.lessorRelation
+          lessorRelation: this.dataForm.lessorRelation,
+          reason: this.checkReason
         }
         this.$http.post('/pli/power/rentContractInfo/review', params).then(({ data: res }) => {
           if (res.code !== 0) {
@@ -296,6 +328,8 @@ export default {
                   type: 'success',
                   duration: 500,
                   onClose: () => {
+                      this.disabledBtn = false
+                      this.checkVisible = false
                       this.visible = false
                       this.$emit('refreshDataList')
                   }
diff --git a/src/views/modules/visual/basicinfo/cpts/incident-info.vue b/src/views/modules/visual/basicinfo/cpts/incident-info.vue
index f3a860895..9dda7949d 100644
--- a/src/views/modules/visual/basicinfo/cpts/incident-info.vue
+++ b/src/views/modules/visual/basicinfo/cpts/incident-info.vue
@@ -399,7 +399,13 @@ export default {
 
     //加载组织数据
     async getInfo() {
-      const url = "/gov/project/resievent/eventdetail-icdata";
+      let url = "/gov/project/icEvent/icevent-eventdetail-icdata";
+      // 市北沿用旧接口
+      if (
+        this.$store.state.user.customerId == "b09527201c4409e19d1dbc5e3c3429a1"
+      ) {
+        url = "/gov/project/resievent/eventdetail-icdata";
+      }
 
       const { data, code, msg } = await requestPost(url, {
         resiEventId: this.resiEventId,
@@ -414,7 +420,12 @@ export default {
 
     //加载组织数据
     async getComment() {
-      const url = "/gov/project/resieventreply/list";
+      let url = "/gov/project/icEvent/icevent-list";
+      if (
+        this.$store.state.user.customerId == "b09527201c4409e19d1dbc5e3c3429a1"
+      ) {
+        url = "/gov/project/resieventreply/list";
+      }
 
       const { data, code, msg } = await requestPost(url, {
         resiEventId: this.resiEventId,
diff --git a/src/views/modules/visual/basicinfo/people.vue b/src/views/modules/visual/basicinfo/people.vue
index c754ff017..e0a9cea6f 100644
--- a/src/views/modules/visual/basicinfo/people.vue
+++ b/src/views/modules/visual/basicinfo/people.vue
@@ -493,13 +493,24 @@
         @close="showedDemandInfo = false"
       />
 
-      <incident-info
-        v-if="incident.list.length > 0 && incident.showedInfo"
-        :resiEventId="incident.list[incident.currentIndex].resiEventId"
-        :epmetUserIdList="info.epmetUserIdList"
-        :icResiUserId="userId"
-        @close="incident.showedInfo = false"
-      />
+      <template v-if="incident.list.length > 0 && incident.showedInfo">
+        <incident-info
+          v-if="
+            $store.state.user.customerId == 'b09527201c4409e19d1dbc5e3c3429a1'
+          "
+          :resiEventId="incident.list[incident.currentIndex].resiEventId"
+          :epmetUserIdList="info.epmetUserIdList"
+          :icResiUserId="userId"
+          @close="incident.showedInfo = false"
+        />
+        <event-info
+          v-else
+          :eventId="incident.list[incident.currentIndex].resiEventId"
+          :orgId="$store.state.user.agencyId"
+          orgType="agency"
+          @close="incident.showedInfo = false"
+        />
+      </template>
 
       <topic-info
         v-if="topic.list.length > 0 && topic.showedInfo"
@@ -519,11 +530,31 @@ import cptCard from "@/views/modules/visual/cpts/card";
 import peopleMore from "@/views/modules/visual/basicinfo/cpts/people-more";
 import demandInfo from "@/views/modules/visual/measure/dialogInfo";
 import incidentInfo from "@/views/modules/visual/basicinfo/cpts/incident-info";
+import eventInfo from "@/views/modules/visual/communityGovern/shijianchuli/event-info.vue";
 import topicInfo from "@/views/modules/visual/basicinfo/cpts/topic-info";
 import cptTb from "@/views/modules/visual/cpts/tb";
 
 export default {
   name: "HomeMap",
+
+  components: {
+    cptCard,
+    peopleMore,
+    cptTb,
+    demandInfo,
+    incidentInfo,
+    topicInfo,
+    eventInfo,
+  },
+
+  props: {
+    uid: {
+      type: String,
+      default: "",
+      // default: "8ada68cb6f1e4b9a8333348a39ef3aee",
+    },
+  },
+
   data() {
     return {
       breadList: [],
@@ -626,24 +657,8 @@ export default {
     };
   },
 
-  props: {
-    uid: {
-      type: String,
-      default: "",
-      // default: "8ada68cb6f1e4b9a8333348a39ef3aee",
-    },
-  },
-
   computed: {},
 
-  components: {
-    cptCard,
-    peopleMore,
-    cptTb,
-    demandInfo,
-    incidentInfo,
-    topicInfo,
-  },
   beforeRouteEnter(to, from, next) {
     console.log("让我看看", to);
     if (from) {
@@ -811,7 +826,15 @@ export default {
 
     //加载组织数据
     async getIncidentData() {
-      const url = "/gov/project/resievent/pageuserreported";
+      let url = "/gov/project/icEvent/icevent-pageuserreported";
+
+      // 市北沿用旧接口
+      if (
+        this.$store.state.user.customerId == "b09527201c4409e19d1dbc5e3c3429a1"
+      ) {
+        url = "/gov/project/resievent/pageuserreported";
+      }
+
       let params = {
         epmetUserIdList: this.info.epmetUserIdList,
         userId: this.userId,
diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
index 5535dc576..194a4d761 100644
--- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
@@ -1613,6 +1613,8 @@ const vueGis = {
         this.zoom = 13
       } else if (agencyLevel === 'community') {
         this.zoom = 14
+      }else{
+        this.zoom = 11
       }
 
     },
@@ -1827,7 +1829,7 @@ export default vueGis;
 .ol-overlaycontainer-stopevent {
   display: none;
 }
-</style> 
+</style>
 
 <style lang="scss" scoped>
 .popTitle {
@@ -1954,4 +1956,4 @@ export default vueGis;
   // color: rgba(1, 17, 104, 1);
   color: #fff;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/modules/visual/communityGovern/shijianchuli/lineOption.js b/src/views/modules/visual/communityGovern/shijianchuli/lineOption.js
index d02e4b20b..04b4f9503 100644
--- a/src/views/modules/visual/communityGovern/shijianchuli/lineOption.js
+++ b/src/views/modules/visual/communityGovern/shijianchuli/lineOption.js
@@ -1,11 +1,4 @@
 import * as echarts from 'echarts'
-let circleList = [
-  'image://data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAhCAYAAAC4JqlRAAAFdklEQVRYhY1YTY/bRBh+/BHbiRN7l02bqst+st1dVT0gceXABYk7PfYPwIELv4IfABJ3euuBCxKCKxckBEKi2y1F6Xa3abTZT+fLHxnbaMZje+zE3Y70aiLPzPs888w778xEin/8EO9YJKGbVDEkrvhdWdSKBumGehGJReBVdVZyApsPk/roicSdi4aKb4sUEK38jeLEHIdVRQWOnsgLgORCLWsKzFUDqlmHXEvGRzMCMnEx6XmIgpCDRaU6saMnMTYfRpmMQgzIJdCiNTebqHc6kHUbMYkQBT7ikCReFBWypkNSZUS+A/f0FOOjMSdRtlgglikgypwCK8z0FQPWzgYkpQn/8grT3jFmo0ggjMxhrSWjsWqhcXcP9c4Yo5fH8AYugFDQOSVBx8apAqkzRQBXYd1bhnF7G8HVNZznV4hDhZNWuIkEQm4EkhLC3luGtrwEb9DF8MUV+560R7xmpFXMB1kCYu+1obc3MD7qY9qbAagDqHFTKwhQkBnicIbrgyEaqy6am9uQ5Fdwnp8LfaW0FpcgX3NzvcXARy/6cAchB9e5aZxEqhaEWVGiAQCftU97PuJZH617GzBdH5Njh4/JglKdi3i1XkNzbQuTNwO4A8LBjZJpXAWRAOHgnkBOgjtwoZgD5tM/ewripkHJMFMHuQr2fgehTzB+ORVmTUmYAJoAWgAsAHbJLN7W5H1z1agv6pP6LgZvYRdIkGsKVLOD64Mel1njM6fOGtxxg33rfLwNe3+DjXYOX+H0t64we0nYasnSjLrnWLq/CrnWZ3mDkygSsHdtRLMA/iXhYJqgQELAuvc+9r98BOPWeqbdnU+Ajc+PcfjdDxi+eC2Akywu/MsJ800xrp6epQTkwi5QmzYCZ8yJqYIKCYn6nTYefP1FATwt9Btto31y+TVh16jMN8UQMOWCAnKtgeDaK+SCnISGDx59CrW5PAeeLWhzmfVJ+xe3rMx8yzVTPE+KQSgpOmbD2cKMyBLTzoNK8LQkfcRkJWdKU9+SoolBKJeGS4gjlLZmbkrdupGA0rAqx+e+s1ImEPNVKR+riYX+6EYCoTeqHJ/7XkggRhwGqFk1IYqjQo4fdZ/dSGDUPRTyfij4iZlviiGQSAkkDKPZFJplCMBEyHABuo9/BZlWq0Dbuo9/yfrn4xMi1DfFEC4ossAmBpk4qC01CwdLnts9TE5Ocfjt9wicwRx44CRttE+SkHw+dpaRoL4phoCpZuDURl0HKx9tQVuiW6ac25MMd/l3F79/9Q1WP7uP1vY6l/0YvZ8PEIf07J9yc/nYRAnqU9F1XP/jiAoUCZApAZkO0Npq4+KvMz5YFRJWcuzSdXz90x8A/uTjIz5TnwOnBHIVWlu3mG+KUVoCCCQiOAd9KA0d5pohKJA6pVmSxsCQngAlG/K28ZwC1JfSMJjv/EaEVAFxq0QgLoHbfwlzfQdk2oN/4S3I7W+7D/gF01ckmOsduP3/mO/SJbW4BKkjGguKfgJ7fw3Df9/AO/OEwAxuvBGlshu3FFi7dxFcnjCf+bYsxEB6RUovCSGrr58NYO9FsHY3ob93Aee5w52rhQuHuHzi1rX3bOjtFfjnR/w6Fop3wXRceikt3/9TABX1TgOt7Q12unnnV5icjBB65fhJlkExAHOtBaO9zOQfdV/BPZ1yUlFJgUgkAIFA+V2QkLF2LRjt25BVC2HgI/LpuyCZiaTIkHUdiqYjIkP4F2dcsaiUDefeBSKBRQeIPFerpgJz3YRq1NlDhAlJIhDPxeR4AjKZm2U58BblgfTNFvPnWeHqLMQHQCYSnGd+xeM0fwNWAGbPMv42rHqelx+gVa/lcnnba1gkl5Wq53m587v8NyCOXfR7vgD4H8khvGFl000HAAAAAElFTkSuQmCC',
-  'image://data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAhCAYAAAC4JqlRAAAFb0lEQVRYhY1YW28bRRT+ZtbrS24mjVu3btPUDoiqFIEQ4gUh8dKX8hf4A/wT+Am88cA7b5GgrxVPFIREL0rapHHbOHGcxM7Fa3u9c9BMZrZn1+umI43W2j2Xb75z5pwZi89/JLznEExMTFGhKb+njtyUD+KCZxaILOfTnvGIAfj3z5/hmjGcnpjyLosBPtPvtB+yfsxIMBCuQWY4komnD09eRVHMoISc1R9jTH0EahcDhIisM5V6mhmugfz75t35qlgOyJTTxJQ3MCcqqIo8yhRBIcQQCmOrmYOPgvAgaYQedbCnXuPUgkhPYsBiBjjNzrGnp1hEUd7CCiTmqIsjtYsmnRllyfSMQTELKa5iQVTxsXcZp6qJJh0gAAwrbjgQWpc4gLTznKxjUSyhgR660Qu8hDLv8w5cCkBEZ4joBU4h0fNWsSjr+IQWsKm2cDQlYQ2AdJKdO2+gIi5hhV6jpXYRAijpHLIzlwXAZAMQ6gBFGziWVxGIG2hIgW21iQ6TFe7JGYhjLmuY187VS7SoYwxr5wU78xaEZ+VhaY2Mc2AEYKi/q10MxRgtHUI5wFDtoGd14qTMpTNeFOHLGupqD23qmBVp58XUzFsWOICxdT5g4AR1EFAJbW2TDvGYBnFSCs5AzIJcRZVGGKtX6AOYsasu2d8lxoafAhDalfPwmOTUtsQi5rXt6DFe8zqSTEIfnphBNdrAG+sgb1fuAMzaZ7FxG40rNaxo5fYOtjefYZOtXrCtZkKjmuh4H+E6fLQQGrbEBACvjjKFGFHXCMxaAJyB2cvXcOPre/h+dgE33SpW7wCffoXmnw/w637LrJBYWExeUBdn2rb2Ea1j3wGQiV0wgzKdmAKSs9PnIOY/QOXb7/ADd+7G3AJu6m9ahoUpz3ZNztieQZn7lJwB4WOGjg2NcS1gIPJffoN7+SIW087d0N+0jJNPbVmpbQvfMCs4A2+TUKKAU0PZREXUhipV3J3m3A0rk2N6MmZa25YGWJyEMqUvSLGkTE0/j4WLAPgFI5Opz2zHIw2AbFDSbfW8k4U4uQhAODIymfrMdiYAgsIIcyZuxDpY5MrsYRtPLwJw2MYzm/1OT8UNSNtWplglWnC8YhqjL+bNvlestrsKN3r0EA/sCqeu/tFD/OHkmb4Bom1rH/yAIhkaQh89MY+5RGN5W9sH3QPsPfwdPwd9tNPOg/75Ny1jC9LQ6oYOhLHdN/0g0Q1jBlQTPe8u6qIMSb2J2m4q3M42Nn/7BT/d/gx3KtXzetDZQ/PZv3hCyvT+vp2B1TVMaJsij0K0HgMwIBIAKMCYBmjLZVSinqlWI9Z0XHmNSGH09B/8BeBvq897QcAAxCzIZVzWtrWPLAAOhFIbaMm7qMgaimrHKPNEdeV1eEE3HHAGtC1RRDH6D+vsRAQHgG8VRQOMqY0tUcOHIsAbOjJG0rX9XeeBIZ9iEULUUFVtPNe2kTqkJkLgDOlckHm8kqtYVlvYoQMDImKrfPeJyNIuluDJOmrUxSttk23LRAjcEckdErSQUM/Rlg0or45bqowDtWkMhLy2pw+lfOvKBsryEpbUIV7a45irC/GJOM2AYB+MoFakE/TlMla8L1CmQxypFk4MuZNVVOn+J6+Z45xuWMNoG09o3yTkGMnjOTJ3AYvn252xj9NoH09lHQtiCVdyVdwifScYYYjIynqmxRSEjwKNcUxdbKkXhjGVqoYqlXMTu4BnO88LqbZwiC10RQmeuI5ZUUAJecvCGIqOEag3OKMgEefM21F6F5hh72xkr2eJozPLD1AAQc9NELIup9x4VkOCu5ZN3A3dC+6MGZt2W06Pd92G3QITY9r1PEHTe/43wHWzfk8OAP8D28XBfaJJ48oAAAAASUVORK5CYII='
-]
-let className = ['1号停车场', '2号停车场', '3号停车场', '4号停车场', '5号停车场', '6号停车场', '7号停车场']
-let serviceCount = [50, 28, 17, 38, 90, 73, 39]
-
 export function lineOption () {
 
   return {
@@ -18,13 +11,6 @@ export function lineOption () {
         }
       }
     },
-    // grid: {
-    //   left: '5%',
-    //   right: '5%',
-    //   bottom: '5%',
-    //   top: '10%',
-    //   containLabel: true
-    // },
     xAxis: {
       type: 'category',
       // boundaryGap: false,
@@ -39,8 +25,7 @@ export function lineOption () {
         lineStyle: {
           color: '#0c4b59'
         }
-      },
-      // data: className
+      }
     },
     yAxis: {
       nameTextStyle: {
@@ -73,82 +58,29 @@ export function lineOption () {
         }
       }
     },
-    // series: [
-    //   {
-    //     name: '项目数',
-    //     type: 'line',
-    //     smooth: true,
-    //     barWidth: 15,
-    //     areaStyle: {},
-    //     itemStyle: {
-    //       color: new echarts.graphic.LinearGradient(
-    //         0, 1, 0, 0,
-    //         [
-    //           { offset: 0, color: 'rgba(121, 55, 255, 0)' },
-    //           { offset: 1, color: '#6339FF' }
-    //         ]
-    //       )
-    //     }
-    //   },
-    //   // {
-    //   //   data: [820, 932, 901, 934, 1290, 1330, 1320],
-    //   //   type: 'line',
-    //   //   areaStyle: {}
-    //   // }
-    // ]
     series: [
       {
-      name: '',
-      type: 'bar',
-      zlevel: 1,
-      itemStyle: {
-       
-        normal: {
-          barBorderRadius: 0,
-          color: function (params) {
-            // 大于等于50%的是黄色 反之为蓝色
-            var colorList = [
-              ['rgba(252, 210, 152, .2)', 'rgba(252, 210, 152, 1)'],
-              ['rgba(36, 253, 231, .2)', 'rgba(36, 253, 231, 1)'],
-            ];
-            var colorItem
-           
-              colorItem = colorList[1];
-        
-            // 设置线条渐变色
-            return new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
-              offset: 0,
-              color: colorItem[0]
-            },
-            {
-              offset: 1,
-              color: colorItem[1]
-            }
-            ], false);
-          }
-
-        },
-      },
-      barWidth: 4,
-      // data: serviceCount
-    },
-   
-    {
-      name: 'XXX',
-      type: 'pictorialBar',
-      symbol: function (params, value) {
-        // 设置图片
-      
-        return circleList[1]
+        name: '项目数',
+        type: 'line',
+        smooth: true,
+        barWidth: 15,
+        areaStyle: {},
+        itemStyle: {
+          color: new echarts.graphic.LinearGradient(
+            0, 1, 0, 0,
+            [
+              { offset: 0, color: 'rgba(121, 55, 255, 0)' },
+              { offset: 1, color: '#6339FF' }
+            ]
+          )
+        }
       },
-      symbolPosition: 'end',
-      symbolSize: [30, 30],
-      symbolOffset: [0, -12],
-      z: 20,
-      // data: serviceCount
-    }
+      // {
+      //   data: [820, 932, 901, 934, 1290, 1330, 1320],
+      //   type: 'line',
+      //   areaStyle: {}
+      // }
     ]
 
-
   }
 }
diff --git a/src/views/modules/visual/cpts/tb.vue b/src/views/modules/visual/cpts/tb.vue
index 8b77155dd..2920ee649 100644
--- a/src/views/modules/visual/cpts/tb.vue
+++ b/src/views/modules/visual/cpts/tb.vue
@@ -21,13 +21,22 @@
       <tbody class="table-body">
         <tr class="table-body-tr"
             v-for="(value, index) in list"
-            :key="index">
+            :key="index"
+            @click="handleClickRow(index)">
           <td class="td"
               v-for="(item, indexs) in value"
               :key="indexs">
             <div v-if="typeof item === 'string' || typeof item === 'number'">
               {{ item }}
             </div>
+
+            <div v-if="typeof item === 'object'&& item.type === 'img'">
+              <!-- <span>{{  item.type+  item.src}}</span> -->
+              <img style="width:18px;height:18px"
+                   :src="item.src"
+                   alt="" />
+
+            </div>
             <div v-if="typeof item === 'object' && item && item.type == 'index'">
               <img v-if="highlightTop3 && index == 0"
                    src="@/assets/img/shuju/top/1.png"
@@ -139,6 +148,10 @@ export default {
   created () { },
 
   methods: {
+    //点击某一行
+    handleClickRow (index) {
+      this.$emit("handleClickRow", index);
+    },
     handleClickBtn (index, type) {
       this.$emit("operate", index, type);
     },
@@ -191,7 +204,7 @@ export default {
           box-sizing: border-box;
           text-align: center;
           border: none;
-          padding: 20px 5px;
+          padding: 10px 5px;
 
           > div {
             overflow: hidden;
diff --git a/src/views/modules/workSys/mapConfig.vue b/src/views/modules/workSys/mapConfig.vue
index bc2f4d3db..967164693 100644
--- a/src/views/modules/workSys/mapConfig.vue
+++ b/src/views/modules/workSys/mapConfig.vue
@@ -622,6 +622,8 @@ const vueGis = {
         this.zoom = 13
       } else if (agencyLevel === 'community') {
         this.zoom = 14
+      }else{
+        this.zoom = 11
       }
 
     },
@@ -792,13 +794,23 @@ const vueGis = {
       //中国经纬度范围
       // 经度范围：73°33′E至135°05′E 东经
       // 纬度范围：3°51′N至53°33′N 北纬
+      let aaa = this.polygonManullyString.replace(/\[/g, ',')
+      aaa = aaa.replace(/\]/g, ',')
 
-      const arrayString = this.polygonManullyString
-      let array = arrayString.split(/[, ()]/)
+
+      let array = aaa.split(/[, ()]/)
+      // const arrayString = this.polygonManullyString
+      // let array = arrayString.split(",|(|)|[|]")
       console.log(array)
       let polygonStringResult = ''
 
 
+      // const arrayString = this.polygonManullyString
+      // let array = arrayString.split(/[, ()]/)
+      // console.log(array)
+      // let polygonStringResult = ''
+
+
       array.forEach(element => {
         let num = Number(element)
         if (num) {
@@ -832,7 +844,7 @@ const vueGis = {
       });
 
       if (selPolygonString) {
-        this.saveOffset(tyhis.xOffset, this.yOffset, selPolygonString)
+        this.saveOffset(this.xOffset, this.yOffset, selPolygonString)
       }
 
     },
@@ -1139,9 +1151,9 @@ export default vueGis;
 .div_textarea {
   text-align: center;
 }
-</style>  
+</style>
 <style>
 .ol-overlaycontainer-stopevent {
   display: none;
 }
-</style>  
+</style>