miaofuhao 1 год назад
Родитель
Сommit
faf3631fa4

+ 9 - 0
WebChartNewest/.project

@@ -33,5 +33,14 @@
33 33
 				<arguments>1.0-name-matches-false-false-node_modules</arguments>
34 34
 			</matcher>
35 35
 		</filter>
36
+		<filter>
37
+			<id>1717119618465</id>
38
+			<name></name>
39
+			<type>26</type>
40
+			<matcher>
41
+				<id>org.eclipse.ui.ide.multiFilter</id>
42
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
43
+			</matcher>
44
+		</filter>
36 45
 	</filteredResources>
37 46
 </projectDescription>

+ 2 - 2
WebChartNewest/Script/Common/huayi.config.js

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

+ 5 - 6
WebUI/CallCenterWeb.UI/CommonHtml/AddAppeal.html

@@ -234,17 +234,16 @@
234 234
 							<th>办理时限:</th>
235 235
 							<td>
236 236
 								<select class="startTime form-control" id="startTime" style="width: 200px; height: 30px; line-height: 30px;">
237
-									<!--<option value="1">一个工作日</option>
238
-									<option value="2" class="shengpt" style="display: none;">两个工作日</option>
237
+									<option value="1">一个工作日</option>
239 238
 									<option value="3">三个工作日</option>
240
-									<option value="4" class="shengpt" style="display: none;">四个工作日</option>
239
+									<option value="4">四个工作日</option>
241 240
 									<option value="5">五个工作日</option>
242
-									<option value="7" class="noshengpt">七个工作日</option>-->
243
-									<option value="1">一个工作日</option>
241
+									<option value="10">十个工作日</option>
242
+									<!--<option value="1">一个工作日</option>
244 243
 									<option value="2">两个工作日</option>
245 244
 									<option value="3">三个工作日</option>
246 245
 									<option value="4">四个工作日</option>
247
-									<option value="5">五个工作日</option>								
246
+									<option value="5">五个工作日</option>								-->
248 247
 								</select>
249 248
 							</td>
250 249
 							<td class="isSPT" style="display: none;">

+ 6 - 4
WebUI/CallCenterWeb.UI/CommonHtml/Timesq.html

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

+ 39 - 12
WebUI/CallCenterWeb.UI/Script/Common/huayi.config.js

@@ -3,18 +3,42 @@
3 3
 }
4 4
 //var AYWebUrl = window.document.location.href
5 5
 huayi.config = {
6
-//	callcenter_url: "http://192.168.8.9:1042/",// 生产环境
7
-	callcenter_url: "http://docking.zwfw.anyang.gov.cn:65527/", // 生产环境 
8
-    socket_ip: "192.168.8.7", //ip
9
-//	translation_socket:"ws://125.45.12.102:12233",
10
-	translation_socket:"ws://192.168.8.7:8081",
11
-	videoSocket_url: "wss://12345rx.zwfw.anyang.gov.cn:65512", //docking.zwfw.anyang.gov.cn 
12
-//  socket_ip: "125.45.12.123", //ip
13
-    socket_port: "8081", //端口
14
-	sip_ip:"12345sp.zwfw.anyang.gov.cn",
15
-	sip_password_:"1234", 
16
-	ws_uri_:"wss://12345sp2.zwfw.anyang.gov.cn:7443",
17
-	contact_uri:"@12345sp2.zwfw.anyang.gov.cn;transport=wss",  //
6
+	callcenter_url: "http://39.164.159.226:1042/",// 生产环境	39.164.159.226
7
+	//	callcenter_url: "http://docking.zwfw.anyang.gov.cn:65527/", // 生产环境 
8
+	socket_ip: "ws://39.164.159.226:8081", //ip 
9
+	// socket_ip: "wss://12345sp.zwfw.anyang.gov.cn:8082", //ip 
10
+	//	translation_socket:"ws://125.45.12.102:12233",
11
+	//	translation_socket:"ws://192.168.8.7:8081",
12
+	
13
+	
14
+//	videoSocket_url: "wss://12345rx.zwfw.anyang.gov.cn:65512", //docking.zwfw.anyang.gov.cn 
15
+//	sip_ip:"12345sp.zwfw.anyang.gov.cn",
16
+//	sip_password_:"1234", 
17
+//	ws_uri_:"wss://12345sp2.zwfw.anyang.gov.cn:7443",
18
+
19
+//	contact_uri:"@12345sp2.zwfw.anyang.gov.cn;transport=wss",  //
20
+//	socket_ip: "192.168.1.10",
21
+//	socket_port: "9002",
22
+//	ws_uri_: "ws://192.168.1.10:5066", //端口  
23
+
24
+//	videoSocket_url: "ws://192.168.1.10:9002", //docking.zwfw.anyang.gov.cn 
25
+//	sip_ip:"192.168.1.10",
26
+//	sip_password_:"1016", 
27
+//	ws_uri_:"ws://192.168.1.10:5066",
28
+//	contact_uri:"@192.168.1.10;transport=ws",
29
+
30
+//	videoSocket_url: "ws://192.168.1.10:9002", //docking.zwfw.anyang.gov.cn 
31
+//	sip_ip:"12345sp1.jbdu.cn",
32
+//	sip_password_:"123456", 
33
+//	ws_uri_:"wss://12345sp1.jbdu.cn:7443",
34
+//	contact_uri:"@12345sp1.jbdu.cn;transport=wss",
35
+
36
+	videoSocket_url: "ws://192.168.1.9:9002", //docking.zwfw.anyang.gov.cn 
37
+	sip_ip:"192.168.1.9",
38
+	sip_password_:"123456", 
39
+	ws_uri_:"ws://192.168.1.9:5066",
40
+	contact_uri:"@192.168.1.9;transport=ws",
41
+	
18 42
     menuworktime: 30000, //菜单工单数量刷新间隔
19 43
     indextime: 60000*30, //首页报表刷新间隔
20 44
     arr: [
@@ -104,7 +128,10 @@ huayi.config = {
104 128
 };
105 129
 //if(window.document.location.href.indexOf("https")!==-1){   
106 130
 //	huayi.config.callcenter_url = "https://docking.zwfw.anyang.gov.cn/"
131
+//	huayi.config.socket_ip = "wss://12345sp.zwfw.anyang.gov.cn:8082"
132
+
107 133
 //} else if(window.document.location.href.indexOf("http")!==-1){
108 134
 //	huayi.config.callcenter_url = "http://docking.zwfw.anyang.gov.cn:65527/"
135
+//	huayi.config.socket_ip = "ws://61.54.2.122:8081"
109 136
 //}
110 137
 //console.log(huayi.config.callcenter_url)

+ 2 - 2
WebUI/CallCenterWeb.UI/WXchat/Script/Common/huayi.config.js

@@ -2,8 +2,8 @@
2 2
     var huayi = {};
3 3
 }
4 4
 huayi.config = {
5
-	callcenter_url: "http://192.168.8.9:1042/" ,// 测试环境
6
-	// callcenter_url: "http://docking.zwfw.anyang.gov.cn:65527/" ,// 测试环境
5
+//	callcenter_url: "http://192.168.8.9:1042/" ,// 测试环境
6
+	 callcenter_url: "http://docking.zwfw.anyang.gov.cn:65527/" ,// 测试环境
7 7
 
8 8
     //callcenter_url: "http://117.158.196.116:4010/"// 测试环境
9 9
 	//	callcenter_url: "http://docking.zwfw.anyang.gov.cn:9998/" // 生产环境

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

@@ -98,7 +98,9 @@ function closeMediaVideo() {
98 98
 function testStart() {
99 99
 
100 100
 	sip_uri_ = "sip:" + selectExten + "@"+huayi.config.sip_ip; // 12345sp.zwfw.anyang.gov.cn
101
-	sip_password_ = huayi.config.sip_password_; //zhumadian12345800100
101
+//	sip_password_ = huayi.config.sip_password_; //zhumadian12345800100
102
+//	sip_password_ = 1012; //zhumadian12345800100
103
+	sip_password_ = "123456"; //zhumadian12345800100
102 104
 	ws_uri_ = huayi.config.ws_uri_
103 105
 	
104 106
 	console.info("get input info: sip_uri = ", sip_uri_, " sip_password = ", sip_password_, " ws_uri = ", ws_uri_);
@@ -298,7 +300,7 @@ function sipCallVideo() {
298 300
 			'eventHandlers': eventHandlers,
299 301
 			'mediaConstraints': {
300 302
 				'audio': true,
301
-				'video': true
303
+				'video': false
302 304
 
303 305
 			},
304 306
 			'mediaStream': localStream

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

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

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

@@ -9,8 +9,15 @@ huayi.config = {
9 9
 	//	socket_ip: "12345sp.jbdu.cn",
10 10
 	//	socket_port: "8082",
11 11
 	//	ws_uri_: "wss://12345sp1.jbdu.cn:7443", //端口   
12
-	socket_url: "wss://12345rx.zwfw.anyang.gov.cn:8082",
13
-	ws_uri_: "wss://12345sp.zwfw.anyang.gov.cn:7443", //端口  
14
-	contact_uri:"@12345sp.zwfw.anyang.gov.cn;transport=wss",  //
12
+//	socket_url: "wss://12345rx.zwfw.anyang.gov.cn:8082",
13
+//	ws_uri_: "wss://12345sp.zwfw.anyang.gov.cn:7443", //端口  
14
+//	contact_uri:"@12345sp.zwfw.anyang.gov.cn;transport=wss",  //
15
+	
16
+	socket_url: "ws://192.168.1.10:9002",
17
+	ws_uri_: "ws://192.168.1.10:5066", //端口   9002
18
+	contact_uri:"@1192.168.1.10;transport=ws",  //
19
+	socket_ip: "192.168.1.10",
20
+//	socket_port: "9002",
21
+//	ws_uri_: "ws://192.168.1.10:5066", //端口  
15 22
 	
16 23
 };

+ 3 - 1
WebUI/CallCenterWeb.UI/calloutNew-2.1/weChatVideo/js/main.js

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

+ 11 - 4
WebUI/CallCenterWeb.UI/calloutNew/weChatVideo/js/huayi.config.js

@@ -10,11 +10,18 @@ huayi.config = {
10 10
 	//	socket_port: "8082",
11 11
 	//	ws_uri_: "wss://12345sp1.jbdu.cn:7443", //端口   
12 12
 	callcenter_url: "https://docking.zwfw.anyang.gov.cn/", //生产环境
13
-	socket_ip: "12345sp.zwfw.anyang.gov.cn",
13
+	
14 14
 //	socket_url: "wss://12345rx.zwfw.anyang.gov.cn:8082", 65529 
15
-	socket_url: "wss://12345rx.zwfw.anyang.gov.cn:65512",
15
+//	socket_ip: "12345sp.zwfw.anyang.gov.cn",
16
+//	socket_url: "wss://12345rx.zwfw.anyang.gov.cn:65512",
17
+//	sip_password_:'1234',
18
+//	ws_uri_: "wss://12345sp2.zwfw.anyang.gov.cn:7443", //端口  
19
+//	contact_uri:"@12345sp2.zwfw.anyang.gov.cn;transport=wss",  //
20
+	
21
+	socket_ip: "192.168.1.10",
22
+	socket_url: "ws://192.168.1.10:9002",
16 23
 	sip_password_:'1234',
17
-	ws_uri_: "wss://12345sp2.zwfw.anyang.gov.cn:7443", //端口  
18
-	contact_uri:"@12345sp2.zwfw.anyang.gov.cn;transport=wss",  //
24
+	ws_uri_: "ws://192.168.1.10:5066", //端口  
25
+	contact_uri:"@192.168.1.10;transport=ws",  //
19 26
 	
20 27
 };

+ 4 - 1
WebUI/CallCenterWeb.UI/calloutNew/weChatVideo/js/main.js

@@ -106,6 +106,8 @@
106 106
 					},5000)
107 107
  					
108 108
  					
109
+ 				} else if( data.Type.toLowerCase() ==='videoreqexten'){
110
+ 					videoreqextenBack(data);
109 111
  				}
110 112
 				if(data.Type === "VideoReqBindAgent"){
111 113
 					$(".registStatus").text("绑定失败")
@@ -174,7 +176,8 @@
174 176
  		extenNum = data.AgentExten
175 177
  		$("#account").val(extenNum)
176 178
  		sip_uri_ = "sip:" + extenNum + "@" + huayi.config.socket_ip;
177
- 		sip_password_ = huayi.config.sip_password_;
179
+// 		sip_password_ = huayi.config.sip_password_;
180
+ 		sip_password_ = extenNum;
178 181
  		ws_uri_ = huayi.config.ws_uri_; //wss://sip.800100.com.cn:7443  218.29.229.185:8011
179 182
  		contact_uri =  huayi.config.contact_uri
180 183
  		testStart();

+ 10 - 11
WebUI/CallCenterWeb.UI/js/index.js

@@ -263,19 +263,19 @@ $(document).ready(function() {
263 263
 				if(result.data.user.F_SeatFlag) {
264 264
 					Connect();
265 265
 					if($.cookie("code") == "spdbzy") {
266
-						//layer.open({
267
-							//type: 2,
268
-							//content: "./calloutNew/videoCall.html", //iframe的url,no代表不显示滚动条
269
-							//title: "视频通话窗口",
270
-							//shade: 0,
271
-							//offset: "rb",
272
-							//area: ["22%", "65%"], //宽高
273
-						//});
266
+						layer.open({
267
+							type: 2,
268
+							content: "./calloutNew/videoCall.html", //iframe的url,no代表不显示滚动条
269
+							title: "视频通话窗口",
270
+							shade: 0,
271
+							offset: "rb",
272
+							area: ["22%", "65%"], //宽高
273
+						});
274 274
 					}else{
275
-//						connectVoice(1); //创建连接 
275
+						connectVoice(1); //创建连接 
276 276
 					}
277 277
 					if($.cookie("code") != "spdbzy") {
278
-						connectVoice(1); //创建连接 
278
+//						connectVoice(1); //创建连接 
279 279
 					}
280 280
 					//CreateWebSockets();
281 281
 					//$(".open_chat").show();
@@ -2619,7 +2619,6 @@ function LB(obj) {
2619 2619
 						"</option>"
2620 2620
 					).appendTo(obj);
2621 2621
 				});
2622
-				console.log($('#hidCallKey').val())
2623 2622
 				if ($('#hidCallKey').val() == '5') {
2624 2623
 					obj.val(4256+'')
2625 2624
 				}

+ 1 - 1
WebUI/CallCenterWeb.UI/js/main.js

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

BIN
anyangWebAPP.zip