From 6d5631ac0771c80d8f8723455a41bdf514f1996e Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Wed, 6 Sep 2023 15:23:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0title=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/langs/zh.js          |  4 +-
 src/components/page/editorBorder.vue       |  8 +++-
 src/components/page/editorialBoard.vue     | 23 +++++------
 src/components/page/editorialBoardList.vue | 45 +++++++++++++++++++++-
 src/components/page/partyRole.vue          | 40 ++++++++++++++++---
 5 files changed, 96 insertions(+), 24 deletions(-)

diff --git a/src/components/common/langs/zh.js b/src/components/common/langs/zh.js
index add8621..4108ba2 100644
--- a/src/components/common/langs/zh.js
+++ b/src/components/common/langs/zh.js
@@ -120,7 +120,9 @@ const zh = {
 		tools: '辅助工具',
 		ReArticles: '被拒稿件',     // 被拒稿件
 		editorialBoard:'编委管理',
-		editorialBoard1:'编委列表'
+		editorialBoard1:'编委列表',
+		chiefInspector:'总监',
+		managingDirector:'总经理'
 	},
 	home: {
 		authortop: '用户指南',
diff --git a/src/components/page/editorBorder.vue b/src/components/page/editorBorder.vue
index f9341c8..532502b 100644
--- a/src/components/page/editorBorder.vue
+++ b/src/components/page/editorBorder.vue
@@ -204,8 +204,9 @@
 			</div>
 			<div v-else>
 				<!-- 有分组时 -->
-				<div v-for="(item,key) of tableData_C"  :key="key">
-					<div v-if="key == 'nogroup'">	
+				<div>
+				<div v-for="(item,key1) of tableData_C"  :key="key1">
+					<div v-if="key1 == 'nogroup'">	
 						<!-- 显示无分组 -->
 					<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;">
@@ -235,6 +236,8 @@
 					</el-table>
 				</div>
 				</div>
+				</div>
+				<div>
 				<div v-for="(item,key) of tableData_C"  :key="key">
 					<div v-if="key !== 'nogroup'">
 						<!-- 显示有分组 -->
@@ -294,6 +297,7 @@
 				</div>
 				</div>
 			</div>
+			</div>
 		</div>
 
 		<!-- 添加弹出框 -->
diff --git a/src/components/page/editorialBoard.vue b/src/components/page/editorialBoard.vue
index 8de5621..cbfbb80 100644
--- a/src/components/page/editorialBoard.vue
+++ b/src/components/page/editorialBoard.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
-    <el-table :data="tableData" border stripe class="table" ref="multipleTable" header-cell-class-name="table-header"
-			empty-text="New messages (0)">
+    <el-table :data="tableData" border stripe class="table" ref="multipleTable" header-cell-class-name="table-header" 
+			empty-text="New messages (0)" v-loading="loading">
 			<el-table-column type="index" label="No." width="55" align="center"></el-table-column>
 			<el-table-column  label="journals" prop="jabbr" align="center"></el-table-column>
             <el-table-column  label="number" prop="boards_count"  align="center"></el-table-column>
@@ -22,6 +22,7 @@
 export default {
     data(){
         return{
+            loading:false,
             query: {
 					username: localStorage.getItem('U_name'),
 					// journal: localStorage.getItem('ms_journal_alias') ? parseInt(localStorage.getItem('ms_journal_alias')) : 0,
@@ -40,23 +41,17 @@ export default {
     },
     methods:{
         // 获取文章列表数据
+        
 			getdata() {
+                this.loading = true
 				this.$api
 					.post('api/Monitor/getJournalBoards')
 					.then(res => {
-                        if(res.code == 0){
-                           // console.log(res,'res')
-                            //this.Total = res.total;
-                            // var arr = []
-                            // arr = res.data.journals.map( (item) => {
-                            //     var num = 0
-                            //     num = item.boards.main.length
-                            //     item.pnum = num
-                            //     return item
-                            // })                                                  			
-                            this.tableData = res.data.journals;
-                          //  console.log(this.tableData,'this.tableData')
+                        if(res.code == 0){   
+
+                            this.tableData = res.data.journals;                         
                         }
+                        this.loading = false
 					})
 					.catch(err => {
 						console.log(err);
diff --git a/src/components/page/editorialBoardList.vue b/src/components/page/editorialBoardList.vue
index f087417..45411e7 100644
--- a/src/components/page/editorialBoardList.vue
+++ b/src/components/page/editorialBoardList.vue
@@ -127,7 +127,49 @@
 					</el-table>
 			</div>
 			<div v-else>
-				<div v-for="(item,key) of tableData_C" v-if="tableData_C.length!=0">
+				<!-- 有分组时 -->
+				<div>
+				<div v-for="(item,key1) of tableData_C"  :key="key1">
+					<div v-if="key1 == 'nogroup'">	
+						<!-- 显示无分组 -->
+						<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>
+
+				<div><div v-for="(item,key) of tableData_C"  :key="key">
+					<div v-if="key !== 'nogroup'">
 					<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;">
@@ -163,6 +205,7 @@
 					</el-table-column>					
 					</el-table>
 				</div>
+				</div></div>
 			</div>
 		</div>
 
diff --git a/src/components/page/partyRole.vue b/src/components/page/partyRole.vue
index b2d5053..f794e15 100644
--- a/src/components/page/partyRole.vue
+++ b/src/components/page/partyRole.vue
@@ -622,9 +622,11 @@
 					label: 'Associate Prof.',
 				}, {
 					label: 'Assistant Prof.',
-				}, {
-					label: 'Ph.D.',
-				}, {
+				}, 
+				// {
+				// 	label: 'Ph.D.',
+				// }, 
+				{
 					label: 'Researcher',
 				}, {
 					label: 'Associate research fellow',
@@ -634,9 +636,35 @@
 					label: 'Engineer',
 				}, {
 					label: 'Senior engineer',
-				}, {
-					label: 'Others',
-				}],
+				}, 
+				{
+					label: 'Associate Researcher',
+				},
+				{
+					label: 'Lecturer',
+				},
+				{
+					label: 'Associate Chief Physician',
+				},
+				{
+					label: 'Assistant Researcher',
+				},
+				{
+					label: 'Physician',
+				},
+				{
+					label: 'Chief Physician',
+				},
+				{
+					label: 'Senior Lecturer',
+				},
+				{
+					label: 'Research Fellow',
+				},
+				// {
+				// 	label: 'Others',
+				// }
+			],
 				list_year: [{
 					title: '1 Year',
 					id: 1