代码提交

WebUI/CallCenterWeb.UI/Appeal/AddAppeal.html

@@ -411,6 +411,13 @@
                         token: $.cookie("token")
                     },
                     success: function (data) {
+                    	if (callID) {
+                        	var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
+		                    parent.layer.close(index); //再执行关闭
+		                    parent.layer.msg("创建工单成功");
+		                    parent.$('#list').bootstrapTable('refresh');
+		                    return
+                        }
                         $('.BC').attr("disabled", false);
                         $('.SavedSubmit').attr("disabled", false);
                         $('.BC').text('保存');

WebUI/CallCenterWeb.UI/CommonHtml/AddAppeal.html

@@ -167,7 +167,6 @@
                             </select>
                         </td>
                     </tr>
-                   
                     <tr class="leaderCharge-wrapper" style="display: none;">
                         <th class="">分管领导:</th>
                         <td>
@@ -178,6 +177,7 @@
                             </select>
                         </td>
                     </tr>
+                    
                     <tr class="banliState">
                         <th>自动派单:</th>
                         <td>
@@ -214,7 +214,7 @@
                             <input type="text" id="limittimes" class="form-control">
                         </td>
                     </tr>
-                    <tr class="limittimesWrapperCB" style="display: none;">
+                    <tr class="limittimesWrapperCB banliState" style="display: none;">
                         <th>办理时限：</th>
                         <td colspan="">
                             <input type="text" id="limittimesCB" class="form-control" autocomplete="off">
@@ -386,6 +386,21 @@
                 	$(".banliState").hide()
                 }else{
                 	$(".banliState").show()
+                	
+                	if (workType === "cb") {
+		                $(".limittimeWrapper").hide()
+                        $(".limittimesWrapper").hide()
+                        $(".limittimesWrapperCB").show()
+		            } else if (workType === "jb" || workType === "zzbl" || workType === "jwthsh") {
+		            	$(".limittimesWrapperCB").hide()
+		                if ($("#level option:selected").text()=="紧急") {
+	                        $(".limittimesWrapper").show()
+	                        $(".limittimeWrapper").hide()
+	                    } else {
+	                        $(".limittimesWrapper").hide()
+	                        $(".limittimeWrapper").show()
+	                    }
+		            }
                 }
             });
 
@@ -495,6 +510,7 @@
                                 $(".store_Lng").val(Data[0].F_Longitude);
                                 $(".store_Lat").val(Data[0].F_Latitude);
                             }
+                            
                             //x性别
                             $("#SEX option:selected").val(
                                 Data[0].F_CusSex + ""
@@ -504,6 +520,7 @@
                             } else {
                                 $("#SEX option:selected").text("女"); //乡镇
                             }
+                            
                             //来源
                             $("#source option:selected").val(Data[0].F_InfoSource + "");
                             $("#source option:selected").text(Data[0].SourceName); //来源
@@ -553,7 +570,7 @@
                             $("#type option:selected").text(
                                 Data[0].TypeName1
                             ); //类型
-                            //紧急程度
+                            //紧急程度 1普通 2紧急
                             $("#level").val(Data[0].F_Level + "");
                             if (workType === "cb") {
                                 $(".limittimeWrapper").hide()
@@ -570,7 +587,9 @@
                                     $(".limittimeWrapper").show()
                                 }
                             }
-
+							if (Data[0].F_IsResult) { //1当即办理，0网络转办
+			                	$(".banliState").hide()
+			                }
                             // 管理员、审核员、供暖专员 展示直办内容
                             if (roleCode === "GLY" || roleCode === "ZXLD" || roleCode === "GNZY") {
                                 $(".Nows_box").show();
@@ -580,12 +599,10 @@
                                 }
                             }
                             $('input[name="mj"][value="' +Data[0].F_IsProtect +'"]').prop("checked", "checked");
-                            $('input[name="banli"][value="' +Data[0].F_IsResult +'"]').prop("checked", "checked");
-                            if (Data[0].F_IsResult) {
-			                	$(".banliState").hide()
-			                }else{
-			                	$(".banliState").show()
-			                }
+                            
+                            $('input[name="banli"][value="' +Data[0].F_IsResult +'"]').prop("checked", "checked"); //1当即办理，0网络转办
+                            
+			                
                             if (String(Data[0].F_Business) === "1") {
                                 $('#threeWayCall').attr("checked", true);
                             } else {

WebUI/CallCenterWeb.UI/CommonHtml/Supervision_.html

@@ -130,11 +130,11 @@
                     $(".title").text("督办意见");
                     $(".JC").hide();
                     $(".superviseWay").show()
-//                  if (pageName === "superviseUpcoming") {
-//                      $('.whetherSupervise').show();
-//                  } else if (pageName === "haveAduit") {
-//                      $('.whetherSupervise').hide();
-//                  }
+                    if (pageName === "superviseUpcoming") {
+                        $('.whetherSupervise').show();
+                    } else if (pageName === "haveAduit") {
+                        $('.whetherSupervise').hide();
+                    }
                 } else {
                     $(".title").text("不督办意见");
                     $(".JC").hide();
@@ -274,8 +274,6 @@
                             if (r.state.toLowerCase() == "success") {
                                 $(".fjnr").text(r.data[0].F_FileName);
                                 var a = r.data;
-                                //								var str = '';
-                                //								var Str;
 
                                 $(a).each(function (i, n) {
                                     var strs = '<span class="files" fiel-num="' + n.F_FileId +
@@ -288,6 +286,7 @@
                                             file_num();
                                         })
                                 })
+                                
                                 file_num();
                             }
                         }
@@ -348,9 +347,7 @@
                     var content = data.data;
                     $("<option value=''>请选择</option>").appendTo(obj);
                     $(content).each(function (i, n) {
-                        $("<option value='" + n.F_DeptId + "'>" + n.F_DeptName + "</option>").appendTo(
-                            obj);
-
+                        $("<option value='" + n.F_DeptId + "'>" + n.F_DeptName + "</option>").appendTo(obj);
                     })
                     obj.selectpicker({
                         noneSelectedText: '请选择' //默认显示内容
@@ -367,6 +364,7 @@
             parent.$("#orderlist").bootstrapTable("refresh");
             parent.layer.msg("操作成功");
         }
+        
     </script>
 </body>
 

WebUI/CallCenterWeb.UI/CommonHtml/WorkDatil.html

@@ -404,10 +404,10 @@
                     &nbsp;&nbsp;<input type="button" class="jbDiv pdBtn release authority" value="派单" />
                     <!--&nbsp;&nbsp;<input type="button" class="return release authority" style="display: none;" value="退回申请" />-->
                     &nbsp;&nbsp;<input type="button" class="applicationDelay release authority" style="display: none; value="申请延时" />
-                    &nbsp;&nbsp;<input type="button" class="handle release authority" style="display: none;" value="办理" />
-                    &nbsp;&nbsp;<input type="button" value="打印预览" class="print" />
-                    &nbsp;&nbsp;<input type="button" value="撤销子工单" class="cancelChildWorkOrder" style="display: none;" />
-                    &nbsp;&nbsp;<input type="button" value="关闭" class="closexq" />
+                    &nbsp;&nbsp; <input type="button" class="handle release authority" style="display: none;" value="办理" />
+                    &nbsp;&nbsp; <input type="button" value="打印预览" class="print" />
+                    &nbsp;&nbsp; <input type="button" value="撤销子工单" class="cancelChildWorkOrder" style="display: none;" />
+                    &nbsp;&nbsp; <input type="button" value="关闭" class="closexq" />
                 </div>
                 <input type="hidden" id="Change" />
 
@@ -929,6 +929,7 @@
                                     var level = Data[0].F_Level;
                                     $(".F_CusName").text(Data[0].F_CusName);
                                     $(".F_CusPhone").text(Data[0].F_CusPhone);
+                                    
                                     $(".F_ConPhone").text(Data[0].F_ConPhone);
                                     $(".phoneType").text(Data[0].F_PhoneType);
                                     $(".splituser").text(Data[0].F_SplitUser);
@@ -980,7 +981,7 @@
                                     }
                                     if (Data[0].F_CusName) {
                                         if (roleCode !== "WLDW" && roleCode !== "EJWLDW") {
-                                            $(".F_CusName").hide()
+                                         	$(".F_CusName").hide()
                                         } else {
                                             $(".callerTitle").unbind("click");
                                         }
@@ -1113,6 +1114,8 @@
                                         $('.MJ').text("普通");
                                     } else {
                                         $('.MJ').text("保密");
+                                        $(".F_CusName").hide()
+                                        $(".F_CusPhone").hide()
                                     }
                                     //紧急程度
                                     if (Data[0].F_Level == 1) {

WebUI/CallCenterWeb.UI/CommonHtml/editProcessingResult.html

@@ -16,10 +16,10 @@
                 <th class="Importent">办理结果:</th>
                 <td colspan="7"><textarea data-adaptheight id="result" name="" rows="3" cols=""></textarea></td>
             </tr>
-            <tr>
+            <!--<tr>
                 <th class="Importent">工单内容:</th>
                 <td colspan="7"><textarea data-adaptheight id="content" name="" rows="3" cols=""></textarea></td>
-            </tr>
+            </tr>-->
             <tr>
                 <th class="Importent">来电内容:</th>
                 <td colspan="7"><textarea data-adaptheight id="comContent" name="" rows="3" cols=""></textarea></td>
@@ -59,16 +59,16 @@
         //重办
         function CB() {
             if ($('#result').val() == '') {
-                layer.msg("请输入办理结果"); content
+                layer.msg("请输入办理结果"); 
                 return;
-            }else if($('#content').val() == ''){
-            	layer.msg("请输入工单内容"); content
+            }else if($('#comContent').val() == ''){
+            	layer.msg("请输入来电内容"); 
                 return;
             }
             $.post(huayi.config.callcenter_url + 'WorkOrder/EditResult', {
                 workorderid: wid,
                 result: $("#result").val(),
-                content: $("#content").val(),
+//              content: $("#content").val(),
                 comContent:$("#comContent").val(),
                 additionalReply:$("#additionalReply").val(),
                 token: $.cookie("token")
@@ -148,12 +148,14 @@
                 success: function (result) {
                     if (result.state.toLowerCase() == "success") {
                         var content = result.data;
-                        if (content.data[0].F_Content === "" || content.data[0].F_Content === null) {
-                            $("#content").text(content.data[0].F_ComContent)
-                        } else {
-                            $("#content").text(content.data[0].F_Content)
-                        }
+                        $("#comContent").text(content.data[0].F_ComContent)
+//                      if (content.data[0].F_Content === "" || content.data[0].F_Content === null) {
+//                          $("#content").text(content.data[0].F_ComContent)
+//                      } else {
+//                          $("#content").text(content.data[0].F_Content)
+//                      }
                         $("#result").val(content.data[0].F_Result)
+                        $("#additionalReply").val(content.data[0].F_AdditionalReply)
                     }
                 }
             })

WebUI/CallCenterWeb.UI/ProvincialPlatformManagement/dataSharing.html

@@ -0,0 +1,248 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="UTF-8" />
+    <title>工单查询</title>
+    <script src="../Script/Common/huayi.load.js"></script>
+    <script src="../Script/Common/huayi.config.js"></script>
+    <link rel="stylesheet" href="../css/bootstrap-select.css" />
+    <link rel="stylesheet" href="../js/zTree/zTreeStyle.css" />
+    <link rel="stylesheet" href="../css/init.css" />
+    <link rel="stylesheet" href="../js/layui/css/layui.css">
+    <link rel="stylesheet" href="../js/layui/css/layui.css">
+    <link rel="stylesheet" href="../css/WorkOrder/WorkOrderList.css">
+    <style>
+    	.select_{
+    		width: 120%;
+    	}
+    	.input_{
+    		width: 100px;
+    	}
+    	/*.btns{
+    		position: absolute;
+    		right: 10px;
+    		bottom: 0px;
+    	}*/
+    </style>
+</head>
+
+<body class="gray-bg">
+    <div class="wrapper wrapper-content animated fadeInRight">
+        <div class="daoHang clearfix">
+            <div class="dhLeft">
+                <sapn>
+                    <i class="syIcon"></i>位置：
+                    <a href="javaScript:;" id="ReIndex">首页</a>&gt;
+                    
+                    <a href="" class="nowPosition">数据共享</a>
+                </sapn>
+            </div>
+            <div class="dhRight">
+                <a href="" title="刷新"><i class="fa fa-refresh"></i></a>
+            </div>
+        </div>
+        <div style="padding: 10px" class="tj_content clearFix">
+            <div style="padding: 10px" class="tj_content clearFix">
+                <div>
+                    <span>【搜索信息】</span>
+                    <div class="box_content">
+                        <table id="sqzx" style="width: 100%" border="0" cellspacing="0" cellpadding="0">
+                            <tr>
+                                
+                                <th>关键词：</th>
+                                <td>
+                                    <input type="text" id="tel" class="form-control " placeholder="请输入关键词" />
+                                </td>
+                                <th>共享渠道：</th>
+                                <td>
+                                    <select class="form-control select_" id="source"></select>
+                                </td>
+                                <th>所属板块：</th>
+                                <td>
+                                    <select class="form-control select_" id="source"></select>
+                                </td>
+                                
+                                <th>资源提供方：</th>
+                                <td>
+                                    <select class="form-control  Min-width" id="source"></select>
+                                </td>
+                                
+                                
+                            </tr>
+                           <tr style="position: relative;">
+                           		<th>共享时间：</th>
+                                <td colspan="6">
+                                    <input id="starttime" class="photo x-color laydate-icon" type="text" autocomplete="off" style="height: 35px;" />
+                                    -<input id="endtime" class="photo x-color laydate-icon" type="text" autocomplete="off" style="height: 35px;" />
+                                </td>
+                                <td>
+                                	<botton class="btns Seach">搜索</botton>
+	                              	<botton class="btns exportFile">导出</botton>   
+                                </td>
+	                        </tr>
+	                           
+                        </table>
+                    </div>
+                </div>
+                <div>
+                    <div style="width: 100%; padding: 10px">
+                        <table id="orderlist" data-row-style="rowStyle" data-query-params="queryParams"
+                            data-pagination="true">
+                            <thead>
+                                <tr>
+                                    <th data-formatter="serialNumber" data-align="center">序号</th>
+                                    <th data-field="resourceName" data-formatter="GetTit"  data-align="center">资源名称</th>
+                                    <th data-field="resourceContent" data-formatter="GetCont" data-align="center">资源内容</th>
+                                    <th data-field="sharedChannel" data-align="center">共享渠道</th>
+                                    <th data-field="panelname" data-align="center">所属板块</th>
+                                    <th data-field="sharingTime" data-align="center">共享时间</th>
+                                    <th data-field="resourceState" data-align="center">资源状态</th>
+                                    <th data-field="resourceProvider" data-align="center">资源提供方</th>
+                                </tr>
+                            </thead>
+                            <tbody class="list"></tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+       
+    </div>
+    
+    <script src="../js/layui/layui.js"></script>
+    <script src="../js/layui/layui.js"></script>
+    <script src="../js/bootstrap-select.js"></script>
+    <script src="../css/laydate/laydate.js"></script>
+    <script src="../My97DatePicker/WdatePicker.js"></script>
+    <script src="../js/zTree/jquery.ztree.core.js"></script>
+    <script src="../js/WorkOrder/WorkOrderList.js"></script>
+    
+
+    <script>
+        var wid = helper.request.queryString("wid");
+        var exportParams; // 导出参数
+        $(document).ready(function () {
+            if (wid) {
+                $("#tel").val(wid);
+                load();
+            }
+            laydate.skin('blue');
+			laydate({
+                elem: '#starttime',
+                event: 'focus',
+                istime: true,
+                format: 'YYYY-MM-DD hh:mm:ss'
+            });
+            laydate({
+                elem: '#endtime',
+                event: 'focus',
+                istime: true,
+                format: 'YYYY-MM-DD hh:mm:ss'
+            });
+            load();
+        });
+
+        $("#orderlist").on("click-row.bs.table", function (e, row, ele) {
+            $(".success").removeClass("success"); //去除之前选中的行的，选中样式
+            $(ele).addClass("success"); //添加当前选中的 success样式用于区别
+        });
+        //获取查询信息
+        function load() {
+            //先销毁表格
+            $("#orderlist").bootstrapTable("destroy");
+            //初始化表格,动态从服务器加载数据
+            $("#orderlist").bootstrapTable({
+                method: "get", //使用get请求到服务器获取数据
+                url: "./json/jsonData.js", //获取数据的Servlet地址
+                contentType: "application/x-www-form-urlencoded",
+                striped: true, //表格显示条纹
+                pagination: true, //启动分页
+                pageSize: 10, //每页显示的记录数
+                pageNumber: 1, //当前第几页
+                pageList: [10, 20, 50, 100], //记录数可选列表
+                search: false, //是否启用查询
+                showColumns: false, //显示下拉框勾选要显示的列
+                showRefresh: false, //显示刷新按钮
+                sidePagination: "server", //表示服务端请求
+                //设置为undefined可以获取pageNumber，pageSize，searchText，sortName，sortOrder
+                //设置为limit可以获取limit, offset, search, sort, order
+                queryParamsType: "undefined",
+                queryParams: function queryParams(params) {
+                    //设置查询参数
+                    //alert(params.pageNumber)
+                    var param = {
+                        page: params.pageNumber,
+                        pagesize: params.pageSize,
+                        token: $.cookie("token"),
+                    };
+                    // 导出参数
+                    exportParams = param;
+                    return param;
+                },
+                onLoadSuccess: function (data) {
+                    //加载成功时执行
+                    //layer.msg("加载成功");
+                    //console.log(data);
+                },
+                onLoadError: function () {
+                    //加载失败时执行
+                    //layer.msg("加载数据失败", { time: 1500, icon: 2 });
+                },
+            });
+        }
+		//编号
+        function serialNumber(val, row, index) {
+            return index + 1;
+        }
+        function GetCont(val) {
+            if (val) {
+                var str = "<div ";
+                if (val.length > 50) {
+                    str = str + ' title="' + val + '" ';
+                    val = val.substr(0, 50) + "...";
+                }
+                return str + ">" + val + "</div>";
+            } else {
+                return "";
+            }
+        }
+        function GetTit(val){
+        	if (val) {
+        		if (val) {
+                var str = "<div ";
+                if (val.length >15) {
+                    str = str + ' title="' + val + '" ';
+                    val = val.substr(0,15) + "..."
+                }
+                return str + ">" + val + "</div>";
+            } else {
+                return "";
+            }
+        	}
+        }
+        //操作
+        function Dispose(val, row) {
+            var Rows = row.Buttons;
+            var html = "";
+            for (var i = 0; i < Rows.length; i++) {
+                var html1 = huayi.config.arr[Rows[i].key * 1 - 1];
+                if (html1) {
+                    html1 = html1.replace("data", val);
+                    html1 = html1.replace("isProtect", row.F_IsProtect);
+                    html1 = html1.replace("row", row.F_MainDeptId);
+                }
+                html += html1;
+            }
+            return html;
+        }
+        
+        // 导出文件
+        $(".exportFile").click(function() {
+            exportParams.isdc = 1;
+            exportFileFun("WorkOrder/GetList", exportParams)
+        })
+    </script>
+</body>
+
+</html>

WebUI/CallCenterWeb.UI/ProvincialPlatformManagement/json/jsonData.js

@@ -0,0 +1,87 @@
+{
+	"state": "success",
+	"message": "成功",
+	"rows": [{
+		"resourceName": "关于2021年第十批行政许可企业名单的公示",
+		"resourceContent": "根据《河南省城市房地产开发经营管理条例》和原建设部《房地产开发企业资质管理规定》(建设部令第77号),《建",
+		"sharedChannel": "安阳市住房及城乡建设局",
+		"panelname": "建设动态",
+		"sharingTime": "2022-01-04",
+		"resourceState": "发布",
+		"resourceProvider": "安阳市住建局"
+		
+	}, {
+		"resourceName": "市住建局加快路网建设提升城市功能品质",
+		"resourceContent": "根据2021年城市道路管养台账和2021年城市道路建设完工情况统计，截至2021年底，安阳市建成区（含北关区、文",
+		"sharedChannel": "安阳市住房及城乡建设局",
+		"panelname": "市政工程",
+		"sharingTime": "2021-11-25",
+		"resourceState": "发布",
+		"resourceProvider": "安阳市住建局"
+	}, {
+		"resourceName": "关于调整安阳市2021年度二级建造师执业资格 审核结果查询方式的通知",
+		"resourceContent": "按照《关于2021年度河南省二级建造师执业资格考试有关问题的通知》（豫人社函〔2021〕60号）和《关于专业技",
+		"sharedChannel": "安阳市住房及城乡建设局",
+		"panelname": "建筑管理",
+		"sharingTime": "2021-12-08",
+		"resourceState": "发布",
+		"resourceProvider": "安阳市住建局"
+	}, {
+		"resourceName": "安阳汽车站逐步恢复客运班线运行（公告）",
+		"resourceContent": "根据当前安阳市疫情防控形势，经安阳市新冠肺炎疫情防控指挥部和市交通运输局要求，我站自2月8日起在从严落",
+		"sharedChannel": "安阳市交通运输局",
+		"panelname": "通知公告",
+		"sharingTime": "2022-02-07",
+		"resourceState": "发布",
+		"resourceProvider": "安阳市交通局"
+	}, {
+		"resourceName": "安阳市人民政府办公室关于印发安阳市进一步降低物流成本实施方案的通知",
+		"resourceContent": "为贯彻落实《河南省人民政府办公厅关于印发河南省进一步降低物流成本实施方案的通知》（豫政办〔2020〕39号",
+		"sharedChannel": "安阳市交通运输局",
+		"panelname": "建设动态",
+		"sharingTime": "2021-08-26",
+		"resourceState": "发布",
+		"resourceProvider": "安阳市交通局"
+	}, {
+		"resourceName": "安阳市淘汰国Ⅲ及以下排放标准营运柴油货车工作实施方案",
+		"resourceContent": "为加快推进国Ⅲ及以下排放标准营运柴油货车淘汰工作，依据《河南省交通运输厅河南省生态环境厅河南省财政厅河",
+		"sharedChannel": "部门文件",
+		"panelname": "建设动态",
+		"sharingTime": "2020-07-10",
+		"resourceState": "发布",
+		"resourceProvider": "安阳市交通局"
+	}, {
+		"resourceName": "收费公路恢复收费若干问题问答",
+		"resourceContent": "为统筹疫情防控和经济社会发展，经国务院同意，从2020年2月17日零时起，全国收费公路免收车辆通行费。免费",
+		"sharedChannel": "安阳市交通运输局",
+		"panelname": "政策解读",
+		"sharingTime": "2020-04-29",
+		"resourceState": "发布",
+		"resourceProvider": "安阳市交通局"
+	}, {
+		"resourceName": "安阳全域禁售禁放烟花爆竹",
+		"resourceContent": "为保障公共安全和人民群众的人身、财产安全，有效防治噪声和大气污染，根据《中华人民共和国大气污染防治法》",
+		"sharedChannel": "安阳市生态环境局",
+		"panelname": "环保要闻",
+		"sharingTime": "2022-01-27",
+		"resourceState": "发布",
+		"resourceProvider": "安阳市生态局"
+	}, {
+		"resourceName": "安阳市生态环境局坚决做好疫情期间医疗和城镇污水处理监管工作",
+		"resourceContent": "疫情发生以来，市生态环境局扛牢责任，积极做好医疗废水和城镇污水处理环境监管、监测工作，严防新冠病毒通过",
+		"sharedChannel": "安阳市生态环境局",
+		"panelname": "工作动态",
+		"sharingTime": "2022-01-17",
+		"resourceState": "发布",
+		"resourceProvider": "安阳市生态局"
+	}, {
+		"resourceName": "安阳市生态环境局政务服务事项清单",
+		"resourceContent": "安阳市生态环境局政务服务事项清单",
+		"sharedChannel": "安阳市生态环境局",
+		"panelname": "通知公告",
+		"sharingTime": "2021-12-25",
+		"resourceState": "发布",
+		"resourceProvider": "安阳市生态局"
+	}],
+	"total": 90
+}

WebUI/CallCenterWeb.UI/ReportForm/superviseDataStatisticsSecondaryUnitList.html

@@ -257,7 +257,7 @@
             var dbdata = 1;
 
             var url = huayi.config.callcenter_url + "WorkOrder/GetModelList?token=" + $.cookie("token");
-            url += "&starttime=" + starttime + "&endtime=" + endtime + "&dbdata=" + dbdata + "&deptid=" + deptId +
+            url += "&starttime=" + starttime + "&endtime=" + endtime + "&dbdata2=" + dbdata + "&deptid=" + deptId +
                 "&dbtype=" + dbtype + "&isdc=1";
             window.location.href = url;
         }

WebUI/CallCenterWeb.UI/ReportForm/superviseReportList.html

@@ -45,6 +45,7 @@
         var starttime = decodeURIComponent(helper.request.queryString("starttime"));
         var endtime = decodeURIComponent(helper.request.queryString("endtime"));
         var dbdb = "";
+        var exportParams;
         $(document).ready(function () {
             if (db === "5") {
                 dbdb = db;
@@ -85,6 +86,7 @@
                         isRelease: 2, // 2主工单，3子工单
                         token: $.cookie("token")
                     };
+                    exportParams = param;
                     return param;
                 },
                 responseHandler: function(res) {
@@ -209,17 +211,29 @@
 
         //导出
         $('.exportFile').click(function () {
-            dcexcel(this);
+           	exportParams.isdc = 1;
+			exportFileFun("WorkOrderReport/WorkOrdrList", exportParams)
         })
 
-        function dcexcel(obj) {
-			
-            var url = huayi.config.callcenter_url + "WorkOrderReport/WorkOrdrList?token=" + $.cookie("token");
-
-            url += "&starttime=" + starttime + "&endtime=" + endtime + "&dbusercode=" + dbusercode + "&db=" + db + "&isdc=1";
-
-            window.location.href = url;
-        }
+      
+        // 导出列表
+		function exportFileFun(api, params) {
+		    var url = huayi.config.callcenter_url + api;
+		    if(typeof(params) !== "object") {
+		        return
+		    }
+		    // 分页为空
+		    params.page = "";
+		    params.pagesize = "";
+		    Object.keys(params).forEach(function(key, index) {
+		        if (index === 0) {
+		            url += `?${key}=${params[key]}`
+		        } else {
+		            url += `&${key}=${params[key]}`
+		        }
+		    })
+		    window.location.href = url;
+		}
     </script>
 </body>
 

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

@@ -3,10 +3,9 @@
 }
 huayi.config = {
 	callcenter_url: "http://192.168.8.9:1042/",//生产环境
-	//callcenter_url: "http://125.45.12.146:9998/", //生产环境
-    
-//  videoSocket_ip: "docking.zwfw.anyang.gov.cn", //docking.zwfw.anyang.gov.cn
-//  videoSocket_port: "8082", //端口
+//	callcenter_url: "http://docking.zwfw.anyang.gov.cn:9998/",//生产环境
+	//videoSocket_ip: "docking.zwfw.anyang.gov.cn", //docking.zwfw.anyang.gov.cn
+	//videoSocket_port: "8082", //端口
     socket_ip: "192.168.8.7", //ip
     socket_port: "8081", //端口
     menuworktime: 30000, //菜单工单数量刷新间隔

WebUI/CallCenterWeb.UI/TelCall/CallRecord.html

@@ -767,11 +767,17 @@
                 });
             }
         }
-		// 查看工单详情
+		// 添加工单
         function addWorkOrder(str) {
             if (str) {
-            	var turnLink = "./Appeal/AddAppeal.html?CallID=" + str
-            	top.turnIframe(turnLink)
+            	layer.open({
+                    type: 2,
+                    content: "../Appeal/AddAppeal.html?CallID=" + str, //iframe的url，no代表不显示滚动条
+                    title: '工单详情',
+                    area: ['100%', '100%'], //宽高
+                });
+//          	var turnLink = "./Appeal/AddAppeal.html?CallID=" + str
+//          	top.turnIframe(turnLink)
             }
         }
         // 外呼

WebUI/CallCenterWeb.UI/TelCall/uplinkSMSList.html

@@ -182,6 +182,11 @@
 					},
 					onLoadSuccess: function() { //加载成功时执行
 						//layer.msg("加载成功");
+						if(type==="1"){
+							$(".accept").hide()
+						}else if(type==="2"){
+							$(".accept").show()
+						}
 					},
 					onLoadError: function() { //加载失败时执行
 						//layer.msg("加载数据失败", { time: 1500, icon: 2 });

WebUI/CallCenterWeb.UI/YeWu/keywordsStatistics.html

@@ -146,7 +146,7 @@
         //表格
         function initTable(pid=38) {
             $.ajax({
-                url: huayi.config.callcenter_url + 'DataAnalysis/GetKeyReport_1',
+                url: huayi.config.callcenter_url + 'DataAnalysis/GetKeyReport_1', 
                 type: 'get',
                 data: {
                     sdate: $("#squeryTime").val(),

WebUI/CallCenterWeb.UI/YeWu/keywordsStatisticsChild.html

@@ -35,6 +35,7 @@
         var key = helper.request.queryString("key");
         var starttime = decodeURIComponent(helper.request.queryString("starttime"));
         var endtime = decodeURIComponent(helper.request.queryString("endtime"));
+        console.log(endtime)
         var source = helper.request.queryString("source");
         $(document).ready(function () {
             initTable();
@@ -117,6 +118,7 @@
         }
 
         function viewKeywordList(key) {
+        	console.log(endtime)
             if (endtime.length > 0 && endtime.length <= 10) {
                 endtime = encodeURIComponent(endtime + " 23:59:59");
             } else {
@@ -129,6 +131,7 @@
                 title: '关键词统计表',
                 area: ['90%', '90%'], //宽高
             });
+            endtime = decodeURIComponent(endtime)
         }
     </script>
 </body>

WebUI/CallCenterWeb.UI/css/home.css

@@ -36,7 +36,9 @@ ul li {
 	font-size: 12px;
 }
 .clearfix{
-	overflow: hidden;
+	content: "";
+    display: block;
+    clear: both;
 }
 .title-box {
 	margin-top: 5px;
@@ -1338,6 +1340,7 @@ ul.ztree {
 .listW30{ width: 30%;}
 .listW35{ width: 35%;}
 .listW45{ width: 45%;}
+.listW52{ width: 52%;}
 .listW85{ width: 85%;}
 
 .lineHeight36{ line-height: 36px;}
@@ -1345,7 +1348,11 @@ ul.ztree {
 .orderForm{
 	margin-top: 30px;
 }
-#dicForms{ overflow: hidden;}
+#dicForms{ 
+	content: "";
+    display: block;
+    clear: both;
+}
 .dicLeft,.dicRight{
 	float: left;
 	width: 50%;
@@ -1400,9 +1407,9 @@ ul.ztree {
 .table-responsive table thead tr th{
 	background-color:#1AA3C7 ;
 }
-.table-striped>tbody>tr{
+/*.table-striped>tbody>tr{
 	background-color:#DAF3F8 !important;
-}
+}*/
 
 .list tr td{
 	border-top: 1px solid #8D9EA6 !important;

WebUI/CallCenterWeb.UI/home.html

@@ -20,7 +20,7 @@
     <link rel="stylesheet" href="./js/zTree/zTreeStyle.css" />
     <link rel="stylesheet" href="./css/addappeal.css" />
     <link rel="stylesheet" href="./css/bootstrap-select.css" />
-    <link rel="stylesheet" href="./css/bootstrap-select.css" />
+   <!-- <link rel="stylesheet" href="./css/bootstrap-select.css" />-->
     <link rel="stylesheet" href="./js/layui/css/layui.css">
 	<link rel="stylesheet" type="text/css" href="./css/home.css"/>
 
@@ -273,7 +273,7 @@
     <!-- 弹屏状态 -->
     <input id="bounceScreenStatus" type="hidden" />
     <!--来电弹屏开始-->
-    <div class="ldtp-con clearfix animated fadeInDown">
+    <div class="ldtp-con  animated fadeInDown" >
         <div class="minBacha clearfix">
             <div class="minClosed">
                 <a href="javaScript:;" title="最小化"></a>
@@ -377,23 +377,24 @@
 	                                    
 	                                    <div class="form-group clearfix">
 	                                    	<div class="labelTit listW15">是否营商:</div>
-	                                        <div class="labelContent listW19">
+	                                        <div class="labelContent listW18">
 	                                            <select name="" id="isbusiness" class="form-control">
 	                                                <option value="0" selected="selected">否</option>
 	                                                <option value="1">是</option>
 	                                            </select>
 	                                        </div>
-	                                    </div>
-	                                    
-	                                    <div class="form-group clearfix">
 	                                        <div class="labelTit listW15 Import">反映类别:</div>
-	                                        <div class="labelContent listW35">
+	                                        <div class="labelContent listW52" style="position: relative;">
 	                                            <input type="text" id="reflectCategory" class="form-control" utocomplete="off" />
 	                                        	<div class="reflectCategoryList-wrapper">
 	                                                <ul id="reflectCategoryList">
 	                                                </ul>
 	                                            </div>
 	                                        </div>
+	                                    </div>
+	                                    
+	                                    <div class="form-group clearfix">
+	                                        
 	                                        <div class="labelTit listW15">电话类别:</div>
 	                                        <div class="labelContent listW35">
 	                                            <select name="" id="phonetype" class="form-control">
@@ -667,12 +668,13 @@
                                 </div>
                                 <div class="form-group clearfix">
                                     <span class="col-sm-1">受话坐席:</span>
-                                    <span class="col-sm-2">
+                                    <span class="col-sm-3">
                                         <select id="comprehensiveContentSerrchSeat" name="select" class="selectpicker show-tick form-control" multiple
                                         data-live-search="true">
                                             <option value="">请选择坐席</option>
                                         </select>
                                     </span>
+                                    
                                 </div>
                             </div>
                             <div class="detail-con">