From 2d152c5e2d734d40d41ee93295f166ce9bfd7516 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Czhuzihan=E2=80=9D=E2=80=83?=
 <“772644120@qq.com”>
Date: Thu, 3 Jul 2025 15:10:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=99=E5=B8=88=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Dashboard.vue          |   17 +-
 src/components/LabDrawerDetail.vue    |    1 -
 src/components/TalentDetail.vue       |  120 ++-
 src/components/TalentDrawerDetail.vue | 1003 +++++--------------------
 src/components/common.css             |    4 +-
 5 files changed, 247 insertions(+), 898 deletions(-)

diff --git a/src/components/Dashboard.vue b/src/components/Dashboard.vue
index 4658aa7..5aacbbb 100644
--- a/src/components/Dashboard.vue
+++ b/src/components/Dashboard.vue
@@ -1048,19 +1048,19 @@ watch(dashboardData, () => {
     const keyProjectsEl = document.querySelector('.stat-card:nth-child(4) .stat-value');
   
     if (paperCountEl) {
-      paperCountEl.innerHTML = `<span class="stat-prefix">累计</span>${dashboardData.value.paperCount || 0}`;
+      paperCountEl.innerHTML = `<span class="stat-prefix" style="font-size: 12px;">累计</span>${dashboardData.value.paperCount || 0}`;
     }
   
     if (patentCountEl) {
-      patentCountEl.innerHTML = `<span class="stat-prefix">本年</span>${dashboardData.value.patentCount || 0}`;
+      patentCountEl.innerHTML = `<span class="stat-prefix" style="font-size: 12px;">本年</span>${dashboardData.value.patentCount || 0}`;
     }
   
     if (highImpactPapersEl) {
-      highImpactPapersEl.innerHTML = `<span class="stat-prefix">累计</span>${dashboardData.value.highImpactPapers || 0}`;
+      highImpactPapersEl.innerHTML = `<span class="stat-prefix" style="font-size: 12px;">累计</span>${dashboardData.value.highImpactPapers || 0}`;
     }
   
     if (keyProjectsEl) {
-      keyProjectsEl.innerHTML = `<span class="stat-prefix">国家重点</span>${dashboardData.value.keyProjects || 0}<span>项</span>`;
+      keyProjectsEl.innerHTML = `<span class="stat-prefix" style="font-size: 12px;">国家重点</span>${dashboardData.value.keyProjects || 0}<span>项</span>`;
     }
   
     // 更新研究经费
@@ -1131,7 +1131,6 @@ onUnmounted(() => {
 <style scoped>
 /* 特定于Dashboard的样式 */
 .dashboard {
-  background-color: #102048;
   color: white;
 }
 
@@ -1180,7 +1179,7 @@ onUnmounted(() => {
 .chart-container {
   width: 100%;
   height: 100%;
-  min-height: 150px;
+  min-height: 160px;
 }
 
 .year-selector {
@@ -1213,8 +1212,9 @@ onUnmounted(() => {
 
 .stat-card h3 {
   margin: 0 0 10px 0;
-  font-size: 14px;
+  font-size: 12px;
   font-weight: normal;
+  white-space: nowrap;
 }
 
 .stat-value {
@@ -1226,9 +1226,10 @@ onUnmounted(() => {
   align-items: baseline;
 }
 
-.stat-prefix {
+.stat-value .stat-prefix {
   font-size: 12px !important;
   margin-right: 5px;
+  white-space: nowrap;
 }
 
 /* 学术产出布局 */
diff --git a/src/components/LabDrawerDetail.vue b/src/components/LabDrawerDetail.vue
index bb362cc..38a478b 100644
--- a/src/components/LabDrawerDetail.vue
+++ b/src/components/LabDrawerDetail.vue
@@ -12,7 +12,6 @@
           <div class="basic-info">
             <div class="form-row">
               <div class="form-item">
-                {{console.log(labData)}}
                 <span class="label">编号:</span>
                 <span class="display-text">{{ labData.basicInformation.name0 }}</span>
               </div>
diff --git a/src/components/TalentDetail.vue b/src/components/TalentDetail.vue
index d18da06..7ef5dfb 100644
--- a/src/components/TalentDetail.vue
+++ b/src/components/TalentDetail.vue
@@ -50,7 +50,7 @@
             </h1>
           </div>
           <div class="search-box">
-            <input type="text" placeholder="请输入教师姓名或ID" v-model="searchQuery" @input="handleSearch" />
+            <input type="text" placeholder="请输入教师姓名" v-model="searchQuery" @input="handleSearch" />
             <button class="search-button">
               <svg class="search-icon" viewBox="0 0 24 24" width="20" height="20">
                 <path fill="white"
@@ -71,28 +71,32 @@
             <div class="card-top">
               <div class="teacher-left">
                 <div class="teacher-photo">
-                  <img :src="teacher.photo" alt="教师照片" />
+                  <img :src="teacher.basicInformation.name7" alt="教师照片" />
                 </div>
-                <div class="teacher-id">ID: {{ teacher.idcode || teacher.id }}</div>
+                <!-- <div class="teacher-id">姓名：{{ teacher.basicInformation.name0 }}</div> -->
               </div>
 
               <div class="teacher-info">
                 <div class="info-row">
                   <span class="info-label">姓名:</span>
-                  <span class="info-value">{{ teacher.name }}</span>
+                  <span class="info-value">{{ teacher.basicInformation.name0 }}</span>
                 </div>
                 <div class="info-row">
-                  <span class="info-label">教育背景:</span>
+                  <span class="info-label">职称 / 职务:</span>
+                  <span class="info-value">{{ teacher.basicInformation.name2 }} / {{ teacher.basicInformation.name3 }}</span>
+                </div>
+                <div class="info-row">
+                  <span class="info-label">所属院校:</span>
 
-                  <span class="info-value">{{ teacher.education }}</span>
+                  <span class="info-value">{{ teacher.basicInformation.name4 }}</span>
                 </div>
                 <div class="info-row">
-                  <span class="info-label">论文:</span>
-                  <span class="info-value">{{ teacher.papers }}</span>
+                  <span class="info-label">最高学历:</span>
+                  <span class="info-value">{{ teacher.basicInformation.name5 }}</span>
                 </div>
                 <div class="info-row">
-                  <span class="info-label">项目:</span>
-                  <span class="info-value">{{ teacher.projects }}</span>
+                  <span class="info-label">学科方向:</span>
+                  <span class="info-value">{{ teacher.basicInformation.name6 }}</span>
                 </div>
               </div>
             </div>
@@ -106,30 +110,9 @@
     </div>
   </div>
 
-  <!-- 自定义维度对话框 -->
-  <el-dialog v-model="dimensionDialogVisible" :title="isEditingDimension ? '编辑维度' : '添加维度'" width="30%"
-    custom-class="dimension-dialog">
-    <el-form :model="dimensionForm" :rules="dimensionRules" ref="dimensionFormRef" label-position="top">
-      <el-form-item label="维度名称" prop="name">
-        <el-input v-model="dimensionForm.name" placeholder="请输入维度名称" />
-      </el-form-item>
-      <el-form-item label="权重(W)" prop="weight">
-        <el-input-number v-model="dimensionForm.weight" :min="1" :max="100" :step="1" />
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="dimensionDialogVisible = false">取消</el-button>
-        <el-button type="danger" v-if="isEditingDimension" @click="deleteDimension">删除</el-button>
-        <el-button type="primary" @click="saveDimension">确定</el-button>
-      </span>
-    </template>
-  </el-dialog>
-
   <TalentDrawerDetail v-model:visible="drawerVisible" :is-edit="isEditMode" :dimensions="dimensions"
     :teacher-data="selectedTeacher" @save="handleSaveEvaluation" />
-  <DimensionDrawer v-model:visible="dimensionDrawerVisible" :dimensions="dimensions" category="talent"
-    @save="handleSaveDimensions" />
+
 </template>
 
 <script setup>
@@ -137,7 +120,6 @@ import { ref, onMounted, watch, nextTick } from 'vue';
 import * as echarts from 'echarts/core';
 import { RadarChart } from 'echarts/charts';
 // 引入新组件
-import DimensionDrawer from './DimensionDrawer.vue';
 import TalentDrawerDetail from './TalentDrawerDetail.vue';
 import {
   TitleComponent,
@@ -226,29 +208,17 @@ const dimensions = ref([]);  // 改为空数组，从API获取数据
 
 // 在组件挂载时获取维度数据
 onMounted(async () => {
-  try {
-    // 获取教师评估维度数据
-    const response = await axios.get(`${getApiBaseUrl()}/admin-api/pg/J-dimensions/talent`);
-    dimensions.value = response.data.data;
-    // 加载教师数据
-    await loadTeachers();
-    // 初始化雷达图
-    handleSearch();
-  } catch (error) {
-    console.error('获取维度数据失败:', error);
-    ElMessage.error('获取维度数据失败');
-  }
+  await teacherLabs();
 });
 
 // 加载教师数据
-const loadTeachers = async () => {
+const teacherLabs = async () => {
   try {
-    const response = await axios.get(`${getApiBaseUrl()}/admin-api/pg/J-talents/talents`);
+    const response = await axios.get(`${getApiBaseUrl()}/admin-api/pg/teacher-evaluation-results/get-release`);
     teachers.value = response.data.data;
     handleSearch();
   } catch (error) {
-    console.error('获取教师数据失败:', error);
-    ElMessage.error('获取教师数据失败');
+    ElMessage.error('获取工程研究中心数据失败');
   }
 };
 
@@ -257,8 +227,7 @@ const dimensionDialogVisible = ref(false);
 const isEditingDimension = ref(false);
 const currentDimensionIndex = ref(-1);
 const dimensionForm = ref({
-  name: '',
-  weight: 10
+  name: ''
 });
 const dimensionFormRef = ref(null);
 const dimensionRules = {
@@ -331,8 +300,7 @@ const handleSearch = () => {
     filteredTeachers.value = teachers.value;
   } else {
     filteredTeachers.value = teachers.value.filter(teacher =>
-      teacher.name.includes(searchQuery.value) ||
-      teacher.id.includes(searchQuery.value)
+      teacher.basicInformation.name0.includes(searchQuery.value)
     );
   }
 };
@@ -348,28 +316,10 @@ const initRadarCharts = () => {
     const chart = echarts.init(chartDom);
 
     // 生成雷达图所需的指标
-    const indicators = dimensions.value.map(dim => ({
-      name: dim.name,
-      max: 100
+    const indicators = teacher.dimension.map(dim => ({
+      name: dim
     }));
 
-    // 为每个教师生成一个基准值，用于增加各教师数据的差异性
-    const baseValue = teacher.id ? parseInt(teacher.id.slice(-2)) : Math.floor(Math.random() * 30);
-
-    // 确保评估数据的长度与维度数量匹配
-    let evaluationData = teacher.evaluationData || [];
-    if (evaluationData.length !== dimensions.value.length) {
-      // 生成更加随机和独特的评估数据
-      evaluationData = dimensions.value.map((_, dimIndex) => {
-        // 使用教师ID、维度索引和基准值来生成差异更大的随机数
-        const offset = (dimIndex * 7 + baseValue) % 35;
-        // 生成20-95之间的随机数，不同教师、不同维度有不同的随机范围
-        return Math.min(95, Math.max(20, Math.floor(Math.random() * 40) + 30 + offset));
-      });
-      // 更新教师的评估数据
-      teacher.evaluationData = evaluationData;
-    }
-
     chart.setOption({
       radar: {
         indicator: indicators,
@@ -377,18 +327,31 @@ const initRadarCharts = () => {
         axisLine: { lineStyle: { color: 'rgba(255, 255, 255, 0.2)' } },
         splitLine: { lineStyle: { color: 'rgba(255, 255, 255, 0.2)' } },
         name: { textStyle: { color: '#fff', fontSize: 10 } },
-        radius: '70%'
+        radius: '50%'
       },
       series: [
         {
           type: 'radar',
           data: [
             {
-              value: evaluationData,
+              value: teacher.result,
               name: '评估结果',
               areaStyle: { opacity: 0 }, // 移除半透明的底色
               lineStyle: { color: 'rgb(63, 196, 15)', width: 2 }, // 设置线段颜色为RGB(63, 196, 15)
-              itemStyle: { color: 'rgb(63, 196, 15)' } // 设置点的颜色
+              itemStyle: { color: 'rgb(63, 196, 15)' }, // 设置点的颜色
+              label: {
+                 show: true, // 显示标签
+                 position: 'top', // 标签位置
+                 color: '#fff', // 标签颜色
+                 fontSize: 10 // 标签字体大小
+              },
+              emphasis: {
+                label: {
+                  show: true, // 鼠标悬停时也显示标签
+                  fontSize: 12, // 鼠标悬停时字体变大
+                  fontWeight: 'bold' // 鼠标悬停时字体加粗
+                }
+              }
             }
           ]
         }
@@ -432,6 +395,9 @@ const openTeacherDetail = (teacher) => {
 </style>
 
 <style scoped>
+.teacher-info span{
+  font-size: 14px;
+}
 .evaluation-page {
   position: absolute;
   top: 0;
@@ -692,7 +658,7 @@ const openTeacherDetail = (teacher) => {
 /* 教师卡片网格 */
 .teacher-card-grid {
   display: grid;
-  grid-template-columns: repeat(auto-fill, minmax(280px, 1fr));
+  grid-template-columns: repeat(auto-fill, minmax(320px, 1fr));
   gap: 20px;
   overflow-y: auto;
   /* 允许卡片区域滚动 */
diff --git a/src/components/TalentDrawerDetail.vue b/src/components/TalentDrawerDetail.vue
index 3e96c46..8da8306 100644
--- a/src/components/TalentDrawerDetail.vue
+++ b/src/components/TalentDrawerDetail.vue
@@ -1,277 +1,121 @@
 <template>
   <el-drawer
       v-model="drawerVisible"
-      :title="drawerTitle"
+      title=""
       direction="rtl"
       size="900px"
       :before-close="handleClose"
       custom-class="talent-drawer"
   >
     <div class="drawer-content">
-      <!-- 标签导航 -->
-      <div class="tab-navigation">
-        <div
-            v-for="(tab, index) in tabs"
-            :key="index"
-            :class="['tab-item', { active: activeTab === tab.value }]"
-            @click="activeTab = tab.value"
-        >
-          {{ tab.label }}
-        </div>
-      </div>
-
-      <!-- URL输入标签页 -->
-      <div v-if="activeTab === 'url'" class="tab-content">
-        <div class="url-input-container">
-          <el-input
-              v-model="urlInput"
-              placeholder="请输入URL"
-              class="url-input"
-          />
-          <el-button
-              type="primary"
-              @click="fetchDataFromUrl"
-              class="send-button primary-btn"
-          >
-            发送
-          </el-button>
-        </div>
-      </div>
-
-      <!-- 上传文档标签页 -->
-      <div v-else-if="activeTab === 'upload'" class="tab-content">
-        <el-upload
-            class="upload-container"
-            action="#"
-            :auto-upload="false"
-            :on-change="handleFileChange"
-        >
-          <el-button type="primary" class="primary-btn" style="display: inline-block;">选择文件</el-button>
-          <div class="el-upload__tip" style="display: inline-block;margin-left: 30px;">请上传文档，支持PDF、DOC、DOCX格式</div>
-        </el-upload>
-      </div>
-
-      <!-- 手动输入标签页 -->
-      <div v-else class="tab-content">
-        <div class="manual-input-tip">请手动填写以下信息</div>
-      </div>
       <!-- 个人信息表单 - 仅在数据加载后显示 -->
-      <div v-if="formData.name || activeTab == 'manual'" class="personal-info-form">
+      <div v-if="teacherData && teacherData.basicInformation" class="personal-info-form">
         <div class="form-header">
           <div class="photo-section">
             <div class="teacher-photo">
-              <img :src="formData.photo || defaultPhoto" alt="教师照片" />
+              <!-- 使用 teacherData.basicInformation.name7 作为图片源 -->
+              <img :src="teacherData.basicInformation.name7" alt="教师照片" />
             </div>
           </div>
 
           <div class="basic-info">
             <div class="form-row">
-              <div class="form-item">
-                <span class="label">编号:</span>
-                <el-input v-model="formData.idcode" placeholder="请输入编号" />
-              </div>
               <div class="form-item">
                 <span class="label">姓名:</span>
-                <el-input v-model="formData.name" placeholder="请输入姓名" />
+                <span class="display-text">{{ teacherData.basicInformation.name0 }}</span>
               </div>
               <div class="form-item">
                 <span class="label">性别:</span>
-                <el-input v-model="formData.gender" placeholder="请输入性别" />
+                <span class="display-text">{{ teacherData.basicInformation.name1 }}</span>
               </div>
             </div>
 
             <div class="form-row">
-              <div class="form-item">
-                <span class="label">出生年月:</span>
-                <el-input v-model="formData.birthDate" placeholder="出生年月" />
-              </div>
               <div class="form-item">
                 <span class="label">职称:</span>
-                <el-input v-model="formData.title" placeholder="请输入职称" />
+                <span class="display-text">{{ teacherData.basicInformation.name2 }}</span>
               </div>
               <div class="form-item">
                 <span class="label">职务:</span>
-                <el-input v-model="formData.position" placeholder="请输入职务" />
+                <span class="display-text">{{ teacherData.basicInformation.name3 }}</span>
+              </div>
+              <div class="form-item">
+                <span class="label">所属院校:</span>
+                <span class="display-text">{{ teacherData.basicInformation.name4 }}</span>
               </div>
-            </div>
-
-            <div class="form-row">
               <div class="form-item">
                 <span class="label">最高学历:</span>
-                <el-input v-model="formData.education" placeholder="请输入最高学历" />
-              </div>
-              <div class="form-item">
-                <span class="label">教育背景:</span>
-                <el-input v-model="formData.educationBackground" placeholder="请输入教育背景" />
-              </div>
-            </div>
-
-            <div class="form-row">
-              <div class="form-item">
-                <span class="label">通讯地址:</span>
-                <el-input v-model="formData.address" placeholder="请输入通讯地址" />
+                <span class="display-text">{{ teacherData.basicInformation.name5 }}</span>
               </div>
               <div class="form-item">
                 <span class="label">学科方向:</span>
-                <el-input v-model="formData.academicDirection" placeholder="请输入学科方向" />
-              </div>
-            </div>
-
-            <div class="form-row">
-              <div class="form-item">
-                <span class="label">人才计划:</span>
-                <el-input v-model="formData.talentPlan" placeholder="请输入人才计划" />
-              </div>
-              <div class="form-item">
-                <span class="label">办公地点:</span>
-                <el-input v-model="formData.officeLocation" placeholder="请输入办公地点" />
-              </div>
-            </div>
-
-            <div class="form-row">
-              <div class="form-item">
-                <span class="label">电子邮箱:</span>
-                <el-input v-model="formData.email" placeholder="请输入电子邮箱" />
-              </div>
-              <div class="form-item">
-                <span class="label">联系方式:</span>
-                <el-input v-model="formData.phone" placeholder="请输入联系方式" />
-              </div>
-              <div class="form-item">
-                <span class="label">导师类型:</span>
-                <el-input v-model="formData.tutorType" placeholder="请输入导师类型" />
-              </div>
-            </div>
-
-            <div class="form-row">
-              <div class="form-item">
-                <span class="label">论文:</span>
-                <el-input v-model="formData.papers" placeholder="请输入论文数量" />
-              </div>
-              <div class="form-item">
-                <span class="label">项目:</span>
-                <el-input v-model="formData.projects" placeholder="请输入项目数量" />
+                <span class="display-text">{{ teacherData.basicInformation.name6 }}</span>
               </div>
             </div>
           </div>
         </div>
 
-        <!-- 详细信息部分 -->
+        <!-- 详细信息 - 工程研究中心年度信息 - 合并成一个card -->
         <div class="detail-sections">
-          <h3 class="section-title">教育与工作经历</h3>
-          <div class="section-content">
-            <el-input
-                type="textarea"
-                v-model="formData.eduWorkHistory"
-                :rows="4"
-                placeholder="请输入教育与工作经历"
-            />
-          </div>
-
-          <h3 class="section-title">研究方向</h3>
-          <div class="section-content">
-            <el-input
-                type="textarea"
-                v-model="formData.researchDirection"
-                :rows="4"
-                placeholder="请输入研究方向"
-            />
-          </div>
-
-          <h3 class="section-title">近五年承担的科研项目</h3>
-          <div class="section-content">
-            <el-input
-                type="textarea"
-                v-model="formData.recentProjects"
-                :rows="4"
-                placeholder="请输入近五年承担的科研项目"
-            />
-          </div>
-
-          <h3 class="section-title">代表性学术论文</h3>
-          <div class="section-content">
-            <el-input
-                type="textarea"
-                v-model="formData.representativePapers"
-                :rows="4"
-                placeholder="请输入代表性学术论文"
-            />
-          </div>
-
-          <h3 class="section-title">授权国家发明专利及出版专著</h3>
-          <div class="section-content">
-            <el-input
-                type="textarea"
-                v-model="formData.patents"
-                :rows="4"
-                placeholder="请输入授权国家发明专利及出版专著"
-            />
+          <h3 class="section-title">详细信息</h3>
+          <div class="year-content">
+            <div class="display-form">
+              <!-- 工程研究中心概况 -->
+              <div class="form-section">
+                <div class="display-textarea">
+                  <!-- 遍历 teacherData.resultList -->
+                  <div v-for="(categoryItem, index) in teacherData.resultList" :key="index" class="category-section">
+                    <h4 class="category-title">
+                      {{ categoryItem.category }} (总分: {{ calculateCategoryTotal(categoryItem.result) }})
+                    </h4>
+                    <div class="category-content">
+                      <div v-for="(item, itemIndex) in categoryItem.result" :key="itemIndex" class="category-item">
+                        <span class="item-label">{{ item.label }}:</span>
+                        <!-- 使用 teacherData.assessmentScore[item.prop] 来显示分数，如果不存在则显示 '0' -->
+                        <span class="item-score">{{ teacherData.assessmentScore[item.prop] || '0' }}</span>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+                <!-- 总分显示 -->
+                <div class="overall-score-section">
+                  <span class="overall-score-label">总分:</span>
+                  <span class="overall-score-value">{{ overallTotalScore }}</span>
+                </div>
+              </div>
+            </div>
           </div>
         </div>
-
-        <!-- 雷达图 -->
-        <div class="evaluation-chart-section">
-          <div id="evaluation-radar-chart" class="radar-chart"></div>
-        </div>
+      </div>
+      <!-- 如果 teacherData 未加载，可以显示一个加载提示或者空状态 -->
+      <div v-else class="loading-placeholder">
+        正在加载人才数据...
       </div>
     </div>
 
     <template #footer>
       <div class="drawer-footer">
-        <button class="drawer-btn cancel-btn" @click="handleClose">取消</button>
-        <button v-if="props.isEdit" class="drawer-btn delete-btn" @click="handleDelete">删除</button>
-        <button class="drawer-btn confirm-btn" @click="handleSave">确定</button>
-<!--         <button class="drawer-btn confirm-btn" >确定</button>-->
+        <button class="drawer-btn cancel-btn" @click="handleClose">关闭</button>
       </div>
     </template>
   </el-drawer>
 </template>
 
 <script setup>
-import { ref, reactive, computed, onMounted, watch, nextTick } from 'vue';
-import * as echarts from 'echarts/core';
-import { RadarChart } from 'echarts/charts';
-import {
-  TitleComponent,
-  TooltipComponent,
-  GridComponent,
-  LegendComponent
-} from 'echarts/components';
-import { CanvasRenderer } from 'echarts/renderers';
-import { ElMessage, ElLoading, ElMessageBox } from 'element-plus';
-import { getApiBaseUrl } from '../config';
-import axios from 'axios';
-
-// 注册必要的echarts组件
-echarts.use([
-  RadarChart,
-  TitleComponent,
-  TooltipComponent,
-  GridComponent,
-  LegendComponent,
-  CanvasRenderer
-]);
+import { ref, computed } from 'vue';
 
 const props = defineProps({
   visible: {
     type: Boolean,
     default: false
   },
-  isEdit: {
-    type: Boolean,
-    default: false
-  },
-  dimensions: {
-    type: Array,
-    default: () => []
-  },
   teacherData: {
     type: Object,
     default: () => ({})
-  }
+  },
 });
 
-const emit = defineEmits(['update:visible', 'save']);
+const emit = defineEmits(['update:visible']);
 
 // 用于visible属性的双向绑定
 const drawerVisible = computed({
@@ -279,471 +123,45 @@ const drawerVisible = computed({
   set: (val) => emit('update:visible', val)
 });
 
-// 默认照片占位符
-const defaultPhoto = `/image/人1.png`;
-
-// 抽屉标题的计算属性
-const drawerTitle = computed(() => props.isEdit ? '详情' : '新增评估');
-
-// 标签页配置
-const tabs = [
-  { label: 'URL输入', value: 'url' },
-  { label: '上传文档', value: 'upload' },
-  { label: '手动录入', value: 'manual' }
-];
-
-// 激活的标签页
-const activeTab = ref('url');
-
-// URL输入
-const urlInput = ref('');
-
-// 数据是否已加载标志
-const dataLoaded = ref(false);
-
-// 选择的上传文件
-const selectedFile = ref(null);
-
-// 表单数据
-const formData = reactive({
-  id: '',
-  idcode: '',
-  name: '',
-  gender: '',
-  birthDate: '',
-  title: '',
-  position: '',
-  education: '',
-  educationBackground: '',
-  address: '',
-  academicDirection: '',
-  talentPlan: '',
-  officeLocation: '',
-  email: '',
-  phone: '',
-  tutorType: '',
-  papers: '',
-  projects: '',
-  photo: '',
-  eduWorkHistory: '',
-  researchDirection: '',
-  recentProjects: '',
-  representativePapers: '',
-  patents: '',
-  evaluationData: [60, 60, 60, 60, 60, 60]  // 默认评估数据
-});
-
-// 雷达图实例
-let chart = null;
-
-// 从props初始化表单数据
-watch(() => props.teacherData, (newValue) => {
-  if (newValue && Object.keys(newValue).length > 0) {
-    Object.assign(formData, newValue);
-    if (props.isEdit) {
-      dataLoaded.value = true;
+// 计算每个分类的总分
+const calculateCategoryTotal = (resultArray) => {
+  if (!props.teacherData.assessmentScore) {
+    return 0;
+  }
+  let totalScore = 0;
+  resultArray.forEach(item => {
+    const score = Number(props.teacherData.assessmentScore[item.prop]);
+    if (!isNaN(score)) {
+      totalScore += score;
     }
-  }
-}, { immediate: true, deep: true });
-
-// 监听抽屉可见性变化
-watch(() => props.visible, (isVisible) => {
-  if (isVisible) {
-    if (props.isEdit && dataLoaded.value) {
-      // 编辑模式：当抽屉变为可见时，初始化或更新图表
-      nextTick(() => {
-        initRadarChart();
-      });
-    } else if (!props.isEdit) {
-      // 新增模式：清空表单数据
-      Object.assign(formData, {
-        id: '', // ID会在保存时生成
-        idcode: '', // 清空编号
-        name: '',
-        gender: '',
-        birthDate: '',
-        title: '',
-        position: '',
-        education: '',
-        educationBackground: '',
-        address: '',
-        academicDirection: '',
-        talentPlan: '',
-        officeLocation: '',
-        email: '',
-        phone: '',
-        tutorType: '',
-        papers: '',
-        projects: '',
-        photo: '',
-        eduWorkHistory: '',
-        researchDirection: '',
-        recentProjects: '',
-        representativePapers: '',
-        patents: '',
-        evaluationData: [60, 60, 60, 60, 60, 60] // 默认评估数据
-      });
-      dataLoaded.value = true;
-      nextTick(() => {
-        initRadarChart();
-      });
-    }
-  }
-});
-
-// 组件挂载时初始化
-onMounted(() => {
-  if (props.visible && dataLoaded.value) {
-    initRadarChart();
-  }
-});
-
-// 初始化雷达图
-const initRadarChart = () => {
-  const chartDom = document.getElementById('evaluation-radar-chart');
-  if (!chartDom) return;
-
-  // 清除任何现有图表
-  if (chart) {
-    chart.dispose();
-  }
-
-  chart = echarts.init(chartDom);
-
-  // 从dimensions生成指标
-  const indicators = props.dimensions.map(dim => ({
-    name: dim.name,
-    max: 100
-  })) || [
-    { name: '工作经历', max: 100 },
-    { name: '研究方向', max: 100 },
-    { name: '科研项目', max: 100 },
-    { name: '学术论文', max: 100 },
-    { name: '专利专著', max: 100 },
-    { name: '学术影响', max: 100 }
-  ];
-
-  // 确保评估数据的长度与维度数量匹配
-  let evaluationData = formData.evaluationData || [];
-  if (evaluationData.length !== indicators.length) {
-    // 如果维度数量变化，要调整评估数据
-    evaluationData = indicators.map((_, i) => {
-      // 如果有原始数据就用原始数据，否则设为默认值60
-      return evaluationData[i] || 60;
-    });
-    // 更新表单的评估数据
-    formData.evaluationData = evaluationData;
-  }
-
-  chart.setOption({
-    radar: {
-      indicator: indicators,
-      splitArea: { show: false },
-      axisLine: { lineStyle: { color: 'rgba(255, 255, 255, 0.2)' } },
-      splitLine: { lineStyle: { color: 'rgba(255, 255, 255, 0.2)' } },
-      name: { textStyle: { color: '#fff', fontSize: 10 } },
-      radius: '70%'
-    },
-    series: [
-      {
-        type: 'radar',
-        data: [
-          {
-            value: evaluationData,
-            name: '评估结果',
-            areaStyle: { opacity: 0 },
-            lineStyle: { color: 'rgb(63, 196, 15)', width: 2 },
-            itemStyle: { color: 'rgb(63, 196, 15)' }
-          }
-        ]
-      }
-    ]
-  });
-
-  // 添加窗口大小变化事件监听器
-  window.addEventListener('resize', () => {
-    chart && chart.resize();
   });
+  return totalScore;
 };
 
-// 处理文件变更
-const handleFileChange = async (file) => {
-  selectedFile.value = file;
-
-  // 检查文件类型
-  if (!file.name.endsWith('.pdf') && !file.name.endsWith('.doc') && !file.name.endsWith('.docx')) {
-    ElMessage.warning('请上传PDF、DOC或DOCX格式的文件');
-    return;
+// 计算所有大项的总分
+const overallTotalScore = computed(() => {
+  let total = 0;
+  if (props.teacherData.resultList && props.teacherData.assessmentScore) {
+    props.teacherData.resultList.forEach(categoryItem => {
+      total += calculateCategoryTotal(categoryItem.result);
+    });
   }
-
-  try {
-    // 显示加载状态
-    const loadingIndicator = ElLoading.service({
-      lock: true,
-      text: '正在解析文档...',
-      background: 'rgba(0, 0, 0, 0.7)'
-    });
-
-    // 创建FormData对象
-    const uploadFormData = new FormData();
-    uploadFormData.append('file', file.raw);
-
-    // 从localStorage获取JWT令牌
-    const token = localStorage.getItem('token');
-    if (!token) {
-      ElMessage.error('未登录或登录已过期，请重新登录');
-      loadingIndicator.close();
-      return;
-    }
-
-    // 调用后端API上传文档
-    const response = await axios.post(`${getApiBaseUrl()}/api/upload-talent-document`, uploadFormData, {
-      headers: {
-        'Authorization': `Bearer ${token}`,
-        'Content-Type': 'multipart/form-data'
-      }
-    });
-
-    // 关闭加载指示器
-    loadingIndicator.close();
-
-    if (response.data.success) {
-      // 使用响应数据更新表单
-      Object.assign(formData, response.data.data);
-      
-      // 设置数据已加载标志
-      dataLoaded.value = true;
-
-      // 更新图表
-      nextTick(() => {
-        initRadarChart();
-      });
-
-      ElMessage.success('文档解析成功');
-    } else {
-      throw new Error(response.data.message || '文档解析失败');
-    }
-  } catch (error) {
-    ElMessage.error('文档解析失败: ' + (error.response?.data?.detail || error.message));
-    console.error('Error uploading document:', error);
-  }
-};
-
-// 从URL获取数据
-const fetchDataFromUrl = async () => {
-  if (!urlInput.value) {
-    ElMessage.warning('请输入有效的URL');
-    return;
-  }
-
-  try {
-    // 显示加载状态
-    const loadingIndicator = ElLoading.service({
-      lock: true,
-      text: '正在获取数据...',
-      background: 'rgba(0, 0, 0, 0.7)'
-    });
-
-    // 调用后端API进行URL爬取
-    const response = await fetch(`${getApiBaseUrl()}/api/scrape-url`, {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json'
-      },
-      body: JSON.stringify({ url: urlInput.value })
-    });
-
-    // 获取响应数据
-    const data = await response.json();
-    
-    // 关闭加载指示器
-    loadingIndicator.close();
-
-    if (!response.ok) {
-      throw new Error(data.error || '网络请求失败');
-    }
-
-    // 检查数据是否有效
-    if (!data || Object.keys(data).length === 0) {
-      ElMessage.warning('未能从提供的URL中提取有效的数据');
-      return;
-    }
-
-    // 使用响应更新表单数据
-    Object.assign(formData, data);
-
-    // 设置数据已加载标志
-    dataLoaded.value = true;
-
-    // 更新图表
-    nextTick(() => {
-      initRadarChart();
-    });
-    
-    ElMessage.success('数据获取成功');
-  } catch (error) {
-    ElMessage.error('获取数据失败: ' + error.message);
-    console.error('Error fetching data:', error);
-  }
-};
+  return total;
+});
 
 // 处理关闭
 const handleClose = () => {
   drawerVisible.value = false;
-  // 重置数据加载状态
-  if (!props.isEdit) {
-    dataLoaded.value = false;
-  }
-};
-
-// 处理保存
-const handleSave = async () => {
-  try {
-    // 如果是新增评估，不需要传id字段
-    if (!props.isEdit) {
-      // 在新增模式下，删除id字段，因为后端通过是否有id字段来判断是新增还是修改
-      delete formData.id;
-      
-      // 确保用户已经输入idcode
-      if (!formData.idcode) {
-        ElMessage.warning('请输入编号');
-        return;
-      }
-    }
-    
-    // 准备请求体数据
-    const payload = {
-      data_type: "talent", // 指定为人才评估类型
-      data: { ...formData }
-    };
-    
-    // 从localStorage获取JWT令牌
-    const token = localStorage.getItem('token');
-    console.log('当前token:', token ? token.substring(0, 20) + '...' : '无token');
-    
-    if (!token) {
-      ElMessage.error('未登录或登录已过期，请重新登录');
-      return;
-    }
-
-    // 先测试token是否有效
-    try {
-      const testResponse = await axios.get(`${getApiBaseUrl()}/users/me`, {
-        headers: {
-          'Authorization': `Bearer ${token}`
-        }
-      });
-      console.log('Token验证成功，用户信息:', testResponse.data);
-    } catch (tokenError) {
-      console.error('Token验证失败:', tokenError);
-      ElMessage.error('登录已过期，请重新登录');
-      // 清除无效token
-      localStorage.removeItem('token');
-      localStorage.removeItem('username');
-      localStorage.removeItem('isLoggedIn');
-      return;
-    }
-    
-    console.log('发送保存请求，payload:', payload);
-    
-    // 发送POST请求到后端API，添加Authorization头
-    const response = await axios.post(`${getApiBaseUrl()}/api/save-data`, payload, {
-      headers: {
-        'Authorization': `Bearer ${token}`,
-        'Content-Type': 'application/json'
-      }
-    });
-    
-    console.log('保存响应:', response.data);
-    
-    if (response.data.success) {
-      // 如果是新增操作，后端会返回生成的id，需要更新表单数据的id
-      if (response.data.id && !props.isEdit) {
-        formData.id = response.data.id;
-      }
-      
-      // 通知父组件刷新数据并传递保存的数据
-      emit('save', { ...formData });
-      
-      // 保存成功后关闭抽屉
-      drawerVisible.value = false;
-      
-      // 显示成功消息
-      ElMessage.success(props.isEdit ? '修改成功' : '新增成功');
-    } else {
-      throw new Error(response.data.message || '保存失败');
-    }
-  } catch (error) {
-    console.error('保存评估数据失败:', error);
-    console.error('错误详情:', error.response?.data);
-    ElMessage.error(`保存评估数据失败: ${error.response?.data?.detail || error.message}`);
-  }
-};
-
-// 处理删除
-const handleDelete = async () => {
-  if (!props.isEdit || !formData.id) {
-    ElMessage.warning('无法删除：缺少必要信息');
-    return;
-  }
-
-  try {
-    // 显示确认对话框
-    await ElMessageBox.confirm(
-      `确定要删除教师 "${formData.name}" 的评估数据吗？此操作不可恢复。`,
-      '确认删除',
-      {
-        confirmButtonText: '确定删除',
-        cancelButtonText: '取消',
-        type: 'warning',
-        confirmButtonClass: 'el-button--danger'
-      }
-    );
-
-    // 从localStorage获取JWT令牌
-    const token = localStorage.getItem('token');
-    if (!token) {
-      ElMessage.error('未登录或登录已过期，请重新登录');
-      return;
-    }
-
-    // 调用删除API
-    const response = await axios.delete(`${getApiBaseUrl()}/talents/${formData.id}`, {
-      headers: {
-        'Authorization': `Bearer ${token}`
-      }
-    });
-
-    if (response.status === 200) {
-      ElMessage.success('删除成功');
-      
-      // 通知父组件删除成功，传递被删除的数据
-      emit('save', { ...formData, _deleted: true });
-      
-      // 关闭抽屉
-      drawerVisible.value = false;
-    } else {
-      throw new Error('删除失败');
-    }
-  } catch (error) {
-    if (error.message === 'cancel') {
-      // 用户取消删除
-      return;
-    }
-    console.error('删除失败:', error);
-    ElMessage.error(`删除失败: ${error.response?.data?.detail || error.message}`);
-  }
 };
 </script>
 
 <style>
-@import './common.css';
+/* 移除 common.css 导入，如果其中内容不再需要 */
 
 .el-drawer{
   border-left: 1px solid #4986ff;
 }
 
-
 .el-drawer__body{
   padding: 0px !important;
 }
@@ -778,83 +196,6 @@ const handleDelete = async () => {
   background-color: #0c1633;
 }
 
-/* 标签导航 */
-.tab-navigation {
-  display: flex;
-  border-bottom: 1px solid rgba(73,134,255,0.3);
-  margin-bottom: 20px;
-}
-
-.tab-item {
-  padding: 10px 20px;
-  cursor: pointer;
-  font-size: 16px;
-  color: rgba(255,255,255,0.7);
-  position: relative;
-}
-
-.tab-item.active {
-  color: #4986ff;
-  font-weight: bold;
-}
-
-.tab-item.active::after {
-  content: '';
-  position: absolute;
-  bottom: -1px;
-  left: 0;
-  width: 100%;
-  height: 2px;
-  background-color: #4986ff;
-}
-
-/* URL输入部分 */
-.url-input-container {
-  display: flex;
-  margin-bottom: 20px;
-}
-
-.url-input {
-  flex: 1;
-  margin-right: 10px;
-}
-
-/* 上传部分 */
-.upload-container {
-  margin-bottom: 20px;
-  width: 100%;
-  display: block;
-}
-
-.upload-container :deep(.el-upload) {
-  width: 100%;
-  display: block;
-}
-
-.upload-container :deep(.el-upload-dragger) {
-  width: 100%;
-}
-
-.el-upload__tip {
-  color: rgba(255,255,255,0.7);
-  margin-top: 5px;
-}
-
-/* 主要按钮 - 统一按钮样式 */
-.primary-btn {
-  background-color: rgba(14,62,167,1) !important;
-  color: rgba(255,255,255,1) !important;
-  border: 1px solid rgba(73,134,255,1) !important;
-  border-radius: 10px !important;
-  padding: 8px 15px !important;
-}
-
-/* 手动输入提示 */
-.manual-input-tip {
-  margin-bottom: 20px;
-  color: rgba(255,255,255,0.7);
-}
-
 /* 个人信息表单 */
 .form-header {
   display: flex;
@@ -872,6 +213,23 @@ const handleDelete = async () => {
   align-items: center;
 }
 
+.teacher-photo {
+  width: 120px; /* 示例宽度 */
+  height: 120px; /* 示例高度 */
+  overflow: hidden;
+  border: 2px solid #4986ff; /* 边框 */
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-shrink: 0; /* 防止缩小 */
+}
+
+.teacher-photo img {
+  width: 100%;
+  height: 100%;
+  object-fit: cover; /* 保持图片比例，填充容器 */
+}
+
 .basic-info {
   flex: 1;
 }
@@ -892,19 +250,86 @@ const handleDelete = async () => {
   margin-right: 0;
 }
 
-.form-item.full-width {
-  flex: 3;
-}
-
 .label {
   display: block;
   margin-bottom: 8px;
   color: rgba(255,255,255,0.7);
 }
 
+.display-text {
+  background-color: rgba(255,255,255,0.1);
+  box-shadow: 0 0 0 1px rgba(73,134,255,0.3) inset;
+  padding: 9px 15px;
+  border-radius: 4px;
+  min-height: 32px;
+  display: flex;
+  align-items: center;
+  color: white;
+  word-break: break-all;
+}
+
+.display-textarea {
+  background-color: rgba(255,255,255,0.1);
+  box-shadow: 0 0 0 1px rgba(73,134,255,0.3) inset;
+  padding: 9px 15px;
+  border-radius: 4px;
+  min-height: 100px;
+  color: white;
+  line-height: 1.8;
+  white-space: pre-wrap;
+  word-break: break-all;
+  display: flex;
+  flex-direction: column;
+  gap: 20px;
+}
+
+.category-section {
+  padding-bottom: 15px;
+  border-bottom: 1px solid rgba(73,134,255,0.2);
+}
+
+.category-section:last-child {
+  border-bottom: none;
+  padding-bottom: 0;
+}
+
+.category-title {
+  font-size: 16px;
+  font-weight: bold;
+  color: #4986ff;
+  margin-top: 0;
+  margin-bottom: 15px;
+}
+
+.category-content {
+  display: grid;
+  grid-template-columns: repeat(3, 1fr);
+  gap: 15px 30px;
+}
+
+.category-item {
+  display: flex;
+  justify-content: space-between;
+  align-items: baseline;
+  word-break: break-all;
+}
+
+.item-label {
+  flex: 1;
+  color: rgba(255,255,255,0.9);
+  margin-right: 10px;
+  line-height: 20px;
+  font-size: 16px;
+}
+
+.item-score {
+  font-weight: bold;
+  color: #4986ff;
+  flex-shrink: 0;
+}
+
 /* 详细信息部分 */
 .detail-sections {
-  margin-bottom: 30px;
   background-color: #1f3266;
   border-radius: 8px;
   padding: 15px;
@@ -917,24 +342,6 @@ const handleDelete = async () => {
   color: rgba(255,255,255,0.9);
 }
 
-.section-content {
-  margin-bottom: 20px;
-}
-
-/* 雷达图部分 */
-.evaluation-chart-section {
-  background-color: #1f3266;
-  border-radius: 8px;
-  padding: 15px;
-  border: 1px solid rgba(73,134,255,0.3);
-}
-
-.radar-chart {
-  width: 100%;
-  height: 300px; /* 明确指定雷达图高度 */
-  min-height: 300px; /* 确保最小高度 */
-}
-
 /* 抽屉页脚 */
 .talent-drawer :deep(.el-drawer__footer) {
   border-top: 1px solid rgba(73,134,255,0.3);
@@ -947,7 +354,7 @@ const handleDelete = async () => {
   justify-content: flex-end;
 }
 
-/* 按钮样式 - 现在与TalentDetail中的按钮一致 */
+/* 按钮样式 */
 .drawer-btn {
   padding: 8px 15px;
   border-radius: 10px;
@@ -962,63 +369,6 @@ const handleDelete = async () => {
   color: rgba(255,255,255,0.8);
   border: 1px solid rgba(73,134,255,0.5);
 }
-
-.delete-btn {
-  background-color: #f56c6c;
-  color: white;
-  border: 1px solid #f56c6c;
-}
-
-.delete-btn:hover {
-  background-color: #f78989;
-  border-color: #f78989;
-}
-
-.confirm-btn {
-  background-color: rgba(14,62,167,1);
-  color: rgba(255,255,255,1);
-  border: 1px solid rgba(73,134,255,1);
-}
-
-/* Element Plus组件的深色主题覆盖样式 */
-:deep(.el-input__wrapper),
-:deep(.el-textarea__wrapper) {
-  background-color: rgba(255,255,255,0.1);
-  box-shadow: 0 0 0 1px rgba(73,134,255,0.3) inset;
-}
-
-:deep(.el-input__inner),
-:deep(.el-textarea__inner) {
-  background-color: transparent;
-  color: white;
-}
-
-:deep(.el-input__inner::placeholder),
-:deep(.el-textarea__inner::placeholder) {
-  color: rgba(255,255,255,0.5);
-}
-
-:deep(.el-select .el-input__wrapper) {
-  background-color: rgba(255,255,255,0.1);
-  box-shadow: 0 0 0 1px rgba(73,134,255,0.3) inset;
-}
-
-:deep(.el-select-dropdown__item) {
-  color: #606266;
-}
-
-:deep(.el-date-editor) {
-  background-color: rgba(255,255,255,0.1);
-  border-color: rgba(73,134,255,0.3);
-  color: white;
-}
-
-:deep(.el-upload),
-:deep(.el-upload-dragger) {
-  background-color: rgba(255,255,255,0.1);
-  border-color: rgba(73,134,255,0.3);
-}
-
 /* 滚动条样式 */
 .drawer-content::-webkit-scrollbar {
   width: 6px;
@@ -1033,4 +383,35 @@ const handleDelete = async () => {
   border-radius: 10px;
   border: none;
 }
+
+/* 新增：总分显示样式 */
+.overall-score-section {
+  margin-top: 20px;
+  padding: 15px;
+  background-color: rgba(12, 22, 51, 0.3);
+  border-radius: 8px;
+  border: 1px solid rgba(73, 134, 255, 0.3);
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+  font-size: 18px;
+  font-weight: bold;
+  color: #4986ff;
+}
+
+.overall-score-label {
+  margin-right: 10px;
+  color: rgba(255,255,255,0.9);
+}
+
+.overall-score-value {
+  color: #4986ff;
+}
+
+.loading-placeholder {
+  color: rgba(255,255,255,0.7);
+  text-align: center;
+  padding: 50px;
+  font-size: 18px;
+}
 </style>
\ No newline at end of file
diff --git a/src/components/common.css b/src/components/common.css
index 27b5bbd..3d93796 100644
--- a/src/components/common.css
+++ b/src/components/common.css
@@ -118,7 +118,9 @@
   font-size: 16px;
   text-align: center;
 }
-
+h2{
+  text-align: left!important;
+}
 .panel-header {
   display: flex;
   justify-content: space-between;