14 changed files with 183 additions and 254 deletions
--- a/src/renderer/src/api/education/entpCourseWork.js
+++ b/src/renderer/src/api/education/entpCourseWork.js
@ -108,21 +108,4 @@ 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
-  })
 }
--- a/src/renderer/src/store/modules/classTask.js
+++ b/src/renderer/src/store/modules/classTask.js
@ -1,46 +1,16 @@
 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: [],
-    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) {
      // 获取班级列表
      return new Promise((resolve, reject) => {
-        const education = params.edustage + params.edusubject;
-        listClassmain(education)
+        listClassmain(params)
          .then((res) => {
            this.classListIds = res.rows&&res.rows.map((item) => item.id)
            resolve(res)
@ -50,58 +20,9 @@ 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.entpCourseWorkYearList = results[0];
-          this.entpCourseWorkTypeList = results[2];
-          this.entpCourseWorkGroupList = results[1];
-        })
-        .catch(error => {
-          console.error('更新第三方题源+题型err:', error);
-        });
-    },
  },
  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)
-      })
-  })
-}
--- a/src/renderer/src/utils/examQuestion/jyeoo.js
+++ b/src/renderer/src/utils/examQuestion/jyeoo.js
@ -1,5 +1,3 @@
-import { getJYPath } from "@/api/education/entpcoursework";
-
 const JY_TOKEN = 'CA82641DA86072DEFD39E287335E035FDA6AEEC0549B58F54F4408734C8683FFAF0585CFA3B25091E588A03A65C66A80F5FF613F539D600954007A35DFFBFDC3C7BB982771C5E13F0918642CFD7596CE3718F06E5579238D92EC809AC6F4C82A9FE4B0E232A67DD3594D4DAC1C219CCBC4A7A093344446107EB11DC317526D0594249DEBBD82B740C794CF5A7065E1982B7779AF16AD25D7';
 const JY_SUBJECT = [
  {id: 10, subject: 'math3', name: '小学数学'},
@ -28,31 +26,8 @@ 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 = '高中历史') => {
+export const JYApiListCT = async (_this, name = '高中历史') => {
  if (name === '初中政治') {
    name = '初中道德与法治';
  }
@ -60,8 +35,7 @@ export const JYApiListCT = async (name = '高中历史') => {
  if(obj.length < 1) {
    return [];
  }
-  getJYPath
-  const res = await getJYPath(`/${obj[0].subject}/common`, {
+  const res = await _this.$requestGetJYW(`/${obj[0].subject}/common`, {
    headers: {
    authorization: `Token ${JY_TOKEN}`
    },
@ -89,13 +63,22 @@ export const JYApiListCT = async (name = '高中历史') => {
  return arrCT;
 }

+export const JYApiListOriginYear = () => {
+  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 = '高中历史') => {
+export const JYApiListSO = async (_this, name = '高中历史') => {
  if (name === '初中政治') {
    name = '初中道德与法治';
  }
@ -104,7 +87,7 @@ export const JYApiListSO = async (name = '高中历史') => {
  if(obj.length < 1) {
    return [];
  }
-  const res = await getJYPath(`/${obj[0].subject}/common`, {
+  const res = await _this.$requestGetJYW(`/${obj[0].subject}/common`, {
    headers: {
    authorization: `Token ${JY_TOKEN}`
    },
@ -120,12 +103,8 @@ export const JYApiListSO = async (name = '高中历史') => {
 }


-/**
- * @desc: 根据学科+学段获取菁优网-知识点
- * @return: {*}
- * @param {*} name 学科+学科
- */
-export const JYApiListPoint = async (name = '高中历史') => {
+
+export const JYApiListPoint = async (_this, name = '高中历史') => {
  if (name === '初中政治') {
    name = '初中道德与法治';
  }
@ -134,7 +113,7 @@ export const JYApiListPoint = async (name = '高中历史') => {
  if(obj.length < 1) {
    return [];
  }
-  const res = await getJYPath(`/${obj[0].subject}/point`, {
+  const res = await _this.$requestGetJYW(`/${obj[0].subject}/point`, {
    headers: {
    authorization: `Token ${JY_TOKEN}`
    },
@ -147,12 +126,10 @@ export const JYApiListPoint = async (name = '高中历史') => {


 /**
- * @desc: 根据查询条件获取菁优网-教材版本
+ * @desc: 获取菁优网的版本内容
 * @return: {*}
- * @param {*} query {}
- * @param {*} hasPoints
 */
-export const JYApiListVersion = async (query, hasPoints=true) => {
+export const JYApiListVersion = async (_this, query, hasPoints=true) => {
  const listVersion = {
    status: 0,
    msg: '',
@ -171,7 +148,7 @@ export const JYApiListVersion = async (query, hasPoints=true) => {
    listVersion.msg = `[${name}]未找到对应菁优网教材版本, 请检查学段或学科是否匹配!`;
    return listVersion;
  }
-  const JYBook = await getJYPath(`/${result[0].subject}/book2`, {
+  const JYBook = await _this.$requestGetJYW(`/${result[0].subject}/book2`, {
    headers: {
      // JYToken仅占位, 实际后续已未使用该token
      authorization: `Token ${JY_TOKEN}`
--- a/src/renderer/src/views/classTask/classTaskAssign.vue
+++ b/src/renderer/src/views/classTask/classTaskAssign.vue
@ -416,7 +416,6 @@ const queryPushRecords = (row) => {
  // 获取已推送历史
  console.log(row,'查看该行推送历史')
  pushRecordsOpen.value = true;
-  pushRecordsList.value = [];
  pushRecordsLoading.value = true;
  homeworklist({
    entpcourseid: entpcourseid.value,
@ -876,6 +875,21 @@ 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;
--- 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 useClassTaskStore from '@/store/modules/classTask'
+import { JYApiListCT, JYApiListOriginYear, JYApiListSO} from "@/utils/examQuestion/jyeoo"
+ 
 import {throttle,debounce } from '@/utils/comm'  
 import { useToolState } from '@/store/modules/tool'
 import useUserStore from '@/store/modules/user'
@ -303,11 +303,6 @@ const userStore = useUserStore().user
 const { proxy } = getCurrentInstance()
 const router = useRouter()
 const toolStore = useToolState()
-const {
-  entpCourseWorkTypeList,
-  entpCourseWorkGroupList,
-  entpCourseWorkYearList
-} = useClassTaskStore();

 const props = defineProps({
  bookobj: {
@ -331,11 +326,39 @@ 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({
@ -983,6 +1006,18 @@ const initPageParams = () => {


 onMounted(async() => {
+  // 获取当前学科下的试题题型
+  const name = userStore.edustage + userStore.edusubject;
+  const jyCT = await JYApiListCT(proxy, name);
+  if (jyCT.length == 0) {
+    ElMessage.error('获取题型失败!');
+    return;
+  }
+  entpCourseWorkTypeList.value = jyCT;
+  // 获取当前学科下的试题年份
+  entpCourseWorkYearList.value = JYApiListOriginYear();
+  entpCourseWorkGroupList.value = await JYApiListSO(proxy, name);
+
 })

 // const refreshData = () => {
--- 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:'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: '上千万高质量习题资源，历届考试真题，每道题均有习题解析', 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: '推送pdf、视频、音频、图片，学生可以拍照上传。', icon: '#icon-zhaoxiangji',type:'danger' },
  { title: 'AI设计作业', description: '通过AI助手，根据课标、教材、考试等分析结果，智能创建作业。', icon: '#icon-jiqiren_o',type:'danger' },
  { title: '习题上传', description: '自己上传个人题库。', icon: '#icon-shangchuan',type:'danger' },
--- 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; text-align: left;">
+                  <div style="margin: 5px; background-color: white">
                    <div v-html="item.titleFormat" style="padding: 15px 20px 5px 20px"></div>
                    <div style="display: flex;">
                      <el-form-item label="分值">
@ -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, Delete } from '@element-plus/icons-vue'
+import { Plus } 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,6 +144,10 @@ 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'
--- a/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue
@ -125,26 +125,16 @@ 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 { 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 {
-  entpCourseWorkTypeList,
-  entpCourseWorkGroupList,
-  entpCourseWorkYearList
-} = useClassTaskStore();
-
 const props = defineProps({
  bookobj: {
    type: Object,
@ -152,7 +142,37 @@ 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'},
+]); // 习题查询条件 - 年份


 // 习题查询参数条件
@ -200,7 +220,7 @@ const dlgImportSingle = reactive({
 onMounted(() => {
  debounceQueryData(); // 查询习题列表
 })
-/** 前往习题上传页面 */
+
 const goToQuestUpload = () => {
  router.push({ path: '/model/questionUpload', query: { courseObj: JSON.stringify(props.bookobj) } });
 }
@ -316,7 +336,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++) {
--- 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.value" :label="item.label" :value="item.label"></el-option>
+        <el-option v-for="item in fromOptions.type" :key="item.Key" :label="item.Value" :value="item.Value"></el-option>
      </el-select>
      <el-tag v-if="questForm.worktype=='填空题'" type="danger" style=" margin-left: 10px ">温馨提示：填空题题目的填空位置，下划线请连续输入3-10个 _
        符号。eg：今天___好日子。</el-tag>
@ -414,15 +414,7 @@ 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 {
-  entpCourseWorkTypeList,
-  entpCourseWorkGroupList,
-  entpCourseWorkYearList
-} = useClassTaskStore();
-
 const { proxy } = getCurrentInstance()
 // 定义要发送的emit事件
 const emit = defineEmits(['submit-exam-single-callback','cancel-exam-single-callback','cropper-exam-form-item'])
@ -458,13 +450,12 @@ const fromOptions = reactive({
  //题型
  type: [
    //{"Key": 0, "Value": "不限"},
-    {value: 0, label: "不限"},
-    {value: 1, label: "单选题"},
-    {value: 2, label: "填空题"},
-    {value: 3, label: "多选题"},
-    {value: 4, label: "判断题"},
-    {value: 5, label: "主观题"},
-    {value: 6, label: "复合题"},
+    {"Key": 1, "Value": "单选题"},
+    {"Key": 4, "Value": "多选题"},
+    {"Key": 2, "Value": "填空题"},
+    {"Key": 5, "Value": "判断题"},
+    {"Key": 6, "Value": "主观题"},
+    {"Key": 3, "Value": "复合题"},
    //{"Key": 4, "Value": "辨析评析题"},
  ],
  // 复合题型
@ -485,7 +476,7 @@ const questForm = reactive({
  id: 0,
  title: '',
  worktype: '单选题',
-  worktagYear: 2024,
+  worktagYear: '2024',
  //worktagArea: '',
  worktag: '',
  workgroup: 0,
@ -611,8 +602,8 @@ onMounted(() => {
    lessionId: lessionid,
    fileAlias: '单题上传',
  };
-  
  // 获取最新年份
+  // yearList = 
  for(var i = 0; i < 15; i++) {
    const year  = new Date().getFullYear();
    const s ={
@ -622,17 +613,7 @@ onMounted(() => {
    yearList.value.push(s)
  };

-  // 更新第三方题型、题源
-  if (entpCourseWorkTypeList.length>0) {
-    const flagDict = ['单选题', '多选题', '判断题', '填空题'];
-    fromOptions.type = entpCourseWorkTypeList.filter(item => flagDict.includes(item.label));
-  }
-  if (entpCourseWorkGroupList.length>0) {
-    fromOptions.flag = entpCourseWorkGroupList;
-  }
-  // if (entpCourseWorkYearList.length>0) {
-  //   yearList.value = entpCourseWorkYearList;
-  // }
+  // 拿到当前章节下得所有知识点
 })


@ -1009,26 +990,16 @@ const updateForm= async(item, submitIndex=0, submitType=1) =>{

    lessionid.value = props.bookobj.levelSecondId? props.bookobj.levelSecondId : props.bookobj.levelFirstId;
    console.log('lessionid', lessionid.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;
-      }
+    const res = await getBindlist({ eid: lessionid.value })
+    if (!res.data || res.data.length < 1) {
+      ElMessage.warning('当前章节下未绑定知识点，暂不更新该试题知识点！');
+      curKnowledgePointList.value = [];
    }
+    else {
+      curKnowledgePointList.value = res.data;
+    }
+    
  }

  //item.evalnodeid = '3772b,374112,374233';
--- a/src/renderer/src/views/classTask/newClassTaskAssign/searchQuestion/index.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/searchQuestion/index.vue
@ -20,7 +20,6 @@
      <el-col :span="10">
        <el-form-item label="知识点" label-width="70">
          <el-cascader
-            disabled
            v-model="entpCourseWorkQueryParams.point"
            clearable
            style="width: 100%"
@ -119,18 +118,11 @@ 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 {
-  entpCourseWorkTypeList,
-  entpCourseWorkGroupList,
-  entpCourseWorkYearList
-} = useClassTaskStore();
-
 const props = defineProps({
  bookobj: {
    type: Object,
@ -138,11 +130,41 @@ 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'},
+]); // 习题查询条件 - 年份


 // 习题查询参数条件
@ -320,7 +342,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++) {
--- a/src/renderer/src/views/desktop/index.vue
+++ b/src/renderer/src/views/desktop/index.vue
@ -58,11 +58,6 @@ 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);
@ -211,14 +206,11 @@ 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: {
--- 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(selName);
+  const jyCT = await JYApiListCT(proxy, selName);
  if (jyCT.length == 0) {
    ElMessage.error('获取题型失败!');
    return;
--- a/src/renderer/src/views/profile/components/selectClass.vue
+++ b/src/renderer/src/views/profile/components/selectClass.vue
@ -59,27 +59,24 @@ const getSubject = () => {
 // 选择学段
 const handleUserEduStage = (item) => {
    userStore.edustage = item
-    sessionStore.set('edustageSelf',item)
+    sessionStore.set('edustage',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('edusubjectSelf',item)
+    sessionStore.set('edusubject',item)
 }
 onMounted(() => {
    getSubject()
--- a/src/renderer/src/views/profile/userInfo.vue
+++ b/src/renderer/src/views/profile/userInfo.vue
@ -40,9 +40,6 @@ import {listClassmain} from '@/api/classManage/index'
 //班级列表
 import ClassList from './components/classList.vue'

-import useClassTaskStore from '@/store/modules/classTask'
-const classTaskStore = useClassTaskStore();
-
 //班级列表
 const classList = ref([])
 // 未加入的班级
@ -165,12 +162,12 @@ setTimeout(() => {
 function submit() {
  proxy.$refs.userRef.validate((valid) => {
    if (valid) {
-      userStore.user.edusubject = sessionStore.get('edusubjectSelf') ? sessionStore.get('edusubjectSelf') : userStore.user.edusubject
-      userStore.user.edustage = sessionStore.get('edustageSelf') ? sessionStore.get('edustageSelf') : userStore.user.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(() => {
-            userStore.getInfo().then(async res => {
+            userStore.getInfo().then(res => {
              if(res.code === 200){
                let sessionSubject = {
                  bookList: null, 
@ -181,10 +178,6 @@ 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)
              }