diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registerView.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registerView.html index 6170605e..8ee91168 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registerView.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registerView.html @@ -44,7 +44,7 @@
-
+
×
@@ -111,10 +111,10 @@ { field : 'num', title : '检查次数', - formatter:function (value,row,index) { - return "" +value+ ""; - } + // formatter:function (value,row,index) { + // return "" +value+ ""; + // } }, { field : 'createTime', @@ -128,7 +128,7 @@ align: 'center', formatter: function(value, row, index) { var actions = []; - actions.push(' 详情 '); + actions.push(' 详情 '); return actions.join(''); } } @@ -155,6 +155,25 @@ var url = prefix + '/registrationDetail/' + dictId; $.modal.openTab("字典数据", url); } + function detailNew(id) { + let start = $("#startTime").val(); + let end = $("#endTime").val(); + let num = $("#num").val(); + $.ajax({ + url: prefix2 +'/queryByEpId', + type:'POST', + data:{ + "enterpriseNumber": id, + "beginTime": start, + "endTime": end, + "num": num + }, + success: function (response) { + $('#detail2').show(); + $('#bootstrap-table3').bootstrapTable('load', response); + } + }) + } function selectUnite(value,beginTime,endTime){ let start = $("#startTime").val(); let end = $("#endTime").val(); diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/overall-analysis.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/overall-analysis.html index e77c8661..6b4616c3 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/overall-analysis.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/overall-analysis.html @@ -18,7 +18,7 @@
- +
@@ -410,7 +410,6 @@ dataType: 'json', contentType: "application/json", success: function(res) { - debugger var streetHtml = ''; var districtHtml = ''; if(res.success) { @@ -468,6 +467,7 @@ bureau_order(deptId,beginTime,endTime); if (null == name) name = "全区" $("#dept_flag").html(name+"") + console.log() } function searchDate(time1, time2) {