liuyifan 4 gadi atpakaļ
vecāks
revīzija
a46364d218

+ 9 - 0
WebChart/.project

60
 				<arguments>1.0-name-matches-false-false-node_modules</arguments>
60
 				<arguments>1.0-name-matches-false-false-node_modules</arguments>
61
 			</matcher>
61
 			</matcher>
62
 		</filter>
62
 		</filter>
63
+		<filter>
64
+			<id>1626234389736</id>
65
+			<name></name>
66
+			<type>26</type>
67
+			<matcher>
68
+				<id>org.eclipse.ui.ide.multiFilter</id>
69
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
70
+			</matcher>
71
+		</filter>
63
 	</filteredResources>
72
 	</filteredResources>
64
 </projectDescription>
73
 </projectDescription>

+ 28 - 0
WebChartBig/.project

1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<projectDescription>
3
+	<name>安阳WebChartBig</name>
4
+	<comment></comment>
5
+	<projects>
6
+	</projects>
7
+	<buildSpec>
8
+		<buildCommand>
9
+			<name>com.aptana.ide.core.unifiedBuilder</name>
10
+			<arguments>
11
+			</arguments>
12
+		</buildCommand>
13
+	</buildSpec>
14
+	<natures>
15
+		<nature>com.aptana.projects.webnature</nature>
16
+	</natures>
17
+	<filteredResources>
18
+		<filter>
19
+			<id>1626234283040</id>
20
+			<name></name>
21
+			<type>26</type>
22
+			<matcher>
23
+				<id>org.eclipse.ui.ide.multiFilter</id>
24
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
25
+			</matcher>
26
+		</filter>
27
+	</filteredResources>
28
+</projectDescription>

+ 1 - 2
WebChartBig/Script/Common/huayi.config.js

6
     callcenter_url: "http://192.168.8.13:1001/",//生产环境
6
     callcenter_url: "http://192.168.8.13:1001/",//生产环境
7
     //callcenter_data: "http://192.168.4.18:4032/",//市县选择
7
     //callcenter_data: "http://192.168.4.18:4032/",//市县选择
8
 // callcenter_url: "http://12345.shangqiu.gov.cn:8819/",//生产环境
8
 // callcenter_url: "http://12345.shangqiu.gov.cn:8819/",//生产环境
9
-    //callcenter_url: "http://localhost:63662/"//测试环境
10
-
9
+//  callcenter_url: "http://localhost:63662/"//测试环境
11
 //  socket_ip: "192.168.5.8",//ip
10
 //  socket_ip: "192.168.5.8",//ip
12
     socket_ip: "192.168.4.3",//ip
11
     socket_ip: "192.168.4.3",//ip
13
     socket_port: "8081",//端口
12
     socket_port: "8081",//端口

+ 28 - 0
WebChartBigNew/.project

1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<projectDescription>
3
+	<name>安阳WebChartBigNew</name>
4
+	<comment></comment>
5
+	<projects>
6
+	</projects>
7
+	<buildSpec>
8
+		<buildCommand>
9
+			<name>com.aptana.ide.core.unifiedBuilder</name>
10
+			<arguments>
11
+			</arguments>
12
+		</buildCommand>
13
+	</buildSpec>
14
+	<natures>
15
+		<nature>com.aptana.projects.webnature</nature>
16
+	</natures>
17
+	<filteredResources>
18
+		<filter>
19
+			<id>1626234317024</id>
20
+			<name></name>
21
+			<type>26</type>
22
+			<matcher>
23
+				<id>org.eclipse.ui.ide.multiFilter</id>
24
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
25
+			</matcher>
26
+		</filter>
27
+	</filteredResources>
28
+</projectDescription>

+ 28 - 0
WebChartBigNew2/.project

1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<projectDescription>
3
+	<name>安阳WebChartBigNew2</name>
4
+	<comment></comment>
5
+	<projects>
6
+	</projects>
7
+	<buildSpec>
8
+		<buildCommand>
9
+			<name>com.aptana.ide.core.unifiedBuilder</name>
10
+			<arguments>
11
+			</arguments>
12
+		</buildCommand>
13
+	</buildSpec>
14
+	<natures>
15
+		<nature>com.aptana.projects.webnature</nature>
16
+	</natures>
17
+	<filteredResources>
18
+		<filter>
19
+			<id>1626234338662</id>
20
+			<name></name>
21
+			<type>26</type>
22
+			<matcher>
23
+				<id>org.eclipse.ui.ide.multiFilter</id>
24
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
25
+			</matcher>
26
+		</filter>
27
+	</filteredResources>
28
+</projectDescription>

+ 1 - 2
WebChat/Script/Common/huayi.config.js

3
 }
3
 }
4
 huayi.config = {
4
 huayi.config = {
5
     //callcenter_url: "http://117.158.196.116:4010/"//生产环境
5
     //callcenter_url: "http://117.158.196.116:4010/"//生产环境
6
-	//callcenter_url: "http://117.160.143.195:4010/"//生产环境
7
-	callcenter_url: "http://12345.shangqiu.gov.cn:8819/"//生产环境
6
+	callcenter_url: "http://192.168.8.9:1042/" //测试环境
8
 };
7
 };

+ 151 - 115
WebChat/html/myTouSu.html

24
             width: 100%;
24
             width: 100%;
25
         }
25
         }
26
 
26
 
27
-        .mui-table-view .mui-table-view-cell > a:not(.mui-btn) {
27
+        .mui-table-view .mui-table-view-cell>a:not(.mui-btn) {
28
             text-align: center;
28
             text-align: center;
29
         }
29
         }
30
 
30
 
62
             padding-right: 1px !important;
62
             padding-right: 1px !important;
63
             padding-left: 51px !important;
63
             padding-left: 51px !important;
64
         }
64
         }
65
+
65
         .ztext {
66
         .ztext {
66
             width: 100%;
67
             width: 100%;
67
             margin: 0;
68
             margin: 0;
68
             border: 0;
69
             border: 0;
69
         }
70
         }
71
+
70
         .action {
72
         .action {
71
             padding: 11px 15px;
73
             padding: 11px 15px;
72
         }
74
         }
125
                 <div class="mui-input-row">
127
                 <div class="mui-input-row">
126
                     <label class="label">主题词:</label>
128
                     <label class="label">主题词:</label>
127
                     <input type="text" id='zhuTiResult' class="ui-alert type_con" data-index="" readonly="readonly" />
129
                     <input type="text" id='zhuTiResult' class="ui-alert type_con" data-index="" readonly="readonly" />
128
-                    <a href="javascript:void(0)"><span class="type_down mui-icon mui-icon-arrowdown mui-pull-right"></span></a>
130
+                    <a href="javascript:void(0)"><span
131
+                            class="type_down mui-icon mui-icon-arrowdown mui-pull-right"></span></a>
129
                 </div>
132
                 </div>
130
             </li>
133
             </li>
131
 
134
 
150
             </li>
153
             </li>
151
             <li class="mui-table-view-cell">
154
             <li class="mui-table-view-cell">
152
                 <div class="mui-input-row">
155
                 <div class="mui-input-row">
153
-                    <textarea class="ztext content" name="" id="textarea" rows="3" cols="" placeholder="请详细描述您的问题..."></textarea>
156
+                    <textarea class="ztext content" name="" id="textarea" rows="3" cols=""
157
+                        placeholder="请详细描述您的问题..."></textarea>
154
                 </div>
158
                 </div>
155
             </li>
159
             </li>
156
             <li class="mui-table-view-cell">
160
             <li class="mui-table-view-cell">
178
             <li class="mui-table-view-cell" id='showCityPicker3'>
182
             <li class="mui-table-view-cell" id='showCityPicker3'>
179
                 <div class="mui-input-row">
183
                 <div class="mui-input-row">
180
                     <label class="label adress"></label>
184
                     <label class="label adress"></label>
181
-                    <input type="text" id='cityResult3' data-index="" class="ui-alert type_con" placeholder="请选择市县" readonly="readonly" />
182
-                    <a href="javascript:void(0)"><span class="type_down mui-icon mui-icon-arrowdown mui-pull-right"></span></a>
185
+                    <input type="text" id='cityResult3' data-index="" class="ui-alert type_con" placeholder="请选择市县"
186
+                        readonly="readonly" />
187
+                    <a href="javascript:void(0)"><span
188
+                            class="type_down mui-icon mui-icon-arrowdown mui-pull-right"></span></a>
183
                 </div>
189
                 </div>
184
             </li>
190
             </li>
185
             <li class="mui-table-view-cell" id='showtown'>
191
             <li class="mui-table-view-cell" id='showtown'>
186
                 <div class="mui-input-row">
192
                 <div class="mui-input-row">
187
                     <label class="label">街道:</label>
193
                     <label class="label">街道:</label>
188
-                    <input type="text" id='town' data-index="" class="ui-alert type_con" placeholder="请选择街道" readonly="readonly" />
189
-                    <a href="javascript:void(0)"><span class="type_down mui-icon mui-icon-arrowdown mui-pull-right"></span></a>
194
+                    <input type="text" id='town' data-index="" class="ui-alert type_con" placeholder="请选择街道"
195
+                        readonly="readonly" />
196
+                    <a href="javascript:void(0)"><span
197
+                            class="type_down mui-icon mui-icon-arrowdown mui-pull-right"></span></a>
190
                 </div>
198
                 </div>
191
             </li>
199
             </li>
192
             <li class="mui-table-view-cell" id='showvillage'>
200
             <li class="mui-table-view-cell" id='showvillage'>
193
                 <div class="mui-input-row">
201
                 <div class="mui-input-row">
194
                     <label class="label">村庄:</label>
202
                     <label class="label">村庄:</label>
195
-                    <input type="text" id='village' data-index="" class="ui-alert type_con" placeholder="请选择村庄" readonly="readonly" />
196
-                    <a href="javascript:void(0)"><span class="type_down mui-icon mui-icon-arrowdown mui-pull-right"></span></a>
203
+                    <input type="text" id='village' data-index="" class="ui-alert type_con" placeholder="请选择村庄"
204
+                        readonly="readonly" />
205
+                    <a href="javascript:void(0)"><span
206
+                            class="type_down mui-icon mui-icon-arrowdown mui-pull-right"></span></a>
197
                 </div>
207
                 </div>
198
             </li>
208
             </li>
199
             <li class="mui-table-view-cell">
209
             <li class="mui-table-view-cell">
220
             <span style="color: #f81737;">如事件内容地址填写不详细,将影响到你事件办理,请填写详细</span>
230
             <span style="color: #f81737;">如事件内容地址填写不详细,将影响到你事件办理,请填写详细</span>
221
         </p>
231
         </p>
222
         <!--<button type="button" class="mui-btn mui-btn-primary mui-btn-block block_button">提交</button>-->
232
         <!--<button type="button" class="mui-btn mui-btn-primary mui-btn-block block_button">提交</button>-->
223
-        <button type="button" data-loading-text="提交中" class="mui-btn mui-btn-primary mui-btn-block block_button submit">提交</button>
233
+        <button type="button" data-loading-text="提交中"
234
+            class="mui-btn mui-btn-primary mui-btn-block block_button submit">提交</button>
224
     </div>
235
     </div>
225
     <script src="../layui/layui.js"></script>
236
     <script src="../layui/layui.js"></script>
226
     <script src="../js/mui.min.js"></script>
237
     <script src="../js/mui.min.js"></script>
231
     <script src="../Script/Common/huayi.http.js"></script>
242
     <script src="../Script/Common/huayi.http.js"></script>
232
     <script src="../js/feedback-page.js"></script>
243
     <script src="../js/feedback-page.js"></script>
233
     <script type="text/javascript">
244
     <script type="text/javascript">
234
-//      $(document).ready(function () {
235
-	 		var townPicker, villagePicker,areaList = [],townList = [],villageList = [],keyList = [];
236
-            var openid = helper.cookies.get("openid");
237
-            //var openid = "obwtK6JT-bTCeSbtqu4lkw4lIz0o";
245
+        var townPicker, villagePicker, areaList = [],
246
+            townList = [],
247
+            villageList = [],
248
+            keyList = [];
249
+        var openid = "obwtK6JT-bTCeSbtqu4lkw4lIz0o";
250
+        var menuCode = "WYTS";
251
+//          var openid = helper.cookies.get("openid");
252
+        // var menuCode = helper.request.queryString("menuCode");
253
+        $(document).ready(function () {
238
             if (!openid) {
254
             if (!openid) {
239
                 window.location.replace("../html/error.html");
255
                 window.location.replace("../html/error.html");
240
             }
256
             }
241
-            var menuCode = helper.request.queryString("menuCode");
242
 
257
 
243
             if (menuCode == 'WYBY') {
258
             if (menuCode == 'WYBY') {
244
                 $('.adress').html('市县:');
259
                 $('.adress').html('市县:');
248
                 $('.baoMi').show();
263
                 $('.baoMi').show();
249
             }
264
             }
250
             switch (menuCode) {
265
             switch (menuCode) {
251
-                case "WYZX": $("title").html("我要咨询"); $('#userResult').attr('data-index', '9'); $('#userResult').val('咨询'); break;
252
-                case "WYQZ": $("title").html("我要求助"); $('#userResult').attr('data-index', '10'); $('#userResult').val('求助'); break;
253
-                case "WYTS": $("title").html("我要投诉"); $('#userResult').attr('data-index', '11'); $('#userResult').val('投诉'); break;
254
-                case "WYJY": $("title").html("我要建议"); $('#userResult').attr('data-index', '12'); $('#userResult').val('建议 '); break;
255
-                case "WYBY": $("title").html("我要表扬"); $('#userResult').attr('data-index', '13'); $('#userResult').val('表扬'); break;
266
+                case "WYZX":
267
+                    $("title").html("我要咨询");
268
+                    $('#userResult').attr('data-index', '9');
269
+                    $('#userResult').val('咨询');
270
+                    break;
271
+                case "WYQZ":
272
+                    $("title").html("我要求助");
273
+                    $('#userResult').attr('data-index', '10');
274
+                    $('#userResult').val('求助');
275
+                    break;
276
+                case "WYTS":
277
+                    $("title").html("我要投诉");
278
+                    $('#userResult').attr('data-index', '11');
279
+                    $('#userResult').val('投诉');
280
+                    break;
281
+                case "WYJY":
282
+                    $("title").html("我要建议");
283
+                    $('#userResult').attr('data-index', '12');
284
+                    $('#userResult').val('建议 ');
285
+                    break;
286
+                case "WYBY":
287
+                    $("title").html("我要表扬");
288
+                    $('#userResult').attr('data-index', '13');
289
+                    $('#userResult').val('表扬');
290
+                    break;
256
             }
291
             }
257
             //提交按钮
292
             //提交按钮
258
             $('.submit').on('tap', function () {
293
             $('.submit').on('tap', function () {
266
                     if (a) {
301
                     if (a) {
267
                         if (str_ary) {
302
                         if (str_ary) {
268
                             str_ary = str_ary + ',' + a;
303
                             str_ary = str_ary + ',' + a;
269
-                        }
270
-                        else {
304
+                        } else {
271
                             str_ary = a;
305
                             str_ary = a;
272
                         }
306
                         }
273
                     }
307
                     }
291
                 if (!$('#phone').val()) {
325
                 if (!$('#phone').val()) {
292
                     mui.alert('请输入联系电话!');
326
                     mui.alert('请输入联系电话!');
293
                     return;
327
                     return;
294
-                }
295
-                else {
328
+                } else {
296
 
329
 
297
                     var regTel = /^(([0\+]\d{2,3}-)?((0\d{2,3}))?(-)?)?(\d{7,8})(-(\d{3,}))?$/;
330
                     var regTel = /^(([0\+]\d{2,3}-)?((0\d{2,3}))?(-)?)?(\d{7,8})(-(\d{3,}))?$/;
298
                     var regMobile = /^([+-]?)\d*\.?\d+$/;
331
                     var regMobile = /^([+-]?)\d*\.?\d+$/;
317
                     async: true,
350
                     async: true,
318
                     data: {
351
                     data: {
319
                         openid: openid,
352
                         openid: openid,
320
-                        cusname: $('#name').val(),//投诉人姓名
321
-                        cusphone: $('#phone').val(),//投诉人电话
322
-                        conphone: $('#phone').val(),//客户电话
323
-                        title: $('#title').val(),//投诉主题
324
-                        content: $('.content').val(),//投诉内容
325
-                        sourcearea: $('#cityResult3').attr('data-index'),//事发地域id
326
-                        sourceaddress: $('#town').val()+" "+$('#village').val()+" "+$('#detail_address').val(),//详细地址
327
-                        keys: $('#zhuTiResult').attr('data-index'),//关键词
328
-                        type: $('#userResult').attr('data-index'),//诉求类型
353
+                        cusname: $('#name').val(), //投诉人姓名
354
+                        cusphone: $('#phone').val(), //投诉人电话
355
+                        conphone: $('#phone').val(), //客户电话
356
+                        title: $('#title').val(), //投诉主题
357
+                        content: $('.content').val(), //投诉内容
358
+                        sourcearea: $('#cityResult3').attr('data-index'), //事发地域id
359
+                        sourceaddress: $('#town').val() + " " + $('#village').val() + " " + $(
360
+                            '#detail_address').val(), //详细地址
361
+                        keys: $('#zhuTiResult').attr('data-index'), //关键词
362
+                        type: $('#userResult').attr('data-index'), //诉求类型
329
                         files: str_ary,
363
                         files: str_ary,
330
-                        isprotect: $('input[name="secret"]:checked').val()//(0普通1保密)
364
+                        isprotect: $('input[name="secret"]:checked').val() //(0普通1保密)
331
                     },
365
                     },
332
                     success: function (data) {
366
                     success: function (data) {
333
                         var str = JSON.parse(data);
367
                         var str = JSON.parse(data);
350
 
384
 
351
             if (openid) {
385
             if (openid) {
352
                 //事发地域
386
                 //事发地域
353
-                getArea(1,0);
387
+                getArea(1, 0);
354
                 //主题词
388
                 //主题词
355
                 $.ajax({
389
                 $.ajax({
356
                     type: "get",
390
                     type: "get",
357
                     url: huayi.config.callcenter_url + 'WxLogin/GetKeyList',
391
                     url: huayi.config.callcenter_url + 'WxLogin/GetKeyList',
358
                     async: false,
392
                     async: false,
359
-                    data: { openid: openid },
393
+                    data: {
394
+                        openid: openid
395
+                    },
360
                     dataType: 'json',
396
                     dataType: 'json',
361
                     success: function (data) {
397
                     success: function (data) {
362
                         var key_data = data.data;
398
                         var key_data = data.data;
369
                     }
405
                     }
370
                 });
406
                 });
371
             }
407
             }
372
-//      })
373
-        
374
-        function getArea(arrType,ids){
375
-        	townList = [];
376
-        	villageList = [];
377
-        	$.ajax({
378
-                    type: "get",
379
-                    url: huayi.config.callcenter_url + 'Web/GetWebAreaListById',
380
-                    async: false,
381
-                    data: {
382
-                    	openid: openid,
383
-                    	id: ids
384
-                    },
385
-                    dataType: 'json',
386
-                    success: function (data) {
387
-                        var area_data = data.data;
388
-                        $(area_data).each(function (i, n) {
389
-                            var obj = {};
390
-                            obj.value = n.F_AreaId;
391
-                            obj.text = n.F_AreaName;
392
-                            if(arrType==1){
393
-                            	areaList.push(obj)
394
-                            }else if(arrType==2){
395
-                            	console.log(arrType)
396
-                            	townList.push(obj)
397
-                            	townPicker.setData(townList);
398
-                            }else{
399
-                            	villageList.push(obj)
400
-                            		villagePicker.setData(villageList);
401
-                            }
402
-                            
403
-                        })
404
-//                      console.log(townList)
405
-//                       if(arrType==2){
406
-//                          	townPicker.setData(townList);
407
-//                          }else if(arrType==3){
408
-//                          	villagePicker.setData(villageList);
409
-//                          }
410
-                    }
411
-                });
408
+        })
409
+
410
+        function getArea(arrType, ids) {
411
+            townList = [];
412
+            villageList = [];
413
+            $.ajax({
414
+                type: "get",
415
+                url: huayi.config.callcenter_url + 'Web/GetWebAreaListById',
416
+                async: false,
417
+                data: {
418
+                    openid: openid,
419
+                    id: ids
420
+                },
421
+                dataType: 'json',
422
+                success: function (data) {
423
+                    var area_data = data.data;
424
+                    $(area_data).each(function (i, n) {
425
+                        var obj = {};
426
+                        obj.value = n.F_AreaId;
427
+                        obj.text = n.F_AreaName;
428
+                        if (arrType == 1) {
429
+                            areaList.push(obj)
430
+                        } else if (arrType == 2) {
431
+                            console.log(arrType)
432
+                            townList.push(obj)
433
+                            townPicker.setData(townList);
434
+                        } else {
435
+                            villageList.push(obj)
436
+                            villagePicker.setData(villageList);
437
+                        }
438
+                    })
439
+                    // console.log(townList)
440
+                    // if(arrType==2){
441
+                    //     townPicker.setData(townList);
442
+                    //     }else if(arrType==3){
443
+                    //     villagePicker.setData(villageList);
444
+                    //     }
445
+                }
446
+            });
412
         }
447
         }
413
-        
448
+
414
         //工单类型
449
         //工单类型
415
         //      var typeList=[];
450
         //      var typeList=[];
416
         //      $.ajax({
451
         //      $.ajax({
431
         //      });
466
         //      });
432
 
467
 
433
 
468
 
434
-       
469
+
435
         (function ($, doc) {
470
         (function ($, doc) {
436
             $.init();
471
             $.init();
437
             $.ready(function () {
472
             $.ready(function () {
473
                 var showCityPickerButton = doc.getElementById('showCityPicker3');
508
                 var showCityPickerButton = doc.getElementById('showCityPicker3');
474
                 var cityResult3 = doc.getElementById('cityResult3');
509
                 var cityResult3 = doc.getElementById('cityResult3');
475
                 showCityPickerButton.addEventListener('tap', function (event) {
510
                 showCityPickerButton.addEventListener('tap', function (event) {
476
-//                  if (areaList.length > 0) {
477
-                        cityPicker3.show(function (items) {
478
-                            cityResult3.value = (items[0].text ? items[0].text : "");
479
-                            cityResult3.setAttribute("data-index", items[0].value);
480
-                            //返回 false 可以阻止选择框的关闭
481
-                            //return false;
482
-                             getArea(2,items[0].value);
483
-                              if (townList.length == 0) {
484
-		                            doc.getElementById('town').value="暂无数据";
485
-		                        } else {
486
-		                        	doc.getElementById('town').value="";
487
-		                            doc.getElementById('town').setAttribute("placeholder", "请选择街道");
488
-		                            doc.getElementById('village').value="";
489
-		                              doc.getElementById('village').setAttribute("placeholder", "请选择村庄");
490
-		                        }
491
-                        });
492
-//                  }
511
+                    //                  if (areaList.length > 0) {
512
+                    cityPicker3.show(function (items) {
513
+                        cityResult3.value = (items[0].text ? items[0].text : "");
514
+                        cityResult3.setAttribute("data-index", items[0].value);
515
+                        //返回 false 可以阻止选择框的关闭
516
+                        //return false;
517
+                        getArea(2, items[0].value);
518
+                        if (townList.length == 0) {
519
+                            doc.getElementById('town').value = "暂无数据";
520
+                        } else {
521
+                            doc.getElementById('town').value = "";
522
+                            doc.getElementById('town').setAttribute("placeholder", "请选择街道");
523
+                            doc.getElementById('village').value = "";
524
+                            doc.getElementById('village').setAttribute("placeholder",
525
+                                "请选择村庄");
526
+                        }
527
+                    });
528
+                    //                  }
493
                 }, false);
529
                 }, false);
494
                 //街道
530
                 //街道
495
-               		townPicker= new $.PopPicker({
531
+                townPicker = new $.PopPicker({
496
                     layer: 1
532
                     layer: 1
497
                 });
533
                 });
498
-//              townPicker.setData(townList);
534
+                //              townPicker.setData(townList);
499
                 var townPickerPickerButton = doc.getElementById('showtown');
535
                 var townPickerPickerButton = doc.getElementById('showtown');
500
                 var townResult = doc.getElementById('town');
536
                 var townResult = doc.getElementById('town');
501
                 townPickerPickerButton.addEventListener('tap', function (event) {
537
                 townPickerPickerButton.addEventListener('tap', function (event) {
505
                             townResult.setAttribute("data-index", items[0].value);
541
                             townResult.setAttribute("data-index", items[0].value);
506
                             //返回 false 可以阻止选择框的关闭
542
                             //返回 false 可以阻止选择框的关闭
507
                             //return false;
543
                             //return false;
508
-                            getArea(3,items[0].value);
544
+                            getArea(3, items[0].value);
509
                             if (villageList.length == 0) {
545
                             if (villageList.length == 0) {
510
-		                            doc.getElementById('village').value="暂无数据";
511
-//		                            doc.getElementById('village').setAttribute("placeholder", "暂无数据");
512
-		                        } else {
513
-		                        	doc.getElementById('village').value="";
514
-		                            doc.getElementById('village').setAttribute("placeholder", "请选择村庄");
515
-		                        }
546
+                                doc.getElementById('village').value = "暂无数据";
547
+                                //		                            doc.getElementById('village').setAttribute("placeholder", "暂无数据");
548
+                            } else {
549
+                                doc.getElementById('village').value = "";
550
+                                doc.getElementById('village').setAttribute("placeholder",
551
+                                    "请选择村庄");
552
+                            }
516
                         });
553
                         });
517
                     }
554
                     }
518
                 }, false);
555
                 }, false);
519
                 //村庄
556
                 //村庄
520
-                	 villagePicker= new $.PopPicker({
557
+                villagePicker = new $.PopPicker({
521
                     layer: 1
558
                     layer: 1
522
                 });
559
                 });
523
-//              townPicker.setData(townList);
560
+                //              townPicker.setData(townList);
524
                 var villagePickerPickerButton = doc.getElementById('showvillage');
561
                 var villagePickerPickerButton = doc.getElementById('showvillage');
525
                 var villageResult = doc.getElementById('village');
562
                 var villageResult = doc.getElementById('village');
526
                 villagePickerPickerButton.addEventListener('tap', function (event) {
563
                 villagePickerPickerButton.addEventListener('tap', function (event) {
527
-//                  if (townList.length > 0) {
528
-                        villagePicker.show(function (items) {
529
-                            villageResult.value = (items[0].text ? items[0].text : "");
530
-                            villageResult.setAttribute("data-index", items[0].value);
531
-                            //返回 false 可以阻止选择框的关闭
532
-                            //return false;
533
-                        });
534
-//                  }
564
+                    //                  if (townList.length > 0) {
565
+                    villagePicker.show(function (items) {
566
+                        villageResult.value = (items[0].text ? items[0].text : "");
567
+                        villageResult.setAttribute("data-index", items[0].value);
568
+                        //返回 false 可以阻止选择框的关闭
569
+                        //return false;
570
+                    });
571
+                    //                  }
535
                 }, false);
572
                 }, false);
536
-
537
             })
573
             })
538
         })(mui, document);
574
         })(mui, document);
539
     </script>
575
     </script>

+ 2 - 1
WebChat/index.html

15
         <script src="Script/Common/huayi.config.js"></script>
15
         <script src="Script/Common/huayi.config.js"></script>
16
         <script src="Script/Common/huayi.http.js"></script>
16
         <script src="Script/Common/huayi.http.js"></script>
17
 		<script type="text/javascript">
17
 		<script type="text/javascript">
18
-            var openid = helper.cookies.get("openid");
18
+            // var openid = helper.cookies.get("openid");
19
+         	var openid = "obwtK6JT-bTCeSbtqu4lkw4lIz0o";
19
             var code = helper.request.queryString("code");
20
             var code = helper.request.queryString("code");
20
             var menucode = helper.request.queryString("menucode");
21
             var menucode = helper.request.queryString("menucode");
21
             if (!openid) {
22
             if (!openid) {

+ 1 - 1
WebUI/CallCenterWeb.UI/Appeal/AddAppeal.html

571
                     if (data.state.toLowerCase() == "success") {
571
                     if (data.state.toLowerCase() == "success") {
572
                         var content = data.data;
572
                         var content = data.data;
573
                         $(content).each(function (i, n) {
573
                         $(content).each(function (i, n) {
574
-                            $("<option value='" + n.F_Value + "'>" + n.F_Value + "</option>")
574
+                            $("<option value='" + n.F_Value + "'>" + n.F_Remark + "</option>")
575
                                 .appendTo(obj);
575
                                 .appendTo(obj);
576
                         })
576
                         })
577
                     }
577
                     }

+ 19 - 0
WebUI/CallCenterWeb.UI/Business/LeaderYJA.html

411
                 html += html1;
411
                 html += html1;
412
 
412
 
413
             }
413
             }
414
+            html += '<a class="xg" onclick="unsuccessful(\'' + row.F_WorkOrderId + '\')">已办未果&nbsp</a>';
414
             return html;
415
             return html;
415
         }
416
         }
416
 
417
 
698
             });
699
             });
699
         }
700
         }
700
 
701
 
702
+        // 已办未果
703
+        function unsuccessful(str) {
704
+            layer.confirm('确认已办未果吗?', {
705
+                btn: ['是', '否'] //按钮
706
+            }, function () {
707
+                $.post(huayi.config.callcenter_url + 'WorkOrder/Transfer', {
708
+                    workorderid: str,
709
+                    "token": $.cookie("token")
710
+                }, function (result) {
711
+                    result = JSON.parse(result);
712
+                    if (result.state.toLowerCase() == "success") {
713
+                        layer.msg("操作成功");
714
+                        $("#orderlist").bootstrapTable('refresh');
715
+                    }
716
+                })
717
+            });
718
+        }
719
+
701
         $('.Appeal').click(function () {
720
         $('.Appeal').click(function () {
702
             layer.open({
721
             layer.open({
703
                 type: 2,
722
                 type: 2,

+ 32 - 19
WebUI/CallCenterWeb.UI/CommonHtml/AddAppealDCL.html

55
                     <tr>
55
                     <tr>
56
                         <th class="Importent">标题:</th>
56
                         <th class="Importent">标题:</th>
57
                         <td colspan="7">
57
                         <td colspan="7">
58
-                            <input id="title" type="text" style="width: 100%" />
58
+                            <input id="title" class="form-control" type="text" />
59
                         </td>
59
                         </td>
60
                     </tr>
60
                     </tr>
61
                     <tr class="content-wrapper">
61
                     <tr class="content-wrapper">
62
                         <th class="Importent">来电内容:</th>
62
                         <th class="Importent">来电内容:</th>
63
                         <td colspan="7">
63
                         <td colspan="7">
64
-                            <textarea data-adaptheight id="content" name="" rows="" cols="" style="width: 100%"
64
+                            <textarea data-adaptheight id="content" class="form-control" name="" rows="" cols="" 
65
                                 readonly="readonly"></textarea>
65
                                 readonly="readonly"></textarea>
66
                         </td>
66
                         </td>
67
                     </tr>
67
                     </tr>
68
                     <tr class="workcontent-wrapper">
68
                     <tr class="workcontent-wrapper">
69
                         <th class="Importent">工单内容:</th>
69
                         <th class="Importent">工单内容:</th>
70
                         <td colspan="7">
70
                         <td colspan="7">
71
-                            <textarea data-adaptheight id="workcontent" name="" rows="" cols=""
71
+                            <textarea data-adaptheight id="workcontent" class="form-control" name="" rows="" cols=""
72
                                 style="width: 100%;"></textarea>
72
                                 style="width: 100%;"></textarea>
73
                         </td>
73
                         </td>
74
                     </tr>
74
                     </tr>
104
                     <tr>
104
                     <tr>
105
                         <th class="Importent">姓名:</th>
105
                         <th class="Importent">姓名:</th>
106
                         <td>
106
                         <td>
107
-                            <input type="text" id="cusname" />
107
+                            <input type="text" id="cusname" class="form-control" />
108
                         </td>
108
                         </td>
109
                         <th>性别:</th>
109
                         <th>性别:</th>
110
                         <td>
110
                         <td>
111
-                            <select class="select_" id="SEX">
111
+                            <select class="form-control" id="SEX">
112
                                 <option value="">请选择</option>
112
                                 <option value="">请选择</option>
113
                                 <option value="0">男</option>
113
                                 <option value="0">男</option>
114
                                 <option value="1">女</option>
114
                                 <option value="1">女</option>
116
                         </td>
116
                         </td>
117
                         <th>来源:</th>
117
                         <th>来源:</th>
118
                         <td>
118
                         <td>
119
-                            <select class="select_" id="source"></select>
119
+                            <select class="form-control" id="source"></select>
120
                         </td>
120
                         </td>
121
                         <th class="Importent">来电号码:</th>
121
                         <th class="Importent">来电号码:</th>
122
                         <td>
122
                         <td>
123
-                            <input type="text" id="cusphone" />
123
+                            <input type="text" id="cusphone" class="form-control" />
124
                         </td>
124
                         </td>
125
                     </tr>
125
                     </tr>
126
                     <tr>
126
                     <tr>
127
                         <th>类型:</th>
127
                         <th>类型:</th>
128
                         <td>
128
                         <td>
129
-                            <select class="select_" id="type"></select>
129
+                            <select class="form-control" id="type"></select>
130
                         </td>
130
                         </td>
131
                         <th class="Importent">反映类别:</th>
131
                         <th class="Importent">反映类别:</th>
132
                         <td class="reflectCategory-wrapper">
132
                         <td class="reflectCategory-wrapper">
156
                         </td>
156
                         </td>
157
                         <th>紧急程度:</th>
157
                         <th>紧急程度:</th>
158
                         <td>
158
                         <td>
159
-                            <select class="select_" id="level">
159
+                            <select class="form-control" id="level">
160
                                 <!--<option value="0">选择</option>-->
160
                                 <!--<option value="0">选择</option>-->
161
                                 <option value="1">普通</option>
161
                                 <option value="1">普通</option>
162
                                 <option value="2">紧急</option>
162
                                 <option value="2">紧急</option>
165
                     </tr>
165
                     </tr>
166
                     <tr>
166
                     <tr>
167
                         <th>承办单位:</th>
167
                         <th>承办单位:</th>
168
-                        <td colspan="3">
169
-                            <select id="jbSelect" name="select" class="selectpicker show-tick  form-control" multiple
168
+                        <td colspan="7">
169
+                            <input type="text" id="jbSelectText" class="form-control" style="width: 100%"/>
170
+                            <input type="hidden" id="jbSelect">
171
+                            <!-- <select id="jbSelect" name="select" class="selectpicker show-tick  form-control" multiple
170
                                 data-live-search="true">
172
                                 data-live-search="true">
171
-                            </select>
173
+                            </select> -->
172
                         </td>
174
                         </td>
173
                     </tr>
175
                     </tr>
174
                     <tr class="leaderCharge-wrapper" style="display: none;">
176
                     <tr class="leaderCharge-wrapper" style="display: none;">
175
                         <th class="">分管领导:</th>
177
                         <th class="">分管领导:</th>
176
                         <td>
178
                         <td>
177
-                            <select class="select_" id="leaderCharge">
179
+                            <select class="select_ form-control" id="leaderCharge">
178
                                 <option value="">请选择</option>
180
                                 <option value="">请选择</option>
179
                                 <option value="省长">省长</option>
181
                                 <option value="省长">省长</option>
180
                                 <option value="市长">市长</option>
182
                                 <option value="市长">市长</option>
184
                     <tr class="limittimeWrapper">
186
                     <tr class="limittimeWrapper">
185
                         <th>办理时限:</th>
187
                         <th>办理时限:</th>
186
                         <td colspan="3">
188
                         <td colspan="3">
187
-                            <select class="startTime" id="startTime"
189
+                            <select class="startTime form-control" id="startTime"
188
                                 style="width: 200px; height: 30px; line-height: 30px;">
190
                                 style="width: 200px; height: 30px; line-height: 30px;">
189
                                 <!--<option value="0">选择</option>-->
191
                                 <!--<option value="0">选择</option>-->
190
                                 <option value="1">一天</option>
192
                                 <option value="1">一天</option>
197
                     <tr class="limittimesWrapper">
199
                     <tr class="limittimesWrapper">
198
                         <th>紧急时限:</th>
200
                         <th>紧急时限:</th>
199
                         <td colspan="">
201
                         <td colspan="">
200
-                            <input type="text" id="limittimes">
202
+                            <input type="text" id="limittimes" class="form-control">
201
                         </td>
203
                         </td>
202
                     </tr>
204
                     </tr>
203
                     <tr class="limittimesWrapperCB" style="display: none;">
205
                     <tr class="limittimesWrapperCB" style="display: none;">
204
                         <th>办理时限:</th>
206
                         <th>办理时限:</th>
205
                         <td colspan="">
207
                         <td colspan="">
206
-                            <input type="text" id="limittimesCB" autocomplete="off">
208
+                            <input type="text" id="limittimesCB" class="form-control" autocomplete="off">
207
                         </td>
209
                         </td>
208
                     </tr>
210
                     </tr>
209
                     <tr>
211
                     <tr>
220
                     <tr>
222
                     <tr>
221
                         <th class="Importent">事件地址:</th>
223
                         <th class="Importent">事件地址:</th>
222
                         <td colspan="7">
224
                         <td colspan="7">
223
-                            <select class="select_" id="sourcearea"></select>
225
+                            <select class="select_ form-control" id="sourcearea"></select>
224
                         </td>
226
                         </td>
225
                     </tr>
227
                     </tr>
226
                     <tr>
228
                     <tr>
227
                         <th class="Importent"></th>
229
                         <th class="Importent"></th>
228
                         <td colspan="7">
230
                         <td colspan="7">
229
-                            <input id="sourceaddress" type="text" placeholder="输入详细地址"
231
+                            <input id="sourceaddress" class="form-control" type="text" placeholder="输入详细地址"
230
                                 style="width: 50%; padding-left: 15px" />
232
                                 style="width: 50%; padding-left: 15px" />
231
                         </td>
233
                         </td>
232
                     </tr>
234
                     </tr>
262
             LY($("#source"));
264
             LY($("#source"));
263
             LB($("#type"));
265
             LB($("#type"));
264
             ZT($("#keys"));
266
             ZT($("#keys"));
265
-            jbSelect($("#jbSelect"));
267
+            jbSelect($("#jbSelectText"));
266
             getReactionCategory();
268
             getReactionCategory();
267
             laydate.skin("blue");
269
             laydate.skin("blue");
268
             laydate({
270
             laydate({
862
             parent.layer.msg("操作成功");
864
             parent.layer.msg("操作成功");
863
         }
865
         }
864
 
866
 
867
+        $("#jbSelectText").click(function() {
868
+            var jbSelect = $("#jbSelect").val();
869
+            var jbSelectText = encodeURIComponent($("#jbSelectText").val());
870
+            layer.open({
871
+                type: 2,
872
+                content: "../CommonHtml/organizer.html?jbSelect=" + jbSelect + "&jbSelectText=" + jbSelectText, //iframe的url,no代表不显示滚动条
873
+                title: '承办单位',
874
+                area: ['60%', '80%'], //宽高
875
+            });
876
+        })
877
+
865
         function jbSelect(obj) {
878
         function jbSelect(obj) {
866
             obj.empty();
879
             obj.empty();
867
             $.getJSON(huayi.config.callcenter_url + "Department/GetDeptList", {
880
             $.getJSON(huayi.config.callcenter_url + "Department/GetDeptList", {

+ 162 - 0
WebUI/CallCenterWeb.UI/CommonHtml/organizer.html

1
+<!DOCTYPE html>
2
+<html>
3
+
4
+<head>
5
+    <meta charset="UTF-8">
6
+    <script src="../Script/Common/huayi.load.js"></script>
7
+    <script src="../Script/Common/huayi.config.js"></script>
8
+    <link href="../css/layer/need/layer.css" />
9
+    <link rel="stylesheet" href="../css/init.css" />
10
+    <link rel="stylesheet" href="../js/layui/css/layui.css">
11
+    <title>承办单位</title>
12
+    <style>
13
+        .reminderContent {
14
+            width: 90%;
15
+            margin: 0 auto;
16
+        }
17
+
18
+        .organizerListStyle {
19
+            display: inline-block;
20
+            height: 300px;
21
+            width: 40%;
22
+            overflow: auto;
23
+            border: 1px solid rgb(229, 230, 231);
24
+        }
25
+
26
+        .organizerListStyle li {
27
+            padding: 0 0 0 5px;
28
+        }
29
+
30
+        .organizerListStyle li:hover {
31
+            background: #00a1cb;
32
+        }
33
+
34
+        table tr th {
35
+            text-align: right;
36
+        }
37
+
38
+        .btns {
39
+            padding: 3px 18px;
40
+        }
41
+
42
+        .btn_box {
43
+            text-align: center !important;
44
+        }
45
+    </style>
46
+</head>
47
+
48
+<body>
49
+    <div class="Common reminderContent">
50
+        <table>
51
+            <tr>
52
+                <th class="Importent">承办单位:</th>
53
+                <td>
54
+                    <input id="organizer" class="form-control" type="text">
55
+                </td>
56
+                <td><button class="search btns">搜索</button></td>
57
+            <tr>
58
+                <td colspan="3">
59
+                    <ul id="organizerList" class="organizerListStyle">
60
+                    </ul>
61
+                    <ul id="addOrganizerList" class="organizerListStyle">
62
+                    </ul>
63
+                </td>
64
+            </tr>
65
+            <tr>
66
+                <td colspan="3" class="btn_box">
67
+                    <button id="save" class="btns">保存</button>
68
+                </td>
69
+            </tr>
70
+        </table>
71
+        <div class="btn_box">
72
+        </div>
73
+    </div>
74
+    <script src="../js/layui/layui.js"></script>
75
+    <script src="../css/laydate/laydate.js"></script>
76
+    <script src="../js/adjustHeight.js"></script>
77
+    <script>
78
+        var jbSelect = helper.request.queryString("jbSelect");
79
+        var jbSelectText = decodeURIComponent(helper.request.queryString("jbSelectText"));
80
+        $(document).ready(function () {
81
+            getOrganizer($("#organizerList"));
82
+            if (jbSelect.length > 0 && jbSelectText.length > 0) {
83
+                var id = jbSelect.split(",");
84
+                var text = jbSelectText.split(",");
85
+                for (var i = 0; i < id.length; i++) {
86
+                    $("<li data-id='" + id[i] + "'>" + text[i] + "</li>")
87
+                        .appendTo($("#addOrganizerList"));
88
+                }
89
+            }
90
+        })
91
+
92
+        // 承办单位
93
+        function getOrganizer(obj) {
94
+            obj.empty();
95
+            $.getJSON(huayi.config.callcenter_url + "Department/GetDeptList", {
96
+                token: $.cookie("token"),
97
+                iscbdw: 2,
98
+            }, function (data) {
99
+                if (data.state.toLowerCase() == "success") {
100
+                    var content = data.data;
101
+                    $(content).each(function (i, n) {
102
+                        $("<li data-id='" + n.F_DeptId + "'>" + n.F_DeptName + "</li>")
103
+                            .appendTo(
104
+                                obj);
105
+                    })
106
+                }
107
+            })
108
+        }
109
+
110
+        // 搜索承办单位
111
+        function searchOrganizer(obj) {
112
+            obj.empty();
113
+            $.getJSON(
114
+                huayi.config.callcenter_url + "Department/GetDeptListByDept", {
115
+                    token: $.cookie("token"),
116
+                    dept: $("#organizer").val(),
117
+                },
118
+                function (data) {
119
+                    if (data.state.toLowerCase() == "success") {
120
+                        var content = data.data;
121
+                        $(content).each(function (i, n) {
122
+                            $("<li data-id='" + n.F_DeptId + "'>" + n.F_DeptName + "</li>")
123
+                            .appendTo(
124
+                                obj);
125
+                        });
126
+                    }
127
+                }
128
+            );
129
+        }
130
+
131
+
132
+        $(".search").click(function () {
133
+            searchOrganizer($("#organizerList"));
134
+        })
135
+
136
+        $("#organizerList").on("click", "li", function () {
137
+            $("<li data-id='" + $(this).attr("data-id") + "'>" + $(this).text() + "</li>")
138
+                .appendTo($("#addOrganizerList"));
139
+        });
140
+        $("#addOrganizerList").on("click", "li", function () {
141
+            $(this).remove();
142
+        });
143
+
144
+        $("#save").click(function () {
145
+            var id = "";
146
+            var text = "";
147
+            $("#addOrganizerList").find("li").each(function (i, n) {
148
+                console.log("11", n);
149
+                id += $(this).attr("data-id") + ",";
150
+                text += $(this).text() + ",";
151
+            })
152
+            id = id.substring(0, (id.length - 1));
153
+            text = text.substring(0, (text.length - 1));
154
+            parent.$("#jbSelectText").val(text);
155
+            parent.$("#jbSelect").val(id);
156
+            var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
157
+            parent.layer.close(index); //再执行关闭
158
+        })
159
+    </script>
160
+</body>
161
+
162
+</html>

+ 0 - 1
WebUI/CallCenterWeb.UI/MultimediaWorkOrder/WorkIsproresultMedia.html

373
             } else {
373
             } else {
374
                 usercodeID = "";
374
                 usercodeID = "";
375
             }
375
             }
376
-
377
             //      	调度员
376
             //      	调度员
378
             var ddusercodeID = "";
377
             var ddusercodeID = "";
379
             var ddusercode_ = $("#yardman").val(); //坐席
378
             var ddusercode_ = $("#yardman").val(); //坐席

+ 1 - 1
WebUI/CallCenterWeb.UI/OtherPhoneManagement/LawsuitOtherPhone.html

1201
                     if (data.state.toLowerCase() == "success") {
1201
                     if (data.state.toLowerCase() == "success") {
1202
                         var content = data.data;
1202
                         var content = data.data;
1203
                         $(content).each(function (i, n) {
1203
                         $(content).each(function (i, n) {
1204
-                            $("<option value='" + n.F_Value + "'>" + n.F_Value + "</option>")
1204
+                            $("<option value='" + n.F_Value + "'>" + n.F_Remark + "</option>")
1205
                                 .appendTo(obj);
1205
                                 .appendTo(obj);
1206
                         })
1206
                         })
1207
                     }
1207
                     }

+ 5 - 3
WebUI/CallCenterWeb.UI/SystemManager/js/shuJuZiDian.js

193
                 pid: addPid, //当前选择节点ID
193
                 pid: addPid, //当前选择节点ID
194
                 name: addDeptname, //部门名称
194
                 name: addDeptname, //部门名称
195
                 deptid: $("#Dpment").val(), //部门名称id
195
                 deptid: $("#Dpment").val(), //部门名称id
196
+                remark: $("#addRemarks").val(), //备注
196
                 token: token,
197
                 token: token,
197
             },
198
             },
198
             success: function (data) {
199
             success: function (data) {
204
                     $(".inps1").val("");
205
                     $(".inps1").val("");
205
                     $(".inps2").val("");
206
                     $(".inps2").val("");
206
                     $(".inps3").val("");
207
                     $(".inps3").val("");
208
+                    $("#addRemarks").val();
207
                 }
209
                 }
208
             },
210
             },
209
         });
211
         });
224
         });
226
         });
225
         return;
227
         return;
226
     } else {
228
     } else {
227
-        // if (pid == "38") {
229
+        // if (String(pid) === "38") {
228
             $(".editkey").show();
230
             $(".editkey").show();
229
         // } else {
231
         // } else {
230
         //     $(".editkey").hide();
232
         //     $(".editkey").hide();
232
         changeAjax(id);
234
         changeAjax(id);
233
         $(".changeModel").css("display", "block");
235
         $(".changeModel").css("display", "block");
234
         $(".chtps").html(name);
236
         $(".chtps").html(name);
235
-        //			console.log(pidName);
236
-        //			console.log(pid);
237
         $(".inps4").val(pidName);
237
         $(".inps4").val(pidName);
238
         chbcPid = pid;
238
         chbcPid = pid;
239
         changeTreeCont();
239
         changeTreeCont();
328
             $(".inps5").val(chanCon.F_Value);
328
             $(".inps5").val(chanCon.F_Value);
329
             $(".inps3").val(chanCon.F_DeptName);
329
             $(".inps3").val(chanCon.F_DeptName);
330
             $("#Dpment").val(chanCon.F_Deptid);
330
             $("#Dpment").val(chanCon.F_Deptid);
331
+            $("#changeRemarks").val(chanCon.F_Remark);
331
             //				$('.inps6').val(chanCon.sort);
332
             //				$('.inps6').val(chanCon.sort);
332
             //				chbcSort = chanCon.sort;
333
             //				chbcSort = chanCon.sort;
333
             chbcName = chanCon.F_Value;
334
             chbcName = chanCon.F_Value;
346
             pid: chbcPid,
347
             pid: chbcPid,
347
             name: chbcName,
348
             name: chbcName,
348
             deptid: $("#Dpment").val(), //部门名称id
349
             deptid: $("#Dpment").val(), //部门名称id
350
+            remark: $("#changeRemarks").val(), //备注
349
             token: token,
351
             token: token,
350
         },
352
         },
351
         success: function (data) {
353
         success: function (data) {

+ 2 - 0
WebUI/CallCenterWeb.UI/SystemManager/shuJuZiDian.html

53
                     </div>
53
                     </div>
54
                 </div>
54
                 </div>
55
                 <div>分类名称:<input class="inps inps2" type="text" /></div>
55
                 <div>分类名称:<input class="inps inps2" type="text" /></div>
56
+                <div>字典备注:<input id="addRemarks" class="inps" type="text" /></div>
56
                 <div class="addkey">部门名称:
57
                 <div class="addkey">部门名称:
57
                     <div class="inpBox">
58
                     <div class="inpBox">
58
                         <input type="text" class="inps3" />
59
                         <input type="text" class="inps3" />
109
                     </div>
110
                     </div>
110
                 </div>
111
                 </div>
111
                 <div>分类名称:<input class="inps inps5" type="text" style="margin-left: 5px" /></div>
112
                 <div>分类名称:<input class="inps inps5" type="text" style="margin-left: 5px" /></div>
113
+                <div>字典备注:<input id="changeRemarks" class="inps" type="text" style="margin-left: 5px" /></div>
112
                 <div class="editkey">部门名称:
114
                 <div class="editkey">部门名称:
113
                     <div class="inpBox">
115
                     <div class="inpBox">
114
                         <input type="text" class="inps3" />
116
                         <input type="text" class="inps3" />

+ 4 - 4
WebUI/CallCenterWeb.UI/TelCall/CallRecord.html

469
 
469
 
470
                     if (stype == '1') {
470
                     if (stype == '1') {
471
                         param.usercode = usercodeID;
471
                         param.usercode = usercodeID;
472
-                        param.phone = $("#tel").val();
472
+                        param.phone = $("#tel").val().replace(/\s+/g, "");
473
                         param.starttime = $("#start").val();
473
                         param.starttime = $("#start").val();
474
                         param.endtime = $("#end").val();
474
                         param.endtime = $("#end").val();
475
                         param.callstate = $("#ss_hjzt").val();
475
                         param.callstate = $("#ss_hjzt").val();
477
                         param.type = $("#callType").val(); //type=通话类型
477
                         param.type = $("#callType").val(); //type=通话类型
478
                         param.actiontype = $("#ss_HJLX").val(); //呼叫类型
478
                         param.actiontype = $("#ss_HJLX").val(); //呼叫类型
479
                         param.tasktype = $("#sf_hf").val(); //呼叫类型
479
                         param.tasktype = $("#sf_hf").val(); //呼叫类型
480
-                        param.extnumber = $("#extnumber").val();
480
+                        param.extnumber = $("#extnumber").val().replace(/\s+/g, "");
481
                         param.phoneType = $("#phoneType").val();
481
                         param.phoneType = $("#phoneType").val();
482
                         param.islike = $("#islike").val(); // 查询类型
482
                         param.islike = $("#islike").val(); // 查询类型
483
                     } else if (stype == '2') {
483
                     } else if (stype == '2') {
490
                         param.type = $("#callType").val(); //type=通话类型
490
                         param.type = $("#callType").val(); //type=通话类型
491
                         param.actiontype = $("#ss_HJLX").val(); //呼叫类型
491
                         param.actiontype = $("#ss_HJLX").val(); //呼叫类型
492
                         param.tasktype = $("#sf_hf").val(); //呼叫类型
492
                         param.tasktype = $("#sf_hf").val(); //呼叫类型
493
-                        param.extnumber = $("#extnumber").val();
493
+                        param.extnumber = $("#extnumber").val().replace(/\s+/g, "");
494
                         param.phoneType = $("#phoneType").val();
494
                         param.phoneType = $("#phoneType").val();
495
                         param.islike = $("#islike").val(); // 查询类型
495
                         param.islike = $("#islike").val(); // 查询类型
496
                     }
496
                     }
666
                     if (data.state.toLowerCase() == "success") {
666
                     if (data.state.toLowerCase() == "success") {
667
                         var content = data.data;
667
                         var content = data.data;
668
                         $(content).each(function (i, n) {
668
                         $(content).each(function (i, n) {
669
-                            $("<option value='" + n.F_Value + "'>" + n.F_Value + "</option>")
669
+                            $("<option value='" + n.F_Value + "'>" + n.F_Remark + "</option>")
670
                                 .appendTo(obj);
670
                                 .appendTo(obj);
671
                         })
671
                         })
672
                     }
672
                     }

+ 2 - 2
WebUI/CallCenterWeb.UI/css/call.css

404
 }
404
 }
405
 .layui-menu li {
405
 .layui-menu li {
406
     margin: 0 !important;
406
     margin: 0 !important;
407
-    height: 24px;
408
-    line-height: 16px !important;
407
+    height: 20px;
408
+    line-height: 12px !important;
409
 }
409
 }

+ 2 - 2
WebUI/CallCenterWeb.UI/css/init.css

344
 }
344
 }
345
 .layui-menu li {
345
 .layui-menu li {
346
     margin: 0 !important;
346
     margin: 0 !important;
347
-    height: 24px;
348
-    line-height: 16px !important;
347
+    height: 20px;
348
+    line-height: 12px !important;
349
 }
349
 }

+ 4 - 4
WebUI/CallCenterWeb.UI/css/style.min862f.css

201
 }
201
 }
202
 
202
 
203
 .nav>li.active {
203
 .nav>li.active {
204
-	/*border-left: 4px solid #19aa8d;*/
204
+	border-left: 2px solid #00a1cb;
205
 	background: #00a1cb;
205
 	background: #00a1cb;
206
 }
206
 }
207
 
207
 
565
 }
565
 }
566
 
566
 
567
 .top-navigation .nav>li.active>a {
567
 .top-navigation .nav>li.active>a {
568
-	color: #1ab394
568
+	color: #00a1cb
569
 }
569
 }
570
 
570
 
571
 .top-navigation .navbar-right {
571
 .top-navigation .navbar-right {
3562
 	cursor: default
3562
 	cursor: default
3563
 }
3563
 }
3564
 
3564
 
3565
-.nav.nav-tabs li {
3565
+/* .nav.nav-tabs li {
3566
 	background: 0 0;
3566
 	background: 0 0;
3567
 	border: none
3567
 	border: none
3568
-}
3568
+} */
3569
 
3569
 
3570
 .nav-tabs>li>a {
3570
 .nav-tabs>li>a {
3571
 	color: #A7B1C2;
3571
 	color: #A7B1C2;

+ 42 - 39
WebUI/CallCenterWeb.UI/home.html

1661
         <!--右侧边栏结束-->
1661
         <!--右侧边栏结束-->
1662
     </div>
1662
     </div>
1663
     <!--==========================================================================================-->
1663
     <!--==========================================================================================-->
1664
+    <!-- 弹屏状态 -->
1665
+    <input id="bounceScreenStatus" type="hidden" />
1664
     <!--来电弹屏开始-->
1666
     <!--来电弹屏开始-->
1665
     <div class="ldtp-con clearfix animated fadeInDown">
1667
     <div class="ldtp-con clearfix animated fadeInDown">
1666
         <div class="minBacha clearfix">
1668
         <div class="minBacha clearfix">
1939
                                         <span class="col-sm-1">
1941
                                         <span class="col-sm-1">
1940
                                             来电人:
1942
                                             来电人:
1941
                                         </span>
1943
                                         </span>
1942
-                                        <span class="col-sm-3">
1944
+                                        <span class="col-sm-2">
1943
                                             <input type="text" class="khmc form-control" id="cusname" />
1945
                                             <input type="text" class="khmc form-control" id="cusname" />
1944
                                         </span>
1946
                                         </span>
1945
                                         <span class="col-sm-1">
1947
                                         <span class="col-sm-1">
1946
                                             性别:
1948
                                             性别:
1947
                                         </span>
1949
                                         </span>
1948
-                                        <span class="col-sm-3">
1950
+                                        <span class="col-sm-2">
1949
                                             <select name="" id="" class="form-control">
1951
                                             <select name="" id="" class="form-control">
1950
                                                 <option value="0">
1952
                                                 <option value="0">
1951
1953
1958
                                         <span class="col-sm-1 Import">
1960
                                         <span class="col-sm-1 Import">
1959
                                             来电号码:
1961
                                             来电号码:
1960
                                         </span>
1962
                                         </span>
1961
-                                        <span class="col-sm-3">
1963
+                                        <span class="col-sm-2">
1962
                                             <input type="text" class="tsdh form-control" id="cusphone" />
1964
                                             <input type="text" class="tsdh form-control" id="cusphone" />
1963
                                         </span>
1965
                                         </span>
1964
-                                    </div>
1965
-                                    <div class="form-group clearfix">
1966
                                         <span class="col-sm-1">
1966
                                         <span class="col-sm-1">
1967
                                             类型:
1967
                                             类型:
1968
                                         </span>
1968
                                         </span>
1969
-                                        <span class="col-sm-3">
1969
+                                        <span class="col-sm-2">
1970
                                             <select name="" id="type" class="form-control">
1970
                                             <select name="" id="type" class="form-control">
1971
                                                 <option value="咨询">
1971
                                                 <option value="咨询">
1972
                                                     咨询
1972
                                                     咨询
1985
                                                 </option>
1985
                                                 </option>
1986
                                             </select>
1986
                                             </select>
1987
                                         </span>
1987
                                         </span>
1988
-                                        <span class="col-sm-1">
1989
-                                            反映类别:
1990
-                                        </span>
1991
-                                        <span class="col-sm-3">
1992
-                                            <input type="text" id="reflectCategory" class="form-control" autocomplete="off" />
1993
-                                            <div class="reflectCategoryList-wrapper">
1994
-                                                <ul id="reflectCategoryList">
1995
-                                                </ul>
1996
-                                            </div>                
1997
-                                        </span>
1998
-                                        <!-- <span class="col-sm-1 Import">
1999
-                                            反映类别:
2000
-                                        </span>
2001
-                                        <span class="col-sm-3" style="position: relative">
2002
-                                            <div class="inpBox">
2003
-                                                <input type="text" class="inps" onkeyup="darptSearch()" />
2004
-                                                <i class="Cleans fa fa-close"></i>
2005
-                                                <i class="xl xl_one"></i>
2006
-                                                <div class="addTree xlAdd">
2007
-                                                    <ul id="addTreeDemo" class="ztree"></ul>
2008
-                                                </div>
2009
-                                            </div>
2010
-                                            <div class="selDpart1">
2011
-                                                <ul id="sponsor"></ul>
2012
-                                            </div>
2013
-                                        </span> -->
1988
+                                    </div>
1989
+                                    <div class="form-group clearfix">
1990
+                                        
2014
                                         <span class="col-sm-1 Import">
1991
                                         <span class="col-sm-1 Import">
2015
                                             紧急程度:
1992
                                             紧急程度:
2016
                                         </span>
1993
                                         </span>
2017
-                                        <span class="col-sm-3">
1994
+                                        <span class="col-sm-2">
2018
                                             <select name="" id="level" class="form-control">
1995
                                             <select name="" id="level" class="form-control">
2019
                                                 <!--<option value="0">请选择</option>-->
1996
                                                 <!--<option value="0">请选择</option>-->
2020
                                                 <option value="1" selected="selected">
1997
                                                 <option value="1" selected="selected">
2025
                                                 </option>
2002
                                                 </option>
2026
                                             </select>
2003
                                             </select>
2027
                                         </span>
2004
                                         </span>
2028
-                                    </div>
2029
-                                    <div class="form-group clearfix">
2030
                                         <span class="col-sm-1">
2005
                                         <span class="col-sm-1">
2031
                                             回访方式:
2006
                                             回访方式:
2032
                                         </span>
2007
                                         </span>
2033
-                                        <span class="col-sm-3">
2008
+                                        <span class="col-sm-2">
2034
                                             <select name="" id="visittype" class="form-control">
2009
                                             <select name="" id="visittype" class="form-control">
2035
                                                 <option value="0" selected="selected">
2010
                                                 <option value="0" selected="selected">
2036
                                                     正常回访
2011
                                                     正常回访
2041
                                             </select>
2016
                                             </select>
2042
                                         </span>
2017
                                         </span>
2043
                                         <span class="col-sm-1">
2018
                                         <span class="col-sm-1">
2044
-                                            自动派单
2019
+                                            自动派单:
2045
                                         </span>
2020
                                         </span>
2046
-                                        <span class="col-sm-3">
2021
+                                        <span class="col-sm-2">
2047
                                             <select name="" id="automaticDispatch" class="form-control">
2022
                                             <select name="" id="automaticDispatch" class="form-control">
2048
                                                 <option value="">请选择</option>
2023
                                                 <option value="">请选择</option>
2049
                                                 <option value="1">
2024
                                                 <option value="1">
2056
                                         </span>
2031
                                         </span>
2057
                                     </div>
2032
                                     </div>
2058
                                     <div class="form-group clearfix">
2033
                                     <div class="form-group clearfix">
2034
+                                        <span class="col-sm-1">
2035
+                                            反映类别:
2036
+                                        </span>
2037
+                                        <span class="col-sm-5">
2038
+                                            <input type="text" id="reflectCategory" class="form-control" autocomplete="off" />
2039
+                                            <div class="reflectCategoryList-wrapper">
2040
+                                                <ul id="reflectCategoryList">
2041
+                                                </ul>
2042
+                                            </div>            
2043
+                                        </span>
2044
+                                        <!-- <span class="col-sm-1 Import">
2045
+                                            反映类别:
2046
+                                        </span>
2047
+                                        <span class="col-sm-3" style="position: relative">
2048
+                                            <div class="inpBox">
2049
+                                                <input type="text" class="inps" onkeyup="darptSearch()" />
2050
+                                                <i class="Cleans fa fa-close"></i>
2051
+                                                <i class="xl xl_one"></i>
2052
+                                                <div class="addTree xlAdd">
2053
+                                                    <ul id="addTreeDemo" class="ztree"></ul>
2054
+                                                </div>
2055
+                                            </div>
2056
+                                            <div class="selDpart1">
2057
+                                                <ul id="sponsor"></ul>
2058
+                                            </div>
2059
+                                        </span> -->
2059
                                         <span class="col-sm-1 ">
2060
                                         <span class="col-sm-1 ">
2060
                                             电话类别:
2061
                                             电话类别:
2061
                                         </span>
2062
                                         </span>
2062
-                                        <span class="col-sm-3">
2063
+                                        <span class="col-sm-5">
2063
                                             <select name="" id="phonetype" class="form-control">
2064
                                             <select name="" id="phonetype" class="form-control">
2064
                                                 <option value="">
2065
                                                 <option value="">
2065
                                                     请选择
2066
                                                     请选择
2067
                                             </select>
2068
                                             </select>
2068
                                         </span>
2069
                                         </span>
2069
                                     </div>
2070
                                     </div>
2071
+                                    <div class="form-group clearfix">
2072
+                                    </div>
2070
                                     <div class="form-group clearfix" style="text-align: center">
2073
                                     <div class="form-group clearfix" style="text-align: center">
2071
                                         <!--<div class="bton addt_"><a>保存</a></div>-->
2074
                                         <!--<div class="bton addt_"><a>保存</a></div>-->
2072
                                         <a class="btns addt_">保存</a>
2075
                                         <a class="btns addt_">保存</a>

+ 6 - 6
WebUI/CallCenterWeb.UI/js/bootstrap-select.js

2499
         if (!!that.$searchbox.val()) {
2499
         if (!!that.$searchbox.val()) {
2500
           that.$searchbox.val('');
2500
           that.$searchbox.val('');
2501
         }
2501
         }
2502
-        setTimeout(function () {
2503
-            that.selectpicker.search.elements = [];
2504
-            that.selectpicker.search.data = [];
2505
-            that.$menuInner.scrollTop(0);
2506
-            that.createView(false);
2507
-        },100);
2502
+        // setTimeout(function () {
2503
+        //     that.selectpicker.search.elements = [];
2504
+        //     that.selectpicker.search.data = [];
2505
+        //     that.$menuInner.scrollTop(0);
2506
+        //     that.createView(false);
2507
+        // }, 100);
2508
       });
2508
       });
2509
 
2509
 
2510
       this.$searchbox.on('click.bs.dropdown.data-api focus.bs.dropdown.data-api touchend.bs.dropdown.data-api', function (e) {
2510
       this.$searchbox.on('click.bs.dropdown.data-api focus.bs.dropdown.data-api touchend.bs.dropdown.data-api', function (e) {

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

1792
                         "<option value='" +
1792
                         "<option value='" +
1793
                             n.F_Value +
1793
                             n.F_Value +
1794
                             "'>" +
1794
                             "'>" +
1795
-                            n.F_Value +
1795
+                            n.F_Remark +
1796
                             "</option>"
1796
                             "</option>"
1797
                     ).appendTo(obj);
1797
                     ).appendTo(obj);
1798
                 });
1798
                 });

+ 18 - 6
WebUI/CallCenterWeb.UI/js/main.js

304
 
304
 
305
     $('.head-pic .lahei .la-after').hide();
305
     $('.head-pic .lahei .la-after').hide();
306
     $(".Bacha").hide();
306
     $(".Bacha").hide();
307
+    /* 
308
+        弹屏状态
309
+       bounceScreenStatus
310
+       0、关闭
311
+       1、打开
312
+    */
313
+    $("#bounceScreenStatus").val("1")
307
     // 历史记录 历史工单
314
     // 历史记录 历史工单
308
     loadOld()
315
     loadOld()
309
 }
316
 }
313
     $("#top-search li i").removeClass("active");
320
     $("#top-search li i").removeClass("active");
314
     $(".Logout").addClass("active");
321
     $(".Logout").addClass("active");
315
     $(".SayBusy").removeClass("active");
322
     $(".SayBusy").removeClass("active");
316
-    $(".SayFree").addClass("active");
323
+    // $(".SayFree").addClass("active");
317
     $(".MakeCall").addClass("active");
324
     $(".MakeCall").addClass("active");
318
     $(".td-call").hide();
325
     $(".td-call").hide();
319
     $(".zxzt").removeClass("bl").removeClass("br").addClass("by");
326
     $(".zxzt").removeClass("bl").removeClass("br").addClass("by");
367
         $(".Logout").addClass("active");
374
         $(".Logout").addClass("active");
368
         if($("#isml").val()==0){
375
         if($("#isml").val()==0){
369
 			$(".SayBusy").addClass("active");
376
 			$(".SayBusy").addClass("active");
370
-		}
371
-		else{
377
+		} else {
372
 			$(".SayFree").addClass("active");
378
 			$(".SayFree").addClass("active");
373
 		}
379
 		}
374
 //      $(".SayBusy").addClass("active");
380
 //      $(".SayBusy").addClass("active");
501
 function SetState(obj) {
507
 function SetState(obj) {
502
     if (obj.State == '5') {
508
     if (obj.State == '5') {
503
         $(".SayBusy").removeClass("active");
509
         $(".SayBusy").removeClass("active");
504
-        $(".SayFree").addClass("active");
505
         $(".zxzt").removeClass("bl").removeClass("br").addClass("by");
510
         $(".zxzt").removeClass("bl").removeClass("br").addClass("by");
506
         $(".hwzt").text('忙碌');
511
         $(".hwzt").text('忙碌');
507
         $("#isml").val(1);
512
         $("#isml").val(1);
513
+        if($("#bounceScreenStatus").val() === "1"){
514
+			$(".SayFree").removeClass("active");
515
+		} else {
516
+            $(".SayFree").addClass("active");
517
+        }
518
+        $("#bounceScreenStatus").val("0")
508
         // SetStateCookie(1);
519
         // SetStateCookie(1);
509
     }
520
     }
510
     if (obj.State == '2') {
521
     if (obj.State == '2') {
648
 }
659
 }
649
 //后台排队
660
 //后台排队
650
 function backstageQueue(data) {
661
 function backstageQueue(data) {
662
+    console.log("123")
651
     var obj = $("iframe:visible")
663
     var obj = $("iframe:visible")
652
-    if (obj.attr("data-id") == "index_v1.html") {
664
+    // if (obj.attr("data-id") == "index_v1.html") {
653
         window.frames[obj.attr("name")].realTimeMonitorQueue(data.WaitCount);
665
         window.frames[obj.attr("name")].realTimeMonitorQueue(data.WaitCount);
654
-    }
666
+    // }
655
 }
667
 }
656
 //录音返回
668
 //录音返回
657
 function RecordPathBack(data) {
669
 function RecordPathBack(data) {

+ 1 - 1
WebUI/CallCenterWeb.UI/js/search/screen.js

102
         },
102
         },
103
         function (data) {
103
         function (data) {
104
             if (data.state.toLowerCase() == "success") {
104
             if (data.state.toLowerCase() == "success") {
105
-                var content = data.data;
105
+                var content = data.data.Table1;
106
                 $(content).each(function (i, n) {
106
                 $(content).each(function (i, n) {
107
                     $(
107
                     $(
108
                         "<option value='" +
108
                         "<option value='" +

+ 1 - 0
WebUI/CallCenterWeb.UI/widgets.html

1264
                 );
1264
                 );
1265
             }
1265
             }
1266
             function realTimeMonitorQueue(data) {
1266
             function realTimeMonitorQueue(data) {
1267
+                console.log("456");
1267
                 $("#backstageQueue").text(data)
1268
                 $("#backstageQueue").text(data)
1268
             }
1269
             }
1269
         </script>
1270
         </script>