diff --git a/app-dm/src/TeacherPages/Trainmanage/Trainmanage.css b/app-dm/src/TeacherPages/Trainmanage/Trainmanage.css index 0ac3472..de200bc 100644 --- a/app-dm/src/TeacherPages/Trainmanage/Trainmanage.css +++ b/app-dm/src/TeacherPages/Trainmanage/Trainmanage.css @@ -113,11 +113,12 @@ } /* 弹窗 */ .TrainBox{ + position: absolute; width: 650px; height: 400px; margin-left: 350px; margin-top: 180px; - z-index: 2; + z-index: 999; border: 10px solid #ceedf5; /* background-color: #d4f6f6; */ background-color: #e7f5f8; diff --git a/app-dm/src/TeacherPages/Trainmanage/Trainmanage.jsx b/app-dm/src/TeacherPages/Trainmanage/Trainmanage.jsx index f87240f..1f3ba52 100644 --- a/app-dm/src/TeacherPages/Trainmanage/Trainmanage.jsx +++ b/app-dm/src/TeacherPages/Trainmanage/Trainmanage.jsx @@ -87,7 +87,7 @@ function TrainManage(){ 总成绩 -

---------------------------------------------------------------------------

+

--------------------------------------------------------------------------

{TrainData&& {Object.keys(TrainData).map((key,index)=>( diff --git a/app-dm/src/pages/ListPages/Analyse/AnalysePages.jsx b/app-dm/src/pages/ListPages/Analyse/AnalysePages.jsx index d031a44..103436b 100644 --- a/app-dm/src/pages/ListPages/Analyse/AnalysePages.jsx +++ b/app-dm/src/pages/ListPages/Analyse/AnalysePages.jsx @@ -4,6 +4,7 @@ import '../Analyse/AnalysePages.css' import { Pie } from 'react-chartjs-2'; import 'chart.js/auto'; import axios from 'axios'; +import { parseInt } from 'lodash'; // 首页 学习分析 @@ -76,20 +77,22 @@ function SubjectPage(){ return(
- {HistoryTrain&&
- {/* 内容 */} + {HistoryTrain &&
+ {/* 内容 */}
    {Object.keys(HistoryTrain).map((key)=>(
  • handleSubjectClick(key)} key={key}>

    实训ID:{HistoryTrain[key][0][2]}{eval(HistoryTrain[key][1][0][11])}

    - {HistoryTrain[key][1][0][5]} + 结束时间:{HistoryTrain[key][1][0][6]}

  • ))}
+
} + {SubjectModal && (