diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html index a457b34a..539d9f96 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html @@ -150,7 +150,7 @@ -
+
@@ -248,7 +248,7 @@ echarts2(); echarts3(); echarts4(); - } + }; $(function() { var options = { modalName: "执法记录统计", @@ -289,7 +289,10 @@ }, { field : 'lawEnforcementItemText', - title : '检查事项' + title : '检查事项', + formatter:function (value,row,index) { + return $.table.tooltip(value); + } }, { field : 'uniteCheck', @@ -356,7 +359,7 @@ $("#bootstrap-table").bootstrapTable(options); }); function echarts1(){ - var currentId=$('form').eq(1).attr('id') + var currentId=$('form').eq(1).attr('id'); var params = $.common.formToJSON(currentId); $.ajax({ url:prefix+'/echarts1', @@ -402,16 +405,16 @@ url: prefix + '/echarts2', type: 'POST', success: function (response) { - console.log(response) + console.log(response); let xdata=[]; response.forEach(e => { xdata.push(e.name) - }) + }); let ydata=[]; response.forEach(e => { ydata.push(e.value) - }) + }); var option2 = { tooltip: {}, xAxis: { @@ -431,7 +434,7 @@ barWidth: 50 } ] - } + }; echart2.setOption(option2); } }) @@ -441,15 +444,15 @@ url: prefix + '/echarts3', type: 'POST', success: function (response) { - console.log(response) + console.log(response); let xdata=[]; response.forEach(e => { xdata.push(e.name) - }) + }); let ydata=[]; response.forEach(e => { ydata.push(e.value) - }) + }); var option3 = { tooltip: {}, xAxis: { @@ -469,7 +472,7 @@ barWidth: 50 } ] - } + }; echart3.setOption(option3); } }) @@ -479,15 +482,15 @@ url: prefix + '/echarts4', type: 'POST', success: function (response) { - console.log(response) + console.log(response); let xdata=[]; response.forEach(e => { xdata.push(e.name) - }) + }); let ydata=[]; response.forEach(e => { ydata.push(e.value) - }) + }); var option4 = { tooltip: {}, xAxis: { @@ -507,7 +510,7 @@ barWidth: 50 } ] - } + }; echart4.setOption(option4); } }) 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 a1fd2d3d..2ca29fae 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 @@ -404,6 +404,7 @@ } } ], + tooltip: {}, xAxis: { type: 'category', axisLabel: { interval: 0, rotate: 30 } @@ -412,7 +413,9 @@ series: { type: 'bar', encode: { x: 'name', y: 'score' }, - datasetIndex: 1 + datasetIndex: 1, + color: "rgba(24, 116, 205, 1)", + barWidth: 50 } }; option && myChart.setOption(option); @@ -437,6 +440,7 @@ } } ], + tooltip: {}, xAxis: { type: 'category', axisLabel: { interval: 0, rotate: 30 } @@ -445,7 +449,9 @@ series: { type: 'bar', encode: { x: 'name', y: 'score' }, - datasetIndex: 1 + datasetIndex: 1, + color: "rgba(24, 116, 205, 1)", + barWidth: 50 } }; option && myChart.setOption(option); @@ -470,6 +476,7 @@ } } ], + tooltip: {}, xAxis: { type: 'category', axisLabel: { interval: 0, rotate: 30 } @@ -478,7 +485,9 @@ series: { type: 'bar', encode: { x: 'name', y: 'score' }, - datasetIndex: 1 + datasetIndex: 1, + color: "rgba(24, 116, 205, 1)", + barWidth: 50 } }; option && myChart.setOption(option); @@ -503,6 +512,7 @@ } } ], + tooltip: {}, xAxis: { type: 'category', axisLabel: { interval: 0, rotate: 30 } @@ -511,7 +521,9 @@ series: { type: 'bar', encode: { x: 'name', y: 'score' }, - datasetIndex: 1 + datasetIndex: 1, + color: "rgba(24, 116, 205, 1)", + barWidth: 50 } }; option && myChart.setOption(option);