代码提交

WebChartNewest/.project

@@ -33,5 +33,14 @@
 				<arguments>1.0-name-matches-false-false-node_modules</arguments>
 			</matcher>
 		</filter>
+		<filter>
+			<id>1717119618465</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//报表刷新时间

WebUI/CallCenterWeb.UI/CommonHtml/AddAppeal.html

@@ -234,17 +234,16 @@
 							<th>办理时限：</th>
 							<td>
 								<select class="startTime form-control" id="startTime" style="width: 200px; height: 30px; line-height: 30px;">
-									<!--<option value="1">一个工作日</option>
-									<option value="2" class="shengpt" style="display: none;">两个工作日</option>
+									<option value="1">一个工作日</option>
 									<option value="3">三个工作日</option>
-									<option value="4" class="shengpt" style="display: none;">四个工作日</option>
+									<option value="4">四个工作日</option>
 									<option value="5">五个工作日</option>
-									<option value="7" class="noshengpt">七个工作日</option>-->
-									<option value="1">一个工作日</option>
+									<option value="10">十个工作日</option>
+									<!--<option value="1">一个工作日</option>
 									<option value="2">两个工作日</option>
 									<option value="3">三个工作日</option>
 									<option value="4">四个工作日</option>
-									<option value="5">五个工作日</option>								
+									<option value="5">五个工作日</option>								-->
 								</select>
 							</td>
 							<td class="isSPT" style="display: none;">

WebUI/CallCenterWeb.UI/CommonHtml/Timesq.html

@@ -16,10 +16,12 @@
                     <td>
                         <select class="startTime" id="startTime" style="width: 150px; height: 30px; line-height: 30px;">
 	                        <!--<option value="0">选择</option>-->
-	                        <option value="1">一天</option>
-	                        <option value="3">三天</option>
-	                        <option value="5" selected="true">五天</option>
-	                        <!-- <option value="7">七天</option> -->
+	                        <option value="1">一个工作日</option>
+							<option value="3">三个工作日</option>
+							<option value="4">四个工作日</option>
+							<option value="5" selected="true">五个工作日</option>
+							<option value="10">十个工作日</option>
+	                        
 	                    </select>
                     </td>
                 </tr>

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

@@ -3,18 +3,42 @@
 }
 //var AYWebUrl = window.document.location.href
 huayi.config = {
-//	callcenter_url: "http://192.168.8.9:1042/",// 生产环境
-	callcenter_url: "http://docking.zwfw.anyang.gov.cn:65527/", // 生产环境 
-    socket_ip: "192.168.8.7", //ip
-//	translation_socket:"ws://125.45.12.102:12233",
-	translation_socket:"ws://192.168.8.7:8081",
-	videoSocket_url: "wss://12345rx.zwfw.anyang.gov.cn:65512", //docking.zwfw.anyang.gov.cn 
-//  socket_ip: "125.45.12.123", //ip
-    socket_port: "8081", //端口
-	sip_ip:"12345sp.zwfw.anyang.gov.cn",
-	sip_password_:"1234", 
-	ws_uri_:"wss://12345sp2.zwfw.anyang.gov.cn:7443",
-	contact_uri:"@12345sp2.zwfw.anyang.gov.cn;transport=wss",  //
+	callcenter_url: "http://39.164.159.226:1042/",// 生产环境	39.164.159.226
+	//	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",
+	//	translation_socket:"ws://192.168.8.7:8081",
+	
+	
+//	videoSocket_url: "wss://12345rx.zwfw.anyang.gov.cn:65512", //docking.zwfw.anyang.gov.cn 
+//	sip_ip:"12345sp.zwfw.anyang.gov.cn",
+//	sip_password_:"1234", 
+//	ws_uri_:"wss://12345sp2.zwfw.anyang.gov.cn:7443",
+
+//	contact_uri:"@12345sp2.zwfw.anyang.gov.cn;transport=wss",  //
+//	socket_ip: "192.168.1.10",
+//	socket_port: "9002",
+//	ws_uri_: "ws://192.168.1.10:5066", //端口  
+
+//	videoSocket_url: "ws://192.168.1.10:9002", //docking.zwfw.anyang.gov.cn 
+//	sip_ip:"192.168.1.10",
+//	sip_password_:"1016", 
+//	ws_uri_:"ws://192.168.1.10:5066",
+//	contact_uri:"@192.168.1.10;transport=ws",
+
+//	videoSocket_url: "ws://192.168.1.10:9002", //docking.zwfw.anyang.gov.cn 
+//	sip_ip:"12345sp1.jbdu.cn",
+//	sip_password_:"123456", 
+//	ws_uri_:"wss://12345sp1.jbdu.cn:7443",
+//	contact_uri:"@12345sp1.jbdu.cn;transport=wss",
+
+	videoSocket_url: "ws://192.168.1.9:9002", //docking.zwfw.anyang.gov.cn 
+	sip_ip:"192.168.1.9",
+	sip_password_:"123456", 
+	ws_uri_:"ws://192.168.1.9:5066",
+	contact_uri:"@192.168.1.9;transport=ws",
+	
     menuworktime: 30000, //菜单工单数量刷新间隔
     indextime: 60000*30, //首页报表刷新间隔
     arr: [
@@ -104,7 +128,10 @@ huayi.config = {
 };
 //if(window.document.location.href.indexOf("https")!==-1){   
 //	huayi.config.callcenter_url = "https://docking.zwfw.anyang.gov.cn/"
+//	huayi.config.socket_ip = "wss://12345sp.zwfw.anyang.gov.cn:8082"
+
 //} else if(window.document.location.href.indexOf("http")!==-1){
 //	huayi.config.callcenter_url = "http://docking.zwfw.anyang.gov.cn:65527/"
+//	huayi.config.socket_ip = "ws://61.54.2.122:8081"
 //}
 //console.log(huayi.config.callcenter_url)

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

@@ -2,8 +2,8 @@
     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/" ,// 测试环境
 
     //callcenter_url: "http://117.158.196.116:4010/"// 测试环境
 	//	callcenter_url: "http://docking.zwfw.anyang.gov.cn:9998/" // 生产环境

WebUI/CallCenterWeb.UI/calloutNew-2.1/js/pcSip备份.js

@@ -98,7 +98,9 @@ function closeMediaVideo() {
 function testStart() {
 
 	sip_uri_ = "sip:" + selectExten + "@"+huayi.config.sip_ip; // 12345sp.zwfw.anyang.gov.cn
-	sip_password_ = huayi.config.sip_password_; //zhumadian12345800100
+//	sip_password_ = huayi.config.sip_password_; //zhumadian12345800100
+//	sip_password_ = 1012; //zhumadian12345800100
+	sip_password_ = "123456"; //zhumadian12345800100
 	ws_uri_ = huayi.config.ws_uri_
 	
 	console.info("get input info: sip_uri = ", sip_uri_, " sip_password = ", sip_password_, " ws_uri = ", ws_uri_);
@@ -298,7 +300,7 @@ function sipCallVideo() {
 			'eventHandlers': eventHandlers,
 			'mediaConstraints': {
 				'audio': true,
-				'video': true
+				'video': false
 
 			},
 			'mediaStream': localStream

WebUI/CallCenterWeb.UI/calloutNew-2.1/videoCall.html

@@ -72,7 +72,7 @@
 		<script>
 			var selectExten
 			$(document).ready(function() {
-				selectExten =1016
+				selectExten =1012
 				testStart(selectExten); //初始化
 			})
 		</script>

WebUI/CallCenterWeb.UI/calloutNew-2.1/weChatVideo/js/huayi.config.js

@@ -9,8 +9,15 @@ huayi.config = {
 	//	socket_ip: "12345sp.jbdu.cn",
 	//	socket_port: "8082",
 	//	ws_uri_: "wss://12345sp1.jbdu.cn:7443", //端口   
-	socket_url: "wss://12345rx.zwfw.anyang.gov.cn:8082",
-	ws_uri_: "wss://12345sp.zwfw.anyang.gov.cn:7443", //端口  
-	contact_uri:"@12345sp.zwfw.anyang.gov.cn;transport=wss",  //
+//	socket_url: "wss://12345rx.zwfw.anyang.gov.cn:8082",
+//	ws_uri_: "wss://12345sp.zwfw.anyang.gov.cn:7443", //端口  
+//	contact_uri:"@12345sp.zwfw.anyang.gov.cn;transport=wss",  //
+	
+	socket_url: "ws://192.168.1.10:9002",
+	ws_uri_: "ws://192.168.1.10:5066", //端口   9002
+	contact_uri:"@1192.168.1.10;transport=ws",  //
+	socket_ip: "192.168.1.10",
+//	socket_port: "9002",
+//	ws_uri_: "ws://192.168.1.10:5066", //端口  
 	
 };

WebUI/CallCenterWeb.UI/calloutNew-2.1/weChatVideo/js/main.js

@@ -106,6 +106,8 @@
 					},5000)
  					
  					
+ 				} else if( data.Type.toLowerCase() ==='videoreqexten'){
+ 					videoreqextenBack(data);
  				}
 				if(data.Type === "VideoReqBindAgent"){
 					$(".registStatus").text("绑定失败")
@@ -174,7 +176,7 @@
  		extenNum = data.AgentExten
  		$("#account").val(extenNum)
  		sip_uri_ = "sip:" + extenNum + "@" + huayi.config.socket_ip;
- 		sip_password_ = "123456";
+ 		sip_password_ = extenNum;
  		ws_uri_ = huayi.config.ws_uri_; //wss://sip.800100.com.cn:7443  218.29.229.185:8011
  		contact_uri =  huayi.config.contact_uri
  		testStart();

WebUI/CallCenterWeb.UI/calloutNew/weChatVideo/js/huayi.config.js

@@ -10,11 +10,18 @@ huayi.config = {
 	//	socket_port: "8082",
 	//	ws_uri_: "wss://12345sp1.jbdu.cn:7443", //端口   
 	callcenter_url: "https://docking.zwfw.anyang.gov.cn/", //生产环境
-	socket_ip: "12345sp.zwfw.anyang.gov.cn",
+	
 //	socket_url: "wss://12345rx.zwfw.anyang.gov.cn:8082", 65529 
-	socket_url: "wss://12345rx.zwfw.anyang.gov.cn:65512",
+//	socket_ip: "12345sp.zwfw.anyang.gov.cn",
+//	socket_url: "wss://12345rx.zwfw.anyang.gov.cn:65512",
+//	sip_password_:'1234',
+//	ws_uri_: "wss://12345sp2.zwfw.anyang.gov.cn:7443", //端口  
+//	contact_uri:"@12345sp2.zwfw.anyang.gov.cn;transport=wss",  //
+	
+	socket_ip: "192.168.1.10",
+	socket_url: "ws://192.168.1.10:9002",
 	sip_password_:'1234',
-	ws_uri_: "wss://12345sp2.zwfw.anyang.gov.cn:7443", //端口  
-	contact_uri:"@12345sp2.zwfw.anyang.gov.cn;transport=wss",  //
+	ws_uri_: "ws://192.168.1.10:5066", //端口  
+	contact_uri:"@192.168.1.10;transport=ws",  //
 	
 };

WebUI/CallCenterWeb.UI/calloutNew/weChatVideo/js/main.js

@@ -106,6 +106,8 @@
 					},5000)
  					
  					
+ 				} else if( data.Type.toLowerCase() ==='videoreqexten'){
+ 					videoreqextenBack(data);
  				}
 				if(data.Type === "VideoReqBindAgent"){
 					$(".registStatus").text("绑定失败")
@@ -174,7 +176,8 @@
  		extenNum = data.AgentExten
  		$("#account").val(extenNum)
  		sip_uri_ = "sip:" + extenNum + "@" + huayi.config.socket_ip;
- 		sip_password_ = huayi.config.sip_password_;
+// 		sip_password_ = huayi.config.sip_password_;
+ 		sip_password_ = extenNum;
  		ws_uri_ = huayi.config.ws_uri_; //wss://sip.800100.com.cn:7443  218.29.229.185:8011
  		contact_uri =  huayi.config.contact_uri
  		testStart();

WebUI/CallCenterWeb.UI/js/index.js

@@ -263,19 +263,19 @@ $(document).ready(function() {
 				if(result.data.user.F_SeatFlag) {
 					Connect();
 					if($.cookie("code") == "spdbzy") {
-						//layer.open({
-							//type: 2,
-							//content: "./calloutNew/videoCall.html", //iframe的url，no代表不显示滚动条
-							//title: "视频通话窗口",
-							//shade: 0,
-							//offset: "rb",
-							//area: ["22%", "65%"], //宽高
-						//});
+						layer.open({
+							type: 2,
+							content: "./calloutNew/videoCall.html", //iframe的url，no代表不显示滚动条
+							title: "视频通话窗口",
+							shade: 0,
+							offset: "rb",
+							area: ["22%", "65%"], //宽高
+						});
 					}else{
-//						connectVoice(1); //创建连接 
+						connectVoice(1); //创建连接 
 					}
 					if($.cookie("code") != "spdbzy") {
-						connectVoice(1); //创建连接 
+//						connectVoice(1); //创建连接 
 					}
 					//CreateWebSockets();
 					//$(".open_chat").show();
@@ -2619,7 +2619,6 @@ function LB(obj) {
 						"</option>"
 					).appendTo(obj);
 				});
-				console.log($('#hidCallKey').val())
 				if ($('#hidCallKey').val() == '5') {
 					obj.val(4256+'')
 				}

WebUI/CallCenterWeb.UI/js/main.js

@@ -28,7 +28,7 @@ function createWebSocket() {
 function Connect() {
 //	ws = new WebSocket("ws://" + huayi.config.socket_ip + ":" + huayi.config.socket_port);
 	if($.cookie("code")!="spdbzy"){
-		ws = new WebSocket("ws://" + huayi.config.socket_ip + ":" + huayi.config.socket_port);
+		ws = new WebSocket(huayi.config.socket_ip);
 	} else {
 		ws = new WebSocket(huayi.config.videoSocket_url);
 	}