编辑端显示补充

src/components/page/Editor_For_Major.vue

@@ -38,14 +38,14 @@
 						</p>
 					</template>
 				</el-table-column>
-				<!-- <el-table-column label="Personal introduction" align="center">
+				<el-table-column label="Title" align="center">
 					<template slot-scope="scope">						
 						<p class="tab_tie_col">
-							<span>Field: </span> 
+							<!-- <span>Field: </span>  -->
-							{{scope.row.research_areas}}
+							{{scope.row.editor_title}}
 						</p>						 
 					</template>
-				</el-table-column> -->
+				</el-table-column>
 				<el-table-column label="H-WOS"  align="center">
 					<template slot-scope="scope">
 						<p v-html="colorIndex(scope.row.wos_index,scope.row.wos_time)"></p>
@@ -65,11 +65,11 @@
 								Detail
 							</el-button>
 						</div>
-						<!-- <div style="margin: 0 0 10px 0;">
+						<div style="margin: 0 0 10px 0;">
 							<el-button type="success" plain icon="el-icon-edit"  @click="editHandle(scope.row)">
 								Edit
 							</el-button>
-						</div> -->
+						</div>
 						<div>
 							<el-button type="danger" plain icon="el-icon-delete" @click="reneDelete(scope.row)">Delete
 							</el-button>
@@ -113,6 +113,12 @@
 							:value="item.journal_id"></el-option>
 					</el-select>
 				</el-form-item>
+				<el-form-item label="Title :" prop="title">
+					<el-select v-model="addForm.title" placeholder="Please select a title" style="width: 270px;">
+						<el-option v-for="item in titleList" :label="item.name" :key="item.name"
+							:value="item.name"></el-option>
+					</el-select>
+				</el-form-item>
 				<!-- <el-form-item label="Personal introduction :" >
 					<el-input type="textarea" v-model="addForm.areas" placeholder="Please enter"></el-input>
 				</el-form-item>				 -->
@@ -126,8 +132,12 @@
 		<!-- 编辑弹出框 -->
 		<el-dialog title="Edit Editors & Staff" :visible.sync="editvisible" width="600px" @close="editClose()">
 			<el-form ref="addForm1" :model="addForm1"  label-width="150px" >			
-				<el-form-item label="Personal introduction :" >
+				
-					<el-input type="textarea" v-model="addForm1.areas" placeholder="Please enter"></el-input>
+				<el-form-item label="Title :" prop="editor_title">
+					<el-select v-model="addForm1.editor_title" placeholder="Please select a title" style="width: 270px;">
+						<el-option v-for="item in titleList" :label="item.name" :key="item.name"
+							:value="item.name"></el-option>
+					</el-select>
 				</el-form-item>
 			</el-form>
 
@@ -160,6 +170,11 @@
 				Total: 0,
 				df_jour: [],
 				df_year: [],
+				titleList:[
+					{name:'Production Editor'},
+					{name:'Assistant Editor'},
+					{name:'Managing Editor'}
+				],
 				list_year: [{
 					title: '1 Year',
 					id: 1
@@ -179,8 +194,8 @@
 					account: '',					
 				},
 				addForm1:{
-					ctj_id: null,
+					etj_id: null,
-					areas:''
+					editor_title:''
 				},
 				editvisible:false,
 				reneForm: {
@@ -227,23 +242,23 @@
 			// 关闭编辑弹窗
 			editClose(){				
 				this.editvisible = false
-				this.addForm1.ctj_id = null,
+				this.addForm1.etj_id = null,
-				this.addForm1.areas = ''
+				this.addForm1.editor_title = ''
 			},
 			// 显示编辑弹出框
 			editHandle(val){				
 				this.editvisible = true
 				this.$nextTick(function() {					
-					this.addForm1.ctj_id = val.ctj_id
+					this.addForm1.etj_id = val.etj_id
-					this.addForm1.areas = val.research_areas
+					this.addForm1.editor_title = val.editor_title
 				})
 			},
 			// 提交编辑弹窗
 			saveEdit(){
 				this.$api
-					.post('api/User/editCommittee', {
+					.post('api/User/editEditorToJournal', {
-						'ctj_id': this.addForm1.ctj_id,
+						'etj_id': this.addForm1.etj_id,
-						'research_areas': this.addForm1.areas
+						'editor_title': this.addForm1.editor_title
 					})
 					.then(res => {
 						if (res.code == 0) {
@@ -347,11 +362,13 @@
 							spinner: 'el-icon-loading',
 							background: 'rgba(0, 0, 0, 0.7)'
 						});		
+						// console.log(this.addForm,'this.addForm')									
 						this.$api
 							.post('api/User/addEditorToJournal', 
 							{ 
 								'user_id': this.addForm.user_id,
 								'journal_id': this.addForm.journal_id,
+								'editor_title': this.addForm.title
 								//'research_areas': this.addForm.areas
 						 })
 							.then(res => {

src/components/page/editorBorder.vue

@@ -29,10 +29,35 @@
 					Add new board</el-button>
 			</div>
 
+			<!-- 期刊基本信息 -->
+			<el-card shadow="never" style="margin-bottom: 20px; border-color: #409EFF;" class="jourInfoBox" v-if="journalInfo.title">
+				<el-row :gutter="20">
+					<el-col :span="24" class="jourInfo">
+						<div class="" style="vertical-align: top;"><span>Journal : </span>
+							<el-link type="primary" :href="journalInfo.website" v-if="journalInfo.website !=''" target="_blank">
+								<em>{{journalInfo.title}}({{journalInfo.abbr}})</em>
+							</el-link></div>
+						<div class=""><span>Editor-in-Chief : </span><em>{{journalInfo.editorinchief}}</em></div>
+						<div class=""><span>Email : </span><em>{{journalInfo.email}}</em></div>
+					</el-col>
+					<el-col :span="24">
+						<div class="lieitem">
+							<span>Hindex: <em>{{journalInfo.index_num}} / {{ journalInfo.boards_count }}</em></span>
+							<span>Median: <em>{{journalInfo.median}}</em></span>
+							<span>Avg: <em>{{journalInfo.avg}}</em></span>
+						</div>
+					</el-col>
+					<!-- <el-col :span="6"><div class=""><span>Website: </span><em>{{journalInfo.website}}</em></div></el-col>
+					<el-col :span="6"><div class=""><span>Aim_web: </span><em>{{journalInfo.aim_web}}</em></div></el-col> -->
+				</el-row>
+			</el-card>
+			<!-- end -->
+
 			<el-table :data="tableData_0" border stripe class="table nullTable" ref="multipleTable"
 				header-cell-class-name="table-header" empty-text="New messages (0)">
 				<el-table-column prop="name" label="Realname"></el-table-column>
 				<el-table-column prop="email" label="Email"></el-table-column>		
+				<el-table-column label="Contributions" align="center"></el-table-column>		
 				<!-- <el-table-column prop="hindex" label="H-WOS" width="110px" align="center"></el-table-column> -->
 				<el-table-column prop="ghindex" label="H-Google" width="110px" align="center"></el-table-column>
 				<!-- <el-table-column label="Grade" width="110px" align="center"></el-table-column> -->
@@ -50,6 +75,15 @@
 					</template>
 				</el-table-column>
 				<el-table-column prop="email" label="Email"></el-table-column>
+				<el-table-column label="Contributions"  align="center">
+					<template slot-scope="scope">
+						<div class="flexbox">
+							<div>Articles: <em v-if="scope.row.articles.length > 0">{{scope.row.articles.length}}</em><em v-else>0</em> /
+								<em v-if="scope.row.articles_all.length > 0">{{scope.row.articles_all.length}}</em><em v-else>0</em></div>
+							<div>Reviewes: <em v-if="scope.row.reviewes.length > 0">{{scope.row.reviewes.length}}</em><em v-else>0</em></div>
+						</div>
+					</template>
+				</el-table-column>
 				<!-- <el-table-column prop="hindex" label="H-WOS" width="110px" align="center">
 					<template slot-scope="scope">
 						<p v-html="colorIndex(scope.row.wos_index,scope.row.wos_time)"></p>
@@ -103,6 +137,15 @@
 					</template>
 				</el-table-column>
 				<el-table-column prop="email" label="Email"></el-table-column>
+				<el-table-column label="Contributions"  align="center">
+					<template slot-scope="scope">
+						<div class="flexbox">
+							<div>Articles: <em v-if="scope.row.articles.length > 0">{{scope.row.articles.length}}</em><em v-else>0</em> /
+								<em v-if="scope.row.articles_all.length > 0">{{scope.row.articles_all.length}}</em><em v-else>0</em></div>
+							<div>Reviewes: <em v-if="scope.row.reviewes.length > 0">{{scope.row.reviewes.length}}</em><em v-else>0</em></div>
+						</div>
+					</template>
+				</el-table-column>
 				<!-- <el-table-column prop="hindex" label="H-WOS" width="110px" align="center">
 					<template slot-scope="scope">
 						<p v-html="colorIndex(scope.row.wos_index,scope.row.wos_time)"></p>
@@ -157,6 +200,15 @@
 							</template>
 						</el-table-column>
 						<el-table-column prop="email" label="Email"></el-table-column>
+						<el-table-column label="Contributions"  align="center">
+					<template slot-scope="scope">
+						<div class="flexbox">
+							<div>Articles: <em v-if="scope.row.articles.length > 0">{{scope.row.articles.length}}</em><em v-else>0</em> /
+								<em v-if="scope.row.articles_all.length > 0">{{scope.row.articles_all.length}}</em><em v-else>0</em></div>
+							<div>Reviewes: <em v-if="scope.row.reviewes.length > 0">{{scope.row.reviewes.length}}</em><em v-else>0</em></div>
+						</div>
+					</template>
+				</el-table-column>
 						<!-- <el-table-column prop="hindex" label="H-WOS" width="110px" align="center">
 							<template slot-scope="scope">
 								<p v-html="colorIndex(scope.row.wos_index,scope.row.wos_time)"></p>
@@ -216,7 +268,15 @@
 							</template>
 						</el-table-column>
 						<el-table-column prop="email" label="Email"></el-table-column>
-						
+						<el-table-column label="Contributions"  align="center">
+					<template slot-scope="scope">
+						<div class="flexbox">
+							<div>Articles: <em v-if="scope.row.articles.length > 0">{{scope.row.articles.length}}</em><em v-else>0</em> /
+								<em v-if="scope.row.articles_all.length > 0">{{scope.row.articles_all.length}}</em><em v-else>0</em></div>
+							<div>Reviewes: <em v-if="scope.row.reviewes.length > 0">{{scope.row.reviewes.length}}</em><em v-else>0</em></div>
+						</div>
+					</template>
+				</el-table-column>
 						<el-table-column prop="ghindex" label="H-Google" width="110px" align="center">
 							<template slot-scope="scope">
 								<p v-html="colorIndex(scope.row.google_index,scope.row.google_time)"></p>
@@ -250,6 +310,15 @@
 							</template>
 						</el-table-column>
 						<el-table-column prop="email" label="Email"></el-table-column>
+						<el-table-column label="Contributions"  align="center">
+						<template slot-scope="scope">
+							<div class="flexbox">
+								<div>Articles: <em v-if="scope.row.articles.length > 0">{{scope.row.articles.length}}</em><em v-else>0</em> /
+									<em v-if="scope.row.articles_all.length > 0">{{scope.row.articles_all.length}}</em><em v-else>0</em></div>
+								<div>Reviewes: <em v-if="scope.row.reviewes.length > 0">{{scope.row.reviewes.length}}</em><em v-else>0</em></div>
+							</div>
+						</template>
+					</el-table-column>
 						<!-- <el-table-column prop="hindex" label="H-WOS" width="110px" align="center">
 							<template slot-scope="scope">
 								<p v-html="colorIndex(scope.row.wos_index,scope.row.wos_time)"></p>
@@ -525,6 +594,7 @@
 	export default {
 		data() {
 			return {
+				journalInfo:{},       // 选中期刊信息
 				baseUrl: this.Common.baseUrl,
 				edit_id: localStorage.getItem('U_id'),
 				now_year: 0,
@@ -838,6 +908,11 @@
 							} else {
 								this.tableData_C = []
 							}
+
+							if(res.data.journal){
+								this.journalInfo = res.data.journal
+								console.log(this.journalInfo,'this.journalInfo')
+							}
 							loading.close();
 
 						} else {
@@ -1377,6 +1452,18 @@
 </script>
 
 <style scoped>
+.lieitem{margin-top: 15px;}
+.lieitem span{
+    display: inline-block; float: left; margin-right: 30px; font-size: 14px; color: #606266;
+}
+.lieitem em{font-style: normal; font-weight: bold; font-size: 14px; color: #409EFF; background: #ecf5ff; border-radius: 10px; padding: 4px;}
+.jourInfoBox{background-color: #ecf5ff; }
+.jourInfo{ justify-content: space-around !important; align-items: start; color: #606266;}
+.jourInfo div{width: auto !important; margin-right: 30px; display: inline-block; font-size: 14px;}
+.jourInfo div em{font-style: normal; font-weight: bold;}
+.flexbox{display: flex; justify-content: space-between;}
+.flexbox div{width: 50%;}
+.flexbox em{font-style: normal; font-weight: bold; font-size: 14px; color: #409EFF; background: #ecf5ff; border-radius: 10px; padding: 4px;}
 	.handle-box {
 		margin-bottom: 20px;
 	}

src/components/page/editorialBoard.vue

@@ -64,6 +64,7 @@ export default {
 					})
 					.catch(err => {
 						console.log(err);
+                        this.loading = false
 					});
 			},
     }

src/components/page/partyRole.vue

@@ -661,6 +661,9 @@
 				{
 					label: 'Research Fellow',
 				},
+				{
+					label: 'Senior Investigator',
+				},
 				// {
 				// 	label: 'Others',
 				// }