chenrui
/
zdxtLawEnforcementCode
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

全局修改检查为执法

v6
Chendy 1 year ago
parent
89f814fa87
commit
22bafcddc7
10 changed files with 89 additions and 89 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/js/charts-analy.js
  2. 28
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/statistical/scripts/charts-analyov-bak.js
  3. 34
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/statistical/scripts/charts-analyov.js
  4. 16
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/statistical/scripts/charts-analyovNew.js
  5. 12
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/LawEnforcementWarningList/registrationDetail.html
  6. 28
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html
  7. 34
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/home-bak.html
  8. 4
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/staticProgram.html
  9. 2
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/statisticalPanel.html
  10. 8
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/nonRegistration/nonRegistrationView.html

12
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/js/charts-analy.js
View File

@ -2,11 +2,11 @@
var echartUtil = {
echartRingData: [
{ value: 1048, name: '生态环境检查' },
{ value: 735, name: '卫生健康检查' },
{ value: 580, name: '商务领域检查' },
{ value: 484, name: '财务领域检查' },
{ value: 300, name: '水务领域检查' }
{ value: 1048, name: '生态环境执法' },
{ value: 735, name: '卫生健康执法' },
{ value: 580, name: '商务领域执法' },
{ value: 484, name: '财务领域执法' },
{ value: 300, name: '水务领域执法' }
],
/**
@ -51,7 +51,7 @@ var echartUtil = {
});
},
dataX: ['生态环境检查', '卫生健康检查', '商务领域检查', '财务领域检查', '水务领域检查'],
dataX: ['生态环境执法', '卫生健康执法', '商务领域执法', '财务领域执法', '水务领域执法'],
dataY: ['30', '20', '15', '25', '10'],
dataPercent: ['30', '20', '15', '25', '10'],
dataSum: null,

28
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/statistical/scripts/charts-analyov-bak.js
View File

@ -143,13 +143,13 @@ function chartArea(datas) {
areas.push(indicator.area);
var nums = indicator.list;
for(var j=0; j<nums.length; j++) {
if (nums[j].title == "涉企检查次数") {
if (nums[j].title == "涉企执法次数") {
registrations.push(nums[j].num);
}
if (nums[j].title == "联合检查次数") {
if (nums[j].title == "联合执法次数") {
unite_registrations.push(nums[j].num);
}
if (nums[j].title == "行政检查预告次数") {
if (nums[j].title == "行政执法预告次数") {
lawEnforcements.push(nums[j].num);
}
if (nums[j].title == "涉企投诉次数") {
@ -182,7 +182,7 @@ function chartArea(datas) {
itemGap: 20,
itemWidth: 10,
itemHeight: 10,
data:['涉企检查次数','联合检查次数','行政检查预告次数','涉企投诉次数','执法预警次数','企业数量']
data:['涉企执法次数','联合执法次数','行政执法预告次数','涉企投诉次数','执法预警次数','企业数量']
// data:areas
},
grid: {
@ -244,7 +244,7 @@ function chartArea(datas) {
series : [
{
name:'涉企检查次数',
name:'涉企执法次数',
type:'bar',
barWidth: '10%',
showBackground: true,
@ -259,7 +259,7 @@ function chartArea(datas) {
}
},
{
name:'联合检查次数',
name:'联合执法次数',
type:'bar',
barWidth: '10%',
showBackground: true,
@ -274,7 +274,7 @@ function chartArea(datas) {
}
},
{
name:'行政检查预告次数',
name:'行政执法预告次数',
type:'bar',
barWidth: '10%',
showBackground: true,
@ -364,7 +364,7 @@ function chartRegType(datas) {
},
series: [
{
name: '检查类别数量及占比',
name: '执法类别数量及占比',
type: 'pie',
radius: ['43%', '60%'],
avoidLabelOverlap: false,
@ -611,7 +611,7 @@ function chartComplaintType(datas) {
series : [
{
name:'被检查企业次数',
name:'被执法企业次数',
type:'bar',
barWidth: '25%',
showBackground: true,
@ -727,7 +727,7 @@ function chartComplaintType(datas) {
series : [
{
name:'被检查企业次数',
name:'被执法企业次数',
type:'bar',
barWidth: '25%',
showBackground: true,
@ -839,7 +839,7 @@ function chartComplaintType(datas) {
series : [
{
name:'执法检查数量排行',
name:'执法执法数量排行',
type:'bar',
barWidth: '25%',
showBackground: true,
@ -943,7 +943,7 @@ function chartComplaintType(datas) {
series : [
{
name:'被检查企业次数',
name:'被执法企业次数',
type:'bar',
barWidth: '25%',
showBackground: true,
@ -1044,7 +1044,7 @@ function chartComplaintType(datas) {
series : [
{
name:'被检查企业次数',
name:'被执法企业次数',
type:'bar',
barWidth: '25%',
showBackground: true,
@ -1147,7 +1147,7 @@ function chartComplaintType(datas) {
series : [
{
name:'被检查企业次数',
name:'被执法企业次数',
type:'bar',
barWidth: '25%',
showBackground: true,

34
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/statistical/scripts/charts-analyov.js
View File

@ -47,13 +47,13 @@ function sixIndicators_area(deptId, area,beginTime,endTime,) {
areas.push(indicator.area);
var nums = indicator.list;
for(var j=0; j<nums.length; j++) {
if (nums[j].title == "涉企检查次数") {
if (nums[j].title == "涉企执法次数") {
registrations.push(nums[j].num);
}
if (nums[j].title == "联合检查次数") {
if (nums[j].title == "联合执法次数") {
unite_registrations.push(nums[j].num);
}
if (nums[j].title == "行政检查预告次数") {
if (nums[j].title == "行政执法预告次数") {
lawEnforcements.push(nums[j].num);
}
if (nums[j].title == "涉企投诉次数") {
@ -72,7 +72,7 @@ function sixIndicators_area(deptId, area,beginTime,endTime,) {
xAxis: [{data:areas}],
series: [
{
name:'涉企检查次数',
name:'涉企执法次数',
type:'bar',
barWidth: '10%',
showBackground: true,
@ -86,7 +86,7 @@ function sixIndicators_area(deptId, area,beginTime,endTime,) {
}
},
{
name:'联合检查次数',
name:'联合执法次数',
type:'bar',
barWidth: '10%',
showBackground: true,
@ -100,7 +100,7 @@ function sixIndicators_area(deptId, area,beginTime,endTime,) {
}
},
{
name:'行政检查预告次数',
name:'行政执法预告次数',
type:'bar',
barWidth: '10%',
showBackground: true,
@ -337,7 +337,7 @@ function chartArea() {
itemGap: 20,
itemWidth: 10,
itemHeight: 10,
data:['企业数量','涉企检查次数','联合检查次数','行政检查预告次数','涉企投诉次数','执法预警次数']
data:['企业数量','涉企执法次数','联合执法次数','行政执法预告次数','涉企投诉次数','执法预警次数']
// data:areas
},
grid: {
@ -411,7 +411,7 @@ function chartArea() {
}
},
{
name:'涉企检查次数',
name:'涉企执法次数',
type:'bar',
barWidth: '10%',
showBackground: true,
@ -425,7 +425,7 @@ function chartArea() {
}
},
{
name:'联合检查次数',
name:'联合执法次数',
type:'bar',
barWidth: '10%',
showBackground: true,
@ -439,7 +439,7 @@ function chartArea() {
}
},
{
name:'行政检查预告次数',
name:'行政执法预告次数',
type:'bar',
barWidth: '10%',
showBackground: true,
@ -506,7 +506,7 @@ function chartRegType() {
},
series: [
{
name: '检查类别数量及占比',
name: '执法类别数量及占比',
type: 'pie',
radius: ['42%', '60%'],
avoidLabelOverlap: false,
@ -553,7 +553,7 @@ function chartEnterpriseType() {
},
series: [
{
name: '被检查企业类别数量及占比',
name: '被执法企业类别数量及占比',
type: 'pie',
radius: ['42%', '60%'],
avoidLabelOverlap: false,
@ -710,7 +710,7 @@ function chartComplaintType() {
series : [
{
name:'被检查企业次数',
name:'被执法企业次数',
type:'bar',
barWidth: '25%',
showBackground: true,
@ -918,7 +918,7 @@ function chartComplaintType() {
series : [
{
name:'执法检查数量排行',
name:'执法执法数量排行',
type:'bar',
barWidth: '25%',
showBackground: true,
@ -1026,7 +1026,7 @@ function chartComplaintType() {
series : [
{
name:'被检查企业次数',
name:'被执法企业次数',
type:'bar',
barWidth: '25%',
showBackground: true,
@ -1134,7 +1134,7 @@ function chartComplaintType() {
series : [
{
name:'被检查企业次数',
name:'被执法企业次数',
type:'bar',
barWidth: '25%',
showBackground: true,
@ -1244,7 +1244,7 @@ function chartComplaintType() {
series : [
{
name:'被检查企业次数',
name:'被执法企业次数',
type:'bar',
barWidth: '25%',
showBackground: true,

16
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/statistical/scripts/charts-analyovNew.js
View File

@ -24,7 +24,7 @@
itemGap: 20,
itemWidth: 10,
itemHeight: 10,
data:['涉企检查次数','联合检查次数','行政检查预告次数','涉企投诉次数','执法预警次数','企业数量']
data:['涉企执法次数','联合执法次数','行政执法预告次数','涉企投诉次数','执法预警次数','企业数量']
},
grid: {
left: '0',
@ -84,7 +84,7 @@
series : [
{
name:'涉企检查次数',
name:'涉企执法次数',
type:'bar',
barWidth: '10%',
showBackground: true,
@ -98,7 +98,7 @@
}
},
{
name:'联合检查次数',
name:'联合执法次数',
type:'bar',
barWidth: '10%',
showBackground: true,
@ -112,7 +112,7 @@
}
},
{
name:'行政检查预告次数',
name:'行政执法预告次数',
type:'bar',
barWidth: '10%',
showBackground: true,
@ -189,7 +189,7 @@
},
series: [
{
name: '检查类别数量及占比',
name: '执法类别数量及占比',
type: 'pie',
radius: ['43%', '60%'],
avoidLabelOverlap: false,
@ -207,7 +207,7 @@
},
data: [
{ value: 1048, name: '日常检查' },
{ value: 1048, name: '日常执法' },
{ value: 735, name: '上级交办' },
{ value: 580, name: '其他机关移送' },
{ value: 484, name: '重点领域治理部署' },
@ -417,7 +417,7 @@
series : [
{
name:'被检查企业次数',
name:'被执法企业次数',
type:'bar',
barWidth: '25%',
showBackground: true,
@ -623,7 +623,7 @@
series : [
{
name:'执法检查数量',
name:'执法执法数量',
type:'bar',
barWidth: '25%',
showBackground: true,

12
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/LawEnforcementWarningList/registrationDetail.html
View File

@ -24,7 +24,7 @@
<input type="text" name="lawEnforcer"/>
</li>
<li class="select-time">
<p>检查时间：</p>
<p>执法时间：</p>
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="beginEnforcementTime"/>
<span>-</span>
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="endEnforcementTime"/>
@ -147,7 +147,7 @@
columns: [
{
field : 'enterpriseName',
title : '被检查企业名称',
title : '被执法企业名称',
formatter:function (value) {
return "<div style='text-align: left'>"+ value +"</div>";
}
@ -190,18 +190,18 @@
},
{
field : 'lawEnforcementItemText',
title : '检查事项',
title : '执法事项',
formatter:function (value,row,index) {
return "<div style='text-align: left'>"+ $.table.tooltip(value) +"</div>";
}
},
{
field : 'createTime',
title : '检查时间'
title : '执法时间'
},
{
field : 'uniteCheck',
title : '联合检查',
title : '联合执法',
formatter:function (value,row,index) {
if(value !=null && value!=''){
return "<span>是</span>";
@ -213,7 +213,7 @@
},
{
field : 'checkCategory',
title : '行政检查类别',
title : '行政执法类别',
formatter:function (value,row,index) {
for(i=0;i<checkCategory.length;i++){
if(checkCategory[i].dictValue==row.checkCategory){

28
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html
View File

@ -250,7 +250,7 @@
<div class="echarts" id="echarts3" style="width: 600px; height: 300px;"></div>
</div>
<div class="chart-box">
<h3 class="chart-title"><span id="echarts4-title" class="chart-title"></span>执法检查排行（TOP10）</h3>
<h3 class="chart-title"><span id="echarts4-title" class="chart-title"></span>执法执法排行（TOP10）</h3>
<div class="echarts" id="echarts4" style="width: 800px; height: 300px;"></div>
</div>
</div>
@ -335,7 +335,7 @@
columns: [
{
field : 'enterpriseName',
title : '被检查企业名称',
title : '被执法企业名称',
formatter:function (value) {
return "<div style='text-align: left'>"+ value +"</div>";
}
@ -378,18 +378,18 @@
},
{
field : 'lawEnforcementItemText',
title : '检查事项',
title : '执法事项',
formatter:function (value,row,index) {
return "<div style='text-align: left'>"+ $.table.tooltip(value) +"</div>";
}
},
{
field : 'enforcementTime',
title : '检查时间'
title : '执法时间'
},
{
field : 'uniteCheck',
title : '联合检查',
title : '联合执法',
formatter:function (value,row,index) {
if(value !=null && value!=''){
/*return "<span>是</span>";*/
@ -413,7 +413,7 @@
},
{
field : 'checkCategory',
title : '行政检查类别',
title : '行政执法类别',
formatter:function (value,row,index) {
for(i=0;i<checkCategory.length;i++){
if(checkCategory[i].dictValue==row.checkCategory){
@ -476,7 +476,7 @@
columns: [
{
field : 'enterpriseName',
title : '被检查企业名称',
title : '被执法企业名称',
formatter:function (value) {
return "<div style='text-align: left'>"+ value +"</div>";
}
@ -519,14 +519,14 @@
},
{
field : 'lawEnforcementItemText',
title : '检查事项',
title : '执法事项',
formatter:function (value,row,index) {
return "<div style='text-align: left'>"+ $.table.tooltip(value) +"</div>";
}
},
{
field : 'uniteCheck',
title : '联合检查',
title : '联合执法',
formatter:function (value,row,index) {
if(value !=null && value!=''){
return "<span>是</span>";
@ -537,7 +537,7 @@
},
{
field : 'checkCategory',
title : '行政检查类别',
title : '行政执法类别',
formatter:function (value,row,index) {
for(i=0;i<checkCategory.length;i++){
if(checkCategory[i].dictValue==row.checkCategory){
@ -582,7 +582,7 @@
},
{
field : 'createTime',
title : '检查时间'
title : '执法时间'
},
]
};
@ -751,7 +751,7 @@
},*/
series:[
{
name:currentYear+'年年度执法检查排行(TOP10)',
name:currentYear+'年年度执法执法排行(TOP10)',
data:ydata,
type:'bar',
barWidth: 15,
@ -858,7 +858,7 @@
},*/
series:[
{
name: currentYear + '年' + currentQuarter + '执法检查排行(TOP10)',
name: currentYear + '年' + currentQuarter + '执法执法排行(TOP10)',
data: ydata,
type: 'bar',
barWidth: 15,
@ -966,7 +966,7 @@
},*/
series:[
{
name:currentYear+'年'+currentMonth+'月执法检查排行(TOP10)',
name:currentYear+'年'+currentMonth+'月执法执法排行(TOP10)',
data:ydata,
type: 'bar',
barWidth: 15,

34
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/home-bak.html
View File

@ -94,7 +94,7 @@
</div>
<div class="wrap_right">
<div class="cont_left">
<h1 class="block_tit">非行政检查</h1>
<h1 class="block_tit">非行政执法</h1>
<div class="count_wrap" id="nonRegistrationType">
<!-- <div class="count_item">-->
<!-- <label>行政处罚</label>-->
@ -149,7 +149,7 @@
<div class="count_box">
<div class="count_item admin">
<div class="count_tit">
<label>行政检查</label>
<label>行政执法</label>
</div>
<div class="count_num">
<div class="count_num_all" id="jc_all">0</div>
@ -158,7 +158,7 @@
</div>
<div class="count_item non_admin">
<div class="count_tit">
<label>非行政检查</label>
<label>非行政执法</label>
</div>
<div class="count_num">
<div class="count_num_all" id="njc_all">0</div>
@ -194,19 +194,19 @@
<div class="label_item" id="districtSS" style="top: 25%; left: 84%;"></div>
</div>
<div class="legend_box">
<label>涉企检查次数</label>
<label>被检查企业数量</label>
<label>行政检查</label>
<label>非行政检查</label>
<label>涉企执法次数</label>
<label>被执法企业数量</label>
<label>行政执法</label>
<label>非行政执法</label>
</div>
</div>
</div>
<div class="wrap_bottom">
<div class="cont_left">
<h3>涉企检查趋势</h3>
<h3>涉企执法趋势</h3>
<div class="tab_tit">
<a class="active">行政检查</a>
<a>非行政检查</a>
<a class="active">行政执法</a>
<a>非行政执法</a>
</div>
<div class="tab_chart">
<div class="chartbox" id="echartInspect" style="position: absolute"></div>
@ -695,7 +695,7 @@ function timesCharts(times, ins, ent) {
},
},
legend: {
data: ['行政检查数量', '被检查企业数量'],
data: ['行政执法数量', '被执法企业数量'],
icon: 'rect',
top: 0,
right: 25,
@ -736,7 +736,7 @@ function timesCharts(times, ins, ent) {
},
series: [
{
name: '行政检查数量',
name: '行政执法数量',
type: 'line',
smooth: true,
symbol: 'circle', // 拐点类型
@ -750,7 +750,7 @@ function timesCharts(times, ins, ent) {
},
data: ins
}, {
name: '被检查企业数量',
name: '被执法企业数量',
type: 'line',
smooth: true,
symbol: 'circle',
@ -793,7 +793,7 @@ function timesCharts2(times, ins, ent) {
},
},
legend: {
data: ['行政检查数量', '被检查企业数量'],
data: ['行政执法数量', '被执法企业数量'],
icon: 'rect',
top: 0,
right: 25,
@ -834,7 +834,7 @@ function timesCharts2(times, ins, ent) {
},
series: [
{
name: '行政检查数量',
name: '行政执法数量',
type: 'line',
smooth: true,
symbol: 'circle', // 拐点类型
@ -848,7 +848,7 @@ function timesCharts2(times, ins, ent) {
},
data: ins
}, {
name: '被检查企业数量',
name: '被执法企业数量',
type: 'line',
smooth: true,
symbol: 'circle',
@ -908,7 +908,7 @@ function chart_2(data) {
series : [
{
name:'行政检查类别数量及占比',
name:'行政执法类别数量及占比',
type:'pie',
color: ['#4b7efe', '#0566e8', '#02a7a1', '#febf75','#dd5a73','#224ca8',"#9fe9b7","#26cee1",],
radius : [60, 80],

4
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/staticProgram.html
View File

@ -4,7 +4,7 @@
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro"
xmlns="http://www.w3.org/1999/html">
<head>
<th:block th:include="zdxtInclude :: header('检查计划统计')" />
<th:block th:include="zdxtInclude :: header('执法计划统计')" />
<th:block th:include="zdxtInclude :: datetimepicker-css" />
<link type="text/css" href="/css/stat1.css" rel="stylesheet" />
<style>
@ -182,7 +182,7 @@
}
}
/** 检查事项 */
/** 执法事项 */
function staticAllProgram() {
$.ajax({
url: prefix + '/staticAllProgram', //后台url

2
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/statisticalPanel.html
View File

@ -328,7 +328,7 @@
</div>
<div class="panel-card">
<div class="panel-card-top">
<div class="cont-title">执法检查数量</div>
<div class="cont-title">执法执法数量</div>
<div class="cont-total"><b><span id="regis-total">--</span></b><span>件</span></div>
<div class="percent-tag">
<!-- <span class="data-rise">&#8593</span>-->

8
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/nonRegistration/nonRegistrationView.html
View File

@ -82,7 +82,7 @@
</select>
</li>
<li id="selectTime" class="select-time">
<p>检查时间：</p>
<p>执法时间：</p>
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="startTime"/>
<span>-</span>
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="endTime"/>
@ -142,7 +142,7 @@
function init(){
var options = {
url:prefix+"/getList",
modalName: "非行政检查",
modalName: "非行政执法",
showFooter: false,
showColumns: false,
showRefresh: false,
@ -152,7 +152,7 @@
columns: [
{
field : 'enterpriseName',
title : '被检查企业名称',
title : '被执法企业名称',
align :'center'
},
{
@ -177,7 +177,7 @@
},
{
field : 'enforcementTime',
title : '检查时间',
title : '执法时间',
align :'center'
},
{

Write Preview
Loading…
Cancel
Save