Merge branch 'main' into zouyf_dev

Reviewed-on: #270

package.json

@@ -17,7 +17,7 @@
     "build:test": "electron-vite build --mode test && electron-builder --win --config ./electron-builder.yml",
     "build:prod": "electron-vite build --mode production && electron-builder --win --config ./electron-builder-prod.yml",
     "build:lt": "electron-vite build --mode lt && electron-builder --win --config ./electron-builder-lt.yml",
-    "build:mac": "npm run build && electron-builder --mac",
+    "build:mac": "electron-vite build --mode production && electron-builder --mac --config ./electron-builder-prod.yml",
     "build:linux": "npm run build && electron-builder --linux"
   },
   "dependencies": {

src/main/index.js

@@ -88,9 +88,10 @@ function createLoginWindow() {
 //主窗口
 function createMainWindow() {
   mainWindow = new BrowserWindow({
-    width: 1200,
-    minWidth: 1350,
+    width: 1350,
+    minWidth: 1200,
     height: 700,
+    minHeight: 700,
     show: false,
     frame: false, // 无边框
     autoHideMenuBar: true,
@@ -118,6 +119,11 @@ function createMainWindow() {
     }, 1000)
     // app.quit() // 主窗口关闭-结束所有进程
   })
+  mainWindow.on('resize', () => {
+    const { width, height } = mainWindow.getBounds();
+    mainWindow.webContents.send('minWinResize', { width, height });
+  });
+
   mainWindow.webContents.setWindowOpenHandler((details) => {
     shell.openExternal(details.url)
     return { action: 'deny' }
@@ -129,6 +135,7 @@ function createMainWindow() {
   } else {
     mainWindow.loadFile(join(__dirname, '../renderer/index.html'))
   }
+  
   // mainWindow.setAlwaysOnTop(true, "screen-saver") // 将窗口设置为顶层窗口
   // mainWindow.setVisibleOnAllWorkspaces(true) // 如果窗口在所有工作区都可见
   // 第三步： 开启remote服务

src/renderer/public/pdfjs-dist/web/viewer.css

@@ -3144,7 +3144,7 @@ body{
   background-color:var(--toolbar-bg-color);
   box-shadow:var(--toolbar-box-shadow);
   border-bottom:var(--toolbar-border-bottom);
-  z-index: 9;
+  z-index: 99999;
 }
 
 #toolbarViewer{

src/renderer/src/components/PdfJs/index.vue

@@ -6,6 +6,7 @@
 
 <script setup>
 import { onMounted, ref } from 'vue';
+import { getAppInstallUrl } from '@/utils/tool'
 const props = defineProps({
   url: {
     type: String,
@@ -16,7 +17,7 @@ const props = defineProps({
 /**pdf文件地址 */
 const pdfUrl = ref('');
 /**pdfjs文件地址 */
-const fileUrl = '/pdfjs-dist/web/viewer.html?file=';
+const fileUrl = getAppInstallUrl('pdfjs-dist/web/viewer.html', 'user', '\\out\\renderer', true) + "?file=" //本地
 onMounted(() => {
     /** 将传入的pdf地址进行编码，防止中文识别错误 */
     pdfUrl.value = fileUrl + encodeURIComponent(props.url)

src/renderer/src/components/choose-textbook/index.vue

@@ -77,12 +77,11 @@ const changeBook = (data) => {
   curBook.data = data
   sessionStore.set('subject.curBook', data)
   treeData.value = useSubject.getTreeData(data.id)
-
+  sessionStore.set('subject.subjectTree', useSubject.getTreeData(data.id))
   //切换教材后默认展开第一个并选中
   nextTick(() =>{
     defaultExpandedKeys.value = [treeData.value[0].id]
     curNode.data = getLastLevelData(treeData.value)[0]
-
     handleNodeClick(curNode.data)
   })
   // 延迟关闭 视觉上选中

src/renderer/src/components/move-file/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog v-model="dialogVisible" append-to-body :show-close="false" width="630" :before-close="beforeClose"
+  <el-dialog v-model="model" append-to-body :show-close="false" width="630"
     style="border-radius: 5px;padding-top: 0">
     <div class="dialog-title flex">
       <span>{{ title }}</span>
@@ -7,13 +7,13 @@
     </div>
     <div class="dialog-content">
       <div class="book-name flex" @click="bookVisible = true">
-        <span>{{ curBookName }}</span>
+        <span>{{ curNode.data.itemtitle }}</span>
         <i class="iconfont icon-yidongdaozu"></i>
       </div>
       <el-scrollbar height="400px">
         <div class="book-data">
-          <el-tree ref="refTree" :data="treeData" :props="defaultProps" node-key="id"
-            :default-expanded-keys="defaultExpandedKeys" :current-node-key="currentNodeId" highlight-current
+          <el-tree :data="treeData" :props="defaultProps" node-key="id"
+            :default-expanded-keys="defaultExpandedKeys" :current-node-key="curNode.data.id" highlight-current
             @node-click="handleNodeClick">
             <template #default="{ node }">
               <span :title="node.label" class="tree-label">{{ node.label }}</span>
@@ -24,7 +24,7 @@
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <el-button @click="closeDialog">取消</el-button>
+        <el-button @click="model = false">取消</el-button>
         <el-button type="primary" @click="onSubmit">
           确定
         </el-button>
@@ -43,9 +43,12 @@
 
     <div class="textbook-container">
       <el-scrollbar height="450px">
-        <div class="textbook-item flex" v-for="item in subjectList" :class="curBookId == item.id ? 'active-item' : ''"
+        <div class="textbook-item flex" v-for="item in subjectList" :class="curBook.data.id == item.id ? 'active-item' : ''"
           :key="item.id" @click="changeBook(item)">
-          <img :src="item.avartar" class="textbook-img" alt="">
+          <img v-if="item.avartar" :src="item.avartar.indexOf('http') === 0 ? item.avartar : BaseUrl + item.avartar" class="textbook-img" alt="">
+          <div v-else class="textbook-img">
+            <i class="iconfont icon-jiaocaixuanze" style="font-size: 40px;"></i>
+          </div>
           <span class="book-name">{{ item.itemtitle }}</span>
         </div>
       </el-scrollbar>
@@ -54,9 +57,10 @@
 </template>
 
 <script setup>
-import { ref, reactive, toRaw, onMounted, nextTick, watch } from 'vue'
-import useUserStore from '@/store/modules/user'
-import { listEvaluation } from '@/api/subject'
+import { ref, reactive, toRaw, onMounted, nextTick } from 'vue'
+import { sessionStore } from '@/utils/store'
+import { useGetSubject } from '@/hooks/useGetSubject'
+import { cloneDeep } from 'lodash'
 
 const props = defineProps({
   modelValue: {
@@ -68,134 +72,35 @@ const props = defineProps({
     default: '移动至'
   }
 })
-const userStore = useUserStore()
-const { edustage, edusubject, userId } = userStore.user
+const model = defineModel({ type: Boolean, default: false })
+const BaseUrl = import.meta.env.VITE_APP_BUILD_BASE_PATH
+let useSubject = null
 
-const dialogVisible = ref(false)
 const bookVisible = ref(false)
 //教材
 const subjectList = ref([])
-const evaluationList = ref([])
 const treeData = ref([])
 const defaultProps = {
   children: 'children',
-  label: 'label',
+  label: 'itemtitle',
   class: 'textbook-tree'
 }
-//当前教材ID
-const curBookId = ref(-1)
-//当前教材名称
-const curBookName = ref('')
-// 上册
-const volumeOne = ref([])
-// 当前节点
-const currentNode = reactive({
+// 当前选中的教材
+const curBook = reactive({
   data: {}
 })
-// 当前选中的节点ID
-const currentNodeId = ref(0)
-// 当前选中的节点名称
-const currentNodeName = ref('')
+// 当前节点
+const curNode = reactive({
+  data:{}
+})
+// 提交的数据 节点
+let submitNode = null
+
 // 默认展开的节点
 const defaultExpandedKeys = ref([])
-// tree
-const refTree = ref(null)
+
 // 定义要发送的emit事件
-const emit = defineEmits(['update:modelValue', 'onSubmit'])
-
-watch(() => props.modelValue, (newVal) => {
-  dialogVisible.value = newVal
-})
-
-
-const getSubjectContent = async () => {
-
-  const params = {
-    edusubject,
-    edustage,
-    // entpcourseedituserid: userId,
-    itemgroup: 'textbook',
-    orderby: 'orderidx asc',
-    pageSize: 10000
-  }
-  let data;
-  const { rows } = await listEvaluation(params)
-  localStorage.setItem('evaluationList', JSON.stringify(rows))
-  evaluationList.value = rows
-  data = rows
-
-  //获取教材版本
-  getSubject()
-  //上册
-    /**
-   * 不区分上下册
-   * 2024/08/20调整
-   */
-  // volumeOne.value = data.filter(item => item.level == 1)
-
-  getTreeData()
-}
-
-const getSubject = async () => {
-
-
-  if (localStorage.getItem('subjectList')) {
-    subjectList.value = JSON.parse(localStorage.getItem('subjectList'))
-  }
-  else {
-    const { rows } = await listEvaluation({ itemkey: "version", edusubject, edustage,  pageSize: 10000, orderby: 'orderidx asc', })
-    subjectList.value = rows
-    localStorage.setItem('subjectList', JSON.stringify(subjectList.value))
-  }
-
-  // 默认第一个
-  if(!subjectList.value.length) return
-  curBookName.value = subjectList.value[0].itemtitle
-  curBookId.value = subjectList.value[0].id
-}
-
-const isHaveUnit = (id) => {
-  return evaluationList.value.some(item => {
-    return item.rootid == id
-  })
-}
-
-const getTreeData = () => {
-  //数据过滤
-  let upData = transData(evaluationList.value)
-  if(upData.length){
-    treeData.value = [...upData]
-  }
-  else{
-    treeData.value = []
-    return
-  }
-  nextTick(() => {
-    defaultExpandedKeys.value = [treeData.value[0].id]
-    currentNodeId.value = getLastLevelData(treeData.value)[0].id
-    currentNodeName.value = getLastLevelData(treeData.value)[0].label
-    emitChangeBook()
-  })
-}
-
-
-const emitChangeBook = () => {
-  let curNode = {
-    id: currentNodeId.value,
-    label: currentNodeName.value
-  }
-  let parentNode = findParentByChildId(treeData.value, currentNodeId.value)
-  curNode.parentNode = toRaw(parentNode)
-
-  const data = {
-    textBook: {
-      curBookId: curBookId.value,
-      curBookName: curBookName.value
-    },
-    node: curNode
-  }
-  currentNode.data = data
-}
+const emit = defineEmits(['onSubmit'])
 
 // 根据id 拿到父节点数据
 const findParentByChildId = (treeData, targetNodeId) => {
@@ -219,70 +124,32 @@ const findParentByChildId = (treeData, targetNodeId) => {
   return null;
 }
 
-const handleNodeClick = (data, node) => {
+const handleNodeClick = (data) => {
   /**
    * data : 当前节点数据
-   * node : 当前节点对象 包含当前节点所有数据  parent属性 指向父节点Node对象
    */
-  const nodeData = data;
-  const parentNode = node.parent.data;
-
-  if (Array.isArray(parentNode)) {
-    nodeData.parentNode = null
-  }
-  else {
-    nodeData.parentNode = parentNode
-  }
+  let nodeData = cloneDeep(toRaw(data));
+  //增加一个label 之前取的label
+  nodeData.label = nodeData.itemtitle
+  // 父级节点 如果当前是一级节点 父级则为null
+  let parent = {
+    id: nodeData.parentid,
+    label: nodeData.parenttitle,
+    itemtitle: nodeData.parenttitle
+  } 
+  const parentNode = nodeData.parentid ?  parent : null
+  nodeData.parentNode = parentNode
 
   let curData = {
     textBook: {
-      curBookId: curBookId.value,
-      curBookName: curBookName.value
+      curBookId: curBook.data.id,
+      curBookName: curBook.data.itemtitle
     },
-    node: toRaw(nodeData)
+    node: nodeData
   }
-
-  currentNode.data = curData
-  // emit('nodeClick', curData)
-
+  submitNode = curData
 }
 
-
-const transData = (data) => {
-  let ary = []
-  data.forEach(item => {
-    let obj = {}
-    // 根据当前教材ID 过滤出对应的单元、章节
-    if (item.rootid == curBookId.value) {
-      if(item.level == 1){
-        obj.label = item.itemtitle
-        obj.id = item.id
-        obj.itemtitle = item.itemtitle
-        obj.edudegree = item.edudegree
-        obj.edustage = item.edustage
-        obj.edusubject = item.edusubject
-        let ary2 = []
-        evaluationList.value.forEach(el => {
-          let obj2 = {}
-          if (item.id == el.parentid) {
-            obj2 = {
-              label: el.itemtitle,
-              id: el.id,
-              itemtitle : el.itemtitle,
-              edudegree : el.edudegree,
-              edustage : el.edustage,
-              edusubject : el.edusubject,
-            }
-            ary2.push(obj2)
-          }
-          obj.children = ary2
-        })
-        ary.push(obj)
-      }
-    }
-  })
-  return ary
-}
 // 获取最后一层数据
 const getLastLevelData = (tree) => {
   let lastLevelData = [];
@@ -307,33 +174,53 @@ const getLastLevelData = (tree) => {
 }
 
 // 选择教材
-const changeBook = ({ id, itemtitle }) => {
-  curBookId.value = id
-  curBookName.value = itemtitle
-  getTreeData()
+const changeBook = (data) => {
+  curBook.data = data
+  treeData.value = useSubject.getTreeData(data.id)
+
+  //切换教材后默认展开第一个并选中
+  nextTick(() =>{
+    defaultExpandedKeys.value = [treeData.value[0].id]
+    curNode.data = getLastLevelData(treeData.value)[0]
+    handleNodeClick(curNode.data)
+  })
+
   setTimeout(() => {
     bookVisible.value = false
   }, 0);
 }
 
-
 const onSubmit = () => {
-  emit('onSubmit', toRaw(currentNode.data))
-  closeDialog()
+  emit('onSubmit', submitNode)
+  model.value = false
 }
 
-const closeDialog = () => {
-  emit('update:modelValue', false)
-}
+onMounted(async () => {
+  // 不缓存记录选择的章节 教材 只获取
+  useSubject = await useGetSubject()
+  subjectList.value = sessionStore.get('subject.bookList')
+  // 当前教材
+  if(sessionStore.get('subject.curBook')){
+    curBook.data = sessionStore.get('subject.curBook')
+  }
+  else{
+    curBook.data = subjectList.value[0]
+  }
 
-// 关闭弹窗前
-const beforeClose = (done) => {
-  emit('update:modelValue', false)
-  done()
-}
-
-onMounted(() => {
-  getSubjectContent()
+  // 章节"树"
+  treeData.value = useSubject.getTreeData(curBook.data.id)
+  nextTick(() =>{
+    // 默认展开 选中
+    if(sessionStore.get('subject.curNode')){
+      defaultExpandedKeys.value = sessionStore.get('subject.defaultExpandedKeys')
+      curNode.data = sessionStore.get('subject.curNode')
+    }else{
+      defaultExpandedKeys.value = [treeData.value[0].id]
+      curNode.data = getLastLevelData(treeData.value)[0]
+    }
+    handleNodeClick(curNode.data)
+  })
+  
 })
 </script>
 

src/renderer/src/hooks/useGetSubject.js

@@ -63,7 +63,6 @@ export const useGetSubject = async () =>{
       }
       sessionStore.set('subject.curNode', curNode)
     }
-  
   }
 
   // 单元章节数据转为“树”结构
@@ -73,9 +72,7 @@ export const useGetSubject = async () =>{
     data.forEach( item => {
       item.children = unitList.value.filter( item2 => item2.parentid == item.id && item2.level == 2)
     }) 
-    sessionStore.set('subject.subjectTree', data)
     return data
-
   }
 
   await getSubjectUnit()

src/renderer/src/layout/components/AppMain.vue

@@ -67,7 +67,7 @@ const title = reactive([
       },
       {
         name: '教材分析',
-        url: '/teaching/chatwithtextbook',
+        url: '/textbookAnalysis',
         img: 'iconfont icon-yanjiushi',
         child1: []
       },

src/renderer/src/layout/components/Header.vue

@@ -70,10 +70,8 @@ import { ArrowDown } from '@element-plus/icons-vue'
 import WindowTools from '@/components/window-tools/index.vue'
 import useUserStore from '@/store/modules/user'
 import { updateUserInfo } from '@/api/system/user'
-import outLink from '@/utils/linkConfig'
 import logoIco from '@/assets/images/logo.png'
 import { listEvaluation } from '@/api/classManage/index'
-import { clearBookInfo } from '@/utils/ruoyi'
 import { sessionStore } from '@/utils/store'
 import { useToolState } from '@/store/modules/tool'
 
@@ -175,7 +173,13 @@ function setLayout() {
 }
 // 切换学科
 const changeSubject = async (command) =>{
-  clearBookInfo()
+  let sessionSubject = {
+    bookList: null, 
+    curBook: null, 
+    curNode: null, 
+    defaultExpandedKeys: [], 
+  }
+  sessionStore.set( 'subject', sessionSubject)
   const { userId, userName, phonenumber, plainpwd  } = userStore.user
   const data = {
     userId,
@@ -184,7 +188,7 @@ const changeSubject = async (command) =>{
     edusubject:  command.edusubject
   }
   await updateUserInfo(data)
-  await userStore.login({username: phonenumber, password: plainpwd})
+  await userStore.login({username: phonenumber ? phonenumber :  userName, password: plainpwd})
   await userStore.getInfo()
   router.go()
 }

src/renderer/src/router/index.js

@@ -54,7 +54,13 @@ export const constantRoutes = [
         path: '/standardanalysis',
         component: () => import('@/views/teach/standardAnalysis/index.vue'),
         name: 'standardanalysis',
-        meta: {title: '课标分析'},
+        meta: {title: '课标分析'}
+      },
+      {
+        path: '/textbookAnalysis',
+        component: () => import('@/views/textbookAnalysis/index.vue'),
+        name: 'textbookAnalysis',
+        meta: {title: '教材分析'}
       },
       {
         path: '/profile',

src/renderer/src/utils/tool.js

@@ -49,6 +49,18 @@ export const getStaticUrl = (url = '', type = 'app', exitPath = '', isFile = fal
     }
   }
 }
+
+export const getAppInstallUrl = (url = '', type = 'app', exitPath = '', isFile = false) => {
+  if (isDev) return url
+  else { // 生产环境获取-url
+    switch(type) {
+      case 'app': return path.join(__dirname, url) // 应用目录
+      case 'user': return (isFile?'file://':'')+path.join(Remote.app.getAppPath(),exitPath, url) // 用户目录
+      // case 'user': return (isFile?'file://':'')+path.join(Remote.app.getPath('userData'),exitPath, url) // 用户目录
+      default: return ''
+    }
+  }
+}
 /**
  * @description 消息发送-nodejs 消息发送
  * @form src/main/tool.js 来源
@@ -137,7 +149,7 @@ export const createWindow = async (type, data) => {
           winPdf.focus();
           // toolState.isPdfWin=true
         }
-        
+
           return
       }
       const option = data.option||{}
@@ -272,7 +284,7 @@ const eventHandles = (type, win) => {
         winPdf=null
         win&&win.destroy()
        })
-      
+
        // 监听窗口的激活事件
        win.on('focus', async () => {
         console.log('激活窗口')
@@ -299,8 +311,8 @@ const eventHandles = (type, win) => {
 
 /**
  * @description 外部跳转-web网页
- * @param {*} path 
- * @param {*} params 
+ * @param {*} path
+ * @param {*} params
  */
 export const toLinkWeb = (path) => {
   const config = baseConfig()

src/renderer/src/views/classTask/classTaskAssign.vue

@@ -26,9 +26,9 @@
             <!-- <el-button type="primary" icon="Postcard" @click="handleNewClassWorkDialog" style="margin-left: 20px; margin-top: 10px">{{initDataProps.queryType!=='single'?'设计新作业':'设计新活动'}}</el-button>
             <el-button v-if="initDataProps.queryType!=='single'" type="success" icon="Promotion" @click="handleTaskAssignToAllClass()" style="margin-left: 20px; margin-top: 10px">一键推送</el-button>
             <el-button type="danger" icon="delete" @click="handleDelete" style="margin-left: 20px; margin-top: 10px">删除</el-button> -->
-            <el-button type="primary" @click="handleNewClassWorkDialog" style="margin-left: 20px; margin-top: 10px">设计新作业</el-button>
-            <el-button type="success" @click="handleTaskAssignToAllClass()" style="margin-left: 20px; margin-top: 10px">一键推送</el-button>
-            <el-button type="danger" @click="handleDelete" style="margin-left: 20px; margin-top: 10px">删除</el-button>
+            <el-button type="primary" style="margin-left: 20px; margin-top: 10px" @click="handleNewClassWorkDialog">设计新作业</el-button>
+            <el-button type="success" style="margin-left: 20px; margin-top: 10px" @click="handleTaskAssignToAllClass()">一键推送</el-button>
+            <el-button type="danger" style="margin-left: 20px; margin-top: 10px" @click="handleDelete">删除</el-button>
           </div>
         </el-col>
       </el-row>
@@ -71,14 +71,14 @@
             <template #default="scope">
               <div style="border: 1px solid #ccc; width: 100%; height: auto; display: flex; justify-content: space-between; padding-left: 10px">
                 <div style="display: flex; margin-top: 5px">
-                  <div v-html="scope.row.title" style="max-width: 200px" class="singe-line"></div>
+                  <div class="singe-line" style="max-width: 200px" v-html="scope.row.title"></div>
                 </div>
                 <div>
                   <div v-if="scope.row.status == '10'">
-                    <el-button text  @click="handleWorkTitleEdit(scope.row, scope.$index)" v-hasPermi="['teaching:classwork:edit']">编辑</el-button>
+                    <el-button v-hasPermi="['teaching:classwork:edit']"  text @click="handleWorkTitleEdit(scope.row, scope.$index)">编辑</el-button>
                   </div>
                   <div v-else>
-                    <el-button text  @click="handleWorkTitleEdit(scope.row, scope.$index)" v-hasPermi="['teaching:classwork:edit']">查看详情</el-button>
+                    <el-button v-hasPermi="['teaching:classwork:edit']"  text @click="handleWorkTitleEdit(scope.row, scope.$index)">查看详情</el-button>
                   </div>
                 </div>
               </div>
@@ -112,19 +112,19 @@
             <el-table-column label="题目内容" align="left" >
               <template #default="scope">
                 <div>
-                  <div v-html="scope.row.titleFormat" style="overflow: hidden; text-overflow: ellipsis; font-weight:700"></div>
-                  <div v-html="scope.row.workdescFormat" style="overflow: hidden; text-overflow: ellipsis; margin-top: 6px;"></div>
+                  <div style="overflow: hidden; text-overflow: ellipsis; font-weight:700" v-html="scope.row.titleFormat"></div>
+                  <div style="overflow: hidden; text-overflow: ellipsis; margin-top: 6px;" v-html="scope.row.workdescFormat"></div>
                 </div>
               </template>
             </el-table-column>
             <el-table-column label="分值" align="center" width="180">
               <template #default="scope">
-                <el-input-number v-model="scope.row.score" :min="1" :max="100" :disabled="taskParams.viewkey=='作业反馈'||checkTaskAssigned(currentTask)"></el-input-number >
+                <el-input-number v-model="scope.row.score" :min="1" :max="100" :disabled="checkTaskAssigned(currentWorkEdit.currentTask)"></el-input-number >
               </template>
             </el-table-column>
             <el-table-column label="操作" align="center" width="100">
               <template #default="scope">
-                <el-button @click="handleWorkConfigQuizMinus(scope.$index)" :disabled="taskParams.viewkey=='作业反馈'||checkTaskAssigned(currentTask)">删除</el-button>
+                <el-button :disabled="checkTaskAssigned(currentWorkEdit.currentTask)" @click="handleWorkConfigQuizMinus(scope.$index)">删除</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -133,9 +133,9 @@
         <div slot="footer" class="dialog-footer" style="text-align: right; margin-top: 20px;">
           <div style="display: flex">
             <el-button v-if="currentTag=='习题训练'" style="margin-right: auto" type="primary"
-                @click="handleWorkEdit2ClassWorkQuizAdd" :disabled="taskParams.viewkey=='作业反馈'||checkTaskAssigned(currentTask)">添加作业</el-button>
-            <el-button type="primary" style="margin-left: auto" @click="submitStudy('submit')"
-                :disabled="taskParams.viewkey=='作业反馈'||checkTaskAssigned(currentTask)">确 定</el-button>
+                :disabled="checkTaskAssigned(currentWorkEdit.currentTask)" @click="handleWorkEdit2ClassWorkQuizAdd">添加作业</el-button>
+            <el-button type="primary" style="margin-left: auto" :disabled="checkTaskAssigned(currentWorkEdit.currentTask)"
+                @click="submitStudy('submit')">确 定</el-button>
           </div>
 
         </div>
@@ -143,10 +143,10 @@
 
       <!-- 作业说明编辑 -->
       <el-dialog v-model="currentWorkEdit.workTitleEdit" title="作业说明编辑" width="70%" append-to-body>
-        <el-input v-model="currentTitle" type="textarea" rows="5" placeholder="请输入作业说明" :disabled="taskParams.viewkey=='作业反馈'||checkTaskAssigned(currentTask)"/>
+        <el-input v-model="currentWorkEdit.currentTitle" type="textarea" rows="5" placeholder="请输入作业说明" :disabled="checkTaskAssigned(currentWorkEdit.currentTask)"/>
         <div slot="footer" class="dialog-footer" style="text-align: right; margin-top: 20px;">
-          <el-button type="primary" @click="submitWorkTitle('submit')"
-              :disabled="taskParams.viewkey=='作业反馈'||checkTaskAssigned(currentTask)">确 定</el-button>
+          <el-button type="primary" :disabled="checkTaskAssigned(currentWorkEdit.currentTask)"
+              @click="submitWorkTitle('submit')">确 定</el-button>
         </div>
       </el-dialog>
     </div>
@@ -154,9 +154,12 @@
 </template>
 
 <script setup>
-import { onMounted, ref, toRaw,watch, reactive } from 'vue'
+import { onMounted, ref, toRaw,watch, reactive, getCurrentInstance } from 'vue'
+import { ElMessage } from 'element-plus'
+
 import ChooseTextbook from '@/components/choose-textbook/index.vue'
-import { homeworklist, listEntpcoursework, listClassworkeval } from '@/api/teaching/classwork'
+import { homeworklist, delClasswork } from '@/api/teaching/classwork'
+import { listEntpcoursework, listClassworkeval,updateClasswork } from '@/api/classTask'
 
 import { useGetHomework } from '@/hooks/useGetHomework'
 import { processList } from '@/hooks/useProcessList'
@@ -164,6 +167,7 @@ import { processList } from '@/hooks/useProcessList'
 import { getCurrentTime } from '@/utils/date'
 import useUserStore from '@/store/modules/user'
 const userStore = useUserStore().user
+const { proxy } = getCurrentInstance()
 
 const props = defineProps({
   initDataProps: {
@@ -232,6 +236,30 @@ const getData = (data) => {
   localStorage.setItem('unitId', JSON.stringify({ levelFirstId, levelSecondId}))
 }
 
+/** 
+ * 删除按钮操作  TODO  待完善
+ * */
+const handleDelete =() => {
+  let rows = proxy.$refs.taskTable.getSelectionRows();
+  if (rows.length > 0) {
+    proxy.$modal.confirm('是否确认选中的学习任务？').then(()=> {
+      let ids = [];
+      for (let i = 0; i < rows.length; i++) {
+        ids.push(rows[i].id);
+      }
+      return delClasswork(ids.join(','));
+    }).then(() => {
+      setTimeout(() => {
+        getTaskList();
+      }, 1500);
+      proxy.$modal.msgSuccess("删除成功");
+    }).catch(() => {})
+  }else{
+    proxy.$modal.alertWarning("请选择删除项")
+  }
+};
+
+
 /**
  * 1.获取作业列表
  */
@@ -422,6 +450,54 @@ const handleWorkEdit = (row, index) =>{
   }
 };
 
+// 作业内容编辑-确认
+const submitWorkTitle = () => {
+  console.log(taskList.value)
+  console.log(currentWorkEdit)
+  // ? taskList是新组合的，有的变成子项了， 根据currentIndex获取不到，下面判断暂弃！
+  // if (taskList.value[currentWorkEdit.currentIndex].title == currentWorkEdit.currentTitle) {
+  //   currentWorkEdit.workTitleEdit = false;
+  //   return;
+  // }
+  taskList.value&&taskList.value.forEach((item)=>{
+    if(item.children.length>0){
+      item.children.map(_item=>{
+        if(_item.title == currentWorkEdit.currentTitle){
+          currentWorkEdit.workTitleEdit = false;
+          return;
+        }
+      })
+    }else{
+      if(item.title == currentWorkEdit.currentTitle){
+        currentWorkEdit.workTitleEdit = false;
+        return;
+      }
+    }
+  })
+  console.log('有更改！')
+  // 有修改时才进行更新
+  taskList.value[currentWorkEdit.currentIndex].title = currentWorkEdit.currentTitle;
+  updateClasswork({id: taskList.value[currentWorkEdit.currentIndex].id, title: currentWorkEdit.currentTitle}).then(response => {
+    ElMessage("修改成功");
+    currentWorkEdit.workTitleEdit = false;
+    //this.getClassWorkAllList();
+  });
+};
+
+// 当前是否为已推送作业
+const checkTaskAssigned = (row) => {
+  console.log(row,'checkTaskAssigned')
+  // 只要有一个taskconfig的id不为0，就是已推送过任务了
+  let bAssigned = false;
+  for (let i=0; i<row.taskconfig.length; i++) {
+    if (row.taskconfig[i].id != 0) {
+      bAssigned = true;
+      return bAssigned;
+    }
+  }
+  return bAssigned;
+};
+
 
 /**
  * 表格子项背景暗调

src/renderer/src/views/desktop/container/work-trend.vue

@@ -34,30 +34,15 @@
 <script setup>
 import { ref, onMounted } from 'vue'
 import useUserStore from '@/store/modules/user'
-import { getSelfReserv } from '@/api/classManage'
 import { homeworklist } from '@/api/teaching/classwork'
 import { getCurrentTime, getTomorrow } from '@/utils/date'
 import ItemDialog from '@/views/classTask/container/item-dialog.vue'
 
-const type = ref(-1)
 const user = useUserStore().user
 const loading = ref(false)
-const classList = ref([])
 const homeworkList = ref([])
 const itemDialogRef = ref(null)
 
-// 获取上课
-const getClass = async () => {
-  loading.value = true
-  try {
-    const res = await getSelfReserv()
-    let list = res.data || []
-    list.sort((a, b) => { if (a.status == '上课中') return -1; else return 0 })
-    classList.value = list.filter(item => item.status !== '已结束')
-  } finally {
-    loading.value = false
-  }
-}
 // 获取作业
 const getHomework = async () => {
   loading.value = true
@@ -99,16 +84,16 @@ const tagType = (time) => {
 
 
 onMounted(() => {
-  // getClass()
   getHomework()
 })
 </script>
 
 <style lang="scss" scoped>
 .desktop-work-item {
-  align-items: center;
+  width: 100%;
   height: 100%;
-
+  display: flex;
+  flex-direction: column;
   .item-title {
     height: 32px;
     text-align: left;
@@ -127,7 +112,7 @@ onMounted(() => {
     border-radius: 5px;
     padding: 10px 15px;
     font-size: 13px;
-    height: calc(100% - 60px);
+    flex: 1;
 
     .class-item {
       justify-content: space-between;

src/renderer/src/views/desktop/index.vue

@@ -1,40 +1,40 @@
 <template>
   <div class="page-desktop">
-    <el-row :gutter="20">
-    <el-col :span="17">
-      <el-row :gutter="20">
-        <el-col :span="item.span" v-for="item in menuList" :key="item.id">
-          <div class="desktop-item">
-            <div class="item-title">{{ item.name }}</div>
-            <div class="item-content">
-              <ul class="flex con-ul">
-                <li v-for="menu in item.list" :key="menu.id" @click="clickMenu(menu)" class="flex item-menu" :class="menu.disabled ? 'menu-disabled' : ''">
-                  <i class="iconfont" :class="menu.icon"></i>
-                  <span>{{ menu.name }}</span>
-                </li>
-              </ul>
+    <el-row :gutter="20" style="height: 100%;">
+    <el-col :span="17" class="desktop-left">
+        <el-row :gutter="20">
+          <el-col :span="item.span" v-for="item in menuList" :key="item.id">
+            <div class="desktop-item">
+              <div class="item-title">{{ item.name }}</div>
+              <div class="item-content">
+                <ul class="flex con-ul">
+                  <li v-for="menu in item.list" :key="menu.id" @click="clickMenu(menu)" class="flex item-menu" :class="menu.disabled ? 'menu-disabled' : ''">
+                    <i class="iconfont" :class="menu.icon"></i>
+                    <span>{{ menu.name }}</span>
+                  </li>
+                </ul>
+              </div>
             </div>
-          </div>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="24">
-          <div class="desktop-item">
-            <div class="item-title flex">
-              <span>教学进度</span>
+          </el-col>
+        </el-row>
+        <el-row style="height: 100%;">
+          <el-col :span="24">
+            <div class="desktop-item-chart">
+              <div class="item-title flex">
+                <span>教学进度</span>
+              </div>
+              <div class="item-content">
+                <div ref="chartDom" class="chart-box"></div>
+              </div>
             </div>
-            <div class="item-content">
-              <div ref="chartDom" class="chart-box"></div>
-            </div>
-          </div>
-        </el-col>
-      </el-row>
-    </el-col>
-    <el-col :span="7">
-      <!--工作动态-->
-      <workTrend/>
-    </el-col>
-  </el-row>
+          </el-col>
+        </el-row>
+      </el-col>
+      <el-col :span="7" style="flex: 1;">
+        <!--工作动态-->
+        <workTrend/>
+      </el-col>
+    </el-row>
   
   </div>
 </template>
@@ -42,11 +42,12 @@
 <script setup>
 import { ref, onMounted, nextTick } from 'vue'
 import { useRouter } from 'vue-router'
+import * as echarts from 'echarts'
 import workTrend from './container/work-trend.vue'
 import outLink from '@/utils/linkConfig'
-import * as echarts from 'echarts'
 import { useGetSubject } from '@/hooks/useGetSubject'
 import { sessionStore } from '@/utils/store'
+import { debounce } from 'lodash'
 
 const router = useRouter()
 const { ipcRenderer } = window.electron || {}
@@ -66,8 +67,7 @@ const menuList = [{
       {
         name: '教材分析',
         icon: 'icon-jiaocaixuanze',
-        isOuter: true,
-        path: '/teaching/chatwithtextbook',
+        path: '/textbookAnalysis',
         id: '1-2'
       },
       {
@@ -106,10 +106,7 @@ const menuList = [{
         icon: 'icon-jiaoxuefansi',
         isOuter: true,
         path: '/teaching/classtaskassign?titleName=作业布置&openDialog=newClassTask',
-        // path: '/newClassTask'
-        //path: '/classTaskAssign'
-        //isOuter: true,
-        //path: '/teaching/classtaskassign?titleName=作业布置&&openDialog=newClassTask'
+        // path: '/newClassTask',
         id: '2-1'
       },
       {
@@ -117,8 +114,8 @@ const menuList = [{
         icon: 'icon-xiezuo1',
         isOuter: true,
         path: '/teaching/classtaskassign?titleName=作业布置',
+        // path: '/classTaskAssign',
         id: '2-2'
-        // path: '/classTaskAssign'
       },
       {
         name: '作业批改',
@@ -195,6 +192,10 @@ const clickMenu = ({isOuter, path, disabled, id}) =>{
   }
 }
 
+ipcRenderer.on('minWinResize', debounce((e, data) =>{
+  chartInstance.resize()
+}, 100))
+
 onMounted(async ()=>{
 
   await useGetSubject()
@@ -254,7 +255,10 @@ onMounted(async ()=>{
 .page-desktop{
   height: 100%;
   padding-top: 20px;
-
+  .desktop-left{
+    display: flex;
+    flex-direction: column;
+  }
   .desktop-item{
     margin-bottom: 20px;
     .item-title{
@@ -302,12 +306,30 @@ onMounted(async ()=>{
           }
         }
       }
-      .chart-box{
-        height: 220px;
-      }
+
+      
     }
   }
   
 }
+.desktop-item-chart{
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  .item-title{
+    height: 32px;
+    font-size: 18px;
+    font-weight: bold;
+    margin-bottom: 10px;
+    align-items: center;
+  }
+  .item-content{
+    background: #fff;
+    flex: 1;
+    .chart-box{
+      height: 100%;
+    }
+  }
+}
   
 </style>

src/renderer/src/views/prepare/container/class-start.vue

@@ -1,14 +1,14 @@
 <template>
-  <el-dialog v-model="visible" width="75%" :close-on-click-modal="false"
+  <el-dialog v-model="visible" width="35%" :close-on-click-modal="false"
     @close="handleClose">
-    <template #header><b>准备开始上课</b></template>
+    <template #header><div style="width: 100%;text-align: left"><b>开始上课（APT）</b></div></template>
     <div class="class-all">
       <el-row>
-        <el-col :span="10">
+<!--        <el-col :span="10">
           <c-form v-bind="classForm">
             <template #item_classid="{prop, form}">
               <el-select v-model="form[prop]" placeholder="请选择班级">
-                <el-option v-for="item in listData.classList" :value="item.id" 
+                <el-option v-for="item in listData.classList" :value="item.id"
                 :label="`${item.caption} (${item.classstudentcount}人)`" />
               </el-select>
             </template>
@@ -20,8 +20,16 @@
               </el-scrollbar>
             </template>
           </c-form>
-        </el-col>
-        <el-col :span="14">
+        </el-col>-->
+        <el-col :span="24">
+          <c-form v-bind="classForm">
+            <template #item_classid="{prop, form}">
+              <el-select v-model="form[prop]" placeholder="请选择班级">
+                <el-option v-for="item in listData.classList" :value="item.id"
+                           :label="`${item.caption} (${item.classstudentcount}人)`" />
+              </el-select>
+            </template>
+          </c-form>
           <c-form v-bind="teacherForm">
             <!-- 上课 -->
             <template #item_classcourseid="{prop,form}">
@@ -44,7 +52,7 @@
               <div :title="value" v-if="!!value">
                 <vue-qr :text="value" :size="200" :margin="10" colorDark="green" colorLight="white" :logoSrc="getStaticUrl('/img/logo.png')" :logoScale="0.2" :dotScale="0.7"></vue-qr>
               </div>
-              <el-button type="warning" :loading="dt.loadingDel" @click="removeClasscourse()">删除记录</el-button>
+<!--              <el-button type="warning" :loading="dt.loadingDel" @click="removeClasscourse()">删除记录</el-button>-->
              </template>
              <!-- 手机登录 -->
              <template #item_mobile>
@@ -90,7 +98,6 @@ const visible = ref(false)      // 是否打开窗口
 const myClassActive = ref({})   // 我的课件：准备上课的APT课件
 const imChatRef = ref(null)     // im-chat ref
 const emit = defineEmits(['close'])
-
 const classForm = reactive({    // 班级(左侧)：表单数据 表单配置
   form: {}, itemOption: [], option: {}
 })
@@ -132,7 +139,7 @@ const open = async (id) => {
     nextTick(async() => {
       chat = await imChatRef.value?.initImChat()
     })
-  } 
+  }
 }
 // 关闭弹窗
 const handleClose = async () => {
@@ -144,15 +151,16 @@ const handleClose = async () => {
 // 初始化-数据
 const initData = () => {
   // 班级-表单配置
-  classForm.option = { labelW: 40 }
+  classForm.option = { labelW: 80 }
   classForm.itemOption = [
     { label: '班级', prop: 'classid' },
-    { label: '学生', prop: 'student' },
+    // { label: '学生', prop: 'student' },
   ]
   // 老师-表单提交
   teacherForm.form = { classcourseid: 0 }
   teacherForm.itemOption = [
-    { label: '上课', prop: 'classcourseid' },
+    // { label: '班级', prop: 'classid' },
+    // { label: '上课', prop: 'classcourseid' },
     { label: '老师扫码', prop: 'qrUrl', show: false },
     { label: '手机登录', prop: 'mobile', show: false },
     { label: '故障备用', prop: 'backup', show: false },
@@ -187,10 +195,10 @@ const getClassList = async () => {
       return o
     });
     // 默认选中第一项
-    if (listData.classList.length > 0) {
+    /*if (listData.classList.length > 0) {
       classForm.form.classid = listData.classList[0].id
-    }
-    
+    }*/
+
   }
 }
 // 获取开课列表 - 历史记录
@@ -217,8 +225,12 @@ const getClasscourseList = async type => {
 }
 // 创建课程
 const createClasscourse = async () => {
-  dt.loading = true
   const { classid } = classForm.form
+  if (!classid) {
+    ElMessage.warning('请选择班级')
+    return
+  }
+  dt.loading = true
   const { entpcourseid, evalid, id, coursetitle } = myClassActive.value // 课件对象
   const curDate = commUtil.getDateNow('yyyy-MM-dd')
   const params = {
@@ -329,4 +341,4 @@ defineExpose({
 .class-all{
   text-align: left;
 }
-</style>
+</style>

src/renderer/src/views/prepare/container/reserv.vue

@@ -2,10 +2,10 @@
   <el-dialog
     v-model="centerDialogVisible"
     class="reserv-dialog"
-    title="上课"
+    title="开始上课（PPT）"
     destroy-on-close
     :before-close="closeDialog"
-    width="600"
+    width="35%"
     style="text-align: left"
   >
     <el-form
@@ -15,7 +15,7 @@
       label-width="auto"
       style="max-width: 600px"
     >
-      <el-form-item label="课程名称" prop="name">
+<!--      <el-form-item label="课程名称" prop="name">
         <el-input v-model="form.name" />
       </el-form-item>
       <el-form-item label="课程类型" prop="type">
@@ -59,17 +59,21 @@
             />
           </el-col>
         </el-form-item>
-      </el-form-item>
-      <el-form-item label="授课对象" prop="resource">
-        <el-checkbox-group v-model="form.resource">
+      </el-form-item>-->
+      <el-form-item label-width="80px" label="班级" prop="resource">
+        <el-select v-model="form.resource" placeholder="请选择班级">
+          <el-option v-for="(item, index) in classList" :value="item.id"
+                     :label="`${item.caption} (${item.classstudentcount}人)`" />
+        </el-select>
+<!--        <el-checkbox-group v-model="form.resource">
           <el-checkbox v-for="(item, index) in classList" :key="index" name="type" :value="item.id"
             >{{ item.caption }}({{ item.classstudentcount }})人
           </el-checkbox>
-        </el-checkbox-group>
+        </el-checkbox-group>-->
       </el-form-item>
-      <el-form-item label="教室" prop="classRoom">
+<!--      <el-form-item label="教室" prop="classRoom">
         <el-input v-model="form.classRoom" />
-      </el-form-item>
+      </el-form-item>-->
     </el-form>
     <template #footer>
       <div class="dialog-footer">
@@ -272,7 +276,7 @@ const updateClassReserv = (formData) => {
   })
 }
 const addClassReserv = (formData) => {
-  let ids = formData.resource.join(',')
+  let ids = formData.resource
   // 判断是否添加教材
   if(!props.bookId){
     ElMessage.warning('请选择教材')
@@ -293,10 +297,10 @@ const addClassReserv = (formData) => {
   addSmartClassReserv(param).then((res) => {
     if (res.msg) {
       closeDialog()
-      ElMessage({
+      /*ElMessage({
         type: 'success',
         message: '预约成功！'
-      })
+      })*/
       emit('addSuccess',res.msg)
     } else {
       ElMessage({

src/renderer/src/views/prepare/index.vue

@@ -313,7 +313,6 @@ export default {
         this.openReserv()
       }
       if(item.fileFlag === 'apt') {
-        //TODO 打开apt - fileId: aptId
         this.$refs.calssRef.open(item.fileId)
       }
       // 当前上课-store
@@ -512,6 +511,7 @@ export default {
             })
             this.currentFileList.splice(index, 1)
           })
+          ElMessage.success('操作成功')
         }
       })
     },

src/renderer/src/views/teach/standardAnalysis/index.vue

@@ -70,7 +70,10 @@
     </div>
     <el-dialog v-model="dialogVisible" title="切换教材" append-to-body  width="550">
       <div class="booklist">
-        <div :class="{'item': true,'active': booksel === idx}" v-for="item,idx in bookList" :key="idx" @click="bookChange(item)">{{item.edustage + item.edusubject}}</div>
+        <div :class="{'item': true,'active': booksel === idx}" v-for="item,idx in bookList" :key="idx" @click="bookChange(item,idx)">
+          <el-image class="bookimg" :src="item.avartar" />
+          <div class="bookname">{{item.fileurl.replace('.txt', '')}}</div>
+        </div>
       </div>
     </el-dialog>
   </div>
@@ -237,8 +240,6 @@ const getData = (data) => {
   }
   sourceStore.handleQuery()
   getlistEvaluationclue(levelFirstId, levelSecondId)
-  // 头部 教材分析打开外部链接需要当前章节ID
-  localStorage.setItem('unitId', JSON.stringify({ levelFirstId, levelSecondId}))
 }
 // 获取学科
 const getAllSubject = async () => {
@@ -252,12 +253,16 @@ const getAllSubject = async () => {
       bookList.value.push({...item,avartar: import.meta.env.VITE_APP_BUILD_BASE_PATH + item.avartar})
     }
   })
-  booksel.value = bookList.value.findIndex(item => item.edustage === edustage && item.edusubject === edusubject)
+  const textselidx = bookList.value.findIndex(item => item.edustage === edustage && item.edusubject === edusubject)
+  booksel.value = textselidx
+  booktitle.value = bookList.value[textselidx].fileurl.replace('.txt','')
+  const filePath = import.meta.env.VITE_APP_RES_FILE_PATH + bookList.value[textselidx].fileurl.replace('.txt','.pdf')
+  await loadPdfAnimation(filePath)
 }
 const bookChange = async (item, idx) => {
   booksel.value = idx
   bookInfo.value = {...item}
-  booktitle.value = `${item.edustage + item.edusubject}课程标准`
+  booktitle.value = item.fileurl.replace('.txt','')
   pdfUrl.value = '';
   const filepath = import.meta.env.VITE_APP_RES_FILE_PATH + item.fileurl.replace('.txt','.pdf')
   await loadPdfAnimation(filepath)
@@ -271,10 +276,6 @@ const loadPdfAnimation = (path) => {
 }
 onMounted(async () => {
   await getAllSubject();
-  const { edustage, edusubject } = userStore.user;
-  booktitle.value = `${edustage + edusubject}课程标准`
-  const filePath = `${import.meta.env.VITE_APP_RES_FILE_PATH}${edustage}-${edusubject}-课标.pdf`
-  await loadPdfAnimation(filePath)  
   if(cardref.value && headref.value){
     const cardH = cardref.value.offsetHeight;
     const headh = headref.value.offsetHeight;
@@ -529,13 +530,22 @@ onMounted(async () => {
   padding-top: 1px;
   overflow: auto;
   .item{
-    width: 100%;
+    width: 162px;
     height: auto;
     padding: 8px 16px;
     background-color: #ffffff;
-    border-top: 1px solid #f1f1f1;
-    font-size: 14px;
-    color: #3b3b3b;
+    float: left;
+    .bookimg{
+      width: 130px;
+      height: 180px;
+    }
+    .name{
+      font-size: 14px;
+      color: #3b3b3b;
+    }
+  }
+  .item:hover{
+    cursor: pointer;
   }
   .active{
     background-color: #409eff;

src/renderer/src/views/textbookAnalysis/index.vue

@@ -0,0 +1,555 @@
+<template>
+  <div class="page-con flex" ref="cardref">
+    <!-- <el-button @click="saveJSON">测试保存</el-button> -->
+    <div class="page-con-left">
+      <div class="stand-head" ref="headref">
+        <div class="stand-head-left">
+          <el-image class="imges" :src="bookInfo ? bookInfo.avartar : ''" />
+        </div>
+        <div class="stand-head-right">
+          <div class="stand-head-right-tit">{{booktitle}}</div>
+          <i class="iconfont icon-yidongdaozu stand-head-right-icon" @click="dialogVisible = true"></i>
+          <div class="stand-head-right-row">
+            <div class="stand-head-right-row-time">更新2024.9.10</div>
+            <!-- <el-switch class="stand-head-right-row-switch" v-model="isOpenClass" inline-prompt active-text="公开" inactive-text="非公" /> -->
+          </div>
+        </div>
+      </div>
+      <div class="stand-down">
+        <div class="stand-down-search" ref="searchref">
+          <el-input
+            v-model="searchInp"
+            placeholder="搜索课标、学校和老师"
+            clearable
+            @input="searchHandel"
+          />
+          <el-select v-model="searchSel" placeholder="请选择" style="width: 140px;padding-left:6px" @change="selectHandel">
+            <el-option
+              v-for="item in searchOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </div>
+        <div class="stand-down-con" :style="{overflow: 'auto',height: listHeight + 'px'}">
+          <div class="stand-down-con-list" v-for="item,idx in showData" :key="idx">
+            <div class="stand-down-con-list-icon">
+              <el-image class="imges" :src="item.userheadimgurl" />
+            </div>
+            <div class="stand-down-con-list-txt">
+              <div class="stand-down-con-list-txt-top">
+                <div class="stand-down-con-list-txt-top-name">{{item.username}}</div>
+                <div class="stand-down-con-list-txt-top-tip">{{item.childcount}}条</div>
+              </div>
+              <div class="stand-down-con-list-txt-down">
+                <div class="stand-down-con-list-txt-down-tip">{{ item.userentpname }}</div>
+                <div class="stand-down-con-list-txt-down-tip">{{ item.timeStr }}</div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <p v-if="loading">加载中...</p>
+        <p v-if="noMore">~没有更多了~</p>
+      </div>
+    </div>
+    <div  class="page-con-right">
+      <PDF :url="pdfUrl" v-if="pdfUrl" />
+      <div class="loading" v-else>
+        <div class="setup">
+          <span style="--i:1">文</span>
+          <span style="--i:2">档</span>
+          <span style="--i:3">加</span>
+          <span style="--i:4">载</span>
+          <span style="--i:5">中</span>
+          <span style="--i:6">.</span>
+          <span style="--i:7">.</span>
+          <span style="--i:8">.</span>
+        </div>
+      </div>
+    </div>
+    <el-dialog v-model="dialogVisible" title="切换教材" append-to-body  width="550">
+      <div class="booklist">
+        <div :class="{'item': true,'active': booksel === idx}" v-for="item,idx in bookList" :key="idx" @click="bookChange(item,idx)">
+          <el-image class="bookimg" :src="item.avartar" />
+          <div class="bookname">{{item.fileurl.replace('.txt', '')}}</div>
+        </div>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script setup>
+import { onMounted, ref } from 'vue'
+import PDF from '@/components/PdfJs/index.vue'
+import { useRoute } from 'vue-router';
+import useResoureStore from '../resource/store'
+import { listEvaluationclue } from '@/api/teaching/classwork'
+import { uploadServer, getJSONFile } from '@/utils/common'
+import { ElNotification } from 'element-plus'
+import ChooseTextbook from "@/components/choose-textbook/index.vue";
+import { listEvaluation } from '@/api/classManage/index'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
+const sourceStore = useResoureStore()
+// import { getStaticUrl } from '@/utils/tool'
+
+const route = useRoute();
+const pdfUrl = ref('');
+const isOpenClass = ref(true);
+const searchInp = ref('');
+const searchSel = ref('0');
+const loading = ref(false);
+const noMore = ref(false);
+const cardref = ref(null);
+const headref = ref(null);
+const searchref = ref(null);
+const listHeight = ref(0);
+const dialogVisible = ref(false);
+const booktitle = ref('');
+const bookInfo = ref(null);
+const booksel = ref(0);
+const bookList = ref([])
+
+
+const searchOptions = [{
+    value: '0',
+    label: '按时间',
+  },{
+    value: '1',
+    label: '按内容量',
+  }];
+const standList = ref([]);
+const showData = ref([]);
+
+//查询课标分析列表
+const getlistEvaluationclue = (firstid, levelid) => {
+  const newid = firstid ? firstid : levelid;
+  listEvaluationclue({evalid: newid, parentid: 0, cluegroup: 'teachresource', orderby: "timestamp desc", pageSize: 100}).then((res) => {
+    if(res.code === 200){
+      const newData = formaterTime(res.rows)
+      standList.value = newData
+      showData.value = filterList(newData)
+    }
+  })
+}
+const formaterTime = (data) => {
+  return data.map(item => {
+    return {
+      ...item,
+      timeStr: item.timestamp.split(' ')[0].replace('-', '.').replace('-', '.')
+    }
+  })
+}
+//筛选分析列表
+const filterList = (data) => {
+  let standData = JSON.parse(JSON.stringify(data));
+    let arr = [];
+    if (searchSel.value === '0') {
+      arr = standData.sort((a, b)=>{
+        return new Date(b.timestamp) - new Date(a.timestamp);
+      })
+    }
+    else {
+      arr = standData.sort((a, b)=>{
+        return b.childcount - a.childcount;
+      })
+    }
+    return arr;
+}
+//文本框文字搜索
+const searchHandel = (value) => {
+  const newData = [];
+  standList.value.map(item => {
+    const str = JSON.stringify(item)
+    if(str.indexOf(value) !== -1){
+      newData.push(item);
+    }
+  })
+  showData.value = newData
+}
+//下拉框条件筛选
+const selectHandel = (value) => {
+  const filterData = searchInp.value !== '' ? showData.value : standList.value
+  showData.value = filterList(filterData);
+}
+//保存json文件
+const saveJSON = (data) => {
+  
+  let filename = ''
+  // const data = {
+  //   name: 'txt',
+  //   class: '五年级2班',
+  //   school: '重庆市酉阳二中',
+  //   time: '2024-08-09'
+  // }
+  // saveJSON(jsonStr);
+  if (!data) {
+    console.log('传入的data数据为null');
+    return;
+  }
+  if (!filename) {
+    filename = `json${Date.now()}.json`
+    console.log('未传入文件名,采用默认文件名' + filename);
+  }
+  let newdata = null;
+  if (typeof data === 'object') {
+    newdata = JSON.stringify(data, undefined, 4)
+  }
+  // 创建json文件blob流
+  const blob = new Blob([newdata], { type: 'text/json' });
+  // 创建file文件
+  // const file = new File([blob],filename, {type: blob.type})
+  // 创建上传文件流
+  // const formdata = new FormData();
+  // formdata.append('file', file);
+  //其他参数待添加
+
+  //上传
+  // uploadServer(formdata).then(res => {
+  //   console.log('+++++++++++++');
+  //   console.log(res.data);
+  // })
+
+  let e = document.createEvent('MouseEvents');
+  let a = document.createElement('a');
+  a.download = filename;
+  a.href = window.URL.createObjectURL(blob);
+  a.dataset.downloadurl = ['text/json', a.download, a.href].join(':');
+  e.initMouseEvent('click', true, false, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
+  a.dispatchEvent(e);
+}
+// 查询
+const getData = (data) => {
+  const { textBook, node } = data
+  let textbookId = textBook.curBookId
+  let levelSecondId = node.id
+  let levelFirstId
+  if (node.parentNode) {
+    levelFirstId = node.parentNode.id
+  } else {
+    levelFirstId = node.id
+    levelSecondId = ''
+  }
+  sourceStore.query.levelFirstId = levelFirstId
+  sourceStore.query.levelSecondId = levelSecondId
+  sourceStore.query.textbookId = textbookId
+  sourceStore.nodeData = {
+    textbookId, //版本
+    levelFirstId, //单元
+    levelSecondId //单元课程
+  }
+  sourceStore.handleQuery()
+  getlistEvaluationclue(levelFirstId, levelSecondId)
+}
+// 获取学科
+const getAllSubject = async () => {
+  const { edustage, edusubject } = userStore.user;
+  const { rows } = await listEvaluation({ itemkey: "version", edustage, edusubject, pageSize: 500 })
+  rows && rows.map(item => {
+    if(item.edustage === edustage && item.edusubject === edusubject){
+      bookInfo.value = {...item,avartar: import.meta.env.VITE_APP_BUILD_BASE_PATH + item.avartar}
+    }
+    if(item.fileurl !== ''){
+      bookList.value.push({...item,avartar: import.meta.env.VITE_APP_BUILD_BASE_PATH + item.avartar})
+    }
+  })
+  const textselidx = bookList.value.findIndex(item => item.edustage === edustage && item.edusubject === edusubject)
+  booksel.value = textselidx
+  booktitle.value = bookList.value[textselidx].fileurl.replace('.txt','')
+  const filePath = import.meta.env.VITE_APP_RES_FILE_PATH + bookList.value[textselidx].fileurl.replace('.txt','.pdf')
+  await loadPdfAnimation(filePath)  
+}
+const bookChange = async (item, idx) => {
+  booksel.value = idx
+  bookInfo.value = {...item}
+  booktitle.value = item.fileurl.replace('.txt','')
+  pdfUrl.value = '';
+  const filepath = import.meta.env.VITE_APP_RES_FILE_PATH + item.fileurl.replace('.txt','.pdf')
+  await loadPdfAnimation(filepath)
+  dialogVisible.value = false
+}
+const loadPdfAnimation = (path) => {
+  const timer = setTimeout(() => {
+    pdfUrl.value = path
+    clearTimeout(timer);
+  },2000)
+}
+onMounted(async () => {
+  await getAllSubject();
+  if(cardref.value && headref.value){
+    const cardH = cardref.value.offsetHeight;
+    const headh = headref.value.offsetHeight;
+    const searchh = searchref.value.offsetHeight;
+    listHeight.value = Math.floor(cardH) - Math.floor(headh) - Math.floor(searchh) - 60;
+  }
+  
+  window.addEventListener('resize', () => {
+    if(cardref.value && headref.value){
+      const cardH = cardref.value.offsetHeight;
+      const headh = headref.value.offsetHeight;
+      const searchh = searchref.value.offsetHeight;
+      listHeight.value = Math.floor(cardH) - Math.floor(headh) - Math.floor(searchh) - 60;
+    }
+  })
+  window.addEventListener('message',(event) => {
+    // console.log('------------');
+    const iframeMes = event.data;
+    if(iframeMes.storageInfo){
+      // saveJSON(iframeMes.storageInfo);
+      // console.log(JSON.stringify(iframeMes.storageInfo));
+    }
+    if(iframeMes.quoteInfo){
+      console.log(iframeMes.quoteInfo);
+      const { textStr, StartStr, EndStr } = iframeMes.quoteInfo;
+      if(textStr === StartStr || textStr === EndStr){
+        ElNotification({
+          title: '引用内容',
+          message: textStr,
+          duration: 0,
+          type: 'info',
+          offset: 120
+        })
+        //如果开头和结尾的文字跟内容相同，那么它要么是开头，要么是整段，不需要替换操作
+        console.log('无需替换------',textStr);
+        return
+      }
+      let midStr = ''
+      if(StartStr === '' && EndStr === '' && textStr === '') return
+      if(StartStr === '' && EndStr !== '') {
+        midStr = textStr.replace(EndStr,'eeeeee').split('eeeeee')[0]
+      }else if(StartStr !== '' && EndStr === ''){
+        midStr = textStr.replace(StartStr,'ssssss').split('ssssss')[1]
+      }else{
+        midStr = textStr.replace(StartStr, 'ssssss').replace(EndStr,'eeeeee').split('ssssss')[1].split('eeeeee')[0];
+      }
+      ElNotification({
+          title: '引用内容',
+          message: StartStr + midStr + EndStr,
+          duration: 0,
+          type: 'info',
+          offset: 120
+        })
+      console.log('中间文字------',midStr);
+      console.log('转换后整体文字------',StartStr + midStr + EndStr);
+    }
+  })
+  
+  // const isDev = process.env.NODE_ENV == 'development'
+  // if (isDev) 
+  //   pdfUrl.value = '/'+getStaticUrl('aaa.pdf', 'user', 'selfFile', true)
+  // else
+  //   pdfUrl.value = getStaticUrl(route.query.path, 'user', 'selfFile', true)
+
+  // console.log('页面',pdfUrl.value);
+})
+</script>
+<style scoped lang="scss">
+.page-con {
+  padding-top: 20px;
+  height: 100%;
+  &-left{
+    width: 300px;
+    height: auto;
+    background: #ffffff;
+    border-radius: 10px;
+  }
+  &-right{
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    margin-left: 20px;
+    height: 100%;
+    background: #ffffff;
+    overflow: hidden;
+    border-radius: 10px;
+    box-shadow: 0px 0px 20px 0px rgba(99, 99, 99, 0.06);
+  }
+  .loading {
+    display: flex;
+    align-items: center;
+    justify-content:center;
+    min-height: 100vh;
+    .setup {
+      position: relative;
+      -webkit-box-reflect: below -12px linear-gradient(transparent, rgba(0, 0, 0, 0.2))
+    }
+
+    .setup span {
+      position: relative;
+      display: inline-block;
+      color: #409eff;
+      font-size: 26px;
+      animation: animate 1s ease-in-out infinite;
+      animation-delay: calc(.1s*var(--i))
+    }
+  }
+
+  @keyframes animate {
+    0% {
+      transform: translateY(0px)
+    }
+
+    20% {
+      transform: translateY(-24px)
+    }
+
+    40%,
+    100% {
+      transform: translateY(0px)
+    }
+  }
+}
+.stand-head{
+  width: 100%;
+  padding: 6px;
+  border-radius: 6px;
+  position: relative;
+  &-left{
+    width: 48px;
+    height: 66px;
+    border-radius: 2px;
+    overflow: hidden;
+    .imges{
+      width: 48px;
+      height: 66px;
+    }
+  }
+  &-right{
+    position: absolute;
+    width: 100%;
+    height: auto;
+    padding-left: 60px;
+    padding-right: 6px;
+    left: 0;
+    top: 6px;
+    z-index: 2;
+    &-tit{
+      width: 100%;
+      font-size: 15px;
+      font-weight: 600;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      color: #3b3b3b;
+      text-align: left;
+    }
+    &-icon{
+      position: absolute;
+      right: 12px;
+      top: 0px;
+      z-index: 3;
+      color: var(--el-color-primary);
+    }
+    &-row{
+      width: 100%;
+      height: 32px;
+      display: flex;
+      justify-content: space-between;
+      margin-top: 12px;
+      &-time{
+        font-size: var(--el-font-size-extra-small);
+        color: var(--el-color-info-rgb);
+        line-height: 32px;
+      }
+      &-switch{
+        height: 32px;
+      }
+    }
+  }
+}
+.stand-down{
+  width: 100%;
+  height: auto;
+  padding-top: 20px;
+  padding-right: 6px;
+  &-search{
+    width: 100%;
+    height: 32px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+  }
+  &-con{
+    width: 100%;
+    &-list{
+      width: 100%;
+      height: auto;
+      position: relative;
+      padding: 8px 0;
+      border-top: 1px dashed #e1e1e1;
+      &-icon{
+        width: 48px;
+        height: 48px;
+        border-radius: 50%;
+        position: absolute;
+        left: 0;
+        top: 8px;
+        z-index: 2;
+        overflow: hidden;
+        .imges{
+          width: 48px;
+          height: 48px;
+        }
+      }
+      &-txt{
+        width: 100%;
+        min-height: 48px;
+        padding-left: 56px;
+        padding-right: 12px;
+        &-top,&-down{
+          width: 100%;
+          min-height: 24px;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          &-name{
+            font-size: 14px;
+            color: #3b3b3b;
+            font-weight: 600;
+          }
+          &-tip{
+            font-size: 12px;
+            color: #787878;
+            text-align: left;
+          }
+        }
+        &-down{
+          margin-top: 4px;
+        }
+      }
+    }
+    &-list:first-of-type{
+      border: 0;
+    }
+  }
+}
+.booklist{
+  width: 100%;
+  height: 500px;
+  padding-top: 1px;
+  overflow: auto;
+  .item{
+    width: 162px;
+    height: auto;
+    padding: 8px 16px;
+    background-color: #ffffff;
+    float: left;
+    .bookimg{
+      width: 130px;
+      height: 180px;
+    }
+    .name{
+      font-size: 14px;
+      color: #3b3b3b;
+    }
+  }
+  .item:hover{
+    cursor: pointer;
+  }
+  .active{
+    background-color: #409eff;
+    color: #ffffff;
+  }
+}
+</style>