From 639178c8273d16fbc9193bd2ea190299b4cf3482 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E4=BA=86=E4=B8=AA=E7=99=BD?= <543593352@qq.com>
Date: Fri, 22 Nov 2024 10:02:04 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=B8=83=E7=BD=AE?=
 =?UTF-8?q?=EF=BC=9A=E6=9F=A5=E7=9C=8B=E6=8E=A8=E9=80=81=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/classTask/classTaskAssign.vue      | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/src/renderer/src/views/classTask/classTaskAssign.vue b/src/renderer/src/views/classTask/classTaskAssign.vue
index 590a230..ba69513 100644
--- a/src/renderer/src/views/classTask/classTaskAssign.vue
+++ b/src/renderer/src/views/classTask/classTaskAssign.vue
@@ -416,6 +416,7 @@ const queryPushRecords = (row) => {
   // 获取已推送历史
   console.log(row,'查看该行推送历史')
   pushRecordsOpen.value = true;
+  pushRecordsList.value = [];
   pushRecordsLoading.value = true;
   homeworklist({
     entpcourseid: entpcourseid.value,
@@ -875,21 +876,6 @@ watch(() => courseObj.node, (newVal,oldVal) => {
 
 </script>
 
-<!--
-<style>
-  .el-table .hidden-row {
-    display: none !important;
-    /* color: #ccc !important; */
-  }
-  .el-table .father-row {
-    &#45;&#45;el-table-tr-bg-color: #fff;
-  }
-  .el-table .son-row {
-    &#45;&#45;el-table-tr-bg-color: #f0f0f08a;
-  }
-</style>
--->
-
 <style lang="scss" scoped>
 .page-classTaskAssign {
   padding-top: 10px;

From d26af6446a0154ffabc6373a568700e87db485dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Czouyf=E2=80=9D?= <80906036@qq.com>
Date: Mon, 25 Nov 2024 15:19:15 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E8=AF=95=E9=A2=98=E7=BC=96=E8=BE=91-?=
 =?UTF-8?q?=E5=9B=9E=E6=98=BE=E7=9F=A5=E8=AF=86=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../classTask/newClassTaskAssign/index.vue    |  2 +-
 .../questionUpload/quesItem/index.vue         | 26 +++++++++++++------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/index.vue
index 6adcd64..3f39eea 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/index.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/index.vue
@@ -104,7 +104,7 @@
             <div v-if="classWorkForm.worktype == '习题训练'" class="pageRight-list">
               <div :style="{height: '100%', 'overflow': 'auto', 'border':'1px dotted blue','border-radius':'5px', 'background-color': '#f7f7f7'}">
                 <template v-for="(item,index) in classWorkForm.quizlist" :key="item.id">
-                  <div style="margin: 5px; background-color: white">
+                  <div style="margin: 5px; background-color: white; text-align: left;">
                     <div v-html="item.titleFormat" style="padding: 15px 20px 5px 20px"></div>
                     <div style="display: flex;">
                       <el-form-item label="分值">
diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue
index 952a816..c095ac5 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue
@@ -990,16 +990,26 @@ const updateForm= async(item, submitIndex=0, submitType=1) =>{
 
     lessionid.value = props.bookobj.levelSecondId? props.bookobj.levelSecondId : props.bookobj.levelFirstId;
     console.log('lessionid', lessionid.value);
+
     // 拿到当前章节下得所有知识点
-    const res = await getBindlist({ eid: lessionid.value })
-    if (!res.data || res.data.length < 1) {
-      ElMessage.warning('当前章节下未绑定知识点，暂不更新该试题知识点！');
-      curKnowledgePointList.value = [];
+    if( props.bookobj.node.edustage == '高中' && (props.bookobj.node.edusubject == '语文' || props.bookobj.node.edusubject == '英语') ){
+      const res = await listEvaluation({ edusubject: props.bookobj.node.edusubject, edustage: props.bookobj.node.edustage, itemkey: "subject", pageSize: 10 });
+      const id = res.rows[0]?.id;
+      if (id) {
+        const res = await listKnowlegepointFormat({evalId: id, pageNum: 1, pageSize: 5000,});
+        curKnowledgePointList.value = updateKnowledgePoint(res.rows);
+        //console.log('updateKnowledgePoint->', res.rows);
+      }
+    } else {
+      const res = await getBindlist({ eid: lessionid.value })
+      if (!res.data || res.data.length < 1) {
+        ElMessage.warning('当前章节下未绑定知识点，暂不更新该试题知识点！');
+        curKnowledgePointList.value = [];
+      }
+      else {
+        curKnowledgePointList.value = res.data;
+      }
     }
-    else {
-      curKnowledgePointList.value = res.data;
-    }
-    
   }
 
   //item.evalnodeid = '3772b,374112,374233';

From 09e6bec69f93f75d776de01a0b942f2cedd78d3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Czouyf=E2=80=9D?= <80906036@qq.com>
Date: Mon, 25 Nov 2024 17:23:31 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=8F=81=E4=BC=98?=
 =?UTF-8?q?=E7=BD=91api=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/education/entpCourseWork.js       | 17 +++++++++++++++
 src/renderer/src/utils/examQuestion/jyeoo.js  | 21 +++++++++++--------
 .../container/newTask/taskTypeView.vue        |  4 ++--
 src/renderer/src/views/examReport/index.vue   |  2 +-
 4 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/src/renderer/src/api/education/entpCourseWork.js b/src/renderer/src/api/education/entpCourseWork.js
index 0ba694c..04582ba 100644
--- a/src/renderer/src/api/education/entpCourseWork.js
+++ b/src/renderer/src/api/education/entpCourseWork.js
@@ -108,4 +108,21 @@ export function pyOCRAPI(path) {
       imageBas64: path,
     }
   })
+}
+
+
+/**
+ * @desc: 菁优网转发
+ * @return: {*}
+ * @param {*} url
+ * @param {*} config
+ */
+export function getJYPath(url,config) {
+  config.params = config.params?config.params:{}
+  config.params["getjypath"] = url;
+  return request({
+    url: "/jy/proxy",
+    method: config.method||"get",
+    params: config.params
+  })
 }
\ No newline at end of file
diff --git a/src/renderer/src/utils/examQuestion/jyeoo.js b/src/renderer/src/utils/examQuestion/jyeoo.js
index 8fb0a67..d04c34d 100644
--- a/src/renderer/src/utils/examQuestion/jyeoo.js
+++ b/src/renderer/src/utils/examQuestion/jyeoo.js
@@ -1,3 +1,5 @@
+import { getJYPath } from "@/api/education/entpcoursework";
+
 const JY_TOKEN = 'CA82641DA86072DEFD39E287335E035FDA6AEEC0549B58F54F4408734C8683FFAF0585CFA3B25091E588A03A65C66A80F5FF613F539D600954007A35DFFBFDC3C7BB982771C5E13F0918642CFD7596CE3718F06E5579238D92EC809AC6F4C82A9FE4B0E232A67DD3594D4DAC1C219CCBC4A7A093344446107EB11DC317526D0594249DEBBD82B740C794CF5A7065E1982B7779AF16AD25D7';
 const JY_SUBJECT = [
   {id: 10, subject: 'math3', name: '小学数学'},
@@ -27,7 +29,7 @@ const JY_SUBJECT = [
 ];
 
 
-export const JYApiListCT = async (_this, name = '高中历史') => {
+export const JYApiListCT = async (name = '高中历史') => {
   if (name === '初中政治') {
     name = '初中道德与法治';
   }
@@ -35,7 +37,8 @@ export const JYApiListCT = async (_this, name = '高中历史') => {
   if(obj.length < 1) {
     return [];
   }
-  const res = await _this.$requestGetJYW(`/${obj[0].subject}/common`, {
+  getJYPath
+  const res = await getJYPath(`/${obj[0].subject}/common`, {
     headers: {
     authorization: `Token ${JY_TOKEN}`
     },
@@ -63,7 +66,7 @@ export const JYApiListCT = async (_this, name = '高中历史') => {
   return arrCT;
 }
 
-export const JYApiListOriginYear = () => {
+export const JYApiListOriginYear = async () => {
   const arrYear = [{label: '不限', value: '-1'}];
   let i = 0;
   for( ; i < 10; i++) {
@@ -78,7 +81,7 @@ export const JYApiListOriginYear = () => {
   return arrYear;
 }
 
-export const JYApiListSO = async (_this, name = '高中历史') => {
+export const JYApiListSO = async (name = '高中历史') => {
   if (name === '初中政治') {
     name = '初中道德与法治';
   }
@@ -87,7 +90,7 @@ export const JYApiListSO = async (_this, name = '高中历史') => {
   if(obj.length < 1) {
     return [];
   }
-  const res = await _this.$requestGetJYW(`/${obj[0].subject}/common`, {
+  const res = await getJYPath(`/${obj[0].subject}/common`, {
     headers: {
     authorization: `Token ${JY_TOKEN}`
     },
@@ -104,7 +107,7 @@ export const JYApiListSO = async (_this, name = '高中历史') => {
 
 
 
-export const JYApiListPoint = async (_this, name = '高中历史') => {
+export const JYApiListPoint = async (name = '高中历史') => {
   if (name === '初中政治') {
     name = '初中道德与法治';
   }
@@ -113,7 +116,7 @@ export const JYApiListPoint = async (_this, name = '高中历史') => {
   if(obj.length < 1) {
     return [];
   }
-  const res = await _this.$requestGetJYW(`/${obj[0].subject}/point`, {
+  const res = await getJYPath(`/${obj[0].subject}/point`, {
     headers: {
     authorization: `Token ${JY_TOKEN}`
     },
@@ -129,7 +132,7 @@ export const JYApiListPoint = async (_this, name = '高中历史') => {
  * @desc: 获取菁优网的版本内容
  * @return: {*}
  */
-export const JYApiListVersion = async (_this, query, hasPoints=true) => {
+export const JYApiListVersion = async (query, hasPoints=true) => {
   const listVersion = {
     status: 0,
     msg: '',
@@ -148,7 +151,7 @@ export const JYApiListVersion = async (_this, query, hasPoints=true) => {
     listVersion.msg = `[${name}]未找到对应菁优网教材版本, 请检查学段或学科是否匹配!`;
     return listVersion;
   }
-  const JYBook = await _this.$requestGetJYW(`/${result[0].subject}/book2`, {
+  const JYBook = await getJYPath(`/${result[0].subject}/book2`, {
     headers: {
       // JYToken仅占位, 实际后续已未使用该token
       authorization: `Token ${JY_TOKEN}`
diff --git a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
index 50378b1..94263d1 100644
--- a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
+++ b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
@@ -1008,7 +1008,7 @@ const initPageParams = () => {
 onMounted(async() => {
   // 获取当前学科下的试题题型
   const name = userStore.edustage + userStore.edusubject;
-  const jyCT = await JYApiListCT(proxy, name);
+  const jyCT = await JYApiListCT(name);
   if (jyCT.length == 0) {
     ElMessage.error('获取题型失败!');
     return;
@@ -1016,7 +1016,7 @@ onMounted(async() => {
   entpCourseWorkTypeList.value = jyCT;
   // 获取当前学科下的试题年份
   entpCourseWorkYearList.value = JYApiListOriginYear();
-  entpCourseWorkGroupList.value = await JYApiListSO(proxy, name);
+  entpCourseWorkGroupList.value = await JYApiListSO(name);
 
 })
 
diff --git a/src/renderer/src/views/examReport/index.vue b/src/renderer/src/views/examReport/index.vue
index e0e4d5d..e42669c 100644
--- a/src/renderer/src/views/examReport/index.vue
+++ b/src/renderer/src/views/examReport/index.vue
@@ -187,7 +187,7 @@ const getWorkType = async (data) => {
   if (selName === curName) {
     return;
   }
-  const jyCT = await JYApiListCT(proxy, selName);
+  const jyCT = await JYApiListCT(selName);
   if (jyCT.length == 0) {
     ElMessage.error('获取题型失败!');
     return;

From e405eb041bf5eb1acfcfedaa30964011fbe0096b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Czouyf=E2=80=9D?= <80906036@qq.com>
Date: Tue, 26 Nov 2024 17:06:46 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=AB=A0=E8=8A=82?=
 =?UTF-8?q?=E4=B8=8B=E7=9F=A5=E8=AF=86=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/store/modules/classTask.js   | 59 ++++++++++++++++++-
 src/renderer/src/utils/examQuestion/jyeoo.js  | 52 +++++++++++-----
 .../newClassTaskAssign/Right/index.vue        | 10 ++--
 .../classTask/newClassTaskAssign/index.vue    |  8 +--
 .../newClassTaskAssign/myQuestion/index.vue   | 15 ++++-
 .../questionUpload/quesItem/index.vue         | 35 +++++++----
 .../searchQuestion/index.vue                  | 16 ++++-
 src/renderer/src/views/desktop/index.vue      | 10 +++-
 src/renderer/src/views/profile/userInfo.vue   | 10 +++-
 9 files changed, 173 insertions(+), 42 deletions(-)

diff --git a/src/renderer/src/store/modules/classTask.js b/src/renderer/src/store/modules/classTask.js
index f0008cf..18b06b0 100644
--- a/src/renderer/src/store/modules/classTask.js
+++ b/src/renderer/src/store/modules/classTask.js
@@ -1,16 +1,21 @@
 import { defineStore } from 'pinia'
 import {  } from '@/api/classTask/index.js'
 import { listClassmain } from '@/api/classManage/index'
+import { JYApiListCT, JYApiListOriginYear, JYApiListSO} from "@/utils/examQuestion/jyeoo"
 
 const useClassTaskStore = defineStore('classTask',{
   state: () => ({
     classListIds: [],
+    jyCT: [],
+    jySO: [],
+    jyYear: [],
   }),
   actions: {
     listClassmain(params) {
       // 获取班级列表
       return new Promise((resolve, reject) => {
-        listClassmain(params)
+        const education = params.edustage + params.edusubject;
+        listClassmain(education)
           .then((res) => {
             this.classListIds = res.rows&&res.rows.map((item) => item.id)
             resolve(res)
@@ -20,9 +25,61 @@ const useClassTaskStore = defineStore('classTask',{
           })
       })
     },
+
+    // 根据学科和学段获取菁优网对应得年份、题源、题型
+    initJYInfo(params){
+      const education = params.edustage + params.edusubject;
+      Promise.all([getJYYear(), getJYSO(education), getJYCT(education)])
+        .then(results => {
+          console.log('更新第三方题源+题型succ:', results);
+          this.jyYear = results[0];
+          this.jyCT = results[2];
+          this.jySO = results[1];
+        })
+        .catch(error => {
+          console.error('更新第三方题源+题型err:', error);
+          this.jyYear = [];
+          this.jySO = [];
+          this.jyCT = [];
+        });
+    },
   },
   persist: true
 })
 export default useClassTaskStore
 
+const getJYYear = () => {
+  return new Promise((resolve, reject) => {
+    JYApiListOriginYear()
+      .then((res) => {
+        resolve(res)
+      })
+      .catch((error) => {
+        reject(error)
+      })
+  })
+}
 
+const getJYSO = (params) => {
+  return new Promise((resolve, reject) => {
+    JYApiListSO(params)
+      .then((res) => {
+        resolve(res)
+      })
+      .catch((error) => {
+        reject(error)
+      })
+  })
+}
+
+const getJYCT = (params) => {
+  return new Promise((resolve, reject) => {
+    JYApiListCT(params)
+      .then((res) => {
+        resolve(res)
+      })
+      .catch((error) => {
+        reject(error)
+      })
+  })
+}
\ No newline at end of file
diff --git a/src/renderer/src/utils/examQuestion/jyeoo.js b/src/renderer/src/utils/examQuestion/jyeoo.js
index d04c34d..2371efb 100644
--- a/src/renderer/src/utils/examQuestion/jyeoo.js
+++ b/src/renderer/src/utils/examQuestion/jyeoo.js
@@ -28,7 +28,30 @@ const JY_SUBJECT = [
   {id: 39, subject: 'history2', name: '高中历史'},
 ];
 
+/**
+ * @desc: 获取年份
+ * @return: {*}
+ */
+export const JYApiListOriginYear = async () => {
+  const arrYear = [{label: '不限', value: '-1'}];
+  let i = 0;
+  for( ; i < 5; i++) {
+    const year  = new Date().getFullYear();
+    const s ={
+      label: `${year - i}`, 
+      value: `${year - i}`, 
+    }
+    arrYear.push(s);
+  };
+  //arrYear.push({label: '更早', value: '0'})
+  return arrYear;
+}
 
+/**
+ * @desc: 根据学科+学段获取菁优网-题型
+ * @return: {*}
+ * @param {*} name 学科+学科
+ */
 export const JYApiListCT = async (name = '高中历史') => {
   if (name === '初中政治') {
     name = '初中道德与法治';
@@ -66,21 +89,12 @@ export const JYApiListCT = async (name = '高中历史') => {
   return arrCT;
 }
 
-export const JYApiListOriginYear = async () => {
-  const arrYear = [{label: '不限', value: '-1'}];
-  let i = 0;
-  for( ; i < 10; i++) {
-    const year  = new Date().getFullYear();
-    const s ={
-      label: `${year - i}`, 
-      value: `${year - i}`, 
-    }
-    arrYear.push(s);
-  };
-  //arrYear.push({label: '更早', value: '0'})
-  return arrYear;
-}
 
+/**
+ * @desc: 根据学科+学段获取菁优网-题源
+ * @return: {*}
+ * @param {*} name 学科+学科
+ */
 export const JYApiListSO = async (name = '高中历史') => {
   if (name === '初中政治') {
     name = '初中道德与法治';
@@ -106,7 +120,11 @@ export const JYApiListSO = async (name = '高中历史') => {
 }
 
 
-
+/**
+ * @desc: 根据学科+学段获取菁优网-知识点
+ * @return: {*}
+ * @param {*} name 学科+学科
+ */
 export const JYApiListPoint = async (name = '高中历史') => {
   if (name === '初中政治') {
     name = '初中道德与法治';
@@ -129,8 +147,10 @@ export const JYApiListPoint = async (name = '高中历史') => {
 
 
 /**
- * @desc: 获取菁优网的版本内容
+ * @desc: 根据查询条件获取菁优网-教材版本
  * @return: {*}
+ * @param {*} query {}
+ * @param {*} hasPoints
  */
 export const JYApiListVersion = async (query, hasPoints=true) => {
   const listVersion = {
diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/Right/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/Right/index.vue
index b338d76..b911c6c 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/Right/index.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/Right/index.vue
@@ -29,11 +29,11 @@ import { ElMessage } from 'element-plus'
 
 const emit = defineEmits(['itemClick'])
 const items = shallowRef([
-  { title: '自主搜题', description: '上千万高质量习题资源，历届考试真题，每道题均有习题解析', icon: '#icon-soutibao-',type:'default' },
-  { title: '校本题库', description: '本校公共题库资源。', icon: '#icon-soutibao-',type:'default' },
-  { title: '个人题库', description: '老师上传维护自己的个人题库。', icon: '#icon-soutibao-',type:'default' },
-  { title: '智能推荐', description: '通过对学生的薄弱知识点分析，推送不同难度的习题进行强化训练。', icon: '#icon-tubiao_wuxing-',type:'default' },
-  { title: '课堂展示', description: '通过课堂白板绘制作业，提升学生的创作思维能力。', icon: '#icon-huaban',type:'primary' },
+  { title: '自主搜题', description: '上千万高质量习题资源，历届考试真题，每道题均有习题解析', icon: '#icon-soutibao-',type:'primary' },
+  { title: '校本题库', description: '本校公共题库资源。', icon: '#icon-soutibao-',type:'primary' },
+  { title: '个人题库', description: '老师上传维护自己的个人题库。', icon: '#icon-soutibao-',type:'primary' },
+  { title: '智能推荐', description: '通过对学生的薄弱知识点分析，推送不同难度的习题进行强化训练。', icon: '#icon-tubiao_wuxing-',type:'primary' },
+  { title: '课堂展示', description: '通过课堂白板绘制作业，提升学生的创作思维能力。', icon: '#icon-huaban',type:'danger' },
   { title: '常规作业', description: '推送pdf、视频、音频、图片，学生可以拍照上传。', icon: '#icon-zhaoxiangji',type:'danger' },
   { title: 'AI设计作业', description: '通过AI助手，根据课标、教材、考试等分析结果，智能创建作业。', icon: '#icon-jiqiren_o',type:'danger' },
   { title: '习题上传', description: '自己上传个人题库。', icon: '#icon-shangchuan',type:'danger' },
diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/index.vue
index 3f39eea..55ff885 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/index.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/index.vue
@@ -126,10 +126,10 @@
   </div>
 </template>
 <script setup>
-import { onMounted, ref,watch, reactive, getCurrentInstance,nextTick } from 'vue'
+import { onMounted, ref, watch, reactive, getCurrentInstance, nextTick } from 'vue'
 import { ElMessage } from 'element-plus'
 import { cloneDeep } from 'lodash'
-import { Plus } from '@element-plus/icons-vue'
+import { Plus, Delete } from '@element-plus/icons-vue'
 import { delClasswork } from '@/api/teaching/classwork'
 import {listEntpcoursework, listEntpcourseworkNew, getEntpcoursework} from '@/api/education/entpCourseWork'
 import { addClassworkReturnId } from '@/api/teaching/classwork'
@@ -144,10 +144,6 @@ import whiteboard from '@/components/whiteboard/whiteboard.vue'
 import FileUpload from "@/components/FileUpload/index.vue";
 import Right from './Right/index.vue'
 
-import {
-  Delete
-} from '@element-plus/icons-vue'
-
 import SetHomework from '@/components/set-homework/index.vue'
 import { useGetHomework } from '@/hooks/useGetHomework'
 import { sessionStore } from '@/utils/store'
diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue
index 27be20e..e463904 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue
@@ -129,12 +129,15 @@ import { processList } from '@/hooks/useProcessList'
 
 import { debounce } from '@/utils/comm' 
 import useUserStore from '@/store/modules/user'
+import useClassTaskStore from '@/store/modules/classTask'
 
 const router = useRouter()
 // 定义要发送的emit事件
 const emit = defineEmits(['addQuiz'])
 const { proxy } = getCurrentInstance()
 const userStore = useUserStore().user
+const classTaskStore = useClassTaskStore();
+
 const props = defineProps({
   bookobj: {
     type: Object,
@@ -218,6 +221,16 @@ const dlgImportSingle = reactive({
 })
 
 onMounted(() => {
+  if (classTaskStore.jyCT.length>0) {
+    entpCourseWorkTypeList.value = classTaskStore.jyCT;
+  }
+  if (classTaskStore.jySO.length>0) {
+    entpCourseWorkGroupList.value = classTaskStore.jySO;
+  }
+  if (classTaskStore.jyYear.length>0) {
+    entpCourseWorkYearList.value = classTaskStore.jyYear;
+  }
+
   debounceQueryData(); // 查询习题列表
 })
 
@@ -336,7 +349,7 @@ const handleQueryFromEntpCourseWork= async (queryType) => {
       } else if (clueres.rows[i].cluetag == 'mapview') {
         clueres.rows[i].worktype = '学科定位';
       }
-      console.log("clueres.rows[i].childlist",clueres.rows[i].childlist);
+      //console.log("clueres.rows[i].childlist",clueres.rows[i].childlist);
       if (clueres.rows[i].childlist != '') {
         clueres.rows[i].childArray = JSON.parse('['+clueres.rows[i].childlist+']');
         for (var j=0; j<clueres.rows[i].childArray.length; j++) {
diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue
index c095ac5..ad1d325 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue
@@ -8,7 +8,7 @@
   <el-form ref="questFormRef" :model="questForm" :rules="MainRules" label-width="80px">
     <el-form-item label="题型" prop="worktype">
       <el-select v-model="questForm.worktype" placeholder="请选择题型" style="width:20%" :disabled="questForm.id==0?false:true">
-        <el-option v-for="item in fromOptions.type" :key="item.Key" :label="item.Value" :value="item.Value"></el-option>
+        <el-option v-for="item in fromOptions.type" :key="item.value" :label="item.label" :value="item.label"></el-option>
       </el-select>
       <el-tag v-if="questForm.worktype=='填空题'" type="danger" style=" margin-left: 10px ">温馨提示：填空题题目的填空位置，下划线请连续输入3-10个 _
         符号。eg：今天___好日子。</el-tag>
@@ -414,7 +414,11 @@ import { isJson } from "@/hooks/useProcessList";
 
 import Tinymce from "@/components/tinymce/tinymce.vue"; // 富文本编辑器
 import useUserStore from '@/store/modules/user'
+import useClassTaskStore from '@/store/modules/classTask'
+
 const userStore = useUserStore().user
+const classTaskStore = useClassTaskStore();
+
 const { proxy } = getCurrentInstance()
 // 定义要发送的emit事件
 const emit = defineEmits(['submit-exam-single-callback','cancel-exam-single-callback','cropper-exam-form-item'])
@@ -450,12 +454,13 @@ const fromOptions = reactive({
   //题型
   type: [
     //{"Key": 0, "Value": "不限"},
-    {"Key": 1, "Value": "单选题"},
-    {"Key": 4, "Value": "多选题"},
-    {"Key": 2, "Value": "填空题"},
-    {"Key": 5, "Value": "判断题"},
-    {"Key": 6, "Value": "主观题"},
-    {"Key": 3, "Value": "复合题"},
+    {value: 0, label: "不限"},
+    {value: 1, label: "单选题"},
+    {value: 2, label: "填空题"},
+    {value: 3, label: "多选题"},
+    {value: 4, label: "判断题"},
+    {value: 5, label: "主观题"},
+    {value: 6, label: "复合题"},
     //{"Key": 4, "Value": "辨析评析题"},
   ],
   // 复合题型
@@ -476,7 +481,7 @@ const questForm = reactive({
   id: 0,
   title: '',
   worktype: '单选题',
-  worktagYear: '2024',
+  worktagYear: 2024,
   //worktagArea: '',
   worktag: '',
   workgroup: 0,
@@ -602,8 +607,8 @@ onMounted(() => {
     lessionId: lessionid,
     fileAlias: '单题上传',
   };
+  
   // 获取最新年份
-  // yearList = 
   for(var i = 0; i < 15; i++) {
     const year  = new Date().getFullYear();
     const s ={
@@ -613,7 +618,17 @@ onMounted(() => {
     yearList.value.push(s)
   };
 
-  // 拿到当前章节下得所有知识点
+  // 更新第三方题型、题源
+  if (classTaskStore.jyCT.length>0) {
+    const flagDict = ['单选题', '多选题', '判断题', '填空题'];
+    fromOptions.type = classTaskStore.jyCT.filter(item => flagDict.includes(item.label));
+  }
+  if (classTaskStore.jySO.length>0) {
+    fromOptions.flag = classTaskStore.jySO;
+  }
+  // if (classTaskStore.jyYear.length>0) {
+  //   yearList.value = classTaskStore.jyYear;
+  // }
 })
 
 
diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/searchQuestion/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/searchQuestion/index.vue
index e3655b0..2921ae7 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/searchQuestion/index.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/searchQuestion/index.vue
@@ -20,6 +20,7 @@
       <el-col :span="10">
         <el-form-item label="知识点" label-width="70">
           <el-cascader
+            disabled
             v-model="entpCourseWorkQueryParams.point"
             clearable
             style="width: 100%"
@@ -118,11 +119,14 @@ import { useGetHomework } from '@/hooks/useGetHomework'
 import { sessionStore } from '@/utils/store'
 import {throttle,debounce } from '@/utils/comm' 
 import useUserStore from '@/store/modules/user'
+import useClassTaskStore from '@/store/modules/classTask'
 
 // 定义要发送的emit事件
 const emit = defineEmits(['addQuiz'])
 const { proxy } = getCurrentInstance()
 const userStore = useUserStore().user
+const classTaskStore = useClassTaskStore();
+
 const props = defineProps({
   bookobj: {
     type: Object,
@@ -205,6 +209,16 @@ const workResource = reactive({
 }); // 作业资源
 
 onMounted(() => {
+  if (classTaskStore.jyCT.length>0) {
+    entpCourseWorkTypeList.value = classTaskStore.jyCT;
+  }
+  if (classTaskStore.jySO.length>0) {
+    entpCourseWorkGroupList.value = classTaskStore.jySO;
+  }
+  if (classTaskStore.jyYear.length>0) {
+    entpCourseWorkYearList.value = classTaskStore.jyYear;
+  }
+
   debounceQueryData(); // 查询习题列表
 })
 
@@ -342,7 +356,7 @@ const handleQueryFromEntpCourseWork= async (queryType) => {
       } else if (clueres.rows[i].cluetag == 'mapview') {
         clueres.rows[i].worktype = '学科定位';
       }
-      console.log("clueres.rows[i].childlist",clueres.rows[i].childlist);
+      //console.log("clueres.rows[i].childlist",clueres.rows[i].childlist);
       if (clueres.rows[i].childlist != '') {
         clueres.rows[i].childArray = JSON.parse('['+clueres.rows[i].childlist+']');
         for (var j=0; j<clueres.rows[i].childArray.length; j++) {
diff --git a/src/renderer/src/views/desktop/index.vue b/src/renderer/src/views/desktop/index.vue
index 609694d..cf6351d 100644
--- a/src/renderer/src/views/desktop/index.vue
+++ b/src/renderer/src/views/desktop/index.vue
@@ -58,6 +58,11 @@ import { useGetSubject } from '@/hooks/useGetSubject'
 import { sessionStore } from '@/utils/store'
 import { debounce } from 'lodash'
 
+import useUserStore from '@/store/modules/user'
+import useClassTaskStore from '@/store/modules/classTask'
+const userStore = useUserStore()
+const classTaskStore = useClassTaskStore();
+
 const router = useRouter()
 const { ipcRenderer } = window.electron || {}
 const chartDom = ref(null);
@@ -206,11 +211,14 @@ ipcRenderer.on('minWinResize', debounce((e, data) =>{
 }, 100))
 
 onMounted(async ()=>{
-
   await useGetSubject()
   // 确保DOM 渲染完成
   await nextTick()
   chartInstance = echarts.init(chartDom.value)
+
+  // 更新第三方题型题类
+  await classTaskStore.initJYInfo(userStore.user);
+
   const option = {
 
     tooltip: {
diff --git a/src/renderer/src/views/profile/userInfo.vue b/src/renderer/src/views/profile/userInfo.vue
index 6216179..0dc8c93 100644
--- a/src/renderer/src/views/profile/userInfo.vue
+++ b/src/renderer/src/views/profile/userInfo.vue
@@ -40,6 +40,9 @@ import {listClassmain} from '@/api/classManage/index'
 //班级列表
 import ClassList from './components/classList.vue'
 
+import useClassTaskStore from '@/store/modules/classTask'
+const classTaskStore = useClassTaskStore();
+
 //班级列表
 const classList = ref([])
 // 未加入的班级
@@ -163,10 +166,11 @@ function submit() {
   proxy.$refs.userRef.validate((valid) => {
     if (valid) {
       userStore.user.avatar = userStore.user.avatar
+      console.log('userStore更新前', userStore.user);
       updateUserInfo(userStore.user).then((response) => {
         if(response.code == 200){
           userStore.login({username:userStore.user.userName,password:userStore.user.plainpwd}).then(() => {
-            userStore.getInfo().then(res => {
+            userStore.getInfo().then(async res => {
               if(res.code === 200){
                 let sessionSubject = {
                   bookList: null, 
@@ -177,6 +181,10 @@ function submit() {
                 }
                 sessionStore.set( 'subject', sessionSubject)
                 ElMessage.success('修改成功')
+
+                console.log('userStore更新后', res);
+                await classTaskStore.initJYInfo(userStore.user);
+                //console.log('classTaskStore->', classTaskStore);
               }else{
                 ElMessage.error(response.msg)
               }

From d8c45563935add1ad6732589481c6b74d3316a75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E4=BA=86=E4=B8=AA=E7=99=BD?= <543593352@qq.com>
Date: Wed, 27 Nov 2024 10:01:53 +0800
Subject: [PATCH 05/10] 1

---
 .../src/hooks/useClassTaskWorkQuest.js        | 86 +++++++++++++++++++
 src/renderer/src/store/modules/classTask.js   |  2 +
 .../newClassTaskAssign/myQuestion/index.vue   | 21 +++--
 3 files changed, 104 insertions(+), 5 deletions(-)
 create mode 100644 src/renderer/src/hooks/useClassTaskWorkQuest.js

diff --git a/src/renderer/src/hooks/useClassTaskWorkQuest.js b/src/renderer/src/hooks/useClassTaskWorkQuest.js
new file mode 100644
index 0000000..7837ec2
--- /dev/null
+++ b/src/renderer/src/hooks/useClassTaskWorkQuest.js
@@ -0,0 +1,86 @@
+import { onMounted, ref, nextTick, watch, reactive, getCurrentInstance, computed } from 'vue';
+import { JYApiListCT, JYApiListOriginYear, JYApiListSO} from "@/utils/examQuestion/jyeoo";
+import useUserStore from '@/store/modules/user';
+const userStore = useUserStore().user;
+import useClassTaskStore from '@/store/modules/classTask.js'
+
+
+export default () => {   
+  const { proxy } = getCurrentInstance();
+  const { } = useClassTaskStore();
+  
+  const workTypeList = ref([]); // 习题查询条件 - 题型
+  const workGroupList = ref([]); // 习题查询条件 - 题源
+  const workYearList = ref([]); // 习题查询条件 - 年份(label: '2024', value: '2024')
+  const workKeyWord = ref(''); // 习题查询条件 - 关键字
+
+
+  const name = userStore.edustage + userStore.edusubject; // 获取当前学科下的题型
+
+  // 获取题型列表
+  const getWorkTypeList =async() =>{
+    const jyCT = await JYApiListCT(proxy, name);
+    if (jyCT.length == 0) {
+      // ElMessage.error('获取题型失败!');
+      // return;
+      workTypeList.value = [
+        {value: 0, label: "不限"},
+        {value: 1, label: "单选题"},
+        {value: 2, label: "填空题"},
+        {value: 3, label: "多选题"},
+        {value: 4, label: "判断题"},
+        {value: 5, label: "主观题"},
+        {value: 6, label: "复合题"},
+      ]; // 习题查询条件 - 题型
+      return;
+    }
+    workTypeList.value = jyCT;
+  };
+
+  // 获取题源列表
+  const getWorkGroupList =async() =>{
+    const jySO = await JYApiListSO(proxy, name);
+    if (jySO.length == 0) {
+      workGroupList.value = [{
+        Key: -1,
+        Value: '不限',
+      }, {
+        Key: 1,
+        Value: '真题',
+      }, {
+        Key: 0,
+        Value: '非真题',
+      }];
+      return;
+    }
+    workGroupList.value = jySO;
+  };
+
+  //获取年份
+  const getWorkYearList =()=> {
+    const now = new Date();
+    const year = now.getFullYear(); //年份
+    workYearList.value = [];
+    const arrYear = [{label: '不限', value: '-1'}]; // 默认添加不限选项
+    for(let i = 0; i < 10; i++) {
+      arrYear.push({label: `${year - i}`, value: `${year - i}`})
+    }
+    workYearList.value = arrYear;
+  };
+
+
+  const inits= () => {
+    getWorkTypeList();
+    getWorkGroupList();
+    getWorkYearList();
+  };
+
+
+  return {
+    workTypeList,
+    workGroupList,
+    workYearList,
+    workKeyWord,
+    inits,
+  }
+}
\ No newline at end of file
diff --git a/src/renderer/src/store/modules/classTask.js b/src/renderer/src/store/modules/classTask.js
index f0008cf..6ee57aa 100644
--- a/src/renderer/src/store/modules/classTask.js
+++ b/src/renderer/src/store/modules/classTask.js
@@ -5,6 +5,8 @@ import { listClassmain } from '@/api/classManage/index'
 const useClassTaskStore = defineStore('classTask',{
   state: () => ({
     classListIds: [],
+    jyCT: [],// 青优网题型列表
+
   }),
   actions: {
     listClassmain(params) {
diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue
index 27be20e..ff664ff 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue
@@ -5,7 +5,7 @@
       <el-col :span="7">
         <el-form-item label="题型" label-width="70">
           <el-select v-model="entpCourseWorkQueryParams.worktype" placeholder="请选择" >
-            <el-option v-for="(item, index) in entpCourseWorkTypeList" :key="index" :label="item.label" :value="item">
+            <el-option v-for="(item, index) in workTypeList" :key="index" :label="item.label" :value="item">
             </el-option>
           </el-select>
         </el-form-item>
@@ -13,14 +13,14 @@
       <el-col :span="7">
         <el-form-item label="题源" label-width="70">
           <el-select v-model="entpCourseWorkQueryParams.workgroup" placeholder="请选择" >
-            <el-option v-for="(item, index) in entpCourseWorkGroupList" :key="index" :label="item.Value" :value="item.Key" ></el-option>
+            <el-option v-for="(item, index) in workGroupList" :key="index" :label="item.Value" :value="item.Key" ></el-option>
           </el-select>
         </el-form-item>
       </el-col>
       <el-col :span="7">
         <el-form-item label="年份" label-width="70">
           <el-select v-model="entpCourseWorkQueryParams.yearStr" placeholder="请选择" >
-            <el-option v-for="(item, index) in entpCourseWorkYearList" :key="index" :label="item.label" :value="item.value"></el-option>
+            <el-option v-for="(item, index) in workYearList" :key="index" :label="item.label" :value="item.value"></el-option>
           </el-select>
         </el-form-item>
       </el-col>
@@ -125,12 +125,22 @@ import { delEntpcoursework, updateEntpcoursework } from "@/api/education/entpCou
 import examDetailsDrawer from '@/components/exam-question/examDetailsDrawer.vue'
 import QuesItem from "@/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue";
 import { useHandleData }  from "@/hooks/useHandleData";
-import { processList } from '@/hooks/useProcessList'
+import { processList } from '@/hooks/useProcessList';
+import useClassTaskWorkQuest from '@/hooks/useClassTaskWorkQuest';
+
 
 import { debounce } from '@/utils/comm' 
 import useUserStore from '@/store/modules/user'
 
 const router = useRouter()
+const {
+  workTypeList,
+  workGroupList,
+  workYearList,
+  workKeyWord,
+  inits,
+} = useClassTaskWorkQuest();
+
 // 定义要发送的emit事件
 const emit = defineEmits(['addQuiz'])
 const { proxy } = getCurrentInstance()
@@ -218,9 +228,10 @@ const dlgImportSingle = reactive({
 })
 
 onMounted(() => {
+  inits();
   debounceQueryData(); // 查询习题列表
 })
-
+/** 前往习题上传页面 */
 const goToQuestUpload = () => {
   router.push({ path: '/model/questionUpload', query: { courseObj: JSON.stringify(props.bookobj) } });
 }

From b967c684d60475af87878733fd80c1c71936d40a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E4=BA=86=E4=B8=AA=E7=99=BD?= <543593352@qq.com>
Date: Wed, 27 Nov 2024 10:11:35 +0800
Subject: [PATCH 06/10] 1

---
 .../src/hooks/useClassTaskWorkQuest.js        | 86 -------------------
 .../newClassTaskAssign/myQuestion/index.vue   | 10 +--
 2 files changed, 1 insertion(+), 95 deletions(-)
 delete mode 100644 src/renderer/src/hooks/useClassTaskWorkQuest.js

diff --git a/src/renderer/src/hooks/useClassTaskWorkQuest.js b/src/renderer/src/hooks/useClassTaskWorkQuest.js
deleted file mode 100644
index 7837ec2..0000000
--- a/src/renderer/src/hooks/useClassTaskWorkQuest.js
+++ /dev/null
@@ -1,86 +0,0 @@
-import { onMounted, ref, nextTick, watch, reactive, getCurrentInstance, computed } from 'vue';
-import { JYApiListCT, JYApiListOriginYear, JYApiListSO} from "@/utils/examQuestion/jyeoo";
-import useUserStore from '@/store/modules/user';
-const userStore = useUserStore().user;
-import useClassTaskStore from '@/store/modules/classTask.js'
-
-
-export default () => {   
-  const { proxy } = getCurrentInstance();
-  const { } = useClassTaskStore();
-  
-  const workTypeList = ref([]); // 习题查询条件 - 题型
-  const workGroupList = ref([]); // 习题查询条件 - 题源
-  const workYearList = ref([]); // 习题查询条件 - 年份(label: '2024', value: '2024')
-  const workKeyWord = ref(''); // 习题查询条件 - 关键字
-
-
-  const name = userStore.edustage + userStore.edusubject; // 获取当前学科下的题型
-
-  // 获取题型列表
-  const getWorkTypeList =async() =>{
-    const jyCT = await JYApiListCT(proxy, name);
-    if (jyCT.length == 0) {
-      // ElMessage.error('获取题型失败!');
-      // return;
-      workTypeList.value = [
-        {value: 0, label: "不限"},
-        {value: 1, label: "单选题"},
-        {value: 2, label: "填空题"},
-        {value: 3, label: "多选题"},
-        {value: 4, label: "判断题"},
-        {value: 5, label: "主观题"},
-        {value: 6, label: "复合题"},
-      ]; // 习题查询条件 - 题型
-      return;
-    }
-    workTypeList.value = jyCT;
-  };
-
-  // 获取题源列表
-  const getWorkGroupList =async() =>{
-    const jySO = await JYApiListSO(proxy, name);
-    if (jySO.length == 0) {
-      workGroupList.value = [{
-        Key: -1,
-        Value: '不限',
-      }, {
-        Key: 1,
-        Value: '真题',
-      }, {
-        Key: 0,
-        Value: '非真题',
-      }];
-      return;
-    }
-    workGroupList.value = jySO;
-  };
-
-  //获取年份
-  const getWorkYearList =()=> {
-    const now = new Date();
-    const year = now.getFullYear(); //年份
-    workYearList.value = [];
-    const arrYear = [{label: '不限', value: '-1'}]; // 默认添加不限选项
-    for(let i = 0; i < 10; i++) {
-      arrYear.push({label: `${year - i}`, value: `${year - i}`})
-    }
-    workYearList.value = arrYear;
-  };
-
-
-  const inits= () => {
-    getWorkTypeList();
-    getWorkGroupList();
-    getWorkYearList();
-  };
-
-
-  return {
-    workTypeList,
-    workGroupList,
-    workYearList,
-    workKeyWord,
-    inits,
-  }
-}
\ No newline at end of file
diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue
index 3f84258..9daa584 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue
@@ -126,7 +126,6 @@ import examDetailsDrawer from '@/components/exam-question/examDetailsDrawer.vue'
 import QuesItem from "@/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue";
 import { useHandleData }  from "@/hooks/useHandleData";
 import { processList } from '@/hooks/useProcessList';
-import useClassTaskWorkQuest from '@/hooks/useClassTaskWorkQuest';
 
 
 import { debounce } from '@/utils/comm' 
@@ -134,13 +133,7 @@ import useUserStore from '@/store/modules/user'
 import useClassTaskStore from '@/store/modules/classTask'
 
 const router = useRouter()
-const {
-  workTypeList,
-  workGroupList,
-  workYearList,
-  workKeyWord,
-  inits,
-} = useClassTaskWorkQuest();
+
 
 // 定义要发送的emit事件
 const emit = defineEmits(['addQuiz'])
@@ -241,7 +234,6 @@ onMounted(() => {
     entpCourseWorkYearList.value = classTaskStore.jyYear;
   }
 
-  inits();
   debounceQueryData(); // 查询习题列表
 })
 /** 前往习题上传页面 */

From 48571086c37171fdc3f62d917f59ce6f33010603 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E4=BA=86=E4=B8=AA=E7=99=BD?= <543593352@qq.com>
Date: Wed, 27 Nov 2024 10:12:39 +0800
Subject: [PATCH 07/10] 1

---
 .../views/classTask/newClassTaskAssign/myQuestion/index.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue
index 9daa584..c0bb2d6 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue
@@ -5,7 +5,7 @@
       <el-col :span="7">
         <el-form-item label="题型" label-width="70">
           <el-select v-model="entpCourseWorkQueryParams.worktype" placeholder="请选择" >
-            <el-option v-for="(item, index) in workTypeList" :key="index" :label="item.label" :value="item">
+            <el-option v-for="(item, index) in entpCourseWorkTypeList" :key="index" :label="item.label" :value="item">
             </el-option>
           </el-select>
         </el-form-item>
@@ -13,14 +13,14 @@
       <el-col :span="7">
         <el-form-item label="题源" label-width="70">
           <el-select v-model="entpCourseWorkQueryParams.workgroup" placeholder="请选择" >
-            <el-option v-for="(item, index) in workGroupList" :key="index" :label="item.Value" :value="item.Key" ></el-option>
+            <el-option v-for="(item, index) in entpCourseWorkGroupList" :key="index" :label="item.Value" :value="item.Key" ></el-option>
           </el-select>
         </el-form-item>
       </el-col>
       <el-col :span="7">
         <el-form-item label="年份" label-width="70">
           <el-select v-model="entpCourseWorkQueryParams.yearStr" placeholder="请选择" >
-            <el-option v-for="(item, index) in workYearList" :key="index" :label="item.label" :value="item.value"></el-option>
+            <el-option v-for="(item, index) in entpCourseWorkYearList" :key="index" :label="item.label" :value="item.value"></el-option>
           </el-select>
         </el-form-item>
       </el-col>

From 7a6f57a9b7b45f2397af6d2e49e44deba8e82f8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E6=9D=A8?= <666>
Date: Wed, 27 Nov 2024 10:29:39 +0800
Subject: [PATCH 08/10] =?UTF-8?q?fix=EF=BC=9A=E4=B8=AA=E4=BA=BA=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E4=BF=AE=E6=94=B9=E5=AD=A6=E7=A7=91=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/views/profile/userInfo.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/renderer/src/views/profile/userInfo.vue b/src/renderer/src/views/profile/userInfo.vue
index b927274..7666bdf 100644
--- a/src/renderer/src/views/profile/userInfo.vue
+++ b/src/renderer/src/views/profile/userInfo.vue
@@ -162,8 +162,8 @@ setTimeout(() => {
 function submit() {
   proxy.$refs.userRef.validate((valid) => {
     if (valid) {
-      userStore.user.edusubject = sessionStore.get('edusubject')
-      userStore.user.edustage = sessionStore.get('edustage')
+      userStore.user.edusubject = sessionStore.get('edusubject') ? sessionStore.get('edusubject') : userStore.user.edusubject
+      userStore.user.edustage = sessionStore.get('edustage') ? sessionStore.get('edustage') : userStore.user.edustage
       updateUserInfo(userStore.user).then((response) => {
         if(response.code == 200){
           userStore.login({username:userStore.user.userName,password:userStore.user.plainpwd}).then(() => {

From ef5dfc8ed1d5453a2e5af616e95d011e73ef7e4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E4=BA=86=E4=B8=AA=E7=99=BD?= <543593352@qq.com>
Date: Wed, 27 Nov 2024 10:39:21 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E4=B9=A0=E9=A2=98=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/store/modules/classTask.js   | 40 +++++++++++----
 .../container/newTask/taskTypeView.vue        | 49 +++----------------
 .../newClassTaskAssign/myQuestion/index.vue   | 46 ++---------------
 .../questionUpload/quesItem/index.vue         | 18 ++++---
 .../searchQuestion/index.vue                  | 46 ++---------------
 5 files changed, 59 insertions(+), 140 deletions(-)

diff --git a/src/renderer/src/store/modules/classTask.js b/src/renderer/src/store/modules/classTask.js
index 18b06b0..4fda976 100644
--- a/src/renderer/src/store/modules/classTask.js
+++ b/src/renderer/src/store/modules/classTask.js
@@ -6,9 +6,34 @@ import { JYApiListCT, JYApiListOriginYear, JYApiListSO} from "@/utils/examQuesti
 const useClassTaskStore = defineStore('classTask',{
   state: () => ({
     classListIds: [],
-    jyCT: [],
-    jySO: [],
-    jyYear: [],
+    entpCourseWorkTypeList: [
+      {value: 0, label: "不限"},
+      {value: 1, label: "单选题"},
+      {value: 2, label: "填空题"},
+      {value: 3, label: "多选题"},
+      {value: 4, label: "判断题"},
+      {value: 5, label: "主观题"},
+      {value: 6, label: "复合题"},
+    ], // 习题查询条件 - 题型
+    entpCourseWorkGroupList: [{
+        Key: -1,
+        Value: '不限',
+      }, {
+        Key: 1,
+        Value: '真题',
+      }, {
+        Key: 0,
+        Value: '非真题',
+      }
+    ],  // 习题查询条件 - 题源
+    entpCourseWorkYearList: [
+      {label: '不限', value: '-1'},
+      {label: '2024', value: '2024'},
+      {label: '2023', value: '2023'},
+      {label: '2022', value: '2022'},
+      {label: '2021', value: '2021'},
+      {label: '2020', value: '2020'},
+    ], // 习题查询条件 - 年份
   }),
   actions: {
     listClassmain(params) {
@@ -32,15 +57,12 @@ const useClassTaskStore = defineStore('classTask',{
       Promise.all([getJYYear(), getJYSO(education), getJYCT(education)])
         .then(results => {
           console.log('更新第三方题源+题型succ:', results);
-          this.jyYear = results[0];
-          this.jyCT = results[2];
-          this.jySO = results[1];
+          this.entpCourseWorkYearList = results[0];
+          this.entpCourseWorkTypeList = results[2];
+          this.entpCourseWorkGroupList = results[1];
         })
         .catch(error => {
           console.error('更新第三方题源+题型err:', error);
-          this.jyYear = [];
-          this.jySO = [];
-          this.jyCT = [];
         });
     },
   },
diff --git a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
index 94263d1..0496bee 100644
--- a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
+++ b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
@@ -294,8 +294,8 @@ import FileUpload from "@/components/FileUpload/index.vue";
 import whiteboard from '@/components/whiteboard/whiteboard.vue'
 import prevReadMsgDialog from '@/views/classTask/container/newTask/prevReadMsg-Dialog.vue'
 import examDetailsDrawer from '@/components/exam-question/examDetailsDrawer.vue'
-import { JYApiListCT, JYApiListOriginYear, JYApiListSO} from "@/utils/examQuestion/jyeoo"
- 
+
+import useClassTaskStore from '@/store/modules/classTask'
 import {throttle,debounce } from '@/utils/comm'  
 import { useToolState } from '@/store/modules/tool'
 import useUserStore from '@/store/modules/user'
@@ -303,6 +303,11 @@ const userStore = useUserStore().user
 const { proxy } = getCurrentInstance()
 const router = useRouter()
 const toolStore = useToolState()
+const {
+  entpCourseWorkTypeList,
+  entpCourseWorkGroupList,
+  entpCourseWorkYearList
+} = useClassTaskStore();
 
 const props = defineProps({
   bookobj: {
@@ -326,39 +331,11 @@ const props = defineProps({
 const prevReadMsgDialogRef = ref(null);// 预览框ref
 
 const classWorkFormRef = ref(null);
-const entpCourseWorkTypeList = ref([
-  {value: 0, label: "不限"},
-  {value: 1, label: "单选题"},
-  {value: 2, label: "填空题"},
-  {value: 3, label: "多选题"},
-  {value: 4, label: "判断题"},
-  {value: 5, label: "主观题"},
-  {value: 6, label: "复合题"},
-]); // 习题查询条件 - 题型
-
-const entpCourseWorkGroupList = ref([{
-  Key: -1,
-  Value: '不限',
-}, {
-  Key: 1,
-  Value: '真题',
-}, {
-  Key: 0,
-  Value: '非真题',
-}]);  // 习题查询条件 - 题源
 
 const entpCourseWorkPointList = ref([
   {label: '不限', value: []},
 ]); // 习题查询条件 - 知识点
 const knowledgePointProps = ref({value: 'thirdId', label: 'title'});
-const entpCourseWorkYearList =ref([
-  {label: '不限', value: '-1'},
-  {label: '2024', value: '2024'},
-  {label: '2023', value: '2023'},
-  {label: '2022', value: '2022'},
-  {label: '2021', value: '2021'},
-  {label: '2020', value: '2020'},
-]); // 习题查询条件 - 年份
 
 
 const paginationParams = reactive({
@@ -1006,18 +983,6 @@ const initPageParams = () => {
 
 
 onMounted(async() => {
-  // 获取当前学科下的试题题型
-  const name = userStore.edustage + userStore.edusubject;
-  const jyCT = await JYApiListCT(name);
-  if (jyCT.length == 0) {
-    ElMessage.error('获取题型失败!');
-    return;
-  }
-  entpCourseWorkTypeList.value = jyCT;
-  // 获取当前学科下的试题年份
-  entpCourseWorkYearList.value = JYApiListOriginYear();
-  entpCourseWorkGroupList.value = await JYApiListSO(name);
-
 })
 
 // const refreshData = () => {
diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue
index c0bb2d6..90f71da 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue
@@ -139,7 +139,11 @@ const router = useRouter()
 const emit = defineEmits(['addQuiz'])
 const { proxy } = getCurrentInstance()
 const userStore = useUserStore().user
-const classTaskStore = useClassTaskStore();
+const {
+  entpCourseWorkTypeList,
+  entpCourseWorkGroupList,
+  entpCourseWorkYearList
+} = useClassTaskStore();
 
 const props = defineProps({
   bookobj: {
@@ -148,37 +152,7 @@ const props = defineProps({
   },
 })
 
-
-const entpCourseWorkTypeList = ref([
-  {value: 0, label: "不限"},
-  {value: 1, label: "单选题"},
-  {value: 2, label: "填空题"},
-  {value: 3, label: "多选题"},
-  {value: 4, label: "判断题"},
-  {value: 5, label: "主观题"},
-  {value: 6, label: "复合题"},
-]); // 习题查询条件 - 题型
-
-const entpCourseWorkGroupList = ref([{
-  Key: -1,
-  Value: '不限',
-}, {
-  Key: 1,
-  Value: '真题',
-}, {
-  Key: 0,
-  Value: '非真题',
-}]);  // 习题查询条件 - 题源
-
 const knowledgePointProps = ref({value: 'thirdId', label: 'title'});
-const entpCourseWorkYearList =ref([
-  {label: '不限', value: '-1'},
-  {label: '2024', value: '2024'},
-  {label: '2023', value: '2023'},
-  {label: '2022', value: '2022'},
-  {label: '2021', value: '2021'},
-  {label: '2020', value: '2020'},
-]); // 习题查询条件 - 年份
 
 
 // 习题查询参数条件
@@ -224,16 +198,6 @@ const dlgImportSingle = reactive({
 })
 
 onMounted(() => {
-  if (classTaskStore.jyCT.length>0) {
-    entpCourseWorkTypeList.value = classTaskStore.jyCT;
-  }
-  if (classTaskStore.jySO.length>0) {
-    entpCourseWorkGroupList.value = classTaskStore.jySO;
-  }
-  if (classTaskStore.jyYear.length>0) {
-    entpCourseWorkYearList.value = classTaskStore.jyYear;
-  }
-
   debounceQueryData(); // 查询习题列表
 })
 /** 前往习题上传页面 */
diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue
index ad1d325..92f804e 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue
@@ -417,7 +417,11 @@ import useUserStore from '@/store/modules/user'
 import useClassTaskStore from '@/store/modules/classTask'
 
 const userStore = useUserStore().user
-const classTaskStore = useClassTaskStore();
+const {
+  entpCourseWorkTypeList,
+  entpCourseWorkGroupList,
+  entpCourseWorkYearList
+} = useClassTaskStore();
 
 const { proxy } = getCurrentInstance()
 // 定义要发送的emit事件
@@ -619,15 +623,15 @@ onMounted(() => {
   };
 
   // 更新第三方题型、题源
-  if (classTaskStore.jyCT.length>0) {
+  if (entpCourseWorkTypeList.length>0) {
     const flagDict = ['单选题', '多选题', '判断题', '填空题'];
-    fromOptions.type = classTaskStore.jyCT.filter(item => flagDict.includes(item.label));
+    fromOptions.type = entpCourseWorkTypeList.filter(item => flagDict.includes(item.label));
   }
-  if (classTaskStore.jySO.length>0) {
-    fromOptions.flag = classTaskStore.jySO;
+  if (entpCourseWorkGroupList.length>0) {
+    fromOptions.flag = entpCourseWorkGroupList;
   }
-  // if (classTaskStore.jyYear.length>0) {
-  //   yearList.value = classTaskStore.jyYear;
+  // if (entpCourseWorkYearList.length>0) {
+  //   yearList.value = entpCourseWorkYearList;
   // }
 })
 
diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/searchQuestion/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/searchQuestion/index.vue
index 2921ae7..b24c080 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/searchQuestion/index.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/searchQuestion/index.vue
@@ -125,7 +125,11 @@ import useClassTaskStore from '@/store/modules/classTask'
 const emit = defineEmits(['addQuiz'])
 const { proxy } = getCurrentInstance()
 const userStore = useUserStore().user
-const classTaskStore = useClassTaskStore();
+const {
+  entpCourseWorkTypeList,
+  entpCourseWorkGroupList,
+  entpCourseWorkYearList
+} = useClassTaskStore();
 
 const props = defineProps({
   bookobj: {
@@ -134,41 +138,11 @@ const props = defineProps({
   },
 })
 
-
-const entpCourseWorkTypeList = ref([
-  {value: 0, label: "不限"},
-  {value: 1, label: "单选题"},
-  {value: 2, label: "填空题"},
-  {value: 3, label: "多选题"},
-  {value: 4, label: "判断题"},
-  {value: 5, label: "主观题"},
-  {value: 6, label: "复合题"},
-]); // 习题查询条件 - 题型
-
-const entpCourseWorkGroupList = ref([{
-  Key: -1,
-  Value: '不限',
-}, {
-  Key: 1,
-  Value: '真题',
-}, {
-  Key: 0,
-  Value: '非真题',
-}]);  // 习题查询条件 - 题源
-
 const entpCourseWorkPointList = ref([
   {label: '不限', value: []},
 ]); // 习题查询条件 - 知识点
 const knowledgePointProps = ref({value: 'thirdId', label: 'title'});
 //const knowledgePointProps = ref({value: 'thirdId', label: 'knowTitle'});
-const entpCourseWorkYearList =ref([
-  {label: '不限', value: '-1'},
-  {label: '2024', value: '2024'},
-  {label: '2023', value: '2023'},
-  {label: '2022', value: '2022'},
-  {label: '2021', value: '2021'},
-  {label: '2020', value: '2020'},
-]); // 习题查询条件 - 年份
 
 
 // 习题查询参数条件
@@ -209,16 +183,6 @@ const workResource = reactive({
 }); // 作业资源
 
 onMounted(() => {
-  if (classTaskStore.jyCT.length>0) {
-    entpCourseWorkTypeList.value = classTaskStore.jyCT;
-  }
-  if (classTaskStore.jySO.length>0) {
-    entpCourseWorkGroupList.value = classTaskStore.jySO;
-  }
-  if (classTaskStore.jyYear.length>0) {
-    entpCourseWorkYearList.value = classTaskStore.jyYear;
-  }
-
   debounceQueryData(); // 查询习题列表
 })
 

From 1060929532bca256c5497da93ba3fcd5d63a9f8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E6=9D=A8?= <666>
Date: Wed, 27 Nov 2024 10:51:43 +0800
Subject: [PATCH 10/10] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E4=B8=AA?=
 =?UTF-8?q?=E4=BA=BA=E4=B8=AD=E5=BF=83=E9=BB=98=E8=AE=A4=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/views/profile/components/selectClass.vue | 7 +++++--
 src/renderer/src/views/profile/userInfo.vue               | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/renderer/src/views/profile/components/selectClass.vue b/src/renderer/src/views/profile/components/selectClass.vue
index ada1d13..2dcc47e 100644
--- a/src/renderer/src/views/profile/components/selectClass.vue
+++ b/src/renderer/src/views/profile/components/selectClass.vue
@@ -59,24 +59,27 @@ const getSubject = () => {
 // 选择学段
 const handleUserEduStage = (item) => {
     userStore.edustage = item
-    sessionStore.set('edustage',item)
+    sessionStore.set('edustageSelf',item)
     if(item === '幼儿园'){
         // 默认语文
         userStore.edusubject = '语文'
+        sessionStore.set('edusubjectSelf','语文')
     }
     else if(item === '高中' && userStore.edusubject === "道德与法治"){
         // 默认语文
         userStore.edusubject = '政治'
+        sessionStore.set('edusubjectSelf','政治')
     }
     else if(item != '高中' && userStore.edusubject === "政治"){
         // 默认语文
         userStore.edusubject = '道德与法治'
+        sessionStore.set('edusubjectSelf','道德与法治')
     }
 }
 // 选择学科
 const handleUserEduSubject = (item) => {
     userStore.edusubject = item;
-    sessionStore.set('edusubject',item)
+    sessionStore.set('edusubjectSelf',item)
 }
 onMounted(() => {
     getSubject()
diff --git a/src/renderer/src/views/profile/userInfo.vue b/src/renderer/src/views/profile/userInfo.vue
index 7666bdf..5efcc0f 100644
--- a/src/renderer/src/views/profile/userInfo.vue
+++ b/src/renderer/src/views/profile/userInfo.vue
@@ -162,8 +162,8 @@ setTimeout(() => {
 function submit() {
   proxy.$refs.userRef.validate((valid) => {
     if (valid) {
-      userStore.user.edusubject = sessionStore.get('edusubject') ? sessionStore.get('edusubject') : userStore.user.edusubject
-      userStore.user.edustage = sessionStore.get('edustage') ? sessionStore.get('edustage') : userStore.user.edustage
+      userStore.user.edusubject = sessionStore.get('edusubjectSelf') ? sessionStore.get('edusubjectSelf') : userStore.user.edusubject
+      userStore.user.edustage = sessionStore.get('edustageSelf') ? sessionStore.get('edustageSelf') : userStore.user.edustage
       updateUserInfo(userStore.user).then((response) => {
         if(response.code == 200){
           userStore.login({username:userStore.user.userName,password:userStore.user.plainpwd}).then(() => {