diff --git a/src/api/index.js b/src/api/index.js index fa6d863..2698668 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -19,8 +19,8 @@ const service = axios.create({ // baseURL: 'https://submission.tmrjournals.com/', //正式 记得切换 // baseURL: 'http://www.tougao.com/', //测试本地 记得切换 // baseURL: 'http://192.168.110.110/tougao/public/index.php/', - baseURL: '/api', //本地 - // baseURL: '/', //正式 + // baseURL: '/api', //本地 + baseURL: '/', //正式 }); diff --git a/src/components/page/articleDetailEditor.vue b/src/components/page/articleDetailEditor.vue index 3aa9106..b25f3cf 100644 --- a/src/components/page/articleDetailEditor.vue +++ b/src/components/page/articleDetailEditor.vue @@ -2688,11 +2688,11 @@ this.FinalDecisionVisible=true border: 1px solid #dcdfe6; border-radius: 5px; background-color: #fff; - padding: 20px; + padding: 15px; } .art_caozuo_ { margin-top: 0; - padding: 15px; + padding: 5px 15px; } .art_caozuo_ > div { margin: 0 0 10px 0px; @@ -3079,7 +3079,7 @@ td { white-space: normal; } .kuang_communtion { - margin-bottom: 20px; + margin-bottom: 15px; } ::v-deep .under_review .el-icon-arrow-right{ right: 0px !important; diff --git a/src/components/page/articleListEditor_B1.vue b/src/components/page/articleListEditor_B1.vue index 02d9be3..d1792e1 100644 --- a/src/components/page/articleListEditor_B1.vue +++ b/src/components/page/articleListEditor_B1.vue @@ -149,9 +149,7 @@ :toolbar="['bold italic |customBlue removeBlue|myuppercase myuppercasea Line|subscript superscript|clearButton']" style=" line-height: 12px; - overflow: auto; - font-size: 13px; /* 字体大小 */ margin-top: 0pt; /* 段前间距 */ margin-bottom: 0pt; /* 段后间距 */ @@ -1560,6 +1558,12 @@ this.abstract = '' if (res.code == 0) { this.detailMes = res.data.production; this.abstract = res.data.production.abstract; + if(this.abstract != ''){ + this.$nextTick(()=>{ + this.$refs.tinymceChild1.setContent(this.abstract); + }) + + } this.UpTyFIle = res.data.production.file_pdf; this.getArticleFinal(res.data.production.article_id); if (res.data.production.icon != '') { diff --git a/src/components/page/components/Tinymce/index.vue b/src/components/page/components/Tinymce/index.vue index 0f264dd..1b114b2 100644 --- a/src/components/page/components/Tinymce/index.vue +++ b/src/components/page/components/Tinymce/index.vue @@ -691,6 +691,7 @@ export default { }, //设置内容 setContent(value) { + window.tinymce.get(this.tinymceId).setContent(value); }, //获取内容