From a0fba951f7d4bcea0e69deac674f19762c7180f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B9=E4=BD=B3=20=E5=8D=9A?=
 <12742597+fang-jiabo@user.noreply.gitee.com>
Date: Thu, 15 Aug 2024 10:03:35 +0800
Subject: [PATCH] 'tj'

---
 .../components/AIVenisonDiagram.vue           |   3 +-
 .../components/Image-recognition.vue          |  17 +--
 .../components/Naturallanguageprocessing.vue  |   7 +-
 .../components/Robot-learning.vue             |   7 +-
 .../components/article-identification.vue     |  14 +-
 .../components/face-recognition.vue           |   7 +-
 .../components/voice-technology.vue           |   7 +-
 .../bigData/components/HadoopHDFS.vue         |   5 +-
 .../bigData/components/digitalMarketing.vue   |   3 +-
 .../bigData/components/hadoop.vue             |   7 +-
 .../components/technologyFramework.vue        |   7 +-
 .../bigData/components/whatBigData.vue        |   5 +-
 src/views/learningCenter/Achievement.vue      | 128 ++++++++++--------
 src/views/learningCenter/evaluation.vue       |   8 +-
 .../learningCenter/learningResources.vue      |   4 +-
 15 files changed, 127 insertions(+), 102 deletions(-)

diff --git a/src/views/digitalMarketTech/AIGCLargeModel/components/AIVenisonDiagram.vue b/src/views/digitalMarketTech/AIGCLargeModel/components/AIVenisonDiagram.vue
index b1ad154..87467ad 100644
--- a/src/views/digitalMarketTech/AIGCLargeModel/components/AIVenisonDiagram.vue
+++ b/src/views/digitalMarketTech/AIGCLargeModel/components/AIVenisonDiagram.vue
@@ -67,6 +67,7 @@
 import { ref, reactive } from "vue";
 import * as AI from "@/api/AI.js";
 import {getAssetsFile} from "@/utils/index.js"
+import { getUserInfo } from '@/utils/auth'
 const input = ref("");
 const butFlag = ref(false);
 const messages = reactive([]);
@@ -130,7 +131,7 @@ const sendText = async() => {
       },
       name: "",
       role: "user",
-      userId: "512",
+      userId: JSON.parse(getUserInfo()).userId,
     },
   ];
   const messageId = Date.now();
diff --git a/src/views/digitalMarketTech/artificialIntelligence/components/Image-recognition.vue b/src/views/digitalMarketTech/artificialIntelligence/components/Image-recognition.vue
index e9a0257..ef09d2e 100644
--- a/src/views/digitalMarketTech/artificialIntelligence/components/Image-recognition.vue
+++ b/src/views/digitalMarketTech/artificialIntelligence/components/Image-recognition.vue
@@ -204,7 +204,8 @@
  </div>
 </template>
 <script setup>
-// import { getUserId, getToken } from "@/utils/auth.js";
+// import { getUserId, getToken } from "@/utils/auth.js";\
+import { getUserInfo,getToken } from '@/utils/auth'
 import * as commonality from "@/api/commonality.js";
 import {getAssetsFile} from '@/utils/index.js'
 import { ref } from "vue";
@@ -235,7 +236,7 @@ const Identifyimg=ref('szjj/setpt2.png')
 const dialogShowbtn = () => {
   getlist();
   if(restartCount.value>0) return
-  commonality.getImgEcho({module:'图像识别',userId:'487'}).then((res) => {
+  commonality.getImgEcho({module:'图像识别',userId:JSON.parse(getUserInfo()).userId}).then((res) => {
     if(res.data.length<0) return
     Answer.value = res.data[0].selectPicture;
     value.value = res.data[0].selectText;
@@ -243,10 +244,10 @@ const dialogShowbtn = () => {
   });
 };
 const getlist = () => {
-  commonality.getImgList({ userId: '487', module: "图像识别" }).then((res) => {
+  commonality.getImgList({ userId: JSON.parse(getUserInfo()).userId, module: "图像识别" }).then((res) => {
     topicList.value = res.data;
     if( topicList.value[0].studentAnswer!==null||topicList.value[0].studentAnswer!=='')  step.value=1
-     topicList.value.userId = '487';
+     topicList.value.userId = JSON.parse(getUserInfo()).userId;
     if(restartCount.value>0){
       topicList.value.forEach((item) => {
         item.studentAnswer = null;
@@ -256,7 +257,7 @@ const getlist = () => {
 };
 // 答题
 const submit = () => {
-     topicList.value[0].userId = '487';
+     topicList.value[0].userId = JSON.parse(getUserInfo()).userId;
      step.value=1
      restartCount.value=0
      commonality
@@ -285,7 +286,7 @@ const Choiceimg = () => {
   proxy.$modal.msgSuccess("选择识别成功");
   dialogVisible.value = false;
   step.value=2
-  commonality.uploadImg({irisName:value.value||null,  module: "图像识别" ,order:Answer.value||null ,userId: '487'})
+  commonality.uploadImg({irisName:value.value||null,  module: "图像识别" ,order:Answer.value||null ,userId: JSON.parse(getUserInfo()).userId})
 };
 const selectChange = () => {
   if (Answer.value == "") {
@@ -293,7 +294,7 @@ const selectChange = () => {
     value.value = "";
     return
   }
-commonality.uploadImg({irisName:value.value||null,  module: "图像识别" ,order:Answer.value ||null,userId: '487'})
+commonality.uploadImg({irisName:value.value||null,  module: "图像识别" ,order:Answer.value ||null,userId: JSON.parse(getUserInfo()).userId})
   if (Answer.value == 1 || Answer.value == 2) {
     if(value.value=='变色鸢尾花'){
       proxy.$modal.msgSuccess("识别成功") 
@@ -321,7 +322,7 @@ const submitTask = () => {
       module: "人工智能",
       numberOfErrors: errrCount.value > 10 ? 10 : errrCount.value ,
       taskName: "图像识别",
-      userId: '487',
+      userId: JSON.parse(getUserInfo()).userId,
     })
     .then((response) => {
       proxy.$modal.msgSuccess("提交成功");
diff --git a/src/views/digitalMarketTech/artificialIntelligence/components/Naturallanguageprocessing.vue b/src/views/digitalMarketTech/artificialIntelligence/components/Naturallanguageprocessing.vue
index 4155913..10deb99 100644
--- a/src/views/digitalMarketTech/artificialIntelligence/components/Naturallanguageprocessing.vue
+++ b/src/views/digitalMarketTech/artificialIntelligence/components/Naturallanguageprocessing.vue
@@ -248,6 +248,7 @@
 <script setup>
 import * as commonality from "@/api/commonality";
 // import {getUserId} from "@/utils/auth.js";
+import { getUserInfo } from '@/utils/auth'
 const {proxy} = getCurrentInstance();
 const NaturallanguageprocessingVisible=ref(false)
 const text1 = ref({
@@ -389,7 +390,7 @@ const submit=()=>{
   }
      handleClose()
     console.log(errorCount.value,"errorCount.value");
-     commonality.submitTask({module:'人工智能',numberOfErrors:errorCount.value > 10 ? 10 : errorCount.value  || 0,taskName:'自然语言处理',userId:'487'}).then((response) => {
+     commonality.submitTask({module:'人工智能',numberOfErrors:errorCount.value > 10 ? 10 : errorCount.value  || 0,taskName:'自然语言处理',userId:JSON.parse(getUserInfo()).userId}).then((response) => {
      proxy.$modal.msgSuccess("提交任务成功");
      NaturallanguageprocessingVisible.value=false
      restartStatus.value=false
@@ -433,7 +434,7 @@ NaturallanguageprocessingVisible.value=false
 // 保存记录
 const handleClose = () => {
   const dataObj={
-    userId:'487',
+    userId:JSON.parse(getUserInfo()).userId,
     stepOneA:Object.values(text1.value).join(',')||'',
     stepOneB:Object.values(text2.value).join(',')||'',
     stepOneC:answer.value.studentAnswer.join(',')||'',
@@ -453,7 +454,7 @@ const handleClose = () => {
   });
 }
 const getList=()=>{
-  commonality.getNlpEcho({userId:'487'}).then((response) => {
+  commonality.getNlpEcho({userId:JSON.parse(getUserInfo()).userId}).then((response) => {
     if(restartStatus.value) return
     if(response.data){
       const data=response.data
diff --git a/src/views/digitalMarketTech/artificialIntelligence/components/Robot-learning.vue b/src/views/digitalMarketTech/artificialIntelligence/components/Robot-learning.vue
index 0766773..0286744 100644
--- a/src/views/digitalMarketTech/artificialIntelligence/components/Robot-learning.vue
+++ b/src/views/digitalMarketTech/artificialIntelligence/components/Robot-learning.vue
@@ -216,6 +216,7 @@
 <script setup>
 import * as  commonality from "@/api/commonality.js";
 // import {getUserId} from "@/utils/auth.js";
+import { getUserInfo } from '@/utils/auth'
 const {proxy} = getCurrentInstance();
 const robotlearningVisible = ref(false);
 const TrainingSet=ref([
@@ -495,7 +496,7 @@ const submit=()=>{
       }
      }
 
-    commonality.submitTask({module:'人工智能',numberOfErrors:IncorrectScoring.value > 10 ? 10 : IncorrectScoring.value || 0,taskName:'机器人学习',userId:'487'}).then((response) => {
+    commonality.submitTask({module:'人工智能',numberOfErrors:IncorrectScoring.value > 10 ? 10 : IncorrectScoring.value || 0,taskName:'机器人学习',userId:JSON.parse(getUserInfo()).userId}).then((response) => {
     proxy.$modal.msgSuccess("提交任务成功");
     restartStatus.value=false
     robotlearningVisible.value=false
@@ -511,7 +512,7 @@ const handleCole=()=>{
     dtoList.two=JSON.stringify(FemaleSubset.value),
     dtoList.three=JSON.stringify(greaterThan.value),
     dtoList.four=JSON.stringify(lessThan.value),
-    dtoList.userId='487'
+    dtoList.userId=JSON.parse(getUserInfo()).userId
     dtoList.subState=state.value
     dtoList.numberOfErrors=IncorrectScoring.value
     robotlearningVisible.value=false
@@ -520,7 +521,7 @@ const handleCole=()=>{
   })
 }
 const getList=()=>{
-  commonality.RobotECho({userId:'487'}).then(res=>{
+  commonality.RobotECho({userId:JSON.parse(getUserInfo()).userId}).then(res=>{
     if(restartStatus.value) return
     MaleSubset.value=JSON.parse(res.data.stepOneA)
     FemaleSubset.value=JSON.parse(res.data.stepOneB)
diff --git a/src/views/digitalMarketTech/artificialIntelligence/components/article-identification.vue b/src/views/digitalMarketTech/artificialIntelligence/components/article-identification.vue
index e634d9b..3de6077 100644
--- a/src/views/digitalMarketTech/artificialIntelligence/components/article-identification.vue
+++ b/src/views/digitalMarketTech/artificialIntelligence/components/article-identification.vue
@@ -129,7 +129,7 @@
   </div>
 </template>
 <script setup>
-import {getToken} from "@/utils/auth.js";
+import {getToken,getUserInfo} from "@/utils/auth.js";
 import * as commonality from "@/api/commonality.js";
 const { proxy } = getCurrentInstance()
 const textDialogVisible = ref(false);
@@ -141,7 +141,7 @@ const answerRecord=ref(0)
 const Step1 = ref([]);
 const Step2 = ref([]);
 const CharacterRecognitionCase=()=>{
-  commonality.getTextList({userId:'487',model:'文字识别OCR'}).then(res=>{
+  commonality.getTextList({userId:JSON.parse(getUserInfo()).userId,model:'文字识别OCR'}).then(res=>{
    if(Step1.value.length<1&&Step2.value.length<1){
     Step1.value.push(res.data[0])
     Step2.value.push(res.data[1])
@@ -176,7 +176,7 @@ const CharacterRecognitionCase=()=>{
 // submitStepOne
 const stepOneanswer=()=>{
   answerRecord.value=1
-  commonality.submitStepOne({userId:'487',answer:Step1.value[0].studentAnswer}).then(res=>{
+  commonality.submitStepOne({userId:JSON.parse(getUserInfo()).userId,answer:Step1.value[0].studentAnswer}).then(res=>{
     if(res.msg.includes('错误')){
       errorCount.value=1
       proxy.$modal.msgError(res.msg);
@@ -196,7 +196,7 @@ const stepTwoanswer=()=>{
     return proxy.$modal.msgWarning("请先下载文章图片再进行此操作")
   }
   answerRecord.value=3
-  commonality.submitStepTwo({userId:'487',answer:Step2.value[0].studentAnswer.join(',')}).then(res=>{
+  commonality.submitStepTwo({userId:JSON.parse(getUserInfo()).userId,answer:Step2.value[0].studentAnswer.join(',')}).then(res=>{
     if(res.msg.includes('错误')){
       errorCount.value=2
       proxy.$modal.msgError(res.msg);
@@ -213,7 +213,7 @@ const downloadArticle=()=>{
     return proxy.$modal.msgWarning("请先完成上一步")
   }
   answerRecord.value=2
-  window.open(`http://szjj.sztzjy.com:9909/api/stu/experimental/downloadImg?userId=${'487'}&TOKEN=${getToken()}`)
+  window.open(`http://szjj.sztzjy.com:9909/api/stu/experimental/downloadImg?userId=${JSON.parse(getUserInfo()).userId}&TOKEN=${getToken()}`)
 }
 
 // 识别文字
@@ -221,7 +221,7 @@ const textarea=ref('')
 // 识别文字函数
 const identifyText=()=>{
   const params={
-    userId:'487',
+    userId:JSON.parse(getUserInfo()).userId,
     context:textarea.value
   }
   if(answerRecord.value<3){
@@ -242,7 +242,7 @@ const submit = () => {
     return proxy.$modal.msgWarning("请先完成实训")
   }
   commonality
-  .submitTask({module:'人工智能',numberOfErrors:errorCount.value>10?10:errorCount.value,taskName:'文字之别OCR',userId:'487'})
+  .submitTask({module:'人工智能',numberOfErrors:errorCount.value>10?10:errorCount.value,taskName:'文字之别OCR',userId:JSON.parse(getUserInfo()).userId})
   .then((response) => {
     proxy.$modal.msgSuccess("提交成功");
     textDialogVisible.value=false
diff --git a/src/views/digitalMarketTech/artificialIntelligence/components/face-recognition.vue b/src/views/digitalMarketTech/artificialIntelligence/components/face-recognition.vue
index 71a2536..eba161e 100644
--- a/src/views/digitalMarketTech/artificialIntelligence/components/face-recognition.vue
+++ b/src/views/digitalMarketTech/artificialIntelligence/components/face-recognition.vue
@@ -146,6 +146,7 @@
 <script setup>
 import * as commonality from "@/api/commonality";
 // import {getUserId} from "@/utils/auth.js";
+import { getUserInfo } from '@/utils/auth'
 const {proxy} = getCurrentInstance();
 import {getAssetsFile} from '@/utils/index.js'
 const SelectVisible=ref(false);
@@ -383,7 +384,7 @@ const submit=()=>{
     proxy.$modal.msgError('请先完成所有步骤');
     return
   }
-    commonality.submitTask({module:'人工智能',numberOfErrors:errorCount.value >10 ?10:errorCount.value,taskName:'人脸识别',userId:'487'}).then((response) => {
+    commonality.submitTask({module:'人工智能',numberOfErrors:errorCount.value >10 ?10:errorCount.value,taskName:'人脸识别',userId:JSON.parse(getUserInfo()).userId}).then((response) => {
     proxy.$modal.msgSuccess("提交任务成功");
     faceDialogVisible.value=false
     restartStatus.value=false
@@ -404,11 +405,11 @@ const restart=()=>{
 // 发送选择图片
 const sendSelect=()=>{
   let arr=IdentifyList.value.map(item=>item.id)
-  commonality.getFaceList({module:'人脸识别',order:Storage.value.id,orders:arr.join(','),userId:'487',numberOfErrors:errorCount.value}).then((response) => {
+  commonality.getFaceList({module:'人脸识别',order:Storage.value.id,orders:arr.join(','),userId:JSON.parse(getUserInfo()).userId,numberOfErrors:errorCount.value}).then((response) => {
   })
 }
 const getList = () => {
-   commonality.getFaceEcho({module:'人脸识别',userId:'487'}).then((response) => {
+   commonality.getFaceEcho({module:'人脸识别',userId:JSON.parse(getUserInfo()).userId}).then((response) => {
     if(response.data==null||restartStatus.value) return
     Characterphoto.value.forEach((item,index)=>{
       if(response.data.selectPicture==item.id){
diff --git a/src/views/digitalMarketTech/artificialIntelligence/components/voice-technology.vue b/src/views/digitalMarketTech/artificialIntelligence/components/voice-technology.vue
index 26d4515..736d653 100644
--- a/src/views/digitalMarketTech/artificialIntelligence/components/voice-technology.vue
+++ b/src/views/digitalMarketTech/artificialIntelligence/components/voice-technology.vue
@@ -397,6 +397,7 @@
 </template>
 <script setup>
 // import { getUserId } from "@/utils/auth.js";
+import { getUserInfo } from '@/utils/auth'
 import * as commonality from "@/api/commonality";
 import { getAssetsFile } from "@/utils/index.js";
 import { onMounted, ref } from "vue";
@@ -458,7 +459,7 @@ const flowobj = ref({
   standardDubbing: "",
   synthesizedSpeech: 0,
   voiceSignalAcquisition: "",
-  userId: '487',
+  userId: JSON.parse(getUserInfo()).userId,
 });
 const EchoState = ref(false);
 const restartState = ref(false);
@@ -735,7 +736,7 @@ const submit = () => {
       module: "人工智能",
       numberOfErrors: errorCount.value > 10 ? 10 : errorCount.value,
       taskName: "语音技术",
-      userId: '487',
+      userId: JSON.parse(getUserInfo()).userId,
     })
     .then((response) => {
       proxy.$modal.msgSuccess("提交任务成功");
@@ -797,7 +798,7 @@ const dialogCloick = () => {
     }
   });
   if (restartState.value) return;
-  commonality.getVoiceEcho({ userId: '487' }).then((res) => {
+  commonality.getVoiceEcho({ userId: JSON.parse(getUserInfo()).userId }).then((res) => {
     if (res.data.length == 0) return;
     if(res.data[0].subState===10){
         EchoState.value = true;
diff --git a/src/views/digitalMarketTech/bigData/components/HadoopHDFS.vue b/src/views/digitalMarketTech/bigData/components/HadoopHDFS.vue
index 7fbde35..1298a67 100644
--- a/src/views/digitalMarketTech/bigData/components/HadoopHDFS.vue
+++ b/src/views/digitalMarketTech/bigData/components/HadoopHDFS.vue
@@ -937,6 +937,7 @@
 </template>
 <script setup>
 // import {getUserId} from '@/utils/auth.js'
+import { getUserInfo } from '@/utils/auth'
 import {submitTrainingTask,trainingOperationRecords,HDFSViewOperationRecords} from '@/api/hash/digitalEconomy.js'
 import { onMounted } from 'vue';
 const { proxy } = getCurrentInstance();
@@ -1292,7 +1293,7 @@ const sendTitle=async()=>{
       module:'大数据',
       numberOfErrors:errorNumber > 10 ? 10 : errorNumber,
       taskName:'hadoop HDFS',
-      userId:'487'
+      userId:JSON.parse(getUserInfo()).userId
     }
     const res=await submitTrainingTask(sendData)
     proxy.$modal.msgSuccess("提交成功！")
@@ -1304,7 +1305,7 @@ const getListEcho=async()=>{
   try{
     const sendData={
       module:'大数据',
-      userId:'487'
+      userId:JSON.parse(getUserInfo()).userId
     }
     const res=await HDFSViewOperationRecords(sendData)
     echoShow(res.data[0])
diff --git a/src/views/digitalMarketTech/bigData/components/digitalMarketing.vue b/src/views/digitalMarketTech/bigData/components/digitalMarketing.vue
index 83f9683..342a318 100644
--- a/src/views/digitalMarketTech/bigData/components/digitalMarketing.vue
+++ b/src/views/digitalMarketTech/bigData/components/digitalMarketing.vue
@@ -518,6 +518,7 @@
 
 <script setup>
   // import {getUserId} from '@/utils/auth.js'
+  import { getUserInfo } from '@/utils/auth'
   import {submitTrainingTask,marketingReadQuestionRecords,digitalSavesAutomatically} from '@/api/hash/digitalEconomy.js'
 import { onMounted } from 'vue';
 const dialogVisible = ref(false);
@@ -1081,7 +1082,7 @@ const sendTask=async()=>{
 const gitListDig=async()=>{
     try{
       const sendData={
-        userId:'487'
+        userId:JSON.parse(getUserInfo()).userId
       }
       const res=await marketingReadQuestionRecords(sendData)
       echoData(res.data.stepEightA)
diff --git a/src/views/digitalMarketTech/bigData/components/hadoop.vue b/src/views/digitalMarketTech/bigData/components/hadoop.vue
index c2710ff..cb376f7 100644
--- a/src/views/digitalMarketTech/bigData/components/hadoop.vue
+++ b/src/views/digitalMarketTech/bigData/components/hadoop.vue
@@ -407,6 +407,7 @@
 </template>
 <script setup>
 // import {getUserId} from '@/utils/auth.js'
+import { getUserInfo } from '@/utils/auth'
 import {hadoopExperimentTraining,hadoopCleansData,hadoopEcho} from '@/api/hash/digitalEconomy.js'
 import { watch } from 'vue';
 const { proxy } = getCurrentInstance();
@@ -463,7 +464,7 @@ const clickRadio=async(item1,index1)=>{
       const sendData={
         context:englishData[selectIndex.value-1],
         select:item1,
-        userId:'487'
+        userId:JSON.parse(getUserInfo()).userId
       }
       const res=await hadoopExperimentTraining(sendData)
       if(res.code===200){
@@ -483,7 +484,7 @@ const selectEnglish=(index)=>{
 }
 watch(async()=>{
   const sendData={
-      userId:'487'
+      userId:JSON.parse(getUserInfo()).userId
     }
     const res=await hadoopCleansData(sendData)
 })
@@ -491,7 +492,7 @@ const isOneHadoop=ref(false)
 const echoHaop=async()=>{
   try{
     const sendData={
-      userId:'487'
+      userId:JSON.parse(getUserInfo()).userId
     }
     const res=await hadoopEcho(sendData)
     if(res.data===1){
diff --git a/src/views/digitalMarketTech/bigData/components/technologyFramework.vue b/src/views/digitalMarketTech/bigData/components/technologyFramework.vue
index edc54ed..a896bd0 100644
--- a/src/views/digitalMarketTech/bigData/components/technologyFramework.vue
+++ b/src/views/digitalMarketTech/bigData/components/technologyFramework.vue
@@ -130,6 +130,7 @@
    </template>
    <script setup>
 //    import {getUserId} from '@/utils/auth.js'
+import { getUserInfo } from '@/utils/auth'
    import {topicPresentation,topicSelection,submitTrainingTask} from '@/api/hash/digitalEconomy.js'
    const { proxy } = getCurrentInstance();
    const frameDialogVisible = ref(false);
@@ -141,7 +142,7 @@
      try{
        const sendData={
          module:'大数据技术框架',
-         userId:'487'
+         userId:JSON.parse(getUserInfo()).userId
        }
          const res=await topicPresentation(sendData)
          data.value=res.data
@@ -190,7 +191,7 @@
        });
        const sendData={
          "StuSelectDetailsDTO":{
-           "userId":'487',
+           "userId":JSON.parse(getUserInfo()).userId,
            "module":"大数据技术框架",
            "stuSelectDTOList":nowStuSelectDTOList
          }
@@ -250,7 +251,7 @@
              module:'大数据',
              numberOfErrors:errorNumber > 10 ? 10 :errorNumber ,
              taskName:'大数据技术框架',
-             userId:'487'
+             userId:JSON.parse(getUserInfo()).userId
          }
        const res=await submitTrainingTask(sendData)
        proxy.$modal.msgSuccess("提交成功")
diff --git a/src/views/digitalMarketTech/bigData/components/whatBigData.vue b/src/views/digitalMarketTech/bigData/components/whatBigData.vue
index 8745c0b..fba03e1 100644
--- a/src/views/digitalMarketTech/bigData/components/whatBigData.vue
+++ b/src/views/digitalMarketTech/bigData/components/whatBigData.vue
@@ -89,6 +89,7 @@
   import {LookBlockchainComposition} from '@/api/economy/bigData.js'
   import {getTopic,submitJudgmentResults} from '@/api/hash/digitalEconomy.js'
 //   import { getUserId } from '@/utils/auth'
+import { getUserInfo } from '@/utils/auth'
   const { proxy } = getCurrentInstance();
   const mlistLength = ref(0);
   const answerData=ref([])
@@ -97,7 +98,7 @@
       const newArray = [];
       const sendData={
         module:'人工智能',
-        userId:'487'
+        userId:JSON.parse(getUserInfo()).userId
       }
       const res = await getTopic(sendData);
       mlist.value = res.data;
@@ -299,7 +300,7 @@
         module: "什么是大数据",
         topicId: item.topicId,
         type: item.topicType,
-        userId: '487'
+        userId: JSON.parse(getUserInfo()).userId
       }
     })
     newTable.forEach(
diff --git a/src/views/learningCenter/Achievement.vue b/src/views/learningCenter/Achievement.vue
index 830a40a..0daa822 100644
--- a/src/views/learningCenter/Achievement.vue
+++ b/src/views/learningCenter/Achievement.vue
@@ -19,49 +19,53 @@
              
              style="width: 100%"
            >
-             <el-table-column prop="sid" label="序号" width="80" align="center" />
-             <el-table-column
-               prop="learningProjects"
-               label="学习项目"
-               width="210"
-               align="center"
-             />
-             <el-table-column
-               prop="assessmentItems"
-               label="考核项目"
-               width="225"
-               align="center"
-             />
-             <el-table-column
-               prop="scoringCriteria"
-               label="计分标准"
-               width="314"
-               align="center"
-             />
-             <el-table-column
-               prop="totalScore"
-               label="总分"
-               width="129"
-               align="center"
-             />
-             <el-table-column
-               prop="scoreWeight"
-               label="成绩权重"
-               width="129"
-               align="center"
-             />
-             <el-table-column
-               prop="completionStatus"
-               label="完成情况"
-               width="225"
-               align="center"
-             />
-             <el-table-column
-               prop="scoreProject"
-               label="得分"
-               width="131"
-               align="center"
-             />
+           <el-table-column prop="sid" label="序号" width="80" align="center" />
+            <el-table-column
+              prop="learningProjects"
+              label="学习项目"
+              align="center"
+            />
+            <el-table-column
+              prop="assessmentItems"
+              label="考核项目"
+              width="150"
+              align="center"
+            />
+            <el-table-column
+              prop="scoringCriteria"
+              label="计分标准"
+              width="314"
+              align="center"
+            />
+            <el-table-column
+              prop="totalScore"
+              label="总分"
+              width="129"
+              align="center"
+            />
+            <el-table-column
+              prop="scoreWeight"
+              label="成绩权重"
+              width="129"
+              align="center"
+            />
+            <el-table-column
+              prop="completionStatus"
+              label="完成情况"
+              width="225"
+              align="center"
+            />
+            <el-table-column
+              prop="schedule"
+              label="进度"
+              align="center"
+            />
+            <el-table-column
+              prop="scoreProject"
+              label="得分"
+              width="131"
+              align="center"
+            />
            </el-table>
          </div>
        </div>
@@ -157,7 +161,7 @@
 //  import {Base64} from 'js-base64'
 //  import { useRouter } from "vue-router";
  import {download} from '@/utils/request.js'
- import { getToken } from '@/utils/auth'
+ import { getToken,getUserInfo } from '@/utils/auth'
  import { ElMessage } from "element-plus";
  
 //  const router=useRouter();
@@ -190,6 +194,7 @@
      scoreProject:null,
      scoreWeight:null,
      scoringCriteria:"",
+     schedule:'0%',
      totalScore:100
    },
    {
@@ -199,6 +204,7 @@
      scoreProject:null,
      scoreWeight:null,
      scoringCriteria:"",
+     schedule:'0%',
      totalScore:100
    },
    {
@@ -208,6 +214,7 @@
      scoreProject:null,
      scoreWeight:null,
      scoringCriteria:"",
+     schedule:'0%',
      totalScore:100
    },
    {
@@ -217,6 +224,7 @@
      scoreProject:null,
      scoreWeight:null,
      scoringCriteria:"",
+     schedule:'0%',
      totalScore:100
    },
    {
@@ -226,6 +234,7 @@
      scoreProject:null,
      scoreWeight:null,
      scoringCriteria:"",
+     schedule:'0%',
      totalScore:100
    },
  ])
@@ -251,22 +260,22 @@
  const finalResult = totalWeightedScore;
  const finalResult1=String(finalResult.toFixed())
  const newData = {
-     sid: "合计",
-     project: "",
-     assessmentItems: "100%",
-     scoringCriteria: "/",
-     totalScore: finalResult1,
-     weight: "",
-     condition: "",
-     score: "",
-   }
+    sid: "合计",
+    project: "",
+    assessmentItems: "100%",
+    scoringCriteria: "/",
+    totalScore: finalResult,
+    weight: "",
+    condition: "",
+    score: "",
+  }
    tableData4.value.push(newData)
  }
  const fileList=ref([])
  const data=ref({
    "ascription":'',
-   "userId":'487',
-   "schoolId":'232'
+   "userId":JSON.parse(getUserInfo()).userId,
+   "schoolId":JSON.parse(getUserInfo()).schoolId
  })
  const handleChange =(info)=> {
        fileList.value.push(info);
@@ -291,7 +300,7 @@
  }
  
  const data2={
-   "userId":'587',
+   "userId":JSON.parse(getUserInfo()).userId,
    "TOKEN":'Bearer '+getToken()
  }
  //下载
@@ -314,7 +323,7 @@
    dialogVisible.value=true
  }
  onMounted(()=>{
-   data.value.module='数字营销'
+  //  data.value.module='数字营销'
    setTimeout(() => {
     cerateGrade()
  }, 300);
@@ -339,6 +348,7 @@
           tableData4.value[0].completionStatus=`阅读${time.value}分钟`
           tableData4.value[0].scoreProject=item.scoreProject
           tableData4.value[0].scoreWeight=weight2
+          tableData4.value[0].schedule=item.schedule+'%'
          }
          if(item.learningProjects==="实验实训"){
            const score=parseFloat(item.scoringCriteria)
@@ -350,6 +360,7 @@
            tableData4.value[3].completionStatus=`输错/选错 ${time.value}次`
            tableData4.value[3].scoreProject=item.scoreProject
            tableData4.value[3].scoreWeight=weight2
+           tableData4.value[3].schedule=item.schedule+'%'
          }
          if(item.learningProjects==="资源学习"){
            const score=parseFloat(item.scoringCriteria)
@@ -361,6 +372,7 @@
            tableData4.value[1].completionStatus=`观看${time.value}分钟`
            tableData4.value[1].scoreProject=item.scoreProject
            tableData4.value[1].scoreWeight=weight2
+           tableData4.value[1].schedule=item.schedule+'%'
          }
          if(item.learningProjects==="学习测评"){
            const time = reactive({value: '/'});
@@ -372,6 +384,7 @@
            tableData4.value[2].completionStatus=`错${time.value}道`
            tableData4.value[2].scoreProject=item.scoreProject
            tableData4.value[2].scoreWeight=weight2
+           tableData4.value[2].schedule=item.schedule+'%'
          }
          if(item.learningProjects==="实训报告"){
            tableData4.value[4].scoringCriteria=`提交实训报告，教师评分`
@@ -380,6 +393,7 @@
              tableData4.value[4].scoreProject=item.scoreProject
            }
            tableData4.value[4].scoreWeight=weight2
+           tableData4.value[4].schedule=item.schedule+'%'
          }
            return {
                ...item
diff --git a/src/views/learningCenter/evaluation.vue b/src/views/learningCenter/evaluation.vue
index 0009fab..59b56f0 100644
--- a/src/views/learningCenter/evaluation.vue
+++ b/src/views/learningCenter/evaluation.vue
@@ -160,13 +160,13 @@
 //  import { useRouter } from "vue-router";
 //  import {Base64} from 'js-base64'
  import * as API from "@/api/prtrait/prtrait.js" 
-//  import { getUserId } from "@/utils/auth";
+ import { getUserInfo } from "@/utils/auth";
  import { ElMessage } from "element-plus";
 import { onMounted } from "vue";
  const data = ref({
    module: "",
    ascription:"",
-   userId: '487',
+   userId: JSON.parse(getUserInfo()).userId,
  });
  const multipleChoiceAnswer = ref();
 //  const router = useRouter();
@@ -214,7 +214,7 @@ import { onMounted } from "vue";
  //哈希函数学习测评
  const answerData=ref([])
  onMounted(()=>{
-   data.value.module='数字营销'
+  //  data.value.module='数字营销'
    submitDialogVisible1()
  })
  const submitDialogVisible1 = () => {
@@ -349,7 +349,7 @@ import { onMounted } from "vue";
    const mlistArray = Object.values(mlist.value);
    const transformedData = {
      stuLearningAssessmentScoreDTO: {
-       userId: '487',
+       userId: JSON.parse(getUserInfo()).userId,,
        learningProjects: "学习测评",
        assessmentItems: "客观题测试",
        stuLearningAssessmentDTOS: mlistArray.map((item) => {
diff --git a/src/views/learningCenter/learningResources.vue b/src/views/learningCenter/learningResources.vue
index af5da05..c04c0c9 100644
--- a/src/views/learningCenter/learningResources.vue
+++ b/src/views/learningCenter/learningResources.vue
@@ -30,7 +30,7 @@
   <script setup>
  import * as API from "@/api/prtrait/prtrait.js" 
   import { getAssetsFile } from '@/utils';
-  // import { getUserId } from '@/utils/auth'
+  import { getUserInfo } from '@/utils/auth'
  import { onMounted } from "vue";
   const getImg=(i)=>{
     return getAssetsFile('images/'+i)
@@ -43,7 +43,7 @@
        "learningProjects":"资源学习",
        "assessmentItems":"观看资源",
        "viewingTime":0,
-       "userId":'487',
+       "userId":JSON.parse(getUserInfo()).userId,
      }
   })
   const item=ref({})