From ff301a24bffb7ba801dc07717bf00aad14c3a7a8 Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Mon, 31 Jul 2023 15:58:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/page/ReferenceEditor.vue     |  5 +--
 src/components/page/articleListEditor.vue   |  4 +-
 src/components/page/articleListEditor_E.vue | 43 ++++++++++++++++-----
 src/components/page/editorBorder.vue        | 10 +++--
 src/components/page/reviewerList.vue        |  7 ++--
 5 files changed, 47 insertions(+), 22 deletions(-)

diff --git a/src/components/page/ReferenceEditor.vue b/src/components/page/ReferenceEditor.vue
index 233ad51..2594ec3 100644
--- a/src/components/page/ReferenceEditor.vue
+++ b/src/components/page/ReferenceEditor.vue
@@ -98,9 +98,8 @@
                 </ul>
             </div>
             <div class="refenceCentent mt20">
-                <el-table :data="tableData"  ref="multipleTable" @selection-change="RefenceSelectionChange" 
-              empty-text="New messages (0)" :show-header="false" :stripe="false" :highlight-current-row="false">  
-                    <el-table-column     type="selection"    width="55"></el-table-column>            
+                <el-table :data="tableData"  ref="multipleTable"  
+              empty-text="New messages (0)" :show-header="false" :stripe="false" :highlight-current-row="false"> 
                     <el-table-column type="index" label="No." width="55" align="center"></el-table-column>
                     <el-table-column label="state"  width="55" align="center">
                         <template slot-scope="scope">                           
diff --git a/src/components/page/articleListEditor.vue b/src/components/page/articleListEditor.vue
index 0255a03..4e25f41 100644
--- a/src/components/page/articleListEditor.vue
+++ b/src/components/page/articleListEditor.vue
@@ -17,8 +17,8 @@
 			<!-- 已经发表 -->
 			<p @click="tabIndex(3)" :class="activeIndex == 3 ? 'tab_Normal tab_Select' : 'tab_Normal'">Online</p>
 			<!-- 连续出版 -->
-			<p @click="tabIndex(4)" :class="activeIndex == 4 ? 'tab_Normal tab_Select' : 'tab_Normal'"
-				v-if="preJouList">Pre-publish</p>
+			<!-- <p @click="tabIndex(4)" :class="activeIndex == 4 ? 'tab_Normal tab_Select' : 'tab_Normal'"
+				v-if="preJouList">Pre-publish</p> -->
 			<!-- 出版的 -->
 			<p @click="tabIndex(5)" :class="activeIndex == 5 ? 'tab_Normal tab_Select' : 'tab_Normal'">Publish</p>
 			<!-- 调查与撤回 -->
diff --git a/src/components/page/articleListEditor_E.vue b/src/components/page/articleListEditor_E.vue
index 8f64ac7..73d7165 100644
--- a/src/components/page/articleListEditor_E.vue
+++ b/src/components/page/articleListEditor_E.vue
@@ -50,9 +50,9 @@
 					</p>
 					<p>
 						<span style="margin: 0 5px 0 0;">Layout: </span>
-						<b class="el-icon-check" style="color: #0fa31d;font-weight: bold;" v-if="scope.row.mains!=''">
+						<b class="el-icon-check" style="color: #0fa31d;font-weight: bold;" v-if="scope.row.mains == 1">
 						</b>
-						<b class="el-icon-close" style="color: #ff0000;font-weight: bold;" v-if="scope.row.mains==''">
+						<b class="el-icon-close" style="color: #ff0000;font-weight: bold;" v-if="scope.row.mains == 0">
 						</b>
 					</p>
 				</template>
@@ -228,20 +228,20 @@
 					<el-collapse-item name="html">
 						<template slot="title">
 							Html Layout : 
-							<span style="margin-left: 15px;color: #666;" v-if="UpHtpFIle.mains==''">No Layout</span>
-							<span style="margin-left: 15px;color: #0b4b6a;" v-if="UpHtpFIle.mains!=''">Typesetting completed</span>
-							<el-button v-if="UpHtpFIle.mains!=''" type="primary" plain icon="el-icon-document-copy" @click.stop @click="htmlLayout()"
+							<span style="margin-left: 15px;color: #666;" v-if="mains==''">No Layout</span>
+							<span style="margin-left: 15px;color: #0b4b6a;" v-if="mains!=''">Typesetting completed</span>
+							<el-button v-if="mains!=''" type="primary" plain icon="el-icon-document-copy" @click.stop @click="htmlLayout()"
 											style="margin-left: 20px;">											
 											<font >Edit Html Proofread</font>
 							</el-button>
-							<el-button v-if="UpHtpFIle.mains!=''" type="danger" plain icon="el-icon-document-copy" @click.stop @click="clearHtmlLayout()"
+							<el-button v-if="mains!=''" type="danger" plain icon="el-icon-document-copy" @click.stop @click="clearHtmlLayout()"
 											style="margin-left: 20px;">											
 											<font >Remove Html Proofread</font>
 							</el-button>
 						</template>
 						<div>
 							<!-- 生成选项 -->
-							<div v-if="UpHtpFIle.mains==''">
+							<div v-if="mains==''">
 								<el-radio v-model="createType" label="1">Use last manuscirpt version</el-radio>
   								<el-radio v-model="createType" label="2">Use new file upload</el-radio>								
 								
@@ -268,8 +268,8 @@
 								<!-- end -->
 							</div>
 							<!-- end -->
-							<div class="titHtml" v-if="UpHtpFIle.mains!=''">
-								<div v-for="(item,index) in UpHtpFIle.mains" :key="index">
+							<div class="titHtml" v-if="mains!=''">
+								<div v-for="(item,index) in mains" :key="index">
 									<p v-html="item.content" v-if="item.width==0"></p>
 									<p v-if="item.width!=0" class="MaxPicture">
 										<img :src="baseUrl+'public/mainimg/'+item.content" :style="'width:'+item.width+'px'">
@@ -395,7 +395,8 @@ import { watch } from 'vue';
 				form:{
 					manuscirpt: '',
 				},
-				fileData:'' // 上传后返回的文件url
+				fileData:'', // 上传后返回的文件url
+				mains:[] // html 数据
 			};
 		},
 		created() {
@@ -678,6 +679,7 @@ import { watch } from 'vue';
 						});
 				}
 			},
+			
 
 			// 关闭相关文章
 			RelatCancle() {
@@ -811,6 +813,25 @@ import { watch } from 'vue';
 					});
 			},
 
+			// 点击HTML查询数据
+			getMainsInfo(e){
+				this.$api
+					.post('api/Publish/getArticleMains', {
+						'article_id': e.article_id
+					})
+					.then(res => {
+						if (res.code == 0) {
+							// console.log(res,'res')	
+							this.mains = res.data.mains
+						} else {							
+							this.$message.error(res.msg);
+						}
+					})
+					.catch(err => {						
+						this.$message.error(err);
+					});	
+			},
+
 			// 文章html弹出层
 			htmlContet(e) {				
 				this.articleId = e.article_id
@@ -822,7 +843,9 @@ import { watch } from 'vue';
 				this.UpHtpFIle.title = e.title
 				this.UpHtpFIle.mains = e.mains
 				this.UpLoadFile.article_id = e.article_id
+				this.getMainsInfo(e)
 				this.HtmlVisible = true
+				
 			},
 			// 生成html
 			// CreateHtml(){
diff --git a/src/components/page/editorBorder.vue b/src/components/page/editorBorder.vue
index 766988f..8f763a2 100644
--- a/src/components/page/editorBorder.vue
+++ b/src/components/page/editorBorder.vue
@@ -214,7 +214,7 @@
 				</el-form-item>
 			</el-form>
 			<el-form ref="add_Form" :model="addForm" :rules="rules" label-width="150px" v-if="dis_able">
-				<el-form-item label="Email :">
+				<el-form-item label="Email :" prop="email">
 					{{addForm.email}}
 				</el-form-item>
 				<el-form-item label="Account :" prop="account">
@@ -223,9 +223,9 @@
 				<el-form-item label="Realname :" prop="name">
 					<el-input v-model="addForm.name" style="width: 300px;"></el-input>
 				</el-form-item>
-				<el-form-item label="Picture :">
+				<el-form-item label="Picture :"  prop="board_icon">
 					<span slot="label">
-						<i style="color: #F56C6C;">*</i>
+						<!-- <i style="color: #F56C6C;">*</i> -->
 						Picture
 					</span>
 					<el-upload class="avatar-uploader" :action="baseUrl+'api/Board/up_boardIcon_file'"
@@ -284,6 +284,7 @@
 			</el-form>
 			<span slot="footer" class="dialog-footer">
 				<el-button @click="addVisible = false">Cancel</el-button>
+				<!-- 这这这 -->
 				<el-button type="primary" @click="saveAdd()" v-if="dis_able">OK</el-button>
 			</span>
 		</el-dialog>
@@ -409,6 +410,7 @@
 				editVisible: false,
 				addForm: {
 					email: '',
+					board_icon:'',
 					board_group_id: -1
 				},
 				editForm: {
@@ -962,7 +964,7 @@
 
 			// 添加关闭
 			addVisCancle() {
-				this.$refs.add_Form.resetFields();
+			this.$refs['add_Form'].resetFields();
 				this.addForm.email = ''
 				this.dis_able = false
 			},
diff --git a/src/components/page/reviewerList.vue b/src/components/page/reviewerList.vue
index f260084..0a1aed3 100644
--- a/src/components/page/reviewerList.vue
+++ b/src/components/page/reviewerList.vue
@@ -870,7 +870,7 @@
 						} else {
 							// 重复
 							path_add = 'api/Reviewer/addReviewerBee'
-						}
+						}						
 						this.$api
 							.post(path_add, this.addForm)
 							.then(res => {
@@ -1091,7 +1091,7 @@
 			},
 
 			// 搜索选择领域
-			majorChange(e) {
+			majorChange(e,val) {
 				if (e == 1) {
 					this.$api
 						.post('api/Ucenter/getMajor', {
@@ -1112,7 +1112,8 @@
 							this.addForm.major_c = ''
 							this.majorChange_panduan()
 						});
-				} else {
+				} else {					 
+					this.$set(this.addForm, this.addForm.major_c, val)
 					this.majorChange_panduan()
 				}
 			},