From b979339072e4b0e39db5b7b31da42b0a74ba24d2 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Mon, 27 Jun 2022 14:10:34 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83-?=
 =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E4=BA=8B=E4=BB=B6=20=E6=94=B9=E6=9D=A5?=
 =?UTF-8?q?=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visual/basicinfo/cpts/incident-info.vue       | 15 +++++++++++++--
 src/views/modules/visual/basicinfo/people.vue     | 10 +++++++++-
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/visual/basicinfo/cpts/incident-info.vue b/src/views/modules/visual/basicinfo/cpts/incident-info.vue
index f3a86089..9dda7949 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 c754ff01..03b9a57e 100644
--- a/src/views/modules/visual/basicinfo/people.vue
+++ b/src/views/modules/visual/basicinfo/people.vue
@@ -811,7 +811,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,

From a987177c17a236d045d80c9cceccaa03dc24b670 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Mon, 27 Jun 2022 17:18:58 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83-?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E6=9D=A5=E6=BA=90=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/visual/basicinfo/people.vue | 61 ++++++++++++-------
 1 file changed, 38 insertions(+), 23 deletions(-)

diff --git a/src/views/modules/visual/basicinfo/people.vue b/src/views/modules/visual/basicinfo/people.vue
index 03b9a57e..e0a9cea6 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) {