知识库版本对比修改

WebUI/CallCenterWeb.UI/zhiShiKu/evaluate.html

@@ -25,7 +25,7 @@
 			width: 600px;
 			height: 24px;
 			margin: 20px auto 0;
-			padding-left: 40px;
+			/*padding-left: 40px;*/
 		}
 		
 		.star span {

WebUI/CallCenterWeb.UI/zhiShiKu/js/score.js

@@ -63,7 +63,7 @@
 				ismax(index + 1);
 				
 				$('p',parentCls).hasClass('hidden') && $('p',parentCls).removeClass('hidden');
-				$('p',parentCls).css({'left':index*$(this).width() - 1 + 'px'});
+				$('p',parentCls).css({'left':index*$(this).width() - 35 + 'px'});
 				
 
 				var html = '<em style="text-align:center">' + 

WebUI/CallCenterWeb.UI/zhiShiKu/newRepositoryDetail.html

@@ -197,7 +197,7 @@
 				<div class="operation_bj">
 					
 				</div>
-				<table class="table table-bordered table-condensed">
+				<table class="table table-bordered table-condensed diff-wrapper1">
 					<tr>
 						<td width="100">标题</td>
 						<td colspan="3"> <input type="text" id="title" readonly="readonly" /></td>
@@ -211,8 +211,10 @@
 						<td colspan="3" height="100"> <textarea name="" rows="" cols="" id="change" readonly="readonly"></textarea></td>
 					</tr>
 					<tr>
-						<td width="100" height="100"> 参考答案(修改前后结果对比)</td>
-						<td colspan="3" height="100"> <textarea name="" rows="" cols="" id="diff1" readonly="readonly"></textarea></td>
+						<td width="100" height="100"> 参考答案(修改前后结果对比)<span style="font-size: 12px; color: red;">注: 红色为已删除   绿色为新增</span></td>
+						<td colspan="3" height="100"> <span id="diff1">
+							
+						</span></td>
 					</tr>
 					<tr>
 						<td width="100">单位</td>
@@ -336,6 +338,8 @@
 			<script src="../js/kindeditor/lang/zh-CN.js"></script>
 			<script src="../js/adjustHeight.js"></script>
 			<script src="../js/laydate/laydate.js"></script>
+			<script src="../js/plugins/diff_match_patch/diff_match_patch.js"></script>
+    		<script src="../js/plugins/preetyTextDiff/jquery.pretty-text-diff.min.js"></script>
 			<script>
 				
 				var ids=helper.request.queryString("ids");
@@ -487,28 +491,30 @@
 											'</tr>'
 									$(strs).appendTo($('.SHXX'))
 								})
-			
-			
-			
-			
-								
+								if(con.F_AuditID){
+									$.ajax({
+										type:"get",
+										url:huayi.config.callcenter_url +"Knowledge/GetAuditCompareInfo",
+										async:true,
+										dataType:'json',
+										data:{
+											token: $.cookie("token"),
+											auditid:con.F_AuditID
+										},
+										success:function(res){
+											$('#change').html(res.data.F_PreDescription);  //修改前内容	F_PreDescription
+					    					$('#endanswer').html(res.data.F_AfterDescription);  //修改后内容    F_AfterDescription
+											$(".diff-wrapper1").prettyTextDiff({
+												originalContent: $("#change").html(),
+												changedContent: $("#endanswer").html(),
+												diffContainer: "#diff1"
+											});
+										}
+									})	
+								}
 							}
-							
 						}
 					});
-					$.ajax({
-						type:"get",
-						url:huayi.config.callcenter_url +"Knowledge/GetAuditCompareInfo",
-						async:true,
-						dataType:'json',
-						data:{
-							token: $.cookie("token"),
-							auditid:ids
-						},
-						success:function(res){
-							console.log(res)
-						}
-					})	
 				$('#error_record').bootstrapTable('destroy').bootstrapTable({ striped: true });