From 1f82b16fd4daae788b0ef1c0b4d850f50aa2ccb3 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 26 Jan 2022 14:15:15 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=A4=84=E7=90=86=E5=88=86?=
 =?UTF-8?q?=E6=9E=90-=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityGovern/cpt/project-info.vue      |  2 +-
 .../visual/communityGovern/processAnalyze.vue | 27 ++++++++++++++-----
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/views/modules/visual/communityGovern/cpt/project-info.vue b/src/views/modules/visual/communityGovern/cpt/project-info.vue
index 2645a050..eca674d0 100644
--- a/src/views/modules/visual/communityGovern/cpt/project-info.vue
+++ b/src/views/modules/visual/communityGovern/cpt/project-info.vue
@@ -23,7 +23,7 @@
             </div>
             <div class="info-prop">
               <span>项目方案：</span>
-              <span>{{ projectInfo.projectTitle }}</span>
+              <span>{{ projectInfo.publicReply }}</span>
             </div>
             <div class="info-prop">
               <span>内部备注：</span>
diff --git a/src/views/modules/visual/communityGovern/processAnalyze.vue b/src/views/modules/visual/communityGovern/processAnalyze.vue
index d55502af..c3ebd7a4 100644
--- a/src/views/modules/visual/communityGovern/processAnalyze.vue
+++ b/src/views/modules/visual/communityGovern/processAnalyze.vue
@@ -446,22 +446,37 @@ export default {
 
       if (code === 0) {
         let projectInfo = data;
+        projectInfo = {
+          projectTitle: data.projectTitle ? data.projectTitle : '--',
+          backGround: data.backGround ? data.backGround : '--',
+          publicReply: data.publicReply ? data.publicReply : '--',
+          internalRemark: data.internalRemark ? data.internalRemark : '--',
+          departmentNameList: (data.departmentNameList && data.departmentNameList.length > 0) ? data.departmentNameList.join('、') : '--',
+          projectCate: (data.projectCate && data.projectCate.length > 0) ? data.projectCate.join('、') : '--',
+          projectTag: (data.projectTag && data.projectTag.length > 0) ? data.projectTag.join('、') : '--',
+        }
         let showData = `
                 <div style='font-size:16px; color:#FFFFFF;'>项目信息</div>
                 <div style='font-size:12px; color:#FFFFFF;margin-top:10px'>项目标题：
-                  <span>`+ data.projectTitle + `</span>
+                  <span>`+ projectInfo.projectTitle + `</span>
                 </div>
                 <div style='font-size:12px; color:#FFFFFF;margin-top:5px'>项目背景：
-                  <span>`+ data.backGround + `</span>
+                  <span>`+ projectInfo.backGround + `</span>
                 </div>
                 <div style='font-size:12px; color:#FFFFFF;margin-top:5px'>项目方案：
-                  <span>`+ data.projectTitle + `</span>
+                  <span>`+ projectInfo.projectTitle + `</span>
                 </div>
                 <div style='font-size:12px; color:#FFFFFF;margin-top:5px'>内部备注：
-                  <span>`+ data.internalRemark + `</span>
+                  <span>`+ projectInfo.internalRemark + `</span>
+                </div> 
+                <div style='font-size:12px; color:#FFFFFF;margin-top:5px'>处理部门：
+                  <span>`+ projectInfo.departmentNameList + `</span>
+                </div> 
+                <div style='font-size:12px; color:#FFFFFF;margin-top:5px'>分类：
+                  <span>`+ projectInfo.projectCate + `</span>
                 </div> 
-                <div style='font-size:12px; color:#FFFFFF;margin-top:5px'>当前处理部门：
-                  <span>`+ data.departmentNameList.join("、") + `</span>
+                <div style='font-size:12px; color:#FFFFFF;margin-top:5px'>标签：
+                  <span>`+ projectInfo.projectTag + `</span>
                 </div> 
             
                 `