Merge branch 'preview' of http://120.46.222.128:10021/elink-star/epmet-work-pc into bug_mk

# Conflicts:
#	src/views/dataBoard/cpts/details/yxwxfw.vue

src/views/dataBoard/cpts/details/jmxq.vue

@@ -190,7 +190,7 @@ export default {
 }
 
 .eventWrap {
-  width: 1094px;
+  // width: 1094px;
   height: 798px;
   overflow-y: auto;
   overflow-x: hidden;

src/views/dataBoard/cpts/details/smyd.vue

@@ -207,7 +207,7 @@ export default {
 }
 
 .eventWrap {
-  width: 1094px;
+  // width: 1094px;
   max-height: 798px;
   overflow-y: auto;
   overflow-x: hidden;

src/views/dataBoard/cpts/details/xqwmz.vue

@@ -291,7 +291,7 @@ export default {
 }
 
 .eventWrap {
-  width: 1094px;
+  // width: 1094px;
   max-height: 798px;
   overflow-y: auto;
   overflow-x: hidden;

src/views/dataBoard/cpts/details/yxwxfw.vue

@@ -30,7 +30,7 @@
             </div>
             <div class="eventItem">
               <span>所属组织：</span>
-              <span>{{ formData.principalName }}</span>
+              <span>{{ formData.agencyName || '--'}}</span>
             </div>
             <div class="eventItem">
               <span>服务类型：</span>
@@ -99,6 +99,7 @@ export default {
       item: {},
       loading: false,
       loading1: false,
+      // activities: [],
       zuziTypes: {
         community_org: "社区自组织",
         ic_user_volunteer: "志愿者",
@@ -179,7 +180,16 @@ export default {
             this.$message.error(msg);
           }
         });
-     
+      // this.$http
+      //   .post("/governance/icEvent/process", { icEventId: id })
+      //   .then((res) => {
+      //     const { code, data, msg } = res.data;
+      //     if (code === 0) {
+      //       this.activities = data;
+      //     } else {
+      //       this.$message.error(msg);
+      //     }
+      //   });
     },
   },
 };

src/views/dataBoard/cpts/event-details.vue

@@ -221,6 +221,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    formType: {
+      type: String,
+      default: false,
+    },
   },
 
   data() {
@@ -267,7 +271,7 @@ export default {
     getDetailsData(id) {
       this.loading = true;
       this.$http
-          .post("/governance/icEvent/detail", {icEventId: id})
+          .post(`/governance/${this.formType == '12345'?'icEvent':'icEventOld'}/detail`, {icEventId: id})
           .then((res) => {
             const {code, data, msg} = res.data;
             if (code === 0) {
@@ -279,10 +283,9 @@ export default {
             }
           });
     },
-
     getProcessData(id) {
       this.$http
-          .post("/governance/icEvent/process", {icEventId: id})
+          .post(`/governance/${this.formType == '12345'?'icEvent':'icEventOld'}/process`, {icEventId: id})
           .then((res) => {
             const {code, data, msg} = res.data;
             if (code === 0) {

src/views/dataBoard/cpts/personnel/modules/businessTables/complaint.vue

@@ -17,7 +17,7 @@
       <img width="268px" height="128px" src="~@/assets/images/overview/zanwu.png" />
       <div style="color: #fff">暂无数据</div>
     </div>
-    <eventDetails :showDialog="showDialog" :id="rowId" @close="close" />
+    <eventDetails :showDialog="showDialog" :id="rowId" @close="close" :formType="'12345'" />
     <Pagination
       v-show="total > 0"
       :total="total"

src/views/dataBoard/cpts/personnel/modules/businessTables/reporting-events.vue

@@ -23,7 +23,7 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-    <eventDetails :showDialog="showDialog" :id="this.rowId" @close="close" />
+    <eventDetails :showDialog="showDialog" :formType="'event'" :id="this.rowId" @close="close" />
   </div>
 </template>
 
@@ -45,6 +45,7 @@ export default {
       total: 0,
       rowId: null,
       showDialog: false,
+      
     };
   },
   created() {},

src/views/dataBoard/organizational/jwTree/index.vue

@@ -280,7 +280,7 @@ export default {
     .flowLevel-5 {
       top: 775px;
       height: 180px !important;
-      line-height: 130px;
+      line-height: 180px;
 
       div {
         padding-left: 80px;

src/views/dataBoard/overview/index.vue

@@ -73,8 +73,8 @@
       -- bmysxqk = 不满意事项情况
       -- xqwwcqk = 需求未完成情况
     -->
-    <!-- <MapDialog v-if="isShowMapDialog" ref="MapDialog" :currentLevelData="currentLevelData" :type="mapType"
-               @close="isShowMapDialog = false"/> -->
+    <MapDialog v-if="isShowMapDialog" ref="MapDialog" :currentLevelData="currentLevelData" :type="mapType"
+               @close="isShowMapDialog = false"/>
     <cpt-loading v-show="false"/>
     <MapResourceInfo ref="MapResourceInfo" :currentLevelData="currentLevelData"/>
   </div>