fix bug

src/views/report_manage/reportV2/components/reportEditHeader.vue

@@ -41,11 +41,11 @@
         <!-- 章节报告，只有提交 提交即是发布 -->
         <template v-if="reportInfo&&reportInfo.ReportChapterId">
             <li 
-                class="action-item" 
+                class="action-item editsty" 
                 :class="{'disabled':checkLoading}"
                 @click="$emit('handlePublishOpt')"
             >
-                <img src="~@/assets/img/smartReport/icon01.png" alt="">
+                <img src="~@/assets/img/icons/submit_ico.svg" alt="">
                 <span>{{$t('ReportManage.ReportList.submit_chapter_btn')}}</span>
             </li>
         </template>
@@ -54,32 +54,32 @@
         <template v-else>
             <template v-if="!isApprove||!hasApproveFlow">
                 <li 
-                    class="action-item" 
+                    class="action-item editsty" 
                     :class="{'disabled':checkLoading}"
                     @click="$emit('handlePublishOpt','dsfb')"
                     v-if="permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportManage_publish)"
                     >
-                    <img src="~@/assets/img/smartReport/icon01.png" alt="">
+                    <img src="~@/assets/img/icons/timing_ico.svg" alt="">
                     <span>{{$t('ReportManage.ReportList.scheduled_publish_btn')}}</span>
                 </li>
                 <li 
-                    class="action-item" 
+                    class="action-item editsty" 
                     :class="{'disabled':checkLoading}"
                     @click="$emit('handlePublishOpt','fb')"
                     v-if="permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportManage_publish)"
                 >
-                    <img src="~@/assets/img/smartReport/icon01.png" alt="">
+                    <img src="~@/assets/img/icons/publish_ico.svg" alt="">
                     <span>{{$t('ReportManage.ReportList.publish_btn')}}</span>
                 </li>
             </template>
             <template v-if="isApprove&&hasApproveFlow">
                 <li 
-                    class="action-item" 
+                    class="action-item editsty" 
                     :class="{'disabled':checkLoading}"
                     @click="$emit('handlePublishOpt','submit')"
                     v-if="permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportManage_publish)"
                 >
-                    <img src="~@/assets/img/smartReport/icon01.png" alt="">
+                    <img src="~@/assets/img/icons/submit_ico.svg" alt="">
                     <span>{{$t('ReportManage.ReportList.submission_btn')}}</span>
                 </li>
             </template>

src/views/report_manage/reportV2/normalReport/reportdtl.vue

@@ -30,7 +30,10 @@
 			</block>
 		</div>
 
-		<div class="disclaimer-cont" v-html="configInfo.Disclaimer" v-if="configInfo.Disclaimer"></div>
+		<div class="disclaimer-cont" v-if="configInfo.Disclaimer">
+			<h3>免责声明:</h3>
+			<div v-html="configInfo.Disclaimer"></div>
+		</div>
 
 		<div v-if="linkUrl" style="width:100px;height30px;position:absolute;right:-100px;top:100px;cursor:pointer;">
 			<div v-permission="$route.query.fromPage==='en'
@@ -212,6 +215,9 @@
 			margin-bottom: 20px;
 			padding-bottom: 20px;
 			border-bottom: 1px dashed #ccc;
+			&:last-child {
+				border-bottom:none;
+			}
 			.type{
 				font-size: 15px;
 				color: #fff;
@@ -258,7 +264,12 @@
 		}
 
 		.disclaimer-cont {
-			padding: 0 30px 30px 30px;
+			h3 {
+				margin-bottom: 20px;
+			}
+			border-top: 1px solid #E2E2E2;
+			padding: 30px 0;
+			margin: 0 30px;
 		}
 	}
 </style>

src/views/report_manage/reportV2/smartReport/reportDetail.vue

@@ -47,7 +47,10 @@
                 <div class="html-wrap" v-html="content" v-else></div>
             </template>
 
-            <div class="disclaimer-cont" v-html="configInfo.Disclaimer" v-if="configInfo.Disclaimer"></div>
+            <div class="disclaimer-cont" v-if="configInfo.Disclaimer">
+                <h3>免责声明:</h3>
+			    <div v-html="configInfo.Disclaimer"></div>
+            </div>
 
             <!-- 板尾 -->
             <div class="html-end-img-box" v-if="reportInfo && !!reportInfo.NeedSplice && reportInfo.EndImg&&$route.query.type!=='previewChapter'">
@@ -403,6 +406,9 @@ div{
     .chapter-item{
         padding: 20px 0;
         border-bottom: 1px dashed #ccc;
+        &:last-child {
+            border-bottom:none;
+        }
         .type{
             font-size: 15px;
             color: #fff;
@@ -417,7 +423,12 @@ div{
         }
     }
     .disclaimer-cont {
+        h3 {
+            margin-bottom: 20px;
+        }
+        border-top: 1px solid #E2E2E2;
         padding: 30px 0;
+        margin: 0 30px;
     }
 }
 </style>

src/views/report_manage/reportdtl.vue

@@ -288,7 +288,8 @@
 			h3 {
 				margin-bottom: 20px;
 			}
-			padding: 30px;
+			padding: 30px 0;
+			margin: 0 30px;
 			border-top: 1px solid #E2E2E2;
     }
 	}

src/views/system_manage/etaBaseConfig.vue

@@ -931,7 +931,9 @@ export default {
                         ...{
                             CnPptCoverImgs,
                             EnPptCoverImgs,
-                            WatermarkReport:this.formData.WatermarkReport?'true':'false'
+                            WatermarkReport:this.formData.WatermarkReport?'true':'false',
+                            ReportCenterLogoShow:this.formData.ReportCenterLogoShow?'true':'false',
+                            ReportEnLogoShow:this.formData.ReportEnLogoShow?'true':'false',
                         }
                     }).then(res=>{
                         if(res.Ret!==200) return