diff --git a/src/assets/css/main.css b/src/assets/css/main.css index 008f737..4240aad 100644 --- a/src/assets/css/main.css +++ b/src/assets/css/main.css @@ -319,7 +319,7 @@ a { color: #006699; cursor: pointer; font-weight: bold; - letter-spacing: -0.5px; + letter-spacing: -0.5px; } .art_state_upagain>span:hover { @@ -543,24 +543,19 @@ a { right: -65px; } -.art_file { - border-top: 1px solid #eee; - padding: 20px 0 0 0; - margin: 25px 0 0 0; - -} +.art_file {} .art_file>h4 { - margin: 8px 0 5px 0; + margin: 8px 0 5px 30px; float: left; - width: 116px; - text-align: right; + color: #777; + font-weight: normal; } .art_file>p { - margin: 6px 0 0 20px; + margin: 6px 0 0 10px; margin-bottom: 10px; float: left; } diff --git a/src/components/page/articleList.vue b/src/components/page/articleList.vue index ed70904..bcf7ef0 100644 --- a/src/components/page/articleList.vue +++ b/src/components/page/articleList.vue @@ -7,8 +7,8 @@ -
-
+
+
@@ -26,9 +26,9 @@ New Submission
- + + - - -
-
-

+ + --> +

+
+

ID : {{item.accept_sn}}

-

{{item.title}}

+

{{item.title}}

{{item.type | ellipsis}} - {{item.journalname}} + {{item.journalname}}

Update Time : - {{item.ctime}} + {{item.ctime}}

-
- {{item.state | stateChange}} +
+ + {{item.state,'tst' | stateChange}} + +
+
+ + My Manuscript
-
- Manuscript process - | - Detail - | - Files -
-
+ +
Latest Progress : - {{item.state | stateChange}} - + {{item.state,'tst' | stateChange}} + : click to - Major revision
- -
+ - +

Title :{{artextForm.title}} @@ -109,7 +108,6 @@

Special Issues :{{ artextForm.special_title }}

-

Journal :{{artextForm | journal_me}}

@@ -132,7 +130,7 @@ ORCID iD : {{item.orcid}}

- First author : + First Author : Yes No

@@ -169,14 +167,7 @@

Fund :{{artextForm.fund}}

-
- - OK - - - -

Cover letter :

@@ -224,9 +215,10 @@

- OK + OK +
@@ -259,7 +251,6 @@ authorList_name: '', editVisible: false, artextVisible: false, - artfileVisible: false, Total: 0 }; }, @@ -284,7 +275,6 @@ this.$api .post('api/Article/getArticle', this.query) .then(res => { - console.log(res); this.Total = res.total; for (let i = 0; i < res.data.length; i++) { let date = new Date(parseInt(res.data[i].ctime) * 1000); @@ -308,36 +298,7 @@ addArticle() { this.$router.push('/articleAdd'); }, - //格式化状态输出 - stateFormat(row, column) { - let str = ''; - switch (row.state) { - case 0: - str = this.$t('artstate.state0'); - break; - case 1: - str = this.$t('artstate.state1');; - break; - case 2: - str = this.$t('artstate.state2');; - break; - case 3: - str = this.$t('artstate.state3');; - break; - case 4: - str = this.$t('artstate.state4');; - break; - case 5: - str = this.$t('artstate.state5');; - break; - case 6: - str = this.$t('artstate.state6');; - break; - default: - str = 'error!!'; - } - return str; - }, + // 分页导航 handlePageChange(val) { this.$set(this.query, 'pageIndex', val); @@ -356,14 +317,6 @@ // } }, - tableRowClassName({ - row, - rowIndex - }) { - if (row.editor_act == 1) { - return 'hasChange-row'; - } - }, // 点击稿件进程 esy_mtps(e) { @@ -374,7 +327,7 @@ } }); }, - // 点击稿件内容 + // 点击稿件内容文件 esy_deta(e) { this.$api .post('api/Article/getArticleDetail', { @@ -409,18 +362,12 @@ } } this.authorList_name = "Author : " + alist_name.join(""); - + // 弹出框 this.artextVisible = true - }) .catch(err => { console.log(err); }); - - - }, - // 点击稿件文件 - esy_file(e) { this.$api .post('api/Article/getFilelistByArticleID', { articleId: e @@ -430,15 +377,13 @@ this.picturesAndTablesFileList = res.picturesAndTables; this.manuscirptFileList = res.manuscirpt; this.totalpageFileList = res.totalpage; - - this.artfileVisible = true }) .catch(err => { console.log(err); }); - }, + formatDate(timestamp) { var date = new Date(timestamp * 1000); //时间戳为10位需*1000，时间戳为13位的话不需乘1000 var Y = date.getFullYear() + '-'; @@ -515,65 +460,85 @@ return frag; }, - // 稿件状态 - stateChange(value) { + // 稿件状态,颜色 + stateChange(value, num) { let str = ''; + let sgr = ''; + let skr = ''; + let sfr = ''; + let slr = ''; switch (value) { case 0: - str = 'Received'; + str = '#e1b0271F;'; + sfr = '#e1b0270A;'; + sgr = '#e1b0274D;'; + skr = '#e1b027;'; + slr = 'Received'; break; case 1: - str = 'With editor'; + str = '#5a90e11F;'; + sfr = '#5a90e10A;'; + sgr = '#5a90e14D;'; + skr = '#5a90e1;'; + slr = 'With editor'; break; case 2: - str = 'Under review'; + str = '#5a90e11F;'; + sfr = '#5a90e10A;'; + sgr = '#5a90e14D;'; + skr = '#5a90e1;'; + slr = 'Under review'; break; case 3: - str = 'Reject'; + str = '#8888881F;'; + sfr = '#8888880A;'; + sgr = '#8888884D;'; + skr = '#888888;'; + slr = 'Reject'; break; case 4: - str = 'Revision'; + str = '#5a90e11F;'; + sfr = '#5a90e10A;'; + sgr = '#5a90e14D;'; + skr = '#5a90e1;'; + slr = 'Revision'; break; case 5: - str = 'Accepted'; + str = '#5fab3b1F;'; + sfr = '#5fab3b0A;'; + sgr = '#5fab3b4D;'; + skr = '#5fab3b;'; + slr = 'Accepted'; break; case 6: - str = 'Fininal decision'; + str = '#5a90e11F;'; + sfr = '#5a90e10A;'; + sgr = '#5a90e14D;'; + skr = '#5a90e1;'; + slr = 'Fininal decision'; break; default: - str = 'error!!'; + str = '#8888881F;'; + sfr = '#8888880A;'; + sgr = '#8888884D;'; + skr = '#888888;'; + slr = 'error!!'; } - return str; - }, - // 稿件状态颜色 - stateColor(value) { - let str = ''; - switch (value) { - case 0: - str = 'background-color: #B5C334;'; - break; - case 1: - str = 'background-color: #f75822;'; - break; - case 2: - str = 'background-color: #0ebee1;'; - break; - case 3: - str = 'background-color: #f3170f;'; - break; - case 4: - str = 'background-color: #5a90e1;'; - break; - case 5: - str = 'background-color: #91cc75;'; - break; - case 6: - str = 'background-color: #27727B;'; - break; - default: - str = 'background-color: #888;'; + if (num == '1') { + return 'border-color:'+sgr; + } + if (num == '2') { + return 'background-color:'+sfr; + } + if (num == '3') { + return 'background-color:'+str; + } + if (num == '4') { + return 'color:'+skr; + } + if (num == 'tst') { + return slr; } - return str; }, journal_me(e) { var frag = e.journalname; @@ -640,15 +605,23 @@ color: #333; margin: 0 0 20px 0; font-size: 14px; - position: relative; + /* position: relative; */ border-radius: 5px; border: 1px solid #EBEEF5; + background-color: #fff; } .mangu_list .man_title { margin: 10px 0 18px 0; font-weight: bolder; + letter-spacing: -0.5px; font-size: 16px; + cursor: pointer; + display: inline-block; + } + + .mangu_list .man_title:hover { + text-decoration: underline; } .mangu_list .man_con { @@ -660,7 +633,7 @@ font-size: 12px; margin: 0 25px 0 0; color: #006699; - background-color: #d4f1ff; + background-color: #e0edf3; padding: 2px 8px; } @@ -669,13 +642,16 @@ right: 0; top: 0; color: #fff; - padding: 5px 15px; + text-align: center; + padding: 6px 18px; + letter-spacing: -0.5px; border-top-right-radius: 3px; + /* border-top-left-radius: 3px; */ } .mangu_list .man_progess { padding: 15px 20px; - border-top: 1px solid #EBEEF5; + border-top: 1px solid #5a90e126; } @@ -686,8 +662,8 @@ .mangu_list .man_btn { color: #006699; position: absolute; - bottom: 70px; - right: 20px; + bottom: 25px; + right: 25px; font-size: 15px; } @@ -705,4 +681,8 @@ .mangu_list .man_btn font { margin: 0 18px; } + + .art_state_message { + margin: 0 20px 0 0; + } diff --git a/src/components/page/articleProcess.vue b/src/components/page/articleProcess.vue index c303fd4..e166237 100644 --- a/src/components/page/articleProcess.vue +++ b/src/components/page/articleProcess.vue @@ -101,7 +101,7 @@ articleId: this.$route.query.id, userName: localStorage.getItem('U_name'), loading: false, - reverse: false, + reverse: true, artMes: { articleId: this.$route.query.id }, diff --git a/src/components/page/articleProcessRevision.vue b/src/components/page/articleProcessRevision.vue index de305fd..705965b 100644 --- a/src/components/page/articleProcessRevision.vue +++ b/src/components/page/articleProcessRevision.vue @@ -16,7 +16,7 @@

- ID : {{artMes.accept_sn}} + ID : {{artMes.accept_sn}} {{artMes.title}} Manuscript Detail @@ -42,10 +42,9 @@ Coment from editor

- files 202-50-60 -
-
- files 202-50-60 + + files + 202-50-60
@@ -54,52 +53,51 @@
author
-

Manuscirpt :

+

Cover letter :

-

Click Upload
-
Only pdf and word files can be uploaded(.pdf,.doc,.docx)
+
Only pdf and word files can be uploaded (.pdf,.doc,.docx)


-

manuscirptFileList :

+

Manuscirpt :

-

Click Upload
-
Only word and compressed files(.doc,.docx,.rar,.zip)
+
Only word and compressed files (.doc,.docx,.rar,.zip)


Figures :

- +

Click Upload
-
Only compressed files can be uploaded(.rar,.zip)
+
Only compressed files can be uploaded (.rar,.zip)


Title page :

- +

Click Upload
-
Only word and compressed files(.doc,.docx,.rar,.zip)
+
Only word and compressed files (.doc,.docx,.rar,.zip)


@@ -112,19 +110,19 @@

Communication

-
-
+
+

- Author : + Editor :

{{ item.ad_content }}

 {{formatDate(item.ad_ctime)}}
-
+

- Editor : + Author :

{{ item.ad_content }}

@@ -146,9 +144,8 @@
- +
-

Basic information

Title :{{artMes.title}}

@@ -183,7 +180,7 @@ ORCID iD : {{item.orcid}}

- First author : + First Author : Yes No

@@ -214,7 +211,7 @@

Abstrart :{{artMes.abstrart}}

-

+

KeyWords :{{artMes.keyWords}}

@@ -222,8 +219,60 @@

+
+

Cover letter :

+

+ + + + Uploader : {{item.username}} + {{formatDate(item.ctime)}} + + + +

+
+

Figures :

+

+ + + + Uploader : {{item.username}} + {{formatDate(item.ctime)}} + + + +

+
+

Title page :

+

+ + + + Uploader : {{item.username}} + {{formatDate(item.ctime)}} + + + +

+
+

Manuscirpt :

+

+ + + + Uploader : {{item.username}} + {{formatDate(item.ctime)}} + + + +

+
+
+ + OK + -
@@ -247,7 +296,11 @@ article_id: this.$route.query.id, ad_content: '' }, - talkMsgs: [] + talkMsgs: [], + coverLetterFileList: [], + picturesAndTablesFileList: [], + totalpageFileList: [], + manuscirptFileList: [], }; }, created: function() { @@ -315,6 +368,23 @@ console.log(err); }); + + //初始化filelist + this.$api + .post('api/Article/getFilelistByArticleID', { + articleId: this.articleId + }) + .then(res => { + this.coverLetterFileList = res.coverLetter; + this.picturesAndTablesFileList = res.picturesAndTables; + this.manuscirptFileList = res.manuscirpt; + this.totalpageFileList = res.totalpage; + }) + .catch(err => { + console.log(err); + }); + + // 留言板列表 this.$api .post('api/Article/getArticleDialogs', { @@ -360,7 +430,7 @@ this.initarticle() }); }, - + // 上传文件 onSubmit() { this.$refs.articleform.validate((valid) => { @@ -402,8 +472,8 @@ } }); }, - - + + //检验上传文件的格式 beforeupload_coverLetter(file) {}, beforeupload_picturesAndTables(file) {}, @@ -462,9 +532,9 @@ removefilemanuscirpt(file, fileList) { this.msgform.manuscirpt = ''; }, - - - + + + statetostr(mystate) { let str = ''; switch (mystate) { @@ -600,6 +670,10 @@ font-style: normal; } + .art_suthor_message .det_cssep:hover { + text-decoration: underline; + } + .art_author_ { border: 1px solid #dcdfe6; border-radius: 5px; @@ -616,7 +690,7 @@ .art_author_list { border-bottom: 1px solid #dcdfe6; - padding: 15px 0 25px 0; + padding: 15px 0 25px 10px; } .art_author_list b { @@ -641,25 +715,39 @@ } .art_author_peng { - margin: 20px 0 10px 0; + margin: 20px 0 10px 10px; line-height: 24px; } + .art_author_peng>img { + width: 15px; + vertical-align: text-bottom; + margin: 0 10px 0 0; + } + .art_author_peng span { color: #888; margin: 0 0 0 15px; } - .art_author_btn>div{ + + .art_author_btn>div { margin-bottom: 30px; color: #006699; } - .art_author_btn>h4{ + + .art_author_btn>h4 { float: left; - width: 170px; + width: 110px; + padding: 8px 0 0 0; } - .art_author_btn>p{ + + .art_author_btn>p { float: left; - margin: 0 0 30px 0; + margin: 0 0 30px 0; + } + + .el-upload__tip { + margin-left: 6px; }