Karsa 10 mēneši atpakaļ
vecāks
revīzija
26b9cef8a8

+ 1 - 1
src/views/report_manage/reportV2/components/chapterEditWrapper.vue

@@ -7,7 +7,7 @@
         <li v-if="reportBase.ReportLayout===2&&isCreator" @click="openTerritorySet">
           <el-tooltip
             effect="dark" 
-            :content="$t('ReportManage.ReportList.information_title')" 
+            :content="$t('ReportManage.ReportList.img_set_btn')" 
             placement="top"
           >
             <i class="el-icon-setting" style="color:#0052D9;font-size:20px;"></i>

+ 1 - 1
src/views/report_manage/reportV2/list.vue

@@ -264,7 +264,7 @@
                 >
                   <template v-if="bu.label==='编辑中'">{{ scope.row.Editor || "" }}{{$t(bu.text)}}</template>
 
-                  <template v-if="bu.label==='撤销'">{{scope.row.HasAuth?$t(bu.text):''}}</template>
+                  <template v-else-if="['撤销','取消发布'].includes(bu.label)">{{scope.row.HasAuth?$t(bu.text):''}}</template>
 
                   <a :href="hostapi + '?ReportId=' + parseInt(scope.row.Id)" v-else-if="bu.label=='音频下载A'" 
                     :download="scope.row.VideoName" style="cursor: pointer; color: #4099ef">{{$t('ReportManage.smart_audio_download_btn')}}</a>

+ 6 - 2
src/views/report_manage/reportV2/normalReport/editReport.vue

@@ -216,9 +216,10 @@ export default {
 		/* 当前章节信息 */
 		handleChapterInfo({ selectChapterId,editChapterId }) {
 			this.timer && clearInterval(this.timer);
-
+			
 			this.selectChapterId = selectChapterId;
 			this.editChapterId = editChapterId;
+			this.activeTab='';
 			
 			this.getChapterDetail()
 		},
@@ -263,7 +264,10 @@ export default {
 		/* 章节预览 */
 		handlePreviewChapter() {
 
-      sessionStorage.setItem("reportdtl", JSON.stringify(this.reportInfo));
+      sessionStorage.setItem("reportdtl", JSON.stringify({
+				...this.reportInfo,
+				Abstract:''
+			}));
       let { href } = this.$router.resolve({ path: "/reportdtlV2" });
       window.open(href, "_blank");
 		},

+ 1 - 1
src/views/report_manage/reportV2/smartReport/components/ImgSource.vue

@@ -16,7 +16,7 @@
                     style="width:240px"
                     size="medium"
 				/>
-                <el-select :placeholder="$t('ReportManage.ReportList.select_img_type')" v-model="type" style="width:240px" @change="handleSearch" size="medium" :disabled="defaultType" v-show="!defaultType">
+                <el-select :placeholder="$t('ReportManage.ReportList.select_img_type')" v-model="type" style="width:150px" @change="handleSearch" size="medium" :disabled="defaultType" v-show="!defaultType">
                     <el-option :label="$t('ReportManage.ReportList.page_header_op')" :value="1"></el-option>
                     <el-option :label="$t('ReportManage.ReportList.page_trailer_op')" :value="2"></el-option>
                 </el-select>

+ 16 - 7
src/views/report_manage/reportV2/smartReport/editReport.vue

@@ -429,7 +429,8 @@ export default {
 
 			this.selectChapterId = selectChapterId;
 			this.editChapterId = editChapterId;
-			
+			this.showRight = false;
+            
 			this.getChapterDetail()
 		},
 
@@ -512,7 +513,11 @@ export default {
             let newList = this.conList.map(_ => {
                 if(_.compId===4) {
                     let params = GetQueryString(_.content);
-                    let titleText = $(`.title_iframe${params.code}`)?$(`.title_iframe${params.code}`)[0].innerText:'';
+                    let titleText = ($(`.title_iframe${params.code}`)
+                    &&$(`.title_iframe${params.code}`)[0])
+                        ?$(`.title_iframe${params.code}`)[0].innerText
+                        :'';
+                        
                     return {
                         ..._,
                         titleText
@@ -1122,17 +1127,21 @@ export default {
             return new Promise((resolve,reject)=>{
                 const id=this.$route.query.id||0
                 if(!id) return
+
+                let imgParams = {
+                    HeadImg: this.reportCoopType===1?this.headImg:this.$refs.chapterContRef.reportBase.HeadImg,
+                    EndImg:this.reportCoopType===1?this.endImg:this.$refs.chapterContRef.reportBase.EndImg,
+                    HeadResourceId:this.reportCoopType===1?this.headImgId:this.$refs.chapterContRef.reportBase.HeadResourceId,
+                    EndResourceId:this.reportCoopType===1?this.endImgId:this.$refs.chapterContRef.reportBase.EndResourceId,
+                    CanvasColor:this.reportCoopType===1?this.bgColor:this.$refs.chapterContRef.reportBase.CanvasColor
+                }
                 
                 autosave({
                     ReportId: Number(this.$route.query.id),
                     Content:html,
                     ContentStruct:this.formatContentListElData(),
                     NoChange:this.contentChange?2:1,
-                    HeadImg:this.headImg,
-                    EndImg:this.endImg,
-                    HeadResourceId:this.headImgId,
-                    EndResourceId:this.endImgId,
-                    CanvasColor:this.bgColor
+                    ...imgParams
                 }).then(res=>{
                     if(res.Ret===200){
                         resolve(true)

+ 2 - 1
src/views/report_manage/reportV2/smartReport/reportDetail.vue

@@ -190,7 +190,8 @@ export default {
                     this.layoutBaseInfo['研报作者']=this.reportInfo.Author
                     this.layoutBaseInfo['创建时间']=[2,6].includes(this.reportInfo.State)?this.reportInfo.PublishTime:''
                     if(['preview','previewChapter'].includes(this.$route.query.type)){
-                       this.content=sessionStorage.getItem('smartReportContent')||res.Data.Content
+                       this.content=sessionStorage.getItem('smartReportContent')||res.Data.Content;
+                       this.reportInfo.Abstract = this.$route.query.type==='preview'?this.reportInfo.Abstract : ''; 
                        this.bgColor=this.$route.query.type==='preview'?(sessionStorage.getItem('smartReportContentBg')||res.Data.CanvasColor):''
                     }else{
                         this.content=res.Data.Content