Merge branch 'develop' of http://192.168.1.222:3000/duhongyu/AnYang_UI into develop

WebChartNew/.project

@@ -87,5 +87,14 @@
 				<arguments>1.0-name-matches-false-false-node_modules</arguments>
 			</matcher>
 		</filter>
+		<filter>
+			<id>1715744923477</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
+			</matcher>
+		</filter>
 	</filteredResources>
 </projectDescription>

WebChartNewest/Script/Common/huayi.config.js

@@ -3,8 +3,8 @@ if (huayi == undefined) {
     var huayi = {};
 }
 huayi.config = {
-	 // callcenter_url: "http://192.168.8.9:1042/",//生产环境  
-	callcenter_url: "http://docking.zwfw.anyang.gov.cn:65527/",
+	  callcenter_url: "http://192.168.8.9:1042/",//生产环境  
+//	callcenter_url: "http://docking.zwfw.anyang.gov.cn:65527/",
     socket_ip: "61.54.2.122",//ip 61.54.2.122:8081
     socket_port: "8081",//端口
     indextime: 30000//报表刷新时间

WebChartNewest/css/index.css

@@ -990,6 +990,17 @@ body {
 	border: 1px solid #08fcff;
 	color: #08fcff;
 }
+
+.searchInput{
+    width: 200px;
+    height: 28px;
+    padding: 5px 5px 5px 5px;
+    background-color: #08599f;
+    outline: none;
+    border: 1px solid #08fcff;
+    color: #08fcff;
+}
+
 #rankDate{
 	margin-left: 10px;
 }

WebChartNewest/index.html

@@ -124,7 +124,7 @@
 								<span class="num_roll" id="dxs_num">0</span>
 								<span class="num_roll" id="dxg_num">0</span>
 							</li>
-							<li><label>市民来电：</label><span class="num_roll" id="szw_num">0</span><span class="num_roll"
+							<li><label>市 民 来 电：</label><span class="num_roll" id="szw_num">0</span><span class="num_roll"
 									id="szq_num">0</span><span class="num_roll" id="szb_num">0</span><span
 									class="num_roll" id="szs_num">0</span><span class="num_roll" id="szg_num">0</span>
 							</li>
@@ -136,7 +136,7 @@
 									id="wxq_num">0</span><span class="num_roll" id="wxb_num">0</span><span
 									class="num_roll" id="wxs_num">0</span><span class="num_roll" id="wxg_num">0</span>
 							</li>
-							<li><label>&nbsp;&nbsp;&nbsp;好差评：</label><span class="num_roll" id="zww_num">0</span><span class="num_roll"
+							<li><label>省平台来电：</label><span class="num_roll" id="zww_num">0</span><span class="num_roll"
 									id="zwq_num">0</span><span class="num_roll" id="zwb_num">0</span><span
 									class="num_roll" id="zws_num">0</span><span class="num_roll" id="zwg_num">0</span>
 							</li>
@@ -771,6 +771,22 @@
 					<h2>安阳市12345热线工单列表</h2>
 					<img src="./image/second/title_left.png" class="title_right">
 				</div>
+				<div style="position: relative;">
+					<div class="dataT act" style="left: 20px;font-size: 15px;top: 0px;width: 100px;">
+						<label class="dataAct" data-pos="1" indextitle="工单列表">
+							网络转办<span class="day active"></span>
+						</label><br>
+						<label class="dataAct" data-pos="2" indextitle="工单列表">
+							当即办结<span class="month"></span>
+						</label>
+						<input type="hidden" id="isresult" value="0">
+					</div>
+					<!--<img src="./image/date.png" alt="" class="date_icon">
+					<input type="text" id="date3" placeholder="请选择时间范围" lay-key="100006">-->
+					<input type="text" id="orderId" style="margin-left: 120px;" class="searchInput" onblur="initTable()" placeholder="请输入工单编号" />
+					<input type="text" id="orderKey" class="searchInput" onblur="initTable()" placeholder="请输入关键词" />
+					<input type="text" id="orderTel" class="searchInput" onblur="initTable()" placeholder="请输入联系电话" />
+				</div>
 				<div style="width: 100%;padding: 10px;height: 750px;">
 					<table id="workList" data-row-style="rowStyle" data-query-params="queryParams"
 						data-pagination="true">

WebChartNewest/js/newAdd/operationEvent.js

@@ -32,6 +32,9 @@ $('.dataAct').click(function () {
 			console.log("日-工单类型")
 			typeCountDataType = 0
 			getworkOrder()
+		} else if (indexTitle=="工单列表") {
+			$('#isresult').val('0');
+			initTable();
 		}
 		trafficState = 0;
 	} else if ($(this).attr('data-pos') == '2') {
@@ -56,6 +59,9 @@ $('.dataAct').click(function () {
 		}else if(indexTitle=="工单类型"){
 			typeCountDataType = 1
 			getworkOrder()
+		} else if (indexTitle=="工单列表") {
+			$('#isresult').val('1');
+			initTable();
 		}
 		trafficState = 1;
 	}

WebChartNewest/js/second_index.js

@@ -64,7 +64,7 @@ function formatDate(date) {
 }
 
 function getKeyClass(id, classId, con) {
-	
+
 	$('.bulletFrame').show();
 	$('.secondLevel_keyWord').show();
 	$('.secondLevel_keyWord').siblings().hide()
@@ -93,7 +93,7 @@ function getKeyClass(id, classId, con) {
 		}
 	});
 	console.log($('#gpsxDataAct').val(), 'dataact')
-	if (classId == '1') {
+	if (classId == '1' || classId == '0') {
 		
 		// 当月
 		
@@ -101,10 +101,10 @@ function getKeyClass(id, classId, con) {
 //			
 //			workTable(id,null,null,null,null ,null,null,null,null,null,null,null, $('#keyDate').val());
 			var currentTime = getMonthTime($('#keyDate').val());
-			workTable(id,null,null,null,null ,null,null,null,null,null,null,null, null, null, null, currentTime.start, currentTime.end);
+			workTable(id,null,null,null,null ,null,null,null,null,null,null,null, null, null, null, currentTime.start, currentTime.end, classId == '0' ? 1: null);
 		} else {
 			// 当日
-			workTable(id,null,null,null,null ,null,null,null,null,null,null,null, $('#keyDate').val());
+			workTable(id,null,null,null,null ,null,null,null,null,null,null,null, $('#keyDate').val(), null, null, null, null , classId == '0' ? 1: null);
 		}
 		
 		
@@ -153,6 +153,7 @@ function keyWordTable(id, con, value) {
 				timetype:keyCountDataType,			
 				date: value
 			}
+			
 			return param
 		},
 		onLoadSuccess: function (data) { //加载成功时执行

WebChartNewest/js/workOrder.js

@@ -1,5 +1,9 @@
 //工单列表
-function workTable(KeyId,deptid,sourceId,PhoneType,keyword ,type,sourceArea,key,timetype,handling,source,dptype, date, Township, strworkid, stime, etime) {
+function workTable(KeyId,deptid,sourceId,PhoneType,keyword ,type,sourceArea,key,timetype,handling,source,dptype, date, Township, strworkid, stime, etime, isspecial) {
+	$('#orderTel').val('');
+	$('#orderKey').val('');
+	$('#orderId').val('');
+	$('#isresult').val('0');
 	$('.bulletFrameT').show();
 	$('.workList').show();
 	$('.workList').siblings().hide()
@@ -13,6 +17,48 @@ function workTable(KeyId,deptid,sourceId,PhoneType,keyword ,type,sourceArea,key,
 		$('.timeSta_wrap').show();
 		$('.timeSta_wrap').siblings().hide()
 	})
+	
+	var param = {
+//				token: $.cookie("token"),
+//				page: params.pageNumber,
+//				pagesize: params.pageSize,
+				Township,
+				KeyId: KeyId,
+				deptid:deptid,
+				sourceId:sourceId,
+				PhoneType :PhoneType ,
+				keyword:keyword,
+				workid: strworkid,
+				stime,
+				etime,
+				isspecial,
+				date,
+				type:type,
+				sourceArea:sourceArea,
+				key:key,
+				timetype:timetype,
+				handling:handling,
+				source:source,
+				dptype:dptype
+			};
+	$.cookie("old_params", JSON.stringify(param))
+	initTable(param);
+	
+}
+
+function initTable(parm) {
+	
+	var tel = $('#orderTel').val();
+	var orderKey = $('#orderKey').val();
+	var orderId = $('#orderId').val();
+	var isresult = $('#isresult').val();
+	
+	if (!parm) parm = JSON.parse($.cookie("old_params"))
+	if (!parm.key) parm.key = orderKey;
+	if (!parm.workid) parm.workid = orderId;
+	parm.tel = tel;
+	parm.isresult = isresult || '1';
+	
 	//先销毁表格
 	$('#workList').bootstrapTable('destroy');
 	//初始化表格,动态从服务器加载数据
@@ -34,29 +80,10 @@ function workTable(KeyId,deptid,sourceId,PhoneType,keyword ,type,sourceArea,key,
 		//设置为limit可以获取limit, offset, search, sort, order
 		queryParamsType: "undefined",
 		queryParams: function queryParams(params) { //设置查询参数
-			var param = {
-				token: $.cookie("token"),
-				page: params.pageNumber,
-				pagesize: params.pageSize,
-				Township,
-				KeyId: KeyId,
-				deptid:deptid,
-				sourceId:sourceId,
-				PhoneType :PhoneType ,
-				keyword:keyword,
-				workid: strworkid,
-				stime,
-				etime,
-				date,
-				type:type,
-				sourceArea:sourceArea,
-				key:key,
-				timetype:timetype,
-				handling:handling,
-				source:source,
-				dptype:dptype
-			};
-			return param;
+			parm.token = $.cookie("token");
+			parm.page = params.pageNumber;
+			parm.pagesize= params.pageSize;
+			return parm;
 		},
 		responseHandler: function(res) {
 			//格式化数据
@@ -74,6 +101,7 @@ function workTable(KeyId,deptid,sourceId,PhoneType,keyword ,type,sourceArea,key,
 }
 
 
+
 function examineList(deptid, tab, date) {
 	$('.bulletFrameT').show();
 	$('.workList').show();
@@ -386,14 +414,27 @@ function getClick() {
 		callBack: function(res) {
 			let str = '';
 			res.data.forEach(function(v, n) {
-				str +=
+				if (v.F_Message.indexOf('市民短信评议')>=0 || v.F_Message.indexOf('市民微信评议')>=0 || v.F_Message.indexOf('市民网站评议')>=0) {
+					str +=
+					"<li class='work'><input class='radio' id='work5' name='works' type='radio' checked><div class='relative'>" +
+					"<span class='date'>" + v.F_CreateTime +
+					"</span><span class='circle'></span></div><div class='content'><p onclick=\"messageClick(this, '"+v
+					.F_Message+"')\">市民已评议</p></div></li>"
+				} else {
+					str +=
 					"<li class='work'><input class='radio' id='work5' name='works' type='radio' checked><div class='relative'>" +
 					"<span class='date'>" + v.F_CreateTime +
 					"</span><span class='circle'></span></div><div class='content'><p>" + v
 					.F_Message+ "</p></div></li>"
+				}
+				
 
 			})
 			$('#timeline').html(str);
 		}
 	});
 }
+
+function messageClick(that, mssage) {
+	$(that).html(mssage)
+}

WebUI/CallCenterWeb.UI/TelCall/callFile.html

@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="UTF-8" />
+    <script src="../Script/Common/huayi.load.js"></script>
+    <script src="../Script/Common/huayi.config.js"></script>
+    <link href="../css/layer/need/layer.css" rel="stylesheet" />
+    <link href="../css/init.css" rel="stylesheet" />
+    <title>录音</title>
+</head>
+
+<body>
+    <div class="Common">
+        <table>
+            <tr>
+                <th style="width: 85px;text-align: left;" class="titleText">密码：</th>
+                <td>
+                	<span class="phoneNumber" style="display: none;"></span>
+                	<div style="display: inline-block;" class="passwordSearch">
+                		<input type="number" id="password" value="" autocomplete="off" />
+                		<button onclick="getPhone()">查询</button>
+                	</div>
+                </td>
+            </tr>
+        </table>
+    </div>
+    <script src="../css/laydate/laydate.js"></script>
+    <script src="../js/adjustHeight.js"></script>
+    <script>
+        var phoneNumber = decodeURIComponent(helper.request.queryString("phoneNumber"));
+        var callid = helper.request.queryString("callid")
+       
+        function getPhone() {
+        	if (!$("#password").val()) {
+        		layer.msg('请输入密码')
+        		return
+        	}
+        	$.ajax({
+        		type: "get",
+        		url: huayi.config.callcenter_url + "Callrecords/GetCallFilePath", //获取数据的Servlet地址,
+        		async: true,
+        		dataType: "json",
+        		data: {
+        			CallRecordsId: callid,
+        			password: $("#password").val(),
+        			token: $.cookie("token")
+        		},
+        		success: function(res) {
+        			if (res.state.toLowerCase() === "success") {
+//      				$(".passwordSearch").hide()
+//      				$(".phoneNumber").show()
+						console.log(res.data)
+						
+						helper.luyin.view(null, res.data)
+        			}
+        		}
+        	});
+        }
+    </script>
+</body>
+
+</html>

WebUI/CallCenterWeb.UI/WXchat/html/addWorkOrder.html

@@ -251,6 +251,10 @@
 							<input type="radio"  name="phoneType" value="90" />
 							<label>其他</label>
 						</div>
+						<div class="mui-radio mui-left radio_box">
+							<input type="radio"  name="phoneType" value="4241" />
+							<label>大气污染防治有奖举报</label>
+						</div>
 					</div>
 					<div class="mui-input-row phone">
 						<label>姓名</label>