fix

WebChartNewest/js/second_index.js

@@ -2272,17 +2272,20 @@ function theme_chart(dom, nameArray, piData) {
 			label: {
 				normal: {
 					show: true,
+					align: 'right',
 					formatter: function (params) {
-//						if (params.name.length > 9 && params.name.length < 35) {
-//							return params.name.substring(0, 20) + '\n' + params.name.substring(20, params.name.length) + '：' + (allCount > 0 ? (params.value.toString() + '(' + (params.value/allCount).toFixed(2) + '%)') : params.value.toString();
-//						} else if (params.name.length > 35) {
-//							return params.name.substring(0, 18) + '\n' + params.name.substring(18, 36) + '\n' + params.name.substring(36, params.name.length) + '：' + (allCount > 0 ? (params.value.toString() + '(' + (params.value/allCount).toFixed(2) + '%)') : params.value.toString();
-//						} else {
-//							return params.name + '：' + (allCount > 0 ? (params.value.toString() + '(' + (params.value/allCount).toFixed(2) + '%)') : params.value.toString();
-//
-//						}
-
-						return params.name + '：' + (allCount > 0 ? (params.value.toString() + '(' + (params.value/allCount *100).toFixed(2) + '%)') : params.value.toString());
+//						var params.name = params.name
+						var textNumber = 7
+						if(params.name.length <= textNumber) {
+	                        params.name;
+	                    } else if(params.name.length > textNumber && params.name.length <=(textNumber*2)) {
+	                        params.name = `${params.name.slice(0,textNumber)}\n${params.name.slice((textNumber*1))}`
+	                    } else if(params.name.length > (textNumber*2)&& params.name.length <=(textNumber*3) ){
+	                        params.name = `${params.name.slice(0,(textNumber*1))}\n${params.name.slice((textNumber*1),(textNumber*2))}\n${params.name.slice((textNumber*2))}`
+	                    } 
+	                    var reslutValue = (allCount > 0 ? (params.value.toString() + '(' + (params.value/allCount *100).toFixed(2) + '%)') : params.value.toString())
+						//+'\n'
+						return params.name+ '：' +reslutValue 
 					}
 				},
 				emphasis: {

WebChartNewest/js/workOrder.js

@@ -64,7 +64,6 @@ function initTable(parm) {
 	var orderId = $('#orderId').val();
 	var isresult = $('#isresult').val();
 	var conphone = $('#orderTel').val();
-	console.log($('#isresult').val())
 	if (!parm) parm = JSON.parse($.cookie("old_params"))
 	if (!parm.key) parm.key = orderKey;
 	if (!parm.workid) parm.workid = orderId;
@@ -250,18 +249,20 @@ function backWorkTable(deptid,type) {
 //列表操作
 function getformatter(v) {
 	// workStateAct = 2
-	 
-	return '<span class="workAct" onclick="btn_detail(\'' + v + '\')" style="display: block;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;width:120px;text-align: center;">' + v + '</span>'
+	 var resultValue = (v.substring(0,2) + v.substring(10,16))
+	return '<span class="workAct" onclick="btn_detail(\'' + v + '\')" style="display: block;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;width:120px;text-align: center;">' + resultValue+ '</span>'
 }
 
 
 function getformatterDetail(v,row){
+	var resultValue = (v.substring(0,2) + v.substring(10,16))
 	//	return '<span class="workAct" onclick="detailHandle(\'' + v + '\')">' + v + '</span>'
 	//style="display: block;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;width:80px;text-align: center;"
-	return '<span class="workAct" onclick="detailHandle(\'' + v + '\')"  style="display: block;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;width:160px;text-align: center;">' + v + '</span>'
+	return '<span class="workAct" onclick="detailHandle(\'' + v + '\')"  style="display: block;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;width:160px;text-align: center;">' + resultValue+ '</span>'
 //	return '<span class="workAct" onclick="detailHandle(\'' + v + '\')"  >' + v + '</span></br><span class="workAct" ' + row.F_ComTitle + '</span>'
 }
 function getformatterTitleDetail(val) { 
+//	var resultValue = (v.substring(0,2) + v.substring(10,16))
 //	style='display: block;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;width:100px;margin:0 auto;'
 	return "<div style='display: block;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;width:300px;margin:0 auto;'>" +
 	val + "</div>"
@@ -307,13 +308,13 @@ function getProblem(v){
 		v + "</div>"
 }
 function getformatterTitle(val) { 
+	
 	return "<div style='display: block;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;width:230px;margin:0 auto;'>" +
 	val + "</div>"
  }
 
 
 function detailHandle(id){
-	console.log(id)
 	detailId = id;
 	$(".workDetailsHandle").show()
 	$(".workDetailsHandleSecond").hide()
@@ -351,7 +352,6 @@ function detailHandle(id){
 		Type: 'GET',
 		callBack: function(res) {
 			let data = res.data[0];
-			console.log('是否保密',data.F_IsProtect)
 			if (data.F_IsProtect == 0) {
 				$('.isSecrecy').text("否");
 			} else {
@@ -505,7 +505,6 @@ function btn_detail(id) {
 		Type: 'GET',
 		callBack: function(res) {
 			let data = res.data[0];
-			console.log('是否保密',data.F_IsProtect)
 			if (data.F_IsProtect == 0) {
 				$('.isSecrecy').text("否");
 			} else {

WebUI/CallCenterWeb.UI/CommonHtml/WorkDatil.html

@@ -451,7 +451,22 @@
 							</tbody>
 						</table>
 					</div>
-
+					<div style="font-weight: bold;">&nbsp;&nbsp;&nbsp;&nbsp;历史办理结果</div>
+					<div style="width: 100%;padding: 10px;">
+						<table class="Table" border="" cellspacing="0" cellpadding="0">
+							<theard>
+								<tr>
+									<td class="text-center" style="min-width:50px;">序号</td>
+									<td class="text-center" style="min-width:100px;">办理单位</td>
+									<td class="text-center" style="min-width:100px;">办理时间</td>
+									<td class="text-center" style="min-width:100px;">办理结果</td>
+									
+								</tr>
+							</theard>
+							<tbody class="historyHtml">
+							</tbody>
+						</table>
+					</div>
 					<div style="padding: 10px; font-weight: bold;">退回审核</div>
 					<div style="width: 100%;padding: 10px;">
 						<table class="Table" border="" cellspacing="0" cellpadding="0">

WebUI/CallCenterWeb.UI/CommonHtml/js/orderDetail.js

@@ -332,11 +332,11 @@ function orderDetail4(result,type) {
 	//办理情况
 	var htmls = '';
 	var htmlsPrint = '';
+	var historyHtml = ''
 	if(result.data.bldata.length < 0) {
 		htmls = '<tr>' +
 			'<td class="text-center">' + n.UserName + '</td>' +
 			'</tr>';
-			
 	} else{
 		$(".hfBLQKele").show()
 	}
@@ -345,8 +345,10 @@ function orderDetail4(result,type) {
 			'<td class="text-center">' + n.UserName + '</td>' +
 			'</tr>';
 	}
+	
 	$(".BLQK").empty();
 	$(".BLQKPrint").empty();
+	$(".historyHtml").empty()
 	$(result.data.bldata).each(function(i, n) {
 		//类型
 		var bval = n.F_Type;
@@ -483,6 +485,12 @@ function orderDetail4(result,type) {
 		}
 		//											'<td class="text-center">' + situationValue +
 		//												'</td>' +
+		historyHtml += '<tr>' 
+		historyHtml += '<td class="text-center">' + (i + 1) +'</td>' +
+		'<td class="text-center">' + n.DeptName +'</td>' +
+		'<td class="text-center">' + n.F_CreateTime + '</td>' +
+		'<td class="text-center"  style="white-space: pre-line;">' + n.F_Result +'</td>' 
+		historyHtml += '</tr>';
 		htmls += '<tr>' +
 			'<td class="text-center">' + n.F_DealUser +
 			'</td>' +
@@ -492,8 +500,7 @@ function orderDetail4(result,type) {
 			'<td class="text-center">' + dutiesValue +
 			'</td>' +
 
-			'<td class="text-center">' + n.DeptName +
-			'</td>' +
+			'<td class="text-center">' + n.DeptName +'</td>' +
 			'<td class="text-center"  style="white-space: pre-line;">' + n.F_Result +
 			'</td>' +
 			'<td class="text-center">' + n.F_CreateTime +
@@ -718,7 +725,13 @@ function orderDetail4(result,type) {
 				auditContact = n.F_AuditContact
 				break;
 		}
-
+		historyHtml += '<tr>' 
+			
+		historyHtml += '<td class="text-center">' + (i + 1) +'</td>' +
+		'<td class="text-center">' + n.DeptName +'</td>'+
+		'<td class="text-center">' + n.F_CreateTime + '</td>' +
+		'<td class="text-center"  style="white-space: pre-line;">' + n.F_Result +'</td>' 
+		historyHtml += '</tr>';
 		SJhtmls += '<tr>' +
 			'<td class="text-center">' + n.F_DealUser +
 			'</td>' +
@@ -789,13 +802,17 @@ function orderDetail4(result,type) {
 		})
 		SJhtmls += '</td></tr>'
 	})
+	$(historyHtml).appendTo($(".historyHtml"));
 	if (type ==='4') {
+		
 		$(SJhtmls).appendTo($(".SJBLQK"));
 	} else{
 		$(SJhtmls).appendTo($(".hfSJBLQK"));
 	}
 	
 }
+
+
 //市民评议 10
 function orderDetail10(result){
 	$(".SMPY").empty();

WebUI/CallCenterWeb.UI/Script/Common/huayi.config.js

@@ -3,9 +3,9 @@
 }
 //var AYWebUrl = window.document.location.href
 huayi.config = {
-		callcenter_url: "http://192.168.8.9:1042/",// 生产环境	39.164.159.226
+//		callcenter_url: "http://192.168.8.9:1042/",// 生产环境	39.164.159.226
 //		callcenter_url: "http://39.164.159.226:1042/",// 生产环境	39.164.159.226
-//	callcenter_url: "http://docking.zwfw.anyang.gov.cn:65527/", // 生产环境 
+	callcenter_url: "http://docking.zwfw.anyang.gov.cn:65527/", // 生产环境 
 	socket_ip: "ws://39.164.159.226:8081", //ip 
 	// socket_ip: "wss://12345sp.zwfw.anyang.gov.cn:8082", //ip 
 	//	translation_socket:"ws://125.45.12.102:12233",

WebUI/CallCenterWeb.UI/zhiShiKu/js/addOrEditZhiShiKuPolicyExpert.js

@@ -82,7 +82,9 @@ $(document).ready(function () {
             },
             success: function (result) {
                 if (result.state.toLowerCase() == "success") {
-                    var data = result.data;
+                	console.log(data)
+                    var data = result.data.model;
+                    console.log(data)
                     $("#name").val(data.F_XingMing);
                     $("#address").val(data.F_DiQu);
                     $("#unit").val(data.F_DanWei);

WebUI/CallCenterWeb.UI/zhiShiKu/js/detailZhiShiKuPolicyExpert.js

@@ -2,6 +2,7 @@ var id = helper.request.queryString("id");
 $(document).ready(function () {
     //获取知识库详情
     if (id) {
+    	console.log("详情")
         $.ajax({
             type: "get",
             url: huayi.config.callcenter_url + "Professor/GetModel",
@@ -13,7 +14,7 @@ $(document).ready(function () {
             },
             success: function (result) {
                 if (result.state.toLowerCase() == "success") {
-                    var data = result.data;
+                    var data = result.data.model;
                     $("#name").val(data.F_XingMing);
                     $("#address").val(data.F_DiQu);
                     $("#unit").val(data.F_DanWei);