Merge branch 'employeeScreen'

src/api/ledger/index.js

@@ -285,3 +285,16 @@ export function getTrainingIssue(id) {
 export function exportTrainingIssue(query) {
   return request({ url: '/ledger/trainingIssue/export', method: 'post', params: query, responseType: 'blob' })
 }
+
+// ===== 资格证书状态 =====
+export function listQualificationCertificateStatus(query) {
+  return request({ url: '/ledger/qualificationLevel/list', method: 'get', params: query })
+}
+//导入职业资格等级
+export function importQualificationLevel(data) {
+  return request({ url: '/ledger/import/qualificationLevel', method: 'post', data })
+}
+//通过用户id获取职业资格等级获取时间信息
+export function getQualificationLevelTime(query) {
+  return request({ url: '/ledger/qualificationLevel/user', method: 'get',params: query })
+}

src/router/index.js

@@ -92,9 +92,9 @@ export const constantRoutes = [
     children: [
       {
         path: '/index',
-        component: () => import('@/views/warningPage'),
-        name: 'WarningPage',
-        meta: { title: '预警页面', icon: 'dashboard' }
+        component: () => import('@/views/assistant'),
+        name: 'Assistant',
+        meta: { title: 'AI助手', icon: 'dashboard' }
       },
       // {
       //   path: '/dashboard-work',

src/views/assistant/index.vue

@@ -60,6 +60,17 @@
                       min-width="100" />
                   </el-table>
                   <div v-else-if="msg.result.rows" class="no-data">暂无数据</div>
+                  
+                  <!-- SQL 折叠 -->
+                  <div v-if="msg.result.sql" class="sql-block">
+                    <div class="sql-toggle" @click="toggleSql(msg.id)">
+                      <span class="sql-label">SQL</span>
+                      <span class="sql-arrow">{{ msg.showSql ? '▲' : '▼' }}</span>
+                    </div>
+                    <div v-if="msg.showSql" class="sql-code">
+                      <pre>{{ msg.result.sql }}</pre>
+                    </div>
+                  </div>
                 </div>
 
                 <!-- 耗时 -->
@@ -81,6 +92,11 @@
         </div>
       </div>
 
+      <!-- 意图澄清 -->
+      <div v-if="clarifyQuestion" class="clarify-bar">
+        <span class="clarify-text">{{ clarifyQuestion }}</span>
+      </div>
+
       <!-- 底部输入区 -->
       <div class="chat-container">
         <div class="quick-action">
@@ -88,10 +104,9 @@
           <el-button class="report-btn" @click="handlePerformanceClick">绩效分析报告</el-button>
           <el-button class="report-btn" @click="handleUseReportClick">使用报表</el-button>
         </div>
-        <!--请输入您的问题，按 Enter 发送...-->
         <div class="input-container">
-          <el-input v-model="inputMessage" type="textarea" :rows="3" placeholder="功能开发中，请敬请期待"
-            class="chat-input" @keydown.enter.exact.prevent="handleSend" :disabled="true" />
+          <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" />
@@ -114,7 +129,9 @@ 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'
+
+const AI_BASE = import.meta.env.VITE_AI_SERVICE_URL || 'http://airport-test.samsundot.com:9015'
+const AI_URL = AI_BASE + '/api/query-stream'
 
 const inputMessage = ref('')
 const isLoading = ref(false)
@@ -123,6 +140,9 @@ const messagesRef = ref(null)
 const showDataBoard = ref(false)
 const showPerformanceAnalysis = ref(false)
 const showUseReports = ref(false)
+const sessionId = ref('app_' + Date.now())
+const history = ref([])
+const clarifyQuestion = ref('')
 
 onMounted(() => resetState())
 onActivated(() => resetState())
@@ -135,6 +155,9 @@ const resetState = () => {
   messages.value = []
   showUseReports.value = false
   isLoading.value = false
+  sessionId.value = 'app_' + Date.now()
+  history.value = []
+  clarifyQuestion.value = ''
 }
 
 const scrollToBottom = async () => {
@@ -144,11 +167,84 @@ const scrollToBottom = async () => {
   }
 }
 
+const getUserId = () => {
+  return String(userStore.id || 1)
+}
+
+const toggleSql = (msgId) => {
+  const msg = messages.value.find(m => m.id === msgId)
+  if (msg) {
+    msg.showSql = !msg.showSql
+  }
+}
+
+const handleEvent = (aiMsg, data) => {
+  if (data.step !== undefined && data.name) {
+    // 进度步骤
+    const steps = [...(aiMsg.steps || [])]
+    const si = steps.findIndex(s => s.name === data.name)
+    const step = { 
+      step: si >= 0 ? si : steps.length, 
+      name: data.name, 
+      status: data.status, 
+      duration: data.duration 
+    }
+    if (si >= 0) {
+      steps[si] = step
+    } else {
+      steps.push(step)
+    }
+    aiMsg.steps = steps
+    messages.value = [...messages.value]
+    return
+  }
+
+  if (data.question) {
+    // 意图澄清
+    clarifyQuestion.value = data.question
+    aiMsg.status = 'done'
+    messages.value = [...messages.value]
+    return
+  }
+
+  if (data.columns !== undefined || data.answer !== undefined) {
+    // 最终结果
+    aiMsg.steps.forEach(s => { if (s.status === 'running') s.status = 'done' })
+    
+    // 适配数据结构
+    aiMsg.result = {
+      query_type: data.answer ? 'knowledge' : 'data',
+      answer: data.answer || '',
+      message: data.message || '',
+      sql: data.sql || '',
+      columns: data.columns || [],
+      rows: data.rows || [],
+      sources: data.sources || [],
+      timing: { total: 0 },
+      success: data.success !== false
+    }
+    aiMsg.showSql = false
+    aiMsg.isError = !data.success
+    aiMsg.status = 'done'
+    messages.value = [...messages.value]
+    
+    // 记录历史
+    const prevUserMsg = messages.value.find(m => m.id < aiMsg.id && m.type === 'user')
+    if (prevUserMsg) {
+      history.value.push({
+        question: prevUserMsg.text || '',
+        sql: data.sql || '',
+      })
+    }
+  }
+}
+
 const handleSend = async () => {
   const text = inputMessage.value.trim()
   if (!text || isLoading.value) return
 
   inputMessage.value = ''
+  clarifyQuestion.value = ''
   isLoading.value = true
 
   // 添加用户消息
@@ -162,25 +258,27 @@ const handleSend = async () => {
     status: 'loading',
     steps: [],
     result: null,
-    errorText: ''
+    errorText: '',
+    showSql: false,
+    isError: false
   }
   messages.value.push(assistantMsg)
   await scrollToBottom()
 
   try {
-    const response = await fetch(`${AI_SERVICE_URL}/api/smart-query-stream`, {
+    const response = await fetch(AI_URL, {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
       body: JSON.stringify({
         question: text,
-        user_id: String(userStore.id || 'anonymous'),
-        llm_type: 'claude'
-      })
+        user_id: getUserId(),
+        llm_type: 'qwen',
+        session_id: sessionId.value,
+        history: history.value.slice(-3),
+      }),
     })
 
-    if (!response.ok) {
-      throw new Error(`服务请求失败 (${response.status})`)
-    }
+    if (!response.ok) throw new Error('请求失败 ' + response.status)
 
     const reader = response.body.getReader()
     const decoder = new TextDecoder()
@@ -191,66 +289,27 @@ const handleSend = async () => {
       if (done) break
 
       buffer += decoder.decode(value, { stream: true })
-      // SSE 事件以两个换行符分隔
-      const blocks = buffer.split('\n\n')
-      buffer = blocks.pop() // 保留未完整的块
-
-      for (const block of blocks) {
-        if (!block.trim()) continue
-        const lines = block.split('\n')
-        let eventType = ''
-        let dataStr = ''
-        for (const line of lines) {
-          if (line.startsWith('event: ')) eventType = line.slice(7).trim()
-          else if (line.startsWith('data: ')) dataStr = line.slice(6).trim()
-        }
-        if (!dataStr) continue
-
-        let data
-        try { data = JSON.parse(dataStr) } catch { continue }
-
-        if (eventType === 'progress') {
-          const existing = assistantMsg.steps.find(s => s.step === data.step)
-          if (existing) {
-            Object.assign(existing, data)
-          } else {
-            assistantMsg.steps.push({ ...data })
-          }
-          // 触发响应式更新
-          messages.value = [...messages.value]
-          await scrollToBottom()
-
-        } else if (eventType === 'result') {
-          // 将所有仍在 running 的步骤标记为 done
-          assistantMsg.steps.forEach(s => { if (s.status === 'running') s.status = 'done' })
-          assistantMsg.result = data
-          assistantMsg.status = 'done'
-          messages.value = [...messages.value]
-          await scrollToBottom()
-
-        } else if (eventType === 'error') {
-          assistantMsg.status = 'error'
-          assistantMsg.errorText = data.message || '请求失败，请稍后重试'
-          messages.value = [...messages.value]
+      const lines = buffer.split('\n')
+      buffer = lines.pop()
+
+      for (const line of lines) {
+        if (line.startsWith('data: ')) {
+          try {
+            const data = JSON.parse(line.slice(6))
+            handleEvent(assistantMsg, data)
+            await scrollToBottom()
+          } catch (e) {}
         }
       }
     }
-
-    // 若未收到 result 事件
-    if (assistantMsg.status === 'loading') {
-      assistantMsg.status = 'error'
-      assistantMsg.errorText = '未收到服务响应，请检查 AI 服务是否正常运行'
-      messages.value = [...messages.value]
-    }
-
-  } catch (e) {
+  } catch (err) {
     assistantMsg.status = 'error'
-    assistantMsg.errorText = e.message || '网络错误，请检查 AI 服务连接'
+    assistantMsg.errorText = '请求失败，请检查网络后重试'
     messages.value = [...messages.value]
-  } finally {
-    isLoading.value = false
-    await scrollToBottom()
   }
+
+  isLoading.value = false
+  await scrollToBottom()
 }
 
 const handleReportClick = () => { showDataBoard.value = true }
@@ -459,6 +518,61 @@ const handleBack = () => {
   font-size: 13px;
 }
 
+/* ===== SQL 折叠样式 ===== */
+.sql-block {
+  margin-top: 12px;
+}
+
+.sql-toggle {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  cursor: pointer;
+  color: #557DDB;
+  font-size: 13px;
+}
+
+.sql-label {
+  background: #e6f0ff;
+  padding: 2px 8px;
+  border-radius: 4px;
+  font-weight: 600;
+}
+
+.sql-arrow {
+  font-size: 12px;
+}
+
+.sql-code {
+  margin-top: 8px;
+  background: #f5f7fa;
+  padding: 12px;
+  border-radius: 8px;
+  overflow-x: auto;
+}
+
+.sql-code pre {
+  margin: 0;
+  font-size: 12px;
+  color: #333;
+  white-space: pre-wrap;
+  word-break: break-all;
+}
+
+/* ===== 意图澄清 ===== */
+.clarify-bar {
+  background: #fff3cd;
+  border: 1px solid #ffc107;
+  padding: 12px 16px;
+  border-radius: 8px;
+  margin-bottom: 16px;
+}
+
+.clarify-text {
+  color: #856404;
+  font-size: 14px;
+}
+
 /* ===== 底部输入区 ===== */
 .chat-container {
   flex-shrink: 0;

src/views/ledger/bannerLetter/index.vue

@@ -38,8 +38,8 @@
 
     <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="记录日期" align="center" prop="recordDate" width="110">
-        <template #default="{ row }">{{ parseTime(row.recordDate, '{y}-{m}-{d}') }}</template>
+      <el-table-column label="记录日期" align="center" prop="recordDate" width="170">
+        <template #default="{ row }">{{ row.recordDate }}</template>
       </el-table-column>
       <el-table-column label="部门名称" align="center" prop="deptName" />
       <el-table-column label="队室/班组" align="center" prop="teamName" />

src/views/ledger/channelPassRate/index.vue

@@ -23,8 +23,8 @@
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
     </el-row>
     <el-table v-loading="loading" :data="list">
-      <el-table-column label="记录日期" align="center" prop="recordDate" width="110">
-        <template #default="{ row }">{{ parseTime(row.recordDate, '{y}-{m}-{d}') }}</template>
+      <el-table-column label="记录日期" align="center" prop="recordDate" width="170">
+        <template #default="{ row }">{{ row.recordDate }}</template>
       </el-table-column>
       <el-table-column label="部门名称" align="center" prop="deptName" />
       <el-table-column label="队室/班组" align="center" prop="teamName" />

src/views/ledger/complaint/index.vue

@@ -32,8 +32,8 @@
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
     </el-row>
     <el-table v-loading="loading" :data="list">
-      <el-table-column label="记录日期" align="center" prop="recordDate" width="110">
-        <template #default="{ row }">{{ parseTime(row.recordDate, '{y}-{m}-{d}') }}</template>
+      <el-table-column label="记录日期" align="center" prop="recordDate" width="170">
+        <template #default="{ row }">{{ row.recordDate }}</template>
       </el-table-column>
       <el-table-column label="部门名称" align="center" prop="deptName" />
       <el-table-column label="队室/班组" align="center" prop="teamName" />

src/views/ledger/dailyTraining/index.vue

@@ -23,8 +23,8 @@
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
     </el-row>
     <el-table v-loading="loading" :data="list">
-      <el-table-column label="培训日期" align="center" prop="recordDate" width="110">
-        <template #default="{ row }">{{ parseTime(row.recordDate, '{y}-{m}-{d}') }}</template>
+      <el-table-column label="培训日期" align="center" prop="recordDate" width="170">
+        <template #default="{ row }">{{ row.recordDate }}</template>
       </el-table-column>
       <el-table-column label="班组" align="center" prop="teamName" width="120" />
       <el-table-column label="项目名称" align="center" prop="projectName" min-width="150" show-overflow-tooltip />

src/views/ledger/dormFireSafety/index.vue

@@ -26,8 +26,8 @@
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
     </el-row>
     <el-table v-loading="loading" :data="list">
-      <el-table-column label="检查日期" align="center" prop="checkDate" width="110">
-        <template #default="{ row }">{{ parseTime(row.checkDate, '{y}-{m}-{d}') }}</template>
+      <el-table-column label="检查日期" align="center" prop="checkDate" width="170">
+        <template #default="{ row }">{{ row.checkDate }}</template>
       </el-table-column>
       <el-table-column label="寝室所在位置" align="center" prop="dormLocation" width="120" />
       <el-table-column label="寝室号" align="center" prop="dormNo" width="90" />

src/views/ledger/examScore/index.vue

@@ -35,8 +35,8 @@
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
     </el-row>
     <el-table v-loading="loading" :data="list">
-      <el-table-column label="考试日期" align="center" prop="examDate" width="110">
-        <template #default="{ row }">{{ parseTime(row.examDate, '{y}-{m}-{d}') }}</template>
+      <el-table-column label="考试日期" align="center" prop="examDate" width="170">
+        <template #default="{ row }">{{ row.examDate }}</template>
       </el-table-column>
       <el-table-column label="部门名称" align="center" prop="deptName" />
       <el-table-column label="队室/班组" align="center" prop="teamName" />

src/views/ledger/import/index.vue

@@ -147,7 +147,8 @@ import {
   importLeaderDuty,
   importHealthSoldier,
   importDormFireSafety,
-  importTrainingIssue
+  importTrainingIssue,
+  importQualificationLevel
 } from '@/api/ledger/index'
 
 defineOptions({ name: 'LedgerImport' })
@@ -360,7 +361,15 @@ const importItems = reactive([
     loading: false,
     lastResult: null
   },
-
+  {
+    key: 'qualificationLevel',
+    title: '职业资格等级',
+    desc: '职业资格等级流程记录',
+    icon: 'Medal',
+    api: importQualificationLevel,
+    loading: false,
+    lastResult: null
+  },
   // {
   //   key: 'dailyTraining',
   //   title: '日常培训记录',

src/views/ledger/leaveSpecial/index.vue

@@ -38,11 +38,11 @@
       <el-table-column label="队室/班组" align="center" prop="teamName" />
       <el-table-column label="姓名" align="center" prop="personName" />
       <el-table-column label="假期类型" align="center" prop="leaveType" />
-      <el-table-column label="开始日期" align="center" prop="startDate" width="110">
-        <template #default="{ row }">{{ parseTime(row.startDate, '{y}-{m}-{d}') }}</template>
+      <el-table-column label="开始日期" align="center" prop="startDate" width="170">
+        <template #default="{ row }">{{ row.startDate }}</template>
       </el-table-column>
-      <el-table-column label="结束日期" align="center" prop="endDate" width="110">
-        <template #default="{ row }">{{ parseTime(row.endDate, '{y}-{m}-{d}') }}</template>
+      <el-table-column label="结束日期" align="center" prop="endDate" width="170">
+        <template #default="{ row }">{{ row.endDate }}</template>
       </el-table-column>
       <el-table-column label="天数" align="center" prop="days" />
       <el-table-column label="扣分" align="center" prop="deductScore">

src/views/ledger/patrolInspection/index.vue

@@ -27,8 +27,8 @@
     </el-row>
 
     <el-table v-loading="loading" :data="list">
-      <el-table-column label="巡查日期" align="center" prop="recordDate" width="110">
-        <template #default="{ row }">{{ parseTime(row.recordDate, '{y}-{m}-{d}') }}</template>
+      <el-table-column label="巡查日期" align="center" prop="recordDate" width="170">
+        <template #default="{ row }">{{ row.recordDate }}</template>
       </el-table-column>
       <el-table-column label="部门名称" align="center" prop="deptName" />
       <el-table-column label="队室/班组" align="center" prop="teamName" />

src/views/ledger/qualificationCertificateStatus/index.vue

@@ -0,0 +1,169 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="80px">
+      <el-form-item label="部门名称" prop="deptId">
+        <el-select v-model="queryParams.deptId" placeholder="请选择部门" style="width:150px" clearable filterable
+          @change="handleQueryDeptChange">
+          <el-option v-for="d in queryDeptOptions" :key="d.deptId" :label="d.deptName" :value="d.deptId" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="队室/班组" prop="teamId">
+        <el-select v-model="queryParams.teamId" placeholder="请选择队室/班组" style="width:150px" clearable filterable
+          @change="handleQueryTeamChange">
+          <el-option v-for="t in queryTeamOptions" :key="t.id" :label="t.label" :value="t.id" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="小组" prop="groupId">
+        <el-select v-model="queryParams.groupId" placeholder="请选择小组" style="width:150px" clearable filterable
+          @change="handleQueryGroupChange">
+          <el-option v-for="g in queryGroupOptions" :key="g.id" :label="g.label" :value="g.id" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="员工姓名" prop="personId">
+        <el-select v-model="queryParams.personId" placeholder="请选择员工" style="width:150px" clearable filterable>
+          <el-option v-for="p in queryPersonOptions" :key="p.userId" :label="p.nickName" :value="p.userId" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="录入时间">
+        <el-date-picker v-model="dateRange" type="daterange" value-format="YYYY-MM-DD" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期" clearable />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="Download" @click="handleExport"
+          v-hasPermi="['ledger:qualification:export']">导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
+    </el-row> -->
+
+    <el-table v-loading="loading" :data="list" style="width: 100%;" fit="true"
+      :scrollbar-always-on="true">
+      <el-table-column label="部门名称" align="center" prop="deptName" min-width="120" resizable />
+      <el-table-column label="队室/班组" align="center" prop="teamName" min-width="120" resizable />
+      <el-table-column label="小组" align="center" prop="groupName" min-width="120" resizable />
+      <el-table-column label="姓名" align="center" prop="personName" width="80" resizable />
+      <el-table-column label="一级发证时间" align="center" prop="levelOneTime" width="120" resizable>
+        <template #default="{ row }">{{ row.levelOneTime || '-' }}</template>
+      </el-table-column>
+      <el-table-column label="二级发证时间" align="center" prop="levelTwoTime" width="120" resizable>
+        <template #default="{ row }">{{ row.levelTwoTime || '-' }}</template>
+      </el-table-column>
+      <el-table-column label="三级发证时间" align="center" prop="levelThreeTime" width="120" resizable>
+        <template #default="{ row }">{{ row.levelThreeTime || '-' }}</template>
+      </el-table-column>
+      <el-table-column label="四级发证时间" align="center" prop="levelFourTime" width="120" resizable>
+        <template #default="{ row }">{{ row.levelFourTime || '-' }}</template>
+      </el-table-column>
+      <el-table-column label="五级发证时间" align="center" prop="levelFiveTime" width="120" resizable>
+        <template #default="{ row }">{{ row.levelFiveTime || '-' }}</template>
+      </el-table-column>
+      <el-table-column label="录入时间" align="center" prop="createTime" width="170" resizable>
+        <template #default="{ row }">{{ row.createTime }}</template>
+      </el-table-column>
+    </el-table>
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize" @pagination="getList" />
+  </div>
+</template>
+
+<script setup>
+import { ref, reactive, onMounted } from 'vue'
+import { listDept } from '@/api/system/dept'
+import { deptTreeSelect } from '@/api/system/user'
+import { listUser } from '@/api/system/user'
+import { listQualificationCertificateStatus } from '@/api/ledger/index'
+
+defineOptions({ name: 'LedgerQualificationCertificateStatus' })
+
+const loading = ref(false), list = ref([]), total = ref(0), showSearch = ref(true)
+const dateRange = ref([]), queryRef = ref(null)
+
+const queryParams = reactive({
+  pageNum: 1,
+  pageSize: 10,
+  deptId: null,
+  teamId: null,
+  groupId: null,
+  personId: null
+})
+
+const queryDeptOptions = ref([])
+const queryTeamOptions = ref([])
+const queryGroupOptions = ref([])
+const queryPersonOptions = ref([])
+
+async function loadQueryDepts() {
+  const r = await listDept()
+  queryDeptOptions.value = (r.data || []).filter(d => d.deptType === 'BRIGADE')
+}
+
+async function handleQueryDeptChange(deptId) {
+  queryParams.teamId = null; queryParams.groupId = null; queryParams.personId = null
+  queryTeamOptions.value = []; queryGroupOptions.value = []; queryPersonOptions.value = []
+  if (deptId) {
+    const r = await deptTreeSelect({ parentId: deptId })
+    queryTeamOptions.value = r.data || []
+  }
+}
+
+async function handleQueryTeamChange(val) {
+  queryParams.groupId = null; queryParams.personId = null
+  queryGroupOptions.value = []; queryPersonOptions.value = []
+  if (val) {
+    const r = await deptTreeSelect({ parentId: val })
+    queryGroupOptions.value = r.data || []
+  }
+}
+
+async function handleQueryGroupChange(val) {
+  queryParams.personId = null
+  queryPersonOptions.value = []
+  if (val) {
+    const r = await listUser({ deptId: val, pageSize: 9999 })
+    queryPersonOptions.value = r.rows || []
+  }
+}
+
+function getList() {
+  loading.value = true
+  const p = { ...queryParams }
+  if (dateRange.value?.length === 2) {
+    p.beginTime = dateRange.value[0]
+    p.endTime = dateRange.value[1]
+  }
+  listQualificationCertificateStatus(p).then(r => {
+    list.value = r.rows
+    total.value = r.total
+  }).finally(() => loading.value = false)
+}
+
+function handleQuery() { queryParams.pageNum = 1; getList() }
+
+function resetQuery() {
+  dateRange.value = []
+  Object.assign(queryParams, {
+    pageNum: 1,
+    pageSize: 10,
+    deptId: null,
+    teamId: null,
+    groupId: null,
+    personId: null
+  })
+  queryTeamOptions.value = []; queryGroupOptions.value = []; queryPersonOptions.value = []
+  queryRef.value?.resetFields()
+  handleQuery()
+}
+
+
+
+onMounted(() => {
+  loadQueryDepts()
+  getList()
+})
+</script>

src/views/ledger/realtimeInterception/index.vue

@@ -7,8 +7,8 @@
       <el-form-item label="队室/班组" prop="teamName">
         <el-input v-model="queryParams.teamName" placeholder="请输入队室/班组" clearable @keyup.enter="handleQuery" />
       </el-form-item>
-      <el-form-item label="查获人" prop="inspectorName">
-        <el-input v-model="queryParams.inspectorName" placeholder="请输入查获人" clearable @keyup.enter="handleQuery" />
+      <el-form-item label="责任人" prop="inspectorName">
+        <el-input v-model="queryParams.inspectorName" placeholder="请输入责任人" clearable @keyup.enter="handleQuery" />
       </el-form-item>
 
       <el-form-item label="记录日期">
@@ -30,12 +30,12 @@
     </el-row>
 
     <el-table v-loading="loading" :data="list">
-      <el-table-column label="记录日期" align="center" prop="recordDate" width="110">
-        <template #default="{ row }">{{ parseTime(row.recordDate, '{y}-{m}-{d}') }}</template>
+      <el-table-column label="记录日期" align="center" prop="recordDate" width="170">
+        <template #default="{ row }">{{ row.recordDate }}</template>
       </el-table-column>
       <el-table-column label="部门名称" align="center" prop="deptName" />
       <el-table-column label="队室/班组" align="center" prop="teamName" />
-      <el-table-column label="查获人" align="center" prop="inspectorName" />
+      <el-table-column label="责任人" align="center" prop="inspectorName" />
       <el-table-column label="通道号" align="center" prop="channelNo" />
       <el-table-column label="旅客姓名" align="center" prop="passengerName" />
       <el-table-column label="航班号" align="center" prop="flightNo" />

src/views/ledger/rewardApproval/index.vue

@@ -10,7 +10,7 @@
       <el-form-item label="姓名" prop="personName">
         <el-input v-model="queryParams.personName" placeholder="请输入姓名" clearable @keyup.enter="handleQuery" />
       </el-form-item>
-      <el-form-item label="审批日期">
+      <el-form-item label="查获（事件）时间">
         <el-date-picker v-model="dateRange" type="daterange" value-format="YYYY-MM-DD"
           range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" clearable />
       </el-form-item>
@@ -26,8 +26,8 @@
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
     </el-row>
     <el-table v-loading="loading" :data="list">
-      <el-table-column label="审批日期" align="center" prop="approveDate" width="110">
-        <template #default="{ row }">{{ parseTime(row.approveDate, '{y}-{m}-{d}') }}</template>
+      <el-table-column label="查获（事件）时间" align="center" prop="approveDate" width="170">
+        <template #default="{ row }">{{ row.approveDate }}</template>
       </el-table-column>
       <el-table-column label="部门名称" align="center" prop="deptName" />
       <el-table-column label="队室/班组" align="center" prop="teamName" />

src/views/ledger/rewardPenalty/index.vue

@@ -38,8 +38,8 @@
 
     <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="记录日期" align="center" prop="recordDate" width="110">
-        <template #default="{ row }">{{ parseTime(row.recordDate, '{y}-{m}-{d}') }}</template>
+      <el-table-column label="记录日期" align="center" prop="recordDate" width="170">
+        <template #default="{ row }">{{ row.recordDate }}</template>
       </el-table-column>
       <el-table-column label="部门名称" align="center" prop="deptName" />
       <el-table-column label="队室/班组" align="center" prop="teamName" />

src/views/ledger/securityTest/index.vue

@@ -26,8 +26,8 @@
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
     </el-row>
     <el-table v-loading="loading" :data="list">
-      <el-table-column label="测试日期" align="center" prop="recordDate" width="110">
-        <template #default="{ row }">{{ parseTime(row.recordDate, '{y}-{m}-{d}') }}</template>
+      <el-table-column label="测试日期" align="center" prop="recordDate" width="170">
+        <template #default="{ row }">{{ row.recordDate }}</template>
       </el-table-column>
       <el-table-column label="部门名称" align="center" prop="deptName" />
       <el-table-column label="队室/班组" align="center" prop="teamName" />

src/views/ledger/seizureStats/index.vue

@@ -23,8 +23,8 @@
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
     </el-row>
     <el-table v-loading="loading" :data="list">
-      <el-table-column label="查获日期" align="center" prop="recordDate" width="110">
-        <template #default="{ row }">{{ parseTime(row.recordDate, '{y}-{m}-{d}') }}</template>
+      <el-table-column label="查获日期" align="center" prop="recordDate" width="170">
+        <template #default="{ row }">{{ row.recordDate }}</template>
       </el-table-column>
       <el-table-column label="部门名称" align="center" prop="deptName" />
       <el-table-column label="队室/班组" align="center" prop="teamName" />

src/views/ledger/servicePatrol/index.vue

@@ -7,8 +7,8 @@
       <el-form-item label="队室/班组" prop="teamName">
         <el-input v-model="queryParams.teamName" placeholder="请输入队室/班组" clearable @keyup.enter="handleQuery" />
       </el-form-item>
-      <el-form-item label="被查人" prop="inspectedName">
-        <el-input v-model="queryParams.inspectedName" placeholder="请输入被查人" clearable @keyup.enter="handleQuery" />
+      <el-form-item label="责任人" prop="inspectedName">
+        <el-input v-model="queryParams.inspectedName" placeholder="请输入责任人" clearable @keyup.enter="handleQuery" />
       </el-form-item>
 
       <el-form-item label="记录日期">
@@ -30,13 +30,13 @@
     </el-row>
 
     <el-table v-loading="loading" :data="list">
-      <el-table-column label="巡查日期" align="center" prop="recordDate" width="110">
-        <template #default="{ row }">{{ parseTime(row.recordDate, '{y}-{m}-{d}') }}</template>
+      <el-table-column label="巡查日期" align="center" prop="recordDate" width="170">
+        <template #default="{ row }">{{ row.recordDate }}</template>
       </el-table-column>
       <el-table-column label="部门名称" align="center" prop="deptName" />
       <el-table-column label="队室/班组" align="center" prop="teamName" />
       <el-table-column label="巡查人" align="center" prop="inspectorName" />
-      <el-table-column label="被查人" align="center" prop="inspectedName" />
+      <el-table-column label="责任人" align="center" prop="inspectedName" />
       <el-table-column label="服务类型" align="center" prop="serviceType" />
       <el-table-column label="问题描述" align="center" prop="problemDesc" show-overflow-tooltip />
       <el-table-column label="扣分" align="center" prop="deductScore">

src/views/ledger/supervisionProblem/index.vue

@@ -10,8 +10,8 @@
       <el-form-item label="巡查人" prop="inspectorName">
         <el-input v-model="queryParams.inspectorName" placeholder="请输入巡查人" clearable @keyup.enter="handleQuery" />
       </el-form-item>
-      <el-form-item label="被查人" prop="inspectedName">
-        <el-input v-model="queryParams.inspectedName" placeholder="请输入被查人" clearable @keyup.enter="handleQuery" />
+      <el-form-item label="责任人" prop="inspectedName">
+        <el-input v-model="queryParams.inspectedName" placeholder="请输入责任人" clearable @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="记录日期">
         <el-date-picker v-model="dateRange" type="daterange" value-format="YYYY-MM-DD"
@@ -32,14 +32,14 @@
     </el-row>
 
     <el-table v-loading="loading" :data="list">
-      <el-table-column label="记录日期" align="center" prop="recordDate" width="110">
-        <template #default="{ row }">{{ parseTime(row.recordDate, '{y}-{m}-{d}') }}</template>
+      <el-table-column label="记录日期" align="center" prop="recordDate" width="170">
+        <template #default="{ row }">{{ row.recordDate }}</template>
       </el-table-column>
       <el-table-column label="部门名称" align="center" prop="deptName" />
       <el-table-column label="队室/班组" align="center" prop="teamName" />
       <el-table-column label="小组" align="center" prop="groupName" />
       <el-table-column label="巡查人" align="center" prop="inspectorName" />
-      <el-table-column label="被查人" align="center" prop="inspectedName" />
+      <el-table-column label="责任人" align="center" prop="inspectedName" />
       <el-table-column label="问题类型" align="center" prop="problemType" />
       <el-table-column label="问题描述" align="center" prop="problemDesc" show-overflow-tooltip />
       <el-table-column label="问题地点" align="center" prop="location" />

src/views/ledger/terminalBonus/index.vue

@@ -10,7 +10,7 @@
       <el-form-item label="姓名" prop="personName">
         <el-input v-model="queryParams.personName" placeholder="请输入姓名" clearable @keyup.enter="handleQuery" />
       </el-form-item>
-      <el-form-item label="审核日期">
+      <el-form-item label="计分时间">
         <el-date-picker v-model="dateRange" type="daterange" value-format="YYYY-MM-DD"
           range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" clearable />
       </el-form-item>
@@ -26,8 +26,8 @@
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
     </el-row>
     <el-table v-loading="loading" :data="list">
-      <el-table-column label="审核日期" align="center" prop="approveDate" width="110">
-        <template #default="{ row }">{{ parseTime(row.approveDate, '{y}-{m}-{d}') }}</template>
+      <el-table-column label="计分时间" align="center" prop="scoreDate" width="170">
+        <template #default="{ row }">{{ row.scoreDate }}</template>
       </el-table-column>
       <el-table-column label="部门名称" align="center" prop="deptName" />
       <el-table-column label="队室/班组" align="center" prop="teamName" />

src/views/ledger/trainingIssue/index.vue

@@ -30,8 +30,8 @@
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
     </el-row>
     <el-table v-loading="loading" :data="list">
-      <el-table-column label="问题台账日期" align="center" prop="recordDate" width="120">
-        <template #default="{ row }">{{ parseTime(row.recordDate, '{y}-{m}-{d}') }}</template>
+      <el-table-column label="问题台账日期" align="center" prop="recordDate" width="170">
+        <template #default="{ row }">{{ row.recordDate }}</template>
       </el-table-column>
       <el-table-column label="班组" align="center" prop="teamName" width="120" />
       <el-table-column label="处理人" align="center" prop="handler" width="100" />

src/views/ledger/unsafeEvent/index.vue

@@ -26,8 +26,8 @@
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
     </el-row>
     <el-table v-loading="loading" :data="list">
-      <el-table-column label="事件日期" align="center" prop="recordDate" width="110">
-        <template #default="{ row }">{{ parseTime(row.recordDate, '{y}-{m}-{d}') }}</template>
+      <el-table-column label="事件日期" align="center" prop="recordDate" width="170">
+        <template #default="{ row }">{{ row.recordDate }}</template>
       </el-table-column>
       <el-table-column label="部门名称" align="center" prop="deptName" />
       <el-table-column label="队室/班组" align="center" prop="teamName" />

src/views/portraitManagement/components/ChannelCheckChart.vue

@@ -1,5 +1,5 @@
 <template>
-  <Card title="每日通道过检率">
+  <Card title="通道高峰过检率">
     <div ref="bar" style="width: 100%; height: 100%;"></div>
   </Card>
 </template>

src/views/portraitManagement/components/ProfileBasicDistribution.vue

@@ -96,6 +96,13 @@ const updateGenderChart = (data) => {
       textStyle: { color: '#fff' },
       formatter: '{b}: {c} ({d}%)'
     },
+    legend: {
+      show: true,
+      textStyle: { color: '#fff' },
+      top: 0,
+      itemWidth: 10,
+      itemHeight: 10
+    },
     series: [{
       type: 'pie',
       radius: ['38%', '55%'],
@@ -120,6 +127,13 @@ const updateNationChart = (data) => {
       textStyle: { color: '#fff' },
       formatter: '{b}: {c} ({d}%)'
     },
+    legend: {
+      show: true,
+      textStyle: { color: '#fff' },
+      top: 0,
+      itemWidth: 10,
+      itemHeight: 10
+    },
     series: [{
       type: 'pie',
       radius: ['38%', '55%'],
@@ -144,6 +158,13 @@ const updatePoliticalChart = (data) => {
       textStyle: { color: '#fff' },
       formatter: '{b}: {c} ({d}%)'
     },
+    legend: {
+      show: true,
+      textStyle: { color: '#fff' },
+      top: 0,
+      itemWidth: 10,
+      itemHeight: 10
+    },
     series: [{
       type: 'pie',
       radius: ['38%', '55%'],

src/views/portraitManagement/components/ProfilePositionDistribution.vue

@@ -96,6 +96,12 @@ const updateSkillChart = (data) => {
       textStyle: { color: '#fff' },
       formatter: '{b}: {c}'
     },
+    legend: {
+      show: true,
+      textStyle: { color: '#fff' },
+      top: 0,
+      data: ['职业资格等级']
+    },
     xAxis: {
       type: 'category',
       data: chartData.categories,
@@ -110,6 +116,7 @@ const updateSkillChart = (data) => {
     },
     series: [{
       type: 'bar',
+      name: '职业资格等级',
       data: chartData.values,
       itemStyle: {
         color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
@@ -137,10 +144,16 @@ const updateOperateChart = (data) => {
       textStyle: { color: '#fff' },
       formatter: '{b}: {c}'
     },
+    legend: {
+      show: true,
+      textStyle: { color: '#fff' },
+      top: 0,
+      data: ['开机年限']
+    },
     xAxis: {
       type: 'category',
       data: chartData.categories,
-      axisLabel: { color: '#a0c4ff', fontSize: 10 },
+      axisLabel: { color: '#a0c4ff', fontSize: 10,rotate: 30 },
       axisLine: { lineStyle: { color: 'rgba(15,70,250,0.3)' } }
     },
     yAxis: {
@@ -151,6 +164,7 @@ const updateOperateChart = (data) => {
     },
     series: [{
       type: 'bar',
+      name: '开机年限',
       data: chartData.values,
       itemStyle: {
         color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
@@ -177,10 +191,16 @@ const updatePostChart = (data) => {
       textStyle: { color: '#fff' },
       formatter: '{b}: {c}'
     },
+    legend: {
+      show: true,
+      textStyle: { color: '#fff' },
+      top: 0,
+      data: ['岗位资质']
+    },
     xAxis: {
       type: 'category',
       data: chartData.categories,
-      axisLabel: { color: '#a0c4ff', fontSize: 10 },
+      axisLabel: { color: '#a0c4ff', fontSize: 10,rotate: 30 },
       axisLine: { lineStyle: { color: 'rgba(15,70,250,0.3)' } }
     },
     yAxis: {
@@ -191,6 +211,7 @@ const updatePostChart = (data) => {
     },
     series: [{
       type: 'bar',
+      name: '岗位资质',
       data: chartData.values,
       itemStyle: {
         color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [

src/views/portraitManagement/components/ProfileRadar.vue

@@ -1,17 +1,25 @@
 <template>
   <InfoCard :title="title">
     <div class="radar-section">
-      <div ref="radarChartRef" class="radar-chart"></div>
+      <div>
+        <div class="chart-legend">
+          <div class="legend-item legend-warning"><span></span>预警线（低于75分）</div>
+          <!-- <div class="legend-item legend-normal"><span></span>正常线（75~90分)</div> -->
+          <div class="legend-item legend-excellent"><span></span>优秀线（高于90分）</div>
+          <div class="legend-item legend-current"><span></span>当前分值</div>
+        </div>
+        <div ref="radarChartRef" class="radar-chart"></div>
+      </div>
       <div class="radar-list">
         <div class="radar-item" v-for="(item, index) in computedRadarData" :key="index">
           <span class="item-label">{{ item.name }}</span>
           <div class="progress-row">
             <div class="progress-bar">
-            <div class="progress-fill"
-              :style="{ width: ((item.finalScore || 0) / (computedMaxScore || 1) * 100) + '%', background: `linear-gradient(90deg, ${item.color}33, ${item.color})` }">
+              <div class="progress-fill"
+                :style="{ width: ((item.finalScore || 0) / (computedMaxScore || 1) * 100) + '%', background: `linear-gradient(90deg, ${item.color}33, ${item.color})` }">
                 <span class="progress-end" :style="{ background: item.color }"></span>
+              </div>
             </div>
-          </div>
             <span class="item-value">{{ item.finalScore || 0 }}</span>
           </div>
         </div>
@@ -181,6 +189,62 @@ onUnmounted(() => {
   gap: 20px;
   min-height: 400px;
 
+  .chart-legend {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    flex-wrap: wrap;
+    gap: 10px 18px;
+    padding-top: 8px;
+    color: #fff;
+    font-size: 14px;
+  }
+
+  .legend-item {
+    display: flex;
+    align-items: center;
+    gap: 6px;
+
+    span {
+      width: 24px;
+      height: 10px;
+      border: 2px solid currentColor;
+      border-radius: 2px;
+    }
+  }
+
+  .legend-warning {
+    color: #fe4322;
+
+    span {
+      background-color: #fe4322;
+    }
+  }
+
+  .legend-normal {
+    color: #fff;
+
+    span {
+      background-color: #fff;
+    }
+  }
+
+  .legend-excellent {
+    color: #8EC742;
+
+    span {
+      background-color: #8EC742;
+    }
+  }
+
+  .legend-current {
+    color: #1890ff;
+
+    span {
+      background-color: #1890ff;
+    }
+  }
+
   .radar-chart {
     flex: 1;
     min-width: 300px;

src/views/portraitManagement/components/SeizedItems.vue

@@ -31,6 +31,7 @@ const setChartsOptionsBar = computed(() => {
       textStyle: { color: '#fff' }
     },
     legend: {
+      type: 'scroll',
       top: 'center',
       left: '0%',
       orient: 'vertical',

src/views/portraitManagement/components/SeizedNum.vue

@@ -1,5 +1,5 @@
 <template>
-  <Card title="每日查获数量(个人对比)">
+  <Card :title="title">
     <div ref="bar" style="width: 100%; height: 100%;"></div>
   </Card>
 </template>
@@ -10,6 +10,10 @@
   import { useECharts } from '@/hooks/useEcharts.js';
   const bar = ref(null)
   const props = defineProps({
+    title: {
+      type: String,
+      default: '每日查获数量(个人对比)'
+    },
     chartsData: {
       type: Array,
       default: () => []

src/views/portraitManagement/components/SupervisionDistribution.vue

@@ -33,7 +33,7 @@ const setChartsOptionsBar = computed(() => {
     xAxis: {
       type: 'category',
       data: labels,
-      axisLabel: { color: '#fff', fontSize: 14 },
+      axisLabel: { color: '#fff', fontSize: 13, rotate: 30 },
       axisLine: { lineStyle: { color: '#344067' } }
     },
     yAxis: [

src/views/portraitManagement/deptProfile/component/runData.vue

@@ -16,7 +16,7 @@
         <SeizedNumAll :chartsData="countSeizureTotalQuantityData"/>
       </div>
       <div class="col">
-        <SeizedNum :chartsData="countSeizureSingleQuantityData" />
+        <SeizedNum :chartsData="countSeizureSingleQuantityData" :title="'每日查获数量(班组对比)'"/>
       </div>
     </div>
     <div class="row">

src/views/portraitManagement/employeeProfile/index.vue

@@ -65,7 +65,10 @@
                   </div>
                   <div class="info-item-content">
                     <div class="info-item-label">技能等级：</div>
-                    <div class="info-item-value">{{ portrait.qualificationLevelText || '-' }}</div>
+                    <div class="info-item-value">
+                      {{ portrait.qualificationLevelText || '-' }}
+                      <span class="info-item-tag" style="margin-left: 10px;margin-top: 2px;" v-if="!!portrait.xrayOperatorStarttime">X射线安检仪操作岗位</span>
+                    </div>
                   </div>
                 </div>
                 <div class="info-item">
@@ -84,19 +87,20 @@
                 <div class="score-progress">
                   <el-progress type="circle" :width="160" :stroke-width="18" color="#5BE39E" :percentage="(portrait.totalScore || -2) + 2">
                     <div class="percentage-content">
-                      <span class="percentage-value">{{ (portrait.totalScore || -2) + 2 }}</span>
+                      <span class="percentage-value">{{ (portrait.totalScore || 0)  }}</span>
                       <span class="percentage-text">综合得分</span>
                     </div>
                   </el-progress>
                 </div>
                 <div class="score-box">
-                  <div class="score-row">
+                  <!-- <div class="score-row">
                     <span class="score-col">评分：</span>
                     <span class="score-col-2">{{ portrait.totalScore || 0 }}</span>
-                  </div>
+                  </div> -->
                   <div class="score-row">
-                    <span class="score-col">标签得分：</span>
-                    <span class="score-col-2">{{ tagScoreData != null ? (typeof tagScoreData === 'object' ? (tagScoreData.totalScore ?? tagScoreData.score ?? tagScoreData) : tagScoreData) : 0 }}</span>
+                    <span class="score-col">附加分：</span>
+                    <span class="score-col-2">{{ portrait?.userTags?.split(',').length || 0 }}分</span>
+                    <!-- <span class="score-col-2">{{ tagScoreData != null ? (typeof tagScoreData === 'object' ? (tagScoreData.totalScore ?? tagScoreData.score ?? tagScoreData) : tagScoreData) : 0 }}</span> -->
                   </div>
                 </div>
               </div>
@@ -126,9 +130,21 @@
                 </div>
               </div>
             </Card>
+            <Card title="职业资格证书情况">
+              <div class="cert-info">
+                <span class="cert-name">证书名称：{{ portrait?.qualificationLevelText || '-' }} 时间：{{ getQualificationTime|| '-' }}</span>
+              
+              </div>
+            </Card>
           </div>
           <div class="content-bottom-center">
             <Card title="个人能力">
+              <div class="chart-legend">
+                <div class="legend-item legend-warning"><span></span>预警线（低于75分）</div>
+                <!-- <div class="legend-item legend-normal"><span></span>正常线（75~90分)</div> -->
+                <div class="legend-item legend-excellent"><span></span>优秀线（高于90分）</div>
+                <div class="legend-item legend-current"><span></span>当前员工分值</div>
+              </div>
               <div ref="abilityChart" class="chart-box" @click="goToWarningPage" />
             </Card>
           </div>
@@ -225,6 +241,7 @@ import { getEmployeePortrait } from '@/api/score/index'
 import { countTagScore } from '@/api/portraitManagement/portraitManagement'
 import { onMounted, onUnmounted, reactive, ref, computed, watch } from 'vue'
 import { useDict } from '@/utils/dict'
+import { getQualificationLevelTime } from '@/api/ledger/index'
 import { useECharts } from '@/hooks/useEcharts'
 import useUserStore from '@/store/modules/user'
 import { useRouter } from 'vue-router'
@@ -243,6 +260,7 @@ const abilityChart = ref(null)
 const activeDimName = ref(null)
 const tagScoreData = ref(null)
 const currentQuery = ref(null)
+const qualificationData = ref(null)
 
 const scoreDetails = computed(() => portrait.value?.scoreDetails || [])
 
@@ -279,6 +297,25 @@ const deductTotal = computed(() => {
   return s.toFixed(2)
 })
 
+// 职业资格等级枚举
+const qualificationLevelMap = [
+  { label: '一级', field: 'levelOneTime' },
+  { label: '二级', field: 'levelTwoTime' },
+  { label: '三级', field: 'levelThreeTime' },
+  { label: '四级', field: 'levelFourTime' },
+  { label: '五级', field: 'levelFiveTime' }
+]
+
+const getQualificationTime = computed(() => {
+  const certName = portrait.value?.qualificationLevelText || '-';
+  
+  const item = qualificationLevelMap.find(l => l.label === certName)
+  if (item) {
+    return qualificationData.value?.[item.field] || '-'
+  }
+  return '-'
+})
+
 
 const getSchooling = (schooling) => {
   const result = (sys_user_schooling.value || []).find(item => item.value === schooling) || { label: schooling }
@@ -345,7 +382,12 @@ const invokerEmployeePortrait = (query) => {
       tagScoreData.value = data
     }
   })
-  return Promise.all([portraitPromise, tagPromise]).finally(() => {
+  const qualificationPromise = getQualificationLevelTime({ userId }).then(res => {
+    qualificationData.value = res.data || null
+  }).catch(() => {
+    qualificationData.value = null
+  })
+  return Promise.all([portraitPromise, tagPromise, qualificationPromise]).finally(() => {
     loading.value = false
   })
 }
@@ -764,9 +806,54 @@ onUnmounted(() => {
       & > * {
         height: 100%;
       }
+      .chart-legend {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        flex-wrap: wrap;
+        gap: 10px 18px;
+        padding-top: 8px;
+        color: #fff;
+        font-size: 14px;
+      }
+      .legend-item {
+        display: flex;
+        align-items: center;
+        gap: 6px;
+        span {
+          width: 24px;
+          height: 10px;
+          border: 2px solid currentColor;
+          border-radius: 2px;
+        }
+      }
+      .legend-warning {
+        color: #fe4322;
+        span { 
+          background-color: #fe4322;
+        }
+      }
+      .legend-normal {
+        color: #fff;
+        span { 
+          background-color: #fff;
+        }
+      }
+      .legend-excellent {
+        color: #8EC742;
+        span { 
+          background-color: #8EC742;
+        }
+      }
+      .legend-current {
+        color: #1890ff;
+        span { 
+          background-color: #1890ff;
+        }
+      }
       .chart-box {
         width: 100%;
-        height: 100%;
+        height: calc(100% - 34px);
         overflow: hidden;
       }
     }

src/views/portraitManagement/teamProfile/component/runData.vue

@@ -16,7 +16,7 @@
         <SeizedNumAll :chartsData="countSeizureTotalQuantityData" />
       </div>
       <div class="col">
-        <SeizedNum :chartsData="countSeizureSingleQuantityData" />
+        <SeizedNum :chartsData="countSeizureSingleQuantityData" :title="'每日查获数量(小组对比)'"/>
       </div>
     </div>
     <div class="row">

src/views/score/event/index.vue

@@ -96,14 +96,14 @@
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
     </el-row>
 
-    <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange" style="width: 100%;" fit="true"
-      :scrollbar-always-on="true">
+    <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange" @sort-change="handleSortChange" style="width: 100%;" fit="true"
+      :scrollbar-always-on="true" :default-sort="{ prop: sortField, order: sortOrder }">
       <el-table-column type="selection" width="55" align="center" resizable />
       <el-table-column label="配分层级" align="center" prop="org" width="110" resizable>
         <template #default="{ row }"><dict-tag :options="score_level" :value="row.org" /></template>
       </el-table-column>
-      <el-table-column label="事件时间" align="center" prop="eventTime" width="120" resizable>
-        <template #default="{ row }">{{ parseTime(row.eventTime, '{y}-{m}-{d}') }}</template>
+      <el-table-column label="事件时间" align="center" prop="eventTime" width="170" resizable sortable="custom">
+        <template #default="{ row }">{{ row.eventTime }}</template>
       </el-table-column>
       <el-table-column label="维度" align="center" prop="dimensionName" width="150" resizable />
       <el-table-column label="二级指标" align="center" prop="level2Name" min-width="250" show-overflow-tooltip resizable />
@@ -332,6 +332,8 @@ const channelOptions = ref([])
 const postTreeData = ref([])
 
 const queryParams = reactive({ pageNum: 1, pageSize: 10, personId: null, personName: '', deptId: null, deptName: '', teamId: null, teamName: '', groupId: null, groupName: '', dimensionId: null, sourceType: '', org: '', scoreType: null, regionalId: null, channelId: null, postId: null })
+const sortField = ref('eventTime')
+const sortOrder = ref('descending')
 const form = reactive({ id: null, dimensionId: null, dimensionName: '', indicatorId: null, level2Id: null, level2Name: '', level3Id: null, level3Name: '', level4Id: null, level4Name: '', eventTime: '', location: '', personId: null, deptName: '', deptId: null, teamId: null, groupId: null, scoreValue: 0, cascadeScore: 0, eventDesc: '', remark: '', org: '', regionalId: null, channelId: null, postId: null })
 const formChannelOptions = ref([])
 const rules = computed(() => {
@@ -540,9 +542,21 @@ function getList() {
   loading.value = true
   const p = { ...queryParams }
   if (dateRange.value?.length === 2) { p['params[beginTime]'] = dateRange.value[0]; p['params[endTime]'] = dateRange.value[1] }
+  // 添加排序参数
+  if (sortField.value && sortOrder.value) {
+    const orderType = sortOrder.value === 'ascending' ? 'asc' : 'desc'
+    p[`sorts[${sortField.value}]`] = orderType
+  }
   listScoreEvent(p).then(r => { list.value = r.rows; total.value = r.total }).finally(() => loading.value = false)
 }
 
+function handleSortChange({ prop, order }) {
+  sortField.value = prop
+  sortOrder.value = order
+  queryParams.pageNum = 1
+  getList()
+}
+
 function handleQuery() { queryParams.pageNum = 1; getList() }
 function resetQuery() {
   dateRange.value = []

src/views/warningPage/index.vue

@@ -74,52 +74,56 @@
             </div>
             <div class="employee-card">
                 <div style="overflow-x: auto;">
-                    <table class="data-table" style="width:100%;">
-                        <thead>
-                            <tr>
-                                <th>员工ID</th>
-                                <th>姓名</th>
-                                <th>所属部门</th>
-                                <th>综合评估得分</th>
-                                <th>预警等级</th>
-                                <th>核心风险/优秀事迹</th>
-                                <th>状态标签</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            <tr v-for="emp in filteredEmployees" :key="emp.id" :class="getRowClass(emp.overallScore)">
-                                <td>{{ emp.userId }}</td>
-                                <td><strong>{{ emp.nickName }}</strong></td>
-                                <td>{{ emp.deptName }}</td>
-                                <td>
-                                    <span v-if="emp.overallScore < 75" class="score-danger">{{ emp.overallScore }}
-                                        分</span>
-                                    <span v-else-if="emp.overallScore >= 90" class="score-excellent">{{ emp.overallScore
-                                        }}
-                                        分</span>
-                                    <span v-else style="font-weight:600;">{{ emp.overallScore }} 分</span>
-                                </td>
-                                <td>
-                                    <span v-if="emp.overallScore < 75" class="status-badge"
-                                        style="animation: subtlePulse 1s infinite;"><i
-                                            class="fas fa-exclamation-triangle"></i> 红色预警</span>
-                                    <span v-else-if="emp.overallScore >= 90" class="status-excellent"
-                                        style="background:#d1fae5; color:#065f46;"><i class="fas fa-star"></i>
-                                        优秀标杆</span>
-                                    <span v-else class="status-warning">正常范围</span>
-                                </td>
-                                <td style="font-size:0.75rem;">{{ emp.coreRisksOrOutstandingAchievements }}</td>
-                                <td>
-                                    <span v-if="emp.overallScore < 75" style="color:#b91c1c;"><i
-                                            class="fas fa-bell"></i>
-                                        {{ getAlertLabel(emp.statusLabel) }}</span>
-                                    <span v-else-if="emp.overallScore >= 90" style="color:#15803d;"><i
-                                            class="fas fa-crown"></i> {{ getAlertLabel(emp.statusLabel) }}</span>
-                                    <span v-else>{{ getAlertLabel(emp.statusLabel) }}</span>
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
+                    <el-table :data="filteredEmployees" :row-class-name="getRowClass" style="width:100%;" border stripe>
+                        <el-table-column prop="userId" label="员工ID" />
+                        <el-table-column prop="nickName" label="姓名">
+                            <template #default="{ row }">
+                                <strong>{{ row.nickName }}</strong>
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="deptName" label="所属部门" />
+                        <el-table-column prop="eventTime" label="事件时间" sortable width="180" />
+                        <el-table-column prop="overallScore" label="综合评估得分" sortable>
+                            <template #default="{ row }">
+                                <span v-if="row.overallScore < 75" class="score-danger">{{ row.overallScore }} 分</span>
+                                <span v-else-if="row.overallScore >= 90" class="score-excellent">{{ row.overallScore }} 分</span>
+                                <span v-else style="font-weight:600;">{{ row.overallScore }} 分</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="overallScore" label="预警等级">
+                            <template #default="{ row }">
+                                <span v-if="row.overallScore < 75" class="status-badge"
+                                    style="animation: subtlePulse 1s infinite;"><i
+                                        class="fas fa-exclamation-triangle"></i> 红色预警</span>
+                                <span v-else-if="row.overallScore >= 90" class="status-excellent"
+                                    style="background:#d1fae5; color:#065f46;"><i class="fas fa-star"></i>
+                                    优秀标杆</span>
+                                <span v-else class="status-warning">正常范围</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="coreRisksOrOutstandingAchievements" label="核心风险/优秀事迹" />
+                        <el-table-column prop="statusLabel" label="状态标签">
+                            <template #default="{ row }">
+                                <span v-if="row.overallScore < 75" style="color:#b91c1c;"><i
+                                        class="fas fa-bell"></i>
+                                    {{ getAlertLabel(row.statusLabel) }}</span>
+                                <span v-else-if="row.overallScore >= 90" style="color:#15803d;"><i
+                                        class="fas fa-crown"></i> {{ getAlertLabel(row.statusLabel) }}</span>
+                                <span v-else>{{ getAlertLabel(row.statusLabel) }}</span>
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                    <el-pagination
+                        v-show="total > 0"
+                        :total="total"
+                        v-model:current-page="queryParams.pageNum"
+                        v-model:page-size="queryParams.pageSize"
+                        :page-sizes="[10, 20, 50, 100]"
+                        layout="total, sizes, prev, pager, next, jumper"
+                        @size-change="handleSizeChange"
+                        @current-change="handlePageChange"
+                        style="margin-top: 16px; justify-content: flex-end;"
+                    />
                 </div>
                 <div class="warning-summary">
                     <div><i class="fas fa-circle" style="color:#ef4444;"></i> <strong>红色预警</strong> (综合评估 &lt; 75分) 共计
@@ -190,6 +194,10 @@ const coreRisksOrOutstandingAchievementsList = [
 ]
 
 const employeesData = ref([])
+const queryParams = reactive({
+  pageNum: 1,
+  pageSize: 10
+})
 
 for (let i = 0; i < newNames.length; i++) {
     employeesData.value.push({
@@ -250,10 +258,8 @@ const getSelectedInfo = (selectedValue) => {
     return findNodeByValue(cascadeOptions.value, selectedValue)
 }
 
-const filteredEmployees = computed(() => {
-    let result = employeesData.value.ledgerWarningDetailItemList
-
-
+const allFilteredEmployees = computed(() => {
+    let result = employeesData.value.ledgerWarningDetailItemList || []
 
     // 预警等级筛选
     if (selectedAlertLevel.value) {
@@ -272,11 +278,26 @@ const filteredEmployees = computed(() => {
         }
     }
 
-
-
     return result
 })
 
+const filteredEmployees = computed(() => {
+    const start = (queryParams.pageNum - 1) * queryParams.pageSize
+    const end = start + queryParams.pageSize
+    return allFilteredEmployees.value.slice(start, end)
+})
+
+const total = computed(() => allFilteredEmployees.value.length)
+
+function handlePageChange(newPage) {
+    queryParams.pageNum = newPage
+}
+
+function handleSizeChange(newSize) {
+    queryParams.pageSize = newSize
+    queryParams.pageNum = 1
+}
+
 const redAlertCount = computed(() => {
     return employeesData.value?.redAlertNum || 0
 })
@@ -289,9 +310,9 @@ const avgScore = computed(() => {
     return employeesData.value?.averageComprehensiveScore || 0
 })
 
-const getRowClass = (score) => {
-    if (score < 75) return "employee-warning-row"
-    if (score >= 90) return "employee-excellent-row"
+const getRowClass = ({ row }) => {
+    if (row.overallScore < 75) return "employee-warning-row"
+    if (row.overallScore >= 90) return "employee-excellent-row"
     return ""
 }
 
@@ -348,7 +369,7 @@ const warningDataMap = {
 }
 
 const fetchWarningData = async () => {
-    
+    queryParams.pageNum = 1
     let params = {}
     if (startDate.value && endDate.value) {
         params.startDate = formatDate(startDate.value)
@@ -419,6 +440,10 @@ watch(cascadeOptions, (val) => {
     }
 })
 
+watch(selectedAlertLevel, () => {
+    queryParams.pageNum = 1
+})
+
 // 监听路由参数变化，回显到级联选择器
 watch(() => route.query, (query) => {
     const { id } = query