科研人才模块首页

src/components/Dashboard.vue

@@ -104,15 +104,10 @@
         <div ref="awardsChartRef" class="chart-container"></div>
       </div>
   
-      <!-- 新闻与动态 -->
+      <!-- 教师服务与社会贡献项目分布 -->
       <div class="dashboard-panel" style="flex: 1 1 0;">
-        <h2>新闻与动态</h2>
+        <h2>教师服务与社会贡献项目分布</h2>
-        <div class="news-list custom-scrollbar" ref="newsListRef">
+        <div ref="teacherServiceChartRef" class="chart-container"></div>
-          <div class="news-item" v-for="(item, index) in newsData" :key="index">
-            <span class="news-title">{{ item.title }}</span>
-            <span class="news-date">{{ item.date }}</span>
-          </div>
-        </div>
       </div>
     </div>
   
@@ -137,11 +132,14 @@
         <h2>智能助手</h2>
         <div class="assistant-container">
           <div class="assistant-header">
-            <img src="../assets/logo1.png" alt="北京理工大学" class="assistant-avatar" />
+            <img :src="dashboardData2?.logoUrl" class="assistant-avatar" />
             <h3>北京理工大学</h3>
           </div>
           <div class="assistant-interface">
             <div class="assistant-messages custom-scrollbar" ref="chatMessagesRef">
+              <div class="assistant-message message">
+                <div v-html="dashboardData2?.prompt"></div> 
+              </div>
               <div v-for="(message, index) in chatMessages" :key="index" 
                    :class="['message', message.role === 'user' ? 'user-message' : 'assistant-message']">
                 <div v-html="message.content"></div> 
@@ -213,7 +211,25 @@
 const outputChartRef = ref(null)
 const awardsChartRef = ref(null)
 const fundingChartRef = ref(null)
-  const newsListRef = ref(null)
+const teacherServiceChartRef = ref(null) // 新增教师服务图表DOM引用
+
+// 教研人才图表数据
+const researcherData = ref({
+  datax: [],
+  datay: [],
+  history: [],
+  ishistory: false
+})
+// 学术奖项图表数据
+const studyData = ref({
+  datax: [],
+  datay: []
+})
+// 教师服务与社会贡献项目分布图表数据
+const teacherServiceData = ref({
+  datax: [],
+  datay: []
+})
 // 工程研究中心图表数据
 const labData = ref({
   datax: [],
@@ -229,7 +245,6 @@
 const userInput = ref('')
 const isLoading = ref(false)
 const chatMessages = ref([
-    { role: 'assistant', content: '您好，我是北京理工大学科研评估智能助手，有什么可以帮助您的吗？' }
 ])
 
 // DeepSeek API 调用函数
@@ -253,7 +268,7 @@
   try {
     // 准备发送到 DeepSeek API 的消息历史
     const apiMessages = [
-        { role: 'system', content: '你是北京理工大学的智能助手，专门回答关于科研评估、学术成果和大学研究项目方面的问题。请不要给我返回任何.md格式！如果有人问你使用的什么模型，你就说你是李昂出品必属精品' }
+      { role: 'system', content: '' }
     ]
     
     // 添加最近的10条消息历史(如果有的话)
@@ -356,16 +371,12 @@
 
 // 获取仪表盘数据
 const dashboardData = ref(null);
+const dashboardData2 = ref(null);
 const loading = ref(true);
 
 // 引入API配置
 import { getApiBaseUrl } from '../config';
 
-  // 获取token函数
-  const getToken = () => {
-    return localStorage.getItem('token');
-  };
-  
 // 从API获取仪表盘数据
 const fetchDashboardData = async () => {
   try {
@@ -377,14 +388,6 @@
       dashboardData.value = data.data;
       // 更新相应的UI数据
       if (data) {
-          // 如果有新闻数据，更新新闻列表
-          if (data.newsData && data.newsData.length > 0) {
-            newsData.value = data.newsData;
-          }
-          
-          // 更新其他UI元素，例如研究人员图表等
-          // 这里可以添加更多的UI更新逻辑
-          
         updateChartsWithDashboardData();
       }
     } else {
@@ -396,6 +399,162 @@
     loading.value = false;
   }
 };
+const fetchDashboardData2 = async () => {
+  try {
+    const response = await fetch(`${getApiBaseUrl()}/admin-api/pg/intelligent-assistant/get-release`);
+    const data = await response.json();
+    dashboardData2.value = data.data;
+      if (data) {
+        updateChartsWithDashboardData();
+      }
+  } catch (error) {
+    console.error('获取仪表盘数据出错:', error);
+  } finally {
+    loading.value = false;
+  }
+};
+
+const fetchTeacherbData = async (type) => {
+  try {
+    const res = await fetch(`${getApiBaseUrl()}/admin-api/pg/teacher-dashboard/get-release?type=${type}`);
+    if (res.ok) {
+      const data = await res.json();
+      // 处理 keyFields 数据
+      const keyFields = data.data.keyFields || [];
+      const datax = keyFields.map(item => item.fieldName);
+      const datay = keyFields.map(item => item.quantity);
+
+      if (type === 1) {
+        const highest = data.data.highestValue || [];
+        const ishistory = data.data.historyHighest;
+        const history = highest.map(item => item.quantity);
+        researcherData.value = {
+          datax,
+          datay,
+          history, 
+          ishistory
+        };
+        // 数据更新后，手动更新图表
+        updateResearcherChart();
+      } else if (type === 2) {
+        studyData.value = {
+          datax: keyFields.map(item => ({ name: item.fieldName})),
+          datay
+        };
+        updateStudyChart();
+      } else if (type === 3) {
+        teacherServiceData.value = {
+          datax,
+          datay
+        };
+        updateTeacherServiceChart();
+      }
+    } else {
+      console.error(`获取教师数据失败 (type=${type}):`, res.statusText);
+    }
+  } catch (error) {
+    console.error(`获取教师数据出错 (type=${type}):`, error);
+  } finally {
+    loading.value = false;
+  }
+};
+
+const fetchTeacherbData1 = () => fetchTeacherbData(1);
+const fetchTeacherbData2 = () => fetchTeacherbData(2);
+const fetchTeacherbData3 = () => fetchTeacherbData(3);
+
+const updateStudyChart = () => {
+  const awardsChart = echarts.getInstanceByDom(awardsChartRef.value);
+  if (awardsChart) {
+    awardsChart.setOption({
+      radar: {
+        indicator: studyData.value.datax
+      },
+      series: [
+        {
+          data: [
+            {
+              value: studyData.value.datay
+            }
+          ]
+        }
+      ]
+    });
+  }
+}
+const updateResearcherChart = () => {
+  const researcherChart = echarts.getInstanceByDom(researcherChartRef.value);
+  if (researcherChart) {
+    researcherChart.setOption({
+      legend: {
+        data: researcherData.value.ishistory ? ['当前数量', '历史最高'] : ['当前数量']
+      },
+      yAxis: {
+        data: researcherData.value.datax
+      },
+      series: [
+        {
+          name: '当前数量',
+          data: researcherData.value.datay
+        },
+        {
+          name: '历史最高',
+          data: researcherData.value.history
+        }
+      ]
+    });
+  }
+};
+
+const updateTeacherServiceChart = () => {
+  const teacherServiceChart = echarts.getInstanceByDom(teacherServiceChartRef.value);
+  if (teacherServiceChart) {
+    teacherServiceChart.setOption({
+      legend: {
+        data: ['当前数量'],
+        textStyle: { color: '#fff' }
+      },
+      grid: { left: '3%', right: '4%', bottom: '3%', containLabel: true },
+      xAxis: {
+        type: 'value',
+        axisLine: { lineStyle: { color: '#fff' } },
+        axisLabel: { color: '#fff' },
+        splitLine: {
+          show: true,
+          lineStyle: {
+            type: 'dashed',
+            color: 'rgba(255, 255, 255, 0.2)'
+          }
+        }
+      },
+      yAxis: {
+        type: 'category',
+        data: teacherServiceData.value.datax,
+        axisLine: { lineStyle: { color: '#fff' } },
+        axisLabel: { color: '#fff' },
+        splitLine: { show: false }
+      },
+      series: [
+        {
+          name: '当前数量',
+          type: 'bar',
+          stack: 'total',
+          data: teacherServiceData.value.datay,
+          itemStyle: { color: '#f39c12' }, // 更换颜色
+          barWidth: '40%',
+          label: {
+            show: true,
+            position: 'inside',
+            color: '#fff',
+            formatter: '{c}'
+          }
+        }
+      ]
+    });
+  }
+};
+
+
 const fetchLabData = async () => {
   try {
     const res = await fetch(`${getApiBaseUrl()}/admin-api/pg/research-data-dashboard/get-release`);
@@ -427,15 +586,6 @@
       const data = await res.json();
       // 处理 keyFields 数据
       const afterAnalysis = data.data.afterAnalysis || [];
-            // const datax = [];
-            // const datay = [];
-            // afterAnalysis.forEach(item => {
-            //     const year = Object.keys(item)[0]; // 获取年份
-            //     const quantity = item[year]; // 获取对应的值
-            //     datax.push(year);
-            //     datay.push(quantity);
-            // });
-
           const datax = afterAnalysis.map(item => item.year);
           const datay = afterAnalysis.map(item => item.quantity);
           labLineData.value = {
@@ -487,9 +637,8 @@ const updateLabLineChart = () => {
 // 使用仪表盘数据更新图表
 const updateChartsWithDashboardData = () => {
   if (!dashboardData.value) return;
+  if (!dashboardData2.value) return;
 
-    // 这里可以添加更新各个图表的逻辑
-    // 例如更新研究人员图表、科研成果图表等
 };
 
 // 初始化图表
@@ -499,7 +648,7 @@ const updateLabLineChart = () => {
   researcherChart.setOption({
     tooltip: { trigger: 'axis', axisPointer: { type: 'shadow' } },
     legend: {
-        data: ['当前数量', '历史最高'],
+      data: researcherData.value.ishistory ? ['当前数量', '历史最高'] : ['当前数量'],
       textStyle: { color: '#fff' }
     },
     grid: { left: '3%', right: '4%', bottom: '3%', containLabel: true },
@@ -517,7 +666,7 @@ const updateLabLineChart = () => {
     },
     yAxis: {
       type: 'category',
-        data: ['博士生导师', '高被引学者', '教师总数'],
+      data: researcherData.value.datax,
       axisLine: { lineStyle: { color: '#fff' } },
       axisLabel: { color: '#fff' },
       splitLine: { show: false }
@@ -527,7 +676,7 @@ const updateLabLineChart = () => {
         name: '当前数量',
         type: 'bar',
         stack: 'total',
-          data: [150, 100, 50],
+        data: researcherData.value.datay,
         itemStyle: { color: '#a95df3' },
         barWidth: '40%', // 减小柱宽度
         label: {
@@ -541,7 +690,7 @@ const updateLabLineChart = () => {
         name: '历史最高',
         type: 'bar',
         stack: 'total',
-          data: [80, 50, 30],
+        data: researcherData.value.history,
         itemStyle: { color: '#7b49ca' },
         label: {
           show: true,
@@ -553,6 +702,52 @@ const updateLabLineChart = () => {
     ]
   })
 
+  // 教师服务与社会贡献项目分布
+  const teacherServiceChart = echarts.init(teacherServiceChartRef.value)
+  teacherServiceChart.setOption({
+    tooltip: { trigger: 'axis', axisPointer: { type: 'shadow' } },
+    legend: {
+      data: ['当前数量'],
+      textStyle: { color: '#fff' }
+    },
+    grid: { left: '3%', right: '4%', bottom: '3%', containLabel: true },
+    xAxis: {
+      type: 'value',
+      axisLine: { lineStyle: { color: '#fff' } },
+      axisLabel: { color: '#fff' },
+      splitLine: {
+        show: true,
+        lineStyle: {
+          type: 'dashed',
+          color: 'rgba(255, 255, 255, 0.2)'
+        }
+      }
+    },
+    yAxis: {
+      type: 'category',
+      data: teacherServiceData.value.datax,
+      axisLine: { lineStyle: { color: '#fff' } },
+      axisLabel: { color: '#fff' },
+      splitLine: { show: false }
+    },
+    series: [
+      {
+        name: '当前数量',
+        type: 'bar',
+        stack: 'total',
+        data: teacherServiceData.value.datay,
+        itemStyle: { color: '#f39c12' }, // 更换颜色
+        barWidth: '40%',
+        label: {
+          show: true,
+          position: 'inside',
+          color: '#fff',
+          formatter: '{c}'
+        }
+      }
+    ]
+  })
+
   // 工程研究中心柱状图（调整为占满全部宽度）
   const labBarChart = echarts.init(labBarChartRef.value)
   labBarChart.setOption({
@@ -716,30 +911,38 @@ const updateLabLineChart = () => {
   const awardsChart = echarts.init(awardsChartRef.value)
   awardsChart.setOption({
     radar: {
-        indicator: [
+      indicator: studyData.value.datax,
-          { name: '国家级科技奖励', max: 100 },
-          { name: '省部级科技奖励', max: 100 },
-          { name: '学术会议最佳论文', max: 100 },
-          { name: '行业技术创新奖项', max: 100 },
-          { name: '国际学术奖励', max: 100 }
-        ],
       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' } }
+      name: { textStyle: { color: '#fff' } },
+      radius: '70%'
     },
     series: [
       {
         type: 'radar',
         data: [
           {
-              value: [80, 70, 90, 75, 85],
+            value: studyData.value.datay,
             name: '奖项分布',
             areaStyle: { opacity: 0 }, // 移除中间蒙版
             lineStyle: { color: '#ffd700', width: 2 },
             itemStyle: { color: '#ffd700' }
           }
-          ]
+        ],
+        label: {
+            show: true, // 显示标签
+            position: 'top', // 标签位置
+            color: '#fff', // 标签颜色
+            fontSize: 10 // 标签字体大小
+        },
+        emphasis: {
+          label: {
+            show: true, // 鼠标悬停时也显示标签
+            fontSize: 12, // 鼠标悬停时字体变大
+            fontWeight: 'bold' // 鼠标悬停时字体加粗
+          }
+        }
       }
     ]
   })
@@ -798,9 +1001,6 @@ const updateLabLineChart = () => {
     ]
   })
 
-    // 启动新闻滚动
-    startNewsScroll()
-  
   // 响应窗口大小变化
   window.addEventListener('resize', () => {
     researcherChart.resize()
@@ -809,16 +1009,22 @@ const updateLabLineChart = () => {
     outputChart.resize()
     awardsChart.resize()
     fundingChart.resize()
+    teacherServiceChart.resize()
   })
 }
 
 // 生命周期钩子 - 组件挂载后初始化
 onMounted(async() => {
+  // 教研人才数据
+  await fetchTeacherbData1();
+  await fetchTeacherbData2();
+  await fetchTeacherbData3(); // 调用新的数据获取函数
   // 工程研究中心数据
   await fetchLabData();
   await fetchLabData2();
   // 获取仪表盘数据
   await fetchDashboardData();
+  await fetchDashboardData2();
 
   // 初始化图表
   nextTick(() => {
@@ -832,31 +1038,9 @@ const updateLabLineChart = () => {
     updateChartsWithData();
   }
 }, { deep: true });
-  
   // 更新图表数据
   const updateChartsWithData = () => {
     if (!dashboardData.value) return;
-  
-    // 更新新闻数据
-    newsData.value = dashboardData.value.newsData || [];
-  
-    // 更新各类统计数字和图表数据
-    if (researcherChartRef.value) {
-      const researcherChart = echarts.getInstanceByDom(researcherChartRef.value);
-      if (researcherChart && dashboardData.value.researcherStats) {
-        // 更新研究人员统计数据
-        researcherChart.setOption({
-          series: [{
-            data: [
-              dashboardData.value.researcherStats.professor || 0,
-              dashboardData.value.researcherStats.associateProfessor || 0,
-              dashboardData.value.researcherStats.assistantProfessor || 0
-            ]
-          }]
-        });
-      }
-    }
-  
     // 更新论文数量、专利数量、高影响力论文和关键项目数量
     const paperCountEl = document.querySelector('.stat-card:nth-child(1) .stat-value');
     const patentCountEl = document.querySelector('.stat-card:nth-child(2) .stat-value');
@@ -907,9 +1091,10 @@ const updateLabLineChart = () => {
 
 // 组件卸载时清理定时器
 onUnmounted(() => {
-    if (scrollInterval) {
+  // 移除 resize 事件监听器
-      clearInterval(scrollInterval)
+  window.removeEventListener('resize', () => {
-    }
+    // 这里可以添加移除所有图表实例的逻辑，或者在需要时手动销毁
+  });
 })
 </script>
 
@@ -1144,39 +1329,6 @@ const updateLabLineChart = () => {
   height: 100%;
 }
 
-  /* 新闻列表 */
-  .news-list {
-    padding: 10px;
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-    overflow-y: auto;
-    max-height: 200px;
-  }
-  
-  .news-item {
-    display: flex;
-    justify-content: space-between;
-    padding: 8px;
-    border-bottom: 1px solid rgba(255, 255, 255, 0.1);
-    margin-bottom: 8px;
-    background-color: rgba(36,69,142,1);
-    border: 1px solid rgba(73,134,255,1);
-    border-radius: 5px;
-    color: rgba(123,173,255,1);
-  }
-  
-  .news-title {
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    max-width: 70%;
-  }
-  
-  .news-date {
-    opacity: 0.7;
-  }
-  
 /* 智能助手样式 */
 .assistant-container {
   flex: 1;

src/components/LabDetail.vue

@@ -315,8 +315,8 @@ const handleSearch = () => {
     filteredLabs.value = labs.value;
   } else {
     filteredLabs.value = labs.value.filter(lab =>
-        lab.basicInformation.name1.includes(searchQuery.value) ||
+        lab.basicInformation.name1 && lab.basicInformation.name1.includes(searchQuery.value) ||
-        (lab.name0 && lab.name0.includes(searchQuery.value))
+        (lab.basicInformation.name0 && lab.basicInformation.name0.includes(searchQuery.value))
     );
   }