Merge branch 'ai' into dev

src/api/assistant/assistant.js

@@ -106,4 +106,13 @@ export function getCalculateByTimeList(data) {
     method: 'post',
     data: data
   })
+}
+
+//使用报告
+export function getUsageReport(query) {
+  return request({
+    url: '/system/usageReport/report',
+    method: 'get',
+    params: query
+  })
 }

src/views/assistant/components/dutyOrganization.vue

@@ -177,26 +177,29 @@ const qualificationPieDescriptionPart2 = computed(() => {
   }
 
   // 从资质柱状图数据中找出"一级"人员最多的科室
-  let topDeptForLevel1 = '旅检三科'
-  let level1Count = 25
-  let totalDeptCount = 395
+  let topDeptForLevel1 = ''
+  let level1Count = 0
+  let totalDeptCount = 0
+  let allDeptNames = []
 
   if (qualificationBarData.value && Array.isArray(qualificationBarData.value)) {
     const barData = qualificationBarData.value
 
     // 找出"一级"人员最多的科室
     let maxLevel1Count = 0
-    let maxDeptName = '旅检三科'
-    let totalCountForDept = 395
+    let maxDeptName = ''
+    let totalCountForDept = 0
+
 
     barData.forEach(dept => {
+      allDeptNames.push(dept.deptName)
       if (dept.levelCounts && Array.isArray(dept.levelCounts)) {
-        const level1Data = dept.levelCounts.find(level => level.levelName === '一级')
+        const level1Data = dept.levelCounts.find(level => level.levelName === '高级')
         const deptTotalCount = dept.levelCounts.reduce((sum, level) => sum + (level.count || 0), 0)
 
         if (level1Data && level1Data.count > maxLevel1Count) {
           maxLevel1Count = level1Data.count
-          maxDeptName = dept.deptName || '未知科室'
+          maxDeptName = dept.deptName || ''
           totalCountForDept = deptTotalCount
         }
       }
@@ -208,7 +211,7 @@ const qualificationPieDescriptionPart2 = computed(() => {
   }
 
   // 生成第二部分描述文字
-  return `全站资质等级为"一级"的人员集中在${topDeptForLevel1}（${level1Count}人）${topDeptForLevel1}的人员规模（共${totalDeptCount}人）高于一科、二科`
+  return `全站资质等级为"一级"的人员集中在${topDeptForLevel1}（${level1Count}人）${topDeptForLevel1}的人员规模（共${totalDeptCount}人）高于${allDeptNames.filter(name => name !== topDeptForLevel1).join(', ')}`
 })
 
 
@@ -658,7 +661,9 @@ const updateTrendBarChart = () => {
           label: {
             show: true,
             position: 'top',
-            formatter: '{c}人'
+            formatter: function(params) {
+              return params.value > 0 ? params.value + '人' : '';
+            }
           },
           data: levelCounts
         })

src/views/assistant/components/performanceAnalysis.vue

@@ -297,6 +297,15 @@ const disabledStartMonth = (date) => {
     return true
   }
 
+  // 如果已经选择了结束月份，开始月份不能晚于或等于结束月份
+  if (queryForm.value.endMonth) {
+    const endDate = new Date(queryForm.value.endMonth)
+    if (date.getFullYear() > endDate.getFullYear() ||
+      (date.getFullYear() === endDate.getFullYear() && date.getMonth() >= endDate.getMonth())) {
+      return true
+    }
+  }
+
   return false
 }
 
@@ -316,11 +325,11 @@ const disabledEndMonth = (date) => {
     return true
   }
 
-  // 如果已经选择了开始月份，结束月份不能早于开始月份
+  // 如果已经选择了开始月份，结束月份不能早于或等于开始月份
   if (queryForm.value.startMonth) {
     const startDate = new Date(queryForm.value.startMonth)
     if (date.getFullYear() < startDate.getFullYear() ||
-      (date.getFullYear() === startDate.getFullYear() && date.getMonth() < startDate.getMonth())) {
+      (date.getFullYear() === startDate.getFullYear() && date.getMonth() <= startDate.getMonth())) {
       return true
     }
   }
@@ -409,7 +418,9 @@ const brigadeChartOptions = {
   },
   yAxis: {
     type: 'value',
-    name: '得分'
+    name: '得分',
+    min: 80,
+    interval: 5
   },
   series: [
 
@@ -438,7 +449,9 @@ const departmentChartOptions = {
   },
   yAxis: {
     type: 'value',
-    name: '得分'
+    name: '得分',
+    min: 80,
+    interval: 5
   },
   series: [
 
@@ -467,7 +480,9 @@ const teamListChartOptions = {
   },
   yAxis: {
     type: 'value',
-    name: '得分'
+    name: '得分',
+    min: 80,
+    interval: 5
   },
   series: []
 }
@@ -494,7 +509,9 @@ const personalChartOptions = {
   },
   yAxis: {
     type: 'value',
-    name: '得分'
+    name: '得分',
+    min: 80,
+    interval: 5
   },
   series: []
 }

src/views/assistant/components/riskHazard.vue

@@ -285,7 +285,7 @@ const categoryStatsDescription = computed(() => {
     
   
     // 5. 生成描述文字
-    return `${topDepartment.departmentName || 'XXXX'}是违禁品查获的主力大队，查获违禁物品数量为${topDepartment.seizureCount || 'XX'}，占比${topDepartment.currentRatio}%。`
+    return `${topDepartment.brigadeName || 'XXXX'}是违禁品查获的主力大队，查获违禁物品数量为${topDepartment.seizureCount || 'XX'}，占比${topDepartment.currentRatio}%。`
   })
 
   // 计算属性：动态生成查获岗位分布描述

src/views/assistant/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="ai-assist-wrapper">
-    <div class="ai-assist-container" v-if="!showDataBoard && !showPerformanceAnalysis">
+    <div class="ai-assist-container" v-if="!showDataBoard && !showPerformanceAnalysis && !showUseReports">
 
       <!-- 消息区域 -->
       <div class="messages-area" ref="messagesRef">
@@ -20,10 +20,12 @@
                 <div v-for="step in msg.steps" :key="step.step" :class="['step-item', step.status]">
                   <span class="step-icon">
                     <svg v-if="step.status === 'running'" class="spin-icon" viewBox="0 0 24 24" fill="none">
-                      <circle cx="12" cy="12" r="10" stroke="currentColor" stroke-width="2" stroke-dasharray="32" stroke-dashoffset="10"/>
+                      <circle cx="12" cy="12" r="10" stroke="currentColor" stroke-width="2" stroke-dasharray="32"
+                        stroke-dashoffset="10" />
                     </svg>
                     <svg v-else viewBox="0 0 24 24" fill="none">
-                      <path d="M5 13l4 4L19 7" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+                      <path d="M5 13l4 4L19 7" stroke="currentColor" stroke-width="2" stroke-linecap="round"
+                        stroke-linejoin="round" />
                     </svg>
                   </span>
                   <span class="step-name">{{ step.name }}</span>
@@ -52,21 +54,10 @@
                     <div class="answer-text">{{ msg.result.answer }}</div>
                   </div>
                   <div class="result-summary">{{ msg.result.message }}</div>
-                  <el-table
-                    v-if="msg.result.rows && msg.result.rows.length"
-                    :data="msg.result.rows"
-                    border
-                    size="small"
-                    max-height="360"
-                    class="result-table"
-                  >
-                    <el-table-column
-                      v-for="col in msg.result.columns"
-                      :key="col"
-                      :prop="col"
-                      :label="col"
-                      min-width="100"
-                    />
+                  <el-table v-if="msg.result.rows && msg.result.rows.length" :data="msg.result.rows" border size="small"
+                    max-height="360" class="result-table">
+                    <el-table-column v-for="col in msg.result.columns" :key="col" :prop="col" :label="col"
+                      min-width="100" />
                   </el-table>
                   <div v-else-if="msg.result.rows" class="no-data">暂无数据</div>
                 </div>
@@ -80,8 +71,8 @@
               <!-- 错误 -->
               <div v-if="msg.status === 'error'" class="error-message">
                 <svg viewBox="0 0 24 24" fill="none" width="16" height="16">
-                  <circle cx="12" cy="12" r="10" stroke="currentColor" stroke-width="2"/>
-                  <path d="M12 8v4m0 4h.01" stroke="currentColor" stroke-width="2" stroke-linecap="round"/>
+                  <circle cx="12" cy="12" r="10" stroke="currentColor" stroke-width="2" />
+                  <path d="M12 8v4m0 4h.01" stroke="currentColor" stroke-width="2" stroke-linecap="round" />
                 </svg>
                 {{ msg.errorText }}
               </div>
@@ -95,24 +86,14 @@
         <div class="quick-action">
           <el-button class="report-btn" @click="handleReportClick">质控分析报告</el-button>
           <el-button class="report-btn" @click="handlePerformanceClick">绩效分析报告</el-button>
+          <el-button class="report-btn" @click="handleUseReportClick">使用报表</el-button>
         </div>
         <div class="input-container">
-          <el-input
-            v-model="inputMessage"
-            type="textarea"
-            :rows="3"
-            placeholder="请输入您的问题，按 Enter 发送..."
-            class="chat-input"
-            @keydown.enter.exact.prevent="handleSend"
-          />
-          <el-button
-            :disabled="!inputMessage.trim() || isLoading"
-            circle
-            class="send-btn"
-            @click="handleSend"
-          >
+          <el-input v-model="inputMessage" type="textarea" :rows="3" placeholder="请输入您的问题，按 Enter 发送..."
+            class="chat-input" @keydown.enter.exact.prevent="handleSend" />
+          <el-button :disabled="!inputMessage.trim() || isLoading" circle class="send-btn" @click="handleSend">
             <svg viewBox="0 0 24 24" fill="currentColor" width="18" height="18">
-              <path d="M2.01 21L23 12 2.01 3 2 10l15 2-15 2z"/>
+              <path d="M2.01 21L23 12 2.01 3 2 10l15 2-15 2z" />
             </svg>
           </el-button>
         </div>
@@ -121,6 +102,7 @@
 
     <DataBoard v-if="showDataBoard" @back="handleBack" />
     <PerformanceAnalysis v-if="showPerformanceAnalysis" @back="handleBack" />
+    <UseReports v-if="showUseReports" @back="handleBack" />
   </div>
 </template>
 
@@ -129,7 +111,7 @@ import { ref, nextTick, onMounted, onActivated, onDeactivated } from 'vue'
 import DataBoard from './components/dataBoard.vue'
 import PerformanceAnalysis from './components/performanceAnalysis.vue'
 import useUserStore from '@/store/modules/user'
-
+import UseReports from './components/useReports.vue'
 const userStore = useUserStore()
 const AI_SERVICE_URL = import.meta.env.VITE_AI_SERVICE_URL || 'http://localhost:8000'
 
@@ -139,6 +121,7 @@ const messages = ref([])
 const messagesRef = ref(null)
 const showDataBoard = ref(false)
 const showPerformanceAnalysis = ref(false)
+const showUseReports = ref(false)
 
 onMounted(() => resetState())
 onActivated(() => resetState())
@@ -149,6 +132,7 @@ const resetState = () => {
   showPerformanceAnalysis.value = false
   inputMessage.value = ''
   messages.value = []
+  showUseReports.value = false
   isLoading.value = false
 }
 
@@ -270,9 +254,11 @@ const handleSend = async () => {
 
 const handleReportClick = () => { showDataBoard.value = true }
 const handlePerformanceClick = () => { showPerformanceAnalysis.value = true }
+const handleUseReportClick = () => { showUseReports.value = true }
 const handleBack = () => {
   showDataBoard.value = false
   showPerformanceAnalysis.value = false
+  showUseReports.value = false
 }
 </script>
 
@@ -349,7 +335,7 @@ const handleBack = () => {
   background: #fff;
   padding: 14px 16px;
   border-radius: 18px 18px 18px 4px;
-  box-shadow: 0 2px 8px rgba(0,0,0,0.08);
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
   font-size: 14px;
   line-height: 1.6;
 }
@@ -392,8 +378,13 @@ const handleBack = () => {
 }
 
 @keyframes spin {
-  from { transform: rotate(0deg); }
-  to { transform: rotate(360deg); }
+  from {
+    transform: rotate(0deg);
+  }
+
+  to {
+    transform: rotate(360deg);
+  }
 }
 
 .step-detail {
@@ -536,7 +527,8 @@ const handleBack = () => {
     font-size: 24px;
   }
 
-  .user-bubble, .assistant-bubble {
+  .user-bubble,
+  .assistant-bubble {
     max-width: 95%;
   }
 }