Browse Source

关闭来电弹屏置闲,双汇app办事出筛选,用户头像默认显示

miaofuhao 5 years ago
parent
commit
44b54ad8b7

+ 1 - 1
CallCenterWeb.UI/js/contabs.min.js

126
 		if(k) {
126
 		if(k) {
127
 			if(o == './TelCall/SeatMonitor.html' || o.substring(0,28) == './callScreen/callScreen.html') {
127
 			if(o == './TelCall/SeatMonitor.html' || o.substring(0,28) == './callScreen/callScreen.html') {
128
 				console.log(o)
128
 				console.log(o)
129
-				var p = '<a href="javascript:;" class="active J_menuTab" data-id="' + o + '">' + l + ' <i class="fa fa-times-circle"></i></a>';
129
+				var p = '<a href="javascript:;" class="active J_menuTab" data-id="' + o + '">' + l + ' <i class="fa fa-times-circle close_call"></i></a>';
130
 				$(".J_menuTab").removeClass("active");
130
 				$(".J_menuTab").removeClass("active");
131
 				var n = '<iframe class="J_iframe J_iframeNew" name="iframe' + m + '" width="100%" height="100%" src="' + o + '" frameborder="0" data-id="' + o + '" seamless></iframe>';
131
 				var n = '<iframe class="J_iframe J_iframeNew" name="iframe' + m + '" width="100%" height="100%" src="' + o + '" frameborder="0" data-id="' + o + '" seamless></iframe>';
132
 				$(".J_mainContent").find("iframe.J_iframe").hide().parents(".J_mainContent").append(n);
132
 				$(".J_mainContent").find("iframe.J_iframe").hide().parents(".J_mainContent").append(n);

+ 12 - 0
CallCenterWeb.UI/js/index.js

87
 		$(".WH").removeClass("fadeInDown").addClass("fadeOutUp");
87
 		$(".WH").removeClass("fadeInDown").addClass("fadeOutUp");
88
 		$(".WH").addClass("hidens");
88
 		$(".WH").addClass("hidens");
89
 	})
89
 	})
90
+	
91
+	$(".J_menuTabs").on("click",".close_call", function(){
92
+		alert("!")
93
+		$(".SayBusy").addClass("active");
94
+        $(".SayFree").removeClass("active");
95
+        $(".zxzt").removeClass("br").removeClass("by").addClass("bl");
96
+        $(".hwzt").text('空闲');
97
+        $("#isml").val(0);
98
+      	obj.Type = "SayFree";
99
+		Send();
100
+	})
101
+
90
 	//键盘事件外呼
102
 	//键盘事件外呼
91
 	document.onkeydown = function(e) {
103
 	document.onkeydown = function(e) {
92
 		var theEvent = window.event || e;
104
 		var theEvent = window.event || e;

+ 4 - 4
CallCenterWeb.UI/js/main.js

248
 //来电
248
 //来电
249
 function IncomingBack(data) {
249
 function IncomingBack(data) {
250
 	if(data.CallID!=0){
250
 	if(data.CallID!=0){
251
-		var p = '<a href="javascript:;" class="active J_menuTab" data-id="./callScreen/callScreen.html?tel=' + data.Number + '&CallID=' + data.CallID + '">来电弹屏' + data.Number + ' <i class="fa fa-times-circle"></i></a>';
251
+		var p = '<a href="javascript:;" class="active J_menuTab" data-id="./callScreen/callScreen.html?tel=' + data.Number + '&CallID=' + data.CallID + '">来电弹屏' + data.Number + ' <i class="fa fa-times-circle close_call"></i></a>';
252
 		$(".J_menuTab").removeClass("active");
252
 		$(".J_menuTab").removeClass("active");
253
 		var nif = '<iframe class="J_iframe J_iframeNew" name="iframe'+ data.CallID  +'"  width="100%" height="100%" src="./callScreen/callScreen.html?Number=' + data.Number + '&CallID=' + data.CallID + '&ActionID=' + data.ActionID + '" frameborder="0" data-id="./callScreen/callScreen.html?tel=' + data.Number + '&CallID=' + data.CallID + '" seamless></iframe>';
253
 		var nif = '<iframe class="J_iframe J_iframeNew" name="iframe'+ data.CallID  +'"  width="100%" height="100%" src="./callScreen/callScreen.html?Number=' + data.Number + '&CallID=' + data.CallID + '&ActionID=' + data.ActionID + '" frameborder="0" data-id="./callScreen/callScreen.html?tel=' + data.Number + '&CallID=' + data.CallID + '" seamless></iframe>';
254
 		$(".J_mainContent").find("iframe.J_iframe").hide().parents(".J_mainContent").append(nif);
254
 		$(".J_mainContent").find("iframe.J_iframe").hide().parents(".J_mainContent").append(nif);
258
 		hidActionID=data.ActionID;
258
 		hidActionID=data.ActionID;
259
 	}else{
259
 	}else{
260
 		var timestamp = Date.parse(new Date());
260
 		var timestamp = Date.parse(new Date());
261
-		var p = '<a href="javascript:;" class="active J_menuTab" data-id="./callScreen/callScreen.html?tel=' + data.Number + '&CallID='+timestamp+'">来电弹屏' + data.Number + ' <i class="fa fa-times-circle"></i></a>';
261
+		var p = '<a href="javascript:;" class="active J_menuTab" data-id="./callScreen/callScreen.html?tel=' + data.Number + '&CallID='+timestamp+'">来电弹屏' + data.Number + ' <i class="fa fa-times-circle close_call"></i></a>';
262
 		$(".J_menuTab").removeClass("active");
262
 		$(".J_menuTab").removeClass("active");
263
 		var nif = '<iframe class="J_iframe J_iframeNew" name="iframe'+timestamp+'"  width="100%" height="100%" src="./callScreen/callScreen.html?Number=' + data.Number + '&CallID='+timestamp+'" frameborder="0" data-id="./callScreen/callScreen.html?tel=' + data.Number + '&CallID='+timestamp+'" seamless></iframe>';
263
 		var nif = '<iframe class="J_iframe J_iframeNew" name="iframe'+timestamp+'"  width="100%" height="100%" src="./callScreen/callScreen.html?Number=' + data.Number + '&CallID='+timestamp+'" frameborder="0" data-id="./callScreen/callScreen.html?tel=' + data.Number + '&CallID='+timestamp+'" seamless></iframe>';
264
 		$(".J_mainContent").find("iframe.J_iframe").hide().parents(".J_mainContent").append(nif);
264
 		$(".J_mainContent").find("iframe.J_iframe").hide().parents(".J_mainContent").append(nif);
418
 	
418
 	
419
 	//外呼弹屏
419
 	//外呼弹屏
420
 	if(data.CallID!=0){
420
 	if(data.CallID!=0){
421
-		var p = '<a href="javascript:;" class="active J_menuTab" data-id="./callScreen/callScreen.html?tel=' + makeCallPhone + '&CallID=' + makeCallId + '">外呼弹屏' + makeCallPhone + ' <i class="fa fa-times-circle"></i></a>';
421
+		var p = '<a href="javascript:;" class="active J_menuTab" data-id="./callScreen/callScreen.html?tel=' + makeCallPhone + '&CallID=' + makeCallId + '">外呼弹屏' + makeCallPhone + ' <i class="fa fa-times-circle close_call"></i></a>';
422
 		$(".J_menuTab").removeClass("active");
422
 		$(".J_menuTab").removeClass("active");
423
 		var nif = '<iframe class="J_iframe J_iframeNew" name="iframe'+ makeCallId  +'"  width="100%" height="100%" src="./callScreen/callScreen.html?Number=' + makeCallPhone + '&CallID=' + makeCallId + '&ActionID=' + data.ActionID + '" frameborder="0" data-id="./callScreen/callScreen.html?tel=' + makeCallPhone + '&CallID=' + makeCallId + '" seamless></iframe>';
423
 		var nif = '<iframe class="J_iframe J_iframeNew" name="iframe'+ makeCallId  +'"  width="100%" height="100%" src="./callScreen/callScreen.html?Number=' + makeCallPhone + '&CallID=' + makeCallId + '&ActionID=' + data.ActionID + '" frameborder="0" data-id="./callScreen/callScreen.html?tel=' + makeCallPhone + '&CallID=' + makeCallId + '" seamless></iframe>';
424
 		$(".J_mainContent").find("iframe.J_iframe").hide().parents(".J_mainContent").append(nif);
424
 		$(".J_mainContent").find("iframe.J_iframe").hide().parents(".J_mainContent").append(nif);
428
 		hidActionID=data.ActionID;
428
 		hidActionID=data.ActionID;
429
 	}else{
429
 	}else{
430
 		var timestamp = Date.parse(new Date());
430
 		var timestamp = Date.parse(new Date());
431
-		var p = '<a href="javascript:;" class="active J_menuTab" data-id="./callScreen/callScreen.html?tel=' + makeCallPhone + '&CallID='+timestamp+'">外呼弹屏' + makeCallPhone + ' <i class="fa fa-times-circle"></i></a>';
431
+		var p = '<a href="javascript:;" class="active J_menuTab" data-id="./callScreen/callScreen.html?tel=' + makeCallPhone + '&CallID='+timestamp+'">外呼弹屏' + makeCallPhone + ' <i class="fa fa-times-circle close_call"></i></a>';
432
 		$(".J_menuTab").removeClass("active");
432
 		$(".J_menuTab").removeClass("active");
433
 		var nif = '<iframe class="J_iframe J_iframeNew" name="iframe'+timestamp+'"  width="100%" height="100%" src="./callScreen/callScreen.html?Number=' + makeCallPhone + '&CallID='+timestamp+'" frameborder="0" data-id="./callScreen/callScreen.html?tel=' + makeCallPhone + '&CallID='+timestamp+'" seamless></iframe>';
433
 		var nif = '<iframe class="J_iframe J_iframeNew" name="iframe'+timestamp+'"  width="100%" height="100%" src="./callScreen/callScreen.html?Number=' + makeCallPhone + '&CallID='+timestamp+'" frameborder="0" data-id="./callScreen/callScreen.html?tel=' + makeCallPhone + '&CallID='+timestamp+'" seamless></iframe>';
434
 		$(".J_mainContent").find("iframe.J_iframe").hide().parents(".J_mainContent").append(nif);
434
 		$(".J_mainContent").find("iframe.J_iframe").hide().parents(".J_mainContent").append(nif);

+ 1 - 1
双汇APP-andriod/Common/js/portrait.js

32
 			}
32
 			}
33
 			$(".rolname").val(data.data.user.F_UserCode);
33
 			$(".rolname").val(data.data.user.F_UserCode);
34
 			$(".password").val(data.data.user.F_Password);
34
 			$(".password").val(data.data.user.F_Password);
35
-			if(!data.data.FileUrl[0].F_Url) {
35
+			if(!data.data.FileUrl[0]) {
36
 				$(".feedback .image-item").css("background-image", "url(../img/3.png)")
36
 				$(".feedback .image-item").css("background-image", "url(../img/3.png)")
37
 			} else {
37
 			} else {
38
 				$(".feedback .image-item").css("background-image", "url(" + data.data.FileUrl[0].F_Url + ")")
38
 				$(".feedback .image-item").css("background-image", "url(" + data.data.FileUrl[0].F_Url + ")")

+ 1 - 10
双汇APP-andriod/js/personal.js

185
 		}
185
 		}
186
 	});
186
 	});
187
 })
187
 })
188
-//常见问题
189
-//document.getElementById('Report').addEventListener('tap', function() {
190
-//	var nwaiting = plus.nativeUI.showWaiting();
191
-//	webviewShow = plus.webview.create("Work-Add.html"); //后台创建webview并打开show.html  
192
-//	webviewShow.addEventListener("loaded", function() { //注册新webview的载入完成事件  
193
-//		nwaiting.close(); //新webview的载入完毕后关闭等待框  
194
-//		webviewShow.show("slide-in-right", 300); //把新webview窗体显示出来,显示动画效果为速度300毫秒的右侧移入动画
195
-//	}, false);
196
-//
197
-//});
188
+

+ 5 - 4
双汇APP-andriod/workOrder/js/Work-list.js

124
 								'<span class="areaOffice">大区办事处:'+data.rows[i].F_AreaName +"-"+data.rows[i].F_OfficName+'</span>' +
124
 								'<span class="areaOffice">大区办事处:'+data.rows[i].F_AreaName +"-"+data.rows[i].F_OfficName+'</span>' +
125
 								' </p>'
125
 								' </p>'
126
 							}
126
 							}
127
-							$('<li class="mui-table-view-cell">' +
127
+							$('<li class="mui-table-view-cell orderLi">' +
128
 								'<div class="mui-table order" data-index="' + data.rows[i].F_Id + '">' +
128
 								'<div class="mui-table order" data-index="' + data.rows[i].F_Id + '">' +
129
 								'<div class="mui-table-cell mui-col-xs-12">' +
129
 								'<div class="mui-table-cell mui-col-xs-12">' +
130
 								'<h5 class="mui-ellipsis new_title" >' + data.rows[i].F_QualityProblem + '</h5>' +
130
 								'<h5 class="mui-ellipsis new_title" >' + data.rows[i].F_QualityProblem + '</h5>' +
189
 
189
 
190
 		function Ajax() {
190
 		function Ajax() {
191
 			$(".orderLi").remove();
191
 			$(".orderLi").remove();
192
+			page=1;
193
+			pageSize=10;
192
 			mui.ajax(huayi.config.callcenter_url + 'WorkorderApp/GetList', {
194
 			mui.ajax(huayi.config.callcenter_url + 'WorkorderApp/GetList', {
193
 				data: {
195
 				data: {
194
 					token: token,
196
 					token: token,
197
 					extensionphone: 1,
199
 					extensionphone: 1,
198
 					keywords:keyw,
200
 					keywords:keyw,
199
 					offce:$("#DWResult").attr("data-index"),
201
 					offce:$("#DWResult").attr("data-index"),
200
-					pageindex: page,
201
-					pagesize: pageSize
202
+					pageindex: 1,
203
+					pagesize: 10
202
 				},
204
 				},
203
 				dataType: 'json', //服务器返回json格式数据
205
 				dataType: 'json', //服务器返回json格式数据
204
 				type: 'get', //HTTP请求类型
206
 				type: 'get', //HTTP请求类型
212
 						total = 0;
214
 						total = 0;
213
 						$(".noWork").show();
215
 						$(".noWork").show();
214
 					}
216
 					}
215
-					
216
 					var imgnum;
217
 					var imgnum;
217
 					$(".class-icon img").hide()
218
 					$(".class-icon img").hide()
218
 					$(".Totle").text('(' + total + ')');
219
 					$(".Totle").text('(' + total + ')');

+ 1 - 1
双汇APP/Common/js/portrait.js

32
 			}
32
 			}
33
 			$(".rolname").val(data.data.user.F_UserCode);
33
 			$(".rolname").val(data.data.user.F_UserCode);
34
 			$(".password").val(data.data.user.F_Password);
34
 			$(".password").val(data.data.user.F_Password);
35
-			if(!data.data.FileUrl[0].F_Url) {
35
+			if(!data.data.FileUrl[0]) {
36
 				$(".feedback .image-item").css("background-image", "url(../img/3.png)")
36
 				$(".feedback .image-item").css("background-image", "url(../img/3.png)")
37
 			} else {
37
 			} else {
38
 				$(".feedback .image-item").css("background-image", "url(" + data.data.FileUrl[0].F_Url + ")")
38
 				$(".feedback .image-item").css("background-image", "url(" + data.data.FileUrl[0].F_Url + ")")

+ 9 - 7
双汇APP/workOrder/js/Work-list.js

106
 						for(var i = 0; i < data.rows.length; i++) {
106
 						for(var i = 0; i < data.rows.length; i++) {
107
 							var a = data.rows[i].F_Content;
107
 							var a = data.rows[i].F_Content;
108
 							var c = data.rows[i].F_WorkState;
108
 							var c = data.rows[i].F_WorkState;
109
-							var time = data.rows[i].F_CreateTime.substring(0, data.rows[i].F_CreateTime.indexOf(' '));
109
+							var time = data.rows[i].F_CreateTime;
110
 							if(data.rows[i].F_DealTimely == "Ⅰ级") {
110
 							if(data.rows[i].F_DealTimely == "Ⅰ级") {
111
 								imgnum = '<img src="../img/class-img1.png"/>';
111
 								imgnum = '<img src="../img/class-img1.png"/>';
112
 							} else if(data.rows[i].F_DealTimely == "Ⅱ级") {
112
 							} else if(data.rows[i].F_DealTimely == "Ⅱ级") {
124
 								'<span class="areaOffice">大区办事处:'+data.rows[i].F_AreaName +"-"+data.rows[i].F_OfficName+'</span>' +
124
 								'<span class="areaOffice">大区办事处:'+data.rows[i].F_AreaName +"-"+data.rows[i].F_OfficName+'</span>' +
125
 								' </p>'
125
 								' </p>'
126
 							}
126
 							}
127
-							$('<li class="mui-table-view-cell">' +
127
+							$('<li class="mui-table-view-cell orderLi">' +
128
 								'<div class="mui-table order" data-index="' + data.rows[i].F_Id + '">' +
128
 								'<div class="mui-table order" data-index="' + data.rows[i].F_Id + '">' +
129
 								'<div class="mui-table-cell mui-col-xs-12">' +
129
 								'<div class="mui-table-cell mui-col-xs-12">' +
130
 								'<h5 class="mui-ellipsis new_title" >' + data.rows[i].F_QualityProblem + '</h5>' +
130
 								'<h5 class="mui-ellipsis new_title" >' + data.rows[i].F_QualityProblem + '</h5>' +
148
 								$(".class-icon img").eq(1).show()
148
 								$(".class-icon img").eq(1).show()
149
 							} else if(data.rows[i].F_DealTimely = "普通工单") {
149
 							} else if(data.rows[i].F_DealTimely = "普通工单") {
150
 								$(".class-icon img").eq(2).show()
150
 								$(".class-icon img").eq(2).show()
151
-							} else if(index == 10) {
152
-								$(".mui-btn-submit").hide();
153
 							}
151
 							}
154
 							if(index == 0 || index == 6) {
152
 							if(index == 0 || index == 6) {
155
 								//待提交
153
 								//待提交
160
 							} else if(index == 3 || index == 4) {
158
 							} else if(index == 3 || index == 4) {
161
 								//待处理
159
 								//待处理
162
 								$(".mui-btn-submit").text("处理")
160
 								$(".mui-btn-submit").text("处理")
161
+							}else if(index == 10) {
162
+								$(".mui-btn-submit").hide();
163
 							}
163
 							}
164
 						}
164
 						}
165
 						
165
 						
189
 
189
 
190
 		function Ajax() {
190
 		function Ajax() {
191
 			$(".orderLi").remove();
191
 			$(".orderLi").remove();
192
+			page=1;
193
+			pageSize=10;
192
 			mui.ajax(huayi.config.callcenter_url + 'WorkorderApp/GetList', {
194
 			mui.ajax(huayi.config.callcenter_url + 'WorkorderApp/GetList', {
193
 				data: {
195
 				data: {
194
 					token: token,
196
 					token: token,
197
 					extensionphone: 1,
199
 					extensionphone: 1,
198
 					keywords:keyw,
200
 					keywords:keyw,
199
 					offce:$("#DWResult").attr("data-index"),
201
 					offce:$("#DWResult").attr("data-index"),
200
-					pageindex: page,
201
-					pagesize: pageSize
202
+					pageindex: 1,
203
+					pagesize: 10
202
 				},
204
 				},
203
 				dataType: 'json', //服务器返回json格式数据
205
 				dataType: 'json', //服务器返回json格式数据
204
 				type: 'get', //HTTP请求类型
206
 				type: 'get', //HTTP请求类型
218
 					for(var i = 0; i < data.rows.length; i++) {
220
 					for(var i = 0; i < data.rows.length; i++) {
219
 						var a = data.rows[i].F_Content;
221
 						var a = data.rows[i].F_Content;
220
 						var c = data.rows[i].F_WorkState;
222
 						var c = data.rows[i].F_WorkState;
221
-						var time = data.rows[i].F_CreateTime.substring(0, data.rows[i].F_CreateTime.indexOf(' '));
223
+						var time = data.rows[i].F_CreateTime;
222
 						var areaOffice;
224
 						var areaOffice;
223
 						if (!data.rows[i].F_AreaName) {
225
 						if (!data.rows[i].F_AreaName) {
224
 							areaOffice='';
226
 							areaOffice='';