JiangChongBo 2 years ago
parent
commit
6bfa67ceb9

+ 7 - 5
src/main/java/com/caimei/modules/baike/entity/CmBaikeProduct.java

@@ -94,14 +94,16 @@ public class CmBaikeProduct extends DataEntity<CmBaikeProduct> {
 		this.textInfolist = textInfolist;
 	}
 
-	private List<CmBaikeTextInfo> paramListall;//正文列表
-	public void setParamListall(List<CmBaikeTextInfo> paramListall) {
-		this.paramListall = paramListall;
+	private String textInfolistStr;//正文列表
+
+	public String getTextInfolistStr() {
+		return textInfolistStr;
 	}
 
-	public List<CmBaikeTextInfo> getParamListall() {
-		return paramListall;
+	public void setTextInfolistStr(String textInfolistStr) {
+		this.textInfolistStr = textInfolistStr;
 	}
+
 	private List<String> authImageList;			// 产品认证图片列表
 	private List<String> displayImageList;		// 效果展示图片列表
 	private List<CmBaikeProductQuestion> questionList;		//问题列表

+ 4 - 0
src/main/java/com/caimei/modules/baike/web/CmBaikeProductController.java

@@ -112,6 +112,7 @@ public class CmBaikeProductController extends BaseController {
 	public String form(CmBaikeProduct cmBaikeProduct, Model model) {
 		CmBaikeType cmBaikeType = new CmBaikeType();
 		cmBaikeType.setTypeSort(cmBaikeProduct.getCommodityType());
+		cmBaikeType.setStatus(1);
 		// 分类列表
 		List<CmBaikeType> typeList = cmBaikeTypeService.findList(cmBaikeType);
 		// 商品类型
@@ -483,6 +484,9 @@ public class CmBaikeProductController extends BaseController {
 		String sensitiveWords = infoDao.getSensitiveWords(4);
 		//正文
 		List<CmBaikeTextInfo> textInfo = cmBaikeProductDao.getTextInfo(cmBaikeProduct.getId());
+//		Gson g=new Gson();
+//		String textInfoStr=g.toJson(textInfo);
+//		cmBaikeProduct.setTextInfolistStr(textInfoStr);
 		cmBaikeProduct.setTextInfolist(textInfo);
 		//参考资料
 		if(StringUtils.isNotEmpty(cmBaikeProduct.getId())){

+ 3 - 1
src/main/resources/mappings/modules/baike/CmBaikeTypeMapper.xml

@@ -34,7 +34,9 @@
 		FROM cm_baike_type a
 		<include refid="cmBaikeTypeJoins"/>
 		<where>
-			
+			<if test="status != null ">
+				 a.status = #{status}
+			</if>
 			<if test="id != null and id != ''">
 				AND a.id = #{id}
 			</if>

+ 196 - 118
src/main/webapp/WEB-INF/views/modules/baikePage/auditBaikeProductPage.jsp

@@ -400,10 +400,10 @@
 
 		.box {
 			overflow: hidden;
-			position: absolute;
+			position: fixed;
 			width: 55%;
 			height: 60%;
-			z-index: 100; /*值越大,和其他层层叠时越在上面*/
+			z-index: 200; /*值越大,和其他层层叠时越在上面*/
 			left: 20%;
 			top: 15%;
 			background-color: #fff;
@@ -436,6 +436,7 @@
 			OVERFLOW: scroll;
 			height: calc(100% - 20px);
 			height: -webkit-calc(100% - 20px);
+			margin-left: 30px;
 		}
 
 		.logcontent {
@@ -862,44 +863,46 @@
 		<%--已有资料--%>
 		<div class="control-group" id="yyzl" style="display: none">
 			<label class="control-label titleClass">参考资料</label>
-			<c:forEach items="${cmBaikeProduct.materialInfo}" var="videoFile" varStatus="statusIndex">
-				<c:if test="${videoFile.referenceType eq '1'}">
-					<div class="controls applicationsan" style="margin-top: 5px">
-						<span class="del">[${statusIndex.index}]</span>
-						<span class="del"><a href="${videoFile.website}" target="_blank">${videoFile.articleName}(文章名称)</a></span>
-						<span class="del">${videoFile.websiteName}(网站名称)</span>
-						<span class="del">${videoFile.publishTime}(发表日期)</span>
-						<span class="del">${videoFile.acitationTime}(引文日期)</span>
-						<a onclick="saveMataInfo(${videoFile.id})">引用资料</a>
-					</div>
-				</c:if>
-				<c:if test="${videoFile.referenceType eq '2'}">
-					<div class="controls applicationsan" style="margin-top: 5px">
-						<span class="del">[${statusIndex.index}]</span>
-						<span class="del">${videoFile.author}(作者)</span>
-						<span class="del">${videoFile.workName}(著作名)</span>
-						<span class="del">${videoFile.publicationPlace}(出版地)</span>
-						<span class="del">${videoFile.press}(出版社)</span>
-						<span class="del">${videoFile.publicationYear}(出版年)</span>
-						<span class="del">${videoFile.acitationWeb}(引文页码)</span>
-						<a onclick="saveMataInfo(${videoFile.id})">引用资料</a>
+			<div class="check-reference-list">
+				<c:forEach items="${cmBaikeProduct.materialInfo}" var="videoFile" varStatus="statusIndex">
+					<c:if test="${videoFile.referenceType eq '1'}">
+						<div class="controls applicationsan" style="margin-top: 5px">
+							<span class="del">[${statusIndex.index}]</span>
+							<span class="del"><a href="${videoFile.website}" target="_blank">${videoFile.articleName}.</a></span>
+							<span class="del">${videoFile.websiteName}).</span>
+							<span class="del">${videoFile.publishTime}.</span>
+							<span class="del">${videoFile.acitationTime}.</span>
+							<a onclick="saveMataInfo(${videoFile.id})"></a>
+						</div>
+					</c:if>
+					<c:if test="${videoFile.referenceType eq '2'}">
+						<div class="controls applicationsan" style="margin-top: 5px">
+							<span class="del">[${statusIndex.index}]</span>
+							<span class="del">${videoFile.author}.</span>
+							<span class="del">${videoFile.workName}.</span>
+							<span class="del">${videoFile.publicationPlace}.</span>
+							<span class="del">${videoFile.press}.</span>
+							<span class="del">${videoFile.publicationYear}.</span>
+							<span class="del">${videoFile.acitationWeb}.</span>
+							<a onclick="saveMataInfo(${videoFile.id})"></a>
 
-					</div>
-				</c:if>
-				<c:if test="${videoFile.referenceType eq '3'}">
-					<div class="controls applicationsan" style="margin-top: 5px">
-						<span class="del">[${statusIndex.index}]</span>
-						<span class="del">${videoFile.referenceDescription}(参考资料说明)</span>
-						<span class="del">${videoFile.imageDescription}(图片描述)</span>
-						<div class="conList">
-								<%--							onclick="imgSizeChange()"--%>
-							<img id="imgaa"  src="${videoFile.imageUrl}" height="50px" width="50px" >(图片)</input>
 						</div>
-						<a onclick="saveMataInfo(${videoFile.id})">引用资料</a>
+					</c:if>
+					<c:if test="${videoFile.referenceType eq '3'}">
+						<div class="controls applicationsan" style="margin-top: 5px">
+							<span class="del">[${statusIndex.index}]</span>
+							<span class="del">${videoFile.referenceDescription}.</span>
+							<span class="del">${videoFile.imageDescription}.</span>
+							<div class="conList">
+									<%--							onclick="imgSizeChange()"--%>
+								<img id="imgaa"  src="${videoFile.imageUrl}" height="50px" width="50px" >(图片)</input>
+							</div>
+							<a onclick="saveMataInfo(${videoFile.id})">引用资料</a>
 
-					</div>
-				</c:if>
-			</c:forEach>
+						</div>
+					</c:if>
+				</c:forEach>
+			</div>
 		</div>
 		<%--添加参考资料--%>
 		<div id="zl" style="margin-top: 10px">
@@ -985,17 +988,17 @@
 				</div>
 				<div class="control-group" style="margin-top: 28px">
 					<label class="control-label">图片上传:</label>
-<%--					<div class="main-image-list" style="display: flex;flex-wrap: wrap">--%>
-<%--						<div class="controls upload-content iconBox mainImageBox" id="mainImageBox">--%>
-<%--							<div class="conList">--%>
-<%--								<hidden id="image" path="image" htmlEscape="false" maxlength="255" class="input-xlarge "/>--%>
-<%--								<sys:ckfinder input="image" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100"--%>
-<%--											  maxHeight="100"/>--%>
-<%--								<br>--%>
-<%--								<label style="margin-left: 150px">请上传引用的图片资源,需同时上传资料的封面、以及含有对应具体内容的图片;注意:图片需要保证完整、不可遮挡且清晰</label>--%>
-<%--							</div>--%>
-<%--						</div>--%>
-<%--					</div>--%>
+					<div class="auth-qrCode-list" style="display: flex;flex-wrap: wrap">
+						<div class="controls upload-content iconBox mainImageBox" id="mainImageBox">
+							<div class="conList">
+								<hidden id="referenceImgUrl" path="referenceImgUrl" htmlEscape="false" maxlength="255" class="input-xlarge "/>
+								<sys:ckfinder input="referenceImgUrl" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100"
+											  maxHeight="100"/>
+								<br>
+								<label style="margin-left: 150px">请上传引用的图片资源,需同时上传资料的封面、以及含有对应具体内容的图片;注意:图片需要保证完整、不可遮挡且清晰</label>
+							</div>
+						</div>
+					</div>
 				</div>
 			</div>
 
@@ -1013,7 +1016,7 @@
 		<%--			<a herf="https://www.baidu.com">十里桃花</a>--%>
 		<div><h4>创建词条引导</h4></div>
 		<br>
-		<div>欢迎进入创建词条引导,为便于您更好的通过审核,请务必确保您已知晓百科词条的<a href="${ctx}/baike/cmBaikeProduct/entry">编辑须知</a>,如有疑问,您可以<a>点此</a>求助采美工作人员。</div>
+		<div>欢迎进入创建词条引导,为便于您更好的通过审核,请务必确保您已知晓百科词条的<a href="${ctx}/baike/cmBaikeProduct/entry" target="_blank">编辑须知</a>,如有疑问,您可以<a>点此</a>求助采美工作人员。</div>
 		<br>
 		<div><h5>声明</h5></div>
 		<br>
@@ -1207,44 +1210,46 @@
 	<%--参考资料--%>
 	<div class="control-group" id="mata">
 		<label class="control-label titleClass">参考资料</label>
-		<c:forEach items="${cmBaikeProduct.materialInfo}" var="videoFile" varStatus="statusIndex">
-			<c:if test="${videoFile.referenceType eq '1'}">
-				<div class="controls applicationsan" style="margin-top: 5px">
-					<span class="del">[${statusIndex.index+1}]</span>
-					<span class="del"><a href="${videoFile.website}" target="_blank">${videoFile.articleName}(文章名称)</a></span>
-					<span class="del">${videoFile.websiteName}(网站名称)</span>
-					<span class="del">${videoFile.publishTime}(发表日期)</span>
-					<span class="del">${videoFile.acitationTime}(引文日期)</span>
-					<a class="del" style="margin-left: 100px" onclick="upMaterial(${videoFile.id})">编辑</a>
-					<a onclick="delMaterial(${videoFile.id})">删除</a>
-				</div>
-			</c:if>
-			<c:if test="${videoFile.referenceType eq '2'}">
-				<div class="controls applicationsan" style="margin-top: 5px">
-					<span class="del">[${statusIndex.index+1}]</span>
-					<span class="del">${videoFile.author}(作者)</span>
-					<span class="del">${videoFile.workName}(著作名)</span>
-					<span class="del">${videoFile.publicationPlace}(出版地)</span>
-					<span class="del">${videoFile.press}(出版社)</span>
-					<span class="del">${videoFile.publicationYear}(出版年)</span>
-					<span class="del">${videoFile.acitationWeb}(引文页码)</span>
-					<a class="del" style="margin-left: 100px" onclick="upMaterial(${videoFile.id})">编辑</a>
-					<a onclick="delMaterial(${videoFile.id})">删除</a>
-				</div>
-			</c:if>
-			<c:if test="${videoFile.referenceType eq '3'}">
-				<div class="controls applicationsan" style="margin-top: 5px">
-					<span class="del">[${statusIndex.index+1}]</span>
-					<span class="del">${videoFile.referenceDescription}(参考资料说明)</span>
-					<span class="del">${videoFile.imageDescription}(图片描述)</span>
-					<div class="conList">
-						<img id="imgaa"  src="${videoFile.imageUrl}" height="50px" width="50px" >(图片)</input>
+		<div class="bk-reference-list">
+			<c:forEach items="${cmBaikeProduct.materialInfo}" var="videoFile" varStatus="statusIndex">
+				<c:if test="${videoFile.referenceType eq '1'}">
+					<div class="controls applicationsan" style="margin-top: 5px">
+						<span class="del">[${statusIndex.index+1}]</span>
+						<span class="del"><a href="${videoFile.website}" target="_blank">${videoFile.articleName}</a></span>
+						<span class="del">${videoFile.websiteName}.</span>
+						<span class="del">${videoFile.publishTime}.</span>
+						<span class="del">${videoFile.acitationTime}.</span>
+						<a class="del" style="margin-left: 100px" onclick="upMaterial(${videoFile.id})">编辑</a>
+						<a onclick="delMaterial(${videoFile.id})">删除</a>
 					</div>
-					<a class="del" style="margin-left: 100px" onclick="upMaterial(${videoFile.id})">编辑</a>
-					<a onclick="delMaterial(${videoFile.id})">删除</a>
-				</div>
-			</c:if>
-		</c:forEach>
+				</c:if>
+				<c:if test="${videoFile.referenceType eq '2'}">
+					<div class="controls applicationsan" style="margin-top: 5px">
+						<span class="del">[${statusIndex.index+1}]</span>
+						<span class="del">${videoFile.author}.</span>
+						<span class="del">${videoFile.workName}.</span>
+						<span class="del">${videoFile.publicationPlace}.</span>
+						<span class="del">${videoFile.press}.</span>
+						<span class="del">${videoFile.publicationYear}.</span>
+						<span class="del">${videoFile.acitationWeb}.</span>
+						<a class="del" style="margin-left: 100px" onclick="upMaterial(${videoFile.id})">编辑</a>
+						<a onclick="delMaterial(${videoFile.id})">删除</a>
+					</div>
+				</c:if>
+				<c:if test="${videoFile.referenceType eq '3'}">
+					<div class="controls applicationsan" style="margin-top: 5px">
+						<span class="del">[${statusIndex.index+1}]</span>
+						<span class="del">${videoFile.referenceDescription}.</span>
+						<span class="del">${videoFile.imageDescription}.</span>
+						<div class="conList">
+							<img id="imgaa"  src="${videoFile.imageUrl}" height="50px" width="50px" ></input>
+						</div>
+						<a class="del" style="margin-left: 100px" onclick="upMaterial(${videoFile.id})">编辑</a>
+						<a onclick="delMaterial(${videoFile.id})">删除</a>
+					</div>
+				</c:if>
+			</c:forEach>
+		</div>
 	</div>
 	<%--头图--%>
 	<div class="control-group" style="margin-top: 100px">
@@ -1274,8 +1279,7 @@
 	<div class="control-group">
 		<label class="control-label">SEO关键词:</label>
 		<div class="auto-input">
-			<form:input path="seoKeyword" cssStyle="margin-left: 20px" htmlEscape="false" style="position: relative" class="input-xlarge"/>
-			<label id="seoKeywordSensitiveWords" class="red"></label>
+			<form:input cssStyle="margin-left: 20px" path="seoKeyword" htmlEscape="false" style="position: relative" class="input-xlarge"/>
 		</div>
 	</div>
 	<div class="control-group">
@@ -1355,6 +1359,7 @@
 				referenceEditTyp = 'add'
 				currentContentEdit = edit
 				console.log(currentContentEdit)
+				createReferenceList()
 				$('#dig').show()
 			},
 			referenceEdit(ctrid) {
@@ -1392,7 +1397,7 @@
 		/* (其他资料) */
 		referenceData.referenceDescription= $("#referenceDescription").val()
 		referenceData.imageDescription= $("#imageDescription").val()
-		referenceData.imageUrl = $("#image").val()
+		referenceData.imageUrl = $("#referenceImgUrl").val()
 		referenceData.entryId = data.entryId || '' // 词条id
 		referenceData.entryType = data.entryType || ''
 		return referenceData
@@ -1413,7 +1418,7 @@
 		$("#acitationWeb").val(data.acitationWeb)
 		$("#referenceDescription").val(data.referenceDescription)
 		$("#imageDescription").val(data.imageDescription)
-		$("#image").val(data.imageUrl)
+		$("#referenceImgUrl").val(data.imageUrl)
 	}
 	// 创建信息栏item
 	function createParamItem(index){
@@ -1527,7 +1532,7 @@
 			var textInfoIem = createTextInfoItem(index,  ${videoFile.dictionaryType})
 			$('#textInfolist .controls').append(textInfoIem)
 			console.log('${videoFile.dictionaryContent}')
-			if(${videoFile.dictionaryType}==3){
+			if('${videoFile.dictionaryType}'=='3'){
 				createContentEdit('#' + inputId,'${videoFile.dictionaryContent}')
 			}else{
 				$('#textInfo-' + index).val('${videoFile.dictionaryContent}')
@@ -1540,41 +1545,112 @@
 	function createReferenceItem(referenceData){
 		var text=null
 		if(referenceData.referenceType == 1){
-			text = 	"<div class=\"controls applicationsan\">"+
-					<%--"<span class=\"del\">[${statusIndex.index}]</span>"+--%>
-					"<span class=\"del\"><a href=\""+referenceData.website+"\" target=\"_blank\">${videoFile.articleName}(文章名称)</a></span>"+
-					"<span class=\"del\">\""+referenceData.websiteName+"\"(网站名称)</span>"+
-					"<span class=\"del\">\""+referenceData.publishTimeStr+"\"(发表日期)</span>"+
-					"<span class=\"del\">\""+referenceData.acitationTimeStr+"\"(引文日期)</span>"+
-					<%--"<a onclick=\"saveMataInfo(${videoFile.id})\">引用资料</a>"+--%>
-					"</div>"
+			text = `
+				<div class="controls applicationsan">
+						<span class="del">
+							<a href="\${referenceData.website}" target="_blank">\${referenceData.articleName}.</a>
+						</span>
+						<span class="del">\${referenceData.websiteName}.</span>
+						<span class="del">\${referenceData.publishTimeStr}.</span>
+						<span class="del">\${referenceData.acitationTimeStr}.)</span>
+					</div>
+			`
+		}
+		if(referenceData.referenceType == 2){
+			text=	`
+				<div class="controls applicationsan">
+					<span class="del">\${referenceData.author}.</span>
+					<span class="del">\${referenceData.workName}.</span>
+					<span class="del">\${referenceData.publicationPlace}.</span>
+					<span class="del">\${referenceData.press}.</span>
+					<span class="del">\${referenceData.publicationYearStr}.</span>
+					<span class="del">\${referenceData.acitationWeb}</span>
+				</div>
+			`
+		}
+		if(referenceData.referenceType == 3){
+			text= `
+				<div class="controls applicationsan">
+					<span class="del">\${referenceData.referenceDescription}.</span>
+					<span class="del">\${referenceData.imageDescription}.</span>
+					<div class="conList">
+						<img id="imgaa"  src=\${referenceData.imageUrl}" height="50px" width="50px" ></input>
+					</div>
+				</div>
+			`
+		}
+		return text
+	}
+
+	function createAllReferenceItem(referenceData){
+		var text=null
+		if(referenceData.referenceType == 1){
+			text = `
+					<div class="controls applicationsan">
+						<span class="del"><a href="\${referenceData.website}" target="_blank">\${referenceData.articleName}.</a></span>
+						<span class="del">\${referenceData.websiteName}.</span>
+						<span class="del">\${referenceData.publishTimeStr}.</span>
+						<span class="del">\${referenceData.acitationTimeStr}.</span>
+						<a class="del" style="margin-left: 100px" onclick="upMaterial(\${referenceData.id})">编辑</a>
+						<a onclick="delMaterial(\${referenceData.id})">删除</a>
+					</div>
+			`
 		}
 		if(referenceData.referenceType == 2){
-			text=		"<div class=\"controls applicationsan\">"+
-					"<span class=\"del\">\""+referenceData.author+"\"(作者)</span>"+
-					"<span class=\"del\">\""+referenceData.workName+"\"(著作名)</span>"+
-					"<span class=\"del\">\""+referenceData.publicationPlace+"\"(出版地)</span>"+
-					"<span class=\"del\">\""+referenceData.press+"\"(出版社)</span>"+
-					"<span class=\"del\">\""+referenceData.publicationYearStr+"\"(出版年)</span>"+
-					"<span class=\"del\">\""+referenceData.acitationWeb+"\"(引文页码)</span>"+
-					"</div>"
+			text=	`
+				<div class="controls applicationsan">
+					<span class="del">\${referenceData.author}.</span>
+					<span class="del">\${referenceData.workName}.</span>
+					<span class="del">\${referenceData.publicationPlace}.</span>
+					<span class="del">\${referenceData.press}.</span>
+					<span class="del">\${referenceData.publicationYearStr}.</span>
+					<span class="del">\${referenceData.acitationWeb}.</span>
+					<a class="del" style="margin-left: 100px" onclick="upMaterial(\${referenceData.id})">编辑</a>
+					<a onclick="delMaterial(\${referenceData.id})">删除</a>
+				</div>
+			`
 		}
 		if(referenceData.referenceType == 3){
-			text=		"<div class=\"controls applicationsan\">"+
-					"<span class=\"del\">\""+referenceData.referenceDescription+"\"(参考资料说明)</span>"+
-					"<span class=\"del\">\""+referenceData.imageDescription+"\"(图片描述)</span>"+
-					"<div class=\"conList\">"+
-					"<img id=\"imgaa\"  src=\""+referenceData.imageUrl+"\"height=\"50px\" width=\"50px\" >(图片)</input>"+
-					"</div>"+
-					"</div>"
-		}
-		return text;
+			text= `
+				<div class="controls applicationsan">
+					<span class="del">\${referenceData.referenceDescription}.</span>
+					<span class="del">\${referenceData.imageDescription}.</span>
+					<div class="conList">
+						<img id="imgaa"  src=\${referenceData.imageUrl}" height="50px" width="50px" ></input>
+					</div>
+					<a class="del" style="margin-left: 100px" onclick="upMaterial(\${referenceData.id})">编辑</a>
+					<a onclick="delMaterial(\${referenceData.id})">删除</a>
+				</div>
+			`
+		}
+		return text
 	}
+
+	// 只要referenceList数据有更新就执行一次
+	function createReferenceList(){
+		$('.check-reference-list').html('')
+		referenceList.forEach(function(refData, index){
+			console.log(refData)
+			var item = createReferenceItem(refData)
+			$('.check-reference-list').append(item)
+		})
+		$('.check-reference-list').find('.controls').on('click', function(){
+			var index = $(this).index() + 1
+			var result = referenceList[$(this).index()]
+			console.log(result)
+			if(!result) return
+			var con= createReferenceItem(result)
+			result.ctrlId = currentContentEdit.confirm(con, result.ctrlId, index)
+		})
+	}
+
 	$(function(){
 		var refren='${cmBaikeProduct.referenceList}'
 		if(''==refren|| null==refren){
 		}else{
 			referenceList=JSON.parse(refren)
+			markCount=referenceList.length
+			console.log(markCount)
 		}
 		//初始化 义项名,词条概述
 		createContentEdit('#bk-name','${cmBaikeProduct.alias}')
@@ -1595,6 +1671,8 @@
 				referenceList.push(result)
 				$(this).parents('#dig').hide()
 				initRefrenceFormData({})
+				var item = createAllReferenceItem(result)
+				$('.bk-reference-list').append(item)
 			}else{
 				var result = setRefrenceData(referenceData)
 				const index = referenceList.findIndex(function(item){
@@ -1658,11 +1736,11 @@
 			})
 		});
 		var observeEle1 = document.getElementsByClassName('main-image-list')[0];
-		// var observeEle2 = document.getElementsByClassName('auth-qrCode-list')[0];
+		var observeEle2 = document.getElementsByClassName('auth-qrCode-list')[0];
 		// var observeEle3 = document.getElementsByClassName('auth-image-list')[0];
 		var observeEle4 = document.getElementsByClassName('display-image-list')[0];
 		observer.observe(observeEle1, MutationObserverConfig);
-		// observer.observe(observeEle2, MutationObserverConfig);
+		observer.observe(observeEle2, MutationObserverConfig);
 		// observer.observe(observeEle3, MutationObserverConfig);
 		observer.observe(observeEle4, MutationObserverConfig);
 

+ 196 - 119
src/main/webapp/WEB-INF/views/modules/baikePage/checkBaikePage.jsp

@@ -400,10 +400,10 @@
 
 		.box {
 			overflow: hidden;
-			position: absolute;
+			position: fixed;
 			width: 55%;
 			height: 60%;
-			z-index: 100; /*值越大,和其他层层叠时越在上面*/
+			z-index: 200; /*值越大,和其他层层叠时越在上面*/
 			left: 20%;
 			top: 15%;
 			background-color: #fff;
@@ -436,6 +436,7 @@
 			OVERFLOW: scroll;
 			height: calc(100% - 20px);
 			height: -webkit-calc(100% - 20px);
+			margin-left: 30px;
 		}
 
 		.logcontent {
@@ -862,44 +863,46 @@
 		<%--已有资料--%>
 		<div class="control-group" id="yyzl" style="display: none">
 			<label class="control-label titleClass">参考资料</label>
-			<c:forEach items="${cmBaikeProduct.materialInfo}" var="videoFile" varStatus="statusIndex">
-				<c:if test="${videoFile.referenceType eq '1'}">
-					<div class="controls applicationsan" style="margin-top: 5px">
-						<span class="del">[${statusIndex.index}]</span>
-						<span class="del"><a href="${videoFile.website}" target="_blank">${videoFile.articleName}(文章名称)</a></span>
-						<span class="del">${videoFile.websiteName}(网站名称)</span>
-						<span class="del">${videoFile.publishTime}(发表日期)</span>
-						<span class="del">${videoFile.acitationTime}(引文日期)</span>
-						<a onclick="saveMataInfo(${videoFile.id})">引用资料</a>
-					</div>
-				</c:if>
-				<c:if test="${videoFile.referenceType eq '2'}">
-					<div class="controls applicationsan" style="margin-top: 5px">
-						<span class="del">[${statusIndex.index}]</span>
-						<span class="del">${videoFile.author}(作者)</span>
-						<span class="del">${videoFile.workName}(著作名)</span>
-						<span class="del">${videoFile.publicationPlace}(出版地)</span>
-						<span class="del">${videoFile.press}(出版社)</span>
-						<span class="del">${videoFile.publicationYear}(出版年)</span>
-						<span class="del">${videoFile.acitationWeb}(引文页码)</span>
-						<a onclick="saveMataInfo(${videoFile.id})">引用资料</a>
+			<div class="check-reference-list">
+				<c:forEach items="${cmBaikeProduct.materialInfo}" var="videoFile" varStatus="statusIndex">
+					<c:if test="${videoFile.referenceType eq '1'}">
+						<div class="controls applicationsan" style="margin-top: 5px">
+							<span class="del">[${statusIndex.index}]</span>
+							<span class="del"><a href="${videoFile.website}" target="_blank">${videoFile.articleName}.</a></span>
+							<span class="del">${videoFile.websiteName}).</span>
+							<span class="del">${videoFile.publishTime}.</span>
+							<span class="del">${videoFile.acitationTime}.</span>
+							<a onclick="saveMataInfo(${videoFile.id})"></a>
+						</div>
+					</c:if>
+					<c:if test="${videoFile.referenceType eq '2'}">
+						<div class="controls applicationsan" style="margin-top: 5px">
+							<span class="del">[${statusIndex.index}]</span>
+							<span class="del">${videoFile.author}.</span>
+							<span class="del">${videoFile.workName}.</span>
+							<span class="del">${videoFile.publicationPlace}.</span>
+							<span class="del">${videoFile.press}.</span>
+							<span class="del">${videoFile.publicationYear}.</span>
+							<span class="del">${videoFile.acitationWeb}.</span>
+							<a onclick="saveMataInfo(${videoFile.id})"></a>
 
-					</div>
-				</c:if>
-				<c:if test="${videoFile.referenceType eq '3'}">
-					<div class="controls applicationsan" style="margin-top: 5px">
-						<span class="del">[${statusIndex.index}]</span>
-						<span class="del">${videoFile.referenceDescription}(参考资料说明)</span>
-						<span class="del">${videoFile.imageDescription}(图片描述)</span>
-						<div class="conList">
-								<%--							onclick="imgSizeChange()"--%>
-							<img id="imgaa"  src="${videoFile.imageUrl}" height="50px" width="50px" >(图片)</input>
 						</div>
-						<a onclick="saveMataInfo(${videoFile.id})">引用资料</a>
+					</c:if>
+					<c:if test="${videoFile.referenceType eq '3'}">
+						<div class="controls applicationsan" style="margin-top: 5px">
+							<span class="del">[${statusIndex.index}]</span>
+							<span class="del">${videoFile.referenceDescription}.</span>
+							<span class="del">${videoFile.imageDescription}.</span>
+							<div class="conList">
+									<%--							onclick="imgSizeChange()"--%>
+								<img id="imgaa"  src="${videoFile.imageUrl}" height="50px" width="50px" >(图片)</input>
+							</div>
+							<a onclick="saveMataInfo(${videoFile.id})">引用资料</a>
 
-					</div>
-				</c:if>
-			</c:forEach>
+						</div>
+					</c:if>
+				</c:forEach>
+			</div>
 		</div>
 		<%--添加参考资料--%>
 		<div id="zl" style="margin-top: 10px">
@@ -985,17 +988,17 @@
 				</div>
 				<div class="control-group" style="margin-top: 28px">
 					<label class="control-label">图片上传:</label>
-<%--					<div class="main-image-list" style="display: flex;flex-wrap: wrap">--%>
-<%--						<div class="controls upload-content iconBox mainImageBox" id="mainImageBox">--%>
-<%--							<div class="conList">--%>
-<%--								<hidden id="image" path="image" htmlEscape="false" maxlength="255" class="input-xlarge "/>--%>
-<%--								<sys:ckfinder input="image" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100"--%>
-<%--											  maxHeight="100"/>--%>
-<%--								<br>--%>
-<%--								<label style="margin-left: 150px">请上传引用的图片资源,需同时上传资料的封面、以及含有对应具体内容的图片;注意:图片需要保证完整、不可遮挡且清晰</label>--%>
-<%--							</div>--%>
-<%--						</div>--%>
-<%--					</div>--%>
+					<div class="auth-qrCode-list" style="display: flex;flex-wrap: wrap">
+						<div class="controls upload-content iconBox mainImageBox" id="mainImageBox">
+							<div class="conList">
+								<hidden id="referenceImgUrl" path="referenceImgUrl" htmlEscape="false" maxlength="255" class="input-xlarge "/>
+								<sys:ckfinder input="referenceImgUrl" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100"
+											  maxHeight="100"/>
+								<br>
+								<label style="margin-left: 150px">请上传引用的图片资源,需同时上传资料的封面、以及含有对应具体内容的图片;注意:图片需要保证完整、不可遮挡且清晰</label>
+							</div>
+						</div>
+					</div>
 				</div>
 			</div>
 
@@ -1013,7 +1016,7 @@
 		<%--			<a herf="https://www.baidu.com">十里桃花</a>--%>
 		<div><h4>创建词条引导</h4></div>
 		<br>
-		<div>欢迎进入创建词条引导,为便于您更好的通过审核,请务必确保您已知晓百科词条的<a href="${ctx}/baike/cmBaikeProduct/entry">编辑须知</a>,如有疑问,您可以<a>点此</a>求助采美工作人员。</div>
+		<div>欢迎进入创建词条引导,为便于您更好的通过审核,请务必确保您已知晓百科词条的<a href="${ctx}/baike/cmBaikeProduct/entry" target="_blank">编辑须知</a>,如有疑问,您可以<a>点此</a>求助采美工作人员。</div>
 		<br>
 		<div><h5>声明</h5></div>
 		<br>
@@ -1207,44 +1210,46 @@
 	<%--参考资料--%>
 	<div class="control-group" id="mata">
 		<label class="control-label titleClass">参考资料</label>
-		<c:forEach items="${cmBaikeProduct.materialInfo}" var="videoFile" varStatus="statusIndex">
-			<c:if test="${videoFile.referenceType eq '1'}">
-				<div class="controls applicationsan" style="margin-top: 5px">
-					<span class="del">[${statusIndex.index+1}]</span>
-					<span class="del"><a href="${videoFile.website}" target="_blank">${videoFile.articleName}(文章名称)</a></span>
-					<span class="del">${videoFile.websiteName}(网站名称)</span>
-					<span class="del">${videoFile.publishTime}(发表日期)</span>
-					<span class="del">${videoFile.acitationTime}(引文日期)</span>
-					<a class="del" style="margin-left: 100px" onclick="upMaterial(${videoFile.id})">编辑</a>
-					<a onclick="delMaterial(${videoFile.id})">删除</a>
-				</div>
-			</c:if>
-			<c:if test="${videoFile.referenceType eq '2'}">
-				<div class="controls applicationsan" style="margin-top: 5px">
-					<span class="del">[${statusIndex.index+1}]</span>
-					<span class="del">${videoFile.author}(作者)</span>
-					<span class="del">${videoFile.workName}(著作名)</span>
-					<span class="del">${videoFile.publicationPlace}(出版地)</span>
-					<span class="del">${videoFile.press}(出版社)</span>
-					<span class="del">${videoFile.publicationYear}(出版年)</span>
-					<span class="del">${videoFile.acitationWeb}(引文页码)</span>
-					<a class="del" style="margin-left: 100px" onclick="upMaterial(${videoFile.id})">编辑</a>
-					<a onclick="delMaterial(${videoFile.id})">删除</a>
-				</div>
-			</c:if>
-			<c:if test="${videoFile.referenceType eq '3'}">
-				<div class="controls applicationsan" style="margin-top: 5px">
-					<span class="del">[${statusIndex.index+1}]</span>
-					<span class="del">${videoFile.referenceDescription}(参考资料说明)</span>
-					<span class="del">${videoFile.imageDescription}(图片描述)</span>
-					<div class="conList">
-						<img id="imgaa"  src="${videoFile.imageUrl}" height="50px" width="50px" >(图片)</input>
+		<div class="bk-reference-list">
+			<c:forEach items="${cmBaikeProduct.materialInfo}" var="videoFile" varStatus="statusIndex">
+				<c:if test="${videoFile.referenceType eq '1'}">
+					<div class="controls applicationsan" style="margin-top: 5px">
+						<span class="del">[${statusIndex.index+1}]</span>
+						<span class="del"><a href="${videoFile.website}" target="_blank">${videoFile.articleName}</a></span>
+						<span class="del">${videoFile.websiteName}.</span>
+						<span class="del">${videoFile.publishTime}.</span>
+						<span class="del">${videoFile.acitationTime}.</span>
+						<a class="del" style="margin-left: 100px" onclick="upMaterial(${videoFile.id})">编辑</a>
+						<a onclick="delMaterial(${videoFile.id})">删除</a>
 					</div>
-					<a class="del" style="margin-left: 100px" onclick="upMaterial(${videoFile.id})">编辑</a>
-					<a onclick="delMaterial(${videoFile.id})">删除</a>
-				</div>
-			</c:if>
-		</c:forEach>
+				</c:if>
+				<c:if test="${videoFile.referenceType eq '2'}">
+					<div class="controls applicationsan" style="margin-top: 5px">
+						<span class="del">[${statusIndex.index+1}]</span>
+						<span class="del">${videoFile.author}.</span>
+						<span class="del">${videoFile.workName}.</span>
+						<span class="del">${videoFile.publicationPlace}.</span>
+						<span class="del">${videoFile.press}.</span>
+						<span class="del">${videoFile.publicationYear}.</span>
+						<span class="del">${videoFile.acitationWeb}.</span>
+						<a class="del" style="margin-left: 100px" onclick="upMaterial(${videoFile.id})">编辑</a>
+						<a onclick="delMaterial(${videoFile.id})">删除</a>
+					</div>
+				</c:if>
+				<c:if test="${videoFile.referenceType eq '3'}">
+					<div class="controls applicationsan" style="margin-top: 5px">
+						<span class="del">[${statusIndex.index+1}]</span>
+						<span class="del">${videoFile.referenceDescription}.</span>
+						<span class="del">${videoFile.imageDescription}.</span>
+						<div class="conList">
+							<img id="imgaa"  src="${videoFile.imageUrl}" height="50px" width="50px" ></input>
+						</div>
+						<a class="del" style="margin-left: 100px" onclick="upMaterial(${videoFile.id})">编辑</a>
+						<a onclick="delMaterial(${videoFile.id})">删除</a>
+					</div>
+				</c:if>
+			</c:forEach>
+		</div>
 	</div>
 	<%--头图--%>
 	<div class="control-group" style="margin-top: 100px">
@@ -1274,8 +1279,7 @@
 	<div class="control-group">
 		<label class="control-label">SEO关键词:</label>
 		<div class="auto-input">
-			<form:input path="seoKeyword" cssStyle="margin-left: 20px"  htmlEscape="false" style="position: relative" class="input-xlarge"/>
-			<label id="seoKeywordSensitiveWords" class="red"></label>
+			<form:input cssStyle="margin-left: 20px" path="seoKeyword" htmlEscape="false" style="position: relative" class="input-xlarge"/>
 		</div>
 	</div>
 	<%--关联供应商--%>
@@ -1314,7 +1318,6 @@
 	</div>
 	<%--提交数据 --%>
 	<div class="form-actions">
-<%--		<input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;--%>
 		<input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/>
 	</div>
 </form:form>
@@ -1355,6 +1358,7 @@
 				referenceEditTyp = 'add'
 				currentContentEdit = edit
 				console.log(currentContentEdit)
+				createReferenceList()
 				$('#dig').show()
 			},
 			referenceEdit(ctrid) {
@@ -1392,7 +1396,7 @@
 		/* (其他资料) */
 		referenceData.referenceDescription= $("#referenceDescription").val()
 		referenceData.imageDescription= $("#imageDescription").val()
-		referenceData.imageUrl = $("#image").val()
+		referenceData.imageUrl = $("#referenceImgUrl").val()
 		referenceData.entryId = data.entryId || '' // 词条id
 		referenceData.entryType = data.entryType || ''
 		return referenceData
@@ -1413,7 +1417,7 @@
 		$("#acitationWeb").val(data.acitationWeb)
 		$("#referenceDescription").val(data.referenceDescription)
 		$("#imageDescription").val(data.imageDescription)
-		$("#image").val(data.imageUrl)
+		$("#referenceImgUrl").val(data.imageUrl)
 	}
 	// 创建信息栏item
 	function createParamItem(index){
@@ -1527,7 +1531,7 @@
 			var textInfoIem = createTextInfoItem(index,  ${videoFile.dictionaryType})
 			$('#textInfolist .controls').append(textInfoIem)
 			console.log('${videoFile.dictionaryContent}')
-			if(${videoFile.dictionaryType}==3){
+			if('${videoFile.dictionaryType}'=='3'){
 				createContentEdit('#' + inputId,'${videoFile.dictionaryContent}')
 			}else{
 				$('#textInfo-' + index).val('${videoFile.dictionaryContent}')
@@ -1540,41 +1544,112 @@
 	function createReferenceItem(referenceData){
 		var text=null
 		if(referenceData.referenceType == 1){
-			text = 	"<div class=\"controls applicationsan\">"+
-					<%--"<span class=\"del\">[${statusIndex.index}]</span>"+--%>
-					"<span class=\"del\"><a href=\""+referenceData.website+"\" target=\"_blank\">${videoFile.articleName}(文章名称)</a></span>"+
-					"<span class=\"del\">\""+referenceData.websiteName+"\"(网站名称)</span>"+
-					"<span class=\"del\">\""+referenceData.publishTimeStr+"\"(发表日期)</span>"+
-					"<span class=\"del\">\""+referenceData.acitationTimeStr+"\"(引文日期)</span>"+
-					<%--"<a onclick=\"saveMataInfo(${videoFile.id})\">引用资料</a>"+--%>
-					"</div>"
+			text = `
+				<div class="controls applicationsan">
+						<span class="del">
+							<a href="\${referenceData.website}" target="_blank">\${referenceData.articleName}.</a>
+						</span>
+						<span class="del">\${referenceData.websiteName}.</span>
+						<span class="del">\${referenceData.publishTimeStr}.</span>
+						<span class="del">\${referenceData.acitationTimeStr}.)</span>
+					</div>
+			`
+		}
+		if(referenceData.referenceType == 2){
+			text=	`
+				<div class="controls applicationsan">
+					<span class="del">\${referenceData.author}.</span>
+					<span class="del">\${referenceData.workName}.</span>
+					<span class="del">\${referenceData.publicationPlace}.</span>
+					<span class="del">\${referenceData.press}.</span>
+					<span class="del">\${referenceData.publicationYearStr}.</span>
+					<span class="del">\${referenceData.acitationWeb}</span>
+				</div>
+			`
+		}
+		if(referenceData.referenceType == 3){
+			text= `
+				<div class="controls applicationsan">
+					<span class="del">\${referenceData.referenceDescription}.</span>
+					<span class="del">\${referenceData.imageDescription}.</span>
+					<div class="conList">
+						<img id="imgaa"  src=\${referenceData.imageUrl}" height="50px" width="50px" ></input>
+					</div>
+				</div>
+			`
+		}
+		return text
+	}
+
+	function createAllReferenceItem(referenceData){
+		var text=null
+		if(referenceData.referenceType == 1){
+			text = `
+					<div class="controls applicationsan">
+						<span class="del"><a href="\${referenceData.website}" target="_blank">\${referenceData.articleName}.</a></span>
+						<span class="del">\${referenceData.websiteName}.</span>
+						<span class="del">\${referenceData.publishTimeStr}.</span>
+						<span class="del">\${referenceData.acitationTimeStr}.</span>
+						<a class="del" style="margin-left: 100px" onclick="upMaterial(\${referenceData.id})">编辑</a>
+						<a onclick="delMaterial(\${referenceData.id})">删除</a>
+					</div>
+			`
 		}
 		if(referenceData.referenceType == 2){
-			text=		"<div class=\"controls applicationsan\">"+
-					"<span class=\"del\">\""+referenceData.author+"\"(作者)</span>"+
-					"<span class=\"del\">\""+referenceData.workName+"\"(著作名)</span>"+
-					"<span class=\"del\">\""+referenceData.publicationPlace+"\"(出版地)</span>"+
-					"<span class=\"del\">\""+referenceData.press+"\"(出版社)</span>"+
-					"<span class=\"del\">\""+referenceData.publicationYearStr+"\"(出版年)</span>"+
-					"<span class=\"del\">\""+referenceData.acitationWeb+"\"(引文页码)</span>"+
-					"</div>"
+			text=	`
+				<div class="controls applicationsan">
+					<span class="del">\${referenceData.author}.</span>
+					<span class="del">\${referenceData.workName}.</span>
+					<span class="del">\${referenceData.publicationPlace}.</span>
+					<span class="del">\${referenceData.press}.</span>
+					<span class="del">\${referenceData.publicationYearStr}.</span>
+					<span class="del">\${referenceData.acitationWeb}.</span>
+					<a class="del" style="margin-left: 100px" onclick="upMaterial(\${referenceData.id})">编辑</a>
+					<a onclick="delMaterial(\${referenceData.id})">删除</a>
+				</div>
+			`
 		}
 		if(referenceData.referenceType == 3){
-			text=		"<div class=\"controls applicationsan\">"+
-					"<span class=\"del\">\""+referenceData.referenceDescription+"\"(参考资料说明)</span>"+
-					"<span class=\"del\">\""+referenceData.imageDescription+"\"(图片描述)</span>"+
-					"<div class=\"conList\">"+
-					"<img id=\"imgaa\"  src=\""+referenceData.imageUrl+"\"height=\"50px\" width=\"50px\" >(图片)</input>"+
-					"</div>"+
-					"</div>"
-		}
-		return text;
+			text= `
+				<div class="controls applicationsan">
+					<span class="del">\${referenceData.referenceDescription}.</span>
+					<span class="del">\${referenceData.imageDescription}.</span>
+					<div class="conList">
+						<img id="imgaa"  src=\${referenceData.imageUrl}" height="50px" width="50px" ></input>
+					</div>
+					<a class="del" style="margin-left: 100px" onclick="upMaterial(\${referenceData.id})">编辑</a>
+					<a onclick="delMaterial(\${referenceData.id})">删除</a>
+				</div>
+			`
+		}
+		return text
 	}
+
+	// 只要referenceList数据有更新就执行一次
+	function createReferenceList(){
+		$('.check-reference-list').html('')
+		referenceList.forEach(function(refData, index){
+			console.log(refData)
+			var item = createReferenceItem(refData)
+			$('.check-reference-list').append(item)
+		})
+		$('.check-reference-list').find('.controls').on('click', function(){
+			var index = $(this).index() + 1
+			var result = referenceList[$(this).index()]
+			console.log(result)
+			if(!result) return
+			var con= createReferenceItem(result)
+			result.ctrlId = currentContentEdit.confirm(con, result.ctrlId, index)
+		})
+	}
+
 	$(function(){
 		var refren='${cmBaikeProduct.referenceList}'
 		if(''==refren|| null==refren){
 		}else{
 			referenceList=JSON.parse(refren)
+			markCount=referenceList.length
+			console.log(markCount)
 		}
 		//初始化 义项名,词条概述
 		createContentEdit('#bk-name','${cmBaikeProduct.alias}')
@@ -1595,6 +1670,8 @@
 				referenceList.push(result)
 				$(this).parents('#dig').hide()
 				initRefrenceFormData({})
+				var item = createAllReferenceItem(result)
+				$('.bk-reference-list').append(item)
 			}else{
 				var result = setRefrenceData(referenceData)
 				const index = referenceList.findIndex(function(item){
@@ -1658,11 +1735,11 @@
 			})
 		});
 		var observeEle1 = document.getElementsByClassName('main-image-list')[0];
-		// var observeEle2 = document.getElementsByClassName('auth-qrCode-list')[0];
+		var observeEle2 = document.getElementsByClassName('auth-qrCode-list')[0];
 		// var observeEle3 = document.getElementsByClassName('auth-image-list')[0];
 		var observeEle4 = document.getElementsByClassName('display-image-list')[0];
 		observer.observe(observeEle1, MutationObserverConfig);
-		// observer.observe(observeEle2, MutationObserverConfig);
+		observer.observe(observeEle2, MutationObserverConfig);
 		// observer.observe(observeEle3, MutationObserverConfig);
 		observer.observe(observeEle4, MutationObserverConfig);
 

+ 190 - 113
src/main/webapp/WEB-INF/views/modules/baikePage/cmBaikeProductForm.jsp

@@ -863,44 +863,46 @@
 			<%--已有资料--%>
 			<div class="control-group" id="yyzl" style="display: none">
 				<label class="control-label titleClass">参考资料</label>
-				<c:forEach items="${cmBaikeProduct.materialInfo}" var="videoFile" varStatus="statusIndex">
-					<c:if test="${videoFile.referenceType eq '1'}">
-						<div class="controls applicationsan" style="margin-top: 5px">
-							<span class="del">[${statusIndex.index}]</span>
-							<span class="del"><a href="${videoFile.website}" target="_blank">${videoFile.articleName}(文章名称)</a></span>
-							<span class="del">${videoFile.websiteName}(网站名称)</span>
-							<span class="del">${videoFile.publishTime}(发表日期)</span>
-							<span class="del">${videoFile.acitationTime}(引文日期)</span>
-							<a onclick="saveMataInfo(${videoFile.id})">引用资料</a>
-						</div>
-					</c:if>
-					<c:if test="${videoFile.referenceType eq '2'}">
-						<div class="controls applicationsan" style="margin-top: 5px">
-							<span class="del">[${statusIndex.index}]</span>
-							<span class="del">${videoFile.author}(作者)</span>
-							<span class="del">${videoFile.workName}(著作名)</span>
-							<span class="del">${videoFile.publicationPlace}(出版地)</span>
-							<span class="del">${videoFile.press}(出版社)</span>
-							<span class="del">${videoFile.publicationYear}(出版年)</span>
-							<span class="del">${videoFile.acitationWeb}(引文页码)</span>
-							<a onclick="saveMataInfo(${videoFile.id})">引用资料</a>
+				<div class="check-reference-list">
+					<c:forEach items="${cmBaikeProduct.materialInfo}" var="videoFile" varStatus="statusIndex">
+						<c:if test="${videoFile.referenceType eq '1'}">
+							<div class="controls applicationsan" style="margin-top: 5px">
+								<span class="del">[${statusIndex.index}]</span>
+								<span class="del"><a href="${videoFile.website}" target="_blank">${videoFile.articleName}.</a></span>
+								<span class="del">${videoFile.websiteName}).</span>
+								<span class="del">${videoFile.publishTime}.</span>
+								<span class="del">${videoFile.acitationTime}.</span>
+								<a onclick="saveMataInfo(${videoFile.id})"></a>
+							</div>
+						</c:if>
+						<c:if test="${videoFile.referenceType eq '2'}">
+							<div class="controls applicationsan" style="margin-top: 5px">
+								<span class="del">[${statusIndex.index}]</span>
+								<span class="del">${videoFile.author}.</span>
+								<span class="del">${videoFile.workName}.</span>
+								<span class="del">${videoFile.publicationPlace}.</span>
+								<span class="del">${videoFile.press}.</span>
+								<span class="del">${videoFile.publicationYear}.</span>
+								<span class="del">${videoFile.acitationWeb}.</span>
+								<a onclick="saveMataInfo(${videoFile.id})"></a>
 
-						</div>
-					</c:if>
-					<c:if test="${videoFile.referenceType eq '3'}">
-						<div class="controls applicationsan" style="margin-top: 5px">
-							<span class="del">[${statusIndex.index}]</span>
-							<span class="del">${videoFile.referenceDescription}(参考资料说明)</span>
-							<span class="del">${videoFile.imageDescription}(图片描述)</span>
-							<div class="conList">
-									<%--							onclick="imgSizeChange()"--%>
-								<img id="imgaa"  src="${videoFile.imageUrl}" height="50px" width="50px" >(图片)</input>
 							</div>
-							<a onclick="saveMataInfo(${videoFile.id})">引用资料</a>
+						</c:if>
+						<c:if test="${videoFile.referenceType eq '3'}">
+							<div class="controls applicationsan" style="margin-top: 5px">
+								<span class="del">[${statusIndex.index}]</span>
+								<span class="del">${videoFile.referenceDescription}.</span>
+								<span class="del">${videoFile.imageDescription}.</span>
+								<div class="conList">
+										<%--							onclick="imgSizeChange()"--%>
+									<img id="imgaa"  src="${videoFile.imageUrl}" height="50px" width="50px" >(图片)</input>
+								</div>
+								<a onclick="saveMataInfo(${videoFile.id})">引用资料</a>
 
-						</div>
-					</c:if>
-				</c:forEach>
+							</div>
+						</c:if>
+					</c:forEach>
+				</div>
 			</div>
 			<%--添加参考资料--%>
 			<div id="zl" style="margin-top: 10px">
@@ -986,17 +988,17 @@
 					</div>
 					<div class="control-group" style="margin-top: 28px">
 						<label class="control-label">图片上传:</label>
-<%--						<div class="main-image-list" style="display: flex;flex-wrap: wrap">--%>
-<%--							<div class="controls upload-content iconBox mainImageBox" id="mainImageBox">--%>
-<%--								<div class="conList">--%>
-<%--									<hidden id="image" path="image" htmlEscape="false" maxlength="255" class="input-xlarge "/>--%>
-<%--									<sys:ckfinder input="image" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100"--%>
-<%--												  maxHeight="100"/>--%>
-<%--									<br>--%>
-<%--									<label style="margin-left: 150px">请上传引用的图片资源,需同时上传资料的封面、以及含有对应具体内容的图片;注意:图片需要保证完整、不可遮挡且清晰</label>--%>
-<%--								</div>--%>
-<%--							</div>--%>
-<%--						</div>--%>
+						<div class="auth-qrCode-list" style="display: flex;flex-wrap: wrap">
+							<div class="controls upload-content iconBox mainImageBox" id="mainImageBox">
+								<div class="conList">
+									<hidden id="referenceImgUrl" path="referenceImgUrl" htmlEscape="false" maxlength="255" class="input-xlarge "/>
+									<sys:ckfinder input="referenceImgUrl" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100"
+												  maxHeight="100"/>
+									<br>
+									<label style="margin-left: 150px">请上传引用的图片资源,需同时上传资料的封面、以及含有对应具体内容的图片;注意:图片需要保证完整、不可遮挡且清晰</label>
+								</div>
+							</div>
+						</div>
 					</div>
 				</div>
 
@@ -1208,44 +1210,46 @@
             <%--参考资料--%>
 		<div class="control-group" id="mata">
 			<label class="control-label titleClass">参考资料</label>
-			<c:forEach items="${cmBaikeProduct.materialInfo}" var="videoFile" varStatus="statusIndex">
-				<c:if test="${videoFile.referenceType eq '1'}">
-					<div class="controls applicationsan" style="margin-top: 5px">
-						<span class="del">[${statusIndex.index+1}]</span>
-						<span class="del"><a href="${videoFile.website}" target="_blank">${videoFile.articleName}(文章名称)</a></span>
-						<span class="del">${videoFile.websiteName}(网站名称)</span>
-						<span class="del">${videoFile.publishTime}(发表日期)</span>
-						<span class="del">${videoFile.acitationTime}(引文日期)</span>
-						<a class="del" style="margin-left: 100px" onclick="upMaterial(${videoFile.id})">编辑</a>
-						<a onclick="delMaterial(${videoFile.id})">删除</a>
-					</div>
-				</c:if>
-				<c:if test="${videoFile.referenceType eq '2'}">
-					<div class="controls applicationsan" style="margin-top: 5px">
-						<span class="del">[${statusIndex.index+1}]</span>
-						<span class="del">${videoFile.author}(作者)</span>
-						<span class="del">${videoFile.workName}(著作名)</span>
-						<span class="del">${videoFile.publicationPlace}(出版地)</span>
-						<span class="del">${videoFile.press}(出版社)</span>
-						<span class="del">${videoFile.publicationYear}(出版年)</span>
-						<span class="del">${videoFile.acitationWeb}(引文页码)</span>
-						<a class="del" style="margin-left: 100px" onclick="upMaterial(${videoFile.id})">编辑</a>
-						<a onclick="delMaterial(${videoFile.id})">删除</a>
-					</div>
-				</c:if>
-				<c:if test="${videoFile.referenceType eq '3'}">
-					<div class="controls applicationsan" style="margin-top: 5px">
-						<span class="del">[${statusIndex.index+1}]</span>
-						<span class="del">${videoFile.referenceDescription}(参考资料说明)</span>
-						<span class="del">${videoFile.imageDescription}(图片描述)</span>
-						<div class="conList">
-						<img id="imgaa"  src="${videoFile.imageUrl}" height="50px" width="50px" >(图片)</input>
+			<div class="bk-reference-list">
+				<c:forEach items="${cmBaikeProduct.materialInfo}" var="videoFile" varStatus="statusIndex">
+					<c:if test="${videoFile.referenceType eq '1'}">
+						<div class="controls applicationsan" style="margin-top: 5px">
+							<span class="del">[${statusIndex.index+1}]</span>
+							<span class="del"><a href="${videoFile.website}" target="_blank">${videoFile.articleName}</a></span>
+							<span class="del">${videoFile.websiteName}.</span>
+							<span class="del">${videoFile.publishTime}.</span>
+							<span class="del">${videoFile.acitationTime}.</span>
+							<a class="del" style="margin-left: 100px" onclick="upMaterial(${videoFile.id})">编辑</a>
+							<a onclick="delMaterial(${videoFile.id})">删除</a>
 						</div>
-						<a class="del" style="margin-left: 100px" onclick="upMaterial(${videoFile.id})">编辑</a>
-						<a onclick="delMaterial(${videoFile.id})">删除</a>
-					</div>
-				</c:if>
-			</c:forEach>
+					</c:if>
+					<c:if test="${videoFile.referenceType eq '2'}">
+						<div class="controls applicationsan" style="margin-top: 5px">
+							<span class="del">[${statusIndex.index+1}]</span>
+							<span class="del">${videoFile.author}.</span>
+							<span class="del">${videoFile.workName}.</span>
+							<span class="del">${videoFile.publicationPlace}.</span>
+							<span class="del">${videoFile.press}.</span>
+							<span class="del">${videoFile.publicationYear}.</span>
+							<span class="del">${videoFile.acitationWeb}.</span>
+							<a class="del" style="margin-left: 100px" onclick="upMaterial(${videoFile.id})">编辑</a>
+							<a onclick="delMaterial(${videoFile.id})">删除</a>
+						</div>
+					</c:if>
+					<c:if test="${videoFile.referenceType eq '3'}">
+						<div class="controls applicationsan" style="margin-top: 5px">
+							<span class="del">[${statusIndex.index+1}]</span>
+							<span class="del">${videoFile.referenceDescription}.</span>
+							<span class="del">${videoFile.imageDescription}.</span>
+							<div class="conList">
+								<img id="imgaa"  src="${videoFile.imageUrl}" height="50px" width="50px" ></input>
+							</div>
+							<a class="del" style="margin-left: 100px" onclick="upMaterial(${videoFile.id})">编辑</a>
+							<a onclick="delMaterial(${videoFile.id})">删除</a>
+						</div>
+					</c:if>
+				</c:forEach>
+			</div>
 		</div>
 		<%--头图--%>
 		<div class="control-group" style="margin-top: 100px">
@@ -1355,6 +1359,7 @@
 				referenceEditTyp = 'add'
 				currentContentEdit = edit
 				console.log(currentContentEdit)
+				createReferenceList()
 				$('#dig').show()
 			},
 			referenceEdit(ctrid) {
@@ -1392,7 +1397,7 @@
 		/* (其他资料) */
 		referenceData.referenceDescription= $("#referenceDescription").val()
 		referenceData.imageDescription= $("#imageDescription").val()
-		referenceData.imageUrl = $("#image").val()
+		referenceData.imageUrl = $("#referenceImgUrl").val()
 		referenceData.entryId = data.entryId || '' // 词条id
 		referenceData.entryType = data.entryType || ''
 		return referenceData
@@ -1413,7 +1418,7 @@
 		$("#acitationWeb").val(data.acitationWeb)
 		$("#referenceDescription").val(data.referenceDescription)
 		$("#imageDescription").val(data.imageDescription)
-		$("#image").val(data.imageUrl)
+		$("#referenceImgUrl").val(data.imageUrl)
 	}
 	// 创建信息栏item
 	function createParamItem(index){
@@ -1508,7 +1513,6 @@
 	// 初始化正文内容
 	function initTextInfoList(){
 		var te='${cmBaikeProduct.textInfolist}'
-		console.log('-------------------------------'+te)
 		if(''==te ||null==te ||te=='[]'){
 			var textInfoList = [{type:1},{type:2},{type:3}]
 			textInfoList.forEach(function(item,index){
@@ -1541,41 +1545,112 @@
 	function createReferenceItem(referenceData){
 		var text=null
 		if(referenceData.referenceType == 1){
-			   text = 	"<div class=\"controls applicationsan\">"+
-						<%--"<span class=\"del\">[${statusIndex.index}]</span>"+--%>
-						"<span class=\"del\"><a href=\""+referenceData.website+"\" target=\"_blank\">${videoFile.articleName}(文章名称)</a></span>"+
-						"<span class=\"del\">\""+referenceData.websiteName+"\"(网站名称)</span>"+
-						"<span class=\"del\">\""+referenceData.publishTimeStr+"\"(发表日期)</span>"+
-						"<span class=\"del\">\""+referenceData.acitationTimeStr+"\"(引文日期)</span>"+
-						<%--"<a onclick=\"saveMataInfo(${videoFile.id})\">引用资料</a>"+--%>
-						"</div>"
+			text = `
+				<div class="controls applicationsan">
+						<span class="del">
+							<a href="\${referenceData.website}" target="_blank">\${referenceData.articleName}.</a>
+						</span>
+						<span class="del">\${referenceData.websiteName}.</span>
+						<span class="del">\${referenceData.publishTimeStr}.</span>
+						<span class="del">\${referenceData.acitationTimeStr}.)</span>
+					</div>
+			`
 		}
 		if(referenceData.referenceType == 2){
-				text=		"<div class=\"controls applicationsan\">"+
-							"<span class=\"del\">\""+referenceData.author+"\"(作者)</span>"+
-							"<span class=\"del\">\""+referenceData.workName+"\"(著作名)</span>"+
-							"<span class=\"del\">\""+referenceData.publicationPlace+"\"(出版地)</span>"+
-							"<span class=\"del\">\""+referenceData.press+"\"(出版社)</span>"+
-							"<span class=\"del\">\""+referenceData.publicationYearStr+"\"(出版年)</span>"+
-							"<span class=\"del\">\""+referenceData.acitationWeb+"\"(引文页码)</span>"+
-						"</div>"
+			text=	`
+				<div class="controls applicationsan">
+					<span class="del">\${referenceData.author}.</span>
+					<span class="del">\${referenceData.workName}.</span>
+					<span class="del">\${referenceData.publicationPlace}.</span>
+					<span class="del">\${referenceData.press}.</span>
+					<span class="del">\${referenceData.publicationYearStr}.</span>
+					<span class="del">\${referenceData.acitationWeb}</span>
+				</div>
+			`
 		}
 		if(referenceData.referenceType == 3){
-				text=		"<div class=\"controls applicationsan\">"+
-							"<span class=\"del\">\""+referenceData.referenceDescription+"\"(参考资料说明)</span>"+
-							"<span class=\"del\">\""+referenceData.imageDescription+"\"(图片描述)</span>"+
-							"<div class=\"conList\">"+
-								"<img id=\"imgaa\"  src=\""+referenceData.imageUrl+"\"height=\"50px\" width=\"50px\" >(图片)</input>"+
-							"</div>"+
-						"</div>"
-		}
-		return text;
+			text= `
+				<div class="controls applicationsan">
+					<span class="del">\${referenceData.referenceDescription}.</span>
+					<span class="del">\${referenceData.imageDescription}.</span>
+					<div class="conList">
+						<img id="imgaa"  src=\${referenceData.imageUrl}" height="50px" width="50px" ></input>
+					</div>
+				</div>
+			`
+		}
+		return text
 	}
+
+	function createAllReferenceItem(referenceData){
+		var text=null
+		if(referenceData.referenceType == 1){
+			text = `
+					<div class="controls applicationsan">
+						<span class="del"><a href="\${referenceData.website}" target="_blank">\${referenceData.articleName}.</a></span>
+						<span class="del">\${referenceData.websiteName}.</span>
+						<span class="del">\${referenceData.publishTimeStr}.</span>
+						<span class="del">\${referenceData.acitationTimeStr}.</span>
+						<a class="del" style="margin-left: 100px" onclick="upMaterial(\${referenceData.id})">编辑</a>
+						<a onclick="delMaterial(\${referenceData.id})">删除</a>
+					</div>
+			`
+		}
+		if(referenceData.referenceType == 2){
+			text=	`
+				<div class="controls applicationsan">
+					<span class="del">\${referenceData.author}.</span>
+					<span class="del">\${referenceData.workName}.</span>
+					<span class="del">\${referenceData.publicationPlace}.</span>
+					<span class="del">\${referenceData.press}.</span>
+					<span class="del">\${referenceData.publicationYearStr}.</span>
+					<span class="del">\${referenceData.acitationWeb}.</span>
+					<a class="del" style="margin-left: 100px" onclick="upMaterial(\${referenceData.id})">编辑</a>
+					<a onclick="delMaterial(\${referenceData.id})">删除</a>
+				</div>
+			`
+		}
+		if(referenceData.referenceType == 3){
+			text= `
+				<div class="controls applicationsan">
+					<span class="del">\${referenceData.referenceDescription}.</span>
+					<span class="del">\${referenceData.imageDescription}.</span>
+					<div class="conList">
+						<img id="imgaa"  src=\${referenceData.imageUrl}" height="50px" width="50px" ></input>
+					</div>
+					<a class="del" style="margin-left: 100px" onclick="upMaterial(\${referenceData.id})">编辑</a>
+					<a onclick="delMaterial(\${referenceData.id})">删除</a>
+				</div>
+			`
+		}
+		return text
+	}
+
+	// 只要referenceList数据有更新就执行一次
+	function createReferenceList(){
+		$('.check-reference-list').html('')
+		referenceList.forEach(function(refData, index){
+			console.log(refData)
+			var item = createReferenceItem(refData)
+			$('.check-reference-list').append(item)
+		})
+		$('.check-reference-list').find('.controls').on('click', function(){
+			var index = $(this).index() + 1
+			var result = referenceList[$(this).index()]
+			console.log(result)
+			if(!result) return
+			var con= createReferenceItem(result)
+			result.ctrlId = currentContentEdit.confirm(con, result.ctrlId, index)
+		})
+	}
+
 	$(function(){
 		var refren='${cmBaikeProduct.referenceList}'
 		if(''==refren|| null==refren){
 		}else{
 			referenceList=JSON.parse(refren)
+			markCount=referenceList.length
+			console.log(markCount)
 		}
 		//初始化 义项名,词条概述
 		createContentEdit('#bk-name','${cmBaikeProduct.alias}')
@@ -1596,6 +1671,8 @@
 				referenceList.push(result)
 				$(this).parents('#dig').hide()
 				initRefrenceFormData({})
+				var item = createAllReferenceItem(result)
+				$('.bk-reference-list').append(item)
 			}else{
 				var result = setRefrenceData(referenceData)
 				const index = referenceList.findIndex(function(item){
@@ -1659,11 +1736,11 @@
 			})
 		});
 		var observeEle1 = document.getElementsByClassName('main-image-list')[0];
-		// var observeEle2 = document.getElementsByClassName('auth-qrCode-list')[0];
+		var observeEle2 = document.getElementsByClassName('auth-qrCode-list')[0];
 		// var observeEle3 = document.getElementsByClassName('auth-image-list')[0];
 		var observeEle4 = document.getElementsByClassName('display-image-list')[0];
 		observer.observe(observeEle1, MutationObserverConfig);
-		// observer.observe(observeEle2, MutationObserverConfig);
+		observer.observe(observeEle2, MutationObserverConfig);
 		// observer.observe(observeEle3, MutationObserverConfig);
 		observer.observe(observeEle4, MutationObserverConfig);
 

+ 2 - 2
src/main/webapp/static/content-edit.js

@@ -372,8 +372,8 @@ class ContentEditInput {
         })
     }
 
-    confirm(text) {
-        const ctrid = this.edit.parcel()
+    confirm(text, ctrlId, index) {
+        const ctrid = this.edit.parcel(ctrlId, index)
         this.addLiteratureItem(ctrid, text)
         this.setBubbleNum(this.edit.ctridList.length)
         return ctrid