refactor(profile): 优化个人画像页面布局及样式，调整组织架构命名

- 将“安检大队”名称统一修改为“旅检部”和“部门”等对应称谓
- 统一调整多个视图组件中“大队”、“主管”、“科室”为“部门”、“班组”、“小组”等
- 注释并隐藏出勤人次图中“安检综合大队”相关配置和数据序列
- 个人画像页内增加工作履历、获奖记录、职业资格证书时间等展示模块
- 优化职级时间显示顺序和显示逻辑，调整计算逻辑和相关数据处理
- 改进雷达图配置，简化最大值计算，调整样式和颜色渐变效果
- 修改画像页面用户信息展示布局，增加标签显示样式，完善综合得分组件
- 统一巡检任务层级命名，调整描述文本内容，确保逻辑一致性
- 修正teamProfile组件watch配置，增加immediate以触发初始加载
- 简化warningPage组件el-tree-select标签格式，调整属性排列，无功能改动
- 多处样式细节优化，如线性渐变颜色、滚动条样式和容器尺寸调整

src/views/assistant/components/dutyOrganization.vue

@@ -558,7 +558,7 @@ const attendanceBarOptions = {
     }
   },
   legend: {
-    data: ['安检一大队', '安检二大队', '安检三大队', '安检综合大队', '全站'],
+    data: ['旅检一部', '旅检二部', '旅检三部', '全站'],
     top: 0,
     show: true,
   },
@@ -611,7 +611,7 @@ const attendanceBarOptions = {
       data: []
     },
     {
-      name: '安检一大队',
+      name: '旅检一部',
       type: 'bar',
       barWidth: '10%',
       itemStyle: {
@@ -625,7 +625,7 @@ const attendanceBarOptions = {
       data: []
     },
     {
-      name: '安检二大队',
+      name: '旅检二部',
       type: 'bar',
       barWidth: '10%',
       itemStyle: {
@@ -639,7 +639,7 @@ const attendanceBarOptions = {
       data: []
     },
     {
-      name: '安检三大队',
+      name: '旅检三部',
       type: 'bar',
       barWidth: '10%',
       itemStyle: {
@@ -652,20 +652,7 @@ const attendanceBarOptions = {
       },
       data: []
     },
-    {
-      name: '安检综合大队',
-      type: 'bar',
-      barWidth: '10%',
-      itemStyle: {
-        color: '#FFD166'
-      },
-      label: {
-        show: true,
-        position: 'top',
-        formatter: '{c}人'
-      },
-      data: []
-    }
+    
   ]
 }
 // 出勤人次柱状图配置
@@ -902,7 +889,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)
+    // const dept4Data = trendList.map(item => item.data4 || 0)
 
     // 更新图表配置
     attendanceBarOptions.xAxis.data = xAxisData
@@ -910,7 +897,7 @@ const updateAttendanceBarChart = () => {
     attendanceBarOptions.series[1].data = dept1Data
     attendanceBarOptions.series[2].data = dept2Data
     attendanceBarOptions.series[3].data = dept3Data
-    attendanceBarOptions.series[4].data = dept4Data
+    // attendanceBarOptions.series[4].data = dept4Data
     attendanceBarOptions.legend.show = !!isStationType.value
 
     // 重新设置图表选项

src/views/assistant/components/performanceAnalysis.vue

@@ -68,7 +68,7 @@
         <!-- 大队分析 -->
         <div class="panel-item" :class="{ 'loading-overlay': brigadeLoading }">
           <div class="panel-header">
-            <h3>大队</h3>
+            <h3>部门</h3>
           </div>
           <!-- 折线图 -->
           <div class="chart-container">
@@ -91,7 +91,7 @@
         <!-- 科室分析 -->
         <div class="panel-item" :class="{ 'loading-overlay': departmentLoading }">
           <div class="panel-header">
-            <h3>主管</h3>
+            <h3>班组</h3>
           </div>
           <!-- 折线图 -->
           <div class="chart-container">
@@ -117,7 +117,7 @@
         <!-- 班组分析 -->
         <div class="panel-item" :class="{ 'loading-overlay': teamLoading }">
           <div class="panel-header">
-            <h3>班组</h3>
+            <h3>小组</h3>
             <div class="panel-tabs">
               <div class="button-group small">
                 <div v-for="option in tabOptions" :key="option.value" class="custom-button"

src/views/assistant/components/riskHazard.vue

@@ -86,7 +86,7 @@
           <div class="table-container">
             <el-table :data="captureRankData" style="width: 100%" size="small">
               <el-table-column prop="rank" label="排名" align="center" />
-              <el-table-column prop="department" label="大队" />
+              <el-table-column prop="department" label="部门" />
               <el-table-column prop="percentage" label="占比" align="center">
                 <template #default="{ row }">
                   <span>{{ row.percentage }}%</span>
@@ -397,7 +397,7 @@ const concealmentPositionStatsDescription = computed(() => {
 const departmentRankingDescription = computed(() => {
 
   if (!departmentRankingData.value || !Array.isArray(departmentRankingData.value)) {
-    return 'XXXX是违禁品查获的主力大队，查获违禁物品数量为XX，占比XX%。'
+    return 'XXXX是违禁品查获的主力部门，查获违禁物品数量为XX，占比XX%。'
   }
 
   const rankingData = departmentRankingData.value
@@ -408,7 +408,7 @@ const departmentRankingDescription = computed(() => {
   // 2. 获取查获量最高的大队
   const topDepartment = sortedData[0] || { departmentName: 'XXXX', seizureCount: 234 }
 
-  const str = isStationType.value ? '大队' : isBrigadeType.value ? '主管' : isDepartmentType.value ? '班组' : isTeamsType.value ? '成员' : ''
+  const str = isStationType.value ? '部门' : isBrigadeType.value ? '班组' : isDepartmentType.value ? '小组' : isTeamsType.value ? '成员' : ''
   // 5. 生成描述文字
   return `${topDepartment.brigadeName || 'XXXX'}是违禁品查获的主力${str}，查获违禁物品数量为${topDepartment.seizureCount || 'XX'}，占比${topDepartment.currentRatio}%。`
 })
@@ -962,7 +962,7 @@ const updateDepartmentRankingTable = () => {
     // 转换数据格式
     const formattedData = tableData.map((item, index) => ({
       rank: index + 1,
-      department: item.brigadeName || '未知大队',
+      department: item.brigadeName || '未知部门',
       percentage: item.currentRatio || 0,
       count: item.seizureCount || 0
     }))

src/views/ledger/import/index.vue

@@ -363,8 +363,8 @@ const importItems = reactive([
   },
   {
     key: 'qualificationLevel',
-    title: '职业资格等级',
-    desc: '职业资格等级流程记录',
+    title: '职业资格证书获取时间',
+    desc: '职业资格证书获取时间流程记录',
     icon: 'Medal',
     api: importQualificationLevel,
     loading: false,

src/views/portraitManagement/components/ProfileRadar.vue

@@ -68,19 +68,13 @@ const computedRadarData = computed(() => {
 
 const computedIndicators = computed(() => {
   const data = computedRadarData.value
-  const allScores = data.map(item => item.finalScore || 0)
-  const maxValue = allScores.length > 0 ? Math.max(...allScores) : 100
   return data.map(item => ({
     name: item.name + '\n\n' + (item.finalScore || 0),
-    max: Math.max(maxValue, 1)
+    max: 100
   }))
 })
 
-const computedMaxScore = computed(() => {
-  const data = computedRadarData.value
-  const allScores = data.map(item => item.finalScore || 0)
-  return allScores.length > 0 ? Math.max(...allScores) : 100
-})
+const computedMaxScore = computed(() => 100)
 
 const computedSeries = computed(() => {
   return computedRadarData.value.map(item => item.finalScore || 0)
@@ -90,6 +84,7 @@ const radarChartRef = ref(null)
 let radarChart = null
 
 const updateRadarChart = () => {
+  
   if (!radarChartRef.value) return
 
   if (!radarChart) {

src/views/portraitManagement/employeeProfile/index.vue

@@ -4,194 +4,198 @@
       <div class="content-search">
         <SearchBar v-model:visible="visible" @search="searchHandler" :deptType="'user'" />
       </div>
-      
-        <div v-show="portrait.personName" class="content-info">
-          <Card title="个人基本信息">
-            <div class="userInfo">
-              <div class="userInfo-name">
-                <div class="avatar-area">
-                  <img v-if="portrait.avatar" :src="portrait.avatar" class="avatar" alt="头像" />
-                  <div v-else class="avatar">{{ portrait.personName?.charAt(0) }}</div>
+
+      <div v-show="portrait.personName" class="content-info">
+        <Card title="个人基本信息">
+          <div class="userInfo">
+            <div class="userInfo-name">
+              <div class="avatar-area">
+                <img v-if="portrait.avatar" :src="portrait.avatar" class="avatar" alt="头像" />
+                <div v-else class="avatar">{{ portrait.personName?.charAt(0) }}</div>
+              </div>
+              <div class="basic-name">
+                <div class="basic-label">姓名：</div>
+                <div class="basic-value">{{ portrait.personName }}</div>
+              </div>
+            </div>
+            <div class="userInfo-info">
+              <div class="info-item">
+                <div class="info-item-icon">
+                  <img src="/src/assets/dataBigScreen/img01.png" alt="" />
                 </div>
-                <div class="basic-name">
-                  <div class="basic-label">姓名：</div>
-                  <div class="basic-value">{{ portrait.personName }}</div>
+                <div class="info-item-content">
+                  <div class="info-item-label">所属部门及队室：</div>
+                  <div class="info-item-value">{{ portrait.deptPath || '-' }}</div>
                 </div>
               </div>
-              <div class="userInfo-info">
-                <div class="info-item">
-                  <div class="info-item-icon">
-                    <img src="/src/assets/dataBigScreen/img01.png" alt="" />
-                  </div>
-                  <div class="info-item-content">
-                    <div class="info-item-label">所属部门及队室：</div>
-                    <div class="info-item-value">{{ portrait.deptPath || '-' }}</div>
-                  </div>
+              <div class="info-item">
+                <div class="info-item-icon">
+                  <img src="/src/assets/dataBigScreen/img04.png" alt="" />
                 </div>
-                <div class="info-item">
-                  <div class="info-item-icon">
-                    <img src="/src/assets/dataBigScreen/img04.png" alt="" />
-                  </div>
-                  <div class="info-item-content">
-                    <div class="info-item-label">学历：</div>
-                    <div class="info-item-value">{{ getSchooling(portrait.schooling) }}</div>
-                  </div>
+                <div class="info-item-content">
+                  <div class="info-item-label">学历：</div>
+                  <div class="info-item-value">{{ getSchooling(portrait.schooling) }}</div>
                 </div>
               </div>
-              <div class="userInfo-info">
-                <div class="info-item">
-                  <div class="info-item-icon">
-                    <img src="/src/assets/dataBigScreen/img02.png" alt="" />
-                  </div>
-                  <div class="info-item-content">
-                    <div class="info-item-label">出生日期：</div>
-                    <div class="info-item-value">{{ portrait.birthday || '-' }}</div>
-                  </div>
+            </div>
+            <div class="userInfo-info">
+              <div class="info-item">
+                <div class="info-item-icon">
+                  <img src="/src/assets/dataBigScreen/img02.png" alt="" />
                 </div>
-                <div class="info-item">
-                  <div class="info-item-icon">
-                    <img src="/src/assets/dataBigScreen/img05.png" alt="" />
-                  </div>
-                  <div class="info-item-content">
-                    <div class="info-item-label">专业：</div>
-                    <div class="info-item-value">{{ portrait.major || '-' }}</div>
-                  </div>
+                <div class="info-item-content">
+                  <div class="info-item-label">出生日期：</div>
+                  <div class="info-item-value">{{ portrait.birthday || '-' }}</div>
                 </div>
               </div>
-              <div class="userInfo-info">
-                <div class="info-item">
-                  <div class="info-item-icon">
-                    <img src="/src/assets/dataBigScreen/img03.png" alt="" />
-                  </div>
-                  <div class="info-item-content">
-                    <div class="info-item-label">技能等级：</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 class="info-item">
+                <div class="info-item-icon">
+                  <img src="/src/assets/dataBigScreen/img05.png" alt="" />
                 </div>
-                <div class="info-item">
-                  <div class="info-item-icon">
-                    <img src="/src/assets/dataBigScreen/img06.png" alt="" />
-                  </div>
-                  <div class="info-item-content">
-                    <div class="info-item-label">标签：</div>
-                    <div class="info-item-value" v-if="portrait.userTags">
-                      <span class="info-item-tag" v-for="tag in portrait.userTags.split(',')" :key="tag">{{ tag }}</span>
-                    </div>
+                <div class="info-item-content">
+                  <div class="info-item-label">专业：</div>
+                  <div class="info-item-value">{{ portrait.major || '-' }}</div>
+                </div>
+              </div>
+            </div>
+            <div class="userInfo-info">
+              <div class="info-item">
+                <div class="info-item-icon">
+                  <img src="/src/assets/dataBigScreen/img03.png" alt="" />
+                </div>
+                <div class="info-item-content">
+                  <div class="info-item-label">技能等级：</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="userInfo-score">
-                <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 || 0)  }}</span>
-                      <span class="percentage-text">综合得分</span>
-                    </div>
-                  </el-progress>
+              <div class="info-item">
+                <div class="info-item-icon">
+                  <img src="/src/assets/dataBigScreen/img06.png" alt="" />
+                </div>
+                <div class="info-item-content">
+                  <div class="info-item-label">标签：</div>
+                  <div class="info-item-value" v-if="portrait.userTags">
+                    <span class="info-item-tag" v-for="tag in portrait.userTags.split(',')" :key="tag">{{ tag }}</span>
+                  </div>
                 </div>
-                <div class="score-box">
-                  <!-- <div class="score-row">
+              </div>
+            </div>
+            <div class="userInfo-score">
+              <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 || 0) }}</span>
+                    <span class="percentage-text">综合得分</span>
+                  </div>
+                </el-progress>
+              </div>
+              <div class="score-box">
+                <!-- <div class="score-row">
                     <span class="score-col">评分：</span>
                     <span class="score-col-2">{{ portrait.totalScore || 0 }}</span>
                   </div> -->
-                  <div class="score-row">
-                    <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 class="score-row">
+                  <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>
+          </div>
+        </Card>
+      </div>
+      <div v-show="portrait.personName" class="content-bottom">
+        <div class="content-bottom-left">
+          <Card title="工作履历">
+            <div class="work-history">
+              <span v-if="portrait.entryDate">
+                {{ formatWorkDate(portrait.entryDate) }}入职 | 司龄{{ portrait.companyYears != null ? portrait.companyYears
+                : '-' }}年 | 开机年限{{ portrait.xrayOperatorYears != null ? portrait.xrayOperatorYears : '-'
+
+                }}年 | 现任职{{ portrait.roleNames || '-' }}
+              </span>
+              <span v-else>暂无数据</span>
+            </div>
+          </Card>
+          <Card title="获奖记录">
+            <div class="card-content">
+              <div class="honor-item" v-for="(value, index) in portrait.awards" :key="index">
+                <div :style="{ '--indexBgColor': value.color }">
+                  <div :data-index="index + 1"></div>
+                  {{ value.level2Name }} {{ value.level4Name }}
                 </div>
+                <div>{{ value.score || '-' }}分</div>
+              </div>
+            </div>
+          </Card>
+          <Card title="职业资格证书获取时间">
+            <div class="cert-info">
+              <div class="cert-item" v-for="level in displayQualificationLevels" :key="level.field">
+                <span class="cert-name">{{ level.label }}：{{ qualificationData?.[level.field] || '-' }}</span>
               </div>
             </div>
           </Card>
         </div>
-        <div v-show="portrait.personName" class="content-bottom">
-          <div class="content-bottom-left">
-            <Card title="工作履历">
-              <div class="work-history">
-                <span v-if="portrait.entryDate">
-                  {{ formatWorkDate(portrait.entryDate)  }}入职 | 司龄{{ portrait.companyYears != null ? portrait.companyYears : '-' }}年 | 开机年限{{ portrait.xrayOperatorYears != null ? portrait.xrayOperatorYears : '-'
-
-                  }}年 | 现任职{{ portrait.roleNames || '-' }}
-                </span>
-                <span v-else>暂无数据</span>
+        <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>
+        <div class="content-bottom-right">
+          <Card title="补充信息">
+            <div class="card-content">
+              <div class="supp-item">
+                <span class="s-lbl">政治面貌:</span>
+                <span class="s-val">{{ portrait.politicalStatusText || '-' }}</span>
               </div>
-            </Card>
-            <Card title="获奖记录">
-              <div class="card-content">
-                <div class="honor-item" v-for="(value, index) in portrait.awards" :key="index">
-                  <div :style="{'--indexBgColor': value.color}">
-                    <div :data-index="index + 1"></div>
-                    {{ value.level2Name }} {{ value.level4Name }}
-                  </div>
-                  <div>{{ value.score || '-' }}分</div>
-                </div>
+              <div class="supp-item supp-item-2">
+                <span class="s-lbl">性别:</span>
+                <span class="s-val">{{ portrait.sexText || '-' }}</span>
               </div>
-            </Card>
-            <Card title="职业资格证书情况">
-              <div class="cert-info">
-                <div class="cert-item" v-for="level in displayQualificationLevels" :key="level.field">
-                  <span class="cert-name">{{ level.label }}：{{ qualificationData?.[level.field] || '-' }}</span>
-                </div>
+              <div class="supp-item">
+                <span class="s-lbl">籍贯:</span>
+                <span class="s-val">{{ portrait.nativePlace || '-' }}</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 class="supp-item supp-item-2">
+                <span class="s-lbl">民族:</span>
+                <span class="s-val">{{ portrait.nation || '-' }}</span>
               </div>
-              <div ref="abilityChart" class="chart-box" @click="goToWarningPage" />
-            </Card>
-          </div>
-          <div class="content-bottom-right">
-            <Card title="补充信息">
-              <div class="card-content">
-                <div class="supp-item">
-                  <span class="s-lbl">政治面貌:</span>
-                  <span class="s-val">{{ portrait.politicalStatusText || '-' }}</span>
-                </div>
-                <div class="supp-item supp-item-2">
-                  <span class="s-lbl">性别:</span>
-                  <span class="s-val">{{ portrait.sexText || '-' }}</span>
-                </div>
-                <div class="supp-item">
-                  <span class="s-lbl">籍贯:</span>
-                  <span class="s-val">{{ portrait.nativePlace || '-' }}</span>
-                </div>
-                <div class="supp-item supp-item-2">
-                  <span class="s-lbl">民族:</span>
-                  <span class="s-val">{{ portrait.nation || '-' }}</span>
-                </div>
-                <div class="supp-item">
-                  <span class="s-lbl">年龄:</span>
-                  <span class="s-val">{{ getAge(portrait.birthday) }}</span>
-                </div>
-                <div class="supp-item supp-item-2">
-                  <span class="s-lbl">司龄:</span>
-                  <span class="s-val">{{ portrait.companyYears != null ? portrait.companyYears+'年' : '-' }}</span>
-                </div>
-                <div class="supp-item">
-                  <span class="s-lbl">性格特征:</span>
-                  <span class="s-val">{{ portrait.characterCharacteristics || '-' }}</span>
-                </div>
-                <div class="supp-item supp-item-2">
-                  <span class="s-lbl">工作风格:</span>
-                  <span class="s-val">{{ portrait.workingStyle || '-' }}</span>
-                </div>
-                <div :class="i % 2 ? 'supp-item' : 'supp-item supp-item-2'" v-for="(p, i) in (portrait.postNames || '').split('、')" :key="i">
-                  <span class="s-lbl">{{ i === 0 ? '业务岗位:' : ''}}</span>
-                  <span class="s-val">{{ p }}</span>
-                </div>
+              <div class="supp-item">
+                <span class="s-lbl">年龄:</span>
+                <span class="s-val">{{ getAge(portrait.birthday) }}</span>
               </div>
-            </Card>
-          </div>
+              <div class="supp-item supp-item-2">
+                <span class="s-lbl">司龄:</span>
+                <span class="s-val">{{ portrait.companyYears != null ? portrait.companyYears + '年' : '-' }}</span>
+              </div>
+              <div class="supp-item">
+                <span class="s-lbl">性格特征:</span>
+                <span class="s-val">{{ portrait.characterCharacteristics || '-' }}</span>
+              </div>
+              <div class="supp-item supp-item-2">
+                <span class="s-lbl">工作风格:</span>
+                <span class="s-val">{{ portrait.workingStyle || '-' }}</span>
+              </div>
+              <div :class="i % 2 ? 'supp-item' : 'supp-item supp-item-2'"
+                v-for="(p, i) in (portrait.postNames || '').split('、')" :key="i">
+                <span class="s-lbl">{{ i === 0 ? '业务岗位:' : '' }}</span>
+                <span class="s-val">{{ p }}</span>
+              </div>
+            </div>
+          </Card>
         </div>
+      </div>
       <div v-show="!portrait.personName" class="ep-empty">
         <el-empty description="搜索员工姓名以查看画像" />
       </div>
@@ -300,11 +304,11 @@ const deductTotal = computed(() => {
 
 // 职业资格等级枚举
 const qualificationLevelMap = [
-  { label: '一级', field: 'levelOneTime' },
-  { label: '二级', field: 'levelTwoTime' },
-  { label: '三级', field: 'levelThreeTime' },
+  { label: '五级', field: 'levelFiveTime' },
   { label: '四级', field: 'levelFourTime' },
-  { label: '五级', field: 'levelFiveTime' }
+  { label: '三级', field: 'levelThreeTime' },
+  { label: '二级', field: 'levelTwoTime' },
+  { label: '一级', field: 'levelOneTime' },
 ]
 
 const displayQualificationLevels = computed(() => {
@@ -312,7 +316,7 @@ const displayQualificationLevels = computed(() => {
   if (!currentLevel) return []
   const currentIndex = qualificationLevelMap.findIndex(l => l.label === currentLevel)
   if (currentIndex === -1) return []
-  return qualificationLevelMap.slice(0, currentIndex + 1)
+  return qualificationLevelMap.slice(currentIndex)
 })
 
 
@@ -367,12 +371,12 @@ const invokerEmployeePortrait = (query) => {
   const tagPromise = countTagScore(queryData).then(res => {
     const data = res.data
     if (Array.isArray(data)) {
-   
-   
-      const found = data.find(item => (item.userId == userId) )
-      
+
+
+      const found = data.find(item => (item.userId == userId))
+
       if (found) {
-        
+
         tagScoreData.value = found.totalScore ?? found.score
       } else {
         tagScoreData.value = null
@@ -414,50 +418,50 @@ const radarData = reactive({
 })
 const permutationRadarDataHandler = (result = []) => {
   radarData.grounp = result.map(d => ({ name: d.name + '\n\n' + d.score, max: 100 })),
-  radarData.data = [{
-    name: '个人能力',
-    value: result.map(attr => attr.score),
-    symbolSize: 10,
-    areaStyle: {
-      show: false,
-      opacity: 0,
-     
-      // color: {
-      //   type: 'linear',
-      //   x: 0,
-      //   y: 0,
-      //   x2: 0,
-      //   y2: 1,
-      //   colorStops: [{
-      //     offset: 0, color: '#4DC8FE'
-      //   }, {
-      //     offset: 1, color: '#6C26F3'
-      //   }],
-      //   global: false
+    radarData.data = [{
+      name: '个人能力',
+      value: result.map(attr => attr.score),
+      symbolSize: 10,
+      areaStyle: {
+        show: false,
+        opacity: 0,
+
+        // color: {
+        //   type: 'linear',
+        //   x: 0,
+        //   y: 0,
+        //   x2: 0,
+        //   y2: 1,
+        //   colorStops: [{
+        //     offset: 0, color: '#4DC8FE'
+        //   }, {
+        //     offset: 1, color: '#6C26F3'
+        //   }],
+        //   global: false
+        // },
+      },
+      lineStyle: {
+        color: '#4DC8FE',
+        width: 2
+      },
+      // lineStyle: {
+      //   color: {
+      //     type: 'linear',
+      //     x: 0,
+      //     y: 0,
+      //     x2: 0,
+      //     y2: 1,
+      //     colorStops: [{
+      //       offset: 0, color: '#4DC8FE'
+      //     }, {
+      //       offset: 1, color: '#6C26F3'
+      //     }],
+      //     global: false
+      //   },
+      //   width: 5
       // },
-    },
-    lineStyle: {
-      color: '#4DC8FE',
-      width: 2
-    },
-    // lineStyle: {
-    //   color: {
-    //     type: 'linear',
-    //     x: 0,
-    //     y: 0,
-    //     x2: 0,
-    //     y2: 1,
-    //     colorStops: [{
-    //       offset: 0, color: '#4DC8FE'
-    //     }, {
-    //       offset: 1, color: '#6C26F3'
-    //     }],
-    //     global: false
-    //   },
-    //   width: 5
-    // },
-    itemStyle: { color: '#fff', borderWidth: 1,  borderColor: '#00C8DA', borderJoin: 'round' }
-  }]
+      itemStyle: { color: '#fff', borderWidth: 1, borderColor: '#00C8DA', borderJoin: 'round' }
+    }]
 }
 const setRadarOptions = computed(() => {
   return {
@@ -467,7 +471,7 @@ const setRadarOptions = computed(() => {
       radius: '65%',
       splitNumber: 8,
       axisLine: { lineStyle: { color: '#ccc' } },
-      splitLine: { lineStyle: { color: ['#ccc', '#ccc', '#ccc', '#ccc', '#ccc', '#ccc', '#fe4322', '#8EC742', '#ccc'], width: 3  } },
+      splitLine: { lineStyle: { color: ['#ccc', '#ccc', '#ccc', '#ccc', '#ccc', '#ccc', '#fe4322', '#8EC742', '#ccc'], width: 3 } },
       splitArea: { show: false },
       axisName: {
         color: '#fff',
@@ -547,13 +551,14 @@ onUnmounted(() => {
 
 <style lang="scss" scoped>
 .content {
-  height:  calc(100vh - 90px);
+  height: calc(100vh - 90px);
   display: flex;
   flex-direction: column;
   row-gap: 15px;
   padding: 15px;
   box-sizing: border-box;
   overflow: hidden;
+
   .ep-empty {
     background: #fff;
     height: 100%;
@@ -564,17 +569,21 @@ onUnmounted(() => {
     opacity: 0.8;
     border-radius: 30px;
   }
+
   .content-search {}
+
   .content-info {
-    & > * {
+    &>* {
       height: 100%;
     }
+
     .userInfo {
       display: flex;
       width: 100%;
       height: 180px;
       box-sizing: border-box;
       column-gap: 5px;
+
       .userInfo-name {
         flex: 1;
         position: relative;
@@ -582,16 +591,18 @@ onUnmounted(() => {
         align-items: center;
         justify-content: center;
         column-gap: 30px;
+
         &::after {
           content: '';
           display: block;
           width: 1px;
-          background:linear-gradient(180deg, transparent, #6f6c98, transparent);
+          background: linear-gradient(180deg, transparent, #6f6c98, transparent);
           height: 100%;
           position: absolute;
           top: 0;
           right: -2px;
         }
+
         .avatar-area {
           height: 140px;
           width: 140px;
@@ -600,6 +611,7 @@ onUnmounted(() => {
           display: flex;
           align-items: center;
           justify-content: center;
+
           .avatar {
             width: 100%;
             height: 100%;
@@ -611,22 +623,26 @@ onUnmounted(() => {
             font-weight: 900;
           }
         }
+
         .basic-name {
           display: flex;
           flex-direction: column;
           justify-content: center;
           row-gap: 10px;
           font-weight: 500;
+
           .basic-label {
             font-size: 18px;
             color: #8675AE;
           }
+
           .basic-value {
             font-size: 26px;
             color: #fff;
           }
         }
       }
+
       .userInfo-info {
         flex: 1;
         position: relative;
@@ -636,28 +652,33 @@ onUnmounted(() => {
         padding: 10px 15px;
         padding-right: 0px;
         box-sizing: border-box;
+
         &::after {
           content: '';
           display: block;
           width: 1px;
-          background:linear-gradient(180deg, transparent, #6f6c98, transparent);
+          background: linear-gradient(180deg, transparent, #6f6c98, transparent);
           height: 100%;
           position: absolute;
           top: 0;
           right: -2px;
         }
+
         .info-item {
           display: flex;
           column-gap: 15px;
+
           .info-item-content {
             display: flex;
             flex-direction: column;
             justify-content: space-between;
             font-weight: 500;
+
             .info-item-label {
               font-size: 18px;
               color: #8675AE;
             }
+
             .info-item-value {
               font-size: 18px;
               color: #fff;
@@ -666,6 +687,7 @@ onUnmounted(() => {
               flex-wrap: wrap;
               gap: 2px;
             }
+
             .info-item-tag {
               font-size: 14px;
               display: block;
@@ -676,6 +698,7 @@ onUnmounted(() => {
           }
         }
       }
+
       .userInfo-score {
         :deep(.el-progress-circle) {
           width: 160px;
@@ -683,11 +706,13 @@ onUnmounted(() => {
           --el-fill-color-light: #004970;
           transform: rotate(0.5turn);
         }
+
         flex: 1;
         display: flex;
         align-items: center;
         padding-left: 15px;
         column-gap: 25px;
+
         .score-progress {
           .percentage-content {
             display: flex;
@@ -695,26 +720,31 @@ onUnmounted(() => {
             align-items: center;
             row-gap: 6px;
             font-weight: 500;
+
             .percentage-value {
               font-size: 48px;
               color: #02E5CC;
             }
+
             .percentage-text {
               font-size: 16px;
               color: #fff;
             }
           }
         }
+
         .score-box {
           display: flex;
           flex-direction: column;
           font-weight: 500;
           row-gap: 15px;
           font-size: 18px;
+
           .score-col {
             display: inline-block;
             width: 5em;
           }
+
           .score-col-2 {
             font-size: 24px;
           }
@@ -722,24 +752,30 @@ onUnmounted(() => {
       }
     }
   }
+
   .content-bottom {
     flex: 1;
     display: flex;
     column-gap: 15px;
     overflow: hidden;
+
     .content-bottom-left {
       width: 380px;
       display: flex;
       flex-direction: column;
       row-gap: 15px;
-      & > *:nth-child(1) {
+
+      &>*:nth-child(1) {
         height: 160px;
+
         .work-history {
           font-size: 18px;
         }
       }
-      & > *:nth-child(2) {
+
+      &>*:nth-child(2) {
         flex: 1.6;
+
         .honor-item {
           height: 48px;
           padding-right: 15px;
@@ -750,12 +786,14 @@ onUnmounted(() => {
           align-items: center;
           justify-content: space-between;
           position: relative;
-          & > div:nth-child(1) {
+
+          &>div:nth-child(1) {
             display: flex;
             align-items: center;
             column-gap: 15px;
             margin-left: 10px;
-            & > div {
+
+            &>div {
               width: 26px;
               height: 20px;
               position: relative;
@@ -763,6 +801,7 @@ onUnmounted(() => {
               text-align: center;
               line-height: 20px;
               color: #222;
+
               &::before {
                 position: absolute;
                 inset: 0;
@@ -773,6 +812,7 @@ onUnmounted(() => {
                 height: 100%;
                 transform: skew(-25deg);
               }
+
               &::after {
                 position: absolute;
                 inset: 0;
@@ -784,9 +824,11 @@ onUnmounted(() => {
               }
             }
           }
-          & > div:nth-child(2) {
+
+          &>div:nth-child(2) {
             color: #02E5CC;
           }
+
           &::after {
             content: '';
             display: block;
@@ -795,16 +837,19 @@ onUnmounted(() => {
             left: 0;
             height: 1px;
             width: 100%;
-            background:linear-gradient(45deg, transparent 0%, transparent 30%, #6f6c98 100%);
+            background: linear-gradient(45deg, transparent 0%, transparent 30%, #6f6c98 100%);
           }
         }
       }
     }
+
     .content-bottom-center {
       flex: 1;
-      & > * {
+
+      &>* {
         height: 100%;
       }
+
       .chart-legend {
         display: flex;
         justify-content: center;
@@ -815,10 +860,12 @@ onUnmounted(() => {
         color: #fff;
         font-size: 14px;
       }
+
       .legend-item {
         display: flex;
         align-items: center;
         gap: 6px;
+
         span {
           width: 24px;
           height: 10px;
@@ -826,41 +873,53 @@ onUnmounted(() => {
           border-radius: 2px;
         }
       }
+
       .legend-warning {
         color: #fe4322;
-        span { 
+
+        span {
           background-color: #fe4322;
         }
       }
+
       .legend-normal {
         color: #fff;
-        span { 
+
+        span {
           background-color: #fff;
         }
       }
+
       .legend-excellent {
         color: #8EC742;
-        span { 
+
+        span {
           background-color: #8EC742;
         }
       }
+
       .legend-current {
         color: #1890ff;
-        span { 
+
+        span {
           background-color: #1890ff;
         }
       }
+
       .chart-box {
         width: 100%;
         height: calc(100% - 34px);
         overflow: hidden;
       }
     }
+
     .content-bottom-right {
       width: 380px;
-      & > * {
+
+      &>* {
         height: 100%;
       }
+
       .supp-item {
         display: flex;
         justify-content: space-between;
@@ -869,24 +928,30 @@ onUnmounted(() => {
         padding: 0 15px;
         font-weight: 500;
         font-size: 18px;
+
         .s-lbl {
           color: #8675AE;
         }
+
         .s-val {
           color: #fff;
         }
       }
+
       .supp-item-2 {
         background: #261C48;
       }
     }
+
     .card-content {
       height: 100%;
       overflow-x: hidden;
       overflow-y: auto;
+
       &::-webkit-scrollbar-track {
         background: transparent;
       }
+
       &::-webkit-scrollbar-thumb {
         background: linear-gradient(225deg, #4355cb, #873dc3);
         border-radius: 4px;
@@ -903,6 +968,7 @@ onUnmounted(() => {
   pointer-events: none;
   transform: translateY(-80%);
   display: none;
+
   .p-empty {
     text-align: center;
     margin-top: 5px;
@@ -926,9 +992,11 @@ onUnmounted(() => {
     align-items: center;
     justify-content: space-between;
     color: #fff;
+
     .deduct-text {
       color: #ff4d4f;
     }
+
     .add-text {
       color: #00b42a;
     }
@@ -941,9 +1009,11 @@ onUnmounted(() => {
     justify-content: space-between;
     font-weight: 500;
     font-size: 16px;
+
     &.deduct {
       color: #ff4d4f;
     }
+
     &.add {
       color: #00b42a;
     }

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

@@ -139,7 +139,7 @@ const fetchData = (params) => {
 
 watch(() => props.queryParams, (newParams) => {
   fetchData(newParams)
-}, { deep: true })
+}, { deep: true, immediate: true })
 
 
 </script>

src/views/warningPage/index.vue

@@ -28,18 +28,10 @@
                     <el-date-picker v-model="endDate" type="date" placeholder="结束日期" style="width: 150px;" />
 
                 </div>
-                <el-tree-select
-                    v-model="selectedOrg"
-                    :data="cascadeOptions"
-                    :props="{ label: 'label', value: 'value', children: 'children' }"
-                    node-key="value"
-                    placeholder="组织架构/员工"
-                    clearable
-                    filterable
-                    check-strictly
-                    style="width: 480px;"
-                    @change="fetchWarningData"
-                />
+                <el-tree-select v-model="selectedOrg" :data="cascadeOptions"
+                    :props="{ label: 'label', value: 'value', children: 'children' }" node-key="value"
+                    placeholder="组织架构/员工" clearable filterable check-strictly style="width: 480px;"
+                    @change="fetchWarningData" />
             </div>
             <div class="filter-group">
                 <el-select v-model="selectedAlertLevel" placeholder="预警等级" clearable style="width: 250px;">
@@ -86,7 +78,8 @@
                         <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-if="row.overallScore >= 90" class="score-excellent">{{ row.overallScore }}
+                                    分</span>
                                 <span v-else style="font-weight:600;">{{ row.overallScore }} 分</span>
                             </template>
                         </el-table-column>
@@ -104,8 +97,7 @@
                         <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>
+                                <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>
@@ -113,17 +105,10 @@
                             </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;"
-                    />
+                    <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分) 共计
@@ -195,8 +180,8 @@ const coreRisksOrOutstandingAchievementsList = [
 
 const employeesData = ref([])
 const queryParams = reactive({
-  pageNum: 1,
-  pageSize: 10
+    pageNum: 1,
+    pageSize: 10
 })
 
 for (let i = 0; i < newNames.length; i++) {
@@ -213,25 +198,23 @@ for (let i = 0; i < newNames.length; i++) {
 const transformCascadeData = (nodes) => {
     if (!nodes) return []
     return nodes.map(node => {
-        const label = node.nickName || node.deptName || node.name || node.label
         const deptType = node.deptType || node.nodeType
-    //    console.log(node,"node")
-    //     let value
-    //     if (deptType === 'BRIGADE') {
-    //         value = String(node.deptId)
-    //     } else if (deptType === 'MANAGER') {
-    //         value = String(node.teamId)
-    //     } else if (deptType === 'TEAMS') {
-    //         value = String(node.groupId)
-    //     } else {
-    //         value = String(node.userId ?? node.id ?? node.deptId ?? '')
-    //     }
+        const label = deptType === 'user'
+            ? (node.nickName || node.label)
+            : (node.deptName || node.name || node.label)
+
+        let value;
+        if (deptType === 'STATION') value = `station_${node.id}`;
+        else if (deptType === 'BRIGADE') value = `dept_${node.id}`
+        else if (deptType === 'MANAGER') value = `team_${node.id}`
+        else if (deptType === 'TEAMS') value = `group_${node.id}`
+        else value = `user_${node.id}`
 
         const children = node.children && node.children.length > 0 ? transformCascadeData(node.children) : undefined
 
         return {
             label,
-            value:node.id,
+            value,
             deptType,
             children
         }
@@ -382,10 +365,12 @@ const fetchWarningData = async () => {
 
     const selectedInfo = getSelectedInfo(selectedOrg.value)
     if (selectedInfo) {
-        if (selectedInfo.deptType === 'BRIGADE') params.deptId = selectedInfo.value
-        else if (selectedInfo.deptType === 'MANAGER') params.teamId = selectedInfo.value
-        else if (selectedInfo.deptType === 'TEAMS') params.groupId = selectedInfo.value
-        else if (selectedInfo.deptType === 'user') params.userId = selectedInfo.value
+        const rawId = Number(selectedInfo.value.split('_')[1])
+
+        if (selectedInfo.deptType === 'BRIGADE') params.deptId = rawId
+        else if (selectedInfo.deptType === 'MANAGER') params.teamId = rawId
+        else if (selectedInfo.deptType === 'TEAMS') params.groupId = rawId
+        else if (selectedInfo.deptType === 'user') params.userId = rawId
     }
 
     try {
@@ -417,6 +402,7 @@ onMounted(async () => {
         const res = await getDeptUserTree()
         if (res.data) {
             cascadeOptions.value = transformCascadeData(res.data)
+            console.log(cascadeOptions.value, "cascadeOptions")
         }
     } catch (error) {
         console.error('获取组织架构数据失败:', error)
@@ -448,7 +434,7 @@ watch(selectedAlertLevel, () => {
 watch(() => route.query, (query) => {
     const { id } = query
     if (id) {
-        selectedOrg.value =Number(id)
+        selectedOrg.value = `user_${id}`
     } else {
         selectedOrg.value = ''
     }