Merge branch 'eta1.8.3_fix'

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>
       
@@ -534,7 +534,7 @@ export default {
       }else {
         this.chapterInfo = {
           id: 0,
-          varietys:[],
+          varietys:this.reportVarietyOpts.map(_ =>_.PermissionId)||[],
           editors:[],
           chapterName:'',
           tags: ''

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

@@ -533,7 +533,7 @@ export default {
     // 获取分类
     getclassifylist() {
       //获取分类列表
-      let params = { CurrentIndex: 0, PageSize: 1000, KeyWord: "" };
+      let params = { CurrentIndex: 0, PageSize: 1000, KeyWord: "",Enabled:1 };
 
       classifylist(params).then((res) => {
         if (res.Ret == 200 && Array.isArray(res.Data.List)) {

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/normalReport/components/ImportETAChart.vue

@@ -8,7 +8,7 @@
             <div class="list-wrap" v-infinite-scroll="handleLoadMore" :infinite-scroll-immediate="true">
  
                 <div class="chart-item" v-for="item in list" :key="item.UniqueCode">
-                    <div class="title">{{item.ChartName}}</div>
+                    <div class="title">{{ currentLang==='en'?item.ChartNameEn:item.ChartName }}</div>
                     <img
                         :src="!item.HaveOperaAuth?$icons.lock_big:item.ChartImage"
                         @click="$emit('insertHtml',item)"

src/views/report_manage/reportV2/normalReport/components/importMyChart.vue

@@ -22,8 +22,8 @@
 		</div>
 		<div class="list" v-infinite-scroll="load" v-if="list.length>0">
             <div class="item" v-for="item in list" :key="item.UniqueCode" @click="handleClickItem">
-                <div class="chartEn-mark" v-show="item.IsEnChart && showEnMark" style="top: 0;left: 0;">En</div>
-                <p class="color_primary">{{ item.ChartName }}</p>
+                <!-- <div class="chartEn-mark" v-show="item.IsEnChart && showEnMark" style="top: 0;left: 0;">En</div> -->
+                <p class="color_primary">{{ currentLang==='en'?item.ChartNameEn:item.ChartName }}</p>
                 <img :src="!item.HaveOperaAuth?$icons.lock_big:item.ChartImage" alt="">
             </div>
 		</div>
@@ -36,6 +36,12 @@
 <script>
 import { mychartInterface } from '@/api/api.js';
 export default {
+    computed: {
+        //语言版本
+       currentLang() {
+           return this.$store.state.lang
+       },
+    },
     data() {
         return {
             myChartClassifyList:[],

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

@@ -550,7 +550,7 @@ export default {
 
 		getclassifylist() {
 			//获取分类列表
-			let params = { CurrentIndex: 1, PageSize: 1000, KeyWord: ''  };
+			let params = { CurrentIndex: 1, PageSize: 1000, KeyWord: '',Enabled:1  };
 			classifylist(params).then((res) => {
 				if (res.Ret == 200 && Array.isArray(res.Data.List)) {
 					this.optionsArr = [];

src/views/report_manage/reportV2/smartReport/components/ImportETAChart.vue

@@ -15,7 +15,7 @@
                 :move="onMoveItemHandle"
             >
                 <div class="chart-item" :comp-data="getCompData(item)" v-for="item in list" :key="item.UniqueCode">
-                    <div class="title">{{item.ChartName}}</div>
+                    <div class="title">{{currentLang==='en'?item.ChartNameEn:item.ChartName}}</div>
                     <div class="img" :style="`backgroundImage:url(${ !item.HaveOperaAuth?$icons.lock_big:item.ChartImage })`"></div>
                 </div>
             </draggable>

src/views/report_manage/reportV2/smartReport/components/ImportMyETAChart.vue

@@ -23,7 +23,7 @@
 		</div>
 		<div class="list" v-infinite-scroll="load" v-if="list.length>0">
             <div class="chart-item" v-for="item in list" :key="item.UniqueCode" @click="handleClickItem">
-                <div class="title">{{item.ChartName}}</div>
+                <div class="title">{{ currentLang==='en'?item.ChartNameEn:item.ChartName }}</div>
                 <div class="img" :style="`backgroundImage:url(${ !item.HaveOperaAuth?$icons.lock_big:item.ChartImage })`"></div>
             </div>
 		</div>
@@ -34,6 +34,12 @@
 <script>
 import { mychartInterface } from '@/api/api.js';
 export default {
+    computed: {
+        //语言版本
+        currentLang() {
+            return this.$store.state.lang
+        }
+    },
     data() {
         return {
             myChartClassifyList:[],

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 _
                 }
             })
             
@@ -690,7 +712,7 @@ export default {
                         resArr.child.push({
                             compId:3,
                             compType:'chart',
-                            content:`${LINK_CHART_URL}?code=${e.UniqueCode}`,
+                            content:`${LINK_CHART_URL}?code=${e.UniqueCode}&lang=${this.currentLang}`,
                             id:this.getCompId(`chart${e.UniqueCode}_`),
                             style:'height:350px',
                             child:[]