From 163df2be571f8ab3e4a765d2a2be16abcb93f2af Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Fri, 1 Sep 2023 13:20:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83=EF=BC=8C=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E8=81=94=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/page/editorBorder.vue | 42 ++++++++++++++++++++++++++--
 src/components/page/editorGroup.vue  | 17 +++++++----
 2 files changed, 51 insertions(+), 8 deletions(-)

diff --git a/src/components/page/editorBorder.vue b/src/components/page/editorBorder.vue
index 7a9336d..f9341c8 100644
--- a/src/components/page/editorBorder.vue
+++ b/src/components/page/editorBorder.vue
@@ -205,7 +205,40 @@
 			<div v-else>
 				<!-- 有分组时 -->
 				<div v-for="(item,key) of tableData_C"  :key="key">
-					<p class="shen_number">{{key}}</p>					
+					<div v-if="key == '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="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="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="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 v-for="(item,key) of tableData_C"  :key="key">
+					<div v-if="key !== 'nogroup'">
+						<!-- 显示有分组 -->
+					<p class="shen_number" v-if="key !== 'nogroup'">{{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">
@@ -259,6 +292,7 @@
 						</el-table-column>
 					</el-table>
 				</div>
+				</div>
 			</div>
 		</div>
 
@@ -1003,8 +1037,10 @@
 				}
 			},
 			// 分组管理
-			addGroup() {
-				this.$router.push('/editorGroup');
+			addGroup() {		
+				console.log(this.query.journal_id,'this.query.journal_id')		
+				this.$router.push('/editorGroup?journal_id='+this.query.journal_id);
+
 			},
 
 			// 用户跳转
diff --git a/src/components/page/editorGroup.vue b/src/components/page/editorGroup.vue
index b1b618a..287221f 100644
--- a/src/components/page/editorGroup.vue
+++ b/src/components/page/editorGroup.vue
@@ -57,7 +57,7 @@
 				df_jour: [],
 				addVisible: false,
 				addForm: {
-					journal_id: 0,
+					journal_id: this.$route.query.journal_id - 0,
 					journal_title: '',
 					group_name: ''
 				},
@@ -71,9 +71,9 @@
 				}
 			};
 		},
-		created() {
+		created() {	
 			this.getJour();
-		},
+		},		
 		methods: {
 			// 获取期刊列表
 			getJour() {
@@ -84,8 +84,14 @@
 					.then(res => {
 						if (res.code == 0) {
 							this.df_jour = res.data.journals;
-							this.addForm.journal_id = this.df_jour[0].journal_id
-							this.addForm.journal_title = this.df_jour[0].title
+							this.df_jour.map(item => {
+								if(this.addForm.journal_id == item.journal_id){
+									this.addForm.journal_title = item.journal_id
+									this.addForm.journal_title = item.title
+								}
+							})							
+							//this.addForm.journal_id = this.df_jour[0].journal_id
+							//this.addForm.journal_title = this.df_jour[0].title
 							this.getDate();
 						} else {
 							this.$message.error(res.msg);
@@ -131,6 +137,7 @@
 
 			// 保存添加
 			saveAdd(addForm) {
+				console.log(this.addForm,'this.addForm')
 				this.$refs.add_Form.validate((valid) => {
 					if (valid) {
 						this.$api