From 9d2b47ae33396ae90fa1bcd33ff4a6715e3267c9 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Thu, 23 Jun 2022 09:45:49 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E6=94=B9=E6=94=B9=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/cpts/base/cpts/edit.vue            | 12 +++++++++---
 .../shequzhili/tuceng/anquan/xuncha/cpts/record.vue  |  1 +
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/cpts/base/cpts/edit.vue b/src/views/modules/cpts/base/cpts/edit.vue
index 47bbf6b4f..0b81cbc1a 100644
--- a/src/views/modules/cpts/base/cpts/edit.vue
+++ b/src/views/modules/cpts/base/cpts/edit.vue
@@ -265,7 +265,11 @@
         </div>
       </el-form>
 
-      <slot v-bind:id="formId" v-bind:info="fmData"  v-bind:formType="formType"></slot>
+      <slot
+        v-bind:id="formId"
+        v-bind:info="fmData"
+        v-bind:formType="formType"
+      ></slot>
     </div>
 
     <div class="div_btn resi-btns">
@@ -431,8 +435,10 @@ export default {
 
     // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
     initMap(item) {
+      const { latitude = 39.79069, longitude = 116.506907 } =
+        this.$store.state.user;
       // 定义地图中心点坐标
-      var center = new window.TMap.LatLng(36.0722275, 120.38945519);
+      var center = new window.TMap.LatLng(latitude, longitude);
       // 定义map变量，调用 TMap.Map() 构造函数创建地图
       map = new window.TMap.Map(document.getElementById("app"), {
         center: center, // 设置地图中心点坐标
@@ -545,7 +551,7 @@ export default {
         console.log("------------------------------------info", this.fmData);
 
         await nextTick(800);
-        if (map) {
+        if (map && data.latitude) {
           map.setCenter(new TMap.LatLng(data.latitude, data.longitude));
         }
       } else {
diff --git a/src/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/record.vue b/src/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/record.vue
index bd6c85557..7c3dcd32c 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/record.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/record.vue
@@ -224,6 +224,7 @@
               v-if="formType == 'edit'"
               title="删除之后无法恢复，确认删除？"
               @onConfirm="del(scope.row)"
+              @confirm="del(scope.row)"
             >
               <el-button
                 slot="reference"

From 73cb22a4ba4f94812ac200c87f41459f6bb875a0 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Thu, 23 Jun 2022 10:11:06 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E6=97=A0=E9=99=90=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/cpts/base/cpts/edit.vue                  | 7 +++++--
 src/views/modules/cpts/base/index.vue                      | 3 ++-
 .../modules/shequzhili/tuceng/anquan/weihua/index.vue      | 1 +
 .../modules/shequzhili/tuceng/anquan/xuncha/index.vue      | 2 +-
 .../modules/shequzhili/tuceng/yingji/ziyuan/index.vue      | 1 +
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/cpts/base/cpts/edit.vue b/src/views/modules/cpts/base/cpts/edit.vue
index 0b81cbc1a..34cb29a5a 100644
--- a/src/views/modules/cpts/base/cpts/edit.vue
+++ b/src/views/modules/cpts/base/cpts/edit.vue
@@ -435,8 +435,11 @@ export default {
 
     // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
     initMap(item) {
-      const { latitude = 39.79069, longitude = 116.506907 } =
-        this.$store.state.user;
+      let { latitude, longitude } = this.$store.state.user;
+      if (!latitude || latitude == "" || latitude == "0") {
+        latitude = 39.9088810666821;
+        longitude = 116.39743841556731;
+      }
       // 定义地图中心点坐标
       var center = new window.TMap.LatLng(latitude, longitude);
       // 定义map变量，调用 TMap.Map() 构造函数创建地图
diff --git a/src/views/modules/cpts/base/index.vue b/src/views/modules/cpts/base/index.vue
index 7c4d678cf..a4033ae9e 100644
--- a/src/views/modules/cpts/base/index.vue
+++ b/src/views/modules/cpts/base/index.vue
@@ -535,11 +535,12 @@ export default {
 
     handleClose() {
       this.formShow = false;
+      this.getTableData();
     },
 
     handleEditSuccess() {
       this.handleClose();
-      this.getTableData();
+      // this.getTableData();
     },
 
     async handleDelete(rowData, rowIndex) {
diff --git a/src/views/modules/shequzhili/tuceng/anquan/weihua/index.vue b/src/views/modules/shequzhili/tuceng/anquan/weihua/index.vue
index 91301a2e5..b70bd83d5 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/weihua/index.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/weihua/index.vue
@@ -12,6 +12,7 @@
       :importUrl="importUrl"
       :mubanUrl="mubanUrl"
       :editParams="editParams"
+      :editBtnName="(item) => (item.latitude == '' ? '待完善' : '修改')"
       idName="icDangerousChemicalsId"
     ></base-page>
   </div>
diff --git a/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue b/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue
index d52526b09..c0f745893 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue
@@ -93,7 +93,7 @@ export default {
         { field: "场所名称", keyName: "placeOrgName", type: "text" },
         { field: "场所地址", keyName: "address", type: "text" },
         { field: "场所类型", keyName: "placeTypeName", type: "text" },
-        { field: "规模", keyName: "scale", type: "text" },
+        { field: "规模", keyName: "scaleName", type: "text" },
         { field: "负责人", keyName: "personInCharge", type: "text" },
         { field: "联系电话", keyName: "mobile", type: "text" },
         { field: "最新检查时间", keyName: "latestPatrolTime", type: "text" },
diff --git a/src/views/modules/shequzhili/tuceng/yingji/ziyuan/index.vue b/src/views/modules/shequzhili/tuceng/yingji/ziyuan/index.vue
index 61459b131..62ca95c9f 100644
--- a/src/views/modules/shequzhili/tuceng/yingji/ziyuan/index.vue
+++ b/src/views/modules/shequzhili/tuceng/yingji/ziyuan/index.vue
@@ -12,6 +12,7 @@
       :importUrl="importUrl"
       :mubanUrl="mubanUrl"
       :editParams="editParams"
+      :editBtnName="(item) => (item.latitude == '' ? '待完善' : '修改')"
       idName="icSuperiorResourceId"
     ></base-page>
   </div>

From 9bb4543fe33f509e58582a652f43e79cb980ea13 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Thu, 23 Jun 2022 11:18:44 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E6=AC=A7=E6=8B=89=E6=8B=89=E6=94=B9?=
 =?UTF-8?q?=E6=94=B9=E6=94=B9bg?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/cpts/base/cpts/edit.vue      | 18 +++++++++++++++++-
 src/views/modules/cpts/base/index.vue          |  6 ++++++
 .../shequzhili/tuceng/anquan/xuncha/index.vue  |  8 +++++++-
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/cpts/base/cpts/edit.vue b/src/views/modules/cpts/base/cpts/edit.vue
index 34cb29a5a..8955e14de 100644
--- a/src/views/modules/cpts/base/cpts/edit.vue
+++ b/src/views/modules/cpts/base/cpts/edit.vue
@@ -265,6 +265,18 @@
         </div>
       </el-form>
 
+      <div class="div_btn resi-btns" v-if="!formBtnFixed">
+        <el-button size="small" @click="handleCancle">取 消</el-button>
+        <el-button
+          v-if="formType != 'watch'"
+          type="primary"
+          size="small"
+          :disabled="btnDisable"
+          @click="handleComfirm"
+          >确 定</el-button
+        >
+      </div>
+
       <slot
         v-bind:id="formId"
         v-bind:info="fmData"
@@ -272,7 +284,7 @@
       ></slot>
     </div>
 
-    <div class="div_btn resi-btns">
+    <div class="div_btn resi-btns" v-if="formBtnFixed">
       <el-button size="small" @click="handleCancle">取 消</el-button>
       <el-button
         v-if="formType != 'watch'"
@@ -307,6 +319,10 @@ export default {
       type: String,
       default: "info",
     },
+    formBtnFixed: {
+      type: Boolean,
+      default: true,
+    },
     idName: {
       type: String,
       default: "",
diff --git a/src/views/modules/cpts/base/index.vue b/src/views/modules/cpts/base/index.vue
index a4033ae9e..39be8e8eb 100644
--- a/src/views/modules/cpts/base/index.vue
+++ b/src/views/modules/cpts/base/index.vue
@@ -212,6 +212,7 @@
         :editParams="editParams"
         :editParamsDiv="editParamsDiv"
         :editFixedParams="editFixedParams"
+        :formBtnFixed="formBtnFixed"
         @close="handleClose"
         @afterEdit="handleEditSuccess"
       >
@@ -318,6 +319,11 @@ export default {
       type: String,
       default: "id",
     },
+
+    formBtnFixed: {
+      type: Boolean,
+      default: true,
+    },
   },
 
   data() {
diff --git a/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue b/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue
index c0f745893..c8a27662d 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue
@@ -17,10 +17,16 @@
       :editFixedParams="editFixedParams"
       :editParamsDiv="5"
       :editBtnName="(item) => (item.latitude == '' ? '待完善' : '修改')"
+      :formBtnFixed="false"
       idName="enterpriseId"
     >
       <template v-slot:editElse="{ id, formType, info }">
-        <record v-if="formType != 'add' && id" :formType="formType" :enterpriseId="id" :enterpriseInfo="info"></record>
+        <record
+          v-if="formType != 'add' && id"
+          :formType="formType"
+          :enterpriseId="id"
+          :enterpriseInfo="info"
+        ></record>
       </template>
     </base-page>
   </div>

From baacfe68da617279aa579de392d2e09d71b87ae5 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 23 Jun 2022 13:38:12 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E4=B9=9D=E5=B0=8F=E5=9C=BA=E6=89=80?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ninePlaces/places/places.vue              | 20 ++++++++++---
 .../ninePlaces/places/placesForm.vue          | 28 ++++++++++++++++---
 2 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/src/views/modules/communityService/ninePlaces/places/places.vue b/src/views/modules/communityService/ninePlaces/places/places.vue
index 9c44dd6a6..820e98c5b 100644
--- a/src/views/modules/communityService/ninePlaces/places/places.vue
+++ b/src/views/modules/communityService/ninePlaces/places/places.vue
@@ -148,12 +148,16 @@
                          class="operate">
           <template slot-scope="scope">
 
-            <el-button type="text"
+            <el-button  type="text"
+                       class="div-table-button--detail"
+                       size="small"
+                       @click="handleDetail(scope.row)">查看</el-button>
+            <el-button v-if="agencyId===scope.row.agencyId" type="text"
                        class="div-table-button--edit"
                        size="small"
                        @click="handleEdit(scope.row)">修改</el-button>
 
-            <el-button type="text"
+            <el-button v-if="agencyId===scope.row.agencyId" type="text"
                        class="div-table-button--delete"
                        size="small"
                        @click="handleDelete(scope.row)">删除</el-button>
@@ -182,7 +186,7 @@
                class="dialog-h"
                @closed="diaClose">
       <places-form ref="ref_form"
-                   :gridList="gridList"
+                   :agencyId="agencyId"
                    :scaleList="scaleList"
                    :placeTypeList="placeTypeList"
                    @dialogCancle="addFormCancle"
@@ -262,7 +266,8 @@ export default {
       const url = "/gov/org/customergrid/gridoption"
 
       let params = {
-        agencyId: this.agencyId
+        agencyId: this.agencyId,
+        purpose:"query"
       }
 
       const { data, code, msg } = await requestPost(url, params)
@@ -366,6 +371,13 @@ export default {
         this.$refs.ref_form.initForm('edit', row.placeOrgId)
       })
     },
+    handleDetail (row) {
+      this.formTitle = '详情'
+      this.formShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_form.initForm('detail', row.placeOrgId)
+      })
+    },
 
     addFormCancle () {
       this.formShow = false
diff --git a/src/views/modules/communityService/ninePlaces/places/placesForm.vue b/src/views/modules/communityService/ninePlaces/places/placesForm.vue
index 29080f4a8..ae7bb8e0c 100644
--- a/src/views/modules/communityService/ninePlaces/places/placesForm.vue
+++ b/src/views/modules/communityService/ninePlaces/places/placesForm.vue
@@ -148,6 +148,7 @@ export default {
 
     async initForm (type, placeOrgId) {
       this.$refs.ref_form.resetFields();
+      this.loadGrid()
 
       this.formType = type
       if (placeOrgId) {
@@ -156,6 +157,25 @@ export default {
         await this.loadFormData()
       }
 
+    },
+
+      async loadGrid () {
+      const url = "/gov/org/customergrid/gridoption"
+
+      let params = {
+        agencyId: this.agencyId,
+        purpose:"addorupdate"
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.gridList = data
+
+      } else {
+        this.$message.error(msg)
+      }
+
     },
 
     //加载组织
@@ -301,10 +321,6 @@ export default {
   },
   props: {
 
-    gridList: {
-      type: Array,
-      default: []
-    },
     scaleList: {
       type: Array,
       default: []
@@ -313,6 +329,10 @@ export default {
       type: Array,
       default: []
     },
+    agencyId: {
+      type: String,
+      default: ""
+    },
   }
 }
 </script>

From 66eb1df087d0e3e603a89d6509a37a206e2b06db Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Thu, 23 Jun 2022 13:52:38 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E8=BF=98=E6=98=AF=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/communityService/sqzzz/index.vue  | 379 ++++++++++--------
 .../tuceng/anquan/xuncha/cpts/record.vue      |   2 +-
 2 files changed, 207 insertions(+), 174 deletions(-)

diff --git a/src/views/modules/communityService/sqzzz/index.vue b/src/views/modules/communityService/sqzzz/index.vue
index 93edef7a7..e25b5326e 100644
--- a/src/views/modules/communityService/sqzzz/index.vue
+++ b/src/views/modules/communityService/sqzzz/index.vue
@@ -1,135 +1,145 @@
 <template>
   <div class="resi-container">
-    <el-card ref="searchCard"
-             class="search-card">
-      <el-form ref="searchForm"
-               :inline="true"
-               :model="fmData"
-               class="demo-form-inline">
-        <el-form-item label="组织名称"
-                      prop="organizationName">
-          <el-input v-model="fmData.organizationName"
-                    class="resi-cell-input"
-                    size="small"
-                    clearable
-                    placeholder="请输入">
+    <el-card ref="searchCard" class="search-card">
+      <el-form
+        ref="searchForm"
+        :inline="true"
+        :model="fmData"
+        class="demo-form-inline"
+      >
+        <el-form-item label="组织名称" prop="organizationName">
+          <el-input
+            v-model="fmData.organizationName"
+            class="resi-cell-input"
+            size="small"
+            clearable
+            placeholder="请输入"
+          >
           </el-input>
         </el-form-item>
-        <el-form-item label="创建时间"
-                      prop="createTime">
-          <el-date-picker v-model="fmData.createTime"
-                          type="daterange"
-                          range-separator="至"
-                          start-placeholder="开始日期"
-                          end-placeholder="结束日期"
-                          value-format="yyyy-MM-dd">
+        <el-form-item label="创建时间" prop="createTime">
+          <el-date-picker
+            v-model="fmData.createTime"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            value-format="yyyy-MM-dd"
+          >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="备注"
-                      prop="remark">
-          <el-input v-model="fmData.remark"
-                    class="resi-cell-input"
-                    size="small"
-                    clearable
-                    placeholder="请输入">
+        <el-form-item label="备注" prop="remark">
+          <el-input
+            v-model="fmData.remark"
+            class="resi-cell-input"
+            size="small"
+            clearable
+            placeholder="请输入"
+          >
           </el-input>
         </el-form-item>
         <el-form-item>
-          <el-button class="diy-button--search"
-                     size="small"
-                     @click="handleSearch">查询</el-button>
-          <el-button class="diy-button--reset"
-                     size="small"
-                     @click="resetForm('searchForm')">重置</el-button>
+          <el-button
+            class="diy-button--search"
+            size="small"
+            @click="handleSearch"
+            >查询</el-button
+          >
+          <el-button
+            class="diy-button--reset"
+            size="small"
+            @click="resetForm('searchForm')"
+            >重置</el-button
+          >
         </el-form-item>
       </el-form>
     </el-card>
     <el-card class="resi-card-table">
       <div class="resi-row-btn">
-        <el-button class="diy-button--add"
-                   size="small"
-                   @click="handleAdd">新增</el-button>
-        <el-button class="diy-button--export"
-                   size="small"
-                   @click="handleExportModule('room')">下载模板</el-button>
-        <el-upload ref="upload"
-                   class="upload-btn"
-                   action="uploadUlr"
-                   :limit="1"
-                   :accept="'.xls,.xlsx'"
-                   :with-credentials="true"
-                   :show-file-list="false"
-                   :auto-upload="true"
-                   :on-progress="handleProgress"
-                   :on-success="handleExcelSuccess"
-                   :before-upload="beforeExcelUpload"
-                   :http-request="uploadHttpRequest">
-          <el-button size="small"
-                     class="diy-button--delete"
-                     :loading="importLoading">{{ importBtnTitle }}</el-button>
+        <el-button class="diy-button--add" size="small" @click="handleAdd"
+          >新增</el-button
+        >
+        <el-button
+          class="diy-button--export"
+          size="small"
+          @click="handleExportModule('room')"
+          >下载模板</el-button
+        >
+        <el-upload
+          ref="upload"
+          class="upload-btn"
+          action="uploadUlr"
+          :limit="1"
+          :accept="'.xls,.xlsx'"
+          :with-credentials="true"
+          :show-file-list="false"
+          :auto-upload="true"
+          :on-progress="handleProgress"
+          :on-success="handleExcelSuccess"
+          :before-upload="beforeExcelUpload"
+          :http-request="uploadHttpRequest"
+        >
+          <el-button
+            size="small"
+            class="diy-button--delete"
+            :loading="importLoading"
+            >{{ importBtnTitle }}</el-button
+          >
         </el-upload>
 
-        <el-button @click="handleChu"
-                   class="diy-button--reset"
-                   size="small">导出</el-button>
+        <el-button @click="handleChu" class="diy-button--reset" size="small"
+          >导出</el-button
+        >
       </div>
-      <el-table :data="tableData"
-                border
-                style="width: 100%"
-                class="resi-table"
-                :height="maxTableHeight">
-        <el-table-column label="序号"
-                         type="index"
-                         align="center"
-                         width="50" />
-        <el-table-column prop="organizationName"
-                         label="组织名称"
-                         align="center">
+      <el-table
+        :data="tableData"
+        border
+        style="width: 100%"
+        class="resi-table"
+        :height="maxTableHeight"
+      >
+        <el-table-column label="序号" type="index" align="center" width="50" />
+        <el-table-column
+          prop="organizationName"
+          label="组织名称"
+          align="center"
+        >
           <template slot-scope="scope">
-            <a class="name-a"
-               @click="handleWatch(scope.$index)">
+            <a class="name-a" @click="handleWatch(scope.$index)">
               {{ scope.row.organizationName }}
             </a>
           </template>
         </el-table-column>
-        <el-table-column prop="categoryName"
-                         align="center"
-                         label="分类名称">
+        <el-table-column prop="categoryName" align="center" label="分类名称">
         </el-table-column>
-        <el-table-column prop="organizationPersonCount"
-                         align="center"
-                         label="组织人数">
+        <el-table-column
+          prop="organizationPersonCount"
+          align="center"
+          label="组织人数"
+        >
         </el-table-column>
-        <el-table-column prop="serviceItem"
-                         label="服务事项"
-                         align="center"
-                         :show-overflow-tooltip="true">
+        <el-table-column
+          prop="serviceItem"
+          label="服务事项"
+          align="center"
+          :show-overflow-tooltip="true"
+        >
         </el-table-column>
-        <el-table-column prop="score"
-                         width="100"
-                         align="center"
-                         label="积分">
+        <el-table-column prop="score" width="100" align="center" label="积分">
         </el-table-column>
-        <el-table-column prop="principalName"
-                         align="center"
-                         label="负责人">
+        <el-table-column prop="principalName" align="center" label="负责人">
         </el-table-column>
-        <el-table-column prop="principalPhone"
-                         align="center"
-                         label="联系电话">
+        <el-table-column prop="principalPhone" align="center" label="联系电话">
         </el-table-column>
-        <el-table-column prop="remark"
-                         align="center"
-                         label="备注">
+        <el-table-column prop="remark" align="center" label="备注">
         </el-table-column>
-        <el-table-column prop="organizationCreatedTime"
-                         align="center"
-                         label="创建时间">
+        <el-table-column
+          prop="organizationCreatedTime"
+          align="center"
+          label="创建时间"
+        >
         </el-table-column>
-        <el-table-column fixed="right"
-                         label="操作"
-                         align="center"
-                         width="160">
+        <el-table-column fixed="right" label="操作" align="center" width="160">
           <template slot-scope="scope">
             <!-- <el-button
               @click="handleWatch(scope.$index)"
@@ -137,64 +147,87 @@
               size="small"
               >查看</el-button
             > -->
-            <el-button type="text"
-                       class="div-table-button--detail"
-                       size="small"
-                       @click="handleScore(scope.row)">积分记录</el-button>
-
-            <el-button @click="handleEdit(scope.$index)"
-                       type="text"
-                       size="small"
-                       class="div-table-button--edit">修改</el-button>
-
-            <el-popconfirm title="删除之后无法回复，确认删除？"
-                           @onConfirm="handleDel(scope.row, scope.$index)"
-                           @confirm="handleDel(scope.row, scope.$index)">
-              <el-button slot="reference"
-                         type="text"
-                         size="small"
-                         class="div-table-button--delete"
-                         style="margin-left: 10px">删除</el-button>
+            <el-button
+              type="text"
+              class="div-table-button--detail"
+              size="small"
+              @click="handleScore(scope.row)"
+              >积分记录</el-button
+            >
+
+            <el-button
+              @click="handleEdit(scope.$index)"
+              v-if="scope.row.agencyId == $store.state.user.agencyId"
+              type="text"
+              size="small"
+              class="div-table-button--edit"
+              >修改</el-button
+            >
+
+            <el-popconfirm
+              title="删除之后无法回复，确认删除？"
+              v-if="scope.row.agencyId == $store.state.user.agencyId"
+              @onConfirm="handleDel(scope.row, scope.$index)"
+              @confirm="handleDel(scope.row, scope.$index)"
+            >
+              <el-button
+                slot="reference"
+                type="text"
+                size="small"
+                class="div-table-button--delete"
+                style="margin-left: 10px"
+                >删除</el-button
+              >
             </el-popconfirm>
           </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="parseInt(pageSize)"
-                       layout="sizes, prev, pager, next, total"
-                       :total="total">
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page.sync="pageNo"
+          :page-sizes="[20, 50, 100, 200]"
+          :page-size="parseInt(pageSize)"
+          layout="sizes, prev, pager, next, total"
+          :total="total"
+        >
         </el-pagination>
       </div>
     </el-card>
 
     <!-- 修改弹出框 -->
-    <el-dialog :visible.sync="formShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="formTitle"
-               width="850px"
-               top="5vh"
-               class="dialog-h"
-               @closed="handleClose">
-      <edit-form ref="eleEditForm"
-                 @dialogCancle="handleClose"
-                 @dialogOk="handleEditSuccess"></edit-form>
+    <el-dialog
+      :visible.sync="formShow"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :title="formTitle"
+      width="850px"
+      top="5vh"
+      class="dialog-h"
+      @closed="handleClose"
+    >
+      <edit-form
+        ref="eleEditForm"
+        @dialogCancle="handleClose"
+        @dialogOk="handleEditSuccess"
+      ></edit-form>
     </el-dialog>
 
     <!-- 积分记录 -->
-    <el-dialog :visible.sync="scoreDiaShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="scoreDiaTitle"
-               width="70%"
-               top="5vh"
-               @closed="diaClose">
-      <score-record ref="ref_score"
-                    :serviceType="'community_org'"></score-record>
+    <el-dialog
+      :visible.sync="scoreDiaShow"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :title="scoreDiaTitle"
+      width="70%"
+      top="5vh"
+      @closed="diaClose"
+    >
+      <score-record
+        ref="ref_score"
+        :serviceType="'community_org'"
+      ></score-record>
     </el-dialog>
   </div>
 </template>
@@ -209,7 +242,7 @@ import scoreRecord from "../../../components/scoreRecord.vue";
 
 export default {
   components: { editForm, scoreRecord },
-  data () {
+  data() {
     return {
       openSearch: false,
 
@@ -239,7 +272,7 @@ export default {
     };
   },
   computed: {
-    maxTableHeight () {
+    maxTableHeight() {
       return this.$store.state.inIframe
         ? this.clientHeight - 360 + this.iframeHeigh
         : this.clientHeight - 360;
@@ -257,11 +290,11 @@ export default {
       }
     },
   },
-  mounted () {
+  mounted() {
     this.getTableData();
   },
   methods: {
-    async handleExportModule () {
+    async handleExportModule() {
       let url = "/heart/iccommunityselforganization/import-template-download";
 
       let params = {};
@@ -298,18 +331,18 @@ export default {
         });
     },
     // 上传大图标成功
-    handleExcelSuccess (res, file) {
+    handleExcelSuccess(res, file) {
       if (res.code === 0 && res.msg === "success") {
         console.log("resss---ppp", res);
       } else {
         this.$message.error(res.msg);
       }
     },
-    handleProgress (event, file, fileList) {
+    handleProgress(event, file, fileList) {
       console.log("percentage", file.percentage);
     },
 
-    beforeExcelUpload (file) {
+    beforeExcelUpload(file) {
       console.log("file", file);
       const isType = file.type === "application/vnd.ms-excel";
       const isTypeComputer =
@@ -326,7 +359,7 @@ export default {
       }
       return fileType && isLt1M;
     },
-    async uploadHttpRequest (file) {
+    async uploadHttpRequest(file) {
       this.importLoading = true;
       this.importBtnTitle = "正在上传中...";
       this.$message({
@@ -381,38 +414,38 @@ export default {
       this.$refs.upload.clearFiles();
     },
 
-    handleSizeChange (val) {
+    handleSizeChange(val) {
       console.log(`每页 ${val} 条`);
       this.pageSize = val;
       window.localStorage.setItem("pageSize", val);
       this.getTableData();
     },
-    handleCurrentChange (val) {
+    handleCurrentChange(val) {
       console.log(`当前页: ${val}`);
       this.pageNo = val;
       this.getTableData();
     },
 
-    handleClose () {
+    handleClose() {
       this.formShow = false;
     },
-    handleSearch (val) {
+    handleSearch(val) {
       console.log(this.fmData);
       this.pageNo = 1;
       this.getTableData();
     },
-    resetForm (formName) {
+    resetForm(formName) {
       this.$refs[formName].resetFields();
       this.handleSearch();
     },
-    async handleAdd () {
+    async handleAdd() {
       this.formShow = true;
       await nextTick();
       console.log(this.$refs);
       this.$refs.eleEditForm.initForm("add");
     },
 
-    async handleChu () {
+    async handleChu() {
       const url =
         "/heart/iccommunityselforganization/exportcommunityselforganization";
       const { pageSize, pageNo, fmData } = this;
@@ -448,23 +481,23 @@ export default {
         });
     },
 
-    async handleWatch (rowIndex) {
+    async handleWatch(rowIndex) {
       this.formShow = true;
       await nextTick();
       this.$refs.eleEditForm.initForm("detail", this.tableData[rowIndex]);
     },
 
-    async handleEdit (rowIndex) {
+    async handleEdit(rowIndex) {
       this.formShow = true;
       await nextTick();
       this.$refs.eleEditForm.initForm("edit", this.tableData[rowIndex]);
     },
-    handleEditSuccess () {
+    handleEditSuccess() {
       this.handleClose();
       this.getTableData();
     },
 
-    async handleDel (rowData, rowIndex) {
+    async handleDel(rowData, rowIndex) {
       console.log(rowData, rowIndex);
       const url =
         "/heart/iccommunityselforganization/delcommunityselforganization";
@@ -478,12 +511,12 @@ export default {
         this.$message.success("删除成功！");
         this.getTableData();
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
         // this.$message.success("操作失败！");
       }
     },
 
-    async getTableData () {
+    async getTableData() {
       const url =
         "/heart/iccommunityselforganization/communityselforganizationlist";
       const { pageSize, pageNo, fmData } = this;
@@ -497,23 +530,23 @@ export default {
         this.total = data.total || 0;
         this.tableData = data.list
           ? data.list.map((item) => {
-            return item;
-          })
+              return item;
+            })
           : [];
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
     },
 
     //积分记录
-    handleScore (row) {
+    handleScore(row) {
       this.scoreDiaShow = true;
       this.$nextTick(() => {
         this.$refs.ref_score.initForm(row.orgId);
       });
     },
 
-    diaClose () {
+    diaClose() {
       this.scoreDiaShow = false;
     },
   },
diff --git a/src/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/record.vue b/src/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/record.vue
index 7c3dcd32c..c1704afb6 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/record.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/record.vue
@@ -192,7 +192,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column v-if="!disabled" label="操作" align="center" width="120">
+      <el-table-column v-if="!disabled" fixed="right" label="操作" align="center" width="120">
         <template slot-scope="scope">
           <template v-if="scope.row.isEdit">
             <el-button

From 21181b383f25d7dfed5af177d5fc0448faec465c Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 23 Jun 2022 13:56:22 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E4=BA=94=E5=A4=A7=E5=9B=BE=E5=B1=82?=
 =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visual/communityGovern/fivelayers/mapIndex.vue   | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
index a8cf0094d..0670470bc 100644
--- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
@@ -391,7 +391,7 @@ import { Circle as CircleStyle, Icon, Fill, Stroke, Style, Text } from 'ol/style
 import nextTick from 'dai-js/tools/nextTick'
 import { mapGetters } from "vuex";
 import { Loading } from 'element-ui'; //引入Loading服务
-import { requestPost } from "@/js/dai/request";
+import { requestPost, requestGet } from "@/js/dai/request";
 
 
 import cptTb from "@/views/modules/visual/cpts/tb";
@@ -1030,6 +1030,7 @@ const vueGis = {
 
         this.selInfo = JSON.parse(JSON.stringify(data))
         this.handleShowPopup(coordinate)
+
       } else {
         this.$message.error(msg)
       }
@@ -1125,12 +1126,17 @@ const vueGis = {
       this.getMapTable();
     },
     handleSearch () {
-
+      this.demand.pageNo = 1
+      this.getTable();
+      this.getMapTable();
     },
     //
     handleClickRow (index) {
       let selData = this.tableList[index]
-      mapView.setCenter([selData.longitude, selData.latitude]);
+      if (selData.longitude && selData.latitude) {
+        mapView.setCenter([selData.longitude, selData.latitude]);
+      }
+
       this.clickMapVolunteer(selData)
 
       // alert(index)