Merge branch 'ai' into dev

src/views/assistant/components/dutyOrganization.vue

@@ -315,7 +315,7 @@ const fetchDutyOrganizationData = async (queryParams) => {
     const processedParams = processQueryParams(queryParams)
     const selectedDept = props.selectedDeptObject
     const { deptType = "", id } = selectedDept ? selectedDept : { deptType: "", id: "" }
-
+    delete processedParams.deptId
     let calculateParams = {
       ...(['TEAMS', 'DEPARTMENT', 'BRIGADE'].includes(deptType) ? { deptId: id } : {}),
       ...(deptType == 'USER' ? { userId: id } : {})
@@ -665,6 +665,76 @@ const attendanceBarOptions = {
     }
   ]
 }
+// 出勤人次柱状图配置
+const attendanceBarOtherOptions = {
+  tooltip: {
+    trigger: 'axis',
+    axisPointer: {
+      type: 'shadow'
+    },
+    formatter: function (params) {
+      let result = `${params[0].axisValue}<br/>`
+      params.forEach(param => {
+        result += ` <span style="color:${param.color};font-weight:bold">${param.data}</span>人<br/>`
+      })
+      return result
+    }
+  },
+  legend: {
+    top: 0,
+    show: true,
+  },
+  grid: {
+    left: '3%',
+    right: '4%',
+    bottom: '0%',
+    top: '80',
+    containLabel: true
+  },
+  xAxis: {
+    type: 'category',
+    data: [],
+    axisLine: {
+      lineStyle: {
+        color: '#999'
+      }
+    },
+    axisLabel: {
+      fontSize: 12
+    }
+  },
+  yAxis: {
+    type: 'value',
+    name: '人数',
+    axisLine: {
+      lineStyle: {
+        color: '#999'
+      }
+    },
+    splitLine: {
+      lineStyle: {
+        color: '#f0f0f0'
+      }
+    }
+  },
+  series: [
+    {
+      name: '',
+      type: 'bar',
+      barWidth: '10%',
+      itemStyle: {
+        color: '#5470C6'
+      },
+      label: {
+        show: true,
+        position: 'top',
+        formatter: '{c}人'
+      },
+      data: []
+    },
+  ]
+}
+
 
 // 初始化图表
 onMounted(() => {
@@ -793,6 +863,29 @@ const updateTrendBarChart = () => {
     setBarOption(trendBarOptions)
   }
 }
+//非站长走这个逻辑
+const updateAttendanceBarOtherChart = () => {
+  if (trendData.value && Array.isArray(trendData.value)) {
+    const trendList = trendData.value
+    
+    // 提取横坐标数据（timeLabel字段）
+    const xAxisData = trendList.map(item => item.timeLabel || '未知时间')
+    // 提取各科室数据
+    const allData = trendList.map(item => item.overall || 0)
+    // 更新图表配置
+    attendanceBarOtherOptions.xAxis.data = xAxisData
+    attendanceBarOtherOptions.series[0].data = allData
+    attendanceBarOtherOptions.legend.show = !!isStationType.value
+    // 重新设置图表选项
+    setAttendanceOption(attendanceBarOtherOptions)
+  } else {
+    // 无数据时清空图表
+    attendanceBarOtherOptions.xAxis.data = []
+    attendanceBarOtherOptions.series[0].data = []
+    attendanceBarOtherOptions.legend.show = !!isStationType.value
+    setAttendanceOption(attendanceBarOtherOptions)
+  }
+}
 
 const updateAttendanceBarChart = () => {
   if (trendData.value && Array.isArray(trendData.value)) {
@@ -836,7 +929,12 @@ const updateAttendanceBarChart = () => {
 // 根据API数据更新图表和统计信息
 const updateChartsWithData = () => {
   // 更新出勤人次柱状图
-  updateAttendanceBarChart()
+  if (isStationType.value) {
+    updateAttendanceBarChart()
+  } {
+    updateAttendanceBarOtherChart()
+  }
+
   // 更新资质等级分布饼图
   updateQualificationPieChart()
   // 更新资质趋势柱状图

src/views/assistant/components/qualityControl.vue

@@ -8,7 +8,7 @@
     <!-- 四个横向均分的内容区域 -->
     <div class="four-panel-layout">
       <!-- 第一个：任务计划安排统计 -->
-      <div class="panel-item" v-show="!isTeamType && !isUserType && !isBrigadeType">
+      <div class="panel-item" v-show="!isTeamType && !isUserType && !isDepartmentType">
         <div class="panel-header">
           <h3>任务计划安排统计</h3>
         </div>

src/views/assistant/components/riskHazard.vue

@@ -70,7 +70,7 @@
       <!-- 第二行 -->
       <div class="panel-row">
         <!-- 第四个：查获排名表格 -->
-        <div class="panel-item">
+        <div class="panel-item" v-show="!isUserType">
           <div class="panel-header">
             <h3>查获排名</h3>
           </div>