From b43dabab27313458d2773b0e1fd90ffbc1685af8 Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Wed, 30 Aug 2023 14:14:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/Sidebar.vue          |   2 +-
 src/components/page/Dashboard_.vue         |  12 ++
 src/components/page/editorBorder.vue       | 172 ++++++++++++++-------
 src/components/page/editorialBoard.vue     |   2 +-
 src/components/page/editorialBoardList.vue | 107 ++++++++-----
 5 files changed, 201 insertions(+), 94 deletions(-)

diff --git a/src/components/common/Sidebar.vue b/src/components/common/Sidebar.vue
index ec518a0..0fbfae2 100644
--- a/src/components/common/Sidebar.vue
+++ b/src/components/common/Sidebar.vue
@@ -434,7 +434,7 @@
 					},
 					{ // 总监编委系统
 						icon: 'el-icon-s-opportunity',
-						index: '9',
+						index: '10',
 						title: this.$t('sidebar.editorialBoard'),
 						subs: [{
 							index: 'editorialBoard',
diff --git a/src/components/page/Dashboard_.vue b/src/components/page/Dashboard_.vue
index 0da6458..811bbb6 100644
--- a/src/components/page/Dashboard_.vue
+++ b/src/components/page/Dashboard_.vue
@@ -143,6 +143,14 @@
 							{{coreTable.country}}
 						</div>
 					</div>
+					<div v-if="coreTable.website!=''">
+						<div class="expTit">
+							Website :
+						</div>
+						<div class="expInde" style="margin-top: 0;">
+							<el-link :href="coreTable.website" target="_blank" type="primary">Personal academic introduction</el-link>
+						</div>
+					</div>
 					<div v-if="coreTable.company!=''">
 						<div class="expTit">
 							Affiliation :
@@ -800,6 +808,10 @@
 							:key="item.en_name" :value="item.en_name"></el-option>
 					</el-select>
 				</el-form-item>
+				<el-form-item label="Website :" prop="website">
+					<el-input type="text" placeholder="eg:http://..." v-model="coreForm.website" style="width: 320px;">
+					</el-input>
+				</el-form-item>
 				<el-form-item prop="major_a">
 					<span slot="label">
 						<i style="color: #F56C6C;margin-right: 4px;">*</i>
diff --git a/src/components/page/editorBorder.vue b/src/components/page/editorBorder.vue
index aa3d4b4..4e706fc 100644
--- a/src/components/page/editorBorder.vue
+++ b/src/components/page/editorBorder.vue
@@ -145,64 +145,121 @@
 							@click="handleDelete(scope.$index, scope.row)">Delete</el-button>
 					</template>
 				</el-table-column>
-			</el-table>
+			</el-table>			
 			<p class="shen_fen" v-if="tableData_C.length!=0">Editorial Board Members</p>
-			<div v-for="(item,key) in tableData_C" v-if="tableData_C.length!=0">
-				<p class="shen_number">{{key}}</p>
-				<el-table :data="item" border stripe class="table" ref="multipleTable" :show-header="false"
-					header-cell-class-name="table-header" empty-text="New messages (0)" style="margin-bottom: 20px;">
-					<el-table-column prop="Realname" label="Realname">
-						<template slot-scope="scope">
-							<p @click="perSonnel(scope.row.user_id)" class="perSonGo">{{scope.row.realname}}</p>
-						</template>
-					</el-table-column>
-					<el-table-column prop="email" label="Email"></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>
-						</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>
-						</template>
-					</el-table-column>
-					<!-- <el-table-column label="Grade" width="110px" align="center">
-						<template slot-scope="scope">
-							<p style="display: inline-block;" v-if="scope.row.starList_mark!=0">
-								<img src="../../assets/img/star-all.png" v-for="item in scope.row.starList"
-									v-if="scope.row.starList_mark<=8&&item.star==1" class="starSty">
-								<img src="../../assets/img/star-traf.png" v-for="item in scope.row.starList"
-									v-if="scope.row.starList_mark<=8&&item.star==0" class="starSty">
-								<img src="../../assets/img/star-none.png" v-for="item in scope.row.starList"
-									v-if="scope.row.starList_mark<=8&&item.star==2" class="starSty">
-								<img src="../../assets/img/star-all.png" v-if="scope.row.starList_mark>8"
-									class="starSty">
-								<b style="font-size: 15px;color: #b77614;" v-if="scope.row.starList_mark>8">×
-									{{scope.row.starList_mark}}</b>
-							</p>
-						</template>
-					</el-table-column> -->
-					<!-- <el-table-column label="Remarks" width="180">
-						<template slot-scope="scope">
-							{{scope.row.remark}}
-							<b @click="BoxRemark(scope.row)" style="margin-left:10px;cursor: pointer;color:#006699;"
-								class="el-icon-edit"></b>
-						</template>
-					</el-table-column> -->
-					<el-table-column label="" width="300" align="center">
-						<template slot-scope="scope">
-							<el-button size="mini" type="primary" plain icon="el-icon-edit" 
-						@click="perSonnel(scope.row.user_id)">User Edit</el-button>
-						<el-button size="mini" type="primary" plain icon="el-icon-edit"
-							@click="bhandleEdit(scope.$index, scope.row)">Board Edit</el-button>
-							<el-button size="mini" type="danger" plain icon="el-icon-delete" style="margin-top: 10px;"
-								@click="handleDelete(scope.$index, scope.row)">Delete</el-button>
-						</template>
-					</el-table-column>
-				</el-table>
+			<div v-if="tableData_C[0]">
+				<!-- 没有分组时 -->
+				<el-table :data="tableData_C" border stripe class="table" ref="multipleTable" :show-header="false"
+						header-cell-class-name="table-header" empty-text="New messages (0)" style="margin-bottom: 20px;">
+						<el-table-column prop="Realname" label="Realname">
+							<template slot-scope="scope">
+								<p @click="perSonnel(scope.row.user_id)" class="perSonGo">{{scope.row.realname}}</p>
+							</template>
+						</el-table-column>
+						<el-table-column prop="email" label="Email"></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>
+							</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>
+							</template>
+						</el-table-column>
+						<!-- <el-table-column label="Grade" width="110px" align="center">
+							<template slot-scope="scope">
+								<p style="display: inline-block;" v-if="scope.row.starList_mark!=0">
+									<img src="../../assets/img/star-all.png" v-for="item in scope.row.starList"
+										v-if="scope.row.starList_mark<=8&&item.star==1" class="starSty">
+									<img src="../../assets/img/star-traf.png" v-for="item in scope.row.starList"
+										v-if="scope.row.starList_mark<=8&&item.star==0" class="starSty">
+									<img src="../../assets/img/star-none.png" v-for="item in scope.row.starList"
+										v-if="scope.row.starList_mark<=8&&item.star==2" class="starSty">
+									<img src="../../assets/img/star-all.png" v-if="scope.row.starList_mark>8"
+										class="starSty">
+									<b style="font-size: 15px;color: #b77614;" v-if="scope.row.starList_mark>8">×
+										{{scope.row.starList_mark}}</b>
+								</p>
+							</template>
+						</el-table-column> -->
+						<!-- <el-table-column label="Remarks" width="180">
+							<template slot-scope="scope">
+								{{scope.row.remark}}
+								<b @click="BoxRemark(scope.row)" style="margin-left:10px;cursor: pointer;color:#006699;"
+									class="el-icon-edit"></b>
+							</template>
+						</el-table-column> -->
+						<el-table-column label="" width="300" align="center">
+							<template slot-scope="scope">
+								<el-button size="mini" type="primary" plain icon="el-icon-edit" 
+							@click="perSonnel(scope.row.user_id)">User Edit</el-button>
+							<el-button size="mini" type="primary" plain icon="el-icon-edit"
+								@click="bhandleEdit(scope.$index, scope.row)">Board Edit</el-button>
+								<el-button size="mini" type="danger" plain icon="el-icon-delete" style="margin-top: 10px;"
+									@click="handleDelete(scope.$index, scope.row)">Delete</el-button>
+							</template>
+						</el-table-column>
+					</el-table>
+			</div>
+			<div v-else>
+				<!-- 有分组时 -->
+				<div v-for="(item,key) of tableData_C" >
+					<p class="shen_number">{{key}}</p>
+					<el-table :data="item" border stripe class="table" ref="multipleTable" :show-header="false"
+						header-cell-class-name="table-header" empty-text="New messages (0)" style="margin-bottom: 20px;">
+						<el-table-column prop="Realname" label="Realname">
+							<template slot-scope="scope">
+								<p @click="perSonnel(scope.row.user_id)" class="perSonGo">{{scope.row.realname}}</p>
+							</template>
+						</el-table-column>
+						<el-table-column prop="email" label="Email"></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>
+							</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>
+							</template>
+						</el-table-column>
+						<!-- <el-table-column label="Grade" width="110px" align="center">
+							<template slot-scope="scope">
+								<p style="display: inline-block;" v-if="scope.row.starList_mark!=0">
+									<img src="../../assets/img/star-all.png" v-for="item in scope.row.starList"
+										v-if="scope.row.starList_mark<=8&&item.star==1" class="starSty">
+									<img src="../../assets/img/star-traf.png" v-for="item in scope.row.starList"
+										v-if="scope.row.starList_mark<=8&&item.star==0" class="starSty">
+									<img src="../../assets/img/star-none.png" v-for="item in scope.row.starList"
+										v-if="scope.row.starList_mark<=8&&item.star==2" class="starSty">
+									<img src="../../assets/img/star-all.png" v-if="scope.row.starList_mark>8"
+										class="starSty">
+									<b style="font-size: 15px;color: #b77614;" v-if="scope.row.starList_mark>8">×
+										{{scope.row.starList_mark}}</b>
+								</p>
+							</template>
+						</el-table-column> -->
+						<!-- <el-table-column label="Remarks" width="180">
+							<template slot-scope="scope">
+								{{scope.row.remark}}
+								<b @click="BoxRemark(scope.row)" style="margin-left:10px;cursor: pointer;color:#006699;"
+									class="el-icon-edit"></b>
+							</template>
+						</el-table-column> -->
+						<el-table-column label="" width="300" align="center">
+							<template slot-scope="scope">
+								<el-button size="mini" type="primary" plain icon="el-icon-edit" 
+							@click="perSonnel(scope.row.user_id)">User Edit</el-button>
+							<el-button size="mini" type="primary" plain icon="el-icon-edit"
+								@click="bhandleEdit(scope.$index, scope.row)">Board Edit</el-button>
+								<el-button size="mini" type="danger" plain icon="el-icon-delete" style="margin-top: 10px;"
+									@click="handleDelete(scope.$index, scope.row)">Delete</el-button>
+							</template>
+						</el-table-column>
+					</el-table>
+				</div>
 			</div>
-
 		</div>
 
 		<!-- 添加弹出框 -->
@@ -716,7 +773,7 @@
 								this.tableData_B = []
 							}
 							if (res.data.boards.member != undefined) {
-								this.tableData_C = res.data.boards.member;
+								this.tableData_C = res.data.boards.member;								
 								for (var i = 0; i < this.tableData_C.length; i++) {
 									this.getScoreDataC(i, this.tableData_C[i].score)
 								}
@@ -1130,6 +1187,7 @@
 
 			// 删除操作
 			handleDelete(index, row) {
+				
 				// 二次确认删除
 				this.$confirm('Are you sure you want to delete?', 'Tips', {
 						type: 'warning'
diff --git a/src/components/page/editorialBoard.vue b/src/components/page/editorialBoard.vue
index 875669e..8de5621 100644
--- a/src/components/page/editorialBoard.vue
+++ b/src/components/page/editorialBoard.vue
@@ -45,7 +45,7 @@ export default {
 					.post('api/Monitor/getJournalBoards')
 					.then(res => {
                         if(res.code == 0){
-                            console.log(res,'res')
+                           // console.log(res,'res')
                             //this.Total = res.total;
                             // var arr = []
                             // arr = res.data.journals.map( (item) => {
diff --git a/src/components/page/editorialBoardList.vue b/src/components/page/editorialBoardList.vue
index 8d7709f..f087417 100644
--- a/src/components/page/editorialBoardList.vue
+++ b/src/components/page/editorialBoardList.vue
@@ -91,41 +91,78 @@
 				</el-table-column>
 			</el-table>
 			<p class="shen_fen" v-if="tableData_C.length!=0">Editorial Board Members</p>
-			<div v-for="(item,key) in tableData_C" v-if="tableData_C.length!=0">
-				<p class="shen_number">{{key}}</p>
-				<el-table :data="item" border stripe class="table" ref="multipleTable" :show-header="false"
-					header-cell-class-name="table-header" empty-text="New messages (0)" style="margin-bottom: 20px;">
-					<el-table-column prop="realname" label="name">
-					<template slot-scope="scope">
-						<p @click="perSonnel(scope.row.user_id)" class="perSonGo">{{scope.row.realname}}</p>
-					</template>
-				</el-table-column>	
-				<el-table-column prop="technical" label="technical" width="150px" align="center">
-					<!-- <template slot-scope="scope">
-						<p v-html="colorIndex(scope.row.wos_index,scope.row.wos_time)"></p>
-					</template> -->
-				</el-table-column>
-				<el-table-column prop="field" label="field"  align="center">
-					<!-- <template slot-scope="scope">
-						<p v-html="colorIndex(scope.row.google_index,scope.row.google_time)"></p>
-					</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>
-					</template>
-				</el-table-column>
-				<el-table-column label="" width="150px" align="center">
-					<template slot-scope="scope">
-						<el-button size="mini" type="primary" plain icon="el-icon-edit" 
-						@click="perSonnel(scope.row.user_id)">User Edit</el-button>
-						<!-- <el-button size="mini" type="primary" plain icon="el-icon-edit"
-							@click="bhandleEdit(scope.$index, scope.row)">Board Edit</el-button> -->
-						<!-- <el-button size="mini" type="danger" plain icon="el-icon-delete" style="margin-top: 10px;"
-							@click="handleDelete(scope.$index, scope.row)">Delete</el-button> -->
-					</template>
-				</el-table-column>					
-				</el-table>
+			<div v-if="tableData_C[0]">
+				<el-table :data="tableData_C" border stripe class="table" ref="multipleTable" :show-header="false"
+						header-cell-class-name="table-header" empty-text="New messages (0)" style="margin-bottom: 20px;">
+						<el-table-column prop="realname" label="name">
+						<template slot-scope="scope">
+							<p @click="perSonnel(scope.row.user_id)" class="perSonGo">{{scope.row.realname}}</p>
+						</template>
+					</el-table-column>	
+					<el-table-column prop="technical" label="technical" width="150px" align="center">
+						<!-- <template slot-scope="scope">
+							<p v-html="colorIndex(scope.row.wos_index,scope.row.wos_time)"></p>
+						</template> -->
+					</el-table-column>
+					<el-table-column prop="field" label="field"  align="center">
+						<!-- <template slot-scope="scope">
+							<p v-html="colorIndex(scope.row.google_index,scope.row.google_time)"></p>
+						</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>
+						</template>
+					</el-table-column>
+					<el-table-column label="" width="150px" align="center">
+						<template slot-scope="scope">
+							<el-button size="mini" type="primary" plain icon="el-icon-edit" 
+							@click="perSonnel(scope.row.user_id)">User Edit</el-button>
+							<!-- <el-button size="mini" type="primary" plain icon="el-icon-edit"
+								@click="bhandleEdit(scope.$index, scope.row)">Board Edit</el-button> -->
+							<!-- <el-button size="mini" type="danger" plain icon="el-icon-delete" style="margin-top: 10px;"
+								@click="handleDelete(scope.$index, scope.row)">Delete</el-button> -->
+						</template>
+					</el-table-column>					
+					</el-table>
+			</div>
+			<div v-else>
+				<div v-for="(item,key) of tableData_C" v-if="tableData_C.length!=0">
+					<p class="shen_number">{{key}}</p>
+					<el-table :data="item" border stripe class="table" ref="multipleTable" :show-header="false"
+						header-cell-class-name="table-header" empty-text="New messages (0)" style="margin-bottom: 20px;">
+						<el-table-column prop="realname" label="name">
+						<template slot-scope="scope">
+							<p @click="perSonnel(scope.row.user_id)" class="perSonGo">{{scope.row.realname}}</p>
+						</template>
+					</el-table-column>	
+					<el-table-column prop="technical" label="technical" width="150px" align="center">
+						<!-- <template slot-scope="scope">
+							<p v-html="colorIndex(scope.row.wos_index,scope.row.wos_time)"></p>
+						</template> -->
+					</el-table-column>
+					<el-table-column prop="field" label="field"  align="center">
+						<!-- <template slot-scope="scope">
+							<p v-html="colorIndex(scope.row.google_index,scope.row.google_time)"></p>
+						</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>
+						</template>
+					</el-table-column>
+					<el-table-column label="" width="150px" align="center">
+						<template slot-scope="scope">
+							<el-button size="mini" type="primary" plain icon="el-icon-edit" 
+							@click="perSonnel(scope.row.user_id)">User Edit</el-button>
+							<!-- <el-button size="mini" type="primary" plain icon="el-icon-edit"
+								@click="bhandleEdit(scope.$index, scope.row)">Board Edit</el-button> -->
+							<!-- <el-button size="mini" type="danger" plain icon="el-icon-delete" style="margin-top: 10px;"
+								@click="handleDelete(scope.$index, scope.row)">Delete</el-button> -->
+						</template>
+					</el-table-column>					
+					</el-table>
+				</div>
 			</div>
 		</div>