|
|
@@ -987,27 +987,37 @@ $(function() {
|
|
|
var name = array_all_name[i];
|
|
|
data_a.push(d_t.get(name) == null ? 0 : d_t.get(name));
|
|
|
|
|
|
- if (t_map_p.get(i) == null) {
|
|
|
- t_map_p.set(i, d_t.get(name) == null ? 0 : d_t.get(name))
|
|
|
+ if (t_map_p.get(name) == null) {
|
|
|
+ t_map_p.set(name, d_t.get(name) == null ? 0 : d_t.get(name))
|
|
|
} else {
|
|
|
- t_map_p.set(i, t_map_p.get(i) + (d_t.get(name) == null ? 0 : d_t.get(name)));
|
|
|
+ t_map_p.set(name, t_map_p.get(name) + (d_t.get(name) == null ? 0 : d_t.get(name)));
|
|
|
}
|
|
|
}
|
|
|
var d_tt = {
|
|
|
name: dept,
|
|
|
type: 'bar',
|
|
|
stack: '上月',
|
|
|
- // barWidth: 10,
|
|
|
+ barGap: 5,
|
|
|
+ barCategoryGap: 20,
|
|
|
data: data_a
|
|
|
}
|
|
|
if (j == array_all_deptname.length - 1) {
|
|
|
d_tt['itemStyle'] = {
|
|
|
-
|
|
|
normal: {
|
|
|
label: {
|
|
|
show: true,
|
|
|
position: 'top',
|
|
|
- formatter: '上月',
|
|
|
+ formatter: function(params) {
|
|
|
+ var name = params.name
|
|
|
+ if (name == '仪表') {
|
|
|
+ name = '仪容仪表着装';
|
|
|
+ }
|
|
|
+ if (name == '行为') {
|
|
|
+ name = '工作纪律及行为举止';
|
|
|
+ }
|
|
|
+
|
|
|
+ return '上月\n' + t_map_p.get(name);
|
|
|
+ },
|
|
|
textStyle: {
|
|
|
color: 'blue'
|
|
|
}
|
|
|
@@ -1022,17 +1032,16 @@ $(function() {
|
|
|
var name = array_all_name[i];
|
|
|
data_a.push(0);
|
|
|
|
|
|
- if (t_map_p.get(i) == null) {
|
|
|
- t_map_p.set(i, 0)
|
|
|
+ if (t_map_p.get(name) == null) {
|
|
|
+ t_map_p.set(name, 0)
|
|
|
} else {
|
|
|
- t_map_p.set(i, t_map_p.get(i) + 0);
|
|
|
+ t_map_p.set(name, t_map_p.get(i) + 0);
|
|
|
}
|
|
|
}
|
|
|
var d_tt = {
|
|
|
name: dept,
|
|
|
type: 'bar',
|
|
|
stack: '上月',
|
|
|
- // barWidth: 10,
|
|
|
data: data_a
|
|
|
}
|
|
|
if (j == array_all_deptname.length - 1) {
|
|
|
@@ -1041,7 +1050,17 @@ $(function() {
|
|
|
label: {
|
|
|
show: true,
|
|
|
position: 'top',
|
|
|
- formatter: '上月',
|
|
|
+ formatter: function(params) {
|
|
|
+ var name = params.name
|
|
|
+ if (name == '仪表') {
|
|
|
+ name = '仪容仪表着装';
|
|
|
+ }
|
|
|
+ if (name == '行为') {
|
|
|
+ name = '工作纪律及行为举止';
|
|
|
+ }
|
|
|
+
|
|
|
+ return '上月\n' + t_map_p.get(name);
|
|
|
+ },
|
|
|
textStyle: {
|
|
|
color: 'blue'
|
|
|
}
|
|
|
@@ -1058,10 +1077,10 @@ $(function() {
|
|
|
var name = array_all_name[i];
|
|
|
data_a.push(d_t.get(name) == null ? 0 : d_t.get(name));
|
|
|
|
|
|
- if (t_map_c.get(i) == null) {
|
|
|
- t_map_c.set(i, d_t.get(name) == null ? 0 : d_t.get(name))
|
|
|
+ if (t_map_c.get(name) == null) {
|
|
|
+ t_map_c.set(name, d_t.get(name) == null ? 0 : d_t.get(name))
|
|
|
} else {
|
|
|
- t_map_c.set(i, t_map_c.get(i) + (d_t.get(name) == null ? 0 : d_t.get(name)));
|
|
|
+ t_map_c.set(name, t_map_c.get(name) + (d_t.get(name) == null ? 0 : d_t.get(name)));
|
|
|
}
|
|
|
}
|
|
|
var d_tt = {
|
|
|
@@ -1077,7 +1096,17 @@ $(function() {
|
|
|
label: {
|
|
|
show: true,
|
|
|
position: 'top',
|
|
|
- formatter: '本月',
|
|
|
+ formatter: function(params) {
|
|
|
+ var name = params.name
|
|
|
+ if (name == '仪表') {
|
|
|
+ name = '仪容仪表着装';
|
|
|
+ }
|
|
|
+ if (name == '行为') {
|
|
|
+ name = '工作纪律及行为举止';
|
|
|
+ }
|
|
|
+
|
|
|
+ return '本月\n' + t_map_c.get(name);
|
|
|
+ },
|
|
|
textStyle: {
|
|
|
color: 'red'
|
|
|
}
|
|
|
@@ -1091,10 +1120,10 @@ $(function() {
|
|
|
for (var i = 0; i < array_all_name.length; i++) {
|
|
|
var name = array_all_name[i];
|
|
|
data_a.push(0);
|
|
|
- if (t_map_c.get(i) == null) {
|
|
|
- t_map_c.set(i, 0)
|
|
|
+ if (t_map_c.get(name) == null) {
|
|
|
+ t_map_c.set(name, 0)
|
|
|
} else {
|
|
|
- t_map_c.set(i, t_map_c.get(i) + 0);
|
|
|
+ t_map_c.set(name, t_map_c.get(name) + 0);
|
|
|
}
|
|
|
}
|
|
|
var d_tt = {
|
|
|
@@ -1109,7 +1138,17 @@ $(function() {
|
|
|
label: {
|
|
|
show: true,
|
|
|
position: 'top',
|
|
|
- formatter: '本月',
|
|
|
+ formatter: function(params) {
|
|
|
+ var name = params.name
|
|
|
+ if (name == '仪表') {
|
|
|
+ name = '仪容仪表着装';
|
|
|
+ }
|
|
|
+ if (name == '行为') {
|
|
|
+ name = '工作纪律及行为举止';
|
|
|
+ }
|
|
|
+
|
|
|
+ return '本月\n' + t_map_c.get(name);
|
|
|
+ },
|
|
|
textStyle: {
|
|
|
color: 'red'
|
|
|
}
|