JiangChongBo 2 gadi atpakaļ
vecāks
revīzija
7861ad7248

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

@@ -157,18 +157,27 @@ public class CmBaikeProductController extends BaseController {
 						String acitationTimeStr=simpleDateFormat.format(material.getAcitationTime());
 						material.setAcitationTimeStr(acitationTimeStr);
 						material.setAcitationTime(null);
+					}else{
+						material.setAcitationTimeStr(" ");
+						material.setAcitationTime(null);
 					}
 					//时间格式转换(发表时间)
 					if(null!=material.getPublishTime()){
 						String publishTimeStr=simpleDateFormat.format(material.getPublishTime());
 						material.setPublishTimeStr(publishTimeStr);
 						material.setPublishTime(null);
+					}else{
+						material.setPublishTimeStr(" ");
+						material.setPublishTime(null);
 					}
 					//时间格式转换(出版年)
 					if(null!=material.getPublicationYear()){
 						String publicationYearStr=simpleDateFormat.format(material.getPublicationYear());
 						material.setPublicationYearStr(publicationYearStr);
 						material.setPublicationYear(null);
+					}else{
+						material.setPublicationYearStr(" ");
+						material.setPublicationYear(null);
 					}
 				});
 				cmBaikeProduct.setMaterialInfo(materialInfo);
@@ -403,18 +412,27 @@ public class CmBaikeProductController extends BaseController {
 						String acitationTimeStr=simpleDateFormat.format(material.getAcitationTime());
 						material.setAcitationTimeStr(acitationTimeStr);
 						material.setAcitationTime(null);
+					}else{
+						material.setAcitationTimeStr(" ");
+						material.setAcitationTime(null);
 					}
 					//时间格式转换(发表时间)
 					if(null!=material.getPublishTime()){
 						String publishTimeStr=simpleDateFormat.format(material.getPublishTime());
 						material.setPublishTimeStr(publishTimeStr);
 						material.setPublishTime(null);
+					}else{
+						material.setPublishTimeStr(" ");
+						material.setPublishTime(null);
 					}
 					//时间格式转换(出版年)
 					if(null!=material.getPublicationYear()){
 						String publicationYearStr=simpleDateFormat.format(material.getPublicationYear());
 						material.setPublicationYearStr(publicationYearStr);
 						material.setPublicationYear(null);
+					}else{
+						material.setPublicationYearStr(" ");
+						material.setPublicationYear(null);
 					}
 				});
 				cmBaikeProduct.setMaterialInfo(materialInfo);
@@ -499,18 +517,27 @@ public class CmBaikeProductController extends BaseController {
 						String acitationTimeStr=simpleDateFormat.format(material.getAcitationTime());
 						material.setAcitationTimeStr(acitationTimeStr);
 						material.setAcitationTime(null);
+					}else{
+						material.setAcitationTimeStr(" ");
+						material.setAcitationTime(null);
 					}
 					//时间格式转换(发表时间)
 					if(null!=material.getPublishTime()){
 						String publishTimeStr=simpleDateFormat.format(material.getPublishTime());
 						material.setPublishTimeStr(publishTimeStr);
 						material.setPublishTime(null);
+					}else{
+						material.setPublishTimeStr(" ");
+						material.setPublishTime(null);
 					}
 					//时间格式转换(出版年)
 					if(null!=material.getPublicationYear()){
 						String publicationYearStr=simpleDateFormat.format(material.getPublicationYear());
 						material.setPublicationYearStr(publicationYearStr);
 						material.setPublicationYear(null);
+					}else{
+						material.setPublicationYearStr(" ");
+						material.setPublicationYear(null);
 					}
 				});
 				cmBaikeProduct.setMaterialInfo(materialInfo);

+ 174 - 85
src/main/webapp/WEB-INF/views/modules/baikePage/auditBaikeProductPage.jsp

@@ -6,6 +6,10 @@
 	<title>采美词条</title>
 	<meta name="decorator" content="default"/>
 	<style>
+		.applicationsan{
+			user-select: none;
+			cursor: pointer;
+		}
 		.controls{
 			width: 520px;
 		}
@@ -15,7 +19,7 @@
 		.content-edit{
 			position: relative;
 			width: 100%;
-			z-index: 10;
+			z-index: 999;
 		}
 		.content-edit .bk-input{
 			padding: 4px 6px;
@@ -77,10 +81,14 @@
 		}
 		.content-edit .bk-literature li{
 			list-style-type: none;
-			margin-left: -190px;
 			padding: 8px 16px;
 			display: flex;
 			justify-content: space-between;
+			z-index: 200;
+		}
+		.content-edit .bk-literature li .controls{
+			margin-left: initial;
+			width: inherit;
 		}
 		.content-edit .bk-literature .bk-control{
 			max-width: 80%;
@@ -94,6 +102,11 @@
 		.content-edit .bk-literature .bk-control span:hover{
 			text-decoration: underline;
 		}
+		.content-edit .bk-literature .bk-literature-control span{
+			margin-left: 12px;
+			cursor: pointer;
+			color: #2fa4e7;
+		}
 		.bk-textInfo-item{
 			position: relative;
 			display: flex;
@@ -268,6 +281,14 @@
 			cursor: pointer;
 			z-index: 100;
 		}
+
+		.display-image-list .cancel-upload{
+			top: -106px;
+			left: 114px;
+		}
+		.display-image-list .conList{
+			position: relative;
+		}
 		.hide-pic {
 			display: none !important;
 		}
@@ -387,7 +408,7 @@
 			top: 0px;
 			height: 100%;
 			width: 100%;
-			z-index: 80;
+			z-index: 1000;
 			display: none;
 
 		}
@@ -412,13 +433,63 @@
 		.ckzl {
 			overflow: hidden;
 			position: fixed;
-			width: 60%;
-			height: 80%;
-			z-index: 100; /*值越大,和其他层层叠时越在上面*/
-			left: 20%;
-			top: 15%;
+			width: 600px;
+			max-height: 600px;
+			z-index: 1000; /*值越大,和其他层层叠时越在上面*/
+			left: 50%;
+			top: 50%;
 			background-color: #fff;
-			border: 1px solid rgb(0, 153, 153);
+			transform: translate(-50%, -50%);
+			padding: 32px;
+			border: 1px solid #ddd;
+		}
+
+		.ckzl .digcontent .dig-tab{
+			display: flex;
+			align-items: center;
+			padding-bottom: 24px;
+		}
+
+		.ckzl .digcontent .dig-tab a{
+			margin-right: 16px;
+		}
+
+		.ckzl .digcontent .control-group{
+			margin-left: 0 !important;
+			margin-top: 12px;
+		}
+
+		.ckzl .form-actions{
+			display: flex;
+			align-items: center;
+			background: transparent;
+			padding: 0;
+			padding-top: 20px;
+			background-color: transparent;
+			margin-bottom: 0;
+			border-top: 1px solid #e5e5e5
+		}
+
+		.ckzl .form-actions button{
+			margin-left: 16px;
+		}
+
+		.ckzl .auth-qrCode-list{
+			margin-top: -60px;
+			margin-left: 30px;
+		}
+
+		.ckzl .bk-upload-tip{
+			margin-left: 24px;
+			margin-top: 16px;
+			font-size: 12px;
+			color: #999;
+		}
+
+		.ckzl .bk-input-tip{
+			margin-left: 100px;
+			font-size: 12px;
+			color: #999;
 		}
 
 		.dialogtitle {
@@ -445,6 +516,16 @@
 		.pla::-webkit-input-placeholder{
 			color: green;
 		}
+
+		#mainIgeBox{
+			margin-top: -174px;
+			margin-left:  0 !important;
+		}
+
+		#mainIgeBox label{
+			margin-left: 27px !important;
+			margin-top: 14px;
+		}
 	</style>
 	<script type="text/javascript">
 		//显示弹框,并且根据结果是true或false来更改标题部分的颜色
@@ -472,10 +553,12 @@
 		function addZl(){
 			document.getElementById("zl").style.display='block';
 			document.getElementById("yyzl").style.display='none';
+			document.getElementById("confimRefrence").style.display='block';
 		}
 		function removeZl(){
 			document.getElementById("zl").style.display='none';
 			document.getElementById("yyzl").style.display='block';
+			document.getElementById("confimRefrence").style.display='none';
 		}
 		//不同资料显示不同的内容
 		function ckzl_change(){
@@ -856,17 +939,16 @@
 <div id="dialogmask" class="dialogmask opacity"></div>
 <div id="dig" class="ckzl" style="display: none"> 
 	<div id="dig_content" class="digcontent">
-		<div>
-			<a onclick="addZl()">添加参考资料</a>
-			<a onclick="removeZl()">引用已有资料</a>
+		<div class="dig-tab">
+			<a class="btn btn-primary" onclick="addZl()">添加参考资料</a>
+			<a class="btn btn-primary" onclick="removeZl()">引用已有资料</a>
 		</div>
 		<%--已有资料--%>
 		<div class="control-group" id="yyzl" style="display: none">
-			<label class="control-label titleClass">参考资料</label>
 			<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">
+						<div class="controls applicationsan">
 							<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>
@@ -876,7 +958,7 @@
 						</div>
 					</c:if>
 					<c:if test="${videoFile.referenceType eq '2'}">
-						<div class="controls applicationsan" style="margin-top: 5px">
+						<div class="controls applicationsan">
 							<span class="del">[${statusIndex.index}]</span>
 							<span class="del">${videoFile.author}.</span>
 							<span class="del">${videoFile.workName}.</span>
@@ -889,27 +971,27 @@
 						</div>
 					</c:if>
 					<c:if test="${videoFile.referenceType eq '3'}">
-						<div class="controls applicationsan" style="margin-top: 5px">
+						<div class="controls applicationsan">
 							<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>
+								<%--
+								<div class="conList">
+									<img id="imgaa"  src="${videoFile.imageUrl}" height="50px" width="50px" >(图片)</input>
+								</div>
+								--%>
 							<a onclick="saveMataInfo(${videoFile.id})">引用资料</a>
-
 						</div>
 					</c:if>
 				</c:forEach>
 			</div>
 		</div>
 		<%--添加参考资料--%>
-		<div id="zl" style="margin-top: 10px">
-			<div class="control-group" style="margin-left: 100px">
+		<div id="zl">
+			<div class="control-group">
 				<label class="red">*</label>
 				<label class="control-label">参考资料类型:</label>
-				<select id="info" style="margin-left: 20px" onchange="ckzl_change()">
+				<select id="info" onchange="ckzl_change()">
 					<option id="zllx1" value="1">网络资料</option>
 					<option id="zllx2" value="2">著作资料</option>
 					<option id="zllx3" value="3">其他资料</option>
@@ -917,85 +999,83 @@
 			</div>
 			<%--网络资料--%>
 			<div class="wlzl" style="display: block" id="wlzl">
-				<div class="control-group" style="margin-left: 100px;margin-top: 30px">
+				<div class="control-group">
 					<label class="red">*</label>
 					<label class="control-label keyClass">输入网址:</label>
-					<input id="website" required="true" style="margin-left: 45px" htmlEscape="false" class="input-xlarge " placeholder="请以http(s)开头"/>
+					<input type="text" id="website" required="true"  htmlEscape="false" class="input-xlarge " placeholder="请以http(s)开头"/>
 				</div>
-				<div class="control-group" style="margin-left: 100px;margin-top: 30px">
+				<div class="control-group">
 					<label class="red">*</label>
 					<label class="control-label keyClass">文章名字:</label>
-					<input id="articleName" required="true" style="margin-left: 45px" htmlEscape="false" class="input-xlarge " placeholder="请输入文章名字"/>
+					<input type="text" id="articleName" required="true" htmlEscape="false" class="input-xlarge " placeholder="请输入文章名字"/>
 				</div>
-				<div class="control-group" style="margin-left: 100px;margin-top: 30px">
+				<div class="control-group">
 					<label class="red">*</label>
 					<label class="control-label keyClass">网站名称:</label>
-					<input  id="websiteName" style="margin-left: 45px" htmlEscape="false" class="input-xlarge " placeholder="请输入网站名称 如:新华网"/>
+					<input  type="text" id="websiteName"  htmlEscape="false" class="input-xlarge " placeholder="请输入网站名称 如:新华网"/>
 				</div>
-				<div class="control-group" style="margin-left: 100px;margin-top: 30px">
+				<div class="control-group">
 					<label class="control-label keyClass">发表日期:</label>
-					<input id="publishTimeStr" name="publishTimeStr" style="margin-left: 55px" type="text" readonly="readonly" maxlength="20" class="input-medium Wdate "
+					<input type="text" id="publishTimeStr" name="publishTimeStr" type="text" readonly="readonly" maxlength="20" class="input-medium Wdate "
 						   onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false});"/>
 				</div>
-				<div class="control-group" style="margin-left: 100px;margin-top: 30px">
+				<div class="control-group">
 					<label class="control-label keyClass">引文日期:</label>
-					<input id="acitationTimeStr" name="publishTimeStr" style="margin-left: 55px" type="text" readonly="readonly" maxlength="20" class="input-medium Wdate "
+					<input type="text" id="acitationTimeStr" name="publishTimeStr" type="text" readonly="readonly" maxlength="20" class="input-medium Wdate "
 						   onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false});"/>
 				</div>
 			</div>
 			<%--著作资料--%>
 			<div class="zzzl" style="display: none" id="zzzl">
-				<div class="control-group" style="margin-left: 100px;margin-top: 30px">
+				<div class="control-group" >
 					<label class="red">*</label>
 					<label class="control-label keyClass">作者:</label>
-					<input id="author" style="margin-left: 70px" htmlEscape="false" class="input-xlarge " placeholder="请输入作者名称 多个作者使用英文都好隔开"/>
+					<input type="text" id="author" htmlEscape="false" class="input-xlarge " placeholder="请输入作者名称 多个作者使用英文都好隔开"/>
 				</div>
-				<div class="control-group" style="margin-left: 100px;margin-top: 30px">
+				<div class="control-group">
 					<label class="red">*</label>
 					<label class="control-label keyClass">著作名:</label>
-					<input id="workName" style="margin-left: 60px" htmlEscape="false" class="input-xlarge " placeholder="请输入著作名"/>
+					<input type="text" id="workName"  htmlEscape="false" class="input-xlarge " placeholder="请输入著作名"/>
 				</div>
-				<div class="control-group" style="margin-left: 100px;margin-top: 30px">
+				<div class="control-group">
 					<label class="control-label keyClass">出版地:</label>
-					<input id="publicationPlace" style="margin-left: 70px" htmlEscape="false" class="input-xlarge " placeholder="请输入出版地信息"/>
+					<input type="text" id="publicationPlace" htmlEscape="false" class="input-xlarge " placeholder="请输入出版地信息"/>
 				</div>
-				<div class="control-group" style="margin-left: 100px;margin-top: 30px">
+				<div class="control-group">
 					<label class="red">*</label>
 					<label class="control-label keyClass">出版社:</label>
-					<input id="press" style="margin-left: 60px" htmlEscape="false" class="input-xlarge " placeholder="请输入出版社名称"/>
+					<input type="text" id="press" htmlEscape="false" class="input-xlarge " placeholder="请输入出版社名称"/>
 				</div>
-				<div class="control-group" style="margin-left: 100px;margin-top: 30px">
+				<div class="control-group">
 					<label class="control-label keyClass">出版年:</label>
-					<input id="publicationYearStr" name="publicationYearStr" style="margin-left: 65px" type="text" readonly="readonly" maxlength="20" class="input-medium Wdate "
+					<input type="text" id="publicationYearStr" name="publicationYearStr"  type="text" readonly="readonly" maxlength="20" class="input-medium Wdate "
 						   onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false});"/>
 				</div>
-				<div class="control-group" style="margin-left: 100px;margin-top: 30px">
+				<div class="control-group">
 					<label class="control-label keyClass">引文编码:</label>
-					<input id="acitationWeb" style="margin-left: 60px" htmlEscape="false" class="input-xlarge " placeholder="请输入引用著作的页码 如 100 121"/>
+					<input type="text" id="acitationWeb"  htmlEscape="false" class="input-xlarge " placeholder="请输入引用著作的页码 如 100 121"/>
 				</div>
 			</div>
 			<%--其他资料--%>
-			<div class="qtzl" style="display:none;" id="qtzl">
-				<div class="control-group" style="margin-left: 20px">
+			<div class="qtzl" id="qtzl" style="display: none" >
+				<div class="control-group">
 					<label class="red">*</label>
 					<label class="control-label keyClass">参考资料说明:</label>
 					<textarea id="referenceDescription" type="text"  style="position: relative;height: 100px; width: 450px;" maxlength="50" ></textarea>
-					<label style="margin-left: 150px">其他类型参考资料,填写格式请参阅<a href="">《信息与文献 参考文献著录规则 GB/T 7714-2015》</a></label>
+					<label class="bk-input-tip">其他类型参考资料,填写格式请参阅<a href="">《信息与文献 参考文献著录规则 GB/T 7714-2015》</a></label>
 				</div>
-				<div class="control-group" style="margin-left: 20px">
+				<div class="control-group" >
 					<label class="control-label keyClass">图片描述:</label>
-					<input id="imageDescription" style="margin-left: 45px" htmlEscape="false" class="input-xlarge " placeholder="请输入其他参考资料的具体描述"/>
+					<input type="text" id="imageDescription" htmlEscape="false" class="input-xlarge " placeholder="请输入其他参考资料的具体描述"/>
 				</div>
-				<div class="control-group" style="margin-top: 28px">
+				<div class="control-group">
 					<label class="control-label">图片上传:</label>
-					<div class="auth-qrCode-list" style="display: flex;flex-wrap: wrap">
+					<div class="auth-qrCode-list clearfix">
 						<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>
+								<sys:ckfinder input="referenceImgUrl" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
+								<label class="bk-upload-tip">请上传引用的图片资源,需同时上传资料的封面、以及含有对应具体内容的图片;注意:图片需要保证完整、不可遮挡且清晰</label>
 							</div>
 						</div>
 					</div>
@@ -1005,8 +1085,8 @@
 		</div>
 	</div>
 	<div class="form-actions">
-		<button class="confirm">确 定</button>
-		<button class="cancel">取 消</button>
+		<button class="confirm btn btn-primary" id="confimRefrence">确 定</button>
+		<button class="cancel btn btn-primary">取 消</button>
 	</div>
 </div>
 <%--	<div id="dialogmask" class="dialogmask opacity"></div>--%>
@@ -1126,9 +1206,9 @@
 	<%--概述图册--%>
 	<div class="control-group" style="width: 1000px">
 		<label class="control-label keyClass">概述图册:</label>
-		<div class="display-image-list" style="display: flex;flex-wrap: wrap">
+		<div class="display-image-list" style="display: flex;flex-wrap: nowrap; margin-top: -36px">
 			<c:forEach items="${cmBaikeProduct.displayImageList}" var="displayImage" varStatus="index">
-				<div class="controls upload-content iconBox" id="displayImageBox${index.index}">
+				<div class="controls upload-content iconBox" id="displayImageBox${index.index}" style="width: 170px">
 					<div class="conList">
 						<form:hidden id="displayImage${index.index}" path="displayImageList[${index.index}]" htmlEscape="false"
 									 maxlength="255"
@@ -1141,7 +1221,7 @@
 			</c:forEach>
 			<c:set var="size" value="${empty cmBaikeProduct.displayImageList?0:cmBaikeProduct.displayImageList.size()}"/>
 			<c:forEach var="emptyIndex" begin="${size}" end="${5}">
-				<div class="controls upload-content iconBox conList ${emptyIndex eq 0?'':'hide-pic'}" id="displayImageBox${emptyIndex}" >
+				<div class="controls upload-content iconBox conList ${emptyIndex eq 0?'':'hide-pic'}" id="displayImageBox${emptyIndex}" style="width: 170px">
 					<div class="conList">
 						<form:hidden id="displayImage${emptyIndex}" path="displayImageList[${emptyIndex}]" htmlEscape="false"
 									 maxlength="255"
@@ -1219,7 +1299,7 @@
 						<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 class="del" style="margin-left: 12px" onclick="upMaterial(${videoFile.id})">编辑</a>
 						<a onclick="delMaterial(${videoFile.id})">删除</a>
 					</div>
 				</c:if>
@@ -1232,7 +1312,7 @@
 						<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 class="del" style="margin-left: 12px" onclick="upMaterial(${videoFile.id})">编辑</a>
 						<a onclick="delMaterial(${videoFile.id})">删除</a>
 					</div>
 				</c:if>
@@ -1241,10 +1321,12 @@
 						<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>
+							<%--
+							<div class="conList">
+								<img id="imgaa"  src="${videoFile.imageUrl}" height="50px" width="50px" ></input>
+							</div>
+							--%>
+						<a class="del" style="margin-left: 12px" onclick="upMaterial(${videoFile.id})">编辑</a>
 						<a onclick="delMaterial(${videoFile.id})">删除</a>
 					</div>
 				</c:if>
@@ -1360,7 +1442,8 @@
 				currentContentEdit = edit
 				console.log(currentContentEdit)
 				createReferenceList()
-				$('#dig').show()
+				$('#dialogmask').fadeIn()
+				$('#dig').fadeIn()
 			},
 			referenceEdit(ctrid) {
 				// 编辑
@@ -1370,7 +1453,8 @@
 				})
 				if(!referenceData) return
 				initRefrenceFormData(referenceData)
-				$('#dig').show()
+				$('#dialogmask').fadeIn()
+				$('#dig').fadeIn()
 			},
 		})
 		contentEditMap.set(el, contentEdit)
@@ -1544,15 +1628,18 @@
 
 	function createReferenceItem(referenceData){
 		var text=null
+		if(referenceData.publishTimeStr=='undefined'){
+			referenceData.publishTimeStr='111'
+		}
 		if(referenceData.referenceType == 1){
 			text = `
 				<div class="controls applicationsan">
 						<span class="del">
-							<a href="\${referenceData.website}" target="_blank">\${referenceData.articleName}.</a>
+							<a>\${referenceData.articleName}.</a>
 						</span>
 						<span class="del">\${referenceData.websiteName}.</span>
 						<span class="del">\${referenceData.publishTimeStr}.</span>
-						<span class="del">\${referenceData.acitationTimeStr}.</span>
+						<span class="del">\${referenceData.acitationTimeStr}.</span>
 					</div>
 			`
 		}
@@ -1573,9 +1660,6 @@
 				<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>
 			`
 		}
@@ -1587,11 +1671,12 @@
 		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">[\${referenceList.length}]</span>
+						<span class="del"><a>\${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 class="del" style="margin-left: 12px" onclick="upMaterial(\${referenceData.id})">编辑</a>
 						<a onclick="delMaterial(\${referenceData.id})">删除</a>
 					</div>
 			`
@@ -1599,13 +1684,14 @@
 		if(referenceData.referenceType == 2){
 			text=	`
 				<div class="controls applicationsan">
+					<span class="del">[\${referenceList.length}]</span>
 					<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 class="del" style="margin-left: 12px" onclick="upMaterial(\${referenceData.id})">编辑</a>
 					<a onclick="delMaterial(\${referenceData.id})">删除</a>
 				</div>
 			`
@@ -1613,12 +1699,10 @@
 		if(referenceData.referenceType == 3){
 			text= `
 				<div class="controls applicationsan">
+					<span class="del">[\${referenceList.length}]</span>
 					<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 class="del" style="margin-left: 12px" onclick="upMaterial(\${referenceData.id})">编辑</a>
 					<a onclick="delMaterial(\${referenceData.id})">删除</a>
 				</div>
 			`
@@ -1641,6 +1725,8 @@
 			if(!result) return
 			var con= createReferenceItem(result)
 			result.ctrlId = currentContentEdit.confirm(con, result.ctrlId, index)
+			$('#dialogmask').fadeOut()
+			$('#dig').fadeOut()
 		})
 	}
 
@@ -1669,7 +1755,8 @@
 				var con=createReferenceItem(result)
 				result.ctrlId = currentContentEdit.confirm(con)
 				referenceList.push(result)
-				$(this).parents('#dig').hide()
+				$(this).parents('#dig').siblings('#dialogmask').fadeOut()
+				$(this).parents('#dig').fadeOut()
 				initRefrenceFormData({})
 				var item = createAllReferenceItem(result)
 				$('.bk-reference-list').append(item)
@@ -1679,14 +1766,16 @@
 					return item.ctrlId == referenceData.ctrlId
 				})
 				referenceList.splice(index, 1, result)
-				$(this).parents('#dig').hide()
+				$(this).parents('#dig').siblings('#dialogmask').fadeOut()
+				$(this).parents('#dig').fadeOut()
 				initRefrenceFormData({})
 			}
 			var referen=JSON.stringify(referenceList)
 			$('#referenceList').val(referen);
 		})
 		$('#dig .cancel').on('click', function(){
-			$(this).parents('#dig').hide()
+			$(this).parents('#dig').fadeOut()
+			$(this).parents('#dig').siblings('#dialogmask').fadeOut()
 			initRefrenceFormData({})
 		})
 		<%-- referenceList = [{ctrlId: 'FDIEKABKKNJEEJAN'}] // referenceList[0].reyt = 1 // referenceList:'[{"type": 1}]'--%>

+ 174 - 85
src/main/webapp/WEB-INF/views/modules/baikePage/checkBaikePage.jsp

@@ -6,6 +6,10 @@
 	<title>采美词条</title>
 	<meta name="decorator" content="default"/>
 	<style>
+		.applicationsan{
+			user-select: none;
+			cursor: pointer;
+		}
 		.controls{
 			width: 520px;
 		}
@@ -15,7 +19,7 @@
 		.content-edit{
 			position: relative;
 			width: 100%;
-			z-index: 10;
+			z-index: 999;
 		}
 		.content-edit .bk-input{
 			padding: 4px 6px;
@@ -77,10 +81,14 @@
 		}
 		.content-edit .bk-literature li{
 			list-style-type: none;
-			margin-left: -190px;
 			padding: 8px 16px;
 			display: flex;
 			justify-content: space-between;
+			z-index: 200;
+		}
+		.content-edit .bk-literature li .controls{
+			margin-left: initial;
+			width: inherit;
 		}
 		.content-edit .bk-literature .bk-control{
 			max-width: 80%;
@@ -94,6 +102,11 @@
 		.content-edit .bk-literature .bk-control span:hover{
 			text-decoration: underline;
 		}
+		.content-edit .bk-literature .bk-literature-control span{
+			margin-left: 12px;
+			cursor: pointer;
+			color: #2fa4e7;
+		}
 		.bk-textInfo-item{
 			position: relative;
 			display: flex;
@@ -268,6 +281,14 @@
 			cursor: pointer;
 			z-index: 100;
 		}
+
+		.display-image-list .cancel-upload{
+			top: -106px;
+			left: 114px;
+		}
+		.display-image-list .conList{
+			position: relative;
+		}
 		.hide-pic {
 			display: none !important;
 		}
@@ -387,7 +408,7 @@
 			top: 0px;
 			height: 100%;
 			width: 100%;
-			z-index: 80;
+			z-index: 1000;
 			display: none;
 
 		}
@@ -412,13 +433,63 @@
 		.ckzl {
 			overflow: hidden;
 			position: fixed;
-			width: 60%;
-			height: 80%;
-			z-index: 100; /*值越大,和其他层层叠时越在上面*/
-			left: 20%;
-			top: 15%;
+			width: 600px;
+			max-height: 600px;
+			z-index: 1000; /*值越大,和其他层层叠时越在上面*/
+			left: 50%;
+			top: 50%;
 			background-color: #fff;
-			border: 1px solid rgb(0, 153, 153);
+			transform: translate(-50%, -50%);
+			padding: 32px;
+			border: 1px solid #ddd;
+		}
+
+		.ckzl .digcontent .dig-tab{
+			display: flex;
+			align-items: center;
+			padding-bottom: 24px;
+		}
+
+		.ckzl .digcontent .dig-tab a{
+			margin-right: 16px;
+		}
+
+		.ckzl .digcontent .control-group{
+			margin-left: 0 !important;
+			margin-top: 12px;
+		}
+
+		.ckzl .form-actions{
+			display: flex;
+			align-items: center;
+			background: transparent;
+			padding: 0;
+			padding-top: 20px;
+			background-color: transparent;
+			margin-bottom: 0;
+			border-top: 1px solid #e5e5e5
+		}
+
+		.ckzl .form-actions button{
+			margin-left: 16px;
+		}
+
+		.ckzl .auth-qrCode-list{
+			margin-top: -60px;
+			margin-left: 30px;
+		}
+
+		.ckzl .bk-upload-tip{
+			margin-left: 24px;
+			margin-top: 16px;
+			font-size: 12px;
+			color: #999;
+		}
+
+		.ckzl .bk-input-tip{
+			margin-left: 100px;
+			font-size: 12px;
+			color: #999;
 		}
 
 		.dialogtitle {
@@ -445,6 +516,16 @@
 		.pla::-webkit-input-placeholder{
 			color: green;
 		}
+
+		#mainIgeBox{
+			margin-top: -174px;
+			margin-left:  0 !important;
+		}
+
+		#mainIgeBox label{
+			margin-left: 27px !important;
+			margin-top: 14px;
+		}
 	</style>
 	<script type="text/javascript">
 		//显示弹框,并且根据结果是true或false来更改标题部分的颜色
@@ -472,10 +553,12 @@
 		function addZl(){
 			document.getElementById("zl").style.display='block';
 			document.getElementById("yyzl").style.display='none';
+			document.getElementById("confimRefrence").style.display='block';
 		}
 		function removeZl(){
 			document.getElementById("zl").style.display='none';
 			document.getElementById("yyzl").style.display='block';
+			document.getElementById("confimRefrence").style.display='none';
 		}
 		//不同资料显示不同的内容
 		function ckzl_change(){
@@ -856,17 +939,16 @@
 <div id="dialogmask" class="dialogmask opacity"></div>
 <div id="dig" class="ckzl" style="display: none"> 
 	<div id="dig_content" class="digcontent">
-		<div>
-			<a onclick="addZl()">添加参考资料</a>
-			<a onclick="removeZl()">引用已有资料</a>
+		<div class="dig-tab">
+			<a class="btn btn-primary" onclick="addZl()">添加参考资料</a>
+			<a class="btn btn-primary" onclick="removeZl()">引用已有资料</a>
 		</div>
 		<%--已有资料--%>
 		<div class="control-group" id="yyzl" style="display: none">
-			<label class="control-label titleClass">参考资料</label>
 			<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">
+						<div class="controls applicationsan">
 							<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>
@@ -876,7 +958,7 @@
 						</div>
 					</c:if>
 					<c:if test="${videoFile.referenceType eq '2'}">
-						<div class="controls applicationsan" style="margin-top: 5px">
+						<div class="controls applicationsan">
 							<span class="del">[${statusIndex.index}]</span>
 							<span class="del">${videoFile.author}.</span>
 							<span class="del">${videoFile.workName}.</span>
@@ -889,27 +971,27 @@
 						</div>
 					</c:if>
 					<c:if test="${videoFile.referenceType eq '3'}">
-						<div class="controls applicationsan" style="margin-top: 5px">
+						<div class="controls applicationsan">
 							<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>
+								<%--
+								<div class="conList">
+									<img id="imgaa"  src="${videoFile.imageUrl}" height="50px" width="50px" >(图片)</input>
+								</div>
+								--%>
 							<a onclick="saveMataInfo(${videoFile.id})">引用资料</a>
-
 						</div>
 					</c:if>
 				</c:forEach>
 			</div>
 		</div>
 		<%--添加参考资料--%>
-		<div id="zl" style="margin-top: 10px">
-			<div class="control-group" style="margin-left: 100px">
+		<div id="zl">
+			<div class="control-group">
 				<label class="red">*</label>
 				<label class="control-label">参考资料类型:</label>
-				<select id="info" style="margin-left: 20px" onchange="ckzl_change()">
+				<select id="info" onchange="ckzl_change()">
 					<option id="zllx1" value="1">网络资料</option>
 					<option id="zllx2" value="2">著作资料</option>
 					<option id="zllx3" value="3">其他资料</option>
@@ -917,85 +999,83 @@
 			</div>
 			<%--网络资料--%>
 			<div class="wlzl" style="display: block" id="wlzl">
-				<div class="control-group" style="margin-left: 100px;margin-top: 30px">
+				<div class="control-group">
 					<label class="red">*</label>
 					<label class="control-label keyClass">输入网址:</label>
-					<input id="website" required="true" style="margin-left: 45px" htmlEscape="false" class="input-xlarge " placeholder="请以http(s)开头"/>
+					<input type="text" id="website" required="true"  htmlEscape="false" class="input-xlarge " placeholder="请以http(s)开头"/>
 				</div>
-				<div class="control-group" style="margin-left: 100px;margin-top: 30px">
+				<div class="control-group">
 					<label class="red">*</label>
 					<label class="control-label keyClass">文章名字:</label>
-					<input id="articleName" required="true" style="margin-left: 45px" htmlEscape="false" class="input-xlarge " placeholder="请输入文章名字"/>
+					<input type="text" id="articleName" required="true" htmlEscape="false" class="input-xlarge " placeholder="请输入文章名字"/>
 				</div>
-				<div class="control-group" style="margin-left: 100px;margin-top: 30px">
+				<div class="control-group">
 					<label class="red">*</label>
 					<label class="control-label keyClass">网站名称:</label>
-					<input  id="websiteName" style="margin-left: 45px" htmlEscape="false" class="input-xlarge " placeholder="请输入网站名称 如:新华网"/>
+					<input  type="text" id="websiteName"  htmlEscape="false" class="input-xlarge " placeholder="请输入网站名称 如:新华网"/>
 				</div>
-				<div class="control-group" style="margin-left: 100px;margin-top: 30px">
+				<div class="control-group">
 					<label class="control-label keyClass">发表日期:</label>
-					<input id="publishTimeStr" name="publishTimeStr" style="margin-left: 55px" type="text" readonly="readonly" maxlength="20" class="input-medium Wdate "
+					<input type="text" id="publishTimeStr" name="publishTimeStr" type="text" readonly="readonly" maxlength="20" class="input-medium Wdate "
 						   onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false});"/>
 				</div>
-				<div class="control-group" style="margin-left: 100px;margin-top: 30px">
+				<div class="control-group">
 					<label class="control-label keyClass">引文日期:</label>
-					<input id="acitationTimeStr" name="publishTimeStr" style="margin-left: 55px" type="text" readonly="readonly" maxlength="20" class="input-medium Wdate "
+					<input type="text" id="acitationTimeStr" name="publishTimeStr" type="text" readonly="readonly" maxlength="20" class="input-medium Wdate "
 						   onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false});"/>
 				</div>
 			</div>
 			<%--著作资料--%>
 			<div class="zzzl" style="display: none" id="zzzl">
-				<div class="control-group" style="margin-left: 100px;margin-top: 30px">
+				<div class="control-group" >
 					<label class="red">*</label>
 					<label class="control-label keyClass">作者:</label>
-					<input id="author" style="margin-left: 70px" htmlEscape="false" class="input-xlarge " placeholder="请输入作者名称 多个作者使用英文都好隔开"/>
+					<input type="text" id="author" htmlEscape="false" class="input-xlarge " placeholder="请输入作者名称 多个作者使用英文都好隔开"/>
 				</div>
-				<div class="control-group" style="margin-left: 100px;margin-top: 30px">
+				<div class="control-group">
 					<label class="red">*</label>
 					<label class="control-label keyClass">著作名:</label>
-					<input id="workName" style="margin-left: 60px" htmlEscape="false" class="input-xlarge " placeholder="请输入著作名"/>
+					<input type="text" id="workName"  htmlEscape="false" class="input-xlarge " placeholder="请输入著作名"/>
 				</div>
-				<div class="control-group" style="margin-left: 100px;margin-top: 30px">
+				<div class="control-group">
 					<label class="control-label keyClass">出版地:</label>
-					<input id="publicationPlace" style="margin-left: 70px" htmlEscape="false" class="input-xlarge " placeholder="请输入出版地信息"/>
+					<input type="text" id="publicationPlace" htmlEscape="false" class="input-xlarge " placeholder="请输入出版地信息"/>
 				</div>
-				<div class="control-group" style="margin-left: 100px;margin-top: 30px">
+				<div class="control-group">
 					<label class="red">*</label>
 					<label class="control-label keyClass">出版社:</label>
-					<input id="press" style="margin-left: 60px" htmlEscape="false" class="input-xlarge " placeholder="请输入出版社名称"/>
+					<input type="text" id="press" htmlEscape="false" class="input-xlarge " placeholder="请输入出版社名称"/>
 				</div>
-				<div class="control-group" style="margin-left: 100px;margin-top: 30px">
+				<div class="control-group">
 					<label class="control-label keyClass">出版年:</label>
-					<input id="publicationYearStr" name="publicationYearStr" style="margin-left: 65px" type="text" readonly="readonly" maxlength="20" class="input-medium Wdate "
+					<input type="text" id="publicationYearStr" name="publicationYearStr"  type="text" readonly="readonly" maxlength="20" class="input-medium Wdate "
 						   onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false});"/>
 				</div>
-				<div class="control-group" style="margin-left: 100px;margin-top: 30px">
+				<div class="control-group">
 					<label class="control-label keyClass">引文编码:</label>
-					<input id="acitationWeb" style="margin-left: 60px" htmlEscape="false" class="input-xlarge " placeholder="请输入引用著作的页码 如 100 121"/>
+					<input type="text" id="acitationWeb"  htmlEscape="false" class="input-xlarge " placeholder="请输入引用著作的页码 如 100 121"/>
 				</div>
 			</div>
 			<%--其他资料--%>
-			<div class="qtzl" style="display:none;" id="qtzl">
-				<div class="control-group" style="margin-left: 20px">
+			<div class="qtzl" id="qtzl" style="display: none" >
+				<div class="control-group">
 					<label class="red">*</label>
 					<label class="control-label keyClass">参考资料说明:</label>
 					<textarea id="referenceDescription" type="text"  style="position: relative;height: 100px; width: 450px;" maxlength="50" ></textarea>
-					<label style="margin-left: 150px">其他类型参考资料,填写格式请参阅<a href="">《信息与文献 参考文献著录规则 GB/T 7714-2015》</a></label>
+					<label class="bk-input-tip">其他类型参考资料,填写格式请参阅<a href="">《信息与文献 参考文献著录规则 GB/T 7714-2015》</a></label>
 				</div>
-				<div class="control-group" style="margin-left: 20px">
+				<div class="control-group" >
 					<label class="control-label keyClass">图片描述:</label>
-					<input id="imageDescription" style="margin-left: 45px" htmlEscape="false" class="input-xlarge " placeholder="请输入其他参考资料的具体描述"/>
+					<input type="text" id="imageDescription" htmlEscape="false" class="input-xlarge " placeholder="请输入其他参考资料的具体描述"/>
 				</div>
-				<div class="control-group" style="margin-top: 28px">
+				<div class="control-group">
 					<label class="control-label">图片上传:</label>
-					<div class="auth-qrCode-list" style="display: flex;flex-wrap: wrap">
+					<div class="auth-qrCode-list clearfix">
 						<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>
+								<sys:ckfinder input="referenceImgUrl" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
+								<label class="bk-upload-tip">请上传引用的图片资源,需同时上传资料的封面、以及含有对应具体内容的图片;注意:图片需要保证完整、不可遮挡且清晰</label>
 							</div>
 						</div>
 					</div>
@@ -1005,8 +1085,7 @@
 		</div>
 	</div>
 	<div class="form-actions">
-		<button class="confirm">确 定</button>
-		<button class="cancel">取 消</button>
+		<button class="cancel btn btn-primary">取 消</button>
 	</div>
 </div>
 <%--	<div id="dialogmask" class="dialogmask opacity"></div>--%>
@@ -1126,9 +1205,9 @@
 	<%--概述图册--%>
 	<div class="control-group" style="width: 1000px">
 		<label class="control-label keyClass">概述图册:</label>
-		<div class="display-image-list" style="display: flex;flex-wrap: wrap">
+		<div class="display-image-list" style="display: flex;flex-wrap: nowrap; margin-top: -36px">
 			<c:forEach items="${cmBaikeProduct.displayImageList}" var="displayImage" varStatus="index">
-				<div class="controls upload-content iconBox" id="displayImageBox${index.index}">
+				<div class="controls upload-content iconBox" id="displayImageBox${index.index}" style="width: 170px">
 					<div class="conList">
 						<form:hidden id="displayImage${index.index}" path="displayImageList[${index.index}]" htmlEscape="false"
 									 maxlength="255"
@@ -1141,7 +1220,7 @@
 			</c:forEach>
 			<c:set var="size" value="${empty cmBaikeProduct.displayImageList?0:cmBaikeProduct.displayImageList.size()}"/>
 			<c:forEach var="emptyIndex" begin="${size}" end="${5}">
-				<div class="controls upload-content iconBox conList ${emptyIndex eq 0?'':'hide-pic'}" id="displayImageBox${emptyIndex}" >
+				<div class="controls upload-content iconBox conList ${emptyIndex eq 0?'':'hide-pic'}" id="displayImageBox${emptyIndex}" style="width: 170px">
 					<div class="conList">
 						<form:hidden id="displayImage${emptyIndex}" path="displayImageList[${emptyIndex}]" htmlEscape="false"
 									 maxlength="255"
@@ -1219,7 +1298,7 @@
 						<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 class="del" style="margin-left: 12px" onclick="upMaterial(${videoFile.id})">编辑</a>
 						<a onclick="delMaterial(${videoFile.id})">删除</a>
 					</div>
 				</c:if>
@@ -1232,7 +1311,7 @@
 						<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 class="del" style="margin-left: 12px" onclick="upMaterial(${videoFile.id})">编辑</a>
 						<a onclick="delMaterial(${videoFile.id})">删除</a>
 					</div>
 				</c:if>
@@ -1241,10 +1320,12 @@
 						<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>
+							<%--
+							<div class="conList">
+								<img id="imgaa"  src="${videoFile.imageUrl}" height="50px" width="50px" ></input>
+							</div>
+							--%>
+						<a class="del" style="margin-left: 12px" onclick="upMaterial(${videoFile.id})">编辑</a>
 						<a onclick="delMaterial(${videoFile.id})">删除</a>
 					</div>
 				</c:if>
@@ -1318,6 +1399,7 @@
 	</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>
@@ -1359,7 +1441,8 @@
 				currentContentEdit = edit
 				console.log(currentContentEdit)
 				createReferenceList()
-				$('#dig').show()
+				$('#dialogmask').fadeIn()
+				$('#dig').fadeIn()
 			},
 			referenceEdit(ctrid) {
 				// 编辑
@@ -1369,7 +1452,8 @@
 				})
 				if(!referenceData) return
 				initRefrenceFormData(referenceData)
-				$('#dig').show()
+				$('#dialogmask').fadeIn()
+				$('#dig').fadeIn()
 			},
 		})
 		contentEditMap.set(el, contentEdit)
@@ -1543,15 +1627,18 @@
 
 	function createReferenceItem(referenceData){
 		var text=null
+		if(referenceData.publishTimeStr=='undefined'){
+			referenceData.publishTimeStr='111'
+		}
 		if(referenceData.referenceType == 1){
 			text = `
 				<div class="controls applicationsan">
 						<span class="del">
-							<a href="\${referenceData.website}" target="_blank">\${referenceData.articleName}.</a>
+							<a>\${referenceData.articleName}.</a>
 						</span>
 						<span class="del">\${referenceData.websiteName}.</span>
 						<span class="del">\${referenceData.publishTimeStr}.</span>
-						<span class="del">\${referenceData.acitationTimeStr}.</span>
+						<span class="del">\${referenceData.acitationTimeStr}.</span>
 					</div>
 			`
 		}
@@ -1572,9 +1659,6 @@
 				<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>
 			`
 		}
@@ -1586,11 +1670,12 @@
 		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">[\${referenceList.length}]</span>
+						<span class="del"><a>\${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 class="del" style="margin-left: 12px" onclick="upMaterial(\${referenceData.id})">编辑</a>
 						<a onclick="delMaterial(\${referenceData.id})">删除</a>
 					</div>
 			`
@@ -1598,13 +1683,14 @@
 		if(referenceData.referenceType == 2){
 			text=	`
 				<div class="controls applicationsan">
+					<span class="del">[\${referenceList.length}]</span>
 					<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 class="del" style="margin-left: 12px" onclick="upMaterial(\${referenceData.id})">编辑</a>
 					<a onclick="delMaterial(\${referenceData.id})">删除</a>
 				</div>
 			`
@@ -1612,12 +1698,10 @@
 		if(referenceData.referenceType == 3){
 			text= `
 				<div class="controls applicationsan">
+					<span class="del">[\${referenceList.length}]</span>
 					<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 class="del" style="margin-left: 12px" onclick="upMaterial(\${referenceData.id})">编辑</a>
 					<a onclick="delMaterial(\${referenceData.id})">删除</a>
 				</div>
 			`
@@ -1640,6 +1724,8 @@
 			if(!result) return
 			var con= createReferenceItem(result)
 			result.ctrlId = currentContentEdit.confirm(con, result.ctrlId, index)
+			$('#dialogmask').fadeOut()
+			$('#dig').fadeOut()
 		})
 	}
 
@@ -1668,7 +1754,8 @@
 				var con=createReferenceItem(result)
 				result.ctrlId = currentContentEdit.confirm(con)
 				referenceList.push(result)
-				$(this).parents('#dig').hide()
+				$(this).parents('#dig').siblings('#dialogmask').fadeOut()
+				$(this).parents('#dig').fadeOut()
 				initRefrenceFormData({})
 				var item = createAllReferenceItem(result)
 				$('.bk-reference-list').append(item)
@@ -1678,14 +1765,16 @@
 					return item.ctrlId == referenceData.ctrlId
 				})
 				referenceList.splice(index, 1, result)
-				$(this).parents('#dig').hide()
+				$(this).parents('#dig').siblings('#dialogmask').fadeOut()
+				$(this).parents('#dig').fadeOut()
 				initRefrenceFormData({})
 			}
 			var referen=JSON.stringify(referenceList)
 			$('#referenceList').val(referen);
 		})
 		$('#dig .cancel').on('click', function(){
-			$(this).parents('#dig').hide()
+			$(this).parents('#dig').fadeOut()
+			$(this).parents('#dig').siblings('#dialogmask').fadeOut()
 			initRefrenceFormData({})
 		})
 		<%-- referenceList = [{ctrlId: 'FDIEKABKKNJEEJAN'}] // referenceList[0].reyt = 1 // referenceList:'[{"type": 1}]'--%>

+ 169 - 80
src/main/webapp/WEB-INF/views/modules/baikePage/cmBaikeProductForm.jsp

@@ -6,6 +6,10 @@
 	<title>采美词条</title>
 	<meta name="decorator" content="default"/>
 	<style>
+		.applicationsan{
+			user-select: none;
+			cursor: pointer;
+		}
 		.controls{
 			width: 520px;
 		}
@@ -15,7 +19,7 @@
 		.content-edit{
 			position: relative;
 			width: 100%;
-			z-index: 10;
+			z-index: 999;
 		}
 		.content-edit .bk-input{
 			padding: 4px 6px;
@@ -77,10 +81,14 @@
 		}
 		.content-edit .bk-literature li{
 			list-style-type: none;
-			margin-left: -190px;
 			padding: 8px 16px;
 			display: flex;
 			justify-content: space-between;
+			z-index: 200;
+		}
+		.content-edit .bk-literature li .controls{
+			margin-left: initial;
+			width: inherit;
 		}
 		.content-edit .bk-literature .bk-control{
 			max-width: 80%;
@@ -94,6 +102,11 @@
 		.content-edit .bk-literature .bk-control span:hover{
 			text-decoration: underline;
 		}
+		.content-edit .bk-literature .bk-literature-control span{
+			margin-left: 12px;
+			cursor: pointer;
+			color: #2fa4e7;
+		}
 		.bk-textInfo-item{
 			position: relative;
 			display: flex;
@@ -268,6 +281,14 @@
 			cursor: pointer;
 			z-index: 100;
 		}
+
+		.display-image-list .cancel-upload{
+			top: -106px;
+			left: 114px;
+		}
+		.display-image-list .conList{
+			position: relative;
+		}
 		.hide-pic {
 			display: none !important;
 		}
@@ -387,7 +408,7 @@
 			top: 0px;
 			height: 100%;
 			width: 100%;
-			z-index: 80;
+			z-index: 1000;
 			display: none;
 
 		}
@@ -412,13 +433,63 @@
 		.ckzl {
 			overflow: hidden;
 			position: fixed;
-			width: 60%;
-			height: 80%;
-			z-index: 100; /*值越大,和其他层层叠时越在上面*/
-			left: 20%;
-			top: 15%;
+			width: 600px;
+			max-height: 600px;
+			z-index: 1000; /*值越大,和其他层层叠时越在上面*/
+			left: 50%;
+			top: 50%;
 			background-color: #fff;
-			border: 1px solid rgb(0, 153, 153);
+			transform: translate(-50%, -50%);
+			padding: 32px;
+			border: 1px solid #ddd;
+		}
+
+		.ckzl .digcontent .dig-tab{
+			display: flex;
+			align-items: center;
+			padding-bottom: 24px;
+		}
+
+		.ckzl .digcontent .dig-tab a{
+			margin-right: 16px;
+		}
+
+		.ckzl .digcontent .control-group{
+			margin-left: 0 !important;
+			margin-top: 12px;
+		}
+
+		.ckzl .form-actions{
+			display: flex;
+			align-items: center;
+			background: transparent;
+			padding: 0;
+			padding-top: 20px;
+			background-color: transparent;
+			margin-bottom: 0;
+			border-top: 1px solid #e5e5e5
+		}
+
+		.ckzl .form-actions button{
+			margin-left: 16px;
+		}
+
+		.ckzl .auth-qrCode-list{
+			margin-top: -60px;
+			margin-left: 30px;
+		}
+
+		.ckzl .bk-upload-tip{
+			margin-left: 24px;
+			margin-top: 16px;
+			font-size: 12px;
+			color: #999;
+		}
+
+		.ckzl .bk-input-tip{
+			margin-left: 100px;
+			font-size: 12px;
+			color: #999;
 		}
 
 		.dialogtitle {
@@ -445,6 +516,16 @@
 		.pla::-webkit-input-placeholder{
 			color: green;
 		}
+
+		#mainIgeBox{
+			margin-top: -174px;
+			margin-left:  0 !important;
+		}
+
+		#mainIgeBox label{
+			margin-left: 27px !important;
+			margin-top: 14px;
+		}
 	</style>
 	<script type="text/javascript">
 		//显示弹框,并且根据结果是true或false来更改标题部分的颜色
@@ -472,11 +553,13 @@
 		function addZl(){
 			document.getElementById("zl").style.display='block';
 			document.getElementById("yyzl").style.display='none';
+			document.getElementById("confimRefrence").style.display='block';
 		}
 		function removeZl(){
 			document.getElementById("zl").style.display='none';
 			document.getElementById("yyzl").style.display='block';
-		}
+            document.getElementById("confimRefrence").style.display='none';
+        }
 		//不同资料显示不同的内容
 		function ckzl_change(){
 			var content=$("#info").val();
@@ -856,17 +939,16 @@
 	<div id="dialogmask" class="dialogmask opacity"></div>
 	<div id="dig" class="ckzl" style="display: none"> 
 		<div id="dig_content" class="digcontent">
-			<div>
-				<a onclick="addZl()">添加参考资料</a>
-				<a onclick="removeZl()">引用已有资料</a>
+			<div class="dig-tab">
+				<a class="btn btn-primary" onclick="addZl()">添加参考资料</a>
+				<a class="btn btn-primary" onclick="removeZl()">引用已有资料</a>
 			</div>
 			<%--已有资料--%>
 			<div class="control-group" id="yyzl" style="display: none">
-				<label class="control-label titleClass">参考资料</label>
 				<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">
+							<div class="controls applicationsan">
 								<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>
@@ -876,7 +958,7 @@
 							</div>
 						</c:if>
 						<c:if test="${videoFile.referenceType eq '2'}">
-							<div class="controls applicationsan" style="margin-top: 5px">
+							<div class="controls applicationsan">
 								<span class="del">[${statusIndex.index}]</span>
 								<span class="del">${videoFile.author}.</span>
 								<span class="del">${videoFile.workName}.</span>
@@ -889,27 +971,27 @@
 							</div>
 						</c:if>
 						<c:if test="${videoFile.referenceType eq '3'}">
-							<div class="controls applicationsan" style="margin-top: 5px">
+							<div class="controls applicationsan">
 								<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>
 			</div>
 			<%--添加参考资料--%>
-			<div id="zl" style="margin-top: 10px">
-				<div class="control-group" style="margin-left: 100px">
+			<div id="zl">
+				<div class="control-group">
 					<label class="red">*</label>
 					<label class="control-label">参考资料类型:</label>
-					<select id="info" style="margin-left: 20px" onchange="ckzl_change()">
+					<select id="info" onchange="ckzl_change()">
 						<option id="zllx1" value="1">网络资料</option>
 						<option id="zllx2" value="2">著作资料</option>
 						<option id="zllx3" value="3">其他资料</option>
@@ -917,85 +999,83 @@
 				</div>
 				<%--网络资料--%>
 				<div class="wlzl" style="display: block" id="wlzl">
-					<div class="control-group" style="margin-left: 100px;margin-top: 30px">
+					<div class="control-group">
 						<label class="red">*</label>
 						<label class="control-label keyClass">输入网址:</label>
-						<input id="website" required="true" style="margin-left: 45px" htmlEscape="false" class="input-xlarge " placeholder="请以http(s)开头"/>
+						<input type="text" id="website" required="true"  htmlEscape="false" class="input-xlarge " placeholder="请以http(s)开头"/>
 					</div>
-					<div class="control-group" style="margin-left: 100px;margin-top: 30px">
+					<div class="control-group">
 						<label class="red">*</label>
 						<label class="control-label keyClass">文章名字:</label>
-						<input id="articleName" required="true" style="margin-left: 45px" htmlEscape="false" class="input-xlarge " placeholder="请输入文章名字"/>
+						<input type="text" id="articleName" required="true" htmlEscape="false" class="input-xlarge " placeholder="请输入文章名字"/>
 					</div>
-					<div class="control-group" style="margin-left: 100px;margin-top: 30px">
+					<div class="control-group">
 						<label class="red">*</label>
 						<label class="control-label keyClass">网站名称:</label>
-							<input  id="websiteName" style="margin-left: 45px" htmlEscape="false" class="input-xlarge " placeholder="请输入网站名称 如:新华网"/>
+							<input  type="text" id="websiteName"  htmlEscape="false" class="input-xlarge " placeholder="请输入网站名称 如:新华网"/>
 					</div>
-					<div class="control-group" style="margin-left: 100px;margin-top: 30px">
+					<div class="control-group">
 						<label class="control-label keyClass">发表日期:</label>
-							<input id="publishTimeStr" name="publishTimeStr" style="margin-left: 55px" type="text" readonly="readonly" maxlength="20" class="input-medium Wdate "
+							<input type="text" id="publishTimeStr" name="publishTimeStr" type="text" readonly="readonly" maxlength="20" class="input-medium Wdate "
 								   onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false});"/>
 					</div>
-					<div class="control-group" style="margin-left: 100px;margin-top: 30px">
+					<div class="control-group">
 						<label class="control-label keyClass">引文日期:</label>
-							<input id="acitationTimeStr" name="publishTimeStr" style="margin-left: 55px" type="text" readonly="readonly" maxlength="20" class="input-medium Wdate "
+							<input type="text" id="acitationTimeStr" name="publishTimeStr" type="text" readonly="readonly" maxlength="20" class="input-medium Wdate "
 								   onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false});"/>
 					</div>
 				</div>
 				<%--著作资料--%>
 				<div class="zzzl" style="display: none" id="zzzl">
-					<div class="control-group" style="margin-left: 100px;margin-top: 30px">
+					<div class="control-group" >
 						<label class="red">*</label>
 						<label class="control-label keyClass">作者:</label>
-						<input id="author" style="margin-left: 70px" htmlEscape="false" class="input-xlarge " placeholder="请输入作者名称 多个作者使用英文都好隔开"/>
+						<input type="text" id="author" htmlEscape="false" class="input-xlarge " placeholder="请输入作者名称 多个作者使用英文都好隔开"/>
 					</div>
-					<div class="control-group" style="margin-left: 100px;margin-top: 30px">
+					<div class="control-group">
 						<label class="red">*</label>
 						<label class="control-label keyClass">著作名:</label>
-						<input id="workName" style="margin-left: 60px" htmlEscape="false" class="input-xlarge " placeholder="请输入著作名"/>
+						<input type="text" id="workName"  htmlEscape="false" class="input-xlarge " placeholder="请输入著作名"/>
 					</div>
-					<div class="control-group" style="margin-left: 100px;margin-top: 30px">
+					<div class="control-group">
 						<label class="control-label keyClass">出版地:</label>
-						<input id="publicationPlace" style="margin-left: 70px" htmlEscape="false" class="input-xlarge " placeholder="请输入出版地信息"/>
+						<input type="text" id="publicationPlace" htmlEscape="false" class="input-xlarge " placeholder="请输入出版地信息"/>
 					</div>
-					<div class="control-group" style="margin-left: 100px;margin-top: 30px">
+					<div class="control-group">
 						<label class="red">*</label>
 						<label class="control-label keyClass">出版社:</label>
-						<input id="press" style="margin-left: 60px" htmlEscape="false" class="input-xlarge " placeholder="请输入出版社名称"/>
+						<input type="text" id="press" htmlEscape="false" class="input-xlarge " placeholder="请输入出版社名称"/>
 					</div>
-					<div class="control-group" style="margin-left: 100px;margin-top: 30px">
+					<div class="control-group">
 						<label class="control-label keyClass">出版年:</label>
-						<input id="publicationYearStr" name="publicationYearStr" style="margin-left: 65px" type="text" readonly="readonly" maxlength="20" class="input-medium Wdate "
+						<input type="text" id="publicationYearStr" name="publicationYearStr"  type="text" readonly="readonly" maxlength="20" class="input-medium Wdate "
 							   onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false});"/>
 					</div>
-					<div class="control-group" style="margin-left: 100px;margin-top: 30px">
+					<div class="control-group">
 						<label class="control-label keyClass">引文编码:</label>
-						<input id="acitationWeb" style="margin-left: 60px" htmlEscape="false" class="input-xlarge " placeholder="请输入引用著作的页码 如 100 121"/>
+						<input type="text" id="acitationWeb"  htmlEscape="false" class="input-xlarge " placeholder="请输入引用著作的页码 如 100 121"/>
 					</div>
 				</div>
 				<%--其他资料--%>
-				<div class="qtzl" style="display:none;" id="qtzl">
-					<div class="control-group" style="margin-left: 20px">
+				<div class="qtzl" id="qtzl" style="display: none" >
+					<div class="control-group">
 						<label class="red">*</label>
 						<label class="control-label keyClass">参考资料说明:</label>
 						<textarea id="referenceDescription" type="text"  style="position: relative;height: 100px; width: 450px;" maxlength="50" ></textarea>
-						<label style="margin-left: 150px">其他类型参考资料,填写格式请参阅<a href="">《信息与文献 参考文献著录规则 GB/T 7714-2015》</a></label>
+						<label class="bk-input-tip">其他类型参考资料,填写格式请参阅<a href="">《信息与文献 参考文献著录规则 GB/T 7714-2015》</a></label>
 					</div>
-					<div class="control-group" style="margin-left: 20px">
+					<div class="control-group" >
 						<label class="control-label keyClass">图片描述:</label>
-						<input id="imageDescription" style="margin-left: 45px" htmlEscape="false" class="input-xlarge " placeholder="请输入其他参考资料的具体描述"/>
+						<input type="text" id="imageDescription" htmlEscape="false" class="input-xlarge " placeholder="请输入其他参考资料的具体描述"/>
 					</div>
-					<div class="control-group" style="margin-top: 28px">
+					<div class="control-group">
 						<label class="control-label">图片上传:</label>
-						<div class="auth-qrCode-list" style="display: flex;flex-wrap: wrap">
+						<div class="auth-qrCode-list clearfix">
 							<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>
+									<sys:ckfinder input="referenceImgUrl" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
+									<label class="bk-upload-tip">请上传引用的图片资源,需同时上传资料的封面、以及含有对应具体内容的图片;注意:图片需要保证完整、不可遮挡且清晰</label>
 								</div>
 							</div>
 						</div>
@@ -1005,8 +1085,8 @@
 			</div>
 		</div>
 		<div class="form-actions">
-			<button class="confirm">确 定</button>
-			<button class="cancel">取 消</button>
+			<button class="confirm btn btn-primary" id="confimRefrence">确 定</button>
+			<button class="cancel btn btn-primary">取 消</button>
 		</div>
 	</div>
 <%--	<div id="dialogmask" class="dialogmask opacity"></div>--%>
@@ -1126,9 +1206,9 @@
 		<%--概述图册--%>
 		<div class="control-group" style="width: 1000px">
 			<label class="control-label keyClass">概述图册:</label>
-			<div class="display-image-list" style="display: flex;flex-wrap: wrap">
+			<div class="display-image-list" style="display: flex;flex-wrap: nowrap; margin-top: -36px">
 				<c:forEach items="${cmBaikeProduct.displayImageList}" var="displayImage" varStatus="index">
-					<div class="controls upload-content iconBox" id="displayImageBox${index.index}">
+					<div class="controls upload-content iconBox" id="displayImageBox${index.index}" style="width: 170px">
 						<div class="conList">
 							<form:hidden id="displayImage${index.index}" path="displayImageList[${index.index}]" htmlEscape="false"
 										 maxlength="255"
@@ -1141,7 +1221,7 @@
 				</c:forEach>
 				<c:set var="size" value="${empty cmBaikeProduct.displayImageList?0:cmBaikeProduct.displayImageList.size()}"/>
 				<c:forEach var="emptyIndex" begin="${size}" end="${5}">
-					<div class="controls upload-content iconBox conList ${emptyIndex eq 0?'':'hide-pic'}" id="displayImageBox${emptyIndex}" >
+					<div class="controls upload-content iconBox conList ${emptyIndex eq 0?'':'hide-pic'}" id="displayImageBox${emptyIndex}" style="width: 170px">
 						<div class="conList">
 							<form:hidden id="displayImage${emptyIndex}" path="displayImageList[${emptyIndex}]" htmlEscape="false"
 										 maxlength="255"
@@ -1219,7 +1299,7 @@
 							<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 class="del" style="margin-left: 12px" onclick="upMaterial(${videoFile.id})">编辑</a>
 							<a onclick="delMaterial(${videoFile.id})">删除</a>
 						</div>
 					</c:if>
@@ -1232,7 +1312,7 @@
 							<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 class="del" style="margin-left: 12px" onclick="upMaterial(${videoFile.id})">编辑</a>
 							<a onclick="delMaterial(${videoFile.id})">删除</a>
 						</div>
 					</c:if>
@@ -1241,10 +1321,12 @@
 							<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 class="del" style="margin-left: 12px" onclick="upMaterial(${videoFile.id})">编辑</a>
 							<a onclick="delMaterial(${videoFile.id})">删除</a>
 						</div>
 					</c:if>
@@ -1360,7 +1442,8 @@
 				currentContentEdit = edit
 				console.log(currentContentEdit)
 				createReferenceList()
-				$('#dig').show()
+				$('#dialogmask').fadeIn()
+				$('#dig').fadeIn()
 			},
 			referenceEdit(ctrid) {
 				// 编辑
@@ -1370,7 +1453,8 @@
 				})
 				if(!referenceData) return
 				initRefrenceFormData(referenceData)
-				$('#dig').show()
+				$('#dialogmask').fadeIn()
+				$('#dig').fadeIn()
 			},
 		})
 		contentEditMap.set(el, contentEdit)
@@ -1544,15 +1628,18 @@
 
 	function createReferenceItem(referenceData){
 		var text=null
+		if(referenceData.publishTimeStr=='undefined'){
+			referenceData.publishTimeStr='111'
+		}
 		if(referenceData.referenceType == 1){
 			text = `
 				<div class="controls applicationsan">
 						<span class="del">
-							<a href="\${referenceData.website}" target="_blank">\${referenceData.articleName}.</a>
+							<a>\${referenceData.articleName}.</a>
 						</span>
 						<span class="del">\${referenceData.websiteName}.</span>
 						<span class="del">\${referenceData.publishTimeStr}.</span>
-						<span class="del">\${referenceData.acitationTimeStr}.</span>
+						<span class="del">\${referenceData.acitationTimeStr}.</span>
 					</div>
 			`
 		}
@@ -1573,9 +1660,6 @@
 				<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>
 			`
 		}
@@ -1587,11 +1671,12 @@
 		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">[\${referenceList.length}]</span>
+						<span class="del"><a>\${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 class="del" style="margin-left: 12px" onclick="upMaterial(\${referenceData.id})">编辑</a>
 						<a onclick="delMaterial(\${referenceData.id})">删除</a>
 					</div>
 			`
@@ -1599,13 +1684,14 @@
 		if(referenceData.referenceType == 2){
 			text=	`
 				<div class="controls applicationsan">
+					<span class="del">[\${referenceList.length}]</span>
 					<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 class="del" style="margin-left: 12px" onclick="upMaterial(\${referenceData.id})">编辑</a>
 					<a onclick="delMaterial(\${referenceData.id})">删除</a>
 				</div>
 			`
@@ -1613,12 +1699,10 @@
 		if(referenceData.referenceType == 3){
 			text= `
 				<div class="controls applicationsan">
+					<span class="del">[\${referenceList.length}]</span>
 					<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 class="del" style="margin-left: 12px" onclick="upMaterial(\${referenceData.id})">编辑</a>
 					<a onclick="delMaterial(\${referenceData.id})">删除</a>
 				</div>
 			`
@@ -1641,6 +1725,8 @@
 			if(!result) return
 			var con= createReferenceItem(result)
 			result.ctrlId = currentContentEdit.confirm(con, result.ctrlId, index)
+			$('#dialogmask').fadeOut()
+			$('#dig').fadeOut()
 		})
 	}
 
@@ -1669,7 +1755,8 @@
 				var con=createReferenceItem(result)
 				result.ctrlId = currentContentEdit.confirm(con)
 				referenceList.push(result)
-				$(this).parents('#dig').hide()
+				$(this).parents('#dig').siblings('#dialogmask').fadeOut()
+				$(this).parents('#dig').fadeOut()
 				initRefrenceFormData({})
 				var item = createAllReferenceItem(result)
 				$('.bk-reference-list').append(item)
@@ -1679,14 +1766,16 @@
 					return item.ctrlId == referenceData.ctrlId
 				})
 				referenceList.splice(index, 1, result)
-				$(this).parents('#dig').hide()
+				$(this).parents('#dig').siblings('#dialogmask').fadeOut()
+				$(this).parents('#dig').fadeOut()
 				initRefrenceFormData({})
 			}
 			var referen=JSON.stringify(referenceList)
 			$('#referenceList').val(referen);
 		})
 		$('#dig .cancel').on('click', function(){
-			$(this).parents('#dig').hide()
+			$(this).parents('#dig').fadeOut()
+			$(this).parents('#dig').siblings('#dialogmask').fadeOut()
 			initRefrenceFormData({})
 		})
 		<%-- referenceList = [{ctrlId: 'FDIEKABKKNJEEJAN'}] // referenceList[0].reyt = 1 // referenceList:'[{"type": 1}]'--%>