fix研报bug

src/views/dataEntry_manage/mixins/chartPublic.js

@@ -2941,8 +2941,7 @@ export const chartSetMixin = {
         let markerValue='';
         if(isXDateAxis) {
           //季节图x轴额外拼个年份
-          let nowYear = ChartType===2 ? new Date(this.tableData[0].DataList[1].DataList
-[0].DataTimestamp).getFullYear() : '';
+          let nowYear = ChartType===2 ? new Date(this.tableData[0].DataList[1].DataList[0].DataTimestamp).getFullYear() : '';
           console.log(nowYear)
           markerValue = ChartType===2 
             ? new Date(`${nowYear}-${_.value}`).getTime()
@@ -3035,6 +3034,7 @@ export const chartSetMixin = {
 				});
 			}
 		},
+
     /* ----自定义上下限相关--- */
         /* 计算y轴上下限 */
         calcYAxislimit(tableData=[]) {

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

@@ -89,7 +89,7 @@
           type="primary" 
           size="small" 
           @click="openAddChapter"
-          v-if="isCreator"
+          v-if="isCreator&&permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportMange_chapter_add)"
         ><!-- 添加章节 -->{{$t('ReportManage.ReportList.btn_add_chap')}}</el-button>
       </div>
       

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

@@ -70,8 +70,8 @@ export default {
         let waterMarkStr= localStorage.getItem('waterMarkStr');
 
         str= this.reportIdInfo.ReportLayout===1 
-          ? `${baseUrl}/reportshare_crm_report?code=${this.reportIdInfo.ReportCode}&flag=${waterMarkStr}`
-          : `${baseUrl}/reportshare_smart_report?code=${this.reportIdInfo.ReportCode}`
+          ? `${baseUrl}/reportshare_crm_report?code=${this.reportIdInfo.ReportCode}&flag=${waterMarkStr}& ${this.reportIdInfo.Title}`
+          : `${baseUrl}/reportshare_smart_report?code=${this.reportIdInfo.ReportCode}& ${this.reportIdInfo.Title}`
       }
       
       return str

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

@@ -514,20 +514,42 @@ export default {
 
         /* 表格标题可修改，保存时获取每个sheet最新的title存进conList */
         formatContentListElData() {
+            console.log(this.conList)
             let newList = this.conList.map(_ => {
-                if(_.compId===4) {
-                    let params = GetQueryString(_.content);
-                    let titleText = ($(`.title_iframe${params.code}`)
-                    &&$(`.title_iframe${params.code}`)[0])
-                        ?$(`.title_iframe${params.code}`)[0].innerText
-                        :'';
-                        
+                if(_.child&&_.child.length) { //一行多个
                     return {
-                        ..._,
-                        titleText
+                        child: _.child.map(subCom => {
+                            if(subCom.compId===4) {
+                                let params = GetQueryString(subCom.content);
+                                let titleText = ($(`.title_iframe${params.code}`)
+                                &&$(`.title_iframe${params.code}`)[0])
+                                    ?$(`.title_iframe${params.code}`)[0].innerText
+                                    :'';
+                                    
+                                return {
+                                    ...subCom,
+                                    titleText
+                                }
+                            }else {
+                                return subCom
+                            }
+                        })
+                    }
+                }else { //一行单个
+                    if(_.compId===4) {
+                        let params = GetQueryString(_.content);
+                        let titleText = ($(`.title_iframe${params.code}`)
+                        &&$(`.title_iframe${params.code}`)[0])
+                            ?$(`.title_iframe${params.code}`)[0].innerText
+                            :'';
+                            
+                        return {
+                            ..._,
+                            titleText
+                        }
+                    }else {
+                        return _
                     }
-                }else {
-                    return _
                 }
             })