Merge branch 'ai' into dev

src/utils/request.js

@@ -18,7 +18,7 @@ const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: import.meta.env.VITE_APP_BASE_API,
   // 超时
-  timeout: 10000
+  timeout: 80000
 })
 
 // request拦截器

src/views/assistant/components/dutyOrganization.vue

@@ -467,7 +467,7 @@ const attendanceBarOptions = {
     }
   },
   legend: {
-    data: ['旅检一科', '旅检二科', '旅检三科', '全站'],
+    data: ['安检一大队', '安检二大队', '安检三大队', '安检综合大队', '全站'],
     top: 0
   },
   grid: {
@@ -519,7 +519,7 @@ const attendanceBarOptions = {
       data: []
     },
     {
-      name: '旅检一科',
+      name: '安检一大队',
       type: 'bar',
       barWidth: '10%',
       itemStyle: {
@@ -533,7 +533,7 @@ const attendanceBarOptions = {
       data: []
     },
     {
-      name: '旅检二科',
+      name: '安检二大队',
       type: 'bar',
       barWidth: '10%',
       itemStyle: {
@@ -547,7 +547,21 @@ const attendanceBarOptions = {
       data: []
     },
     {
-      name: '旅检三科',
+      name: '安检三大队',
+      type: 'bar',
+      barWidth: '10%',
+      itemStyle: {
+        color: '#FFD166'
+      },
+      label: {
+        show: true,
+        position: 'top',
+        formatter: '{c}人'
+      },
+      data: []
+    },
+    {
+      name: '安检综合大队',
       type: 'bar',
       barWidth: '10%',
       itemStyle: {
@@ -661,7 +675,7 @@ const updateTrendBarChart = () => {
           label: {
             show: true,
             position: 'top',
-            formatter: function(params) {
+            formatter: function (params) {
               return params.value > 0 ? params.value + '人' : '';
             }
           },
@@ -694,7 +708,7 @@ const updateTrendBarChart = () => {
 const updateAttendanceBarChart = () => {
   if (trendData.value && Array.isArray(trendData.value)) {
     const trendList = trendData.value
-
+    debugger
     // 提取横坐标数据（timeLabel字段）
     const xAxisData = trendList.map(item => item.timeLabel || '未知时间')
 
@@ -703,6 +717,7 @@ const updateAttendanceBarChart = () => {
     const dept1Data = trendList.map(item => item.data1 || 0)
     const dept2Data = trendList.map(item => item.data2 || 0)
     const dept3Data = trendList.map(item => item.data3 || 0)
+    const dept4Data = trendList.map(item => item.data4 || 0)
 
     // 更新图表配置
     attendanceBarOptions.xAxis.data = xAxisData
@@ -710,7 +725,7 @@ const updateAttendanceBarChart = () => {
     attendanceBarOptions.series[1].data = dept1Data
     attendanceBarOptions.series[2].data = dept2Data
     attendanceBarOptions.series[3].data = dept3Data
-
+    attendanceBarOptions.series[4].data = dept4Data
 
     // 重新设置图表选项
     setAttendanceOption(attendanceBarOptions)