diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/js/charts-analy.js b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/js/charts-analy.js index 99bab9f8..4b83209a 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/js/charts-analy.js +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/js/charts-analy.js @@ -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, diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/statistical/scripts/charts-analyov-bak.js b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/statistical/scripts/charts-analyov-bak.js index ed97f146..c5e51489 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/statistical/scripts/charts-analyov-bak.js +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/statistical/scripts/charts-analyov-bak.js @@ -143,13 +143,13 @@ function chartArea(datas) { areas.push(indicator.area); var nums = indicator.list; for(var j=0; j
  • -

    检查时间:

    +

    执法时间:

    - @@ -147,7 +147,7 @@ columns: [ { field : 'enterpriseName', - title : '被检查企业名称', + title : '被执法企业名称', formatter:function (value) { return "
    "+ value +"
    "; } @@ -190,18 +190,18 @@ }, { field : 'lawEnforcementItemText', - title : '检查事项', + title : '执法事项', formatter:function (value,row,index) { return "
    "+ $.table.tooltip(value) +"
    "; } }, { field : 'createTime', - title : '检查时间' + title : '执法时间' }, { field : 'uniteCheck', - title : '联合检查', + title : '联合执法', formatter:function (value,row,index) { if(value !=null && value!=''){ return "是"; @@ -213,7 +213,7 @@ }, { field : 'checkCategory', - title : '行政检查类别', + title : '行政执法类别', formatter:function (value,row,index) { for(i=0;i
    -

    执法检查排行(TOP10)

    +

    执法执法排行(TOP10)

    @@ -335,7 +335,7 @@ columns: [ { field : 'enterpriseName', - title : '被检查企业名称', + title : '被执法企业名称', formatter:function (value) { return "
    "+ value +"
    "; } @@ -378,18 +378,18 @@ }, { field : 'lawEnforcementItemText', - title : '检查事项', + title : '执法事项', formatter:function (value,row,index) { return "
    "+ $.table.tooltip(value) +"
    "; } }, { field : 'enforcementTime', - title : '检查时间' + title : '执法时间' }, { field : 'uniteCheck', - title : '联合检查', + title : '联合执法', formatter:function (value,row,index) { if(value !=null && value!=''){ /*return "是";*/ @@ -413,7 +413,7 @@ }, { field : 'checkCategory', - title : '行政检查类别', + title : '行政执法类别', formatter:function (value,row,index) { for(i=0;i"+ value +""; } @@ -519,14 +519,14 @@ }, { field : 'lawEnforcementItemText', - title : '检查事项', + title : '执法事项', formatter:function (value,row,index) { return "
    "+ $.table.tooltip(value) +"
    "; } }, { field : 'uniteCheck', - title : '联合检查', + title : '联合执法', formatter:function (value,row,index) { if(value !=null && value!=''){ return "是"; @@ -537,7 +537,7 @@ }, { field : 'checkCategory', - title : '行政检查类别', + title : '行政执法类别', formatter:function (value,row,index) { for(i=0;i
    -

    非行政检查

    +

    非行政执法

    @@ -149,7 +149,7 @@
    - +
    0
    @@ -158,7 +158,7 @@
    - +
    0
    @@ -194,19 +194,19 @@
    - - - - + + + +
    -

    涉企检查趋势

    +

    涉企执法趋势

    @@ -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], diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/staticProgram.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/staticProgram.html index 89360663..3ab1c525 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/staticProgram.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/staticProgram.html @@ -4,7 +4,7 @@ - +