修改bug

.gitignore

@@ -0,0 +1,5 @@
+################################################################################
+# 此 .gitignore 文件已由 Microsoft(R) Visual Studio 自动创建。
+################################################################################
+
+/.vs

WebUI/CallCenterWeb.UI/Report/js/CallTime.js

@@ -49,8 +49,8 @@ $(document).ready(function(){
 					dataType: 'json',
 					async: true,
 					data: {
-						stime:  $('#startTime').val() && $('#startTime').val().split('~')[0],
-						etime:  $('#startTime').val() && $('#startTime').val().split('~')[1],
+						stime:  ($('#startTime').val() ? $('#startTime').val().split('~')[0]:""),
+						etime:  ($('#startTime').val() ? $('#startTime').val().split('~')[1]:""),
 						token: $.cookie("token"),
 					},
 					success: function(data) {
@@ -70,6 +70,6 @@ $(document).ready(function(){
 			
 			function dcexcel(obj) {
 				var url = huayi.config.callcenter_url + "/TotalTel/ExptList?token=" + $.cookie("token");
-				url += "&stime=" +  $('#startTime').val() && $('#startTime').val().split('~')[0] + "&etime=" +  $('#startTime').val() && $('#startTime').val().split('~')[1] + "";
+				url += "&stime=" +  ($('#startTime').val() ? $('#startTime').val().split('~')[0]:"") + "&etime=" +  ($('#startTime').val() ? $('#startTime').val().split('~')[1]:"") + "";
 				obj.href = url;
 			}

WebUI/CallCenterWeb.UI/ReportForm/js/callTime.js

@@ -137,7 +137,7 @@ $.ajax({
 //导出
 function dcexcel(obj) {
 	var url = huayi.config.callcenter_url + "TalkTime/ExptList?token=" + $.cookie("token");
-	url += "&stime=" + $('#startTime').val() && $('#startTime').val().split('~')[0] + "&endtime=" + $('#startTime').val() && $('#startTime').val().split('~')[1];
+	url += "&stime=" + ($('#startTime').val() ? $('#startTime').val().split('~')[0]:"") + "&endtime=" + ($('#startTime').val() ? $('#startTime').val().split('~')[1]:"");
 	obj.href = url;
 }
 //表格数据
@@ -159,8 +159,8 @@ function Ajax() {
 		dataType: 'json',
 		data: {
 			token: token,
-			stime: $('#startTime').val() && $('#startTime').val().split('~')[0],
-			endtime: $('#startTime').val() && $('#startTime').val().split('~')[1]
+			stime: ($('#startTime').val() ? $('#startTime').val().split('~')[0]:""),
+			endtime: ($('#startTime').val() ? $('#startTime').val().split('~')[1]:"")
 		},
 		success: function(data) {
 			var tbodyCon = data.data;

WebUI/CallCenterWeb.UI/ReportForm/js/jthusuan.js

@@ -133,8 +133,8 @@ function Ajax() {
 		dataType: 'json',
 		data: {
 			token: token,
-			stime: $('#startTime').val() && $('#startTime').val().split('~')[0],
-			endtime: $('#startTime').val() && $('#startTime').val().split('~')[1]
+			stime: ($('#startTime').val() ? $('#startTime').val().split('~')[0]:""),
+			endtime: ($('#startTime').val() ? $('#startTime').val().split('~')[1]:"")
 		},
 		success: function(data) {
 			var tbodyCon = data.data;
@@ -167,6 +167,6 @@ function Ajax() {
 //导出
 function dcexcel(obj) {
 	var url = huayi.config.callcenter_url + "SwitchedlossCall/ExptList?token=" + $.cookie("token");
-	url += "&stime=" + $('#startTime').val() && $('#startTime').val().split('~')[0] + "&endtime=" + $('#startTime').val() && $('#startTime').val().split('~')[1];
+	url += "&stime=" + ($('#startTime').val() ? $('#startTime').val().split('~')[0]:"") + "&endtime=" + ($('#startTime').val() ? $('#startTime').val().split('~')[1]:"");
 	obj.href = url;
 }

WebUI/CallCenterWeb.UI/ReportForm/js/zuoXiTable.js

@@ -63,7 +63,7 @@ var token = $.cookie("token");
 			function dcexcel(obj) {
         		    var dpt = $("#bumen").val();
 		            var url = huayi.config.callcenter_url + "ZuoXiWorkTotal/ExptList?token=" + $.cookie("token");
-		            url += "&stime=" + $('#startTime').val() && $('#startTime').val().split('~')[0] + "&endtime=" + $('#startTime').val() && $('#startTime').val().split('~')[1] + "&dpt=" + dpt + "&dayss=" + $("#dayss").val();
+		            url += "&stime=" + ($('#startTime').val() ? $('#startTime').val().split('~')[0]:"") + "&endtime=" + ($('#startTime').val() ? $('#startTime').val().split('~')[1]:"") + "&dpt=" + dpt + "&dayss=" + $("#dayss").val();
 		            obj.href = url;
             }
 		        //表头
@@ -96,8 +96,8 @@ var token = $.cookie("token");
 						async:true,
 						dataType:'json',
 						data:{
-							stime:$('#startTime').val() && $('#startTime').val().split('~')[0],
-							endtime: $('#startTime').val() && $('#startTime').val().split('~')[1],
+							stime:($('#startTime').val() ? $('#startTime').val().split('~')[0]:""),
+							endtime: ($('#startTime').val() ? $('#startTime').val().split('~')[1]:""),
 							dpt: $("#bumen").val(),
 							dayss: $("#dayss").val(),
 							token:$.cookie("token")

WebUI/CallCenterWeb.UI/TelCall/dayHuaWu.html

@@ -133,8 +133,8 @@
             	dataType:'json',
             	data:{
             		token:$.cookie("token"),
-            		btime:$('#startTime').val() && $('#startTime').val().split('~')[0],
-            		etime:$('#startTime').val() && $('#startTime').val().split('~')[1],
+            		btime:($('#startTime').val() ? $('#startTime').val().split('~')[0]:""),
+            		etime:($('#startTime').val() ? $('#startTime').val().split('~')[1]:""),
             		type:$('.dataType').val()
 //          		usercode:usercode
             	},
@@ -152,7 +152,7 @@
         //导出
       function dcexcel(obj) {
             var url = huayi.config.callcenter_url + "TelWOReport/ExptList?token=" + $.cookie("token");
-                url += "&btime=" + $('#startTime').val() && $('#startTime').val().split('~')[0], + "&etime=" + $('#startTime').val() && $('#startTime').val().split('~')[1],+ "&type=" + $(".dataType").val();
+                url += "&btime=" + ($('#startTime').val() ? $('#startTime').val().split('~')[0]:""), + "&etime=" + ($('#startTime').val() ? $('#startTime').val().split('~')[1]:""),+ "&type=" + $(".dataType").val();
                 obj.href = url;
        		 }
        

WebUI/CallCenterWeb.UI/YeWu/CB.html

@@ -153,8 +153,8 @@
                     var param = {
                         pageIndex: params.pageNumber,
                         pageSize: params.pageSize,
-                        start:$('#startTime').val() && $('#startTime').val().split('~')[0],
-                        end: $('#startTime').val() && $('#startTime').val().split('~')[1],
+                        start:($('#startTime').val() ? $('#startTime').val().split('~')[0]:""),
+                        end: ($('#startTime').val() ? $('#startTime').val().split('~')[1]:""),
                         token: $.cookie("token")
                     };
                     return param;
@@ -192,7 +192,7 @@
         })
 	   function dcexcel(obj) {
         var url = huayi.config.callcenter_url + "WorkOrderReport/GetNotSatisfied?token=" + $.cookie("token");
-            url += "&start=" + $('#startTime').val() && $('#startTime').val().split('~')[0] + "&end=" + $('#startTime').val() && $('#startTime').val().split('~')[1] + "&isExport=true";
+            url += "&start=" + ($('#startTime').val() ? $('#startTime').val().split('~')[0]:"") + "&end=" + ($('#startTime').val() ? $('#startTime').val().split('~')[1]:"") + "&isExport=true";
             obj.href = url;
    		 }
 	   

WebUI/CallCenterWeb.UI/YeWu/GX.html

@@ -137,8 +137,8 @@
                 url: huayi.config.callcenter_url + 'WorkOrderReport/GetDeptEfficiency',
                 type: 'get',
                 data: {
-                    start: $('#startTime').val() && $('#startTime').val().split('~')[0],
-                    end: $('#startTime').val() && $('#startTime').val().split('~')[1],
+                    start: ($('#startTime').val() ? $('#startTime').val().split('~')[0]:""),
+                    end: ($('#startTime').val() ? $('#startTime').val().split('~')[1]:""),
                     token: $.cookie("token")
                 },
                 dataType: "json",
@@ -202,7 +202,7 @@
 
         function dcexcel(obj) {
             var url = huayi.config.callcenter_url + "WorkOrderReport/GetDeptEfficiency?token=" + $.cookie("token");
-            url += "&start=" + $('#startTime').val() && $('#startTime').val().split('~')[0] + "&end=" + $('#startTime').val() && $('#startTime').val().split('~')[1] + "&isExport=true";
+            url += "&start=" + ($('#startTime').val() ? $('#startTime').val().split('~')[0]:"") + "&end=" + ($('#startTime').val() ? $('#startTime').val().split('~')[1]:"") + "&isExport=true";
             obj.href = url;
         }
 

WebUI/CallCenterWeb.UI/YeWu/MY.html

@@ -133,8 +133,8 @@
                 url: huayi.config.callcenter_url + 'WorkOrderReport/GetDeptSatisfied',
                 type: 'get',
                 data: {
-                    start: $('#startTime').val() && $('#startTime').val().split('~')[0],
-                    end:  $('#startTime').val() && $('#startTime').val().split('~')[1],
+                    start: ($('#startTime').val() ? $('#startTime').val().split('~')[0]:""),
+                    end:  ($('#startTime').val() ? $('#startTime').val().split('~')[1]:""),
                     token: $.cookie("token")
                 },
                 dataType: "json",
@@ -197,7 +197,7 @@
            		
 	   function dcexcel(obj) {
         var url = huayi.config.callcenter_url + "WorkOrderReport/GetDeptSatisfied?token=" + $.cookie("token");
-        url += "&start=" +  $('#startTime').val() && $('#startTime').val().split('~')[0] + "&end=" +  $('#startTime').val() && $('#startTime').val().split('~')[1] + "&isExport=true";
+        url += "&start=" +  ($('#startTime').val() ? $('#startTime').val().split('~')[0]:"") + "&end=" +  ($('#startTime').val() ? $('#startTime').val().split('~')[1]:"") + "&isExport=true";
             obj.href = url;
    		 }
      

WebUI/CallCenterWeb.UI/YeWu/Number.html

@@ -105,11 +105,13 @@
                         <thead>
                             <tr>
                                 <th data-field="deptname" data-align="center">单位名称</th>
-                                <th data-field="acceptcount" data-align="center">受理数量</th>
-                                <th data-field="dealcount" data-align="center">办理数量</th>
-                                <th data-field="dealrate" data-align="center">办理率</th>
-                                <th data-field="endcount" data-align="center">完结数量</th>
-                                <th data-field="endrate" data-align="center">完结率</th>
+                                <th data-field="acceptcount" data-align="center">当月受理量</th>
+                                <th data-field="dealcount" data-align="center">当月处理量</th>
+                                <th data-field="beforedealcount" data-align="center">往月处理量</th>
+                                <th data-field="delaycount" data-align="center">当月延期量</th>
+                                <th data-field="beforedelaycount" data-align="center">往月延期量</th>
+                                <th data-field="dealrate" data-align="center">当月办理率</th>
+                                <th data-field="endrate" data-align="center">当月办结率</th>
                             </tr>
                         </thead>
                     </table>
@@ -121,46 +123,49 @@
    
     <script>
         $(document).ready(function () {
+
             laydate.render({
-					elem: '#startTime',
-					range: '~',
-					theme: '#00a1cb',
-			});
+                theme: '#00a1cb',
+                trigger: 'click',
+                elem: '#monthDateTimes',
+                format: 'yyyy-MM',
+                type: 'month',
+                value: new Date()
+            });
             initTable();
         })
         function initTable() {
             $.ajax({
-                url: huayi.config.callcenter_url + 'WorkOrderReport/GetDeptCount',
+                url: huayi.config.callcenter_url + 'WorkOrderReport/GetDeptMonthReport',
                 type: 'get',
                 data: {
-                    start: $('#startTime').val() && $('#startTime').val().split('~')[0],
-                    end: $('#startTime').val() && $('#startTime').val().split('~')[1],
+                    date: $("#monthDateTimes").val(),
                     token: $.cookie("token")
                 },
                 dataType: "json",
                 async: true,
                 success: function (returnValue) {
                     //异步获取数据
-                    var resultData1 = returnValue.data.DeptDealReport;
+                    var resultData1 = returnValue.data.DeptMonthReport;
                     $('#workorderlist').bootstrapTable('load', resultData1);
                 }
             });
             $('#workorderlist').bootstrapTable('destroy').bootstrapTable({ striped: true });
         }
-      
+
         //代办搜索
         $(".db").click(function () {
             initTable();
         })
-		//导出
-         $('.export').click(function(){
-        		dcexcel(this);
+        //导出
+        $('.export').click(function () {
+            dcexcel(this);
         })
-	   function dcexcel(obj) {
-        var url = huayi.config.callcenter_url + "WorkOrderReport/GetDeptCount?token=" + $.cookie("token");
-            url += "&start=" + $('#startTime').val() && $('#startTime').val().split('~')[0] + "&end=" + $('#startTime').val() && $('#startTime').val().split('~')[1]+ "&isExport=true";
+        function dcexcel(obj) {
+            var url = huayi.config.callcenter_url + "WorkOrderReport/GetDeptMonthReport?token=" + $.cookie("token");
+            url += "&date=" + $("#monthDateTimes").val() + "&isExport=true";
             obj.href = url;
-   		 }
+        }
       
    
     </script>

WebUI/CallCenterWeb.UI/YeWu/SQ.html

@@ -138,8 +138,8 @@
                 url: huayi.config.callcenter_url + 'WorkOrderReport/GetAppeal',
                 type: 'get',
                 data: {
-                    start: $('#startTime').val() && $('#startTime').val().split('~')[0],
-                    end: $('#startTime').val() && $('#startTime').val().split('~')[1],
+                    start: ($('#startTime').val() ? $('#startTime').val().split('~')[0]:""),
+                    end: ($('#startTime').val() ? $('#startTime').val().split('~')[1]:""),
                     token: $.cookie("token")
                 },
                 dataType: "json",
@@ -165,7 +165,7 @@
 
         function dcexcel(obj) {
             var url = huayi.config.callcenter_url + "WorkOrderReport/GetAppeal?token=" + $.cookie("token");
-            url += "&start=" + $('#startTime').val() && $('#startTime').val().split('~')[0] + "&end=" + $('#startTime').val() && $('#startTime').val().split('~')[1] + "&isExport=true";
+            url += "&start=" + ($('#startTime').val() ? $('#startTime').val().split('~')[0]:"") + "&end=" + ($('#startTime').val() ? $('#startTime').val().split('~')[1]:"") + "&isExport=true";
             obj.href = url;
         }
 

WebUI/CallCenterWeb.UI/YeWu/TB.html

@@ -140,7 +140,7 @@
         //表格一
         function initTable() {
             $('#workorderlist').bootstrapTable('destroy').bootstrapTable({ striped: true });
-            $.getJSON(huayi.config.callcenter_url + "WorkOrderReport/GetNotice", { start: $('#startTime').val() && $('#startTime').val().split('~')[0], end:  $('#startTime').val() && $('#startTime').val().split('~')[1], token: $.cookie("token") }, function (data) {
+            $.getJSON(huayi.config.callcenter_url + "WorkOrderReport/GetNotice", { start: ($('#startTime').val() ? $('#startTime').val().split('~')[0]:""), end:  ($('#startTime').val() ? $('#startTime').val().split('~')[1]:""), token: $.cookie("token") }, function (data) {
                 if (data.state == "success") {
                     $('#workorderlist').bootstrapTable('load', data.data.DeptNoticeReport);
                 }
@@ -156,7 +156,7 @@
         })
         function dcexcel(obj) {
             var url = huayi.config.callcenter_url + "WorkOrderReport/GetNotice?token=" + $.cookie("token");
-            url += "&start=" + $('#startTime').val() && $('#startTime').val().split('~')[0] + "&end=" +  $('#startTime').val() && $('#startTime').val().split('~')[1] + "&isExport=true";
+            url += "&start=" + ($('#startTime').val() ? $('#startTime').val().split('~')[0]:"") + "&end=" +  ($('#startTime').val() ? $('#startTime').val().split('~')[1]:"") + "&isExport=true";
             obj.href = url;
         }
     </script>

WebUI/CallCenterWeb.UI/YeWu/XL.html

@@ -158,8 +158,8 @@
                 url: huayi.config.callcenter_url + 'WorkOrderReport/GetDeptAssessment',
                 type: 'get',
                 data: {
-                    start:$('#startTime').val() && $('#startTime').val().split('~')[0],
-                    end: $('#startTime').val() && $('#startTime').val().split('~')[1],
+                    start:($('#startTime').val() ? $('#startTime').val().split('~')[0]:""),
+                    end: ($('#startTime').val() ? $('#startTime').val().split('~')[1]:""),
                     token: $.cookie("token")
                 },
                 dataType: "json",
@@ -194,7 +194,7 @@
 
         function dcexcel(obj) {
             var url = huayi.config.callcenter_url + "WorkOrderReport/GetDeptAssessment?token=" + $.cookie("token");
-            url += "&start=" + $('#startTime').val() && $('#startTime').val().split('~')[0] + "&end=" + $('#startTime').val() && $('#startTime').val().split('~')[1] + "&isExport=true";
+            url += "&start=" + ($('#startTime').val() ? $('#startTime').val().split('~')[0]:"") + "&end=" + ($('#startTime').val() ? $('#startTime').val().split('~')[1]:"") + "&isExport=true";
             obj.href = url;
         }
         //搜索

WebUI/CallCenterWeb.UI/YeWu/YQ.html

@@ -158,8 +158,8 @@
                     var param = {
                         pageIndex: params.pageNumber,
                         pageSize: params.pageSize,
-                        start:$('#startTime').val() && $('#startTime').val().split('~')[0],
-                        end: $('#startTime').val() && $('#startTime').val().split('~')[1],
+                        start:($('#startTime').val() ? $('#startTime').val().split('~')[0]:""),
+                        end: ($('#startTime').val() ? $('#startTime').val().split('~')[1]:""),
                         deptId: $("#depar").val(),
                         token: $.cookie("token")
                     };

WebUI/CallCenterWeb.UI/YeWu/YS.html

@@ -145,8 +145,8 @@
                 url: huayi.config.callcenter_url + 'WorkOrderReport/GetDelay',
                 type: 'get',
                 data: {
-                    start: $('#startTime').val() && $('#startTime').val().split('~')[0],
-                    end:$('#startTime').val() && $('#startTime').val().split('~')[1],
+                    start: ($('#startTime').val() ? $('#startTime').val().split('~')[0]:""),
+                    end:($('#startTime').val() ? $('#startTime').val().split('~')[1]:""),
                     token: $.cookie("token")
                 },
                 dataType: "json",
@@ -171,7 +171,7 @@
 
         function dcexcel(obj) {
             var url = huayi.config.callcenter_url + "WorkOrderReport/GetDelay?token=" + $.cookie("token");
-            url += "&start=" + $('#startTime').val() && $('#startTime').val().split('~')[0] + "&end=" +$('#startTime').val() && $('#startTime').val().split('~')[1] + "&isExport=true";
+            url += "&start=" + ($('#startTime').val() ? $('#startTime').val().split('~')[0]:"") + "&end=" +($('#startTime').val() ? $('#startTime').val().split('~')[1]:"") + "&isExport=true";
             obj.href = url;
         }
 

WebUI/CallCenterWeb.UI/YeWu/ZX.html

@@ -149,8 +149,8 @@
                 url: huayi.config.callcenter_url + 'WorkOrderReport/GetUserAccountAssessment',
                 type: 'get',
                 data: {
-                    start: $('#startTime').val() && $('#startTime').val().split('~')[0],
-                    end: $('#startTime').val() && $('#startTime').val().split('~')[1],
+                    start: ($('#startTime').val() ? $('#startTime').val().split('~')[0]:""),
+                    end: ($('#startTime').val() ? $('#startTime').val().split('~')[1]:""),
                     token: $.cookie("token")
                 },
                 dataType: "json",
@@ -167,7 +167,7 @@
 
         function dcexcel(obj) {
             var url = huayi.config.callcenter_url + "WorkOrderReport/GetUserAccountAssessment?token=" + $.cookie("token");
-            url += "&start=" + $('#startTime').val() && $('#startTime').val().split('~')[0] + "&end=" + $('#startTime').val() && $('#startTime').val().split('~')[1] +"&isExport=true";
+            url += "&start=" + ($('#startTime').val() ? $('#startTime').val().split('~')[0]:"") + "&end=" + ($('#startTime').val() ? $('#startTime').val().split('~')[1]:"") +"&isExport=true";
             obj.href = url;
         }
 

WebUI/CallCenterWeb.UI/YeWu/businessBrief.html

@@ -921,8 +921,8 @@
         //表格
         function initTableBrief(brieftype) {
             $.getJSON(huayi.config.callcenter_url + 'DataAnalysis/GetSimpleReport', {
-                sdate: (brieftype == 1) ? $('#startTime').val() && $('#startTime').val().split('~')[0] : '',
-                edate: (brieftype == 1) ? $('#startTime').val() && $('#startTime').val().split('~')[1] : '',
+                sdate: (brieftype == 1) ? ($('#startTime').val() ? $('#startTime').val().split('~')[0]:"") : '',
+                edate: (brieftype == 1) ? ($('#startTime').val() ? $('#startTime').val().split('~')[1]:"") : '',
                 monthdate: (brieftype == 2) ? $('#monthDateTimes').val() : '',
                 type: brieftype, //1周报 2月报
                 token: $.cookie("token")

WebUI/CallCenterWeb.UI/YeWu/dispatchingWorkStatistics.html

@@ -155,8 +155,8 @@
                 url: huayi.config.callcenter_url + 'WorkOrderReport/GetWorkLoad',
                 type: 'get',
                 data: {
-                    start: $('#startTime').val() && $('#startTime').val().split('~')[0],
-                    end: $('#startTime').val() && $('#startTime').val().split('~')[1],
+                    start: ($('#startTime').val() ? $('#startTime').val().split('~')[0]:""),
+                    end: ($('#startTime').val() ? $('#startTime').val().split('~')[1]:""),
                     token: $.cookie("token")
                 },
                 dataType: "json",
@@ -177,7 +177,7 @@
 
         function dcexcelDispathing(obj) {
             var url = huayi.config.callcenter_url + "WorkOrderReport/GetWorkLoad?token=" + $.cookie("token");
-            url += "&start=" + $('#startTime').val() && $('#startTime').val().split('~')[0] + "&end=" + $('#startTime').val() && $('#startTime').val().split('~')[1] + "&isExport=true";
+            url += "&start=" + ($('#startTime').val() ? $('#startTime').val().split('~')[0]:"") + "&end=" + ($('#startTime').val() ? $('#startTime').val().split('~')[1]:"") + "&isExport=true";
             //debugger;
             obj.href = url;
         }

WebUI/CallCenterWeb.UI/YeWu/publicSentimentAnalysis.html

@@ -116,8 +116,8 @@
                 url: huayi.config.callcenter_url + 'DataAnalysis/GetKeyCountReport',
                 type: 'get',
                 data: {
-                    sdate: $('#startTime').val() && $('#startTime').val().split('~')[0],
-                    edate: $('#startTime').val() && $('#startTime').val().split('~')[1],
+                    sdate: ($('#startTime').val() ? $('#startTime').val().split('~')[0]:""),
+                    edate: ($('#startTime').val() ? $('#startTime').val().split('~')[1]:""),
                     token: $.cookie("token")
                 },
                 dataType: "json",
@@ -143,7 +143,7 @@
 
         function dcexcelDispath(obj) {
             var url = huayi.config.callcenter_url + "DataAnalysis/GetKeyCountReport?token=" + $.cookie("token");
-            url += "&sdate=" + $('#startTime').val() && $('#startTime').val().split('~')[0] + "&edate=" + $('#startTime').val() && $('#startTime').val().split('~')[1] + "&isdc=1";
+            url += "&sdate=" + ($('#startTime').val() ? $('#startTime').val().split('~')[0]:"") + "&edate=" + ($('#startTime').val() ? $('#startTime').val().split('~')[1]:"") + "&isdc=1";
             obj.href = url;
         }