项目详情布局调整

src/assets/scss/modules/visual/incident-info.scss

@@ -120,6 +120,11 @@
     margin: 10px 0;
     display: flex;
     padding-left: 15px;
+    .info-title-2 {
+      width: 70px;
+      flex: 0 0 1;
+      font-size: 14px;
+    }
 
     > span,
     > div {

src/assets/scss/modules/visual/issue-info.scss

@@ -73,10 +73,14 @@
     margin: 10px 0;
     display: flex;
     padding-left: 15px;
-
+    .info-title-2 {
+      width: 90px;
+      flex: 0 0 1;
+      font-size: 14px;
+    }
     .info-pics {
       display: flex;
-      margin: 20px 0;
+      margin: 10px 0;
       img {
         display: block;
         width: 32%;

src/views/modules/visual/communityGovern/cpt/issue-info.vue

@@ -15,16 +15,17 @@
           <div class="m-info">
 
             <div class="info-prop">
-              <span>议题标题：</span>
+              <span class="info-title-2">议题标题：</span>
               <span>{{ info.issueTitle }}</span>
             </div>
             <div class="info-prop">
-              <span>议题建议：</span>
+              <span class="info-title-2">议题建议：</span>
               <span>{{ info.issueSuggestion }}</span>
             </div>
 
             <div class="info-prop">
-              <span>话题内容：</span>
+              <span class="info-title-2">话题内容：</span>
+              <div>
                 <div>{{ info.topicInfo.topicContent }}</div>
                 <div v-if="info.topicInfo.topicImgs&&info.topicInfo.topicImgs.length>0"
                      class="info-pics">
@@ -33,28 +34,29 @@
                        v-for="src in info.topicInfo.topicImgs" />
                 </div>
               </div>
+            </div>
             <div class="info-prop">
-              <span>转议题时间：</span>
+              <span class="info-title-2">转议题时间：</span>
               <span>{{ info.shiftIssueTime}}</span>
             </div>
             <div class="info-prop">
-              <span>所属网格：</span>
+              <span class="info-title-2">所属网格：</span>
               <span>{{ info.belongsGridName}}</span>
             </div>
             <div class="info-prop">
-              <span>话题发表人：</span>
+              <span class="info-title-2">话题发表人：</span>
               <span>{{ info.topicInfo.publishedUser}}</span>
             </div>
             <div class="info-prop">
-              <span>议题发起人：</span>
+              <span class="info-title-2">议题发起人：</span>
               <span>{{ info.issueInitiator}}</span>
             </div>
             <div class="info-prop">
-              <span>话题来源：</span>
+              <span class="info-title-2">话题来源：</span>
               <span>{{ info.topicInfo.groupName}}</span>
             </div>
             <div class="info-prop">
-              <span>话题发表时间：</span>
+              <span class="info-title-2">话题发表时间：</span>
               <span>{{ info.topicInfo.publishedTimeShow}}</span>
             </div>
           </div>

src/views/modules/visual/communityGovern/cpt/project-info.vue

@@ -193,20 +193,25 @@
                        @click="watchImg(src)" />
                 </div>
                 <div class="info-prop">
-                  <span>提交时间：</span>
+                  <span class="info-title-2">提交时间：</span>
                   <span>{{ info.eventTime }}</span>
                 </div>
                 <div class="info-prop">
-                  <span>报事人：</span>
+                  <span class="info-title-2">报事人：</span>
                   <span>{{ info.eventPeopleName }}</span>
                 </div>
                 <div class="info-prop">
-                  <span>所属网格：</span>
+                  <span class="info-title-2">所属网格：</span>
                   <span>{{ info.gridName }}</span>
                 </div>
                 <div class="info-prop">
-                  <span>提报给：</span>
-                  <span>{{ info.eventPerson.join("、") || "--" }}</span>
+                  <span class="info-title-2">提报给：</span>
+                  <div>
+                    <div>{{ info.eventPersonShow}}</div>
+                    <div>{{ info.eventOrgShow}}</div>
+                  </div>
+
+                  <!-- <span>{{ info.eventPerson.join("、") || "--" }}</span> -->
                 </div>
               </div>
 
@@ -530,7 +535,15 @@ export default {
       });
 
       if (code === 0) {
-        this.info = data;
+
+        if (data.eventOrg && data.eventOrg.length > 0) {
+          data.eventOrgShow = data.eventOrg.join('、')
+        }
+        if (data.eventPerson && data.eventPerson.length > 0) {
+          data.eventPersonShow = data.eventPerson.join('、')
+        }
+        this.info = { ...data };
+
       } else {
         this.$message.error(msg);
       }
@@ -592,7 +605,7 @@ export default {
 
         let array1 = []
         let array2 = []
-        // debugger
+
         //楼院小组、居民上报都存在是，研判分析显示两个分支
         if (data.groupProjectList && data.groupProjectList.length > 0 && data.eventProjectList && data.eventProjectList.length > 0) {
           this.yanPan.hasEvent = true

src/views/modules/visual/communityGovern/resibuzz.vue

@@ -31,12 +31,11 @@
 
     <div class="g-cpt-resi">
       <div class="g-l">
-        <screen-echarts-frame v-if="!pieNoData && !dataLoading"
+        <screen-echarts-frame v-if=" !dataLoading"
                               class="echart-wr"
                               @myChartMethod="pieInitOk"
                               ref="pieChart"></screen-echarts-frame>
-        <screen-nodata class="nodata"
-                       v-if="pieNoData && !dataLoading"></screen-nodata>
+
         <div class="table-status"
              v-if="dataLoading">
           <screen-loading>加载中</screen-loading>
@@ -92,7 +91,6 @@ export default {
   data () {
     return {
       dataLoading: true,
-      pieNoData: false,
 
       pieChartS: null,
       pieChart: '',
@@ -365,7 +363,7 @@ export default {
       this.pieTotal = 0
 
       if (this.pieData.length > 0) {
-        this.pieNoData = false
+        this.$refs.pieChart.setNoData(false)
         const _that = this
         let maxIndex = 0
         let maxValue = this.pieData[0].count
@@ -402,7 +400,7 @@ export default {
         }
         this.$refs.pieChart.handleClick(fun)
       } else {
-        this.pieNoData = true
+        this.$refs.pieChart.setNoData(true)
       }
 
     },

src/views/modules/visual/components/screen-echarts-frame/index.vue

@@ -1,8 +1,9 @@
 <template>
   <div>
-    <div class="screenEchartsFrame"
+    <div v-show="!noData"
+         class="screenEchartsFrame"
          ref="screenEchartsFrame"></div>
-    <screen-nodata v-if="noData"
+    <screen-nodata v-show="noData"
                    class="nodata"></screen-nodata>
   </div>
 </template>
@@ -55,6 +56,7 @@ export default {
     },
     //没有数据
     setNoData (nodata) {
+
       this.noData = nodata
     },