|
|
@@ -467,7 +467,7 @@ const attendanceBarOptions = {
|
|
467
|
467
|
}
|
|
468
|
468
|
},
|
|
469
|
469
|
legend: {
|
|
470
|
|
- data: ['旅检一科', '旅检二科', '旅检三科', '全站'],
|
|
|
470
|
+ data: ['安检一大队', '安检二大队', '安检三大队', '安检综合大队', '全站'],
|
|
471
|
471
|
top: 0
|
|
472
|
472
|
},
|
|
473
|
473
|
grid: {
|
|
|
@@ -519,7 +519,7 @@ const attendanceBarOptions = {
|
|
519
|
519
|
data: []
|
|
520
|
520
|
},
|
|
521
|
521
|
{
|
|
522
|
|
- name: '旅检一科',
|
|
|
522
|
+ name: '安检一大队',
|
|
523
|
523
|
type: 'bar',
|
|
524
|
524
|
barWidth: '10%',
|
|
525
|
525
|
itemStyle: {
|
|
|
@@ -533,7 +533,7 @@ const attendanceBarOptions = {
|
|
533
|
533
|
data: []
|
|
534
|
534
|
},
|
|
535
|
535
|
{
|
|
536
|
|
- name: '旅检二科',
|
|
|
536
|
+ name: '安检二大队',
|
|
537
|
537
|
type: 'bar',
|
|
538
|
538
|
barWidth: '10%',
|
|
539
|
539
|
itemStyle: {
|
|
|
@@ -547,7 +547,21 @@ const attendanceBarOptions = {
|
|
547
|
547
|
data: []
|
|
548
|
548
|
},
|
|
549
|
549
|
{
|
|
550
|
|
- name: '旅检三科',
|
|
|
550
|
+ name: '安检三大队',
|
|
|
551
|
+ type: 'bar',
|
|
|
552
|
+ barWidth: '10%',
|
|
|
553
|
+ itemStyle: {
|
|
|
554
|
+ color: '#FFD166'
|
|
|
555
|
+ },
|
|
|
556
|
+ label: {
|
|
|
557
|
+ show: true,
|
|
|
558
|
+ position: 'top',
|
|
|
559
|
+ formatter: '{c}人'
|
|
|
560
|
+ },
|
|
|
561
|
+ data: []
|
|
|
562
|
+ },
|
|
|
563
|
+ {
|
|
|
564
|
+ name: '安检综合大队',
|
|
551
|
565
|
type: 'bar',
|
|
552
|
566
|
barWidth: '10%',
|
|
553
|
567
|
itemStyle: {
|
|
|
@@ -661,7 +675,7 @@ const updateTrendBarChart = () => {
|
|
661
|
675
|
label: {
|
|
662
|
676
|
show: true,
|
|
663
|
677
|
position: 'top',
|
|
664
|
|
- formatter: function(params) {
|
|
|
678
|
+ formatter: function (params) {
|
|
665
|
679
|
return params.value > 0 ? params.value + '人' : '';
|
|
666
|
680
|
}
|
|
667
|
681
|
},
|
|
|
@@ -694,7 +708,7 @@ const updateTrendBarChart = () => {
|
|
694
|
708
|
const updateAttendanceBarChart = () => {
|
|
695
|
709
|
if (trendData.value && Array.isArray(trendData.value)) {
|
|
696
|
710
|
const trendList = trendData.value
|
|
697
|
|
-
|
|
|
711
|
+ debugger
|
|
698
|
712
|
// 提取横坐标数据(timeLabel字段)
|
|
699
|
713
|
const xAxisData = trendList.map(item => item.timeLabel || '未知时间')
|
|
700
|
714
|
|
|
|
@@ -703,6 +717,7 @@ const updateAttendanceBarChart = () => {
|
|
703
|
717
|
const dept1Data = trendList.map(item => item.data1 || 0)
|
|
704
|
718
|
const dept2Data = trendList.map(item => item.data2 || 0)
|
|
705
|
719
|
const dept3Data = trendList.map(item => item.data3 || 0)
|
|
|
720
|
+ const dept4Data = trendList.map(item => item.data4 || 0)
|
|
706
|
721
|
|
|
707
|
722
|
// 更新图表配置
|
|
708
|
723
|
attendanceBarOptions.xAxis.data = xAxisData
|
|
|
@@ -710,7 +725,7 @@ const updateAttendanceBarChart = () => {
|
|
710
|
725
|
attendanceBarOptions.series[1].data = dept1Data
|
|
711
|
726
|
attendanceBarOptions.series[2].data = dept2Data
|
|
712
|
727
|
attendanceBarOptions.series[3].data = dept3Data
|
|
713
|
|
-
|
|
|
728
|
+ attendanceBarOptions.series[4].data = dept4Data
|
|
714
|
729
|
|
|
715
|
730
|
// 重新设置图表选项
|
|
716
|
731
|
setAttendanceOption(attendanceBarOptions)
|