Strona główna Odkrywaj Pomoc
Zarejestruj się Zaloguj się
zhengbingbing
/
GXQGWH_UI
Obserwuj 1
Polub 0
Forkuj 0
Kod Problemy 0 Oczekujące zmiany 0 Commity 60 Wydania 0 Wiki
Przeglądaj źródła

问题修改

liuyifan 5 lat temu
rodzic
dfef07b69b
commit
b59a60736b
18 zmienionych plików z 276 dodań i 57 usunięć
Widok podzielony Pokaż statystyki zmian
  1. 42 0
      CallCenterWeb.UI/OnDuty/SeatsMessage.html
  2. 2 2
      CallCenterWeb.UI/Script/Common/huayi.config.js
  3. 48 23
      CallCenterWeb.UI/SystemManager/MenuManage.html
  4. 15 3
      CallCenterWeb.UI/SystemManager/js/shuJuZiDian.js
  5. 2 1
      CallCenterWeb.UI/SystemManager/js/yongHuManger.js
  6. 12 12
      CallCenterWeb.UI/SystemManager/shuJuZiDian.html
  7. 1 1
      CallCenterWeb.UI/TelCall/contacts.html
  8. 65 4
      CallCenterWeb.UI/TelCall/registrantSituation.html
  9. 20 0
      CallCenterWeb.UI/callOut/callOut.html
  10. 17 0
      CallCenterWeb.UI/callOut/inhtml.html
  11. 16 0
      CallCenterWeb.UI/callOut/keyCallOut.html
  12. 1 1
      CallCenterWeb.UI/callScreen/call.js
  13. 1 1
      CallCenterWeb.UI/css/Table/table1.css
  14. 4 0
      CallCenterWeb.UI/js/main.js
  15. 2 2
      CallCenterWeb.UI/keHuManager/archivesManage/js/addOrEdit.js
  16. 22 1
      CallCenterWeb.UI/zhiShiKu/js/zhiShiKuManger.js
  17. 4 4
      CallCenterWeb.UI/zhiShiKu/zhiShiKuFenLei.html
  18. 2 2
      CallCenterWeb.UI/zhiShiKu/zhiShiKuManger.html

+ 42 - 0
CallCenterWeb.UI/OnDuty/SeatsMessage.html
Wyświetl plik 

@@ -317,6 +317,27 @@
317 317 
 			            btn: ['确定']
318 318 
 			        });
319 319 
 			        return;
320 
+				}
321 
+				if (!$('#Z_gsd').val()) {
322 
+			        layer.confirm('坐席地区号不能为空！', {
323 
+			            icon: 2,
324 
+			            btn: ['确定']
325 
+			        });
326 
+			        return;
327 
+			    }
328 
+				if (!$('#Z_w').val()) {
329 
+			        layer.confirm('外呼外地前缀不能为空！', {
330 
+			            icon: 2,
331 
+			            btn: ['确定']
332 
+			        });
333 
+			        return;
334 
+			    }
335 
+				if (!$('#Z_b').val()) {
336 
+			        layer.confirm('外呼本地前缀不能为空！', {
337 
+			            icon: 2,
338 
+			            btn: ['确定']
339 
+			        });
340 
+			        return;
320 341 
 			    }
321 342 
 				/*发送请求*/
322 343 
 				$.post(huayi.config.callcenter_url + "SeatGroup/AddSeatGroup", {
 
@@ -354,6 +375,27 @@
354 375 
 			            btn: ['确定']
355 376 
 			        });
356 377 
 			        return;
378 
+				}
379 
+				if (!$('#Z_gsds').val()) {
380 
+			        layer.confirm('坐席地区号不能为空！', {
381 
+			            icon: 2,
382 
+			            btn: ['确定']
383 
+			        });
384 
+			        return;
385 
+			    }
386 
+				if (!$('#Z_ws').val()) {
387 
+			        layer.confirm('外呼外地前缀不能为空！', {
388 
+			            icon: 2,
389 
+			            btn: ['确定']
390 
+			        });
391 
+			        return;
392 
+			    }
393 
+				if (!$('#Z_bs').val()) {
394 
+			        layer.confirm('外呼本地前缀不能为空！', {
395 
+			            icon: 2,
396 
+			            btn: ['确定']
397 
+			        });
398 
+			        return;
357 399 
 			    }
358 400 
 				$("#tc").hide();
359 401 
 				/*发送请求*/

+ 2 - 2
CallCenterWeb.UI/Script/Common/huayi.config.js
Wyświetl plik 

@@ -3,8 +3,8 @@
3 3 
 }
4 4 
 huayi.config = {
5 5 
    //callcenter_url: "http://localhost:7456/",//生产环境 前端Web站IP和端口
6 
-   // callcenter_url: "http://192.168.4.18:4687/",//生产环境 前端Web站IP和端口
7 
-    callcenter_url: "http://192.168.8.20:1026/",//生产环境 前端Web站IP和端口
6 
+	callcenter_url: "http://192.168.8.20:1026/",//生产环境 前端Web站IP和端口
7 
+//  callcenter_url: "http://117.160.143.199:1026",//生产环境 前端Web站IP和端口
8 8 
     socket_ip: "192.168.8.7",//WebSocket通讯ip
9 9 
     socket_port: "8081",    //WebSocket通讯端口
10 10 
     menuworktime: 1000 * 60,    //菜单工单数量刷新间隔

+ 48 - 23
CallCenterWeb.UI/SystemManager/MenuManage.html
Wyświetl plik 

@@ -10,8 +10,8 @@
10 10 
     <title>菜单权限</title>
11 11 
     <style>
12 12 
     	.boxCon table th {
13 
-    width: 42%;
14 
-}
13 
+            width: 42%;
14 
+        }
15 15 
     </style>
16 16 
 </head>
17 17 
 <body>
 
@@ -66,19 +66,19 @@
66 66 
             				</td>
67 67 
             			</tr>-->
68 68 
             			<tr>
69 
-            				<th>名    称：</th>
69 
+            				<th><i style="color: #FF0000">*&nbsp;</i>名    称：</th>
70 70 
             				<td>
71 71 
             					<input class="inps inps3" type="text" />
72 72 
             				</td>
73 73 
             			</tr>
74 74 
             			<tr>
75 
-            				<th>代    码：</th>
75 
+            				<th><i style="color: #FF0000">*&nbsp;</i>代    码：</th>
76 76 
             				<td>
77 77 
             					<input class="inps inps4" type="text" />
78 78 
             				</td>
79 79 
             			</tr>
80 80 
             			<tr>
81 
-            				<th>菜单链接：</th>
81 
+            				<th><i style="color: #FF0000">*&nbsp;</i>菜单链接：</th>
82 82 
             				<td>
83 83 
             					<input class="inps inps5" type="text" />
84 84 
             				</td>
 
@@ -168,7 +168,8 @@
168 168 
             			</tr>-->
169 169 
             			<tr>
170 170 
             				<th>
171 
-            					名    称：
171 
+                                <i style="color: #FF0000">*&nbsp;</i>
172 
+                                名    称：
172 173 
             				</th>
173 174 
             				<td>
174 175 
             					<input class="inps inps3_chg" type="text" />
 
@@ -176,7 +177,8 @@
176 177 
             			</tr>
177 178 
             			<tr>
178 179 
             				<th>
179 
-            					代    码：
180 
+                                <i style="color: #FF0000">*&nbsp;</i>
181 
+                                代    码：
180 182 
             				</th>
181 183 
             				<td>
182 184 
             					<input class="inps inps4_chg" type="text" />
 
@@ -184,7 +186,8 @@
184 186 
             			</tr>
185 187 
             			<tr>
186 188 
             				<th>
187 
-            					菜单链接：
189 
+                                <i style="color: #FF0000">*&nbsp;</i>
190 
+                                菜单链接：
188 191 
             				</th>
189 192 
             				<td>
190 193 
             					<input class="inps inps5_chg" type="text" />
 
@@ -392,15 +395,24 @@
392 395 
         }
393 396 
         $('.addCun').click(function () {
394 397 
             //				console.log(addPid);
395 
-            //if ($('.inps2').val() == "" || $('.inps3').val() == "") {
396 
-            //    if (did.length <= 0) {
397 
-            //        layer.confirm('所添加内容不能为空！', {
398 
-            //            btn: ['确定']
399 
-            //        });
400 
-            //        return;
401 
-            //    }
402 
-            //} else {
403 
-
398 
+            if ($(".inps3").val() == '') {
399 
+                layer.confirm('请输入名称！', {
400 
+                    btn: ['确定']
401 
+                });
402 
+                return;
403 
+            }
404 
+            if ($(".inps4").val() == '') {
405 
+                layer.confirm('请输入代码！', {
406 
+                    btn: ['确定']
407 
+                });
408 
+                return;
409 
+            }
410 
+            if ($(".inps5").val() == '') {
411 
+                layer.confirm('请输入菜单链接！', {
412 
+                    btn: ['确定']
413 
+                });
414 
+                return;
415 
+            }
404 416 
             addName = $('.inps3').val();
405 417 
             addCode = $('.inps4').val();
406 418 
             addUrl = $(".inps5").val();
 
@@ -572,18 +584,31 @@
572 584 
                         layer.msg("修改成功！");
573 585 
                         tree();
574 586 
                         clear();
587 
+                    } else {
575 588 
                     }
576 589 
                 }
577 590 
             });
578 591 
         }
579 592
580 593 
         $('.changeCun').click(function () {
581 
-            //if ($('.inps4').val() == "" || $('.inps5').val() == "" || $('.inps6').val() == "") {
582 
-            //    layer.confirm('所修改内容不允许为空！', {
583 
-            //        btn: ['确定']
584 
-            //    });
585 
-            //    return;
586 
-            //} else {
594 
+            if ($(".inps3_chg").val() == '') {
595 
+                layer.confirm('请输入名称！', {
596 
+                    btn: ['确定']
597 
+                });
598 
+                return;
599 
+            }
600 
+            if ($(".inps4_chg").val() == '') {
601 
+                layer.confirm('请输入代码！', {
602 
+                    btn: ['确定']
603 
+                });
604 
+                return;
605 
+            }
606 
+            if ($(".inps5_chg").val() == '') {
607 
+                layer.confirm('请输入菜单链接！', {
608 
+                    btn: ['确定']
609 
+                });
610 
+                return;
611 
+            }
587 612 
             $('.changeModel').css('display', 'none');
588 613 
             console.log('部门id' + id + '所属部门id' + chbcPid + '部门名称' + chbcName + '排序' + chbcSort);
589 614 
             chbcPid;

+ 15 - 3
CallCenterWeb.UI/SystemManager/js/shuJuZiDian.js
Wyświetl plik 

@@ -2,7 +2,7 @@
2 2 
 	var table = $('#table1');
3 3 
 	var bs;//字典标识
4 4 
 	//左边表格
5 
-	   initTable(token);
5 
+	initTable(token);
6 6 
 function initTable(token) {
7 7 
     //先销毁表格
8 8 
     table.bootstrapTable('destroy');
 
@@ -63,18 +63,21 @@ $('.tjzd').click(function () {
63 63 
 });
64 64 
 		//关闭按钮
65 65 
 $('.addBtr ').click(function () {
66 
+    $('.inps1').val('');
67 
+    $('.addzdz').val('');
68 
+    $('.addSort').val('');
66 69 
     $('.addModel').css('display', 'none');
67 70 
 });
68 71 
 		//保存按钮
69 72 
 $('.addCunzd').click(function () {
70 
-    $('.addModel').css('display', 'none');
71 73 
     if ($('.inps1').val() == '' || $('.addzdz').val() == '') {
72 
-        layer.confirm('字典标志与值不允许为空！', {
74 
+        layer.confirm('字典标识与字典分类不允许为空！', {
73 75 
             btn: ['确定']
74 76 
         });
75 77 
         return;
76 78 
     } else {
77 79 
         tjCunzd(token);
80 
+        $('.addModel').css('display', 'none');
78 81 
     }
79 82 
 });
80 83 
 function tjCunzd() {
 
@@ -90,12 +93,14 @@ function tjCunzd() {
90 93 
             sort: $('.addSort').val()
91 94 
         },
92 95 
         success: function (data) {
96 
+            debugger;
93 97 
             if (data.state.toLowerCase() == 'success') {
94 98 
                 layer.msg("添加成功!");
95 99 
                 table.bootstrapTable('refresh');
96 100 
                 $('.inps1').val('');
97 101 
                 $('.addzdz').val('');
98 102 
                 $('.addSort').val('');
103 
+                bs = '';
99 104 
             }
100 105 
         }
101 106 
     });
 
@@ -127,6 +132,7 @@ $('.sure').click(function () {
127 132 
                 layer.msg("删除成功!");
128 133 
 //              table.bootstrapTable('refresh');
129 134 
                 initTable(token);
135 
+                bs = '';
130 136 
             }
131 137 
         }
132 138 
     });
 
@@ -177,6 +183,12 @@ $('.changeBtr').click(function () {
177 183 
 });
178 184 
 	//保存按钮
179 185 
 $('.chanCun').click(function () {
186 
+    if ($('.inps4').val() == '' || $('.chanzdz').val() == '') {
187 
+        layer.confirm('字典标识与字典分类不允许为空！', {
188 
+            btn: ['确定']
189 
+        });
190 
+        return;
191 
+    }
180 192 
     $('.changeModel').css('display', 'none');
181 193 
     cunZiDian(token);
182 194 
 });

+ 2 - 1
CallCenterWeb.UI/SystemManager/js/yongHuManger.js
Wyświetl plik 

@@ -96,6 +96,7 @@ $('.add').click(function() {
96 96 
 })
97 97 
 $('.addBtr').click(function() {
98 98 
 	$('.addModel').css('display', 'none');
99 
+	Clean();
99 100 
 })
100 101
101 102 
 //保存添加按钮
 
@@ -351,7 +352,7 @@ function move(chan_uc) {
351 352 
 			if(data.state.toLowerCase() == "success") {
352 353 
 				layer.msg("删除成功！");
353 354 
 				// 清除数据
354 
-				ygbh = 0;
355 
+				Clean();
355 356 
 				// 重新加载
356 357 
 				initTable(token, id, keyWord);
357 358 
 			}

+ 12 - 12
CallCenterWeb.UI/SystemManager/shuJuZiDian.html
Wyświetl plik 

@@ -29,7 +29,7 @@
29 29 
             </div>
30 30 
             <div class="toolRight">
31 31 
                 <span>字典标识：<input type="text" class="sear_bs" placeholder="请输入字典标识" /></span>
32 
-                <span>字典值：<input type="text" class="sear_name" placeholder="请输入字典值" /></span>
32 
+                <span>字典分类：<input type="text" class="sear_name" placeholder="请输入字典值" /></span>
33 33 
                 <button class="btns sousuo">搜索</button>
34 34 
             </div>
35 35 
         </div>
 
@@ -40,7 +40,7 @@
40 40 
                     <thead>
41 41 
                         <tr>
42 42 
                             <th data-align="center" data-formatter="setCodeLeft">编号</th>
43 
-                            <th data-field="name" data-align="center" data-formatter="oper" data-events="operateEvents">字典值<a class="tjzd" title="添加字典"><i class="addZiDian"></i></a></th>
43 
+                            <th data-field="name" data-align="center" data-formatter="oper" data-events="operateEvents">字典分类<a class="tjzd" title="添加字典"><i class="addZiDian"></i></a></th>
44 44 
                         </tr>
45 45 
                     </thead>
46 46 
                     <!--<tbody id="tbody">
 
@@ -57,7 +57,7 @@
57 57 
                                 <th data-checkbox="true" data-align="center"></th>
58 58 
                                 <th data-align="center" data-formatter="setCodeRight">编号</th>
59 59 
                                 <th data-field="F_DictionaryFlag" data-align="center">字典标识</th>
60 
-                                <th data-field="F_Name" data-align="center">字典值</th>
60 
+                                <th data-field="F_Name" data-align="center">字典分类</th>
61 61 
                                 <th data-field="F_Describe" data-align="center">备注</th>
62 62 
                                 <th data-field="F_Sort" data-align="center">排序编号</th>
63 63 
                             </tr>
 
@@ -80,7 +80,7 @@
80 80 
                 <table>
81 81 
                     <tbody>
82 82 
                         <tr>
83 
-                            <th><i style="color: #FF0000">*&nbsp;</i>字典标志：</th>
83 
+                            <th><i style="color: #FF0000">*&nbsp;</i>字典标识：</th>
84 84 
                             <td colspan="3">
85 85 
                                 <div class="inpBox">
86 86 
                                     <input type="text" class="inps inps1" />
 
@@ -88,7 +88,7 @@
88 88 
                             </td>
89 89 
                         </tr>
90 90 
                         <tr>
91 
-                            <th><i style="color: #FF0000">*&nbsp;</i>字典值：</th>
91 
+                            <th><i style="color: #FF0000">*&nbsp;</i>字典分类：</th>
92 92 
                             <td colspan="3"><textarea style="height: 70px;" class="addzdz"></textarea></td>
93 93 
                         </tr>
94 94 
                         <tr>
 
@@ -112,16 +112,16 @@
112 112 
                 <table>
113 113 
                     <tbody>
114 114 
                         <tr>
115 
-                            <th><i style="color: #FF0000">*&nbsp;</i>字典标志：</th>
115 
+                            <th><i style="color: #FF0000">*&nbsp;</i>字典标识：</th>
116 116 
                             <td colspan="3">
117 117 
                                 <div class="inpBox">
118 
-                                    <input type="text" class="inps inps4" />
118 
+                                    <input type="text" class="inps inps4" disabled="disabled" />
119 119 
                                     <input type="hidden" class="inps inps4id" />
120 120 
                                 </div>
121 121 
                             </td>
122 122 
                         </tr>
123 123 
                         <tr>
124 
-                            <th><i style="color: #FF0000">*&nbsp;</i>字典值：</th>
124 
+                            <th><i style="color: #FF0000">*&nbsp;</i>字典分类：</th>
125 125 
                             <td colspan="3"><textarea style="height: 70px;" class="chanzdz"></textarea></td>
126 126 
                         </tr>
127 127 
                         <tr>
 
@@ -164,7 +164,7 @@
164 164 
                 <table>
165 165 
                     <tbody>
166 166 
                         <tr>
167 
-                            <th>字典标志：</th>
167 
+                            <th>字典标识：</th>
168 168 
                             <td colspan="3">
169 169 
                                 <div class="inpBox">
170 170 
                                     <input type="text" class="inps inps5" readonly="readonly" />
 
@@ -173,7 +173,7 @@
173 173 
                             </td>
174 174 
                         </tr>
175 175 
                         <tr>
176 
-                            <th>字典值：</th>
176 
+                            <th>字典分类：</th>
177 177 
                             <td colspan="3"><textarea style="height: 70px;" class="addList_zdz"></textarea></td>
178 178 
                         </tr>
179 179 
                         <tr>
 
@@ -202,7 +202,7 @@
202 202 
                 <table>
203 203 
                     <tbody>
204 204 
                         <tr>
205 
-                            <th>字典标志：</th>
205 
+                            <th>字典标识：</th>
206 206 
                             <td colspan="3">
207 207 
                                 <div class="inpBox">
208 208 
                                     <input type="text" class="inps inps6" readonly="readonly" />
 
@@ -211,7 +211,7 @@
211 211 
                             </td>
212 212 
                         </tr>
213 213 
                         <tr>
214 
-                            <th>字典值：</th>
214 
+                            <th>字典分类：</th>
215 215 
                             <td colspan="3"><textarea style="height: 70px;" class="chanList_zdz"></textarea></td>
216 216 
                         </tr>
217 217 
                         <tr>

+ 1 - 1
CallCenterWeb.UI/TelCall/contacts.html
Wyświetl plik 

@@ -52,7 +52,7 @@
52 52 
 						<th data-field="F_Telephone">内线电话</th>
53 53 
 						<th data-field="F_Mobile">手机</th>
54 54 
 						<th data-field="F_ElseMobile">其他号码</th>
55 
-						<th data-field="F_CreateDate">创建时间</th>
55 
+						<!-- <th data-field="F_CreateDate">创建时间</th> -->
56 56 
 						<th data-field="F_Department">部门</th>
57 57 
 						<th data-field="F_Position">职位</th>
58 58 
 						<th data-field="F_Note">备注</th>

+ 65 - 4
CallCenterWeb.UI/TelCall/registrantSituation.html
Wyświetl plik 

@@ -128,13 +128,74 @@
128 128 
 	            font-size: 18px;
129 129 
 	            color: #00a0ca;
130 130 
             }
131 
-            @page {
132 
-				size: A4 portrait;
133 
-            }
134 131 
             .btnPrint{
135 132 
                 background: #1e90ff;
136 133 
             }
137 
-	    </style>
134 
+        </style>
135 
+        <style media="print">
136 
+            /*设置打印样式 标题宋体加黑二号*/
137 
+
138 
+            .headerAlign h2 {
139 
+                font-family: "宋体" !important;
140 
+                font-weight: bold !important;
141 
+                font-size: 22pt !important;
142 
+                letter-spacing: -1px !important;
143 
+            }
144 
+            .textCb{
145 
+                color: #e84545 !important;
146 
+            }
147 
+            .headerAlign h3 div:nth-of-type(1) {
148 
+                font-size: 14pt !important;
149 
+                font-family: "宋体" !important;
150 
+                font-weight: normal !important;
151 
+                margin-left: 98px !important;
152 
+            }
153 
+
154 
+            .headerAlign h3 {
155 
+                width: 690px !important;
156 
+            }
157 
+
158 
+            #main {
159 
+                padding: 40px 0 0 0 !important;
160 
+            }
161 
+
162 
+            #main table {
163 
+                font-size: 13pt !important;
164 
+                font-family: "仿宋" !important;
165 
+                border-color: #000;
166 
+                color: #000;
167 
+                width: 621px !important;
168 
+                /*page-break-after:avoid !important;*/
169 
+            }
170 
+
171 
+            tbody td {
172 
+                padding: 6px 0 6px 0 !important;
173 
+            }
174 
+
175 
+            .printdz {
176 
+                text-align: left;
177 
+                text-indent: .3em;
178 
+                padding: 4px;
179 
+            }
180 
+
181 
+            .printdd {
182 
+                text-align: justify !important;
183 
+                padding: 4px 2px 4px 4px !important;
184 
+            }
185 
+
186 
+            .printnr,
187 
+            .printcb,
188 
+            .printldps,
189 
+            .printcljg {
190 
+                text-align: justify !important;
191 
+                padding: 4px !important;
192 
+                text-indent: 2em !important;
193 
+            }
194 
+
195 
+            @page {
196 
+                size: A4 portrait;
197 
+            }
198 
+        </style>
138 199 
 	</head>
139 200
140 201 
 	<body class="gray-bg">

+ 20 - 0
CallCenterWeb.UI/callOut/callOut.html
Wyświetl plik 

@@ -0,0 +1,20 @@
1 
+<!DOCTYPE html>
2 
+<html>
3 
+    <head>
4 
+        <meta charset="UTF-8" />
5 
+        <title>一键回访页面</title>
6 
+        <script src="jquery.min.js"></script>
7 
+    </head>
8 
+    <body>
9 
+        <input id="txtphone" type="text" value="8899" />
10 
+        <input type="button" onclick="CallOutPhone()" value="一键回访" />
11 
+        <iframe id="framenew" width="0" height="0" src="#"></iframe>
12 
+        <script>
13 
+            function CallOutPhone() {
14 
+                var phone = $("#txtphone").val();
15 
+                var srcs = "http://192.168.4.18:4802/callOut/inhtml.html?phone=" + phone;
16 
+                $("#framenew").attr("src", srcs);
17 
+            }
18 
+        </script>
19 
+    </body>
20 
+</html>

+ 17 - 0
CallCenterWeb.UI/callOut/inhtml.html
Wyświetl plik 

@@ -0,0 +1,17 @@
1 
+	<!DOCTYPE html>
2 
+<html>
3 
+	<head>
4 
+		<meta charset="UTF-8">
5 
+		<title></title>
6 
+		<script src="../Script/Common/huayi.load.js"></script>
7 
+		<script src="../Script/Common/huayi.config.js"></script>
8 
+	</head>
9 
+	<body class="gray-bg" onload="keyCallOut()">
10 
+		<script>
11 
+		function keyCallOut(){
12 
+			var phone = helper.request.queryString("phone");
13 
+			    top.PhoneCallOut(1, phone);//外呼
14 
+		}
15 
+		</script>
16 
+	</body>
17 
+</html>

+ 16 - 0
CallCenterWeb.UI/callOut/keyCallOut.html
Wyświetl plik 

@@ -0,0 +1,16 @@
1 
+	<!DOCTYPE html>
2 
+<html>
3 
+	<head>
4 
+		<meta charset="UTF-8">
5 
+		<title></title>
6 
+		<script src="../Script/Common/huayi.load.js"></script>
7 
+		<script src="../Script/Common/huayi.config.js"></script>
8 
+	</head>
9 
+	<body class="gray-bg">
10 
+		<div class="wrapper wrapper-content animated fadeInRight">
11 
+			<iframe class="callIn_iframe"  width="100%" height="100%" src="http://192.168.4.18:4602/callOut/callOut.html" frameborder="0" data-id="index_v1.html" seamless></iframe>
12 
+		</div>
13 
+		<script>
14 
+		</script>
15 
+	</body>
16 
+</html>

+ 1 - 1
CallCenterWeb.UI/callScreen/call.js
Wyświetl plik 

@@ -273,7 +273,7 @@ $(document).ready(function () {
273 273 
             return;
274 274 
         }
275 275 
         if (!$(".ldtel1").val()) {
276 
-            layer.confirm('请输客户入电话！', {
276 
+            layer.confirm('请输入客户电话！', {
277 277 
                 btn: ['确定']
278 278 
             });
279 279 
             return;

+ 1 - 1
CallCenterWeb.UI/css/Table/table1.css
Wyświetl plik 

@@ -143,7 +143,7 @@ input:focus {
143 143
144 144 
 .Pb_sm {
145 145 
     line-height: 82px;
146 
-    display: -webkit-inline-box;
146 
+    /* display: -webkit-inline-box; */
147 147 
     vertical-align: top;
148 148 
     resize: none;
149 149 
     outline: none;

+ 4 - 0
CallCenterWeb.UI/js/main.js
Wyświetl plik 

@@ -20,6 +20,10 @@ function createWebSocket() {
20 20 
 		debuggerLog();
21 21 
 	}
22 22 
 }
23 
+setInterval(function() {
24 
+	debugger
25 
+	$.cookie("token", $.cookie("token"))
26 
+}, huayi.config.menuworktime);
23 27 
 //连接
24 28 
 function Connect() {
25 29

+ 2 - 2
CallCenterWeb.UI/keHuManager/archivesManage/js/addOrEdit.js
Wyświetl plik 

@@ -5,13 +5,13 @@ $(document).ready(function() {
5 5 
 	//保存按钮
6 6 
 	$('#save_btns').click(function() {
7 7 
 		if($('#formName').val() == '') {
8 
-			layer.confirm('请输入客户姓名！', {
8 
+			layer.confirm('请输入姓名！', {
9 9 
 				btn: ['确定']
10 10 
 			});
11 11 
 			return;
12 12 
 		}
13 13 
 		if($('#formTel').val() == '') {
14 
-			layer.confirm('请输入客户电话！', {
14 
+			layer.confirm('请输入电话！', {
15 15 
 				btn: ['确定']
16 16 
 			});
17 17 
 			return;

+ 22 - 1
CallCenterWeb.UI/zhiShiKu/js/zhiShiKuManger.js
Wyświetl plik 

@@ -159,7 +159,7 @@ var addPid, addTitle, addKey, addCon, addDes;
159 159 
 $('.addCun').click(function() {
160 160 
 	console.log(addPid);
161 161 
 	if($('.inps1').val() == "" || $('.addTitle').val() == "") {
162 
-		layer.confirm('标题不允许为空！', {
162 
+		layer.confirm('请输入标题！', {
163 163 
 			btn: ['确定']
164 164 
 		});
165 165 
 		return;
 
@@ -168,6 +168,11 @@ $('.addCun').click(function() {
168 168 
 			btn: ['确定']
169 169 
 		});
170 170 
 		return;
171 
+	} else if (encodeURIComponent(editor.html()) == '') {
172 
+		layer.confirm('请输入内容！', {
173 
+			btn: ['确定']
174 
+		});
175 
+		return;
171 176 
 	} else {
172 177 
 		addTitle = $('.addTitle').val();
173 178 
 		addKey = $('.addKey').val();
 
@@ -330,6 +335,22 @@ function changeBaoCunAjax(changeGetid, chanCunId) {
330 335 
 }
331 336 
 $('.changeCun').click(function() {
332 337 
 	console.log(chanCunId)
338 
+	if($('.changeTitle').val() == "") {
339 
+		layer.confirm('请输入标题！', {
340 
+			btn: ['确定']
341 
+		});
342 
+		return;
343 
+	} else if (chanCunId === 0) {
344 
+		layer.confirm('请选择分类！', {
345 
+			btn: ['确定']
346 
+		});
347 
+		return;
348 
+	} else if (encodeURIComponent(changeEditor.html()) == '') {
349 
+		layer.confirm('请输入内容！', {
350 
+			btn: ['确定']
351 
+		});
352 
+		return;
353 
+	}
333 354 
 	changeBaoCunAjax(changeGetid, chanCunId);
334 355 
 	$('.changeModel').css('display', 'none');
335 356

+ 4 - 4
CallCenterWeb.UI/zhiShiKu/zhiShiKuFenLei.html
Wyświetl plik 

@@ -56,8 +56,8 @@
56 56 
 							</div>
57 57 
 						</div>
58 58 
 					</div>
59 
-					<div>分类名称：<input class="inps inps2" type="text" /></div>
60 
-					<div>排列序号：<input class="inps inps3" type="text" /></div>
59 
+					<div><i style="color: #FF0000">*&nbsp;</i>分类名称：<input class="inps inps2" type="text" /></div>
60 
+					<div>排列序号：<input class="inps inps3" type="text" onkeyup="value=value.replace(/[^\d.]/g,'')" /></div>
61 61 
 					<div><button class="btns addCun">保存</button></div>
62 62 
 				</div>
63 63 
 			</div>
 
@@ -100,8 +100,8 @@
100 100 
 							</div>
101 101 
 						</div>
102 102 
 					</div>
103 
-					<div>分类名称：<input class="inps inps5" type="text" /></div>
104 
-					<div>排列序号：<input class="inps inps6" type="text" /></div>
103 
+					<div><i style="color: #FF0000">*&nbsp;</i>分类名称：<input class="inps inps5" type="text" /></div>
104 
+					<div>排列序号：<input class="inps inps6" type="text" onkeyup="value=value.replace(/[^\d.]/g,'')" /></div>
105 105 
 					<div><button class="btns changeCun">保存</button></div>
106 106 
 				</div>
107 107 
 			</div>

+ 2 - 2
CallCenterWeb.UI/zhiShiKu/zhiShiKuManger.html
Wyświetl plik 

@@ -213,7 +213,7 @@
213 213 
 								<td colspan="3"><input type="text" class="addKey" /></td>
214 214 
 							</tr>
215 215 
 							<tr>
216 
-								<th>内容：</th>
216 
+								<th><i style="color: #FF0000">*&nbsp;</i>内容：</th>
217 217 
 								<td colspan="3">
218 218 
 									<textarea id="addEditor" name="content" style="width: 100%;height: 100px;"></textarea>
219 219 
 								</td>
 
@@ -276,7 +276,7 @@
276 276 
 								<td colspan="3"><input type="text" class="changeKey" /></td>
277 277 
 							</tr>
278 278 
 							<tr>
279 
-								<th>内容：</th>
279 
+								<th><i style="color: #FF0000">*&nbsp;</i>内容：</th>
280 280 
 								<td colspan="3"><textarea id="changeEditor" name="content" style="width: 100%;height: 100px;"></textarea></td>
281 281 
 							</tr>
282 282 
 						</tbody>