Merge branch 'dev-bug-temp'

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,

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,