From a8885bf2ee91ff705eeaa6dea99a9ca4e725f2cc Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Mon, 17 Jul 2023 14:27:23 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A8=BF=E4=BB=B6=E8=AF=A6=E6=83=85=E5=AF=B9?=
 =?UTF-8?q?=E8=AF=9D=E6=A1=86=E6=B7=BB=E5=8A=A0=E4=BA=A4=E4=BA=92=20?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BAhtml=E6=B5=81=E7=A8=8B=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/page/articleDetailEditor.vue | 18 +++++-
 src/components/page/articleListEditor_E.vue | 68 +++++++++++----------
 src/components/page/editPublicRefRdit.vue   |  5 +-
 src/components/page/time_talk.vue           |  3 +-
 4 files changed, 59 insertions(+), 35 deletions(-)

diff --git a/src/components/page/articleDetailEditor.vue b/src/components/page/articleDetailEditor.vue
index 229b236..1581fdb 100644
--- a/src/components/page/articleDetailEditor.vue
+++ b/src/components/page/articleDetailEditor.vue
@@ -266,7 +266,7 @@
 					</div>
 				</el-col>
 				<el-col :span="8">
-					<timetalk :talkMsgs="talkMsgs" :msgform="msgform"></timetalk>
+					<timetalk :talkMsgs="talkMsgs" :msgform="msgform" @talksave="getTalkList"></timetalk>
 					<div class="tree_box">
 						<h2 style="margin: 0 0 20px 0;">Manuscript Tracking</h2>
 						<div class="block">
@@ -661,7 +661,7 @@
 				return str;
 			}
 		},
-		methods: {
+		methods: {			
 			//弹出编辑框
 			testvis() {
 				this.editVisible = true;
@@ -864,6 +864,20 @@
 					});
 			},
 
+			// 获取留言列表
+			getTalkList(){				
+				this.$api
+					.post('api/Article/getArticleDialogs', {
+						article_id: this.$route.query.id
+					})
+					.then((res) => {
+						this.talkMsgs = res.data.dialogs;
+					})
+					.catch((err) => {
+						console.log(err);
+					});
+			},
+
 			// H指数修改
 			HIndexEdit(row) {
 				this.HEditVisible = true
diff --git a/src/components/page/articleListEditor_E.vue b/src/components/page/articleListEditor_E.vue
index ed97fed..db531b4 100644
--- a/src/components/page/articleListEditor_E.vue
+++ b/src/components/page/articleListEditor_E.vue
@@ -230,10 +230,6 @@
 							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="text" plain icon="el-icon-document-copy" @click="showCreateHtmlItem()"
-											style="margin-left: 20px;">
-											<font >Create Html Proofread</font>											
-										</el-button> -->
 							<el-button v-if="UpHtpFIle.mains!=''" type="primary" plain icon="el-icon-document-copy" @click="htmlLayout()"
 											style="margin-left: 20px;">											
 											<font >Edit Html Proofread</font>
@@ -242,12 +238,15 @@
 						<div>
 							<!-- 生成选项 -->
 							<div v-if="UpHtpFIle.mains==''">
-								<el-radio v-model="createType" label="1">使用稿件最终版生成html</el-radio>
-  								<el-radio v-model="createType" label="2">重新上传word文件生成html</el-radio>
-								<!-- 方式是重新上传，且没有上传文件时，按钮不可用 -->
-								<el-button type="primary" @click="htmlLayout" class="import" v-if="createType=='2' && fileL_manuscirpt != '' || createType=='1'">Create Html Proofread</el-button> 
+								<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>								
+								
+								<!-- 使用默认最新稿件生成 -->
+								<div style="margin: 20px 0 0 0" v-if="createType == '1'"> 									
+									<el-button type="primary" @click="htmlLayout" class="import" >Create Html Proofread</el-button> 
+								</div>
 								<!-- 文件上传 -->
-								  <div style="margin: 20px 0 0 0" v-if="createType == '2'">
+								  <div class="up" style="margin: 20px 0 0 0" v-if="createType == '2'">
 									<el-upload ref="uploadFile" class="upload-demo up_newstyle" :action="upload_manuscirpt"
 										accept=".docx" name="completedManuscirpt" :before-upload="beforeupload_manuscirpt"
 										:on-error="uperr_coverLetter" :on-success="upSuccess_manuscirpt" :limit="1"
@@ -260,28 +259,28 @@
 											Only Word and compressed files can be uploaded (file format: .docx).
 										</div> -->
 									</el-upload>
-								</div>
-								
+									<el-button type="primary" @click="htmlLayout" class="import" >Create Html Proofread</el-button> 
+								</div>								
 								<!-- end -->
 							</div>
 							<!-- end -->
-										<div class="titHtml" v-if="UpHtpFIle.mains!=''">
-											<div v-for="(item,index) in UpHtpFIle.mains">
-												<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'">
-													<font :style="'width:'+item.width+'px'">{{item.note}}
-													</font>
-												</p>
-											</div>
-										</div></div>						
+							<div class="titHtml" v-if="UpHtpFIle.mains!=''">
+								<div v-for="(item,index) in UpHtpFIle.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'">
+										<font :style="'width:'+item.width+'px'">{{item.note}}</font>
+									</p>
+								</div>
+							</div>
+						</div>						
 					</el-collapse-item>
 					<el-collapse-item name="references">
 						<template slot="title">
 							References : 
 							<span style="margin-left: 15px;color: #666;" v-if="UpHtpFIle.refers==''">Have no refernces</span>
 							<span style="margin-left: 15px;color: #0b4b6a;" v-if="UpHtpFIle.refers!=''">There are {{UpHtpFIle.refers.length}} pieces of data in total.</span>
-							<el-button type="primary" plain icon="el-icon-document-copy" @click="goEditRefernces"
+							<el-button type="primary" plain icon="el-icon-document-copy" @click="goEditRefernces" @click.stop
 											style="margin-left: 20px;">											
 								<font >Edit References</font>											
 							</el-button>
@@ -336,7 +335,7 @@ import { watch } from 'vue';
 			return {
 				articleId:null,
 				createType:'1',    // html生成方式
-				collapseActiveNames:['html'], // 手风琴绑定值
+				collapseActiveNames:[], // 手风琴绑定值
 				// oldFile:false,   // 是否用新文件生成  
 				fileL_manuscirpt: [],
 				baseUrl: this.Common.baseUrl,
@@ -448,11 +447,7 @@ import { watch } from 'vue';
 				this.createType = '1'    // html生成方式
 				this.collapseActiveNames = ['html']
 				
-			},
-			showCreateHtmlItem(){
-				this.collapseActiveNames[0] = 'html'
-				//console.log(this.collapseActiveNames)
-			},
+			},			
 			beforeupload_manuscirpt(file) {
 				let flieArr = file.name.split(".")
 				let fileSuffix = flieArr[flieArr.length - 1];
@@ -916,9 +911,20 @@ import { watch } from 'vue';
 			},
 
 		},
-		// watch:{
+		watch:{
+			HtmlVisible:{
+				handler(newVal, oldVal) {  				
+				if(this.UpHtpFIle.mains=='' && newVal == true){ //打开赋值
+					this.collapseActiveNames.push('html')
+				}else{ // 关闭清空
+					this.collapseActiveNames = []
+				}      
+			},
+				deep: true // 可以深度检测到 person 对象的属性值的变化
+			},
 		// 	collapseActiveNames : {
 		// 	handler(newVal, oldVal) {  
+		// 		console.log(newVal, '新传入的值')
 		// 		this.$nextTick(()=>{ 
 		// 			this.oldFile = newVal.find((item)=>{item.name===''});
 		// 		})           
@@ -926,7 +932,7 @@ import { watch } from 'vue';
 		// // immediate: true,
 		// 	deep: true // 可以深度检测到 person 对象的属性值的变化
 		// 	}
-		// }
+		}
 	};
 </script>
 
@@ -936,7 +942,7 @@ import { watch } from 'vue';
 .up_newstyle {
 		margin-left: 10px;
 	}
-
+.up .up_newstyle{margin-left: 0; margin-bottom: 15px;}
 	/deep/ .el-upload--text {
 		background-color: #ecf5ff;
 		border: 1px solid #b3d8ff !important;
diff --git a/src/components/page/editPublicRefRdit.vue b/src/components/page/editPublicRefRdit.vue
index 338ee48..f879685 100644
--- a/src/components/page/editPublicRefRdit.vue
+++ b/src/components/page/editPublicRefRdit.vue
@@ -243,6 +243,7 @@
 </template>
 
 <script>
+
 import VueUeditorWrap from 'vue-ueditor-wrap'; // ES6 Module
 export default {
     data(){
@@ -251,7 +252,9 @@ export default {
 			wordText:'',
 			editorConfig: {
 				// 访问 UEditor 静态资源的根路径，可参考 https://hc199421.gitee.io/vue-ueditor-wrap/#/faq
-				UEDITOR_HOME_URL: "/UEditor/",							
+				UEDITOR_HOME_URL: "/UEditor/",
+				// serverUrl: "//ueditor.zhenghaochuan.com/cos",	
+				serverUrl: "",									
 				
 			},
 			wordTextArr:[], // 识别出的word引用数组
diff --git a/src/components/page/time_talk.vue b/src/components/page/time_talk.vue
index a4b9906..9dc1881 100644
--- a/src/components/page/time_talk.vue
+++ b/src/components/page/time_talk.vue
@@ -1,6 +1,6 @@
 <!--对话模块-->
 <template>
-	<div class="kuang_communtion">
+	<div class="kuang_communtion" v-loading="loading">
 		<h2>
 			Communication
 		</h2>
@@ -60,6 +60,7 @@
 		data() {
 			return {
 				username: localStorage.getItem('U_name'),
+				loading:false
 			}
 		},
 		computed: {},