liuyifan 6 年 前
コミット
e1da4c305f

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

@@ -3,8 +3,9 @@ if (huayi == undefined) {
3 3
 }
4 4
 huayi.config = {
5 5
 	//callcenter_url: "http://192.168.4.18:4683/",//生产环境 前端Web站IP和端口
6
-     callcenter_url: "http://localhost:7459/",//生产环境 前端Web站IP和端口
6
+//   callcenter_url: "http://localhost:7459/",//生产环境 前端Web站IP和端口
7 7
     //callcenter_url: "http://192.168.4.18:4669/",//生产环境 前端Web站IP和端口
8
+  	callcenter_url: "http://192.168.8.9:1003/",//生产环境 前端Web站IP和端口
8 9
     socket_ip: "192.168.5.7",//WebSocket通讯ip
9 10
     socket_port: "8081",    //WebSocket通讯端口
10 11
     menuworktime: 30000,    //菜单工单数量刷新间隔

+ 39 - 7
CallCenterWeb.UI/SystemManager/MenuManage.html

@@ -7,8 +7,8 @@
7 7
 		<script src="../Script/Common/huayi.config.js"></script>
8 8
 		<link rel="stylesheet" href="../js/zTree/zTreeStyle.css" />
9 9
 		<link rel="stylesheet" href="../css/init.css" />
10
-		<link href="./css/buMenManger.css" rel="stylesheet" />
11
-		<title>系统管理-->菜单设置</title>
10
+		<link href="./css/MenuManage.css" rel="stylesheet" />
11
+		<title>系统管理-->菜单权限</title>
12 12
 		<style>
13 13
 			.boxCon table th {
14 14
 				width: 42%;
@@ -23,7 +23,7 @@
23 23
 					<a id="ReIndex" href="javaScript:;">首页</a>&gt;
24 24
 					<a href="javaScript:;">系统管理</a>&gt;
25 25
 					<a href="javaScript:;">权限管理</a>&gt;
26
-					<a href="" style="color: #000;">菜单设置</a>
26
+					<a href="" style="color: #000;">菜单权限</a>
27 27
 				</sapn>
28 28
 			</div>
29 29
 			<div class="dhRight">
@@ -315,7 +315,7 @@
315 315
 			//删除按钮
316 316
 			$('.del').click(function() {
317 317
 				if(id == 'null' || id == '') {
318
-					layer.confirm('没有要删除的分类!', {
318
+					layer.confirm('没有要删除的菜单!', {
319 319
 						btn: ['确定']
320 320
 					});
321 321
 					return
@@ -327,6 +327,8 @@
327 327
 			//关闭按钮
328 328
 			$('.delBtr').click(function() {
329 329
 				$('.delModel').css('display', 'none');
330
+				tree();
331
+				clear();
330 332
 			})
331 333
 			//确定删除按钮
332 334
 			$('.sure').click(function() {
@@ -343,6 +345,11 @@
343 345
 						if(data.state == "success") {
344 346
 							layer.msg("删除成功!");
345 347
 							tree();
348
+							clear();
349
+						} else {
350
+							layer.msg("删除成功!");
351
+							tree();
352
+							clear();
346 353
 						}
347 354
 					}
348 355
 				});
@@ -352,6 +359,8 @@
352 359
 			//取消删除按钮
353 360
 			$('.return').click(function() {
354 361
 				$('.delModel').css('display', 'none');
362
+				tree();
363
+				clear();
355 364
 			})
356 365
 
357 366
 			//添加按钮
@@ -372,6 +381,8 @@
372 381
 			//添加关闭按钮
373 382
 			$('.addBtr').click(function() {
374 383
 				$('.addModel').css('display', 'none');
384
+				tree();
385
+				clear();
375 386
 			})
376 387
 			//添加内容下拉
377 388
 			$('.inps1').focus(function() {
@@ -438,7 +449,11 @@
438 449
 						if(data.state == "success") {
439 450
 							layer.msg("添加成功!");
440 451
 							tree();
441
-
452
+							clear();
453
+						} else {
454
+							layer.msg("添加失败!");
455
+							tree();
456
+							clear();
442 457
 						}
443 458
 					}
444 459
 
@@ -456,7 +471,7 @@
456 471
 				chbcPid; //保存的所属部门ID
457 472
 			$('.change').click(function() {
458 473
 				if(id == 'null' || id == '') {
459
-					layer.confirm('没有选择要修改的部门!', {
474
+					layer.confirm('没有选择要修改的菜单!', {
460 475
 						btn: ['确定']
461 476
 					})
462 477
 					return
@@ -471,6 +486,8 @@
471 486
 			//关闭按钮
472 487
 			$('.changeBtr').click(function() {
473 488
 				$('.changeModel').css('display', 'none');
489
+				tree();
490
+				clear();
474 491
 			});
475 492
 			$('.inps4').focus(function() {
476 493
 				$('.xlChange').css('display', 'block')
@@ -583,6 +600,11 @@
583 600
 						if(data.state == "success") {
584 601
 							layer.msg("修改成功!");
585 602
 							tree();
603
+							clear();
604
+						} else {
605
+							layer.msg("修改失败!");
606
+							tree();
607
+							clear();
586 608
 						}
587 609
 					}
588 610
 				});
@@ -602,8 +624,18 @@
602 624
 				//          chbcSort = $('.inps6').val();
603 625
 				changeBaoCunAjax(chbcPid);
604 626
 				//}
605
-
606 627
 			})
628
+			function clear () {
629
+				$('.inps3').val("");
630
+				$('.inps4').val("");
631
+				$(".inps5").val("");
632
+				$('.inps7').prop('checked',false);
633
+				$('.inps8').val("");
634
+				$('.inps9').val("");
635
+				name = "";
636
+				id = 0;
637
+				chbcPid = 0;
638
+			}
607 639
 		</script>
608 640
 	</body>
609 641
 

+ 66 - 0
CallCenterWeb.UI/SystemManager/css/MenuManage.css

@@ -0,0 +1,66 @@
1
+.toolBar {
2
+	padding: 15px 0;
3
+	border-bottom: 1px solid #ccc;
4
+}
5
+
6
+.tree {
7
+	height: 400px;
8
+	overflow-y: auto;
9
+}
10
+
11
+.inpBox {
12
+	border: 1px solid #a9a9a9;
13
+	height: 27px;
14
+	width: 172px;
15
+	display: inline-block;
16
+	position: relative;
17
+	vertical-align: middle;
18
+}
19
+
20
+.inps {
21
+	height: 24px;
22
+	width: 172px;
23
+}
24
+
25
+.inps1,
26
+.inps1_chg {
27
+	width: 170px;
28
+	height: 24px;
29
+	outline: none;
30
+	border: 0;
31
+	border-image-width: 0;
32
+	padding: 0;
33
+	padding-left: 3px;
34
+}
35
+
36
+.xl {
37
+	display: inline-block;
38
+	background: url("../../img/dropDown.png") no-repeat;
39
+	height: 100%;
40
+	background-position: center center;
41
+	width: 20px;
42
+	position: absolute;
43
+	right: 0;
44
+	top: 0px;
45
+	/*background-color: #f7bc8b;*/
46
+	cursor: pointer;
47
+}
48
+/*.xl:hover{
49
+		background-color: #e6d523;
50
+}*/
51
+
52
+.addTree {
53
+	background: #fff;
54
+	position: absolute;
55
+	width: 100%;
56
+	border: 1px solid darkgrey;
57
+	right: 0;
58
+	top: 26px;
59
+	display: none;
60
+}
61
+
62
+.inpstext{
63
+	resize: none;
64
+	width: 50%;
65
+	height: 70px;
66
+}

+ 3 - 2
CallCenterWeb.UI/SystemManager/dengLuRiZhi.html

@@ -170,8 +170,9 @@
170 170
 			}
171 171
 
172 172
 			function setCode(val, row, index) {
173
-				var page = table.bootstrapTable("getPageCode");
174
-				return page.pageSize * (page.pageNumber - 1) + index + 1;
173
+//				var page = table.bootstrapTable("getPageCode");
174
+//				return page.pageSize * (page.pageNumber - 1) + index + 1;
175
+				return index + 1;
175 176
 			}
176 177
 		</script>
177 178
 	</body>

+ 3 - 2
CallCenterWeb.UI/SystemManager/huaWuRiZhi.html

@@ -232,8 +232,9 @@
232 232
 			});
233 233
 
234 234
 			function setCode(val, row, index) {
235
-				    var page = table.bootstrapTable("getPageCode");  
236
-            return page.pageSize * (page.pageNumber - 1) + index + 1;  
235
+//		    var page = table.bootstrapTable("getPageCode");  
236
+//          return page.pageSize * (page.pageNumber - 1) + index + 1;  
237
+				return index + 1;
237 238
 			}
238 239
 		</script>
239 240
 	</body>

+ 3 - 2
CallCenterWeb.UI/SystemManager/js/jiChuShuJu.js

@@ -233,8 +233,9 @@
233 233
 		 }
234 234
 
235 235
 		 function setCode(val, row, index) {
236
-		 	    var page = $table.bootstrapTable("getPageCode");  
237
-            return page.pageSize * (page.pageNumber - 1) + index + 1;  
236
+//		 	var page = $table.bootstrapTable("getPageCode");  
237
+//          return page.pageSize * (page.pageNumber - 1) + index + 1;  
238
+			return index + 1;
238 239
 		 }
239 240
 		 $table.on("click-row.bs.table", function(e, row, ele) {
240 241
 

+ 12 - 4
CallCenterWeb.UI/SystemManager/js/jueSeQuanXian.js

@@ -161,7 +161,7 @@
161 161
 				success: function(data) {
162 162
 					if(data.state.toLowerCase() == 'success') {
163 163
 						layer.msg("删除成功!");
164
-						table.bootstrapTable('refresh');
164
+						initTable(token, jsname);
165 165
 					} else {
166 166
 						alert(data.message);
167 167
 
@@ -239,7 +239,14 @@
239 239
 			$.each(ztree, function(i, n) {
240 240
 				app.push(n.id);
241 241
 			});
242
-			pro(app, jsid);
242
+			if(jsid) {
243
+				pro(app, jsid);
244
+			} else {
245
+				layer.confirm('请选择角色!', {
246
+					btn: ['确定']
247
+				});
248
+				return;
249
+			}
243 250
 		})
244 251
 		//左边表格
245 252
 		initTable(token, jsname);
@@ -293,6 +300,7 @@
293 300
 		});
294 301
 
295 302
 		function setCode(val, row, index) {
296
-			    var page = table.bootstrapTable("getPageCode");  
297
-            return page.pageSize * (page.pageNumber - 1) + index + 1;  
303
+//		    var page = table.bootstrapTable("getPageCode");  
304
+//          return page.pageSize * (page.pageNumber - 1) + index + 1;  
305
+			return index + 1;
298 306
 		}

+ 3 - 2
CallCenterWeb.UI/SystemManager/js/yongHuManger.js

@@ -735,8 +735,9 @@ table.on("click-row.bs.table", function(e, row, ele) {
735 735
 });
736 736
 
737 737
 function setCode(val, row, index) {
738
-	var page = table.bootstrapTable("getPageCode");
739
-	return page.pageSize * (page.pageNumber - 1) + index + 1;
738
+//	var page = table.bootstrapTable("getPageCode");
739
+//	return page.pageSize * (page.pageNumber - 1) + index + 1;
740
+	return index + 1;
740 741
 }
741 742
 
742 743
 function setZuoType(val) {

+ 2 - 2
CallCenterWeb.UI/SystemManager/jueSeQuanXian.html

@@ -84,7 +84,7 @@
84 84
 					<button class="btns protect">保存角色权限</button>
85 85
 				</div>
86 86
 				<div class="toolRight">
87
-					<span>角色名称:<input type="text" class="searJsz"/></span>
87
+					<span>角色:<input type="text" class="searJsz"/></span>
88 88
 					<button class="btns search">搜索</button>
89 89
 				</div>
90 90
 
@@ -178,7 +178,7 @@
178 178
 			</div>
179 179
 
180 180
 		</div>
181
-		<!--删除弹出内容-->
181
+		<!--保存权限弹出内容-->
182 182
 		<div class="model proModel">
183 183
 			<div class="box">
184 184
 				<div class="btop clearfix">

+ 1 - 1
CallCenterWeb.UI/index.html

@@ -1052,7 +1052,7 @@
1052 1052
 					<ul>
1053 1053
 						<li class="top13" style="width: 100%;"></li>
1054 1054
 					</ul>
1055
-					<span class="fr">Copyright © 华谊科技 All Rights Reserved</span>
1055
+					<span class="fr">Copyright © 加一信息 All Rights Reserved</span>
1056 1056
 
1057 1057
 				</div>
1058 1058
 			</div>

+ 3 - 2
CallCenterWeb.UI/regionalManagement/js/proManagement.js

@@ -82,8 +82,9 @@ function getProslist() {
82 82
 }
83 83
 
84 84
 function setCode(val, row, index) {
85
-	var page = $('#table1').bootstrapTable("getPageCode");
86
-	return page.pageSize * (page.pageNumber - 1) + index + 1;
85
+//	var page = $('#table1').bootstrapTable("getPageCode");
86
+//	return page.pageSize * (page.pageNumber - 1) + index + 1;
87
+	return index + 1;
87 88
 }
88 89
 
89 90
 //格式化中间列表操作

+ 3 - 2
CallCenterWeb.UI/regionalManagement/js/regionalSetting.js

@@ -143,6 +143,7 @@ function initTable() {
143 143
 }
144 144
 
145 145
 function setCode(val, row, index) {
146
-	var page = table.bootstrapTable("getPageCode");
147
-	return page.pageSize * (page.pageNumber - 1) + index + 1;
146
+//	var page = table.bootstrapTable("getPageCode");
147
+//	return page.pageSize * (page.pageNumber - 1) + index + 1;
148
+	return index + 1;
148 149
 }

+ 3 - 2
CallCenterWeb.UI/zhiShiKu/js/zhiShiKuManger.js

@@ -122,8 +122,9 @@ function formatterKey(val, row) {
122 122
 }
123 123
 
124 124
 function setCode(val, row, index) {
125
-	var page = table.bootstrapTable("getPageCode");
126
-	return page.pageSize * (page.pageNumber - 1) + index + 1;
125
+//	var page = table.bootstrapTable("getPageCode");
126
+//	return page.pageSize * (page.pageNumber - 1) + index + 1;
127
+	return index + 1;
127 128
 }
128 129
 
129 130
 //点击标题 内容查看详情

+ 3 - 2
CallCenterWeb.UI/zhiShiKu/zhiShiKuChaXun.html

@@ -237,8 +237,9 @@
237 237
 		}
238 238
 		
239 239
 		function setCode(val, row, index) {
240
-			var page = table.bootstrapTable("getPageCode");
241
-			return page.pageSize * (page.pageNumber - 1) + index + 1;
240
+//			var page = table.bootstrapTable("getPageCode");
241
+//			return page.pageSize * (page.pageNumber - 1) + index + 1;
242
+			return index + 1;
242 243
 		}
243 244
 		
244 245
 		//点击标题 内容查看详情