Merge branch 'zouyf_dev' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl

# Conflicts:
#	src/renderer/src/views/profile/userInfo.vue

src/renderer/src/api/education/entpCourseWork.js

@@ -109,3 +109,20 @@ export function pyOCRAPI(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
+  })
+}

src/renderer/src/components/template-study/container/adjust-dialog.vue

@@ -45,6 +45,7 @@ import { conversation, completion } from '@/api/mode/index'
 import { sessionStore } from '@/utils/store'
 import { ElMessage } from 'element-plus'
 import { dataSetJson } from '@/utils/comm.js'
+import emitter from '@/utils/mitt';
 
 const textarea = ref('')
 
@@ -109,13 +110,16 @@ const getCompletion = async (val) => {
 }
 
 const saveAdjust = (item) =>{
-  emit('saveAdjust', item.msg)
+
   isDialog.value = false
   ElMessage.success('操作成功')
+  emitter.on('saveAdjust', item.msg)
+
 }
 
 onMounted(() => {
   let data = sessionStore.get('subject.curNode')
+  
   Object.assign(curNode, data);
   let text = props.modeType == 1||props.modeType == 2 ? '课标' : '考试'
   let jsonKey = `${text}-${data.edustage}-${data.edusubject}`

src/renderer/src/components/template-study/container/edit-dialog.vue

@@ -29,6 +29,7 @@
 import { ref, watch} from 'vue'
 import { ElMessage } from 'element-plus'
 import { editTempResult } from '@/api/mode/index.js'
+import emitter from '@/utils/mitt';
 
 const textarea = ref('')
 
@@ -49,12 +50,12 @@ watch(() => props.item.answer, (newVal) => {
   }
 },{ deep: true })
 
-const emit = defineEmits(['saveEdit'])
+
 const onSave = () =>{
   editTempResult({id: props.item.reultId, content: textarea.value}).then( res =>{
     isDialog.value = false
     ElMessage.success('操作成功')
-    emit('saveEdit', textarea.value)
+    emitter.emit('onGetChild', textarea.value)
   })
 }
 

src/renderer/src/components/template-study/container/header.vue

@@ -1,149 +0,0 @@
-<template>
-  <div class="container-header flex">
-    <div class="header-left flex">
-      <el-button link @click="onClick">
-        {{ curNode.edustage}}{{ curNode.edusubject }}{{ type == 1 ? '课标研读': '教材分析'}}<i class="iconfont icon-xiangxia"></i>
-      </el-button>
-    </div>
-
-    <div class="header-right flex">
-      <el-dropdown @command="changeTemplate" :hide-on-click="false">
-        <span class="el-dropdown-link">
-          {{ curTemplate.name }}
-          <i class="iconfont icon-xiangxia"></i>
-        </span>
-        <template #dropdown>
-          <el-dropdown-menu>
-            <el-dropdown-item v-for="item in templateList" :command="item" :key="item.id">{{ item.name
-              }}</el-dropdown-item>
-          </el-dropdown-menu>
-        </template>
-      </el-dropdown>
-      <div>
-       
-        <el-button type="primary" link @click="onAdd">
-          <el-icon>
-            <Plus />
-          </el-icon>
-          添加提示词
-        </el-button>
-        <!-- <el-button type="danger">删除</el-button> -->
-        <!-- <el-button type="primary" link>保存模板</el-button> -->
-        <el-button type="primary" @click="aiRead">一键研读</el-button>
-      </div>
-    </div>
-  </div>
-  <!--添加提示词-->
-  <keywordDialog v-model="wordDialog" :modeType="type" :isAdd="wordDialog" :item="curTemplate" />
-  <Dialog v-model="showDialog" :modeType="type" />
-</template>
-
-<script setup>
-import { ref, reactive, onMounted, onUnmounted, watch } from 'vue'
-import { Plus } from '@element-plus/icons-vue'
-import { ElMessageBox } from 'element-plus'
-import { modelList } from '@/api/mode/index'
-import Dialog from './dialog.vue'
-import keywordDialog from './keyword-dialog.vue'
-import emitter from '@/utils/mitt';
-import { sessionStore } from '@/utils/store'
-
-const wordDialog = ref(false)
-const props = defineProps({
-  type: {
-    type: Number,
-    default: 1
-  }
-})
-
-
-const emit = defineEmits(['changeTemp', 'onRead'])
-
-const showDialog = ref(false)
-
-const aiRead = () => {
-  emit('onRead')
-}
-
-
-// 当前模板名称
-const curTemplate = reactive({ name: '', id: '' })
-// 模板列表
-const templateList = ref([])
-// 获取模板列表
-const getTemplateList = () => {
-  modelList({ model: props.type, type: 1, pageNum: 1, pageSize: 10000 }).then(res => {
-    templateList.value = res.rows
-    Object.assign(curTemplate, res.rows[0]);
-    emit('changeTemp', res.rows[0].id)
-  })
-}
-// 模板切换
-const changeTemplate = (val) => {
-
-  ElMessageBox.confirm(
-    '切换模板将清除当前研读结果?',
-    '提示',
-    {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
-      type: 'warning',
-    }
-  )
-    .then(() => {
-      Object.assign(curTemplate, val);
-      emit('changeTemp', curTemplate.id)
-    })
-}
-
-emitter.on('onGetMain', () =>{
-  getTemplateList()
-})
-
-const onAdd = () => {
-  wordDialog.value = true
-}
-
-const onClick = () =>{
-  if(props.type == 1) return
-  showDialog.value = true
-}
-
-onUnmounted(() => {
-  emitter.off('onGetMain')
-})
-const curNode = reactive({})
-onMounted(() => {
-  let data = sessionStore.get('subject.curNode')
-  Object.assign(curNode, data);
-  getTemplateList()
-})
-
-</script>
-
-<style lang="scss" scoped>
-.container-header {
-  height: 45px;
-  background: #fff;
-  border-radius: 5px 5px 0 0;
-  box-shadow: 0px 0px 20px 0px rgba(99, 99, 99, 0.06);
-
-  .header-left {
-    width: 50%;
-    align-items: center;
-    padding-left: 20px;
-  }
-
-  .header-right {
-    width: 50%;
-    justify-content: space-between;
-    align-items: center;
-    padding: 0 10px;
-  }
-
-  .icon-xiangxia {
-    margin-left: 5px;
-    font-weight: bold;
-  }
-}
-</style>

src/renderer/src/components/template-study/container/keyword-dialog.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog v-model="mode" :show-close="false" width="600" destroy-on-close>
+  <el-dialog v-model="mode" :show-close="false" width="600" append-to-body destroy-on-close>
     <template #header>
       <div class="custom-header flex">
         <span>{{ item.ex3 == '1' ? '请输入新的模板名称' : isAdd ? '添加提示词' : '编辑提示词' }}</span>
@@ -12,12 +12,10 @@
         <el-form-item label="名称">
           <el-input v-model="form.name" />
         </el-form-item>
-
         <el-form-item label="提示词" v-if="item.ex3 == '1' ? false : true">
           <el-input v-model="form.prompt" type="textarea" />
         </el-form-item>
       </el-form>
-
     </div>
     <template #footer>
       <div class="dialog-footer">
@@ -52,14 +50,9 @@ const props = defineProps({
       return { ex3: '' }
     }
   },
-  tempId: {
+
-    type: [String, Number],
-    default: ''
-  },
 })
 
-
-
 const form = reactive({
   name: '',
   prompt: '',
@@ -73,16 +66,17 @@ watch(() => props.isAdd, (newVal) => {
 
 }, { immediate: false })
 
+
 const loading = ref(false)
 const saveAdd = async () => {
-
   loading.value = true
   if (props.item.ex3 == '1') {
+
     if (props.isAdd) {
       try {
         // 系统预设模板 copy一份
         const { msg } = await addKeyWords({ name: form.name, id: props.item.id })
-        emitter.emit('onGetChild')
+        emitter.emit('onGetMain')
         ElMessage.success(msg)
         mode.value = false
       } finally {
@@ -138,7 +132,6 @@ const onAddChildTemp = async (parentId) => {
   }
 }
 
-
 </script>
 
 <style lang="scss" scoped>

src/renderer/src/components/template-study/container/left.vue

@@ -0,0 +1,60 @@
+<template>
+  <div class="container-left-page flex">
+    <div class="container-left-header flex">
+      <el-button link @click="onClick">
+        {{ curNode.edustage }}{{ curNode.edusubject }}{{ type == 1 ? '课标研读' : '教材分析' }}<i
+          class="iconfont icon-xiangxia"></i>
+      </el-button>
+    </div>
+    <div class="container-left-pdf">
+      <PDF :url="pdfUrl" :showCatalog="false" v-if="pdfUrl" />
+    </div>
+    <!--弹窗-->
+    <LeftDialog v-model="showDialog" :modeType="type" />
+  </div>
+</template>
+
+<script setup>
+import { ref, onMounted, nextTick } from 'vue'
+import PDF from '@/components/PdfJs/index.vue'
+import LeftDialog from './left-dialog.vue'
+
+const props = defineProps(['curNode', 'type'])
+
+const showDialog = ref(false)
+const onClick = () => {
+  if (props.type == 1) return
+  showDialog.value = true
+}
+
+// 加载PDF
+const pdfUrl = ref('')
+onMounted(async () => {
+  await nextTick()
+  const { fileurl } = props.curNode
+  pdfUrl.value = import.meta.env.VITE_APP_RES_FILE_PATH + fileurl.replace('.txt', '.pdf')
+})
+</script>
+
+<style lang="scss" scoped>
+.container-left-page {
+  height: 100%;
+  flex-direction: column;
+  .container-left-header {
+    height: 45px;
+    background: #fff;
+    border-radius: 5px 0 0 0;
+    justify-content: flex-start;
+    padding-left: 10px;
+
+    .icon-xiangxia {
+      margin-left: 5px;
+      font-weight: bold;
+    }
+  }
+
+  .container-left-pdf {
+    flex: 1;
+  }
+}
+</style>

src/renderer/src/components/template-study/container/pdf.vue

@@ -1,28 +0,0 @@
-<template>
-  <div class="container-pdf">
-    <PDF :url="pdfUrl" :showCatalog="false" v-if="pdfUrl" />
-  </div>
-  
-</template>
-
-<script setup>
-import { ref, onMounted, nextTick } from 'vue';
-import PDF from '@/components/PdfJs/index.vue'
-import { sessionStore } from '@/utils/store'
-
-const pdfUrl = ref('')
-
-onMounted(async () =>{
-  await nextTick()
-  const { fileurl } = sessionStore.get('subject.curBook')
-  console.log(fileurl,'fileurl');
-  
-  pdfUrl.value = import.meta.env.VITE_APP_RES_FILE_PATH + fileurl.replace('.txt','.pdf')
-})
-</script>
-
-<style lang="scss" scoped>
-.container-pdf{
-  height: 100%;
-}
-</style>

src/renderer/src/components/template-study/container/result.vue

@@ -1,505 +0,0 @@
-<template>
-  <div class="read-container">
-
-    <el-scrollbar height="100%">
-      <div class="template-list">
-        <el-row v-for="(item, index) in childTempList">
-          <el-col :span="24">
-            <div class="template-item" v-loading="item.loading">
-              <div class="item-header">
-                <div>
-                  <span class="blue">#</span>{{ item.name }}
-                </div>
-                <el-popover placement="bottom-end" trigger="hover" popper-class="template-custom-popover">
-                  <template #reference>
-                    <el-button link type="primary">
-                      <i class="iconfont icon-shenglvehao"></i></el-button>
-                  </template>
-                  <template #default>
-                    <el-button type="primary" link @click="editKeyWord(item)">编辑</el-button>
-                    <el-button type="primary" link @click="removeItem(item)">移除</el-button>
-                  </template>
-                </el-popover>
-              </div>
-              <div class="item-text">
-                {{ item.prompt }}
-              </div>
-              <div class="item-text text-answer" v-if="item.answer">
-                <div class="item-icon">
-                  <i class="iconfont icon-ai"></i>
-                </div>
-                <div class="item-answer" v-html="item.answer"></div>
-              </div>
-              <div class="ai-btn" v-if="item.answer">
-                <el-button type="primary" link @click="againResult(index, item)">
-                  <i class="iconfont icon-ai1"></i>
-                  重新研读
-                </el-button>
-                <el-button type="primary" link @click="onAdjust(index, item)">
-                  <i class="iconfont icon-duihua"></i>
-                  AI对话调整
-                </el-button>
-                <el-button type="primary" link @click="onEdit(index, item)">
-                  <i class="iconfont icon-bianji1"></i>
-                  手动编辑结果
-                </el-button>
-              </div>
-            </div>
-          </el-col>
-        </el-row>
-        <el-empty v-if="!childTempList.length" description="暂无模板数据" />
-      </div>
-    </el-scrollbar>
-    <!--编辑结果-->
-    <EditDialog v-model="isEdit" :item="editItem" @saveEdit="saveEdit" />
-    <!--AI 对话调整-->
-    <AdjustDialog v-model="isAdjust" :modeType="modeType" :item="editItem" @saveAdjust="saveAdjust" />
-    <!--编辑提示词-->
-    <keywordDialog v-model="isEditKeyWord" :isAdd="isAdd" :item="keywordItem" :tempId="tempId" />
-  </div>
-</template>
-
-<script setup>
-import { ref, reactive, onMounted, watch, onUnmounted } from 'vue';
-import { ElMessage, ElMessageBox } from 'element-plus'
-import EditDialog from './edit-dialog.vue'
-import AdjustDialog from './adjust-dialog.vue'
-import keywordDialog from './keyword-dialog.vue';
-import { sessionStore } from '@/utils/store'
-import useUserStore from '@/store/modules/user'
-import { tempSave, completion, modelList, removeChildTemp, tempResult } from '@/api/mode/index'
-import { dataSetJson } from '@/utils/comm.js'
-import emitter from '@/utils/mitt';
-
-const userStore = useUserStore()
-
-const props = defineProps({
-  tempId: {
-    type: [String, Number],
-    default: ''
-  },
-  modeType: {
-    type: Number,
-    default: 1
-  }
-})
-
-emitter.on('onGetChild', () =>{
-  getChildTemplate()
-})
-
-// 获取子模板
-const tempLoading = ref(false)
-const childTempList = ref([])
-const getChildTemplate = () => {
-
-  tempLoading.value = true
-  modelList({ model: props.modeType, type: 2, parentId: props.tempId }).then(res => {
-    childTempList.value = res.rows
-    getTempResult()
-  }).finally(() => {
-    tempLoading.value = false
-  })
-}
-// 查询模板结果
-const getTempResult = () => {
-  tempResult({ mainModelId: props.tempId }).then(res => {
-    let rows = res.rows
-    childTempList.value.forEach(item => {
-      rows.forEach(el => {
-        if (item.id == el.modelId) {
-          item.answer = el.content
-          item.reultId = el.id
-        }
-      })
-    })
-  })
-}
-
-const isEdit = ref(false)
-watch(() => props.tempId, (newVal) => {
-  if (newVal) {
-    // isEdit.value = true
-    getChildTemplate()
-
-  }
-})
-
-
-// 获取会话ID
-const params = reactive(
-  {
-    prompt: '',
-    dataset_id: ''
-  }
-)
-const curNode = reactive({})
-const getConversation = () => {
-
-  getCompletion()
-}
-// 大模型对话
-const getCompletion = async () => {
-  for (let item of childTempList.value) {
-    try {
-      item.loading = true
-      params.prompt = `根据${curNode.edustage}${curNode.edusubject}课标，提炼出${item.name}`
-      const { data } = await completion(params)
-      let answer = data.answer
-      item.oldAnswer = answer
-      item.answer = getResult(answer);
-      onSaveTemp(item)
-    } finally {
-      item.loading = false
-    }
-  }
-}
-
-// 保存模板
-const onSaveTemp = (item) => {
-  const data = {
-    mainModelId: props.tempId,
-    modelId: item.id,
-    examDocld: '',
-    content: item.oldAnswer
-  }
-  tempSave(data).then(res => {
-    console.log(res)
-  })
-}
-
-
-
-// 重新研读
-const againResult = async (index, item) => {
-  try {
-    childTempList.value[index].loading = true
-    params.prompt = `根据${curNode.edustage}${curNode.edusubject}课标，提炼出${item.name}`
-    const { data } = await completion(params)
-    let answer = data.answer
-    childTempList.value[index].oldAnswer = answer
-    childTempList.value[index].answer = getResult(answer);
-  } finally {
-    childTempList.value[index].loading = false
-  }
-}
-
-
-// 分析获取课标对话结果
-let getResult = (text) => {
-  text = text.replace(/^\n\n(.*?)\n\n$/s, '<div>$1</div>');
-  text = text.replace(/^\n(.*?)\n$/s, '<p>$1</p>');
-  text = text.replace(/\*\*(.*?)\*\*/g, "<div class='text-tit'>$1</div>");
-  text = text.replace(/(\d+\..*?)\n/g, "<div class='text-num'>$1</div>\n");
-  return text
-}
-
-// 编辑
-const curIndex = ref(-1)
-const editItem = reactive({})
-const onEdit = (index, item) => {
-  curIndex.value = index
-  Object.assign(editItem, item)
-  isEdit.value = true
-}
-
-// 保存编辑
-const saveEdit = (data) => {
-  // childTempList.value[curIndex.value].oldAnswer = data
-  // let answer = getResult(data);
-  // childTempList.value[curIndex.value].answer = answer
-  getChildTemplate()
-}
-
-const isAdjust = ref(false)
-const onAdjust = (index, item) => {
-  curIndex.value = index
-  Object.assign(editItem, item)
-  isAdjust.value = true
-}
-const saveAdjust = (item) => {
-  childTempList.value[curIndex.value].oldAnswer = item
-  let answer = getResult(item);
-  childTempList.value[curIndex.value].answer = answer
-}
-
-// 编辑提示词
-const keywordItem = reactive({})
-const isEditKeyWord = ref(false)
-const isAdd = ref(true)
-const editKeyWord = (item) => {
-  console.log(item)
-  isAdd.value = false
-  isEditKeyWord.value = true
-  Object.assign(keywordItem, item)
-}
-
-// 移除子模板
-const removeItem = async (item) => {
-  if (item.ex3 != '1') {
-    ElMessageBox.confirm(
-      '确认是否移除?',
-      '提示',
-      {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      }
-    ).then(() => {
-        console.log(item)
-        removeChildTemp(item.id).then(res => {
-          ElMessage.success('操作成功')
-          getChildTemplate()
-        })
-      })
-  }
-  else{
-    isAdd.value = false
-    Object.assign(keywordItem, item)
-    isEditKeyWord.value = true
-
-  }
-
-  // const { msg }  = await removeChildTemp(item.id)
-  // ElMessage.success(msg)
-  // getChildTemplate()
-}
-
-
-onMounted(() => {
-  let data = sessionStore.get('subject.curNode')
-  Object.assign(curNode, data);
-  let text = props.modeType == 1 || props.modeType == 2 ? '课标'  : '考试'
-  let jsonKey = `${text}-${data.edustage}-${data.edusubject}`
-  params.dataset_id = dataSetJson[jsonKey]
-
-})
-// 解绑
-onUnmounted(() => {
-  emitter.off('onGetChild')
-})
-
-
-defineExpose({
-  getConversation
-})
-</script>
-
-<style lang="scss" scoped>
-.read-container {
-  display: flex;
-  flex-direction: column;
-  width: 100%;
-  padding: 15px 0;
-  height: 100%;
-  position: relative;
-
-  .el-scrollbar {
-    position: absolute;
-    width: 100%;
-    height: 100%;
-    left: 0;
-    top: 0;
-  }
-
-  .el-dropdown-link {
-    font-weight: bold;
-
-    .el-icon--right {
-      font-weight: bold;
-    }
-  }
-
-  .read-header {
-    justify-content: space-between;
-    align-items: center;
-
-    .add-btn {
-      font-size: 13px;
-
-      .icon-jiahao {
-        margin-right: 3px;
-        font-size: 14px;
-      }
-    }
-
-  }
-
-  .right-con {
-    display: flex;
-  }
-
-  .template-list {
-
-    .template-item {
-      background: #fff;
-      padding: 10px;
-      margin-top: 10px;
-      border-radius: 5px;
-
-      .item-header {
-        display: flex;
-        align-items: center;
-        font-size: 16px;
-        font-weight: bold;
-        color: #000;
-        justify-content: space-between;
-
-        .blue {
-          font-size: 22px;
-          color: #409eff;
-          margin-right: 5px;
-        }
-      }
-
-      .item-text {
-        display: flex;
-        margin-top: 10px;
-        font-size: 14px;
-        text-align: left;
-        color: #606266;
-
-        .item-icon {
-          width: 30px;
-          height: 30px;
-          line-height: 30px;
-          text-align: center;
-          background: #F6F6F6;
-          border-radius: 50%;
-          margin-right: 10px;
-          flex-shrink: 0;
-        }
-
-        .item-answer {
-          flex-direction: column;
-          padding-top: 5px;
-
-          :deep(.text-tit) {
-            font-weight: bold;
-            margin: 10px 0;
-          }
-
-          :deep(.text-num) {
-            padding-left: 2em;
-          }
-        }
-
-      }
-
-      .text-answer {
-        color: #409eff;
-      }
-
-      .ai-btn {
-        margin-top: 10px;
-        display: flex;
-        justify-content: flex-end;
-
-        .iconfont {
-          margin-right: 3px;
-        }
-
-        :deep(.el-button) {
-          font-size: 13px;
-        }
-
-        .icon-ai1 {
-          font-size: 18px;
-        }
-      }
-    }
-  }
-
-  .template-item-result {
-    background: #DDEAFD !important;
-
-    .result-item-header {
-      display: flex;
-      align-items: flex-start;
-      text-align: left;
-      font-size: 16px;
-      font-weight: bold;
-      color: #3D3D3D;
-
-      .icon-xiaoxi {
-        color: #5881D5;
-        font-weight: bold;
-        font-size: 20px;
-        margin-right: 10px;
-      }
-    }
-
-    .result-icon-btn {
-      justify-content: space-between;
-      font-size: 13px;
-      margin-top: 5px;
-
-      span {
-        display: flex;
-        align-items: center;
-        cursor: pointer;
-        margin-right: 10px;
-
-        &:hover {
-          background: #cfe0fa
-        }
-      }
-
-      .iconfont {
-        margin-right: 3px;
-        color: #3498fc;
-      }
-    }
-
-    .line {
-      height: 1px;
-      background: #D8D8D8;
-      margin: 10px 0;
-    }
-
-    .other-msg {
-      font-size: 13px;
-
-      .other-user {
-        align-items: center;
-        color: #BA4B0F;
-        font-size: 12px;
-
-        .icon-touxiang {
-          color: #BA4B0F;
-          font-weight: bold;
-          font-size: 16px;
-          margin-right: 5px;
-        }
-      }
-
-      .other-text {
-        color: #191919;
-        text-align: left;
-      }
-    }
-
-
-  }
-}
-
-.icon-shenglvehao {
-  font-weight: bold;
-  font-size: 22px;
-}
-
-:deep(.el-popover) {
-  min-width: 50px;
-  width: 50px !important;
-}
-
-.pl-25 {
-  padding-left: 25px;
-}
-</style>
-<style>
-.template-custom-popover {
-  width: 110px !important;
-  min-width: 110px !important;
-}
-</style>

src/renderer/src/components/template-study/container/right.vue

@@ -0,0 +1,451 @@
+<template>
+  <div class="container-right-page flex">
+    <!--头部-->
+    <div class="container-right-header flex">
+      <el-dropdown @command="changeTemplate" :hide-on-click="false">
+        <span class="el-dropdown-link">
+          {{ curTemplate.name }}
+          <i class="iconfont icon-xiangxia"></i>
+        </span>
+        <template #dropdown>
+          <el-dropdown-menu>
+            <el-dropdown-item v-for="item in templateList" :command="item" :key="item.id">{{ item.name
+              }}</el-dropdown-item>
+          </el-dropdown-menu>
+        </template>
+      </el-dropdown>
+      <div>
+        <el-button type="danger" link @click="removeItem(curTemplate, false)">
+          删除
+        </el-button>
+        <el-button type="primary" link @click="onAdd">
+          <i class="iconfont icon-jiahao"></i>
+          添加提示词
+        </el-button>
+        <el-button type="primary" :disabled="!(childTempList.length)" @click="getCompletion">一键研读</el-button>
+      </div>
+    </div>
+    <!--List-->
+    <div class="container-right-list">
+          <template v-for="(item, index) in childTempList">
+              <div class="template-item" v-loading="item.loading">
+                <div class="item-header">
+                  <div>
+                    <span class="blue">#</span>{{ item.name }}
+                  </div>
+                  <el-popover placement="bottom-end" trigger="hover" popper-class="template-custom-popover">
+                    <template #reference>
+                      <el-button link type="primary">
+                        <i class="iconfont icon-shenglvehao"></i></el-button>
+                    </template>
+                    <template #default>
+                      <el-button type="primary" link @click="editKeyWord(item)">编辑</el-button>
+                      <el-button type="primary" link @click="removeItem(item, true)">移除</el-button>
+                    </template>
+                  </el-popover>
+                </div>
+                <div class="item-text">
+                  {{ item.prompt }}
+                </div>
+                <div class="item-text text-answer" v-if="item.answer">
+                  <div class="item-icon">
+                    <i class="iconfont icon-ai"></i>
+                  </div>
+                  <div class="item-answer" v-html="item.answer"></div>
+                </div>
+                <div class="ai-btn" v-if="item.answer">
+                  <el-button type="primary" link @click="againResult(index, item)">
+                    <i class="iconfont icon-ai1"></i>
+                    重新研读
+                  </el-button>
+                  <el-button type="primary" link @click="onAdjust(index, item)">
+                    <i class="iconfont icon-duihua"></i>
+                    AI对话调整
+                  </el-button>
+                  <el-button type="primary" link @click="onEdit(index, item)">
+                    <i class="iconfont icon-bianji1"></i>
+                    手动编辑结果
+                  </el-button>
+                </div>
+              </div>
+            
+          </template>
+          <el-empty v-if="!childTempList.length" description="暂无模板数据" />
+    </div>
+  </div>
+  <!--编辑结果-->
+  <EditDialog v-model="isEdit" :item="editItem" />
+  <!--AI 对话调整-->
+  <AdjustDialog v-model="isAdjust" :modeType="type" :item="editItem" />
+  <!--添加、编辑提示词-->
+  <keywordDialog v-model="isWordDialog" :isAdd="isAdd" :item="editItem" />
+</template>
+
+<script setup>
+import { ref, reactive, onMounted, computed, onUnmounted } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { tempSave, completion, modelList, removeChildTemp, tempResult } from '@/api/mode/index'
+import keywordDialog from './keyword-dialog.vue';
+import AdjustDialog from './adjust-dialog.vue'
+import EditDialog from './edit-dialog.vue'
+import emitter from '@/utils/mitt';
+import { dataSetJson } from '@/utils/comm.js'
+
+const props = defineProps(['curNode', 'type'])
+
+/*****************提示词相关****************/
+
+/**
+ * isWordDialog : 提示词弹窗
+ * isAdd ： 是否添加 默认false
+ * editItem: 当前操作的item (添加的时候不需要这个)
+ */
+
+const isWordDialog = ref(false)
+const isAdd = ref(false)
+const editItem = reactive({})
+const onAdd = () => {
+  isAdd.value = true
+  Object.assign(editItem, curTemplate)
+  isWordDialog.value = true
+
+}
+
+const editKeyWord = (item, val) => {
+  /**
+   * isAdd: 字模板中的移除 为编辑  头部删除 添加提示词为新增
+   */
+  isAdd.value = val
+  Object.assign(editItem, item)
+  isWordDialog.value = true
+}
+
+/*******************模板相关**********************/
+
+/**
+ * curTemplate ：当前模板
+ * templateList ：主模板List
+ * childTempList : 子模板List
+ * getTemplateList() : 获取主模板
+ * getChildTemplate() :获取子模板
+ */
+const tempLoading = ref(false)
+const curTemplate = reactive({ name: '', id: '' })
+const templateList = ref([])
+const childTempList = ref([])
+const getTemplateList = () => {
+  modelList({ model: props.type, type: 1, pageNum: 1, pageSize: 10000 }).then(res => {
+    templateList.value = res.rows
+    Object.assign(curTemplate, res.rows[0]);
+    getChildTemplate()
+  })
+}
+const getChildTemplate = () => {
+  tempLoading.value = true
+  modelList({ model: props.type, type: 2, parentId: curTemplate.id }).then(res => {
+    childTempList.value = res.rows
+
+    getTempResult()
+  }).finally(() => {
+    tempLoading.value = false
+  })
+}
+
+
+// 查询模板结果
+const getTempResult = () => {
+  tempResult({ mainModelId: curTemplate.id }).then(res => {
+    let rows = res.rows
+    childTempList.value.forEach(item => {
+      rows.forEach(el => {
+        if (item.id == el.modelId) {
+          item.answer = el.content
+          item.reultId = el.id
+        }
+      })
+    })
+  })
+}
+
+// 模板切换
+const changeTemplate = (val) => {
+  ElMessageBox.confirm(
+    '切换模板将清除当前研读结果?',
+    '提示',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }
+  ).then(() => {
+    Object.assign(curTemplate, val);
+    getChildTemplate()
+  })
+}
+
+// 移除模板
+const removeItem = async (item, isChild) => {
+  /**
+   * item: 当前操作的模板
+   * isChild: 子模板中的移除为 true 否则为false
+   */
+  if (item.ex3 != '1') {
+    ElMessageBox.confirm(
+      '确认是否移除?',
+      '提示',
+      {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }
+    ).then(() => {
+      removeChildTemp(item.id).then(res => {
+        ElMessage.success('操作成功')
+        if(isChild){
+          // 获取子模板
+          getChildTemplate()
+        }
+        else{
+          // 获取主模板
+          getTemplateList()
+        }
+      })
+    })
+  }
+  else {
+
+
+    editKeyWord(item,!isChild)
+  }
+}
+
+
+
+
+// Ai对话调整
+const curIndex = ref(-1)
+const isAdjust = ref(false)
+const onAdjust = (index, item) => {
+  curIndex.value = index
+  Object.assign(editItem, item)
+  isAdjust.value = true
+}
+
+// 编辑结果
+const isEdit = ref(false)
+const onEdit = (index, item) => {
+  curIndex.value = index
+  Object.assign(editItem, item)
+  isEdit.value = true
+}
+
+
+const modeType = computed(() => {
+  if (props.type == 1) return '课标';
+  if (props.type == 2) return '教材';
+  if (props.type == 3) return '考试';
+})
+// 重新研读
+const params = reactive(
+  {
+    prompt: '',
+    dataset_id: ''
+  }
+)
+// 重新研读
+const againResult = async (index, item) => {
+  try {
+    childTempList.value[index].loading = true
+    params.prompt = `按照${item.name}的要求，针对${props.curNode.edustage}${props.curNode.edusubject}${modeType} 对${props.curNode.itemtitle}进行教学分析`
+    const { data } = await completion(params)
+    let answer = data.answer
+    childTempList.value[index].oldAnswer = answer
+    childTempList.value[index].answer = getResult(answer);
+    onSaveTemp(item)
+  } finally {
+    childTempList.value[index].loading = false
+  }
+}
+// 一键研读
+const getCompletion = async () => {
+  for (let item of childTempList.value) {
+    try {
+      item.loading = true
+     params.prompt = `按照${item.name}的要求，针对${props.curNode.edustage}${props.curNode.edusubject}${modeType} 对${props.curNode.itemtitle}进行教学分析`
+      const { data } = await completion(params)
+      let answer = data.answer
+      item.oldAnswer = answer
+      item.answer = getResult(answer);
+      onSaveTemp(item)
+    } finally {
+      item.loading = false
+    }
+  }
+}
+
+// 保存模板
+const onSaveTemp = (item) => {
+  const data = {
+    mainModelId: props.tempId,
+    modelId: item.id,
+    examDocld: '',
+    content: item.oldAnswer
+  }
+  tempSave(data).then(res => {
+    console.log(res)
+  })
+}
+
+
+
+// 替换分析结果
+emitter.on('saveAdjust', (item) => {
+  childTempList.value[curIndex.value].oldAnswer = item
+  let answer = getResult(item);
+  childTempList.value[curIndex.value].answer = answer
+})
+
+// 分析获取课标对话结果
+let getResult = (text) => {
+  text = text.replace(/^\n\n(.*?)\n\n$/s, '<div>$1</div>');
+  text = text.replace(/^\n(.*?)\n$/s, '<p>$1</p>');
+  text = text.replace(/\*\*(.*?)\*\*/g, "<div class='text-tit'>$1</div>");
+  text = text.replace(/(\d+\..*?)\n/g, "<div class='text-num'>$1</div>\n");
+  return text
+}
+
+// 操作之后获取字模板
+emitter.on('onGetChild', () => {
+  getChildTemplate()
+})
+// 操作之后获取主模板
+emitter.on('onGetMain', () => {
+  getTemplateList()
+})
+
+
+
+onMounted(() => {
+  getTemplateList()
+  let jsonKey = `${modeType}-${props.curNode.edustage}-${props.curNode.edusubject}`
+  params.dataset_id = dataSetJson[jsonKey]
+})
+
+// 解绑
+onUnmounted(() => {
+  emitter.off('onGetChild');
+  emitter.off('saveAdjust');
+})
+</script>
+
+<style lang="scss" scoped>
+.container-right-page {
+  height: 100%;
+  flex-direction: column;
+
+  .container-right-header {
+    height: 45px;
+    align-items: center;
+    justify-content: space-between;
+    background: #fff;
+    border-left: solid #EBF0F4 1px;
+    box-sizing: border-box;
+    padding: 0 15px;
+    border-radius: 0 5px 0 0
+  }
+
+  .container-right-list {
+    flex: 1;
+    overflow-y: auto;
+    padding: 5px 15px;
+    box-sizing: border-box;
+
+    
+
+      .template-item {
+        background: #fff;
+        padding: 10px;
+        margin-top: 10px;
+        border-radius: 5px;
+
+        .item-header {
+          display: flex;
+          align-items: center;
+          font-size: 16px;
+          font-weight: bold;
+          color: #000;
+          justify-content: space-between;
+
+          .blue {
+            font-size: 22px;
+            color: #409eff;
+            margin-right: 5px;
+          }
+        }
+
+        .item-text {
+          display: flex;
+          margin-top: 10px;
+          font-size: 14px;
+          text-align: left;
+          color: #606266;
+
+          .item-icon {
+            width: 30px;
+            height: 30px;
+            line-height: 30px;
+            text-align: center;
+            background: #F6F6F6;
+            border-radius: 50%;
+            margin-right: 10px;
+            flex-shrink: 0;
+          }
+
+          .item-answer {
+            flex-direction: column;
+            padding-top: 5px;
+
+            :deep(.text-tit) {
+              font-weight: bold;
+              margin: 10px 0;
+            }
+
+            :deep(.text-num) {
+              padding-left: 2em;
+            }
+          }
+
+        }
+
+        .text-answer {
+          color: #409eff;
+        }
+
+        .ai-btn {
+          margin-top: 10px;
+          display: flex;
+          justify-content: flex-end;
+
+          .iconfont {
+            margin-right: 3px;
+          }
+
+          :deep(.el-button) {
+            font-size: 13px;
+          }
+
+          .icon-ai1 {
+            font-size: 18px;
+          }
+        }
+      }
+    
+  }
+}
+</style>
+<style>
+.template-custom-popover {
+  width: 110px !important;
+  min-width: 110px !important;
+}
+</style>

src/renderer/src/components/template-study/index.vue

@@ -1,26 +1,21 @@
 <template>
   <div class="page-template flex">
-    <!--头部-->
+    <el-row>
-    <Header :type="type" @changeTemp="changeTemp" @onRead="onRead"/>
-    <el-row :gutter="20" class="tempalte-main">
       <el-col :span="12">
-        <!--左侧pdf-->
+        <Left :curNode="curNode" :type="type" />
-        <Pdf />
       </el-col>
       <el-col :span="12">
-        <!--右侧模板研读-->
+        <Right :curNode="curNode" :type="type" />
-        <Result ref="resultRef" :modeType="type" :tempId="tempId"/>
       </el-col>
     </el-row>
-
   </div>
 </template>
 
 <script setup>
-import { ref } from 'vue'
+import { reactive, onMounted } from 'vue'
-import Header from './container/header.vue'
+import { sessionStore } from '@/utils/store'
-import Pdf from './container/pdf.vue'
+import Left from './container/left.vue'
-import Result from './container/result.vue'
+import Right from './container/right.vue'
 
 const props = defineProps({
   type: {
@@ -29,22 +24,24 @@ const props = defineProps({
   },
 })
 
+const curNode = reactive({})
+onMounted(() =>{
+  let data = sessionStore.get('subject.curNode')
+  Object.assign(curNode, data);
+})
 
-const resultRef = ref()
-const tempId = ref('')
-const changeTemp = (id) =>{
-  tempId.value = id
-}
-
-const onRead = () =>{
-  resultRef.value.getConversation()
-}
 </script>
 
 <style lang="scss" scoped>
 .page-template {
   flex-direction: column;
   height: 100%;
+  .el-row{
+    height: 100%;
+    .el-col{
+      height: 100%;
+    }
+  }
   .tempalte-main {
     flex: 1;
   }

src/renderer/src/store/modules/classTask.js

@@ -1,18 +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: [],// 青优网题型列表
+    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)
@@ -22,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)
+      })
+  })
+}

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: '小学数学'},
@@ -26,8 +28,31 @@ 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;
+}
 
-export const JYApiListCT = async (_this, name = '高中历史') => {
+/**
+ * @desc: 根据学科+学段获取菁优网-题型
+ * @return: {*}
+ * @param {*} name 学科+学科
+ */
+export const JYApiListCT = async (name = '高中历史') => {
   if (name === '初中政治') {
     name = '初中道德与法治';
   }
@@ -35,7 +60,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,22 +89,13 @@ export const JYApiListCT = async (_this, 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;
-}
 
-export const JYApiListSO = async (_this, name = '高中历史') => {
+/**
+ * @desc: 根据学科+学段获取菁优网-题源
+ * @return: {*}
+ * @param {*} name 学科+学科
+ */
+export const JYApiListSO = async (name = '高中历史') => {
   if (name === '初中政治') {
     name = '初中道德与法治';
   }
@@ -87,7 +104,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}`
     },
@@ -103,8 +120,12 @@ export const JYApiListSO = async (_this, name = '高中历史') => {
 }
 
 
-
+/**
-export const JYApiListPoint = async (_this, name = '高中历史') => {
+ * @desc: 根据学科+学段获取菁优网-知识点
+ * @return: {*}
+ * @param {*} name 学科+学科
+ */
+export const JYApiListPoint = async (name = '高中历史') => {
   if (name === '初中政治') {
     name = '初中道德与法治';
   }
@@ -113,7 +134,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}`
     },
@@ -126,10 +147,12 @@ export const JYApiListPoint = async (_this, name = '高中历史') => {
 
 
 /**
- * @desc: 获取菁优网的版本内容
+ * @desc: 根据查询条件获取菁优网-教材版本
  * @return: {*}
+ * @param {*} query {}
+ * @param {*} hasPoints
  */
-export const JYApiListVersion = async (_this, query, hasPoints=true) => {
+export const JYApiListVersion = async (query, hasPoints=true) => {
   const listVersion = {
     status: 0,
     msg: '',
@@ -148,7 +171,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}`

src/renderer/src/utils/resourceDict.js

@@ -117,4 +117,8 @@ export const coursewareTypeList = [
     label:'素材',
     value:6
   },
+  {
+    label:'视频',
+    value:12
+  },
 ]

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);
 
 })
 

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:'primary' },
-  { title: '校本题库', description: '本校公共题库资源。', icon: '#icon-soutibao-',type:'default' },
+  { title: '校本题库', description: '本校公共题库资源。', icon: '#icon-soutibao-',type:'primary' },
-  { title: '个人题库', description: '老师上传维护自己的个人题库。', icon: '#icon-soutibao-',type:'default' },
+  { title: '个人题库', description: '老师上传维护自己的个人题库。', icon: '#icon-soutibao-',type:'primary' },
-  { title: '智能推荐', description: '通过对学生的薄弱知识点分析，推送不同难度的习题进行强化训练。', icon: '#icon-tubiao_wuxing-',type:'default' },
+  { title: '智能推荐', description: '通过对学生的薄弱知识点分析，推送不同难度的习题进行强化训练。', icon: '#icon-tubiao_wuxing-',type:'primary' },
-  { title: '课堂展示', description: '通过课堂白板绘制作业，提升学生的创作思维能力。', icon: '#icon-huaban',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' },

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="分值">
@@ -129,7 +129,7 @@
 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'

src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue

@@ -131,6 +131,7 @@ import useClassTaskWorkQuest from '@/hooks/useClassTaskWorkQuest';
 
 import { debounce } from '@/utils/comm' 
 import useUserStore from '@/store/modules/user'
+import useClassTaskStore from '@/store/modules/classTask'
 
 const router = useRouter()
 const {
@@ -145,6 +146,8 @@ const {
 const emit = defineEmits(['addQuiz'])
 const { proxy } = getCurrentInstance()
 const userStore = useUserStore().user
+const classTaskStore = useClassTaskStore();
+
 const props = defineProps({
   bookobj: {
     type: Object,
@@ -228,6 +231,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;
+  }
+
   inits();
   debounceQueryData(); // 查询习题列表
 })
@@ -347,7 +360,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++) {

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": "单选题"},
+    {value: 0, label: "不限"},
-    {"Key": 4, "Value": "多选题"},
+    {value: 1, label: "单选题"},
-    {"Key": 2, "Value": "填空题"},
+    {value: 2, label: "填空题"},
-    {"Key": 5, "Value": "判断题"},
+    {value: 3, label: "多选题"},
-    {"Key": 6, "Value": "主观题"},
+    {value: 4, label: "判断题"},
-    {"Key": 3, "Value": "复合题"},
+    {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;
+  // }
 })
 
 
@@ -990,7 +1005,17 @@ 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('当前章节下未绑定知识点，暂不更新该试题知识点！');
@@ -999,7 +1024,7 @@ const updateForm= async(item, submitIndex=0, submitType=1) =>{
       else {
         curKnowledgePointList.value = res.data;
       }
-    
+    }
   }
 
   //item.evalnodeid = '3772b,374112,374233';
@@ -1698,7 +1723,7 @@ watch(() => props.bookobj.levelSecondId, async (newVal, oldVal) => {
    * 2. 其他: 获取当前章节下的所有知识点
    */
   let id = props.bookobj.levelSecondId;
-  if(props.bookobj.node.edusubject == '语文' || props.bookobj.node.edusubject == '英语'){
+  if( props.bookobj.node.edustage == '高中' && (props.bookobj.node.edusubject == '语文' || props.bookobj.node.edusubject == '英语') ){
     id = props.bookobj.node.rootid;
     const res = await listEvaluation({ edusubject: props.bookobj.node.edusubject, edustage: props.bookobj.node.edustage, itemkey: "subject", pageSize: 10 });
     id = res.rows[0]?.id;

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++) {

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: {

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;

src/renderer/src/views/profile/components/selectClass.vue

@@ -42,6 +42,7 @@ import useUserStore from '@/store/modules/user'
 import {ArrowDown} from '@element-plus/icons-vue'
 import { onMounted,ref } from 'vue';
 import { listEvaluation } from '@/api/subject/index'
+import {sessionStore} from '@/utils/store'
 const userStore = useUserStore().user
 const subjectList = ref([])
 // 获取基础的学科
@@ -58,6 +59,7 @@ const getSubject = () => {
 // 选择学段
 const handleUserEduStage = (item) => {
     userStore.edustage = item
+    sessionStore.set('edustage',item)
     if(item === '幼儿园'){
         // 默认语文
         userStore.edusubject = '语文'
@@ -74,6 +76,7 @@ const handleUserEduStage = (item) => {
 // 选择学科
 const handleUserEduSubject = (item) => {
     userStore.edusubject = item;
+    sessionStore.set('edusubject',item)
 }
 onMounted(() => {
     getSubject()

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([])
 // 未加入的班级
@@ -162,11 +165,13 @@ setTimeout(() => {
 function submit() {
   proxy.$refs.userRef.validate((valid) => {
     if (valid) {
-      userStore.user.avatar = userStore.user.avatar
+      userStore.user.edusubject = sessionStore.get('edusubject')
+      userStore.user.edustage = sessionStore.get('edustage')
+      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 +182,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)
               }

src/renderer/src/views/resource/container/resoure-search.vue

@@ -32,7 +32,15 @@
     </el-row> -->
     <el-row class="resoure-btns">
       <el-col :span="24" class="query-row flex">
-        <div class="flex row-left"> <el-select v-model="sourceStore.query.fileSuffix" @change="sourceStore.changeSuffix"
+        <div class="flex row-left">
+      <!--    第三方资源筛选-->
+          <el-select v-if="isThird" v-model="sourceStore.thirdQuery.type" @change="sourceStore.thirdChangeType"
+            style="width: 110px">
+            <el-option v-for="item in coursewareTypeList" :key="item.value" :label="item.label"
+              :value="item.value" />
+          </el-select>
+
+         <el-select v-else v-model="sourceStore.query.fileSuffix" @change="sourceStore.changeSuffix"
             style="width: 110px">
             <el-option v-for="item in sourceStore.resourceFormatList" :key="item.value" :label="item.label"
               :value="item.value" />
@@ -48,7 +56,6 @@
         </div>
       </el-col>
     </el-row>
-
   </div>
 </template>
 

src/renderer/src/views/teachingDesign/container/left.vue

@@ -7,18 +7,22 @@
           <span>{{ item.name }}</span>
           <el-button type="primary" link @click="onSelect(item)">选择模式</el-button>
         </div>
-        <el-scrollbar>
+        <div class="content-list"> 
             <div class="item-list flex">
               <el-card class="item-card" shadow="never" v-for="el in item.child" :key="el.id">
-              <p class="card-name">{{ el.name }}</p>
+                <p class="card-name">
+                  <el-text line-clamp="1" :title="el.name">
+                    {{ el.name }}
+                  </el-text>
+                  </p>
                 <div class="card-text">
-                <el-text line-clamp="2">
+                  <el-text line-clamp="4" :title="el.prompt">
                     {{ el.prompt }}
                   </el-text>
                 </div>
               </el-card>
             </div>
-        </el-scrollbar>
+        </div>
       </div>
     </div>
   </div>
@@ -97,30 +101,44 @@ onMounted(() => {
       justify-content: space-between;
       margin-bottom: 5px;
     }
-
     .con-item {
       margin-bottom: 20px;
+      display: flex;
+      flex-direction: column
+    }
+    .item-list{
+      margin-bottom: 10px;
     }
-
     .item-card {
       width: 130px;
       font-size: 13px;
       padding: 10px;
       margin-right: 20px;
-
+      flex-shrink: 0;
+      border-radius: 10px;
       :deep(.el-card__body) {
         padding: 0 !important;
       }
 
       .card-name {
         text-align: center;
+        font-size: 14px;
       }
 
       .card-text {
         text-align: left;
-        font-size: 12px;
+  
+        .el-text{
+          font-size: 12px !important;
         }
       }
     }
   }
+}
+.content-list{
+  overflow-x: auto
+}
+.content-list::-webkit-scrollbar {
+  height: 8px;
+}
 </style>

src/renderer/src/views/teachingDesign/container/right.vue

@@ -52,26 +52,55 @@
 </template>
 
 <script setup>
-import { ref, onUnmounted, reactive } from 'vue'
+import { ref, onMounted, onUnmounted, reactive } from 'vue'
+import { sessionStore } from '@/utils/store'
 import emitter from '@/utils/mitt'
 import EditDialog from './edit-dialog.vue'
 import AdjustDialog from './adjust-dialog.vue'
-import { completion } from '@/api/mode/index.js'
+import { completion, tempResult } from '@/api/mode/index.js'
+import { dataSetJson } from '@/utils/comm.js'
 
 
 const resultList = ref([])
 emitter.on('changeMode', (item) => {
+  console.log(item, 'item')
   resultList.value = item.child
-  conversation()
+  // conversation()
+  getTempResult(item.id)
 })
+
+
+// 查询模板结果
+const getTempResult = (id) => {
+  tempResult({ mainModelId: id }).then(res => {
+    console.log(res, 2000)
+    let rows = res.rows
+    if (rows.length > 0) {
+      resultList.value.forEach(item => {
+        rows.forEach(el => {
+          if (item.id == el.modelId) {
+            item.answer = el.content
+            item.reultId = el.id
+          }
+        })
+      })
+    }
+  })
+}
+
+
+const params = reactive(
+  {
+    prompt: '',
+    dataset_id: ''
+  }
+)
 const conversation = async () => {
   for (let item of resultList.value) {
     item.loading = true
     try {
-      const { data } = await completion({
+      params.prompt = `按照${item.prompt}的要求，针对${curNode.edustage}${curNode.edusubject}课标对${curNode.itemtitle}进行教学分析`
-        dataset_id: 'cee3062a9fcf11efa6910242ac140006',
+      const { data } = await completion(params)
-        prompt: item.prompt
-      })
       item.answer = data.answer
     } finally {
       item.loading = false
@@ -89,10 +118,8 @@ const curItem = reactive({})
 const againResult = async (index, item) => {
   try {
     resultList.value[index].loading = true
-    const { data } = await completion({
+    params.prompt = `按照${item.prompt}的要求，针对${curNode.edustage}${curNode.edusubject}课标对${curNode.itemtitle}进行教学分析`
-      dataset_id: 'cee3062a9fcf11efa6910242ac140006',
+    const { data } = await completion(params)
-      prompt: item.prompt
-    })
     resultList.value[index].answer = data.answer
   } finally {
     resultList.value[index].loading = false
@@ -122,6 +149,17 @@ emitter.on('changeResult', (item) => {
 })
 
 
+
+const curNode = reactive({})
+onMounted(() => {
+  let data = sessionStore.get('subject.curNode')
+  Object.assign(curNode, data);
+
+  let jsonKey = `课标-${data.edustage}-${data.edusubject}`
+  params.dataset_id = dataSetJson[jsonKey]
+})
+
+
 // 解绑
 onUnmounted(() => {
   emitter.off('changeMode')