.env.development

@@ -15,5 +15,3 @@ VITE_APP_UPLOAD_API = 'https://file.ysaix.com:7868/prod-api'
 VITE_APP_RES_FILE_PATH = 'https://file.ysaix.com:7868/src/assets/textbook/booktxt/'
 
 VITE_APP_BUILD_BASE_PATH = 'https://file.ysaix.com:7868/'
-
-VITE_SHOW_DEV_TOOLS = 'true'

.env.old

@@ -1,5 +1,5 @@
 # 页面标题
-VITE_APP_TITLE = 文枢课堂
+VITE_APP_TITLE = AIX智慧课堂
 
 # 生产环境配置
 VITE_APP_ENV = 'production'
@@ -17,5 +17,3 @@ VITE_BUILD_COMPRESS = gzip
 VITE_APP_RES_FILE_PATH = 'https://prev.ysaix.com:7868/src/assets/textbook/booktxt/'
 
 VITE_APP_BUILD_BASE_PATH = 'https://prev.ysaix.com:7868/'
-
-VITE_SHOW_DEV_TOOLS = 'false'

.env.production

@@ -17,5 +17,3 @@ VITE_BUILD_COMPRESS = gzip
 VITE_APP_RES_FILE_PATH = 'https://prev.ysaix.com:7868/src/assets/textbook/booktxt/'
 
 VITE_APP_BUILD_BASE_PATH = 'https://prev.ysaix.com:7868/'
-
-VITE_SHOW_DEV_TOOLS = 'true'

.env.test

@@ -17,5 +17,3 @@ VITE_BUILD_COMPRESS = gzip
 VITE_APP_RES_FILE_PATH = 'https://file.ysaix.com:7868/src/assets/textbook/booktxt/'
 
 VITE_APP_BUILD_BASE_PATH = 'https://file.ysaix.com:7868/'
-
-VITE_SHOW_DEV_TOOLS = 'true'

.env.yc2

@@ -1,21 +0,0 @@
-# 页面标题
-VITE_APP_TITLE = 实训教学
-
-# 生产环境配置
-VITE_APP_ENV = 'production'
-
-# AIx融合数字管理系统/生产环境
-VITE_APP_BASE_API = 'https://prev.ysaix.com:7868/prod-api'
-
-VITE_APP_DOMAIN = 'prev.ysaix.com'
-
-VITE_APP_UPLOAD_API = 'https://prev.ysaix.com:7868/prod-api'
-
-# 是否在打包时开启压缩，支持 gzip 和 brotli
-VITE_BUILD_COMPRESS = gzip
-
-VITE_APP_RES_FILE_PATH = 'https://prev.ysaix.com:7868/src/assets/textbook/booktxt/'
-
-VITE_APP_BUILD_BASE_PATH = 'https://prev.ysaix.com:7868/'
-
-VITE_SHOW_DEV_TOOLS = 'false'

electron-builder-old.yml

@@ -1,10 +1,10 @@
 appId: com.electron.app
-productName: 文枢课堂
+productName: AIx
 directories:
   output: dist
   buildResources: build
 win:
-  executableName: 文枢课堂
+  executableName: AIx
   icon: resources/logo2.ico
 files:
   - '!**/.vscode/*'
@@ -17,7 +17,7 @@ asarUnpack:
 nsis:
   oneClick: false
   allowToChangeInstallationDirectory: true
-  artifactName: ${name}-yc-${version}-setup.${ext}
+  artifactName: ${name}-${version}-setup.${ext}
   shortcutName: ${productName}
   uninstallDisplayName: ${productName}
   createDesktopShortcut: always
@@ -30,7 +30,7 @@ mac:
     - NSDownloadsFolderUsageDescription: Application requests access to the user's Downloads folder.
   notarize: false
 dmg:
-  artifactName: ${name}-yc-${version}.${ext}
+  artifactName: ${name}-${version}.${ext}
 linux:
   target:
     - AppImage
@@ -39,11 +39,11 @@ linux:
   maintainer: electronjs.org
   category: Utility
 appImage:
-  artifactName: ${name}-yc-${version}.${ext}
+  artifactName: ${name}-${version}.${ext}
 npmRebuild: false
 publish:
   provider: generic
-  url: https://prev.ysaix.com:7868/src/assets/smarttalkyc/
+  url: https://prev.ysaix.com:7868/src/assets/smarttalk/
 electronDownload:
   mirror: https://npmmirror.com/mirrors/electron/
 # 额外依赖打包到输出目录

electron-builder-yc2.yml

@@ -1,54 +0,0 @@
-appId: com.electron.app.yc2
-productName: 实训教学
-directories:
-  output: dist
-  buildResources: build
-win:
-  executableName: 实训教学
-  icon: resources/logo2.ico
-files:
-  - '!**/.vscode/*'
-  - '!src/*'
-  - '!electron.vite.config.{js,ts,mjs,cjs}'
-  - '!{.eslintignore,.eslintrc.cjs,.prettierignore,.prettierrc.yaml,dev-app-update.yml,CHANGELOG.md,README.md}'
-  - '!{.env,.env.*,.npmrc,pnpm-lock.yaml}'
-asarUnpack:
-  - resources/**
-nsis:
-  oneClick: false
-  allowToChangeInstallationDirectory: true
-  artifactName: ${name}-yc-${version}-setup.${ext}
-  shortcutName: ${productName}
-  uninstallDisplayName: ${productName}
-  createDesktopShortcut: always
-mac:
-  entitlementsInherit: build/entitlements.mac.plist
-  extendInfo:
-    - NSCameraUsageDescription: Application requests access to the device's camera.
-    - NSMicrophoneUsageDescription: Application requests access to the device's microphone.
-    - NSDocumentsFolderUsageDescription: Application requests access to the user's Documents folder.
-    - NSDownloadsFolderUsageDescription: Application requests access to the user's Downloads folder.
-  notarize: false
-dmg:
-  artifactName: ${name}-yc-${version}.${ext}
-linux:
-  target:
-    - AppImage
-    - snap
-    - deb
-  maintainer: electronjs.org
-  category: Utility
-appImage:
-  artifactName: ${name}-yc-${version}.${ext}
-npmRebuild: false
-publish:
-  provider: generic
-  url: https://prev.ysaix.com:7868/src/assets/smarttalkyc/
-electronDownload:
-  mirror: https://npmmirror.com/mirrors/electron/
-# 额外依赖打包到输出目录
-extraFiles:
-  - from: ./node_modules/im_electron_sdk/lib/
-    to: ./resources
-    filter:
-      - '**/*'

package.json

@@ -1,9 +1,9 @@
 {
   "name": "aix-win",
-  "version": "2.1.37",
+  "version": "2.1.12",
   "description": "",
   "main": "./out/main/index.js",
-  "author": "上海交大重庆人工智能研究院",
+  "author": "example.com",
   "homepage": "https://electron-vite.org",
   "scripts": {
     "format": "prettier --write .",
@@ -16,12 +16,16 @@
     "build:dev": "npm run build && electron-builder --win --config ./electron-builder-test.yml",
     "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:yc": "electron-vite build --mode yc && electron-builder --win --config ./electron-builder-yc.yml",
+    "build:lt": "electron-vite build --mode lt && electron-builder --win --config ./electron-builder-lt.yml",
-    "build:yc2": "electron-vite build --mode yc2 && electron-builder --win --config ./electron-builder-yc2.yml",
     "build:mac": "electron-vite build --mode production && electron-builder --mac --config ./electron-builder-prod.yml",
     "build:linux": "npm run build && electron-builder --linux"
   },
   "dependencies": {
+    "@electron-toolkit/preload": "^3.0.1",
+    "@electron-toolkit/utils": "^3.0.0",
+    "@electron/remote": "^2.1.2",
+    "@element-plus/icons-vue": "^2.3.1",
+    "@vitejs/plugin-vue-jsx": "^4.0.0",
     "@antv/x6": "^2.18.1",
     "@antv/x6-plugin-clipboard": "^2.1.6",
     "@antv/x6-plugin-dnd": "^2.1.1",
@@ -30,11 +34,6 @@
     "@antv/x6-plugin-selection": "^2.2.2",
     "@antv/x6-plugin-snapline": "^2.1.7",
     "@antv/x6-plugin-transform": "^2.1.8",
-    "@electron-toolkit/preload": "^3.0.1",
-    "@electron-toolkit/utils": "^3.0.0",
-    "@electron/remote": "^2.1.2",
-    "@element-plus/icons-vue": "^2.3.1",
-    "@vitejs/plugin-vue-jsx": "^4.0.0",
     "@vue-office/docx": "^1.6.2",
     "@vue-office/excel": "^1.7.11",
     "@vue-office/pdf": "^2.0.2",
@@ -54,21 +53,20 @@
     "js-cookie": "^3.0.5",
     "jsencrypt": "^3.3.2",
     "jsondiffpatch": "0.6.0",
-    "less": "^4.2.0",
-    "less-loader": "^7.3.0",
     "lodash": "^4.17.21",
     "node-addon-api": "^8.1.0",
     "pdfjs-dist": "4.4.168",
     "pinia": "^2.1.7",
     "pinia-plugin-persistedstate": "^3.2.1",
-    "qs": "^6.13.1",
     "spark-md5": "^3.0.2",
     "vite-plugin-electron": "^0.28.8",
     "vue-qr": "^4.0.9",
     "vue-router": "^4.4.0",
-    "whiteboard_lyc": "^0.1.3",
     "xgplayer": "^3.0.19",
-    "xlsx": "^0.18.5"
+    "xlsx": "^0.18.5",
+    "less": "^4.2.0",
+    "less-loader": "^7.3.0",
+    "whiteboard_lyc": "^0.1.3"
   },
   "devDependencies": {
     "@electron-toolkit/eslint-config": "^1.0.2",

src/main/file.js

@@ -284,10 +284,9 @@ export default async function ({ app, shell, BrowserWindow, ipcMain }) {
   function downloadFiles(url,fileName) {
     console.log(url,fileName)
     return new Promise((resolve, reject)=>{
-      const browserWindow = BrowserWindow.getAllWindows()
+      const browserWindow = BrowserWindow.getFocusedWindow()
-      console.log(browserWindow)
       const id = manager.download({
-        window: browserWindow[0],
+        window: browserWindow,
         url: url,
         saveAsFilename: fileName,
         directory: appTempFilePath,

src/main/index.js

@@ -46,7 +46,7 @@ if(!gotTheLock){
 function createLoginWindow() {
   if (loginWindow) return
   loginWindow = new BrowserWindow({
-    width: import.meta.env.MODE==='yc'||import.meta.env.MODE==='yc2'?1160:888,
+    width: 888,
     height: 520,
     show: false,
     frame: false,
@@ -73,7 +73,8 @@ function createLoginWindow() {
     loginWindow.loadFile(join(__dirname, '../renderer/index.html'), { hash: 'login' })
     updateInit(loginWindow)
   }
-  if (import.meta.env.VITE_SHOW_DEV_TOOLS === 'true') loginWindow.webContents.openDevTools()
+
+  loginWindow.webContents.openDevTools()
   loginWindow.once('ready-to-show', () => {
     loginWindow.show()
   })
@@ -127,7 +128,7 @@ function createMainWindow() {
     shell.openExternal(details.url)
     return { action: 'deny' }
   })
-  if (import.meta.env.VITE_SHOW_DEV_TOOLS === 'true') mainWindow.webContents.openDevTools()
+  mainWindow.webContents.openDevTools()
 
   if (is.dev && process.env['ELECTRON_RENDERER_URL']) {
     mainWindow.loadURL(process.env['ELECTRON_RENDERER_URL'])
@@ -137,7 +138,6 @@ function createMainWindow() {
 
   // mainWindow.setAlwaysOnTop(true, "screen-saver") // 将窗口设置为顶层窗口
   // mainWindow.setVisibleOnAllWorkspaces(true) // 如果窗口在所有工作区都可见
-  mainWindow.maximize();
   // 第三步： 开启remote服务
   remote.enable(mainWindow.webContents)
 }
@@ -175,7 +175,6 @@ async function createLinkWin(data) {
     data.fullPath += '?urlSource=smarttalk&t' + Date.now()
   }
   linkWin[data.key].loadURL(data.fullPath)
-  if (import.meta.env.VITE_SHOW_DEV_TOOLS === 'true') linkWin[data.key].webContents.openDevTools()
 
   linkWin[data.key].once('ready-to-show', () => {
     linkWin[data.key].show()
@@ -272,13 +271,12 @@ app.on('window-all-closed', () => {
 function handleAll() {
   const chatInstance = chat.initialize() // im-chat 实例
   // 新窗口创建-监听
-  ipcMain.handle('new-window', (e, data) => {
+  ipcMain.on('new-window', (e, data) => {
     const { id, type } = data
     const win = BrowserWindow.fromId(id)
     win.type = type // 绑定独立标识
     remote.enable(win.webContents)        // 开启远程服务
     chatInstance.enable(win.webContents)  // 开启im-chat
-    console.log(`主进程 [${type}]: 窗口注册-远程代理-完毕(${Date.now()})`)
   })
   // 用于监听-状态管理变化-同步所有窗口
   ipcMain.handle('pinia-state-change', (e, storeName, jsonStr) => {

src/main/store.js

@@ -23,9 +23,7 @@ const defaultData = {
       curNode: null, // 当前选中的节点
       defaultExpandedKeys: [], //展开的节点
       subjectTree: [] // "树结构" 章节
-    },
+    }
-    env: {},      // 不走同步 Pinia - 变量
-    curr: {}      // 不走同步 Pinia - 当前信息
   },
   local: { // 本地(永久localStorage)
   },

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

@@ -13097,16 +13097,15 @@ const PDFViewerApplication = {
       }
       if (isValidSpreadMode(spread)) {
         //默认双页
-        this.pdfViewer.spreadMode = spread;
+        // this.pdfViewer.spreadMode = spread;
-        //默认双页
+        this.pdfViewer.spreadMode = 1;
-        // this.pdfViewer.spreadMode = 1;
       }
     };
     this.isInitialViewSet = true;
     this.pdfSidebar?.setInitialView(sidebarView);
     //默认双页
-    setViewerModes(scrollMode, spreadMode);
+    // setViewerModes(scrollMode, spreadMode);
-    // setViewerModes(scrollMode, 1);
+    setViewerModes(scrollMode, 1);
     if (this.initialBookmark) {
       setRotation(this.initialRotation);
       delete this.initialRotation;

src/renderer/src/api/classTask/index.js

@@ -71,16 +71,6 @@ export function updateClassworkeval(data) {
   })
 }
 
-
-// 修改classworkeval
-export function updateClassworkevalList(data) {
-  return request({
-    url: '/education/classworkeval/updateList',
-    method: 'put',
-    data: data
-  })
-}
-
 // 修改classworkdata
 export function updateClassworkdata(data) {
   return request({
@@ -89,13 +79,6 @@ export function updateClassworkdata(data) {
     data: data
   })
 }
-export function updateClassWorkDataAutoFinish(data) {
-  return request({
-    url: '/education/classworkdata/updAutoFinish',
-    method: 'put',
-    data: data
-  })
-}
 
 // 修改classwork
 export function updateClasswork(data) {

src/renderer/src/api/file/index.js

@@ -24,13 +24,6 @@ export const getPrepareById = (id) => {
   })
 }
 
-export const addFileToKj = (id) => {
-  return request({
-    url: '/smarttalk/file/addFileToKj/' + id,
-    method: 'get'
-  })
-}
-
 export function deleteSmarttalk(id) {
   return request({
     url: '/smarttalk/file/' + id,
@@ -60,14 +53,3 @@ export const moveSmarttalk = (params) => {
     params
   })
 }
-
-export const addFileToPrepareThird = (data) => {
-  return request({
-    url: '/smarttalk/file/addFileToPrepareThird',
-    method: 'post',
-    headers: {
-      'Content-Type': 'multipart/form-data'
-    },
-    data
-  })
-}

src/renderer/src/api/pdf/index.js

@@ -1,27 +0,0 @@
-import request from '@/utils/request'
-
-// 查询分析列表
-export function getEvaluationclueList(params) {
-  return request({
-    url: '/education/evaluationclue/list',
-    method: 'get',
-    params
-  })
-}
-
-//修改分析内容
-export function updateEvaluationclue(data) {
-  return request({
-    url: '/education/evaluationclue',
-    method: 'put',
-    data
-  })
-}
-// 新增分析
-export function addEvaluationclue(data) {
-  return request({
-    url: '/education/evaluationclue',
-    method: 'post',
-    data
-  })
-}

src/renderer/src/assets/iconfont/iconfont.css

@@ -1,9 +1,9 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2794390 */
-  src: url('iconfont.woff2?t=1732002934577') format('woff2'),
+  src: url('iconfont.woff2?t=1728543886557') format('woff2'),
-       url('iconfont.woff?t=1732002934577') format('woff'),
+       url('iconfont.woff?t=1728543886557') format('woff'),
-       url('iconfont.ttf?t=1732002934577') format('truetype'),
+       url('iconfont.ttf?t=1728543886557') format('truetype'),
-       url('iconfont.svg?t=1732002934577#iconfont') format('svg');
+       url('iconfont.svg?t=1728543886557#iconfont') format('svg');
 }
 
 .iconfont {
@@ -14,26 +14,6 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
-.icon-a-shiyanpingshiyanyanjiu:before {
-  content: "\e9a0";
-}
-
-.icon-banji2:before {
-  content: "\e6c0";
-}
-
-.icon-set:before {
-  content: "\e691";
-}
-
-.icon-shouye:before {
-  content: "\e637";
-}
-
-.icon-gongzuotai:before {
-  content: "\e690";
-}
-
 .icon-A1:before {
   content: "\e635";
 }

src/renderer/src/assets/iconfont/iconfont.json

@@ -1,45 +1,10 @@
 {
   "id": "2794390",
-  "name": "文枢2.1",
+  "name": "electron",
   "font_family": "iconfont",
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
-    {
-      "icon_id": "41507853",
-      "name": "实验瓶",
-      "font_class": "a-shiyanpingshiyanyanjiu",
-      "unicode": "e9a0",
-      "unicode_decimal": 59808
-    },
-    {
-      "icon_id": "1017928",
-      "name": "班级",
-      "font_class": "banji2",
-      "unicode": "e6c0",
-      "unicode_decimal": 59072
-    },
-    {
-      "icon_id": "376364",
-      "name": "设置",
-      "font_class": "set",
-      "unicode": "e691",
-      "unicode_decimal": 59025
-    },
-    {
-      "icon_id": "5835474",
-      "name": "首页",
-      "font_class": "shouye",
-      "unicode": "e637",
-      "unicode_decimal": 58935
-    },
-    {
-      "icon_id": "19108133",
-      "name": "工作台",
-      "font_class": "gongzuotai",
-      "unicode": "e690",
-      "unicode_decimal": 59024
-    },
     {
       "icon_id": "11657531",
       "name": "A",

src/renderer/src/assets/iconfont/iconfont.svg

@@ -14,16 +14,6 @@
     />
       <missing-glyph />
       
-      <glyph glyph-name="a-shiyanpingshiyanyanjiu" unicode="&#59808;" d="M404.602646 837.887844l-16.783367-7.405737-128.245981-56.577561-16.787416-7.405736-16.787416-7.405737 100.716399-228.298334a18.342257 18.342257 0 0 1 24.189104-9.37763l161.816764 71.384985a18.338207 18.338207 0 0 1 9.377631 24.189104L421.390062 845.293581l-16.787416-7.405737zM422.325396 869.563666L202.995737 772.80725A18.354404 18.354404 0 0 1 193.614058 748.614097l25.735846-58.342952a18.350355 18.350355 0 0 1 24.193153-9.38168L462.872715 777.645881a18.350355 18.350355 0 0 1 9.38168 24.193153l-25.739895 58.347001a18.342257 18.342257 0 0 1-24.189104 9.377631zM921.226676 261.831663L517.555315 623.259148l-12.240318-13.669638-161.812715-71.384985-18.346306 0.076932 1.886863-540.157186c-0.149815-39.065362 14.386322-70.158119 40.940079-87.540747 26.549708-17.37858 60.853372-18.265324 96.590404-2.498272L895.547517 99.994654c35.765376 15.77515 58.193137 41.677008 63.157289 72.935776 4.956053 31.254719-8.353218 62.833364-37.47813 88.901233zM921.226676 261.831663l-136.445333 122.168337H325.694501l1.348338-385.879778c-0.149815-39.065362 14.386322-70.158119 40.940079-87.540747 26.549708-17.37858 60.853372-18.265324 96.590404-2.498272l430.974195 191.909402c35.765376 15.77515 58.193137 41.677008 63.157289 72.935776 4.956053 31.258768-8.353218 62.837413-37.47813 88.905282z"  horiz-adv-x="1039" />
-      
-      <glyph glyph-name="banji2" unicode="&#59072;" d="M865.793707 531.61984c0 12.357973-10.03008 22.386347-22.386347 22.386347-12.357973 0-22.386347-10.03008-22.386347-22.386347 0-61.743787-50.19136-111.93344-111.935147-111.93344s-111.935147 50.19136-111.935147 111.93344c0 12.357973-10.03008 22.386347-22.386347 22.386347-12.357973 0-22.386347-10.03008-22.386347-22.386347 0-86.413653 70.294187-156.70784 156.70784-156.70784S865.793707 445.206187 865.793707 531.61984zM1059.054933 208.631467c58.876587 23.237973 99.48672 81.08544 99.48672 145.916587 0 71.637333-47.684267 132.082347-115.24608 150.528 0.67072 8.820053 1.611093 17.55136 1.611093 26.550613 0 185.183573-150.662827 335.802027-335.802027 335.802027-185.183573 0-335.802027-150.618453-335.802027-335.802027 0-9.043627 1.477973-17.73056 2.194773-26.594987-67.428693-18.536107-115.024213-78.93504-115.024213-150.483627 0-64.832853 40.564053-122.68032 99.442347-145.916587L287.470933 1.59744c-4.118187-11.685547 2.059947-24.446293 13.70112-28.520107 2.46272-0.84992 4.969813-1.252693 7.386453-1.252693 9.222827 0 17.90976 5.77536 21.133653 14.999893l80.413013 229.643947c0.402773 1.02912 0.67072 2.148693 0.940373 3.268267 2.46272 11.55072-4.432213 23.058773-15.849813 26.238293-2.776747 0.807253-5.59616 0.896-8.193707 0.761173-47.72864 13.298347-81.75616 57.623893-81.75616 107.815253 0 49.206613 31.43168 91.24864 76.741973 106.069333 25.879893-117.306027 113.322667-215.048533 230.137173-250.374827l-72.174933-206.226773c-4.118187-11.685547 2.059947-24.446293 13.745493-28.520107 2.46272-0.896 4.92544-1.252693 7.386453-1.252693 9.268907 0 17.865387 5.77536 21.133653 14.999893l80.18944 229.15072c2.10432 6.045013 1.56672 12.670293-1.611093 18.26816-3.089067 5.59616-8.46336 9.581227-14.73024 10.970453-132.125013 29.146453-227.985067 148.60288-227.985067 283.997867 0 160.469333 130.56 291.027627 291.027627 291.027627s291.027627-130.56 291.027627-291.027627c0-12.043947-0.761173-23.86432-2.148693-35.551573-14.327467-116.993707-97.158827-213.03296-211.10784-244.642133-5.95456-1.657173-10.970453-5.686613-13.88032-11.19232-2.82112-5.46304-3.31264-11.910827-1.252693-17.73056l81.62304-233.270613c3.268267-9.222827 11.864747-14.999893 21.133653-14.999893 2.46272 0 4.92544 0.3584 7.386453 1.252693 11.685547 4.07552 17.819307 16.83456 13.745493 28.520107l-74.011307 211.46624c110.052693 38.99904 190.55616 131.76832 214.95808 245.225813 45.535573-14.685867 77.190827-56.818347 77.190827-106.15808 0-50.773333-34.833067-95.501653-83.457707-108.30848-2.194773 0-4.522667-0.31232-6.760107-1.02912-11.461973-3.403093-18.044587-15.849813-15.179093-27.446613 0.402773-1.431893 0.896-2.776747 1.477973-4.118187l79.428267-226.822827c3.223893-9.222827 11.820373-14.999893 21.087573-14.999893 2.46272 0 4.969813 0.402773 7.432533 1.252693 11.641173 4.07552 17.819307 16.83456 13.70112 28.520107L1059.054933 208.631467z"  horiz-adv-x="1366" />
-      
-      <glyph glyph-name="set" unicode="&#59025;" d="M512 558.182c-115.665 0-209.455-93.789-209.455-209.455 0-115.665 93.789-209.455 209.455-209.455s209.455 93.789 209.455 209.455c0 115.665-93.789 209.455-209.455 209.455zM512 185.818c-89.972 0-162.909 72.937-162.909 162.909 0 89.972 72.937 162.909 162.909 162.909s162.909-72.937 162.909-162.909c0-89.972-72.937-162.909-162.909-162.909zM907.636 465.091l-66.746 0c-4.143 11.59-8.797 22.9-14.057 33.932l47.197 47.197c18.199 18.199 18.199 47.663 0 65.815l-98.723 98.723c-18.199 18.199-47.663 18.199-65.815 0l-47.43-47.43c-10.938 5.213-22.109 10.1-33.652 14.196l0 66.839c0 25.693-20.852 46.545-46.545 46.545l-139.636 0c-25.693 0-46.545-20.852-46.545-46.545l0-66.839c-11.59-4.096-22.807-8.89-33.792-14.15l-47.383 47.383c-18.153 18.199-47.663 18.199-65.815 0l-98.723-98.723c-18.199-18.199-18.199-47.663 0-65.815l47.29-47.29c-5.26-10.985-10.1-22.249-14.196-33.839l-66.7 0c-25.693 0-46.545-20.852-46.545-46.545l0-139.636c0-25.693 20.852-46.545 46.545-46.545l66.746 0c4.143-11.59 8.797-22.9 14.057-33.885l-47.197-47.197c-18.199-18.153-18.199-47.663 0-65.815l98.723-98.723c18.199-18.199 47.663-18.199 65.815 0l47.43 47.43c10.938-5.213 22.109-10.1 33.652-14.196l0-66.886c0-25.693 20.852-46.545 46.545-46.545l139.636 0c25.693 0 46.545 20.852 46.545 46.545l0 66.746c11.59 4.143 22.9 8.797 33.885 14.057l47.197-47.197c18.199-18.199 47.663-18.199 65.815 0l98.723 98.723c18.199 18.199 18.199 47.663 0 65.815l-47.43 47.43c5.213 10.938 10.1 22.109 14.196 33.652l66.932 0c25.693 0 46.545 20.852 46.545 46.545l0 139.636c0 25.74-20.852 46.592-46.545 46.592zM907.636 302.182c0-12.847-10.426-23.273-23.273-23.273l-78.243 0c-7.54-31.837-20.108-61.673-36.817-88.762l55.343-55.389c9.076-9.076 9.076-23.831 0-32.908l-65.815-65.815c-9.076-9.076-23.831-9.076-32.908 0l-55.343 55.343c-27.089-16.71-56.925-29.277-88.762-36.817l0-78.196c0-12.847-10.426-23.273-23.273-23.273l-93.091 0c-12.847 0-23.273 10.426-23.273 23.273l0 78.243c-31.837 7.54-61.673 20.108-88.762 36.817l-55.343-55.343c-9.076-9.076-23.831-9.076-32.908 0l-65.815 65.815c-9.076 9.076-9.076 23.831 0 32.908l55.343 55.389c-16.71 27.043-29.277 56.879-36.817 88.716l-78.243 0c-12.847 0-23.273 10.426-23.273 23.273l0 93.091c0 12.847 10.426 23.273 23.273 23.273l78.243 0c7.54 31.837 20.108 61.673 36.817 88.762l-55.389 55.343c-9.076 9.076-9.076 23.831 0 32.908l65.815 65.815c9.076 9.076 23.831 9.076 32.908 0l55.343-55.343c27.136 16.71 56.972 29.277 88.809 36.817l0 78.243c0 12.847 10.426 23.273 23.273 23.273l93.091 0c12.847 0 23.273-10.426 23.273-23.273l0-78.243c31.837-7.54 61.673-20.108 88.762-36.817l55.343 55.343c9.076 9.076 23.831 9.076 32.908 0l65.815-65.815c9.076-9.076 9.076-23.831 0-32.908l-55.343-55.343c16.71-27.089 29.277-56.879 36.817-88.762l78.243 0c12.847 0 23.273-10.426 23.273-23.273l0-93.091z"  horiz-adv-x="1024" />
-      
-      <glyph glyph-name="shouye" unicode="&#58935;" d="M960 448c-6.4 0-12.9 1.9-18.6 6L512 760.7 82.6 454c-14.4-10.2-34.4-6.9-44.6 7.5-10.3 14.4-6.9 34.4 7.5 44.6l448 320c11.1 7.9 26.1 7.9 37.2 0l448-320c14.4-10.3 17.7-30.3 7.5-44.6-6.4-8.8-16.2-13.5-26.2-13.5zM608-64H416c-17.7 0-32 14.3-32 32V256c0 17.7 14.3 32 32 32h192c17.7 0 32-14.3 32-32v-288c0-17.7-14.3-32-32-32z m-160 64h128V224H448v-224zM832-64H192c-52.9 0-96 43.1-96 96V512c0 17.7 14.3 32 32 32s32-14.3 32-32v-480c0-17.6 14.4-32 32-32h640c17.6 0 32 14.4 32 32V512c0 17.7 14.3 32 32 32s32-14.3 32-32v-480c0-52.9-43.1-96-96-96z"  horiz-adv-x="1024" />
-      
-      <glyph glyph-name="gongzuotai" unicode="&#59024;" d="M320.284444 810.666667a85.333333 85.333333 0 0 0 85.333334-85.333334v-234.951111H170.666667a85.333333 85.333333 0 0 0-85.333334 85.333334V725.333333a85.333333 85.333333 0 0 0 85.333334 85.333334h149.617777m0 85.333333H170.666667a170.666667 170.666667 0 0 1-170.666667-170.666667v-149.617777a170.666667 170.666667 0 0 1 170.666667-170.666667h320.284444V725.333333a170.666667 170.666667 0 0 1-170.666667 170.666667zM405.617778 277.617778V42.666667a85.333333 85.333333 0 0 0-85.333334-85.333334H170.666667a85.333333 85.333333 0 0 0-85.333334 85.333334v149.617777a85.333333 85.333333 0 0 0 85.333334 85.333334h234.951111m85.333333 85.333333H170.666667a170.666667 170.666667 0 0 1-170.666667-170.666667V42.666667a170.666667 170.666667 0 0 1 170.666667-170.666667h149.617777a170.666667 170.666667 0 0 1 170.666667 170.666667V362.951111zM853.333333 277.617778a85.333333 85.333333 0 0 0 85.333334-85.333334V42.666667a85.333333 85.333333 0 0 0-85.333334-85.333334h-149.617777a85.333333 85.333333 0 0 0-85.333334 85.333334v234.951111H853.333333m0 85.333333H533.048889V42.666667a170.666667 170.666667 0 0 1 170.666667-170.666667H853.333333a170.666667 170.666667 0 0 1 170.666667 170.666667v149.617777a170.666667 170.666667 0 0 1-170.666667 170.666667zM853.333333 810.666667a85.333333 85.333333 0 0 0 85.333334-85.333334v-149.617777a85.333333 85.333333 0 0 0-85.333334-85.333334h-234.951111V725.333333a85.333333 85.333333 0 0 0 85.333334 85.333334H853.333333m0 85.333333h-149.617777a170.666667 170.666667 0 0 1-170.666667-170.666667v-320.284444H853.333333a170.666667 170.666667 0 0 1 170.666667 170.666667V725.333333a170.666667 170.666667 0 0 1-170.666667 170.666667z"  horiz-adv-x="1024" />
-      
       <glyph glyph-name="A1" unicode="&#58933;" d="M449 339h121.5L507.5 505.5zM782 834H242C143 834 62 753 62 654v-540c0-99 81-180 180-180h540c99 0 180 81 180 180V654c0 99-81 180-180 180z m-139.5-675l-40.5 103.5H422L381.5 159H287L462.5 609H557l180-450h-94.5z"  horiz-adv-x="1024" />
       
       <glyph glyph-name="A" unicode="&#59119;" d="M841.589844 779.507813a65.917969 65.917969 0 0 0 65.917969-65.917969v-659.179688a65.917969 65.917969 0 0 0-65.917969-65.917969H182.410156a65.917969 65.917969 0 0 0-65.917969 65.917969V713.589844a65.917969 65.917969 0 0 0 65.917969 65.917969h659.179688z m0-49.438477H182.410156a16.479492 16.479492 0 0 1-16.21582-13.513183L165.930664 713.589844v-659.179688a16.479492 16.479492 0 0 1 13.513183-16.21582L182.410156 37.930664h659.179688a16.479492 16.479492 0 0 1 16.21582 13.513183L858.069336 54.410156V713.589844a16.479492 16.479492 0 0 1-13.513183 16.21582L841.589844 730.069336zM539.059326 614.712891l188.85498-461.425782h-69.543456l-53.822022 139.746094H411.606933L360.916016 153.287109H296.118652l177.1875 461.425782h65.786133z m-34.277344-48.449707c-5.899658-29.597168-14.172364-58.996582-24.884033-88.165284L429.207031 342.80127h156.456299l-48.153076 127.781982-4.779053 12.689209a1170.900879 1170.900879 0 0 0-27.982178 82.990723z"  horiz-adv-x="1024" />

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

@@ -139,23 +139,16 @@ const handleNodeClick = (data) => {
    * data : 当前节点数据
    */
   let nodeData = cloneDeep(toRaw(data));
+ 
   //增加一个label 之前取的label
   nodeData.label = nodeData.itemtitle
-
+  // 父级节点 如果当前是一级节点 父级则为null
-  let parentNode
+  let parent = {
-  // 存在children 则为一级节点
-  if(nodeData.children){
-    // 为一级节点
-    parentNode = null
-  }
-  else{
-    parentNode = {
     id: nodeData.parentid,
     label: nodeData.parenttitle,
     itemtitle: nodeData.parenttitle
   } 
-  }
+  const parentNode = nodeData.parentid ?  parent : null
-
   nodeData.parentNode = parentNode
   let curData = {
     textBook: {

src/renderer/src/components/exam-question/examDetailsDrawer.vue

@@ -1,74 +0,0 @@
-<template>
-  <!-- 试题详情 -->
-  <el-drawer 
-    v-model="activeExamInfoDrawer" 
-    title="题目详情" 
-    :with-header="false" 
-    direction="rtl" 
-    size="60%"
-  >
-    <div style="height: calc(100% - 50px);">
-      <el-scrollbar style="background: #F3F5F8;border-radius: 8px;">
-        <el-row class="drawer-main">
-          <el-col :span="24">
-            <span>{{activeExam.worktag}}</span>
-            <span style="margin-left: 4px" v-html="activeExam.titleFormat" ></span>
-          </el-col>
-          <el-col :span="24" style="padding: 4px" v-html="activeExam.workdescFormat">
-          </el-col>
-          <el-col :span="3"  class="drawer-main-col"><em>【答案】</em></el-col>
-          <el-col :span="20" class="drawer-main-col" v-html="activeExam.workanswerFormat"></el-col>
-          <el-col :span="3"  class="drawer-main-col"><em>【分析】</em></el-col>
-          <el-col :span="20" class="drawer-main-col" v-html="activeExam.method"></el-col>
-          <el-col :span="3"  class="drawer-main-col"><em>【解答】</em></el-col>
-          <el-col :span="20" class="drawer-main-col" v-html="activeExam.analyse"></el-col>
-          <el-col :span="3"  class="drawer-main-col" ><em>【点评】</em></el-col>
-          <el-col :span="20" class="drawer-main-col" v-html="activeExam.discuss"></el-col>
-        </el-row>
-      </el-scrollbar>
-    </div>
-    <div class="drawer-footer">
-      <el-button type="primary" @click="activeExamInfoDrawer = false">关闭</el-button>
-    </div>
-  </el-drawer>
-</template>
-
-
-<script setup name="examDetailsDrawerRef">
-import {ref, reactive, watch} from 'vue'
-
-const props = defineProps({
-});
-
-
-const activeExamInfoDrawer = ref(false);
-const activeExam = ref({});
-
-//接收父组件传过来的参数
-const acceptParams = (params) => {
-  activeExamInfoDrawer.value = true;
-  activeExam.value = params.activeExam;
-}
-defineExpose({
-  acceptParams
-})
-
-</script>
-
-<style lang="scss" scoped>
-  .drawer-main{
-    margin: 1%; 
-    padding: 2%; 
-    display: flex;
-    text-align: left;
-    .drawer-main-col{
-      padding: 10px 0px;
-    }
-  }
-  .drawer-footer{
-    padding-top: 15px;
-    display: flex;
-    justify-content: flex-end;
-    box-sizing: border-box;
-  }
-</style>

src/renderer/src/components/set-homework/index.vue

@@ -213,7 +213,7 @@ const delStudent = (index) => {
 const onSubmit = (formEl) => {
   if (!formEl) return
   // 课堂id
-  const classRoomId = sessionStore.get('curr.curClassRoom.id')
+  const classRoomId = sessionStore.get('curClassRoom.id')
   formEl.validate((valid) => {
     if (valid) {
       /**
@@ -244,8 +244,7 @@ const onSubmit = (formEl) => {
             entpcourseworklist: '[' + props.rows[i].entpcourseworklist + ']',
             needMsgNotifine: 'false',
             msgkey: 'newclasswork',
-            //title: '作业任务',
+            title: '作业任务',
-            title: props.rows[i].title,
             msgcontent: '',
             teachername: userInfo.nickName,
             unixstamp: new Date().getTime(),
@@ -255,16 +254,14 @@ const onSubmit = (formEl) => {
           ary.push(obj)
         }
       }
-      console.log('ary->', ary)
       setLoading.value = true
       saveByClassWorkArray({
         classworkarray: JSON.stringify(ary)
       })
         .then((res) => {
-          
           setLoading.value = false
           ElMessage.success('操作成功')
-          emit('on-success', res)
+          emit('on-success', res.data)
           cloneDialog(formEl)
         })
         .catch(() => {

src/renderer/src/components/thirdFile-preview/index.vue

@@ -1,35 +0,0 @@
-<template>
-    <el-drawer v-model="model" class="preview-drawer" :modal="true" :destroy-on-close="true" :with-header="false" :append-to-body="true"
-      size="50%">
-      <div class="drawer-content">
-        <el-image v-for="(url,index) in srcList" :key="index" :src="url" lazy />
-      </div>
-    </el-drawer>
-  </template>
-<script setup>
-import {ref} from 'vue'
-import {getImgPath} from "@/api/file/third";
-  
-  const model = defineModel()
-  //显示图片的路径
-    const srcList = ref([])
-  const init = (id) => {
-    srcList.value = []
-    getImgPath({itemId:id}).then(res => {
-        if(res.code === 200){
-        res.data.forEach(item => {
-            item.subsets.forEach(previewItem => {
-            previewItem.previewFiles.forEach(fileItem => {
-                srcList.value.push(fileItem.fileUrl)
-            })
-            })
-        })
-        }
-    })
-  }
-  defineExpose({
-    init
-  })
-</script>
-  
-  

src/renderer/src/components/window-tools/index.vue

@@ -8,10 +8,9 @@
 </template>
 
 <script setup>
-import { ref, onMounted } from 'vue'
+import { ref } from 'vue'
 import { ElMessageBox } from 'element-plus'
 import useUserStore from '@/store/modules/user'
-const Remote = require('@electron/remote')
 
 const userStore = useUserStore()
 const { ipcRenderer } = window.electron || {}
@@ -38,7 +37,6 @@ const closeWindow = () => {
   ElMessageBox.confirm('确认退出系统吗?', '提示', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
-    customClass: 'login-close-tool',
     type: 'warning'
   }).then(() => {
     userStore.logOut().then(() => {
@@ -49,16 +47,8 @@ const closeWindow = () => {
     })
   }).catch(() => { });
 }
-
-onMounted(() =>{
-  isMaxSize.value = Remote.getCurrentWindow().isMaximized()
-})
 </script>
-<style>
+
-.login-close-tool {
-  -webkit-app-region: no-drag;
-}
-</style>
 <style lang="scss" scoped>
 .header-tool {
   width: 100%;

src/renderer/src/hooks/useClassTask.js

@@ -34,7 +34,6 @@ export const editListItem = (row, courseObj) => {
       chooseWorkLists: [],// 设计中的框架梳理list
       fileHomeworkList: [],// 设计中的常规作业list
       whiteboardObj: '',// 设计中的课堂展示对象
-      question: '', // 设计中的[课堂展示]的问题
     };
     console.log('编辑的行', row);
 
@@ -100,7 +99,7 @@ export const editListItem = (row, courseObj) => {
         console.log('row.课堂展示', row.workcodes);
         const workcodes = JSON.parse(row.workcodes);
         classtaskObj.whiteboardObj = JSON.stringify(workcodes.json);
-        classtaskObj.question = row.worktag;
+        //
         // console.log('课堂展示', classtaskObj);
         return resolve(classtaskObj);
       }

src/renderer/src/hooks/useProcessList.js

@@ -16,9 +16,8 @@ export const isJson = (str) => {
 /**
  * @description processList 格式化试题
  * @param {*} row
- * @param {*} aloneOption 选择题中选项是否为每行一个
  */
-export const processList = (row, aloneOption=false) => {
+export const processList = (row) => {
   for (var i = 0; i < row.length; i++) {
     if (isJson(row[i].workanalysis)) {
       //1、先默认格式化 格式化各项内容(待优化, 后续界面显示的为format的值)
@@ -57,24 +56,18 @@ export const processList = (row, aloneOption=false) => {
             let tmp = ''
             let j = 0
             for (; j < workDescArr.length; j++) {
-              const char = String.fromCharCode(65+j);
-              if (aloneOption) {
-                tmp += `<div style='width:100%;display:flex;padding: 2px 0'>${char}.${workDescArr[j]}</div>`;
-              }
-              else {
               if (j % 2 == 0) {
-                  tmp += `<div style='width:100%;display:flex;'>`;
+                tmp += `<div style='width:80%;display:flex;'>`
               }
-                
+              const char = String.fromCharCode(65 + j)
-                tmp += `<div style='padding-left:10px;width:50%;overflow:hidden;text-overflow:ellipsis;font-size:0.9em;'>${char}.${workDescArr[j]}</div>`;
+              tmp += `<div style='display:flex;margin-left:2%;width:35%;overflow:hidden;text-overflow:ellipsis;font-size:0.9em;'>${char}.${workDescArr[j]}</div>`
               if (j % 2 == 1) {
-                  tmp += '</div>';
+                tmp += '</div>'
-                }
               }
             }
             // j此刻已自增1, 故当选项为单数时, 需要补充结束标签
-            if(!aloneOption && j%2 == 1){
+            if (j % 2 == 1) {
-              tmp += '</div>';
+              tmp += '</div>'
             }
 
             // workDescArr为 [''] 表示为 判断题或者填空题，这里不需要选项
@@ -143,36 +136,31 @@ export const processList = (row, aloneOption=false) => {
            * ]
            */
           let workDescArr = JSON.parse(row[i].workdesc)
-          let workDescHtml = `<div style='width:100%;display:flex;>`
+          let workDescHtml = `<div style='width:80%;display:flex;>`
           workDescArr.map((item, index) => {
             if (item.type == '单选题' || item.type == '多选题') {
-              workDescHtml += `<div style='width:100%;display:flex;'>${index + 1}. ${item.title}</div>`
+              workDescHtml += `<div style='width:80%;display:flex;'>${index + 1}. ${item.title}</div>`
               let tmp = ''
               let j = 0
               let optionsArr = item.options
               for (; j < optionsArr.length; j++) {
-                const char = String.fromCharCode(65+j);
-                if (aloneOption) {
-                  tmp += `<div style='width:100%;display:flex;padding: 2px 0'>${char}.${optionsArr[j]}</div>`;
-                }
-                else {
                 if (j % 2 == 0) {
-                    tmp += `<div style='width:100%;display:flex;'>`;
+                  tmp += `<div style='width:80%;display:flex;'>`
                 }
-                  
+                const char = String.fromCharCode(65 + j)
-                  tmp += `<div style='padding-left: 10px; width: 50%'>${char}.${optionsArr[j]}</div>`;
+                tmp += `<div style='display:flex;margin-left: 2%; width: 36%'>${char}.${optionsArr[j]}</div>`
                 if (j % 2 == 1) {
-                    tmp += '</div>';
+                  tmp += '</div>'
-                  }
                 }
               }
               // j此刻已自增1, 故当选项为单数时, 需要补充结束标签
-              if(!aloneOption && j%2 == 1){
+              if (j % 2 == 1) {
-                tmp += '</div>';
+                tmp += '</div>'
               }
+
               workDescHtml += tmp
             } else if (item.type == '填空题' || item.type == '判断题' || item.type == '主观题') {
-              workDescHtml += `<div style='width:100%;display:flex;'>${index + 1}. ${item.title}</div>`
+              workDescHtml += `<div style='width:80%;display:flex;'>${index + 1}. ${item.title}</div>`
             }
           })
           workDescHtml += '</div>'
@@ -278,23 +266,17 @@ export const processList = (row, aloneOption=false) => {
           let tmp = ''
           let j = 0
           for (; j < workDescArr.length; j++) {
-            const char = String.fromCharCode(65+j);
-            if (aloneOption) {
-              tmp += `<div style='width:100%;display:flex;padding: 2px 0'>${char}.${workDescArr[j]}</div>`;
-            }
-            else {
             if (j % 2 == 0) {
-                tmp += `<div style='width:100%;display:flex;'>`;
+              tmp += `<div style='width:80%;display:flex;'>`
             }
-              
+            const char = String.fromCharCode(65 + j)
-              tmp += `<div style='padding-left: 10px; width: 50%'>${char}.${workDescArr[j]}</div>`;
+            tmp += `<div style='display:flex;margin-left: 2%; width: 36%'>${char}.${workDescArr[j]}</div>`
             if (j % 2 == 1) {
-                tmp += '</div>';
+              tmp += '</div>'
             }
           }
-          }
+          if (j % 2 == 0) {
-          if(!aloneOption && j%2== 0){
+            tmp += '</div>'
-            tmp += '</div>';
           }
           row[i].workdescFormat = tmp
 

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

@@ -29,15 +29,11 @@
         <div class="avatar-container">
           <div class="avatar-wrapper flex">
             <el-dropdown class="right-menu-item hover-effect" @command="handleCommand">
-              <el-image :src="dev_api + userStore.user.avatar" class="user-avatar" style="float: left">
+              <img :src="dev_api + userStore.user.avatar" class="user-avatar" style="float: left" />
-                <template #error>
-                  <el-image :src="defaultUserImg" class="user-avatar" style="float: left" />
-                </template>
-              </el-image>
               <template #dropdown>
                 <el-dropdown-menu>
                   <el-dropdown-item @click="changePage('/profile')">个人中心</el-dropdown-item>
-<!--                  <el-dropdown-item @click="changePage('/classReserv')">课程预约</el-dropdown-item>-->
+                  <el-dropdown-item @click="changePage('/classReserv')">课程预约</el-dropdown-item>
                   <el-dropdown-item @click="changePage('/class')">班级中心</el-dropdown-item>
                   <el-dropdown-item divided command="logout">
                     <span>退出登录</span>
@@ -84,7 +80,6 @@ import { updateUserInfo } from '@/api/system/user'
 import logoIco from '@/assets/images/logo.png'
 import { listEvaluation } from '@/api/classManage/index'
 import { sessionStore } from '@/utils/store'
-import defaultUserImg from '@/assets/images/img-avatar.png'
 // import Chat from '@/utils/chat' // im 登录初始化
 // if (!Chat.imChat) Chat.init()
 
@@ -121,12 +116,6 @@ const headerMenus = [
     id: 4,
     icon: '#icon-iconfontzhizuobiaozhunbduan3-1',
     disabled: true
-  },
-  {
-    name: '实验室',
-    id: 5,
-    icon: '#icon-a-shiyanpingshiyanyanjiu',
-    path: '/experiment'
   }
 ]
 

src/renderer/src/plugins/shareStore.js

@@ -10,7 +10,7 @@ import _ from 'lodash'
 // import { diff } from 'jsondiffpatch'
 // const Remote = isNode?require('@electron/remote'):{}  // 远程模块
 
-const exArrs = ['subject','env','curr'] // 不需要同步key-排除
+const exArrs = ['subject'] // 不需要同步key-排除
 
 export function shareStorePlugin({store}) {
   store.$subscribe((mutation, state) => { // 自动同步
@@ -60,7 +60,7 @@ function stateSyncWatch(storeName, newState) {
   const diffData = findDifferences(oldState, newState)
   if(!_.keys(diffData).length) return // 没有变化就终止执行
   // 数据处理: 找出差异
-  // console.log('state-change-diffData', diffData, newState)
+  // console.log('state-change-diffData', diffData)
   try {
     let pinaValue = {} // store pina状态管理需要的数据格式
     // 数据转换处理
@@ -83,7 +83,7 @@ function stateSyncWatch(storeName, newState) {
       // 没变化也终止执行
       if (_.isEqual(oldValAll, newValAll)) return
       // 更新本地数据-session
-      sessionStore.set(key, newValAll || null)
+      sessionStore.set(key, newValAll)
   
       // 数据处理: pina-store
       const jsonStr = JSON.stringify(pinaValue) // 从新组装-json数据

src/renderer/src/router/index.js

@@ -49,12 +49,6 @@ export const constantRoutes = [
         name: 'resource',
         meta: {title: '资源库'}
       },
-      {
-        path: '/experiment',
-        component: () => import('@/views/experiment/index.vue'),
-        name: 'experiment',
-        meta: {title: '实验室'}
-      },
       {
         path: '/prepare',
         component: () => import('@/views/prepare/index.vue'),

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

@@ -0,0 +1,28 @@
+import { defineStore } from 'pinia'
+import {  } from '@/api/classTask/index.js'
+import { listClassmain } from '@/api/classManage/index'
+
+const useClassTaskStore = defineStore('classTask',{
+  state: () => ({
+    classListIds: [],
+  }),
+  actions: {
+    listClassmain(params) {
+      // 获取班级列表
+      return new Promise((resolve, reject) => {
+        listClassmain(params)
+          .then((res) => {
+            this.classListIds = res.rows&&res.rows.map((item) => item.id)
+            resolve(res)
+          })
+          .catch((error) => {
+            reject(error)
+          })
+      })
+    },
+  },
+  persist: true
+})
+export default useClassTaskStore
+
+

src/renderer/src/store/modules/overview.js

@@ -4,17 +4,12 @@ const overviewStore = defineStore(
     {
         state: () => {
             return {
-                tableList:[],
+                tableList:[]
-                allData:[]
             }
         },
         actions: {
            getTableList(data){
                this.tableList = [...data]
-           },
-           //整理的所有列表
-           getAllData(data){
-            this.allData = [...data]
            }
         }
     })

src/renderer/src/store/modules/tool.js

@@ -6,7 +6,7 @@ import { sessionStore } from '@/utils/store'
 
 // 默认数据
 const defData = sessionStore.store || {}
-const exArrs = ['subject','env','curr']
+const exArrs = ['subject']
 exArrs.forEach(k => Object.keys(defData).includes(k) && (delete defData[k]))
 
 // 延时

src/renderer/src/utils/comm.js

@@ -127,10 +127,7 @@ export const removePropertyOf = function(obj){
 export function removeTree(list) {
   var this_ = this
   for (var i in list) {
-    if (list[i].children == null) {
+    if (list[i].children.length == 0) {
-      delete list[i].children;
-    }
-    else if (list[i].children.length == 0) {
       list[i].children = undefined
     } else {
       this_.removeTree(list[i].children)

src/renderer/src/utils/date.js

@@ -167,61 +167,3 @@ export function getTomorrow() {
 
   return tomorrow;
 }
-/**
- * 当前日期的 前几天
- * @param {*} index 天数
- * @param {*} format true 返回中国标准时间：Wed Oct 02 2024 08:00:00 GMT+0800 (中国标准时间) 格式； false 返回标准时间格式 YYYY-MM-DD
- * @returns 
- */
-export function getTheOtherDay(index, format=true) {
-  let date = new Date();
-  var year = date.getFullYear()
-  var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1
-  var day = date.getDate()- index < 10 ? '0' + (date.getDate()- index) : date.getDate()- index
-
-  // 前  index 天的时间
-  if(format){
-    let tomorrow = `${year}-${month}-${day}`;
-    return new Date(tomorrow);
-  }else{
-    let tomorrow = `${year}-${month}-${day}`;
-    return tomorrow;
-  }
-}
-/**
- * 当前日期的 后几天
- * @param {*} index 天数
- * @param {*} format true 返回中国标准时间：Wed Oct 02 2024 08:00:00 GMT+0800 (中国标准时间) 格式； false 返回标准时间格式 YYYY-MM-DD
- * @returns 
- */
-export function getTheOtheNextDay(index, format=true) {
-  const date = new Date();
-  var year = date.getFullYear()
-  var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1
-  var day = date.getDate()+ index < 10 ? '0' + (date.getDate()+ index) : date.getDate()+ index
-
-  // 前  index 天的时间
-  if(format){
-    const tomorrow = `${year}-${month}-${day}`;
-    return new Date(tomorrow);
-  }else{
-    const tomorrow = `${year}-${month}-${day}`;
-    return tomorrow;
-  }
-}
-
-
-/**
- * Wed Oct 02 2024 08:00:00 GMT+0800 (中国标准时间) 转为日期格式: YYYY-MM-DD
- * 
- * @param {*} format 
- * @returns 
- */
-export const getDateFormatDate = (newDate)=> {
-  const now = newDate; // new Date();
-  const year = now.getFullYear();
-  const month = (now.getMonth() + 1).toString().padStart(2, '0');
-  const day = now.getDate().toString().padStart(2, '0');
- 
-  return `${year}-${month}-${day}`; 
-}

src/renderer/src/utils/pdftools.js

@@ -1,224 +0,0 @@
-import request from '@/utils/request'
-import axios from 'axios';
-import { ElMessage, ElMessageBox, ElNotification } from "element-plus";
-import qs from 'qs';
-import { uploadServer, getJSONFile } from '@/utils/common';
-import { getEvaluationclueList, updateEvaluationclue, addEvaluationclue } from '@/api/pdf';
-
-export const pdfCallBack = (pdfInfo) => {
-    if(pdfInfo.toString() !== '{}' || pdfInfo !== null){
-        if(pdfInfo.storageInfo){
-            //圈点勾画操作返回
-            // saveJSON(pdfInfo.storageInfo)
-            saveAnnotationStorage(pdfInfo.storageInfo)
-            return 'draw'
-        }else if(pdfInfo.quoteInfo){
-            //引用文本操作返回
-            quoteWords(pdfInfo.quoteInfo)
-            return 'quote'
-        }else if(pdfInfo.imgInfo){
-            //OCR截图返回
-            ocrCallBack(pdfInfo.imgInfo)
-            return 'ocr'
-        }
-    }else{
-        return ''
-    }
-}
-//百度OCR识别配置
-const baidubceConfig = {
-    // Header
-    'Content-Type': "application/x-www-form-urlencoded",
-    // 格式
-    'Accept' : 'application/json',
-    // id(临时测试)
-    'client_id': "U0DrGBE6X92IXgV6cJMNON8F",
-    // 密钥(临时测试)
-    'client_secret': 'oWb0M0YWMmZPMQIhIUkJX99ddr7h61qf',
-};
-
-//获取百度token
-const getBaiduToken = async () => {
-    let config = {
-        headers: {
-            'Content-Type': `${baidubceConfig['Content-Type']}`
-        },
-        url: `/baidubce/oauth/2.0/token?grant_type=client_credentials&client_id=${baidubceConfig['client_id']}&client_secret=${baidubceConfig['client_secret']}`,
-        method: 'POST'
-    }
-    return await axios(config)
-}
-//图片识别方法
-const getBaiduOCR = async (token,params) => {
-    let config = {
-        headers: {
-            'Content-Type': `${baidubceConfig['Content-Type']}`,
-            'Accept': `${baidubceConfig['Accept']}`,
-        },
-        method: 'POST',
-        url: `/baidubce/rest/2.0/ocr/v1/doc_analysis?access_token=${token}`,
-        data: qs.stringify(params),
-    }
-    try{
-        return await axios(config)
-    }catch{
-        return null
-    }
-}
-const ocrCallBack = async (ocrInfo) => {
-    ElMessage({
-        type: 'info',
-        message: '正在识别请稍后',
-        grouping: true,
-        duration: 3000
-    })
-    const baseUrl = ocrInfo.base64;
-    const imgurl = baseUrl.split(",")[1];
-    //获取百度智能云token
-    const tokenData = await getBaiduToken();
-    console.log('----tokenData',tokenData);
-    if(tokenData.status !== 200){
-        ElMessage({
-            type: 'error',
-            message: '文字识别获取用户标识失败',
-            grouping: true,
-            showClose: true,
-            duration: 5000
-        })
-        return;
-    }
-    //获取到的token
-    const token = tokenData.data?.access_token;
-    const query = {
-        image: imgurl,               //图片地址(base64)
-        line_probability: false,     //是否返回每行识别结果的置信度。默认为false
-        disp_line_poly: false,       //是否返回每行的四角点坐标。默认为false
-        words_type: 'handprint_mix', //文字类型。 默认：印刷文字识别 = handwring_only：手写文字识别 = handprint_mix： 手写印刷混排识别
-        layout_analysis: false,      //是否分析文档版面：包括layout（图、表、标题、段落、目录）；attribute（栏、页眉、页脚、页码、脚注）的分析输出
-        recg_long_division: false,   //是否检测并识别手写竖式
-        recg_formula: true,          //控制是否检测并识别公式，默认为false
-    }
-    const ocrData = await getBaiduOCR(token,query);
-    if(ocrData && ocrData.status === 200){
-        const ocrList = ocrData.data?.words_result;
-        let words = '';
-        ocrList.map(item => {
-            words += item.words
-        })
-        ElMessageBox.alert(words, '识别结果', {
-            confirmButtonText: '引用文本',
-            type: 'info',
-            cancelButtonText: '取消'
-        }).then(() => {
-            window.navigator.clipboard.writeText(words).then(() => {
-                ElMessage({
-                    type: 'success',
-                    message: '已复制到粘贴板',
-                    grouping: true,
-                    duration: 3000
-                })
-            }).catch(() => {
-                ElMessage({
-                    type: 'error',
-                    message: '复制信息出错',
-                    grouping: true,
-                    duration: 3000
-                })
-            })
-        })
-    }else{
-        ElMessage({
-            type: 'error',
-            message: '识别信息出错',
-            grouping: true,
-            duration: 3000
-        })
-    }
-}
-const saveAnnotationStorage = (storage) => {
-    localStorage.setItem('PDFJS_Annotation', JSON.stringify(storage));
-}
-//保存json文件
-export const saveJSON = (data) => {
-    let filename = ''
-    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);
-    })
-    //下载json文件
-    // 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 quoteWords = (quoteInfo) => {
-    const { textStr, StartStr, EndStr } = 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);
-}
-//获取分析列表
-export const getAnalysisList = async (params) => {
-    return await getEvaluationclueList(params)
-}
-//新增分析数据
-export const addAnalysis = async (params) => {
-    return await addEvaluationclue(params);
-}
-//修改分析数据
-export const updateAnalusis = async (params) => {
-    return await updateEvaluationclue(params);
-}

src/renderer/src/utils/ppt-request.js

@@ -3,8 +3,8 @@ import { getSignature } from "./index";
 import { ElMessage } from "element-plus";
 import request from '@/utils/request'
 
-let appId = "a3c84da2";
+let appId = "01ec9aa3";
-let secret = "OTZkZDdhNDQ4MDk0NTZiYjcyY2RjZmYz";
+let secret = "M2QxMDAxMjYyYTEzODMwMGRkZTQ4NmUy";
 let timestamp = Math.floor(Date.now() / 1000);
 let signature = getSignature(appId, secret, timestamp);
 let req = (url, type, data)=>{
@@ -96,34 +96,5 @@ const getProgress = async (id) => {
     throw error;
   }
 };
-const getBackGroundV2 = async () => {
-  try {
-    const response = await req("/api/aipptV2/themeListV2", "GET");
-    return response.data;
-  } catch (error) {
-    console.error("请求失败:", error);
-    throw error;
-  }
-};
-const createPPTV2 = async (data) => {
-  try {
-    const response = await req("/api/aipptV2/createV2", "POST", data);
-    console.log("createOutline response:", response);
 
-    return response.data;
+export { createOutline, getBackGround, createPPT, getProgress, createByOutline };
-  } catch (error) {
-    console.error("请求失败:", error);
-    throw error;
-  }
-};
-const getProgressV2 = async (id) => {
-  try {
-    const response = await req(`/api/aipptV2/progressV2?sid=${id}`, "GET");
-    return response.data;
-  } catch (error) {
-    console.error("请求失败:", error);
-    throw error;
-  }
-};
-
-export { createOutline, getBackGround, createPPT, getProgress, getBackGroundV2, createPPTV2, getProgressV2, createByOutline };

src/renderer/src/utils/resourceDict.js

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

src/renderer/src/utils/tool.js

@@ -131,14 +131,14 @@ export const createWindow = async (type, data) => {
       data.isConsole = true // 是否开启控制台
       data.isWeb = false    // 是否开启web安全
       data.option = {...defOption, ...option}
-      wins_tool = await toolWindow(type, data)
+      wins_tool = await toolWindow(data)
       wins_tool.type = type  // 唯一标识
       wins_tool.show()
       wins_tool.setFullScreen(true) // 设置窗口为全屏
       wins_tool.setIgnoreMouseEvents(true, {forward: true}) // 忽略鼠标事件但是事件继续传递给窗口
       wins_tool.setAlwaysOnTop(true,'screen-saver') // 将窗口设置为顶层窗口
       wins_tool.setVisibleOnAllWorkspaces(true) // 如果窗口在所有工作区都可见
-      if (import.meta.env.VITE_SHOW_DEV_TOOLS === 'true') wins_tool.webContents.openDevTools() // 打开调试工具
+      wins_tool.webContents.openDevTools() // 打开调试工具
       eventHandles(type, wins_tool) // 事件监听处理
       return wins_tool
     }
@@ -161,11 +161,11 @@ export const createWindow = async (type, data) => {
       }
       data.isConsole = true // 是否开启控制台
       data.option = {...defOption, ...option}
-      const win = await toolWindow(type, data)
+      const win = await toolWindow(data)
       win.type = type  // 唯一标识
       win.show()
       win.setFullScreen(true) // 设置窗口为全屏
-      if (import.meta.env.VITE_SHOW_DEV_TOOLS === 'true') win.webContents.openDevTools() // 打开调试工具
+      win.webContents.openDevTools() // 打开调试工具
       eventHandles(type, win) // 事件监听处理
       winPdf=win
       break
@@ -193,32 +193,13 @@ export const createWindow = async (type, data) => {
       }
       data.isConsole = true // 是否开启控制台
       data.option = {...defOption, ...option}
-      winChild = await toolWindow(type, data)
+      winChild = await toolWindow(data)
       winChild.type = type  // 唯一标识
       winChild.show()
       winChild.setFullScreen(false) // 设置窗口为全屏
       eventHandles(type, winChild) // 事件监听处理
       return winChild
     }
-    case 'open-win': { // 创建-新窗口
-      const option = data.option||{}
-      const defOption = {
-        show: false,
-        frame: true, // 无边框
-        autoHideMenuBar: true,
-        maximizable: false,
-      }
-      data.isConsole = true // 是否开启控制台
-      data.option = {...defOption, ...option}
-      const win = await toolWindow(type, data)
-      win.type = type  // 唯一标识
-      win.show()
-      win.maximize();
-      // win.setFullScreen(true) // 设置窗口为全屏
-      if (import.meta.env.VITE_SHOW_DEV_TOOLS === 'true') win.webContents.openDevTools() // 打开调试工具
-      eventHandles(type, win) // 事件监听处理
-      break
-    }
     default:
       break
   }
@@ -232,7 +213,7 @@ export const createWindow = async (type, data) => {
  * @author: zdg
  * @date 2021-07-05 14:07:01
  */
-export function toolWindow(type, {url, isConsole, isWeb=true, option={}}) {
+export function toolWindow({url, isConsole, isWeb=true, option={}}) {
   // width = window.screen.width
   let width = option?.width || 800
   let height = option?.height || 600
@@ -240,7 +221,7 @@ export function toolWindow(type, {url, isConsole, isWeb=true, option={}}) {
   const devUrl = `${BaseUrl}${url}`
   const buildUrl = path.join(__dirname, 'index.html')
   const urlAll = isDev ? devUrl : buildUrl
-  return new Promise(async(resolve) => {
+  return new Promise((resolve) => {
     const config = {
       width, height,
       icon: path.join(appPath, '/resources/logo2.ico'),
@@ -255,9 +236,6 @@ export function toolWindow(type, {url, isConsole, isWeb=true, option={}}) {
     }
     // 创建-新窗口
     let win = new Remote.BrowserWindow(config)
-    // 新窗口-创建事件(如:主进程加载远程服务)
-    await ipcMsgInvoke('new-window', {id:win.id, type})
-    console.log(`渲染进程 [${type}]: 窗口创建-成功${Date.now()}`)
     if (!isDev) win.loadFile(urlAll,{hash: url})  // 加载文件
     else win.loadURL(urlAll)                      // 加载url
     win.once('ready-to-show', () => {             // 窗口加载完成
@@ -303,7 +281,7 @@ const eventHandles = (type, win) => {
     })
 
     // 新窗口-创建事件(如:主进程加载远程服务)
-    // ipcRenderer.send('new-window', {id:win.id, type})
+    ipcRenderer.send('new-window', {id:win.id, type})
   }
   switch(type) {
     case 'tool-sphere': { // 创建-悬浮球
@@ -362,7 +340,7 @@ const eventHandles = (type, win) => {
       // 监听窗口的激活事件
       win.on('focus', async () => {
         toolState.isTaskWin=true
-        // win&&win.reload(); //刷新该窗口
+        win&&win.reload(); //刷新该窗口
       });
       // 监听窗口关闭事件
       win.on('closed', function () {
@@ -379,18 +357,6 @@ const eventHandles = (type, win) => {
       publicMethods(on) // 加载公共方法
       break;
     }
-    case 'open-win': { // 打开新窗口
-      // 监听窗口关闭事件
-      win.on('closed', function () {
-        win&&win.destroy()
-      });
-      const on = {
-        onClosed: () => {
-        }
-      }
-      publicMethods(on) // 加载公共方法
-      break
-    }
     default:
       break
   }

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

@@ -4,26 +4,30 @@
       <div class="class-reserv-tabs">
         <el-segmented v-model="tabActive" block :options="tabOptions" size="large" />
       </div>
-      <div v-if="tabActive === '已批改'"> 
+      <div v-if="tabActive === '已结束'"> 
         <div class="demo-date-picker">
+          <div class="block">
             <el-date-picker
-            v-model="startEndDate"
+              v-model="EndDate"
-            type="daterange"
+              type="date"
-            start-placeholder="Start Date"
+              format="YYYY-MM-DD"
-            end-placeholder="End Date"
+              value-format="YYYY-MM-DD"
-            :default-time="defaultTime"
+              placeholder="请选择截止日期"
-            @change="changeStartEndDate"
+              size="large"
+              :disabled-date="disabledDate"
+              @change="changeEndDate"
             />
           </div>
         </div>
       </div>
+    </div>
     <div class="class-reserv-body">
       <!-- loading  <el-skeleton :rows="5" animated />-->
       <el-skeleton :rows="5" :loading="loading" animated />
       <div v-if="classWorkList.length > 0">
         <task-item
           v-for="(item, index) in activeDataList"
-          v-show="tabActive === '待批改'"
+          v-show="tabActive === '进行中'"
           :key="index"
           :item="item"
           :tabactive="tabActive"
@@ -32,7 +36,7 @@
         ></task-item>
         <task-item
           v-for="(item, index) in doneDataList"
-          v-show="tabActive === '已批改'"
+          v-show="tabActive === '已结束'"
           :key="index"
           :item="item"
           :tabactive="tabActive"
@@ -48,6 +52,7 @@
         ></el-empty>
       </div>
     </div>
+    <!-- <item-dialog ref="itemDialogRef" @cle-click="closeDialog"></item-dialog> -->
   </el-container>
 </template>
 
@@ -56,29 +61,25 @@ import { ref, onMounted, onUnmounted, computed, watch } from 'vue'
 import { listByDeadDate, listClassworkdata } from '@/api/classTask'
 
 import TaskItem from '@/views/classTask/container/classTask/task-item.vue'
+// import ItemDialog from '@/views/classTask/container/item-dialog.vue'
 import { useToolState } from '@/store/modules/tool'
-import { getDateFormatDate, getTheOtherDay, getTheOtheNextDay } from '@/utils/date'
+import { getCurrentTime } from '@/utils/date'
 import useUserStore from '@/store/modules/user'
+import useClassTaskStore from "@/store/modules/classTask";
 import {createWindow} from '@/utils/tool'
+import {sessionStore} from '@/utils/store'
 import {debounce } from '@/utils/comm'  
 
 
 const toolState = useToolState();
+
+const classTaskStore = useClassTaskStore()
 const userStore = useUserStore().user
-
+// const itemDialogRef = ref(null)
-const tabOptions = ref(['待批改', '已批改'])
+const tabOptions = ref(['进行中', '已结束'])
-const tabActive = ref('待批改')
+const tabActive = ref('进行中')
 const dataList = ref([])
-// 默认起止时间：当前日期前2天后3天；默认查询一周的数据
+const EndDate = ref(getCurrentTime('YYYY-MM-DD'))
-const startEndDate = ref([
-  getTheOtherDay(3),
-  getTheOtheNextDay(3),
-])
-const defaultTime = ref<[Date, Date]>([
-  getTheOtherDay(3),
-  getTheOtheNextDay(3),
-])
-
 
 // 所有班级作业列表
 const classWorkList = ref([])
@@ -90,18 +91,23 @@ const loading = ref(false)
 const activeDataList = computed(() => {
   return classWorkList.value 
 })
-const doneDataList = computed(() => {
-  return classWorkList.value
-})
 const deleteReserv = (item) => {
   console.log('删除待开发', item)
   // dataList.value = dataList.value.filter((is) => {
   //   return is.id !== item.id
   // })
 }
+const doneDataList = computed(() => {
+  return classWorkList.value
+})
 
-const changeStartEndDate = (val) => {
+// 当日之后的日期禁用
-  console.log('起止日期改变', val)
+const disabledDate = (time) => {
+  return time.getTime() > Date.now()
+}
+// 截止日期改变
+const changeEndDate = (val) => {
+  console.log('截止日期改变', val)
   getData() // 加载数据
 }
 
@@ -109,35 +115,63 @@ const changeStartEndDate = (val) => {
 const getData = async () => {
   classWorkList.value = []
   loading.value = true
-  // 1、班级作业
+  // 1、班级列表
+  // getClassList()
+  // 2、班级作业
   await getClassWorkList()
-  // 2、班级学生作业 包含多个班级 
+  // 3、班级学生作业 包含多个班级 
   getStudentClassWorkData()
   loading.value = false
 }
-
 /**
- * 1、获取班级作业
+ * 1、获取班级列表数据
+ * TODO 这里暂时取班级id的list，后续需要在修改
+ */
+const getClassList = () => {
+  if(classTaskStore.classListIds.length==0){
+    // 获取 班级列表ids 这里暂时取班级id的list，后续需要在修改
+    classTaskStore.listClassmain({ classuserid: userStore.userId, pageSize: 100, status: 'open' })
+  }
+}
+/**
+ * 2、获取班级作业
  */
 const getClassWorkList = async () => {
+  //if(classTaskStore.classListIds.length>0){
+  {
     // 班级作业数据，包含多个班级 homeworklist
     const response = await listByDeadDate({
       edituserid: userStore.userId, // 老师的id
       edustage: userStore.edustage, // 学段
       edusubject: userStore.edusubject,//学科
-    startdate: tabActive.value === '待批改'? '' : getDateFormatDate(startEndDate.value[0]),
+      // deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中：明天，已结束：选择的日期 弃用
-    deaddate: tabActive.value === '待批改'? '' : getDateFormatDate(startEndDate.value[1]),// 待批改：明天，已批改：选择的日期
+      deaddate: EndDate.value,// 进行中：明天，已结束：选择的日期
-    status: tabActive.value === '待批改'? '1' : '2', // 作业状态：1-已发布
+      status: '1', // 作业状态：1-已发布
       orderby: 'deaddate DESC',
       pageSize: 100,
     })
 
-  let list = response.rows || [];
+    /**
+     * 2024-10-17 由于 后面截止时间加了 时分，特加判断
+     * 1、进行中、以前是以明天判断。现改为传当天的日期，并根据当前日期的时分与截止日期进行判断，
+     * 2、已结束、以前默认是以明天判断。现依然以明天为判断，并根据当前日期时分大于截止日期时分判断。
+     */
+    let list = [];
+    if(tabActive.value === '进行中'){
+      // 进行中  当前日期时间 小于  截止 日期时间
+      list = response.rows&&response.rows.filter(item => item.deaddate && getCurrentTime('YYYY-MM-DD HH:mm') < item.deaddate); // 进行中
+    }else{
+      list = response.rows&&response.rows.filter(item => item.deaddate && getCurrentTime('YYYY-MM-DD HH:mm') > item.deaddate); // 已结束
+    }
+
+
     for (var i = 0; i < list.length; i++) {
       // 初始化部分新增字段值
-    list[i].workdatalist = [] // 当前任务中有多少个学生的数据集合
+      list[i].workdatalist = []
+      list[i].workdatacount = 0 // 人数
       list[i].workdatalistVisible = false
-    list[i].feedtimelength = 0 // 已交的学生人中，汇总计算用时
+      list[i].workdatafeedbackcount = 0 // 已交人数
+      list[i].feedtimelength = 0
       list[i].rightAnswerCount = 0
       list[i].scoingRate = 0 + '%' // 得分率
       list[i].averagetime = 0 // 平均用时
@@ -166,11 +200,19 @@ const getClassWorkList = async () => {
       } else {
         list[i].entpcourseworklistarray = []
       }
+      // 根据 classworkdatastudentids 初始化判断分配的人数
+      if (
+        list[i].classworkdatastudentids != '' &&
+        list[i].classworkdatastudentids != null &&
+        list[i].classworkdatastudentids != 'null'
+      ) {
+        const stuList = JSON.parse('[' + list[i].classworkdatastudentids + ']')
+        list[i].workdatacount = stuList.length
       }
-
+    }
-  // 显示分配人数(workdataresultsum)>0 的
+    // 显示分配人数(workdatacount)>0 的
     if (list && list.length > 0) {
-    classWorkList.value = list && list.filter((item) => item.workdataresultsum > 0)
+      classWorkList.value = list && list.filter((item) => item.workdatacount > 0)
       //TODO： 这里没分页，貌似这个 total 不重要，后续看
       total.value = 0
     }else{
@@ -179,24 +221,37 @@ const getClassWorkList = async () => {
     }
     loading.value = false
   }
-
-/**
- * 2、获取多个班级学生作业数据
- * 查询已交的列表
- * @param workList ：需要更新的作业list
- * @param Refresh ：true 不用刷新，false 需要刷新
- */
-const getStudentClassWorkData = async(workList = [], Refresh = true) => {
-  // 获取 已交的 列表数据(workdataresultcount 已交的学生数)
-  let SubmitClWorkList = [];
-  if(Refresh){
-     SubmitClWorkList = classWorkList.value.filter((item) => item.workdataresultcount > 0) ;
-  }else{
-    SubmitClWorkList = workList;
 }
 
-  console.log('有提交的作业', SubmitClWorkList)
+/**
-  const ids = SubmitClWorkList&&SubmitClWorkList.map((item) => item.id).join(',');
+ * 3、获取多个班级学生作业数据
+ */
+const getStudentClassWorkData = async() => {
+  // const { chapterId } = await useGetHomework(props.bookobj.node)
+    // this.entpcourseid = chapterId
+  //if(classTaskStore.classListIds.length>0){
+    // listClassworkdataByDeadDate({
+    //   edituserid: userStore.userId,   // 老师的id
+    //   classids: classTaskStore.classListIds.join(','),
+    //   edusubject: userStore.edusubject,//学科
+    //   deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中：明天，已结束：选择的日期
+    // deaddate: EndDate.value,// 进行中：明天，已结束：选择的日期
+    //   //status: '1', // 作业状态：1-已发布
+    //   orderby: "deaddate DESC",// TODO： 这里是否加 deaddate 的排序，后续看
+    //   pageSize: 1000,
+    // })
+
+    // listClassworkdataNew({
+    //   classworkids: ids,              // 作业id
+    //   edituserid: userStore.userId,   // 老师的id
+    //   edusubject: userStore.edusubject,//学科
+    //   evalStatus: 1,
+    //   pageSize: 1000,
+    // })
+
+    
+  {
+    const ids = classWorkList.value.map((item) => item.id).join(',');
     if (ids == '') {
       return;
     }
@@ -206,14 +261,13 @@ const getStudentClassWorkData = async(workList = [], Refresh = true) => {
     }).then((res) => {
       for (var t = 0; t < classWorkList.value.length; t++) {
         for (var i = 0; i < res.rows.length; i++) {
-        // finishtimelength != '0' 已交
           if (res.rows[i].classworkid == classWorkList.value[t].id && res.rows[i].finishtimelength != '0') {
             console.log('==================')
             // 有几个学生完成/正在完成学习任务
             // 至少resultcount不是0
-          //classWorkList.value[t].workdataresultcount++
+            classWorkList.value[t].workdatafeedbackcount++
 
-          // 已交的学生人中，汇总计算用时
+            // 在参与学习任务的人中，汇总计算用时
             classWorkList.value[t].feedtimelength += parseInt(res.rows[i].finishtimelength)
 
             // 计算得分率
@@ -251,43 +305,36 @@ const getStudentClassWorkData = async(workList = [], Refresh = true) => {
               }
             }
           }
-        // 当前这个学习任务，共推送给了几个学生，workdataresultsum
+          // 当前这个学习任务，共推送给了几个学生，workdatacount
           if (res.rows[i].classworkid == classWorkList.value[t].id) {
             classWorkList.value[t].workdatalist.push(res.rows[i])
           }
         }
-      
+        // 计算完成进度     workdatacount人数要大于0
-
+        if (
-      // 计算完成进度: workdataresultcount 学生提交了的个数;     workdataresultsum 人数要大于0;
+          classWorkList.value[t].workdataresultcount > 0 &&
-      if (classWorkList.value[t].workdataresultcount > 0 && classWorkList.value[t].workdataresultsum > 0 ) {
+          classWorkList.value[t].workdatacount > 0
+        ) {
           classWorkList.value[t].finishpercent = parseInt(
-          (classWorkList.value[t].workdataresultcount / classWorkList.value[t].workdataresultsum) * 100
+            (classWorkList.value[t].workdataresultcount / classWorkList.value[t].workdatacount) * 100
           )
         } else {
           classWorkList.value[t].finishpercent = 0
         }
 
-      /** 计算 已批阅进度  */
-      // workdataresultsum 人数   teacherrationgcount 已批阅人数
-      // 已批阅百分比： (人数-已批阅数) / 人数 * 100
-      if (classWorkList.value[t].workdataresultsum > 0) {
-        classWorkList.value[t].teacherCorrectionProgress = parseInt(
-          ((classWorkList.value[t].teacherrationgcount) / classWorkList.value[t].workdataresultsum) * 100
-        )
-      } else {
-        classWorkList.value[t].teacherCorrectionProgress = 0
-      }
-
         // 以下四个参数，都要计算
         // 2024-04-12，酉阳，by jackyshen
         
-      // 计算参与学习任务的平均用时：学生总用时/ 提交学生数
+        // 计算参与学习任务的平均用时
-      if (classWorkList.value[t].workdataresultcount > 0) {
+        if (classWorkList.value[t].workdatafeedbackcount > 0) {
-        classWorkList.value[t].averagetime = Math.ceil(classWorkList.value[t].feedtimelength / classWorkList.value[t].workdataresultcount / 60).toFixed(0)
+          classWorkList.value[t].averagetime = Math.ceil(classWorkList.value[t].feedtimelength / classWorkList.value[t].workdatafeedbackcount / 60).toFixed(0)
         } else {
           classWorkList.value[t].averagetime = 0
         }
 
+        // 计算批阅异常，需要获取每个题目的类型，找出主观题
+        // 暂缓
+
         // 计算平均得分率： 正确题数/（题目总数*学生人数）*100
         if (
           classWorkList.value[t].entpcourseworklistarray &&
@@ -296,15 +343,17 @@ const getStudentClassWorkData = async(workList = [], Refresh = true) => {
           var dd =
             (classWorkList.value[t].rightAnswerCount /
               (classWorkList.value[t].entpcourseworklistarray.length *
-              classWorkList.value[t].workdataresultsum)) *
+                classWorkList.value[t].workdatacount)) *
             100
           classWorkList.value[t].scoingRate = dd.toFixed(0) + '%'
         } else {
           classWorkList.value[t].scoingRate = '0%'
         }
+        // 设定典型作答，需要获取每个题目的类型，找出主观题
+        // 暂缓
       }
     })
-  
+  }
 }
 
 
@@ -330,7 +379,6 @@ const getStudentClassWorkDataPolling = () => {
   getStudentVisible()
   // 在轮询
   pollingST.value = setInterval(() => {
-    console.log('轮询查询学生作业进度')
     getStudentVisible()
   }, 1000 * 10)
 }
@@ -353,8 +401,7 @@ const onClickItem = (item) => {
   clearInterval(pollingST.value)
 
   console.log('防抖开启弹窗')
-  // sessionStore.set('teachClassWorkItem', item); // 缓存点击的item 
+  sessionStore.set('teachClassWorkItem', item); // 缓存点击的item 
-  localStorage.setItem('teachClassWorkItem', JSON.stringify(item));
   debounceOpenWin();
 }
 
@@ -365,56 +412,75 @@ onUnmounted(() => {
 
 // [作业反馈] - 实际查询逻辑
 const getStudentVisible = async () => {
-  if(!classWorkList.value.length>0){
+  if (classTaskStore.classListIds.length <= 0) {
-    return;
+    return
   }
+  // 班级作业数据，多个班级 
   const response = await listByDeadDate({
+    classidarray: classTaskStore.classListIds.join(','),
     edituserid: userStore.userId, // 老师的id
     edustage: userStore.edustage,// 学段
     edusubject: userStore.edusubject,//学科
-    startdate: tabActive.value === '待批改'? '' : getDateFormatDate(startEndDate.value[0]),
+    // deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中：明天，已结束：选择的日期
-    deaddate: tabActive.value === '待批改'? '' : getDateFormatDate(startEndDate.value[1]),// 待批改：明天，已批改：选择的日期
+    deaddate: EndDate.value,// 进行中：明天，已结束：选择的日期
-    status: tabActive.value === '待批改'? '1' : '2', // 作业状态：1-已发布
+    status: '1', // 作业状态：1-已发布
+    // orderby: 'concat(deaddate,uniquekey) DESC',
     orderby: 'deaddate DESC',
-    pageSize: 100,
+    pageSize: 100
   })
 
-  let list = response.rows || [];
+  /**
-
+   * 2024-10-17 由于 后面截止时间加了 时分，特加判断
-  let newList = [];
+   * 1、进行中、以前是以明天判断。现改为传当天的日期，并根据当前日期的时分与截止日期进行判断，
-  for(let i = 0; i < classWorkList.value.length; i++){
+   * 2、已结束、以前默认是以明天判断。现依然以明天为判断，并根据当前日期时分大于截止日期时分判断。
-    // 父list的id与子list的id相等，在进行对比；若是不等？ 有可能是老师批阅完了这个list数据，变成了已批改状态中，则父list数据需要删除
+   */
-    const isList = list.filter((item) => item.id === classWorkList.value[i].id);
+    let list = [];
-    if(isList.length === 0){
+  if(tabActive.value === '进行中'){
-      // 父list的id与子list的id不相等，则删除父list数据
+    // 进行中  当前日期时间 小于  截止 日期时间
-      classWorkList.value.splice(i,1);
+    list = response.rows&&response.rows.filter(item => item.deaddate && getCurrentTime('YYYY-MM-DD HH:mm') < item.deaddate); // 进行中
-    }
-    for(let j = 0; j < list.length; j++){
-      //  workdataresultcount 学生提交了的个数; 
-      if(classWorkList.value[i].id === list[j].id && classWorkList.value[i].workdataresultcount != list[j].workdataresultcount){
-        // 学生提交数 ！= 学生提交数？  
-        newList.push(list[j]);
-      }
-      // teacherrationgcount 已批阅人数
-      if(classWorkList.value[i].id === list[j].id && classWorkList.value[i].teacherrationgcount != list[j].teacherrationgcount){
-        // 更新批阅进度条
-        if (classWorkList.value[i].workdataresultsum > 0) {
-          // 更新批阅数、 进度条
-          classWorkList.value[i].teacherrationgcount = list[j].teacherrationgcount;
-          classWorkList.value[i].teacherCorrectionProgress = parseInt(
-            ((list[j].teacherrationgcount) / list[j].workdataresultsum) * 100
-          )
   }else{
-          classWorkList.value[i].teacherCorrectionProgress = 0
+    list = response.rows&&response.rows.filter(item => item.deaddate && getCurrentTime('YYYY-MM-DD HH:mm') > item.deaddate); // 已结束
+  }
+
+  const curWorkList = list
+
+  /**
+   * warn: 这里仅更新了finishpercent(进度条), 且当前作业布置推送新任务时, curWorkList中会查到新的任务与当前页面中this.classWorkList长度不一致,
+   *       故这里需循环this.classWorkList且只更新当前页面中的存在的任务进度
+   */
+  for (let t = 0; t < classWorkList.value.length; t++) {
+    // 当前时间超过[作业任务]截止时间的跳过
+    // if( getDateTime > classWorkList.value[t].deaddate ){
+    //   continue;
+    // }
+    // 确保当前拿到的任务与页面中存在的任务能一对一(避免因删除其他操作而删除作业任务导致两个数组的index不统一而越界)
+    let curWork = curWorkList.find((work) => work.id === classWorkList.value[t].id)
+    // workdataresultcount 完成人数 workdatacount人数要大于0 
+    if (curWork && curWork.workdataresultcount > 0 && classWorkList.value[t].workdatacount > 0) {
+      classWorkList.value[t].workdataresultcount = curWork.workdataresultcount
+      // 桌面端貌似不需要进度条了？
+      classWorkList.value[t].finishpercent = parseInt(
+        (classWorkList.value[t].workdataresultcount / classWorkList.value[t].workdatacount) * 100
+      )
+      // 计算参与学习任务的平均用时
+      if (classWorkList.value[t].workdatafeedbackcount > 0) {
+        classWorkList.value[t].averagetime = Math.ceil(classWorkList.value[t].feedtimelength / classWorkList.value[t].workdatafeedbackcount / 60).toFixed(0)
+      } else {
+        classWorkList.value[t].averagetime = 0
+      }
+      // 更新批阅数
+      classWorkList.value[t].teacherrationgcount = curWork.teacherrationgcount
+    } else {
+      // 学生未完成，但是老师批改了？
+      if(curWork && curWork.workdataresultcount == 0){
+        // 更新批改数
+        classWorkList.value[t].teacherrationgcount = curWork.teacherrationgcount
+      }
+      classWorkList.value[t].finishpercent = 0
     }
   }
-    }
+
-  }
+  return 1
-  if(newList.length>0){
-    // 更新学生提交后的数据？ 作业进度条、平均用时、得分率
-    const list =  newList&&newList.filter((item) => item.workdataresultcount > 0) ;
-    getStudentClassWorkData(list,false);
-  }
 }
 
 
@@ -422,27 +488,16 @@ const getStudentVisible = async () => {
 watch(
   () => [dataList, toolState.isTaskWin],
   () => {
-    console.log('监听--批改窗口是否打开===', toolState.isTaskWin)
+    console.log('=监听到批改窗口打开了===', toolState.isTaskWin)
     if(!toolState.isTaskWin){
-      if(tabActive.value === '待批改'){
+
       closeDialog();// 开启轮询
     }
   }
-  }
 )
-
 watch(tabActive, (newVal,oldVal)=>{
   console.log('newVal',newVal);
   getData() // 加载数据
-  if(newVal === '待批改'){
-    // 轮询查询
-    console.log('监听---开启轮询')
-    closeDialog();
-  }else{
-    // 关闭轮询
-    console.log('监听---关闭轮询')
-    clearInterval(pollingST.value);
-  }
 })
 </script>
 

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

@@ -15,11 +15,10 @@
       <!-- 标题 -->
       <el-row style="align-items: center; margin-bottom: 0px; flex: 0 0 auto">
         <el-col :span="12" style="padding-left: 20px; text-align: left;">
-          <!-- <div class="unit-top-left" @click="isCollapse = !isCollapse"> -->
+          <div class="unit-top-left" @click="isCollapse = !isCollapse">
-          <div class="unit-top-left">
+            <i v-if="!isCollapse" class="iconfont icon-xiangzuo" style="color: blue;"></i>
-            <!-- <i v-if="!isCollapse" class="iconfont icon-xiangzuo" style="color: blue;"></i> -->
+            <span>课程目录</span>
-            <span>作业布置</span>
+            <i v-if="isCollapse" class="iconfont icon-xiangyou" style="color: blue;"></i>
-            <!-- <i v-if="isCollapse" class="iconfont icon-xiangyou" style="color: blue;"></i> -->
           </div>
         </el-col>
         <el-col :span="12">
@@ -148,7 +147,7 @@
             </template>
           </div>
         </div>
-        <!-- TODO 课堂展示 预览待开发-->
+        <!-- TODO 课堂展示 、常规作业 预览待开发-->
         <!-- 常规作业：包含多个格式（图片略缩图展示，点击放大；其他附件跳转另外弹窗查看） -->
         <div v-if="currentTag=='常规作业'" :style="{'padding': '15px', 'overflow': 'auto'}">
           <div style="margin: 5px; background-color: white">
@@ -477,8 +476,7 @@ const debounceOpenWin = debounce(() => {
 // 批改作业
 const onClickItem = (item) => {
   console.log('防抖开启弹窗')
-  // sessionStore.set('teachClassWorkItem', item); // 缓存点击的item
+  sessionStore.set('teachClassWorkItem', item); // 缓存点击的item 
-  localStorage.setItem('teachClassWorkItem', JSON.stringify(item));
   debounceOpenWin();
 }
 
@@ -880,20 +878,18 @@ watch(() => courseObj.node, (newVal,oldVal) => {
 
 </script>
 
-<!--
 <style>
   .el-table .hidden-row {
     display: none !important;
     /* color: #ccc !important; */
   }
   .el-table .father-row {
-    &#45;&#45;el-table-tr-bg-color: #fff;
+    --el-table-tr-bg-color: #fff;
   }
   .el-table .son-row {
-    &#45;&#45;el-table-tr-bg-color: #f0f0f08a;
+    --el-table-tr-bg-color: #f0f0f08a;
   }
 </style>
--->
 
 <style lang="scss" scoped>
 .page-classTaskAssign {
@@ -910,6 +906,7 @@ watch(() => courseObj.node, (newVal,oldVal) => {
     min-height: 100%;
   }
   .unit-top-left {
+    cursor: pointer;
 
     .icon-xiangzuo {
       margin-right: 5px;

src/renderer/src/views/classTask/container/classOverview.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="common-layout" style="width: 100%">
+  <div class="common-layout" style="width: 100%; height: 73vh;">
     <el-container>
       <el-container>
         <el-header style="height: auto">
@@ -7,7 +7,7 @@
           <el-card>
             <template #header>
               <div style="font-size: 20px;font-weight: bold">
-                等级分布
+                学情分布
               </div>
             </template>
             <Distribution></Distribution>
@@ -18,7 +18,7 @@
           <el-card>
             <template #header>
               <div style="font-size: 20px;font-weight: bold">
-                用时分析
+                时长分析
               </div>
             </template>
             <TimeAnalyse></TimeAnalyse>
@@ -29,7 +29,7 @@
           <el-card>
             <template #header>
               <div style="font-size: 20px;font-weight: bold">
-                价值透析
+                知识点概览
               </div>
             </template>
             <Konwledge></Konwledge>
@@ -43,12 +43,12 @@
 </template>
 
 <script setup>
-import {ref,watchEffect,provide } from 'vue'
+import Distribution from '@/views/classTask/container/classOverview/distribution.vue'
-import Distribution from './classOverview/distribution.vue'
+import Konwledge from '@/views/classTask/container/classOverview/knowledge.vue'
-import Konwledge from './classOverview/knowledge.vue'
+import TimeAnalyse from '@/views/classTask/container/classOverview/timeAnalyse.vue'
-import TimeAnalyse from './classOverview/timeAnalyse.vue'
 import {defineProps,watch} from 'vue'
 import overviewStore from "@/store/modules/overview";
+// import {getBindlist} from "@/api/education/knowledgePoint";
 const useOverview = overviewStore()
 const props = defineProps({
   tableList: {
@@ -57,225 +57,12 @@ const props = defineProps({
       return []
     }
   },
-  evalId:{
+  // evalId:{
-    type: Number,
+  //   type: Number,
-    default: 0
+  //   default: 0
-  },
-  activeData: {                   // 数据
-    type: Object,
-    // required: true,               // 必传
-    default: () => ({
-      quizlist: [],                // 当前习题列表
-      studentList: [],             // 当前课程-所有学生
-      workFeedList: []             // 当前课程-所有学生反馈数据
-    })
-  },
-})
-let studentList = ref([])         // 学生数据
-
-// 初始-数据处理
-const initData = () => {
-  // window.test = activeCourse
-  studentList.value = props.activeData.studentList || []
-  const activeWorkFeedList = props.activeData.workFeedList || []
-  const quizlist = props.activeData.quizlist || []
-  console.log(quizlist,'quizlist');
-  
-  // 习题特殊处理
-  let data = quizlist.map(o => {
-    // 解析题选项 
-    const workdesc = o.workdesc || ''
-    let accSum = 0                  // 该题总人数
-    let activeIds = []              // 已做答学生
-    let rightIds = []               // 正确学生
-    let hasAnswers= []              // 答过题的学生
-    let timeAnalyse = []            // 平均时长和编号
-    // let subjectCourese = []         // 题目编号
-    const quizFeedList = activeWorkFeedList.filter(f => f.entpcourseworkid == o.id) // 做该题的列表
-    
-    let children = []
-    const allStudents = [];
-    if (o.worktype == '单选题') { // '单选题','多选题'
-      const list = workdesc.includes('#&') ? workdesc.split('#&') : isJson(workdesc)?JSON.parse(workdesc):[];
-      children = list.map((v,i) => {
-        const code = toCode(i)          // 转换 A-Z
-        const isOk = (isJson(workdesc)?JSON.parse(o.workanswer):o.workanswer||'').includes(i+'')  // 是否(包含)正确答案
-        // 改选项的学生id
-        const studentIds = quizFeedList.filter(f => f.feedcontent==v&&f.finishtimelength!='0').map(f => f.studentid)||[];
-        accSum += studentIds.length;
-        // 该到题的用时时间
-        timeAnalyse = quizFeedList.reduce((acc, cur) => {
-            return acc + (cur.timelength ? Number(cur.timelength) : 0);
-        },0)
-        
-        if (isOk) {
-          activeIds.push(...studentIds)
-        }
-        hasAnswers.push(...studentIds)
-        return { def: v, code, isOk, studentIds }
-      })
-    }
-    else if (o.worktype == '多选题') {
-      // 多选题的正确率单独处理
-      rightIds = quizFeedList.filter(f => {
-        const workanswer = (isJson(o.workanswer)) ? JSON.parse(o.workanswer) : o.workanswer || [];
-        const res = isSame((f.feedcontent||'').split(','), workanswer);
-        return f.entpcourseworkid  == o.id && f.finishtimelength!='0' && res;
-      });
-    
-      const list = workdesc.includes('#&') ? workdesc.split('#&') : isJson(workdesc)?JSON.parse(workdesc):[];
-      children = list.map((v,i) => {
-        const isOne = o.worktype == '单选题'
-        const code = toCode(i)          // 转换 A-Z
-        // const isOk = isOne ? i == o.workanswer : o.workanswer.includes(i)  // 是否(包含)正确答案
-        const isOk = (isJson(workdesc)?JSON.parse(o.workanswer):o.workanswer||'').includes(i+'')  // 是否(包含)正确答案
-        // 改选项的学生id
-        const studentIds = quizFeedList.filter(f => f.feedcontent.includes(i)&&f.finishtimelength!='0').map(f => f.studentid)||[];
-        accSum += studentIds.length;
-        if (studentIds.length>0) {
-          allStudents.push(...studentIds);
-        }
-          // 该到题的用时时间
-        timeAnalyse = quizFeedList.reduce((acc, cur) => {
-            return acc + (cur.timelength ? Number(cur.timelength) : 0);
-        },0)
-        if(isOk) {
-          activeIds=[...new Set(activeIds.concat(studentIds))] // 多选去重
-        }
-        hasAnswers=[...new Set(hasAnswers.concat(studentIds))]
-        return { def: v, code, isOk, studentIds }
-      })
-    }
-    else if (o.worktype == '填空题') { // 填空题
-      let title = o.title.replace(/_{3,}/g, '_____');   //将3-10的下划线统一格式为5个
-      let regex = /<!--BA-->(.*?)<!--EA-->/g // 定义正则表达式，匹配 <!--BA-->xxx<!--EA--> 格式的内容
-      if (title.indexOf('_____') != -1) {
-        regex = /_{5}/g // 定义正则表达式，匹配 <!--BA-->xxx<!--EA--> 格式的内容
-      }
-      children = (title||'').match(regex).map((v,i) => {
-        const def = `填空项 ${i+1}`
-        //const code = '(&emsp;)'
-        const code = '(略)', txt=v
-        // 改选项的学生id
-        const studentIds = quizFeedList.filter(f => !!(f.feedcontent||'').replace(/#$/,'').split('#')[i] && f.finishtimelength!='0').map(f => f.studentid)||[]
-        activeIds=[...new Set(activeIds.concat(studentIds))] // 多选去重
-        hasAnswers=[...new Set(hasAnswers.concat(studentIds))]
-        accSum = activeIds.length
-        // 该到题的用时时间
-        timeAnalyse = quizFeedList.reduce((acc, cur) => {
-            return acc + (cur.timelength ? Number(cur.timelength) : 0);
-        },0)
-        return { def, code, txt, isOk:true, studentIds }
-      })
-    } else if (o.worktype == '判断题') { // 判断题
-      const list = ['正确', '错误'];
-      children = list.map((v,i) => {
-        const workanswer = o.workanswer
-          .replace('×', '0')
-          .replace('√', '1')
-          .replace('错误', '0')
-          .replace('正确', '1')
-          .replace('正确。', '1')
-          .replace('F', '0')
-          .replace('T', '1')
-          .replace('错', '0')
-          .replace('对', '1');
-        const workanswerFormat = isJson(workanswer) ? JSON.parse(workanswer) : workanswer||''
-        const code = v=='正确' ? '1' : '0'
-        let isOk = (workanswerFormat).includes(code)
-        // warn: 看是否需要转为回答正常的显示， 当前为学生实际回答字面的正确和错误
-        // if (workanswerFormat == '0') {
-        //   isOk = !isOk;
   // }
-        // 改选项的学生id
-        const studentIds = quizFeedList.filter(f => {
-          const feedcontent = f.feedcontent
-            .replace('×', '0')
-            .replace('√', '1')
-            .replace('错误', '0')
-            .replace('正确', '1')
-            .replace('正确。', '1')
-            .replace('F', '0')
-            .replace('T', '1')
-            .replace('错', '0')
-            .replace('对', '1');
-          if(feedcontent == code&&f.finishtimelength!='0'){
-            return f
-          }
-        }).map(f => f.studentid)||[];
-        accSum += studentIds.length;
-        if(isOk) activeIds.push(...studentIds)
-        hasAnswers.push(...studentIds)
-        // 该到题的用时时间
-        timeAnalyse = quizFeedList.reduce((acc, cur) => {
-            return acc + (cur.timelength ? Number(cur.timelength) : 0);
-        },0)
-        return { def: v, code: v, isOk, studentIds }
 })
-    } else { // 论述题
-      // code = '(&emsp;)'
-      const code = '(略)', def = '解答内容'
-      const studentIds = quizFeedList.filter(f => !!(f.feedcontent||'').replace(/#$/,'')&&f.finishtimelength!='0').map(f => f.studentid)||[]
-      activeIds=[...new Set(activeIds.concat(studentIds))] // 多选去重
-      hasAnswers=[...new Set(hasAnswers.concat(studentIds))]
-      accSum = activeIds.length
-      // 该到题的用时时间
-      timeAnalyse = quizFeedList.reduce((acc, cur) => {
-          return acc + (cur.timelength ? Number(cur.timelength) : 0);
-      },0)
-      children = [{ def, code, isOk:true, studentIds }]
-    }
-
-    const studentSum = studentList.value.length || 0                // 当前推送答题人数
-    let points = percent((activeIds.length / (studentSum||1)).toFixed(2)) // 计算得分率
-    let rightSum = activeIds.length;                                // 回答正确人数
-    
-    // 多选题单独处理
-    if (o.worktype == '多选题') {
-      // 单独重新处理人数问题
-      const uniqueTmpStuents = [...new Set(allStudents)];
-      accSum = uniqueTmpStuents.length;
-      // 单独处理得分率
-      points = percent((rightIds.length / (studentSum||1)).toFixed(2)) // 计算得分率
-      // 回答正确人数
-      rightSum = rightIds.length;
-    }
-
-    // def: 原始题数据 type 类型 active: 选中 points: 得分率, accSum 题解答人数
-    return { def: o, id: o.id, type: o.worktype, active: [], points, accSum, rightSum, children,hasAnswers,timeAnalyse,score:o.workScore }
-  })
-  if (data.length === 0) return
-  useOverview.getAllData([...data])
-}
-// 百分比现在 0-100
-const percent = v => v > 1 ? 1 : v < 0 ? 0 : Math.round(v * 100)
-// Unicode 转 字符 差值65
-const toCode = (v, b) => b ? v.charCodeAt() - 65 : String.fromCharCode(v + 65)
-// 判断是否为json字符串
-const isJson = str => {if(typeof str == 'string'){
-  try {
-    const res = JSON.parse(str)
-    if(typeof res == 'object' && res) return true
-  } catch (error) {}}return false
-}
-// 获取到学生的平均回答时间
-const groupByField = (array, field) => {
-  const groupedMap = {};
-  array.forEach(item => {
-    const key = item[field];
-    if (!groupedMap[key]) {
-      groupedMap[key] = [];
-    }
-    groupedMap[key].push(item);
-  });
-
-  // 将映射对象转换为二维数组
-  return Object.values(groupedMap);
-}
-
 watch(() => props.tableList,() => {
   useOverview.getTableList(props.tableList)
 },{deep:true})
-// === 监听器 ===
-watchEffect(() => { initData() })
 </script>

src/renderer/src/views/classTask/container/classOverview/distribution.vue

@@ -14,8 +14,8 @@
 </template>
 
 <script setup>
-import Echarts from './distribution/echarts.vue'
+import Echarts from '@/views/classTask/container/classOverview/distribution/echarts.vue'
-import StuList from "./distribution/stuList.vue";
+import StuList from "@/views/classTask/container/classOverview/distribution/stuList.vue";
 </script>
 
 <style scoped>

src/renderer/src/views/classTask/container/classOverview/distribution/echarts.vue

@@ -1,40 +1,32 @@
 <template>
-  <div class="chart-container">
+  <div className="chart-container">
-    <div ref="chartRef" class="chart"></div>
+    <div ref="chartRef" className="chart"></div>
   </div>
 </template>
 
 <script setup>
 import {ref,nextTick,watch} from 'vue';
 import * as echarts from 'echarts';
-import overviewStore from '@/store/modules/overview';
+import overviewStore from '@/store/modules/overview'
-const useOverview = overviewStore();
+const useOverview = overviewStore()
 
 // 获取图表容器的引用
 const chartRef = ref(null);
 
 // 数据源
 const dataList = ref([
-  { name: '完美', value: 0, rating: 1, max: 100, min: 100 },
+  {name: '完美', value: 0,rating:1,max:100,min:100,},
-  { name: '优秀', value: 0, rating: 2, max: 99, min: 80 },
+  {name: '优秀', value: 0,rating:2,max:99,min:80,},
-  { name: '良好', value: 0, rating: 3, max: 79, min: 70 },
+  {name: '良好', value: 0,rating:3,max:79,min:70,},
-  { name: '及格', value: 0, rating: 4, max: 69, min: 60 },
+  {name: '及格', value: 0,rating:4,max:69,min:60,},
-  { name: '不及格', value: 0, rating: 5, max: 59, min: 0 },
+  {name: '不及格', value: 0,rating:5,max:59,min:0,},
 ]);
-// 答过题的学生才进行统计
-const hasStudents = ref([])
-
 
 // 根据数据生成不同的颜色
-function getColor(name) {
+function getColor(index) {
-  const colorMap = {
+  // 这里可以根据值生成不同的颜色
-    '完美': '#d14a61',
+  const colors = ['#d14a61','#675bba', '#e89110','#008c8c','#5793f3'];
-    '优秀': '#675bba',
+  return colors[index];
-    '良好': '#e89110',
-    '及格': '#008c8c',
-    '不及格': '#5793f3'
-  };
-  return colorMap[name];
 }
 
 // 初始化图表
@@ -42,86 +34,75 @@ function initChart() {
   const myChart = echarts.init(chartRef.value);
   const total = dataList.value.reduce((acc, cur) => acc + cur.value, 0); // 计算总数
 
-  // 过滤掉值为0的数据项
-  const filteredData = dataList.value.filter(item => item.value > 0);
-
   const options = {
     tooltip: {
-      trigger: 'item',
+      trigger: 'axis',
-      formatter: params => {
+      axisPointer: {
-        const value = params.value;
+        type: 'shadow'
-        const percentage = value ? ((value / total) * 100).toFixed(2) : 0; // 计算百分比并保留两位小数
-        return `${params.name}: ${value}人 (${percentage}%)`; // 显示为百分比形式
       }
     },
+    grid: {
+      left: '3%',
+      right: '4%',
+      bottom: '3%',
+      containLabel: true
+    },
+    xAxis: {
+      type: 'category',
+      data: dataList.value.map(item => item.name),
+      axisTick: {
+        alignWithLabel: true
+      }
+    },
+    yAxis: {
+      type: 'value'
+    },
     series: [{
       name: '数据',
-      type: 'pie',
+      type: 'bar',
-      radius: '90%', // 设置饼图的半径为实心
+      barWidth: '30%',
-      data: filteredData.map(item => ({
+      data: dataList.value.map(item => item.value),
-        name: item.name,
-        value: item.value,
       itemStyle: {
-          color: getColor(item.name)
+        color: function (params) {
+          // 确保这里返回正确的颜色
+          return getColor(params.dataIndex);
         }
-      })),
+      },
+      // 显示柱子顶部的值
       label: {
         show: true,
-        position: 'inside', // 将标签显示在饼图内部
+        position: 'top',
         formatter: params => {
-          const value = params.value;
+          const value = dataList.value[params.dataIndex].value;
-          const percentage = value ? ((value / total) * 100).toFixed(2) : 0; // 计算百分比并保留两位小数
+          const percentage = value ? ((value / total) * 100).toFixed() : 0; // 计算百分比并保留两位小数
-          return `${params.name}\n${value}人 (${percentage}%)`; // 显示为百分比形式，换行显示
+          return `${value}人 ${percentage}%`; // 显示为百分比形式
         },
         color: '#333',
         fontSize: 12
-      },
-      labelLine: {
-        show: false // 不显示标签线
       }
     }]
   };
 
   myChart.setOption(options);
 }
-
 // 获取表的数据
 const showEcharts =() => {
-  hasStudents.value.forEach((item, index) => {
+  useOverview.tableList.forEach((item,index) => {
-    if (item.rating === 0) {
+    if(item.rating === 0) return // 没批改不计数
     dataList.value.forEach((item1,index1) => {
       if(item1.min <= Number(item.scoingRate) && Number(item.scoingRate) <= item1.max ){
-          item1.value++;
+        item1.value ++
-        }
-      });
-    } else {
-      dataList.value.forEach((item1, index1) => {
-        if (item1.rating === item.rating) {
-          item1.value++;
-        }
-      });
-    }
-  });
-}
-//执行
-watch(() => useOverview.tableList, () => {
-  // 判断是不是客观题
-  const subType = useOverview.allData.map(item => item.type)
-  const objectiveQuestion = ['单选题','多选题','判断题']
-  if( !subType.every(item => objectiveQuestion.includes(item)) ){
-    hasStudents.value = useOverview.tableList.filter(item => {
-      if(item.rating > 0 && useOverview.allData[0].hasAnswers.includes(item.studentid)){
-        return item
       }
     })
-  }else{
+  })
-    hasStudents.value = useOverview.tableList.filter(item => useOverview.allData[0].hasAnswers.includes(item.studentid)).map(item => item);
 }
-  showEcharts();
+watch(() => useOverview.tableList,() => {
+  showEcharts()
   nextTick(() => {
     initChart();
-  });
+  })
-},{deep: true})
+})
+
 </script>
 
 <style scoped>

src/renderer/src/views/classTask/container/classOverview/distribution/stuList.vue

@@ -4,7 +4,7 @@
       <el-tab-pane :label="item.label" style="text-align:left" stretch="true">
         <template v-if="item.stuList.length > 0">
           <template v-for="(stuItem,stuIndex) in item.stuList" :key="stuIndex">
-            <el-tag style="margin:5px 10px 0 0" type="primary">{{ stuItem.studentname }}:{{ stuItem.getScore }}分</el-tag>
+            <el-tag style="margin:5px 10px 0 0" type="primary">{{stuItem.studentname}}</el-tag>
           </template>
         </template>
         <template v-else>
@@ -16,14 +16,11 @@
 </template>
 
 <script setup>
-import {ref, watch} from 'vue'
+import {nextTick, ref, watch} from 'vue'
 import overviewStore from '@/store/modules/overview'
 
 const useOverview = overviewStore()
 const tabPosition = ref('left')
-
-//答过题的学生才进行统计
-const hasStudents = ref([])
 const leftList = ref([
   {
     label:'完美',
@@ -68,33 +65,17 @@ const handelChange = (item) => {
 }
 //取区域的学生
 const showStudents = (index) => {
-  leftList.value[index].stuList = hasStudents.value.filter(item => {
+  leftList.value[index].stuList = useOverview.tableList.filter(item => {
-    if(item.rating === 0){
+    if(item.rating > 0){
       if(leftList.value[index].min <= Number(item.scoingRate || 0) && Number(item.scoingRate || 0) <= leftList.value[index].max ){
         return item
       }
-    }else{
-      if(item.rating == leftList.value[index].rating){
-        return item
-      }
     }
   })
 }
 watch(() => useOverview.tableList,() => {
-  // 判断是不是客观题
-  const subType = useOverview.allData.map(item => item.type)
-  const objectiveQuestion = ['单选题','多选题','判断题']
-  if( !subType.every(item => objectiveQuestion.includes(item)) ){
-    hasStudents.value = useOverview.tableList.filter(item => {
-      if(item.rating > 0 && useOverview.allData[0].hasAnswers.includes(item.studentid)){
-        return item
-      }
-    })
-  }else{
-    hasStudents.value = useOverview.tableList.filter(item => useOverview.allData[0].hasAnswers.includes(item.studentid)).map(item => item);
-  }
   showStudents(0)
-},{deep: true})
+})
 </script>
 
 <style scoped>

src/renderer/src/views/classTask/container/classOverview/knowledge.vue

@@ -20,71 +20,82 @@
 <script setup>
 import {ref, watch} from 'vue'
 import overviewStore from '@/store/modules/overview'
+import {listEntpcoursework} from '@/api/education/entpCourseWork'
 
 const useOverview = overviewStore()
 const tableData = ref([])
+//获取题目id
+const ids = ref('')
+//总分
+const allScore = ref(0)
 //用来获取所有知识点
 const konwledge = ref([])
-const hasStudents = ref([])
-// 获取的所有得分
-const allScore = ref(0)
-// 平均分
-const avatarScore = ref()
 //所有题目的知识点
 const getKonwledge = () => {
-  const getScoreRate = []
+  useOverview.tableList.forEach(item => {
-  // 获取知识点的种数
-  const ledges = []
-  hasStudents.value.forEach((item,index) => {
-    //判断是否存在知识点
     if(item.knowledgePoint){
-      const title = JSON.parse(item.knowledgePoint)
+      konwledge.value.push({...JSON.parse(item.knowledgePoint),...{scoingRate:Number(item.scoingRate),point:item.point,allPoint:allScore.value}})
-      //判断知识点是否重复
-      if(!ledges.includes(title.id)){
-        ledges.push(title.id)
-        // 假如分数是0 或者 得分率为空
-        konwledge.value.push({title:title.title,allPoint:allScore.value,id:title.id,point:avatarScore.value})
-      }
-      // 判断学生是否答过题
-      if(useOverview.allData[0].hasAnswers.includes(item.studentid))
-          getScoreRate.push({rate:item.scoingRate,id:title.id})
     }
   })
-  
+  tableData.value = getTableList(konwledge.value)
-  // 看看有几个知识点
+  tableData.value = tableData.value.map(item => {
-  konwledge.value.forEach(item => {
+    return{
-    tableData.value.push({
-      scoingRate:(item.point / item.allPoint * 100).toFixed(2),
       ...item,
+      allPoint: allScore.value
+    }
   })
-  })
+  console.log(tableData.value,'tableData.value')
+}
+//获取总分
+const getScore = async () => {
+  const scoreId = useOverview.tableList[0].entpcourseworklist
+  const fixedJsonString = `[${scoreId}]`;
+  const objects = JSON.parse(fixedJsonString);
+  const id = objects.map(obj => obj.id);
+  ids.value = id.join(',')
+  const res = await listEntpcoursework({ids: ids.value, pageSize: 500})
+  if(res.code === 200){
+    allScore.value = res.rows.reduce((acc, cur) => acc + cur.workScore, 0);
+    getKonwledge()
+  }
 }
 //组装tableList表格
-
+const getTableList = (data) => {
-watch(() => useOverview.tableList,() => { 
+  const result = [];
- // 判断是不是客观题
+  data.forEach(item => {
- const subType = useOverview.allData.map(item => item.type)
+    const existingItem = result.find(i => i.id === item.id);
-  const objectiveQuestion = ['单选题','多选题','判断题']
+    if (existingItem) {
-  if( !subType.every(item => objectiveQuestion.includes(item)) ){
+      // 累加point和scoingRate
-    hasStudents.value = useOverview.tableList.filter(item => {
+      existingItem.pointTotal += parseInt(item.point);
-      if(item.rating > 0 && useOverview.allData[0].hasAnswers.includes(item.studentid)){
+      existingItem.scoingRateTotal += parseFloat(item.scoingRate);
-        return item
+      existingItem.count++;
-      }
-    })
     } else {
-    hasStudents.value = useOverview.tableList.filter(item => useOverview.allData[0].hasAnswers.includes(item.studentid)).map(item => item);
+      // 新的对象
+      result.push({
+        id: item.id,
+        title: item.title,
+        pointTotal: item.point,
+        scoingRateTotal: parseFloat(item.scoingRate),
+        count: 1
+      });
     }
-  // 这里获取所有知识点的总分
+  });
-  allScore.value = useOverview.allData.reduce((acc, cur) => {
-    return acc + Number(cur.score)
-  },0)
-  // 平均分
-  avatarScore.value = hasStudents.value.reduce((acc, cur) => {
-    return acc + Number(cur.getScore)
-  },0) / hasStudents.value.length
 
-  // 计算得分率
+  // 计算平均值
-  getKonwledge()
+  result.forEach(item => {
+    item.point = Math.round(item.pointTotal / item.count);
+    // item.scoingRate = Math.round((item.scoingRateTotal / item.count) * 100) / 100;
+    item.scoingRate = Math.round((item.point / allScore.value) * 100);
+    delete item.pointTotal;
+    delete item.scoingRateTotal;
+    delete item.count;
+  });
+
+  return result;
+}
+watch(() => useOverview.tableList,() => {
+  console.log(useOverview.tableList,'useOverview.tableList')
+  getScore()
 })
 </script>
 

src/renderer/src/views/classTask/container/classOverview/timeAnalyse.vue

@@ -9,160 +9,166 @@ import * as echarts from 'echarts';
 import {ref, nextTick, watch} from 'vue'
 import overviewStore from '@/store/modules/overview'
 
-const useOverview = overviewStore();
+const useOverview = overviewStore()
 
 // 获取图表容器的引用
 const chartRef = ref(null);
-// 预计用时
+
-const expectedDuration = ref([]);
+const estimateTime = ref([]);
+
+const avaterTime = ref([]);
+// x轴
+const xAxisData = ref([]);
+
+// 获得 y 轴的数据
+const getyAxisData = () => {
+  estimateTime.value = [];
+  avaterTime.value = [];
+  useOverview.tableList.forEach(item => {
+    if (item.rating !== 0) {
+      estimateTime.value.push({
+        name: item.scoingRate ? item.scoingRate + '%' : 0 + '%',
+        value: Number(item.timelength)
+      });
+      avaterTime.value.push({
+        name: item.scoingRate ? item.scoingRate + '%' : 0 + '%',
+        value: Number(item.finishtimelength)
+      });
+    }
+  });
+
+  // x 轴排序
+  xAxisData.value.sort((a, b) => {
+    const aPercentage = parseInt(a.replace('%', ''));
+    const bPercentage = parseInt(b.replace('%', ''));
+    return aPercentage - bPercentage;
+  });
+
+  // 生成 x 轴数据
+  generateXAxisData();
+};
+
+// 生成 x 轴数据
+function generateXAxisData() {
+  // 超过8条开始计算x轴
+  if(estimateTime.value.length > 8){
+    const minScoreRate = 0;
+    const maxScoreRate = 100;
+    const numPoints = 6; // x 轴上的点数
+    const step = (maxScoreRate - minScoreRate) / (numPoints - 1);
+
+    xAxisData.value = [];
+    for (let i = 0; i < numPoints; i++) {
+      const scoreRate = minScoreRate + i * step;
+      xAxisData.value.push(scoreRate + '%');
+    }
+  }else{
+    let uniqueXAxisData = new Set();
+    estimateTime.value.forEach(item => {
+      // 添加元素到 Set 中，自动处理重复问题
+      uniqueXAxisData.add(item.name);
+    });
+    // 将 Set 转换成数组
+    xAxisData.value = Array.from(uniqueXAxisData);
+    // 对数组进行排序
+    xAxisData.value.sort((a, b) => {
+      const aPercentage = parseInt(a.replace('%', ''));
+      const bPercentage = parseInt(b.replace('%', ''));
+      return aPercentage - bPercentage;
+    });
+  }
+}
 
 // 初始化图表
 function initChart() {
   const myChart = echarts.init(chartRef.value);
-
+  const options = {
-  // 指定图表的配置项和数据
-  let option = {
     tooltip: {
-      trigger: "axis",
+      trigger: 'axis',
       axisPointer: {
-        type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
+        type: 'cross'
-      },
-      formatter: function (parms) {
-        let str = "";
-        parms.forEach(param => {
-          if (param.seriesType === 'bar') {
-            str += param.axisValue + "</br>" + param.marker + "平均用时：" + param.value + 's' + "</br>";
-          } else if (param.seriesType === 'line') {
-            str += param.marker + "预计用时：" + param.value + 's';
       }
-        });
-        return str;
     },
+    legend: {
+      data: ['预估时长', '平均用时']
     },
-    textStyle: {
-      color: "#333",
-    },
-    color: ["#7BA9FA", "#4690FA"],
     grid: {
-      containLabel: true,
+      left: '3%',
-      left: "10%",
+      right: '4%',
-      top: "20%",
+      bottom: '3%',
-      bottom: "10%",
+      top: '10%',
-      right: "10%",
+      containLabel: true
     },
     xAxis: {
-      type: "category",
+      type: 'category',
-      data: getXValue(),
+      boundaryGap: false,
-      axisLine: {
+      name: '得分率',
-        lineStyle: {
+      nameTextStyle: {
-          color: "#333",
+        color: '#999',
+        fontSize: 12,
+        padding: [0, 0, 10, 0]
       },
-      },
+      data: xAxisData.value
-      axisTick: {
-        show: false,
-      },
-      axisLabel: {
-        margin: 20, //刻度标签与轴线之间的距离。
-        textStyle: {
-          color: "#000",
-        },
-      },
-      name: '题目编号'
     },
     yAxis: {
-      type: "value",
+      type: 'value',
-      axisLine: {
+      name: '作业时长',
-        show: true,
+      nameTextStyle: {
-        lineStyle: {
+        color: '#999',
-          color: "#B5B5B5",
+        fontSize: 12,
+        padding: [0, 0, 10, 0]
       },
     },
-      name: '平均时长',
-      splitLine: {
-        lineStyle: {
-          // 使用深浅的间隔色
-          color: ["#B5B5B5"],
-          type: "dashed",
-          opacity: 0.5,
-        },
-      },
-      axisLabel: {},
-    },
     series: [
       {
-        data: getYValue(),
+        name: `预估时长`,
-        stack: "zs",
+        type: 'line',
-        type: "bar",
-        barMaxWidth: "auto",
-        barWidth: 60,
-        itemStyle: {
-          color: {
-            x: 0,
-            y: 0,
-            x2: 0,
-            y2: 1,
-            type: "linear",
-            global: false,
-            colorStops: [
-              { offset: 0, color: "#5EA1FF" },
-              { offset: 1, color: "#90BEFF" },
-            ],
-          },
-        },
-        label: {
-          show: true,
-          position: 'top',
-          formatter: '{c}s',
-          color: '#333',
-        },
-      },
-      //折线的加入
-      {
-        data: expectedDuration.value,
-        type: "line",
         smooth: true,
         symbol: 'circle',
-        symbolSize: 8,
+        symbolSize: 10,
         lineStyle: {
-          color: '#FF7F50',
+          color: '#5793f3'
-          width: 2,
         },
-        itemStyle: {
+        data: estimateTime.value.map(item => ({
-          color: '#FF7F50',
+          name: item.name,
+          value: item.value
+        }))
       },
+      {
+        name: `平均用时`,
+        type: 'line',
+        smooth: true,
+        symbol: 'circle',
+        symbolSize: 10,
+        lineStyle: {
+          color: '#d14a61'
         },
-    ],
+        data: avaterTime.value.map(item => ({
+          name: item.name,
+          value: item.value
+        }))
+      }
+    ]
   };
-
+  myChart.setOption(options);
-  myChart.setOption(option);
+}
+//获取平均时长
+const getAvaterTime = () => {
+  return useOverview.tableList.reduce((acc, cur) => acc + cur.finishtimelength, 0) / useOverview.tableList.length;
+}
+const getEstimateTime = () => {
+  return useOverview.tableList.reduce((acc, cur) => acc + cur.timelength, 0) / useOverview.tableList.length;
 }
 
-// 获取平均时长纵坐标
-const getYValue = () => {
-  const arr = useOverview.allData.map(item => item.timeAnalyse)
-  const num = useOverview.allData[0].hasAnswers.length;
-  if (arr.length === 0) return [];
-  return arr.map(item => (item ? (item / num).toFixed(2) : 0));
-};
 
-// 获取横纵轴坐标数据
-const getXValue = () => {
-  return useOverview.allData.map((item, index) => `第${index + 1}题`);
-};
 
 watch(() => useOverview.tableList,() => {
-  const time = useOverview.tableList.map(item => Number(item.timelength))
+  getyAxisData()
-  if(time.length === 0) return;
-  const avatarTime = time.reduce((acc, cur) => {
-    return acc + cur
-  },0) / time.length
-  
-  expectedDuration.value = useOverview.allData.map(() => (Number(avatarTime) * 60 / useOverview.allData.length).toFixed(2));
-  // 获取横纵坐标
   nextTick(() => {
     initChart();
-  });
+  })
-});
+})
+
 </script>
 
 <style scoped>

src/renderer/src/views/classTask/container/classTask/item-dialog-score.vue

@@ -1,7 +1,7 @@
 <template>
   <el-form ref="classWorkFormScoreRef" :model="classWorkFormScore" style="height: 100%">
     <!-- <div class="teacher_content" :style="{ height: dialogProps.maxheight + 'px' }"> -->
-    <div class="teacher_content" :style="{ height: '100%',fontSize: '18px' }">
+    <div class="teacher_content" :style="{ height: '100%' }">
       <div style="font-size: 18px; width: 100%; padding: 5px 10px; flex: 0 0 auto;">
         {{ classWorkFormScore.name }} 答题详情
       </div>
@@ -90,7 +90,7 @@
                         <span>学生答案：
                           <span 
                             v-if="stuItem.feedcontent !=''" 
-                            :style="{backgroundColor: `${formatWorkAnswer(quItem) == formatFeedContent(stuItem, quItem)? '#0ed116' : 'red'}`,color: 'white', padding: '0 5px', borderRadius: '5px'}"
+                            style="background-color: red; color: white; padding: 0 5px; border-radius: 5px;"
                             v-html="formatFeedContent(stuItem, quItem)"
                           >
                           </span>
@@ -284,27 +284,58 @@
 
         <!-- 批改评价与评语 -->
         <div class="tacher_conten_foot">
-          <el-row style=" padding: 1% 4%; border: 2px dotted;">
+          <el-row style="padding: 1% 4%; border: 2px dotted">
-            <el-col :span="24" style="display: flex;flex-direction: column;">
+            <el-col :span="24" style="display: flex; flex-direction: column">
               <el-row>
-                <el-col :span="24"> 
+                <el-col :span="14">
-                  <div class="greenLine" style="text-align: left;" v-if="dialogProps.studentObj.worktype == '习题训练'">
+                  <div style="display: flex; margin: 10px auto">
-                      <span style="font-weight: bold;">老师点评：</span>
+                    <span style="display: flex; align-items: center">
-                      <span style="margin: 0;">{{ classWorkFormScore.teacherRating.reduce((a, b) => a + b.score, 0).toFixed(2)}}</span>分
+                      <span v-if="dialogProps.studentObj.worktype == '习题训练'">
-                  </div>
+                        <span>得分： </span>
-                  <div style="display: flex; margin: 10px auto;align-items: center;justify-content: space-between;">
+                        <span style="margin: 0; color: red">{{
+                          classWorkFormScore.teacherRating.reduce((a, b) => a + b.score, 0).toFixed(2)
+                        }}</span>
+                        <span>分</span>
+                      </span>
+                      <span v-else>
+                        <span>得分： </span>
+                        <span v-if="classWorkFormScore.teacherRating.length > 0">
+                          <el-input-number
+                            v-model="classWorkFormScore.teacherRating[0].score"
+                            :controls="false"
+                            type="number"
+                            :min="0"
+                            :max="classWorkFormScore.teacherRating[0].maxScore"
+                            size="small"
+                            style="width: 60px"
+                            @change="handleChange"
+                          ></el-input-number>
+                        </span>
+                        <span>分</span>
+                      </span>
+                    </span>
                     <div class="score-container">
                       <div
                         v-for="(score, index) in teacherRatingList"
                         :key="index"
-                        style="white-space: nowrap;"
+                        :class="[
-                        :class="['score-circle', { 'active': classWorkFormScore.rating == score.ratingKey }]"
+                          'score-circle',
+                          { active: classWorkFormScore.rating == score.ratingKey }
+                        ]"
                         @click="selectScore(score)"
                       >
-                        <el-text :style="{fontWeight:'bold', color: classWorkFormScore.rating == score.ratingKey ? 'rgb(225,12,8)':'rgb(131,131,131)' }">{{ score.ratingValue }}</el-text>
+                        {{ score.ratingValue }}
                       </div>
                     </div>
-                    <el-select v-model="value" placeholder="常用评语" style="width: 240px" @change="onSelectOption">
+                  </div>
+                </el-col>
+                <el-col :span="10" style="display: flex; align-items: center">
+                  <el-select
+                    v-model="value"
+                    placeholder="常用评语"
+                    style="width: 240px"
+                    @change="onSelectOption"
+                  >
                     <el-option
                       v-for="item in cities"
                       :key="item.value"
@@ -322,21 +353,23 @@
                           placeholder="输入新的常用语"
                           size="small"
                         />
-                        <el-button type="primary" size="small" @click="onConfirm">
+                        <el-button type="primary" size="small" @click="onConfirm"> 确定 </el-button>
-                          确定
-                        </el-button>
                         <el-button size="small" @click="clear">取消</el-button>
                       </template>
                     </template>
                   </el-select>
-                  </div>
                 </el-col>
               </el-row>
             </el-col>
-            <el-col :span="24" style="display: flex;flex-direction: column;">
+            <el-col :span="24" style="display: flex; flex-direction: column">
-              <el-form-item>
+              <el-form-item label="评语说明">
-                <el-col :span="24" style="padding: 0px">
+                <el-col :span="15" style="padding: 0px">
-                  <el-input row="5" type="textarea" v-model="classWorkFormScore.teacherremark" rows="1" placeholder="输入评语" />
+                  <el-input
+                    v-model="classWorkFormScore.teacherremark"
+                    type="textarea"
+                    rows="1"
+                    placeholder="请输入评语说明"
+                  />
                 </el-col>
               </el-form-item>
             </el-col>
@@ -427,7 +460,7 @@ import useUserStore from '@/store/modules/user'
 import { ref, reactive } from 'vue'
 // import { Plus } from '@element-plus/icons-vue'
 import { ElMessageBox, ElMessage } from 'element-plus'
-import { updateClassworkeval,updateClasswork,  updateClassWorkDataAutoFinish, getClassworkdata, updateClassworkevalList } from '@/api/classTask'
+import { updateClassworkeval, updateClassworkdata, getClassworkdata } from '@/api/classTask'
 import { getTimeDate } from '@/utils/date'
 import ReFilePreview from '@/components/refile-preview/index.vue'
 import { quizStrToList } from '@/utils/comm';
@@ -468,11 +501,11 @@ const classWorkFormScore = reactive({
   teacherremark: '' //评分说明
 })
 const teacherRatingList = ref([
-  { ratingKey: '1', ratingValue: '完美' },
+  { ratingKey: '1', ratingValue: '优' },
-  { ratingKey: '2', ratingValue: '优秀' },
+  { ratingKey: '2', ratingValue: '优-' },
-  { ratingKey: '3', ratingValue: '良好' },
+  { ratingKey: '3', ratingValue: '良' },
-  { ratingKey: '4', ratingValue: '及格' },
+  { ratingKey: '4', ratingValue: '良-' },
-  { ratingKey: '5', ratingValue: '不及格' }
+  { ratingKey: '5', ratingValue: '差' }
 ])
 // 确定的线上图片数据
 //#region 文件内容相关
@@ -610,33 +643,7 @@ const selectScore = (score) => {
   console.log(score, 'score----')
   classWorkFormScore.rating = score.ratingKey
 }
-const checkWorkType = (params) => {
-  //这里判断题目类型
-  const subType = params.quizlist.map(item => item.worktype)
-  const objectiveQuestion = ['单选题','多选题','判断题']
-  //判断题目是不是客观题
-  if(subType.every(item => objectiveQuestion.includes(item))){
-    // 获取学生答题列表
 
-    const score = extractedNumber(params.studentObj.scoingRate)
-    if(0<=score && score<=59){
-      classWorkFormScore.rating = 5
-    }else if(60<=score && score<=69){
-      classWorkFormScore.rating = 4 
-    }else if(70<=score && score<=79){
-      classWorkFormScore.rating = 3
-    }else if(80<=score && score<=99){
-      classWorkFormScore.rating = 2
-    }else{
-      classWorkFormScore.rating = 1
-    }
-  }
-}
-// 获取百分比的数字
-const extractedNumber = (score) => {
-  const match = score.match(/\d+/);
-  return match ? parseInt(match[0], 10) : null;
-}
 // 接收父组件传过来的参数
 const acceptParams = async (params) => {
   console.log(params)
@@ -657,7 +664,7 @@ const acceptParams = async (params) => {
   teacherFeedContentList.value = []
   teachImageList.value = []
   teachFileList.value = []
-  checkWorkType(params)
+
   // -----------------
   dialogProps.value = params
   classWorkFormScore.name = params.studentObj.studentname
@@ -795,7 +802,7 @@ const acceptParams = async (params) => {
     console.log(params.studentQuizAllList[0].rating, '----------------------------')
     // 为null 或0 则默认为0
     classWorkFormScore.rating =
-      params.studentQuizAllList[0].rating == 0 ? classWorkFormScore.rating : params.studentQuizAllList[0].rating
+      params.studentQuizAllList[0].rating == 0 ? 0 : params.studentQuizAllList[0].rating
   }
 
   analysisScoreOpen.value = true
@@ -827,10 +834,8 @@ const formatFeedContent = (stuItem, quItem) => {
     const list = quizStrToList(quItem.workdesc);
     format = list.map((item,index) =>{
       if (quItem.worktype == '单选题') {
-        // const workdesc = item.replace(/<[^>]*>/g,'');
+        const workdesc = item.replace(/<[^>]*>/g,'');
-        // const feedcontent = stuItem.feedcontent.replace(/<[^>]*>/g,'');
+        const feedcontent = stuItem.feedcontent.replace(/<[^>]*>/g,'');
-        const workdesc = item;
-        const feedcontent = stuItem.feedcontent;
         if(workdesc == feedcontent){
           return (String.fromCharCode(65+Number(index)))
         }
@@ -871,13 +876,6 @@ const onSubmit = () => {
     })
     return
   }
-  /** 1、 更新当前作业是否已经批阅完成 */
-  // TODO updateClasswork
-  
-
-
-
-  /** 2、 更新每个学生的批阅 */
 
   var formd = {
     id: dialogProps.value.studentObj.id, // this.activeClassWork.id;
@@ -885,7 +883,7 @@ const onSubmit = () => {
     updatedate: getTimeDate(),// = year+'-'+month+'-'+day+' '+hh+':'+mm;
   };
   // 更新作业批改状态
-  updateClassWorkDataAutoFinish(formd).then(res => {
+  updateClassworkdata(formd).then(res => {
   })
 
   // 更新题目批改
@@ -905,21 +903,6 @@ const onSubmit = () => {
         // }
       })
     })
-  // let queryList = [];
-  // classWorkFormScore.teacherRating && classWorkFormScore.teacherRating.map((item, index) => {
-  //   const queryParams = {
-  //     id: item.id,
-  //     teacherRating: item.score, // 教师评分
-  //     rating: classWorkFormScore.rating, //  评价
-  //     teacherremark: classWorkFormScore.teacherremark, //评分说明
-  //     timestamp: getTimeDate() // 时间
-  //   }
-  //   //console.log(queryParams);
-  //   queryList.push(queryParams);
-  // })
-  // //console.log(queryList);
-  // updateClassworkevalList(queryList).then((res) => {
-  // })
   ElMessage({
     type: 'success',
     message: '提交成功!'
@@ -989,23 +972,23 @@ defineExpose({
 }
 
 .score-circle {
-  border: 1px solid rgb(131,131,131,.5);
+  width: 30px;
-  padding: 5px 0;
+  height: 30px;
-  background-color: #fff;
+  border-radius: 50%;
+  background-color: pink;
+  color: red;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-size: 13px;
+  margin: 0 10px;
   cursor: pointer;
-  margin-right: 5px;
+  transition: background-color 0.3s;
-  width: 60px;
-  text-align: center;
 }
 
 .score-circle.active {
-  background-color: rgb(253, 236, 224);
+  background-color: red;
   color: white;
-  border: 1px solid rgb(253, 236, 224);
-}
-.greenLine{
-  border-left: 5px solid rgb(14, 209, 22);
-  padding-left: 5px
 }
 
 .card-header{

src/renderer/src/views/classTask/container/classTask/task-item.vue

@@ -14,40 +14,31 @@
          |  截止时间：{{ item.deaddate }}  | {{ tabactive }}
       </div>
     </div>
-
+    <div class="class-reserv-item-tool">
-    <div v-if=" tabactive == '待批改' " class="class-reserv-item-progress"> 
-      <el-progress :text-inside="true" :stroke-width="26" :percentage="item.finishpercent" :color="'#000fff'"  style="cursor: pointer"></el-progress>
-      <span>
-        已交(
       <span>
         <span v-if="item.workdataresultcount!=0" style="color:#000fff; font-weight: 900; font-size: 15px">{{ item.workdataresultcount }}</span>
         <span v-if="item.workdataresultcount==0">{{ item.workdataresultcount }}</span>
-          /{{ item.workdataresultsum }}
+        /{{ item.workdatacount }}</span>
-        </span>
+      <span>已交</span>
-        )
-      </span>
     </div>
-
+    <div class="class-reserv-item-tool">
-    <div v-if=" tabactive == '待批改' " class="class-reserv-item-progress"> 
+      <!-- 总人数-已批阅人数 -->
-      <el-progress :text-inside="true" :stroke-width="26" :percentage="item.teacherCorrectionProgress"  :color="'#ff7f00'" style="cursor: pointer"></el-progress>
+      <span style="color: #ff7f00; font-weight: 900; font-size: 15px">{{ item.teacherrationgcount?item.workdatacount - item.teacherrationgcount:item.workdatacount }}</span>
-      <span>
+      <span>待批阅</span>
-        已批阅(<span style="color: #ff7f00; font-weight: 900; font-size: 15px">{{ item.teacherrationgcount}}</span>)
-      </span>
     </div>
-    
-    <!-- TODO  练习次数、引用次数  这里随便的假数据-->
-    <div  v-if=" tabactive == '已批改' " class="class-reserv-item-tool">
-      <span  style="color:#000fff; font-weight: 900; font-size: 15px">{{ item.workdataresultsum }}</span>
-      <span>练习次数</span>
-    </div>
-
-    <div  v-if=" tabactive == '已批改' " class="class-reserv-item-tool">
-      <span style="color: #ff7f00; font-weight: 900; font-size: 15px">{{ item.teacherrationgcount?item.workdataresultsum - item.teacherrationgcount:item.workdataresultsum }}</span>
-      <span>引用次数</span>
-    </div>
-    
     <div class="class-reserv-item-tool">
       <span>
+        <!-- {{ item.averagetime?item.averagetime:0 }} -->
+        <!-- <span v-if=" item.averagetime<60 ">
+          <span  style="color: #007fff; font-weight: 900; font-size: 15px">{{ item.averagetime }}</span>分钟
+        </span>
+        <span v-if=" item.averagetime==60 ">
+          <span  style="color: #007fff; font-weight: 900; font-size: 15px">1</span>小时
+        </span>
+        <span v-if=" item.averagetime>60 ">
+          <span  style="color: #007fff; font-weight: 900; font-size: 15px">{{ Math.floor(item.averagetime / 60)}}</span>小时
+          <span  style="color: #007fff; font-weight: 900; font-size: 15px">{{ Math.floor(item.averagetime % 60)}}</span>分钟
+        </span> -->
         <span  style="color: #007fff; font-weight: 900; font-size: 15px">{{ item.averagetime }}</span>分钟
       </span>
       <span>平均用时</span>
@@ -106,11 +97,6 @@ const props = defineProps({
       }
     }
   }
-  .class-reserv-item-progress {
-    width: 200px;
-    padding: 0 10px;
-    font-size: 14px;
-  }
   .class-reserv-item-tool {
     margin-left: 10px;
     display: flex;

src/renderer/src/views/classTask/container/item-dialog.vue

@@ -0,0 +1,767 @@
+<template>
+  <el-dialog
+    v-model="classWorkAnalysis.open"
+    :modal-append-to-body="false"
+    class="clwk_dialog"
+    style="width: 90%; height: 85vh"
+    :show-close="false"
+    top="8vh"
+    append-to-body
+    destory-on-close
+    :before-close="onBeforeClose"
+  >
+    <template #header>
+      <div style="font-size: 18px; display: flex; flex-wrap: nowrap">
+        <div style="flex: 1">
+          {{ classWorkAnalysis.title }}答题情况
+          <el-tag :type="classWorkAnalysis.workclass" size="large" style="height: 25px">{{
+            classWorkAnalysis.worktype
+          }}</el-tag>
+        </div>
+        <!-- classWorkAnalysis.entpcourseworklistarray 当前学习任务所包含的试题ID -->
+        <el-row
+          v-if="classWorkAnalysis.entpcourseworklistarray.length > 0"
+          style="margin: 0 auto; flex: 1"
+        >
+          <el-button-group style="margin-bottom: 10px">
+            <el-button
+              :type="classWorkAnalysis.view == 'studentview' ? 'success' : ''"
+              @click="classWorkAnalysis.view = 'studentview'"
+              >作业批阅</el-button
+            >
+            <el-button
+              v-if="classWorkAnalysis.row.worktype == '习题训练'"
+              :type="classWorkAnalysis.view == 'quizStats' ? 'success' : ''"
+              @click="workHandle('quizStats')"
+              >逐题分析</el-button
+            >
+            <el-button
+              v-if="classWorkAnalysis.row.worktype == '习题训练'"
+              :type="classWorkAnalysis.view == 'report' ? 'success' : ''"
+              @click="handleClassOverviewOpen('report')"
+              >整体分析</el-button
+            >
+          </el-button-group>
+        </el-row>
+        <div style="flex: 1">
+          <div
+            style="float: right; padding: 0 10px; cursor: pointer"
+            icon="el-icon-close"
+            @click="closeDialog"
+          >
+            x
+          </div>
+        </div>
+      </div>
+    </template>
+
+    <!-- 如果当前学习没有试题  :height="mainHeight"-->
+    <div
+      v-if="classWorkAnalysis.view == 'studentview'"
+      style="width: 100%; height:73vh; "
+      class="clwk_dialog_view"
+    >
+      <div class="view_table">
+        <el-radio-group
+          v-model="tableRadio.value"
+          style="margin-bottom: 1px"
+          @change="tableRadioChange"
+        >
+          <el-radio-button :value="1" :label="'已交' + '（' + tableRadio.num1 + '）'" />
+          <el-radio-button :value="0" :label="'未交' + '（' + tableRadio.num0 + '）'" />
+        </el-radio-group>
+        <!-- 学生列表：classWorkAnalysis.classworkdata; 已交未交：tableRadio.list  -->
+        <el-table
+          v-loading="loading_dt_table"
+          :data="tableRadio.list"
+          row-key="id"
+          style="height: 69vh;"
+          highlight-current-row
+          @row-click="getStudentClassWorkDataDetail"
+        >
+          <el-table-column type="index" label="序号" width="52" reserve-selection align="center" />
+          <el-table-column label="姓名" prop="studentname" width="100" align="center" />
+          <el-table-column :label="tableRadio.value==0?'提交状态':'提交时间'" prop="updatedate" width="170" align="center">
+            <template #default="scope">
+              <span v-if="tableRadio.value==0" style="color: #2196f3">未提交</span>
+              <span v-if="tableRadio.value==1">{{ scope.row.updatedate }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="批阅状态" prop="teacherRating" align="center" width="120" sortable>
+            <template #default="scope">
+              <template v-if="scope.row.teacherRating == 0">
+                <span v-if="tableRadio.value==1" style="color: #2196f3">待批阅</span>
+              </template>
+              <!-- 1-优 2-优减 3-良 4-良减 5-差 -->
+              <template v-if="scope.row.teacherRating == 1"
+                ><el-tag type="danger">优</el-tag></template
+              >
+              <template v-if="scope.row.teacherRating == 2"
+                ><el-tag type="danger">优-</el-tag></template
+              >
+              <template v-if="scope.row.teacherRating == 3"
+                ><el-tag type="warning">良</el-tag></template
+              >
+              <template v-if="scope.row.teacherRating == 4"
+                ><el-tag type="info">良-</el-tag></template
+              >
+              <template v-if="scope.row.teacherRating == 5"
+                ><el-tag type="info">差</el-tag></template
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+
+      <div class="view_teachrting">
+        <div class="classwork-score">
+          <div v-if="classWorkAnalysis.activeStudentQuizlist.length == 0">
+            <el-empty
+              description="点击左侧表格学生信息可查看批阅详情"
+              style="width: 100%; height: 500px"
+            ></el-empty>
+          </div>
+          <div v-else>
+            <div v-if="isopen_dtwk_table">
+              <div v-show="classWorkAnalysis.activeStudentQuizlist.length > 0">
+                <item-dialog-score
+                  ref="classWorkAnalysisScoreDialogRef"
+                  @class_work_score_submit="onClassWorkScoreSubmit"
+                />
+              </div>
+            </div>
+            <div v-else>
+              <el-empty
+                description="点击左侧表格学生信息可查看批阅详情"
+                style="width: 100%; height: 500px"
+              ></el-empty>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <!-- 逐题分析 -->
+    <div v-else-if="classWorkAnalysis.view == 'quizStats'">
+      <quiz-stats :active-data="classWorkActiveData" />
+    </div>
+
+    <!-- 整体分析-->
+    <div v-else-if="classWorkAnalysis.view == 'report'" style="overflow-y: scroll">
+      <!-- <ClassOverview :table-list="overviewData" :eval-id="courseObj.evalid"></ClassOverview> -->
+      <ClassOverview :table-list="overviewData"></ClassOverview>
+    </div>
+
+    <!-- <template #footer>
+        <div class="dialog-footer">
+            <el-button type="primary" @click="classWorkAnalysis.open=false">关 闭</el-button>
+        </div>
+      </template> -->
+  </el-dialog>
+</template>
+<script setup name="itemDialogRef">
+import { ref, defineExpose, onMounted, reactive, computed, watch, onUnmounted, nextTick, getCurrentInstance } from 'vue'
+import { addSmartClassReserv, updateSmartClassReserv, listClassmain } from '@/api/classManage'
+import { listClassworkdata, listEntpcoursework, listClassworkeval } from '@/api/classTask'
+import useUserStore from '@/store/modules/user'
+import { ElMessage } from 'element-plus'
+import { getCurrentTime, getAfterMinutes } from '@/utils/date'
+import { processList } from '@/hooks/useProcessList'
+import ItemDialogScore from '@/views/classTask/container/classTask/item-dialog-score.vue'
+// zdg: 组件导入
+import quizStats from '@/views/classTask/container/quizStats.vue'
+import ClassOverview from '@/views/classTask/container/classOverview.vue'
+
+const { proxy } = getCurrentInstance()
+const emit = defineEmits(['cle-click'])
+const props = defineProps({
+  bookId: {
+    type: Number,
+    default: 0
+  },
+})
+const mainHeight = ref(document.documentElement.clientHeight - 110)
+const classWorkAnalysis = reactive({
+  open: false
+})
+const tableRadio = reactive({
+  value: '1', // 已交
+  list: [], // 已交list
+  num1: 0, // 已交人数
+  num0: 0 // 未交人数
+}) // 批阅 是否已交
+const loading_dt_table = ref(false)
+const isopen_dtwk_table = ref(false)
+
+// zdg: 逐题分析
+const classWorkActiveData = reactive({
+  quizlist: [], // 当前习题列表
+  studentList: [], // 当前课程-所有学生
+  workFeedList: [], // 当前课程-所有学生反馈数据
+  timerId: 0 // 定时器id
+})
+//所选学生题目- 答题题目分析与评价
+const classWorkAnalysisScore = reactive({
+  studentObj: {}, // 当前学生的作业题型等信息
+  studentQuizAllList: [], // 选择学生的回答list
+  quizlist: [] // 选择学生的题目list
+})
+
+ //查看学生概况数据
+ const overviewData = ref([])
+
+// watch(
+//   // () => props.currentNode,
+//   (newValue, oldValue) => {
+//     form.name = newValue.label
+//   }
+// )
+const openDialog = (data) => {
+  console.log(data, '点击的item答题情况')
+
+  classWorkAnalysis.title = data.uniquekey ? data.uniquekey + '--' : ''
+  classWorkAnalysis.worktype = data.worktype
+  classWorkAnalysis.workclass = data.workclass
+  // 重置学生列表
+  tableRadio.list = []
+  tableRadio.value = '1'
+  tableRadio.num0 = 0
+  tableRadio.num1 = 0
+
+  classWorkAnalysis.open = true
+  // 默认显示是学生作业反馈
+  classWorkAnalysis.view = 'studentview'
+  // 当前学习任务所包含的试题ID
+  classWorkAnalysis.entpcourseworklistarray = data.entpcourseworklistarray
+  // 默认选中的学生
+  classWorkAnalysis.activeStudentQuizlist = []
+  // 默认选中的试题
+  classWorkAnalysis.activeQuizAnalysisData = []
+
+  classWorkAnalysis.row = data
+  // window.test = this
+  // zdg: 学生列表
+  const studentArr = data.classworkdatastudentids
+    ? JSON.parse(`[${data.classworkdatastudentids}]`)
+    : []
+  classWorkActiveData.studentList = studentArr
+  /** 学生完成情况分析--获取作业学生list数据 */
+  getClassWorkStudentList(data.id)
+
+  // 课程列表idlist
+  var ids = []
+  for (var i = 0; i < data.entpcourseworklistarray.length; i++) {
+    ids.push(data.entpcourseworklistarray[i].id)
+  }
+  // 课程作业列表
+  listEntpcoursework({ ids: ids.join(','), pageSize: 500 }).then((idres) => {
+    for (var i = 0; i < idres.rows.length; i++) {
+      // //新增了 复合题、主观题（背景+小题目） 题目标题优化一下 .replace(/!@#\$%/g,'')
+      idres.rows[i].titletext = idres.rows[i].title.replace(/!@#\$%/g, '')
+    }
+    classWorkAnalysis.quizlist = idres.rows
+    classWorkActiveData.quizlist = idres.rows // zdg: 作业概览组件使用
+
+    // 统计每个题目的正误率
+    // 这个学习任务所有题目+所有学生的答题数据 , pageSize: 100
+    listClassworkeval({ workid: data.id, pageSize: 1000 }).then((wevalres) => {
+      for (var i = 0; i < classWorkAnalysis.quizlist.length; i++) {
+        // 分析每一道题目
+        var scoingCount = 0
+        var feedcount = 0
+        // 全部人数
+        var evalCount = 0
+        for (var w = 0; w < wevalres.rows.length; w++) {
+          if (wevalres.rows[w].entpcourseworkid == classWorkAnalysis.quizlist[i].id) {
+            evalCount++
+
+            // 只统计有回答的题目
+            if (wevalres.rows[w].feedcontent != '') {
+              // 已经作答的人数
+              feedcount++
+              // 简单判断正误
+              if (wevalres.rows[w].feedcontent == wevalres.rows[w].rightanswer) {
+                wevalres.rows[w].scoingStatus = true
+                scoingCount++
+                // 学生回答与参考答案一样，则：得分=分值
+                wevalres.rows[w].teacherRating = wevalres.rows[w].score
+              } else {
+                wevalres.rows[w].scoingStatus = false
+              }
+            }
+          }
+        }
+        classWorkAnalysis.quizlist[i].evalCount = evalCount
+        // 作答人数
+        classWorkAnalysis.quizlist[i].feedcount = feedcount
+        // 得分率  这里优化一下（没回答会是NaN%） scoingRate
+        if (scoingCount == 0 && feedcount == 0) {
+          classWorkAnalysis.quizlist[i].scoingRate = '0%'
+        } else {
+          classWorkAnalysis.quizlist[i].scoingRate =
+            ((scoingCount / feedcount) * 100).toFixed(0) + '%'
+        }
+      }
+      // zdg: 所有反馈数据
+      const getStudentid = (workdataid) => {
+        // 获取学生id
+        const classworkdata = (classWorkAnalysis.classworkdata || []).find(
+          (o) => o.id === workdataid
+        )
+        return classworkdata ? classworkdata.studentid : ''
+      }
+      wevalres.rows.forEach((o) => {
+        o.studentid = getStudentid(o.workdataid)
+      })
+      classWorkActiveData.workFeedList = wevalres.rows
+    })
+  })
+
+  console.log(classWorkAnalysis, '点击进度后获得的数据')
+}
+
+//#region 学生完成情况分析
+/** 1、获取作业学生列表 */
+const getClassWorkStudentList = (rowId) => {
+  // 本地保存这个rowid，老师批改后续中使用
+  localStorage.setItem('activeClassWorkRowId', rowId)
+  // 先清空表格中的数据
+  classWorkAnalysis.classworkdata = []
+  // 加载中_
+  loading_dt_table.value = true
+  // 找当前学习任务的classworkdata数据
+  listClassworkdata({ classworkid: rowId, pageSize: 100 })
+    .then((response) => {
+      for (var i = 0; i < response.rows.length; i++) {
+        if (response.rows[i].entpcourseworklist != '') {
+          response.rows[i].entpcourseworkarray = JSON.parse(
+            '[' + response.rows[i].entpcourseworklist + ']'
+          )
+        } else {
+          response.rows[i].entpcourseworkarray = []
+        }
+
+        // 老师批阅状态 默认0 未批改
+        response.rows[i].teacherRating = 0
+
+        // 计算每个学生的得分率
+        if (
+          response.rows[i].classworkevallist != '' &&
+          response.rows[i].classworkevallist != null &&
+          response.rows[i].classworkevallist != 'null'
+        ) {
+          // 将标签中双引号改为转义, 测试数据: "{\"id\":172910, \"feedcontent\":\"毛泽东，<bdo class=\"mathjye-underpoint2\">浮想联翩</bdo>。\", \"score\":4, \"rightanswer\":\"毛泽东重，<bdo class=\"mathjye-underpoint2\">浮想联翩</bdo>。\"},{\"id\":172911, \"rating\":0, \"teacherRating\":0, \"entpcourseworkid\":363100, \"feedcontent\":\"毛泽东重游橘子洲，面对如画的秋色和大好的革命形势，回忆过去战斗的岁月，不禁心潮起伏，<bdo class=\"mathjye-underpoint2\">浮想联翩</bdo>。\", \"score\":4, \"rightanswer\":\"毛泽东重游橘子洲，面对如画的秋色和大好的革命形势，回忆过去战斗的岁月，不禁心潮起伏，<bdo class=\"mathjye-underpoint2\">浮想联翩</bdo>。\"}"
+          // 常规作业（去除【】前后引号）.replace(/"(\[.*\])"/g, '$1'); ：eg: "feedcontent\":\"[{\"name\":\"Bliss.jpg\",\"url\":\"https://wzyzoss.3b8daa474.jpg\"}]\",
+          // json转换会报错； .replace(/""/g, '"')   eg:  ""宇宙环境安全""
+          response.rows[i].classworkevallist = escapeHtmlQuotes(response.rows[i].classworkevallist)
+          //console.log('学生完成情况分析classworkevallist', response.rows[i].classworkevallist)
+          const evalarray = JSON.parse('[' + response.rows[i].classworkevallist + ']')
+          var scoingCount = 0
+          var feedcount = 0
+          for (var e = 0; e < evalarray.length; e++) {
+            if (evalarray[e].feedcontent != '') {
+              feedcount++
+              // 与答案对比正误。注意注意，这里仅限单选题
+              if (evalarray[e].feedcontent == evalarray[e].rightanswer) {
+                scoingCount++
+              }
+            }
+          }
+          //console.log(evalarray, 'evalarray------------------------------------')
+          if (feedcount > 0) {
+            // 多个题目的总得分率: 正确题数/（题目数*100）
+            response.rows[i].scoingRate = ((scoingCount / feedcount) * 100).toFixed(0) + '%'
+          } else {
+            response.rows[i].scoingRate = '0%'
+          }
+          // 批阅状态  优良类 :注意：这里题目中的评价都是一样的，所以取第一个
+          if (evalarray[0].rating != '') {
+            response.rows[i].teacherRating = evalarray[0].rating
+          }
+        } else {
+          response.rows[i].scoingRate = '0%'
+        }
+      }
+      classWorkAnalysis.classworkdata = response.rows
+      loading_dt_table.value = false
+
+      // 默认获取已交的学生列表
+      tableRadio.list =
+        classWorkAnalysis.classworkdata &&
+        classWorkAnalysis.classworkdata.filter((item) => item.finishtimelength != '0')
+      tableRadio.value = '1'
+      tableRadio.num0 = classWorkAnalysis.classworkdata.length - tableRadio.list.length
+      tableRadio.num1 = tableRadio.list.length
+    })
+    .catch(() => {
+      loading_dt_table.value = false
+    })
+}
+/** 2、查看某一个学生的学习任务完成详情*/
+const getStudentClassWorkDataDetail = (row) => {
+  // 这里取出的是学生完成情况
+  // 具体的题目数据在this.classWorkAnalysis.quizlist里
+  console.log(row, '点击了左侧学生')
+  //更新到待批改的学生信息中
+  classWorkAnalysisScore.studentObj = row
+  listClassworkeval({ workdataid: row.id, pageSize: 100 })
+    .then((wevalres) => {
+      for (var i = 0; i < classWorkAnalysis.quizlist.length; i++) {
+        // 分析每一道题目
+        for (var w = 0; w < wevalres.rows.length; w++) {
+          if (wevalres.rows[w].entpcourseworkid == classWorkAnalysis.quizlist[i].id) {
+            wevalres.rows[w].quiztitle = classWorkAnalysis.quizlist[i].title
+            wevalres.rows[w].quiztitletext = classWorkAnalysis.quizlist[i].title.replace(
+              /<[^>]*>/g,
+              ''
+            )
+            wevalres.rows[w].score = wevalres.rows[w].score ? wevalres.rows[w].score : 0
+
+            // 参考答案  去除下html标签
+            // wevalres.rows[w].rightanswer =
+            //   wevalres.rows[w].rightanswer != '' && wevalres.rows[w].rightanswer != null
+            //     ? wevalres.rows[w].rightanswer.replace(/<[^>]+>/g, '')
+            //     : wevalres.rows[w].rightanswer
+            // // 学生回答 去除下html标签
+            // wevalres.rows[w].feedcontent =
+            //   wevalres.rows[w].feedcontent != '' && wevalres.rows[w].feedcontent != null
+            //     ? wevalres.rows[w].feedcontent.replace(/<[^>]+>/g, '')
+            //     : wevalres.rows[w].feedcontent
+
+            if (classWorkAnalysis.row.worktype == '常规作业') {
+              wevalres.rows[w].feedcontent = JSON.parse(wevalres.rows[w].feedcontent)
+            }
+            if (wevalres.rows[w].feedcontent != '') {
+              if (wevalres.rows[w].feedcontent == wevalres.rows[w].rightanswer) {
+                wevalres.rows[w].scoingStatus = true
+                // 学生回答与参考答案一样，则：得分=分值
+                wevalres.rows[w].teacherRating = wevalres.rows[w].score
+              } else {
+                wevalres.rows[w].scoingStatus = false
+              }
+            } else {
+              wevalres.rows[w].scoingStatus = ''
+            }
+            // 计算得分
+          }
+          // "回答" prop="feedcontent" width="200" align="center"></el-table-column>
+          // <el-table-column label="参考答案" prop="rightanswer"
+          //新增了 复合题、主观题（背景+小题目） 题目标题优化一下
+          wevalres.rows[w].worktitle = wevalres.rows[w].worktitle.replace(/!@#\$%/g, '')
+
+          // 将feedcontent中的\r替换为<br />
+          wevalres.rows[w].feedcontent = wevalres.rows[w].feedcontent.replace(/(?<!\\)\n/g, '<br />');    //替换\n而不替换\\n 为 \\n
+        }
+      }
+      classWorkAnalysis.activeStudentQuizlist = wevalres.rows
+      // 加载右边表格
+      isopen_dtwk_table.value = true
+      // 加载右边评语区域
+      if (wevalres.rows.length > 0) {
+        handleClassWorkAnalysissScoreOpen(row)
+      } else {
+        ElMessage({
+          type: 'warning',
+          message: '未获取到答题信息，请稍后再看，或者联系管理员查看情况！'
+        })
+      }
+    })
+    .catch(() => {
+      console.log('获取答题情况失败')
+      ElMessage({
+        type: 'warning',
+        message: '未获取到答题信息！'
+      })
+    })
+}
+/** 3、教师批改后返回的方法*/
+const onClassWorkScoreSubmit = () => {
+  console.log('批改后返回的方法')
+  loading_dt_table.value = true
+  isopen_dtwk_table.value = false
+  // 1、清空答题情况的两个table数据，- 左侧学生列表：classWorkAnalysis.classworkdata；- 右侧学生回答题目列表：classWorkAnalysis.activeStudentQuizlist
+  //  - 左侧学生列表
+  classWorkAnalysis.classworkdata = []
+  classWorkAnalysis.activeStudentQuizlist = []
+  // 2、刷新左侧学生列表数据，更新批改状态
+  const rowid = localStorage.getItem('activeClassWorkRowId')
+  getClassWorkStudentList(rowid)
+}
+// 查看并批改一个学生的题目作答(答题题目分析与评价)
+const handleClassWorkAnalysissScoreOpen = (row) => {
+  console.log(row, '所选点击的信息')
+
+  // 当前学生的回答list
+  classWorkAnalysisScore.studentQuizAllList = classWorkAnalysis.activeStudentQuizlist
+  // 当前学生的所有题目list
+  classWorkAnalysisScore.quizlist = classWorkAnalysis.quizlist
+  // 格式化试题格式信息
+  processList(classWorkAnalysisScore.quizlist)
+  // 屏幕高度
+  classWorkAnalysisScore.maxheight = mainHeight.value - 100
+
+  // 防止组件未渲染完成 调用里面方法报错
+  nextTick(() => {
+    proxy.$refs.classWorkAnalysisScoreDialogRef.acceptParams(classWorkAnalysisScore)
+  })
+}
+//#endregion
+
+/** 批阅：已交未交事件 */
+const tableRadioChange = (e) => {
+  // 关闭右侧批阅ui
+  isopen_dtwk_table.value = false;
+  console.log(e,'??????')
+  console.log("学生列表：", classWorkAnalysis.classworkdata)
+  if(e=='1'){
+    tableRadio.list = classWorkAnalysis.classworkdata.filter(item => item.finishtimelength != '0')
+    tableRadio.value = '1';
+    tableRadio.num0 = classWorkAnalysis.classworkdata.length - tableRadio.list.length;
+    tableRadio.num1 = tableRadio.list.length;
+  }else if(e=='0'){
+    tableRadio.list = classWorkAnalysis.classworkdata.filter(item => item.finishtimelength == '0')
+    tableRadio.value = '0';
+    tableRadio.num0 = tableRadio.list.length;
+    tableRadio.num1 = classWorkAnalysis.classworkdata.length - tableRadio.list.length;
+  }
+}
+
+// 将标签中的双引号增加转义
+const escapeHtmlQuotes = (str) => {
+  // 后端已replace双引号, 故前端不用在处理
+  const regex1 = /\\+/g;  // 匹配多个反斜杠
+  let result = str.replace(regex1, '\\');
+  result = str.replace(/(?<!\\)\n/g, '<br />');    //替换\n而不替换\\n 为 \\n
+
+  return result;
+}
+
+//#region 逐题分析
+// 查看学生-作业概览
+const workHandle = (type) => {
+  // 关闭右侧批阅ui
+  isopen_dtwk_table.value = false;
+  classWorkAnalysis.view = type
+  const isClose = type != 'quizStats' && !! classWorkActiveData.timerId
+  const isOpen = type == 'quizStats' && !classWorkActiveData.timerId
+  // 每次进来都重新调用一次
+  if(type == 'quizStats') {
+    getWorkFeedList();
+  }
+  if (isClose) clearInterval(classWorkActiveData.timerId) // 关闭定时器
+  if (isOpen) {
+    // 轮询 更新学生作答数据
+    classWorkActiveData.timerId = setInterval(() => {
+      console.log('zdg: 定时执行')
+      getWorkFeedList()
+    }, 20 * 1000);
+  }
+}
+// 获取学生答题回馈数据-更新
+const getWorkFeedList = async() =>{
+  const workid = classWorkAnalysis.row.id
+  const res = await listClassworkeval({workid, isFinish: 1, pageSize: 1000})
+  const getStudentid = (workdataid) => { // 获取学生id
+    const classworkdata = (classWorkAnalysis.classworkdata||[]).find(o => o.id === workdataid)
+    return classworkdata ? classworkdata.studentid : ''
+  }
+  res.rows.forEach(o => { o.studentid = getStudentid(o.workdataid) })
+  classWorkActiveData.workFeedList = res.rows
+}
+//#endregion
+
+
+//#regin 整体分析
+/*
+  author: yangws
+  time: 2024-8-06 16:35:33
+  function: 整体分析的处理
+*/
+const handleClassOverviewOpen = (type) =>{
+  // 关闭右侧批阅ui
+  isopen_dtwk_table.value = false;
+  classWorkAnalysis.view = type
+  const data = classWorkAnalysis.row
+  //获取所有学生列表
+  listClassworkdata({classworkid: data.id, pageSize: 100}).then((response) => {
+    if(response.code === 200){
+      response.rows.forEach(item => {
+        let rightAnswer = 0
+        let answers = 0
+        if(!item.classworkevallist) return
+        // 使用正则表达式替换字符串值中的双引号为单引号
+        let replacedString = item.classworkevallist.replace(/""/g, "\"");
+        // 将标签中双引号改为转义, 测试数据: "{\"id\":172907, \"rating\":0, \"teacherRating\":0, \"entpcourseworkid\":358520, \"feedcontent\":\"④①⑤③②\", \"score\":4, \"rightanswer\":\"④①⑤③②\"},{\"id\":172908, \"rating\":0, \"teacherRating\":0, \"entpcourseworkid\":358521, \"feedcontent\":\"气壮山威，鲲鹏展翅楚云飞\", \"score\":4, \"rightanswer\":\"志远天高，春风杨柳麓山青\"},{\"id\":172909, \"rating\":0, \"teacherRating\":0, \"entpcourseworkid\":363096, \"feedcontent\":\"《红烛》化用“蜡矩”这一古典意象，赋予它新的含义，赞美了红烛以“蜡炬成灰”来点亮世界的奉献精神。\", \"score\":4, \"rightanswer\":\"《立在地球边上放号》中，全诗采用间接抒情的方式，描绘了太平洋的浪潮，吟唱了一曲惊心动魄的力的颂歌，意在赞美摧毁旧世界、创造新生活的“五四”精神。\"},{\"id\":172910, \"rating\":0, \"teacherRating\":0, \"entpcourseworkid\":363098, \"feedcontent\":\"毛泽东重游橘子洲，面对如画的秋色和大好的革命形势，回忆过去战斗的岁月，不禁心潮起伏，<bdo class=\"mathjye-underpoint2\">浮想联翩</bdo>。\", \"score\":4, \"rightanswer\":\"毛泽东重游橘子洲，面对如画的秋色和大好的革命形势，回忆过去战斗的岁月，不禁心潮起伏，<bdo class=\"mathjye-underpoint2\">浮想联翩</bdo>。\"},{\"id\":172911, \"rating\":0, \"teacherRating\":0, \"entpcourseworkid\":363100, \"feedcontent\":\"毛泽东重游橘子洲，面对如画的秋色和大好的革命形势，回忆过去战斗的岁月，不禁心潮起伏，<bdo class=\"mathjye-underpoint2\">浮想联翩</bdo>。\", \"score\":4, \"rightanswer\":\"毛泽东重游橘子洲，面对如画的秋色和大好的革命形势，回忆过去战斗的岁月，不禁心潮起伏，<bdo class=\"mathjye-underpoint2\">浮想联翩</bdo>。\"}"
+        replacedString = escapeHtmlQuotes(item.classworkevallist);
+        let allTopic
+        try{
+          allTopic = JSON.parse(`[${item.classworkevallist}]`)
+        }catch{
+          allTopic = JSON.parse(`[${replacedString}]`)
+        }
+        if(item.classworkevallist != ''){
+          allTopic.forEach(itemTopic => {
+            if(itemTopic.feedcontent != ''){
+              answers ++
+              //正确答案，仅限单选题
+              if(itemTopic.feedcontent === itemTopic.rightanswer){
+                rightAnswer ++
+              }
+            }
+          })
+          rightAnswer > 0?item.scoingRate = (rightAnswer/answers * 100).toFixed(0):item.scoingRate = ''
+        }else{
+          item.scoingRate = ''
+        }
+        //获得总分
+        const point = allTopic.reduce((acc, cur) => {
+          if(cur.rating !== 0){
+            return acc + cur.teacherRating;
+          }
+        },0)
+        // item.chapter = this.courseObj.evalid
+        item.point = point || 0
+        item.rating = allTopic[0].rating
+
+      })
+      overviewData.value = [...response.rows]
+    }
+  })
+}
+
+//#endregion
+
+const onBeforeClose = () =>{
+  console.log('非正常关闭dialog?esc、dialog外部区域')
+  closeDialog()
+}
+const closeDialog = () => {
+  classWorkAnalysis.open = false
+  emit('cle-click')
+}
+
+watch(classWorkAnalysis, (newVal, oldVal) => {
+  if(newVal.view != 'quizStats'){
+    console.log('关闭zdg: 定时执行')
+    clearInterval(classWorkActiveData.timerId) // 关闭定时器 逐题分析的
+  }
+})
+
+onUnmounted(() => {
+  clearInterval(classWorkActiveData.timerId) // 关闭定时器 逐题分析的
+})
+
+defineExpose({
+  openDialog,
+})
+</script>
+
+<style src="@/assets/styles/JYStyle.css"></style>
+
+<style scoped lang="scss">
+/*:deep(.reserv-date-pick) {
+  width: 140px;
+}
+:deep(.reserv-time-pick) {
+  width: 240px;
+}*/
+.clwk_dialog {
+  .clwk_dialog_view {
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-start;
+    overflow: hidden;
+  }
+  .view_table {
+    flex: 0 0 auto;
+    height: 100%;
+    overflow: hidden;
+  }
+  .view_teachrting {
+    flex: 1;
+    height: 100%;
+    /*overflow-y: auto; */
+    overflow: hidden;
+  }
+}
+
+.clwk_dialog {
+  display: flex;
+  justify-content: center;
+  overflow: hidden;
+}
+.clwk_dialog .el-dialog {
+  margin: 0 auto !important;
+  height: 85%!important;
+  overflow: hidden;
+}
+.clwk_dialog .el-dialog__header {
+  /* position: absolute;
+  top: 0;
+  left: 0; */
+  width: 100%!important;
+}
+.clwk_dialog .el-dialog__body {
+  position: absolute;
+  left: 0;
+  top: 15px;
+  bottom: 1px;
+  right:0;
+  padding:5px;
+  z-index:1;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+  /* overflow:hidden;
+  overflow-y: auto; */
+}
+.clwk_dialog .el-dialog__footer{
+  position: absolute;
+  bottom: 10px;
+  right: 10px;
+}
+.clwk_dialog .classwork-score{
+  overflow-y: auto;
+}
+</style>
+
+<style scoped>
+.clwk_dialog {
+  display: flex;
+  justify-content: center;
+  overflow: hidden;
+}
+.clwk_dialog .el-dialog {
+  margin: 0 auto !important;
+  height: 85%!important;
+  overflow: hidden;
+}
+.clwk_dialog .el-dialog__header {
+  /* position: absolute;
+  top: 0;
+  left: 0; */
+  width: 100%!important;
+}
+.clwk_dialog .el-dialog__body {
+  position: absolute;
+  left: 0;
+  top: 15px;
+  bottom: 1px;
+  right:0;
+  padding:5px;
+  z-index:1;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+  /* overflow:hidden;
+  overflow-y: auto; */
+}
+.clwk_dialog .el-dialog__footer{
+  position: absolute;
+  bottom: 10px;
+  right: 10px;
+}
+.clwk_dialog .classwork-score{
+  overflow-y: auto;
+}
+</style>

src/renderer/src/views/classTask/container/newTask/taskTypeView.vue

@@ -21,7 +21,7 @@
             <div v-if="classWorkForm.worktype == '课堂展示'" style="height: 100%; display: flex; flex-direction: column;">
               <div style="flex: 0 0 auto;">
                 <el-form-item label="问题">
-                  <el-input v-model="classWorkForm.question" type="text" placeholder="请输入问题" />
+                  <el-input v-model="classWorkForm.title" type="text" placeholder="请输入问题" />
                 </el-form-item>
               </div>
               <div v-loading="boardLoading" class="board-wrap" style="height: 100%; flex: 1; overflow: hidden;">
@@ -55,7 +55,6 @@
                       <el-col :span="11">
                         <el-form-item label="知识点" label-width="70">
                           <el-cascader 
-                            disabled
                             v-model="entpCourseWorkQueryParams.point"
                             clearable
                             style="width: 100%"
@@ -90,13 +89,8 @@
                       </el-col>
                     </el-row>
                     <!-- 习题表格 -->
-                    <div class="infinite-list-wrapper" >
+                    <div class="middle" > 
-                      <el-table 
+                      <el-table :data="workResource.entpCourseWorkList" style="width: 100%; height: 100%;">
-                        :data="workResource.entpCourseWorkList" 
-                        style="width: 100%; height: 100%;"
-                        v-loading="pageParams.loading"
-                        ref="tableRef"
-                      >
                         <el-table-column type="index" width="60" />
                         <el-table-column align="left" >
                           <template #header>
@@ -105,7 +99,7 @@
                             </div>
                           </template>
                           <template #default="scope">
-                            <div @click="showExamAnalyseDrawer(scope.row)">
+                            <div>
                               <div style="overflow: hidden; text-overflow: ellipsis" v-html="scope.row.titleFormat"></div>
                               <div style="overflow: hidden; text-overflow: ellipsis; font-size: 0.9em; margin-top: 6px;" v-html="scope.row.workdescFormat"></div>
                               <el-col :span="24" style="display: flex">
@@ -121,54 +115,17 @@
                           </template>
                         </el-table-column>
                       </el-table>
-                      
-                      <!-- <ul 
-                        v-infinite-scroll="pageLoad" 
-                        class="infinite-list" 
-                        infinite-scroll-immediate="false" 
-                        infinite-scroll-distance='100'
-                        infinite-scroll-delay="1000"
-                        :infinite-scroll-disabled="pageDisabled"
-                      >
-                        <li v-for="(item,index) in workResource.entpCourseWorkList" :key="item" class="infinite-list-item">
-                          <div align="left" style="width: 100%;" >
-                            <div @click="showExamAnalyseDrawer(item)">
-                              <div>
-                                <span style="width: 20px;">{{ index +1 }}. </span>
-                                <span style="overflow: hidden; text-overflow: ellipsis" v-html="item.titleFormat"></span>
-                              </div>
-                              <div style="overflow: hidden; text-overflow: ellipsis; font-size: 0.9em; margin-top: 6px;" v-html="item.workdescFormat"></div>
-                              <el-col :span="24" style="display: flex">
-                                <div style="font-size: 1em; color: silver; padding-top: 5px">{{ item.entpname }} {{ item.editusername }}</div>
-                                <div style="margin-left: 30px; font-size: 1em; color: silver; padding-top: 5px">{{ item.worktag }}</div>
-                              </el-col>
-                            </div>
-                          </div>
-                          <div align="right" style="width: 72px;">
-                            <el-button type="primary" @click="handleClassWorkQuizAdd('entpcourseworklist', item.id)">添加</el-button>
-                          </div>
-
-                        </li>
-                      </ul>
-                      <p class="infinite-list-loading" v-if="pageParams.loading">加载中...</p>
-                      <p class="infinite-list-noMove" v-if="pageNoMore">无更多试题...</p>
-                      <div v-if="workResource.entpCourseWorkList.length == 0 && !pageParams.loading">
-                        <el-empty
-                          description="未找到相关试题"
-                          style="width: 100%; height: 200px; margin-top: 20px;"
-                        ></el-empty>
-                      </div> -->
                     </div>
                     <!-- 分页 这里不用-->
-                    <div style="height: 55px;">
+                    <!-- <div style="height: 55px;">
-                      <el-pagination
+                      <pagination
-                        v-show="pageParams.total > 0"
+                        v-show="entpCourseWorkTotal > 0" 
                         v-model:page="paginationParams.pageNum" 
                         v-model:limit="paginationParams.pageSize"
-                        :total="pageParams.total"
+                        :total="entpCourseWorkTotal" 
                         :style="{ position: 'relative', 'margin-top': '5px' }"
-                        @change="getPaginationList" />
+                        @pagination="getPaginationList" />
-                    </div>
+                    </div> -->
                   </div>
                   <!-- 非习题训练：常规作业、 -->
                   <div v-if="classWorkForm.worktype!='习题训练'">
@@ -267,27 +224,21 @@
 
     <!-- 预览框 -->
     <prevReadMsgDialog ref="prevReadMsgDialogRef" :bookobj="props.bookobj"/>
-
-    <!-- 试题详细信息 -->
-    <examDetailsDrawer ref="examDetailsDrawerRef"></examDetailsDrawer>
   </div>
 </template>
 
 <script setup>
-import { onMounted, ref, nextTick, watch, reactive, getCurrentInstance, computed } from 'vue'
+import { onMounted, ref, nextTick, watch, reactive, getCurrentInstance } from 'vue'
 import { ElMessage } from 'element-plus'
 import { cloneDeep } from 'lodash'
 import { useRouter } from 'vue-router'
-import { Search } from '@element-plus/icons-vue'
 
 import {listEntpcoursework, listEntpcourseworkNew, getEntpcoursework} from '@/api/education/entpCourseWork'
 import { addClassworkReturnId } from '@/api/teaching/classwork'
-import { updateClasswork, listEvaluationclue, listClassworkeval,delClassworkeval,addClassworkeval,updateClassworkeval } from '@/api/classTask'
+import { updateClasswork, listEvaluationclue,readFile, listClassworkeval,delClassworkeval,addClassworkeval,updateClassworkeval } from '@/api/classTask'
 import { listEvaluation } from '@/api/subject'
 import { listEntpcoursefile } from '@/api/education/entpcoursefile'
 import { listKnowledgePoint } from "@/api/knowledge/knowledgePoint";
-import { isJson } from "@/utils/comm";
-
 
 import { useGetHomework } from '@/hooks/useGetHomework'
 import { processList } from '@/hooks/useProcessList'
@@ -295,10 +246,7 @@ import { getCurrentTime } from '@/utils/date'
 import FileUpload from "@/components/FileUpload/index.vue";
 import whiteboard from '@/components/whiteboard/whiteboard.vue'
 import prevReadMsgDialog from '@/views/classTask/container/newTask/prevReadMsg-Dialog.vue'
-import examDetailsDrawer from '@/components/exam-question/examDetailsDrawer.vue'
-import { JYApiListCT, JYApiListOriginYear, JYApiListSO} from "@/utils/examQuestion/jyeoo"
 
-import {throttle,debounce } from '@/utils/comm'  
 import { useToolState } from '@/store/modules/tool'
 import useUserStore from '@/store/modules/user'
 const userStore = useUserStore().user
@@ -401,35 +349,15 @@ let classWorkForm =  reactive({
   chooseWorkLists: props.propsformobj.chooseWorkLists?cloneDeep(props.propsformobj.chooseWorkLists):[], // 作业框架梳理list
   fileHomeworkList: props.propsformobj.fileHomeworkList?cloneDeep(props.propsformobj.fileHomeworkList):[], // 常规作业文件列表
   whiteboardObj: props.propsformobj.whiteboardObj?cloneDeep(props.propsformobj.whiteboardObj):'', // 作业资源 - 课堂展示 白板
-  question: props.propsformobj.question?cloneDeep(props.propsformobj.question):'', // 作业资源 - 课堂展示 输入的问题
 }); // 提交的作业内容
 // ---------------------------------------------------
-// const listWorkType = ref(['习题训练', '框架梳理', '课堂展示', '常规作业']); //作业类型
+const listWorkType = ref(['习题训练', '框架梳理', '课堂展示', '常规作业']); //作业类型
-const listWorkType = ref(['习题训练', '课堂展示', '常规作业']); //作业类型
 
 // 课堂展示-------
 const boardLoading = ref(false);
 //常规作业----------
 const fileLoading = ref(false); // 常规作业loading
 
-// 下拉滚动参数
-
-// const BASE_LIMIT_COUT = 50;   // 总加载额外试题数
-// const pageNoMore = computed( () => {
-//   if (pageParams.value.total < 1) {
-//     return false;
-//   }
-//   let count = BASE_LIMIT_COUT >= pageParams.value.total ? pageParams.value.total : pageParams.value.originCount+BASE_LIMIT_COUT;
-//   return workResource.entpCourseWorkList.length >= count;
-// });
-// const pageDisabled  = computed(() => pageParams.value.loading || pageNoMore.value);
-const pageParams = ref({
-  loading: false,     // 是否正在加载中
-  originCount: 0,     // 初始条目数量
-  isFirst: true,      // 是否是第一次加载
-  total: 0,
-})
-
 /***
  * 作业类型切换
  */
@@ -447,33 +375,9 @@ const changeFormType = (val) => {
 const handleQueryParamFromEntpCourseWork = (queryType) => {
   // 确保更改了搜索参数后从第一页开始查询
   // this.paginationParams = {pageNum: 1,pageSize: 10}; 分页这里展示弃用了
-  // 清空作业列表
-  initPageParams();
   handleQueryFromEntpCourseWork(queryType);
 };
 
-let obj = {};
-
-function Apis(key) {
-   obj[key] = [];
-   return function(task) {
-     return new Promise((resolve, reject) => {
-         obj[key].push(task);
-         Promise.all([...obj[key]]).then(res => {
-           const i = obj[key].findIndex(item => {
-             return item == task;
-           });
-           resolve(obj[key][i]);
-           //arr.splice(i, 1);
-         })
-     })
-   }
- }
- 
- 
- const client = new Apis('/paht');
-
-
 /**
  * @desc: 1、习题训练 -  新查询试题
  * @return: {*}
@@ -482,15 +386,13 @@ function Apis(key) {
  * 1  -  按条件查询
  * 2  -  按关键词查询
  */
- const t = function(name, time) {
+const handleQueryFromEntpCourseWork= (queryType) => {
-   return new Promise(resolve => {
+  //queryForm.pageNum = this.paginationParams.pageNum;
-    const evalId = props.bookobj.levelSecondId=='' ? props.bookobj.levelFirstId : props.bookobj.levelSecondId;
+  //queryForm.pageSize = this.paginationParams.pageSize;
+
   const queryForm = {
-      // 分页参数
-      currentPage: paginationParams.pageNum,
-      pageSize: paginationParams.pageSize,
     // 课程相关参数
-      eid: evalId,
+    eid: props.bookobj.levelSecondId,
     sectionName: props.bookobj.coursetitle,
     edusubject: userStore.edusubject,
     edustage: userStore.edustage,
@@ -503,18 +405,15 @@ function Apis(key) {
     // 年份
     yearStr: entpCourseWorkQueryParams.yearStr !== '-1' ? entpCourseWorkQueryParams.yearStr:'',
     // 知识点
-      thirdId: entpCourseWorkQueryParams.point && entpCourseWorkQueryParams.point.length > 0 ? entpCourseWorkQueryParams.point[0]:'',
+    thirdId: entpCourseWorkQueryParams.point.length > 0 ? entpCourseWorkQueryParams.point[0]:'',
     // 关键字
     keyword: entpCourseWorkQueryParams.keyWord && entpCourseWorkQueryParams.keyWord !== '' ? entpCourseWorkQueryParams.keyWord:'',
 
   }
-    const entpcourseworkres = listEntpcourseworkNew(queryForm);
   
-    resolve(entpcourseworkres);
+  // 分页参数
-   })
+  // pageNum: paginationParams.pageNum,
-  }
+  // pageSize: paginationParams.pageSize,
-const handleQueryFromEntpCourseWork= async (queryType) => {
-  pageParams.value.loading = true;
 
   // 初中政治特殊处理( warn: 需确认是否修改 )
   // if (this.courseObj.edusubject=='政治' && this.courseObj.edustage=='初中') {
@@ -522,45 +421,35 @@ const handleQueryFromEntpCourseWork= async (queryType) => {
   //   queryForm.edusubject = '道德与法治';
   // }
   
-  client(t('任务1', 1500)).then(res => {
+  listEntpcourseworkNew(queryForm).then(entpcourseworkres => {
-    //console.log("请求返回",res);
+    // if (queryType == 1 && this.entpCourseWorkQueryParams.worktype == '主观题') {
-    // if(paginationParams.pageNum == 1){
+    //   // 因菁优网题型因学科而不固定, 故非常规题重定义定为【主观题】
-    //   workResource.entpCourseWorkList = [];
+    //   const allowedWorkTypes = ['单选题', '填空题', '多选题', '判断题', '复合题'];
-    //   workResource.entpCourseWorkTotal = 0;
+    //   workResource.entpCourseWorkList = entpcourseworkres.rows.filter(item => {
-
+    //     return !allowedWorkTypes.includes(item.worktype);
-    //    // 初始化下拉滚动条参数
+    //   });
-    //   // pageParams.value.loading = false;
+    // } else {
-    //   // pageParams.value.isFirst = true;
+    //   workResource.entpCourseWorkList = entpcourseworkres.rows;
-    //   // pageParams.value.originCount = 0;
     // }
-    const data = res.data || [];
-    if(data && data.length>0){
-    // workResource.entpCourseWorkList = entpcourseworkres.data;
-    // workResource.entpCourseWorkTotal = entpcourseworkres.data.length;
     
-      data.forEach(item=> {
+    if(entpcourseworkres.data&&entpcourseworkres.data.length>0){
+      workResource.entpCourseWorkList = entpcourseworkres.data;
+      workResource.entpCourseWorkTotal = entpcourseworkres.data.length;
+
+      workResource.entpCourseWorkList.forEach(item=> {
         if (item.worktype == '选择题') {
           item.worktype = '单选题'
         }
       })
 
+
       //格式化试题信息
-      processList(data);
+      processList(workResource.entpCourseWorkList);
-      //workResource.entpCourseWorkList.push(...data);    
+    }else{
-      workResource.entpCourseWorkList = data;
+      workResource.entpCourseWorkList = [];
-
+      workResource.entpCourseWorkTotal = 0
-      // 初次加载时更新当前试题数量
-      if (pageParams.value.isFirst) {
-        pageParams.value.isFirst = false;
-        pageParams.value.originCount = workResource.entpCourseWorkList.length;
-        pageParams.value.total = parseInt(res.msg);
-        paginationParams.pageNum = Math.ceil(parseInt(res.msg)/paginationParams.pageSize);
-        //console.log('first->', pageParams.value, paginationParams);
     }
-    }
+  })
-    pageParams.value.loading = false;
-  });
-  
 }
 
 // 教学资源，从课标分析、教材分析里来
@@ -585,14 +474,10 @@ const getQueryFromEvaluationclue = () => {
       }
 
       if (clueres.rows[i].childlist != '') {
-        const tmpJson = '['+clueres.rows[i].childlist+']';
+        clueres.rows[i].childArray = JSON.parse('['+clueres.rows[i].childlist+']');
-        if (isJson(tmpJson)){
-          clueres.rows[i].childArray = JSON.parse(tmpJson);
         for (var j=0; j<clueres.rows[i].childArray.length; j++) {
           clueres.rows[i].childArray[j].title = clueres.rows[i].childArray[j].title.replace(/(<([^>]+)>)/ig, '');
         }
-        }
-        
       } else {
         clueres.rows[i].childArray = {};
       }
@@ -752,7 +637,6 @@ const handleClassWorkSave = async () => {
         let canvasJson = proxy.$refs.boardref.getCanvasJson()
         let canvasBase64 = await proxy.$refs.boardref.getCanvasBase64()
         // 课堂展示提交内容
-        cform.worktag = classWorkForm.question;
         cform.title = classWorkForm.title; 
         cform.workcodes = JSON.stringify({json: canvasJson, base64: canvasBase64});
         cform.entpcourseworklist = JSON.stringify([{'id':-1, 'score': '10'}]);
@@ -763,13 +647,21 @@ const handleClassWorkSave = async () => {
             classWorkForm.worktype = "课堂展示";
             classWorkForm.uniquekey = props.propsformobj.uniquekey, // 作业唯一标识 作业名称
             classWorkForm.title = "";
-            classWorkForm.question = "";
             classWorkForm.quizlist = [], // 作业习题列表内容
 
             // 情况选择的资源缓存
             classWorkForm.chooseWorkLists = []; // 框架梳理list
             classWorkForm.whiteboardObj = ''; // ? // 清空白板
+            // refresh the list
+            //这里分离了，所以不需要更新表单数据了
+            // this.getClassWorkAllList();
 
+            // TODO 后续看是否跳转到 作业布置页面
+
+            //TODO 下面3个后续看是啥
+            // this.newWorkSpace = false;
+            // this.newWorkSpaceEdit = false;
+            // this.workEdit = false;
             boardLoading.value = false
           })
         } finally {
@@ -793,6 +685,16 @@ const handleClassWorkSave = async () => {
             classWorkForm.chooseWorkLists = []; // 框架梳理list
             classWorkForm.whiteboardObj = ''; // ? // 清空白板
             classWorkForm.fileHomeworkList = []; // 常规作业list
+            // refresh the list
+            //这里分离了，所以不需要更新表单数据了
+            // this.getClassWorkAllList();
+
+            // TODO 后续看是否跳转到 作业布置页面
+
+            //TODO 下面3个后续看是啥
+            // this.newWorkSpace = false;
+            // this.newWorkSpaceEdit = false;
+            // this.workEdit = false;
 
             fileLoading.value = false
           })
@@ -955,7 +857,6 @@ const editWork = async (cform) =>{
     let canvasJson = proxy.$refs.boardref.getCanvasJson()
     let canvasBase64 = await proxy.$refs.boardref.getCanvasBase64()
     cform.workcodes = JSON.stringify({json: canvasJson, base64: canvasBase64});
-    cform.worktag = classWorkForm.question;
   }
   else if (classWorkForm.worktype=='常规作业') {
     // 1.更新作业任务下的课堂展示内容 (这里未做校验, 直接将当前文件对象更新过去)
@@ -971,96 +872,10 @@ const editWork = async (cform) =>{
   }
 }
 
-/**
+
- * 查看试题详细信息
+
- * @param row 单题数据
+onMounted(() => {
- */
-const showExamAnalyseDrawer = (row) => {
-  nextTick(() => {
-    const activeParams = {
-      activeExam: row,
-    }
-    proxy.$refs.examDetailsDrawerRef.acceptParams(activeParams);
 })
-}
-
-const tableRef = ref();
-const getPaginationList = ( page, limit ) => {
-  paginationParams.pageNum = page;
-  paginationParams.pageSize = limit;
-  //console.log(page, limit)
-  handleQueryFromEntpCourseWork(0);
-  // 重置滚动条至顶部
-  tableRef.value.setScrollTop(0);
-}
-
-const pageLoad = async() => {
-  console.log("加载中...")
-  paginationParams.pageNum ++ ,
-  //paginationParams.pageSize = 2,
-  await handleQueryFromEntpCourseWork(0);
-}
-
-const initPageParams = () => {
-  // 初始化作业习题列表
-  workResource.entpCourseWorkList = [];
-  workResource.entpCourseWorkTotal = 0
-
-  // 初始化下拉滚动条参数
-  pageParams.value.loading = false;
-  pageParams.value.isFirst = true;
-  pageParams.value.originCount = 0;
-  pageParams.value.total = 0;
-
-  // 初始化分页参数
-  paginationParams.pageNum = 1;
-  paginationParams.pageSize = 10;
-}
-
-
-onMounted(async() => {
-  // 获取当前学科下的试题题型
-  const name = userStore.edustage + userStore.edusubject;
-  const jyCT = await JYApiListCT(proxy, name);
-  if (jyCT.length == 0) {
-    ElMessage.error('获取题型失败!');
-    return;
-  }
-  entpCourseWorkTypeList.value = jyCT;
-  // 获取当前学科下的试题年份
-  entpCourseWorkYearList.value = JYApiListOriginYear();
-  entpCourseWorkGroupList.value = await JYApiListSO(proxy, name);
-
-})
-
-// const refreshData = () => {
-//   console.log("刷新数据")
-//   // 初始化滚动加载参数
-//   initPageParams();
-//   // 习题资源
-//   handleQueryFromEntpCourseWork(0);
-//   // 框架梳理
-//   getQueryFromEvaluationclue();
-//   // 知识点
-//   getEntpCourseWorkPointList();
-// }
-// // 结合防抖和节流
-// const debounceQueryData = debounce(throttle(refreshData, 1000), 1000);
-
-
-
-// 防抖
-const debounceQueryData = debounce(() => {
-  console.log("防抖 加载数据中...")
-  // 初始化滚动加载参数
-  initPageParams();
-  // 习题资源
-  handleQueryFromEntpCourseWork(0);
-  // 框架梳理
-  getQueryFromEvaluationclue();
-  // 知识点
-  getEntpCourseWorkPointList();
-}, 1000);
 
 watch(() => props.propsformobj.uniquekey, (newVal) => {
   console.log(props.propsformobj,'propsformobj')
@@ -1068,29 +883,15 @@ watch(() => props.propsformobj.uniquekey, (newVal) => {
     classWorkForm.uniquekey = props.propsformobj.uniquekey?cloneDeep(props.propsformobj.uniquekey):''; // 作业唯一标识 作业名称
   }
 })
-watch(
+watch(() => props.bookobj.levelSecondId, (newVal) => {
-  [
-    () => props.bookobj.levelSecondId,
-    () => props.bookobj.levelFirstId
-  ],
-  ([newLevelSecondId, newLevelFirstId], [oldLevelSecondId, oldLevelFirstId]) =>  {
-    if(props.bookobj.node.edusubject == '英语' && props.bookobj.node.edustage == '高中'){
-      if(newLevelFirstId != oldLevelFirstId){
-        console.log(props.bookobj,'高中英语-课程选择')
-        debounceQueryData();
-      }
-      else{
-        // 习题清空
-        workResource.entpCourseWorkList = [];
-        return;
-      }
-    }
-    else{
   console.log(props.bookobj,'课程选择')
-      debounceQueryData();
+  // 习题资源
-    }
+  handleQueryFromEntpCourseWork(0);
+  // 框架梳理
+  getQueryFromEvaluationclue();
+  // 知识点
+  getEntpCourseWorkPointList();
 })
-
 </script>
 
 <style lang="scss" scoped>
@@ -1178,46 +979,6 @@ watch(
     box-sizing: border-box;
     background-color: rgb(231, 231, 231)
   }
-  .infinite-list-wrapper{
-    height: 100%;
-    text-align: center;
-    overflow: auto;
-
-    .infinite-list {
-      padding: 0;
-      margin: 0;
-      list-style: none;
-
-      .infinite-list-item {
-        display: flex;
-        align-items: center;
-        //justify-content: center;
-        //height: 50px;
-        //background: var(--el-color-primary-light-9);
-        padding: 10px;
-        border-top: 1px solid #eee;
-        //color: var(--el-color-primary);
-      }
-      .infinite-list-item:hover {
-        background-color: #F3F5F8;
-      }
-
-      .infinite-list-item + .list-item {
-        margin-top: 10px;
-      }
-    }
-
-    .infinite-list-loading{
-      padding: 10px 0;
-      border-top: 1px solid #eee;
-      color: red;
-    }
-    .infinite-list-noMove{
-      padding: 10px 0;
-      border-top: 1px solid #eee;
-      color: #999;
-    }
-  }
 
 }
 </style>

src/renderer/src/views/classTask/container/quizStats.vue

@@ -1,9 +1,9 @@
 <template>
   <el-row class="c-warp" :gutter="10">
-    <el-col class="left" :span="10">
+    <el-col class="left" :span="14">
-      <el-collapse class="c-item" v-model="activeTopic" accordion>
+      <el-collapse class="c-item" v-model="activeTopic">
         <template v-for="(item, index) in dataList">
-          <el-collapse-item class="collapse-item" :name="index+1" :id="'collapse-'+(index+1)" @click="clickItem(index)">
+          <el-collapse-item class="collapse-item" :name="index+1" :id="'collapse-'+(index+1)">
             <template #title>
               <el-popover :width="500" placement="right">
                 <p>{{item.def?.titletext}}</p>
@@ -54,13 +54,13 @@
         </template>
       </el-collapse>
     </el-col>
-    <el-col class="right" :span="14">
+    <el-col class="right" :span="10">
       <div class="c-item">
-        <!-- <div class="title">提交情况</div>
+        <div class="title">提交情况</div>
         <div class="respond">
-          <el-space wrap> -->
+          <el-space wrap>
             <!-- <template v-for="it in 11"> -->
-            <!-- <template v-for="(item, index) in dataList">
+            <template v-for="(item, index) in dataList">
               <el-card shadow="hover" class="card-warp">
                 <div class="card-body">
                   <el-progress type="dashboard" :color="colorArr" :width="80" :percentage="ratio_2(item)" />
@@ -70,41 +70,7 @@
               </el-card>
             </template>
           </el-space>
-        </div> -->
-
-        <div class="title">试题详情</div>
-        <!-- 习题训练 -->
-        <el-card class="item-card">
-          <el-row>
-            <el-col :span="24" style="padding: 10px">
-              <!-- 题源、题目标题、题目选项 -->
-              <span>{{ activeExam.worktag }}</span>
-              <span v-html="activeExam.titleFormat"></span>
-              <div :span="24" style="padding: 12px 6px 2px" v-html="activeExam.workdescFormat"></div>
-              <!-- 折叠： 详情分析解答 -->
-              <div class="demo-collapse">
-                <el-collapse v-model="activeExamFlag" class="custom-collapse">
-                  <el-collapse-item title="详情分析解答" name="1">
-                    <el-row style=" padding: 4px; border: 2px dotted;">
-                      <template #default="scope">
-                        <el-col :span="3"  style="padding: 4px 0px"><em>【答案】</em></el-col>
-                        <el-col :span="21" style="padding: 4px 0px" v-html="activeExam.workanswerFormat"></el-col>
-                        <el-col :span="3"  style="padding: 4px 0px"><em>【分析】</em></el-col>
-                        <el-col :span="21" style="padding: 4px 0px"  v-html="activeExam.method"></el-col>
-                        <el-col :span="3"  style="padding: 4px 0px"><em>【解答】</em></el-col>
-                        <el-col :span="21" style="padding: 4px 0px" v-html="activeExam.analyse"></el-col>
-                        <el-col :span="3"  style="padding: 4px 0px"><em>【点评】</em></el-col>
-                        <el-col :span="21" style="padding: 4px 0px" v-html="activeExam.discuss"></el-col>
-                        <!-- <el-col :span="21" style="padding: 4px 0px" v-html="dataList[activeTopic-1].def.discuss"></el-col> -->
-                      </template>
-                    </el-row>
-                  </el-collapse-item>
-                </el-collapse>
         </div>
-            </el-col>
-          </el-row>
-        </el-card>
-        
       </div>
     </el-col>
   </el-row>
@@ -118,9 +84,7 @@ import { ref, defineExpose, onMounted, reactive, computed, watch, nextTick, watc
 // import * as elementPlus from 'element-plus' // ElMessage ElMessageBox
 let colorArr = []                 // 进度颜色值         -- 静态数据
 // const attrs = useAttrs()          // props中未定义属性
-const activeTopic = ref(1)        // 展开的题
+const activeTopic = ref(0)        // 展开的题
-const activeExam = ref({})     // 展开的试题
-const activeExamFlag = ref(['1'])     // 展开的试题
 let dataList = ref([])            // 左侧数据
 let studentList = ref([])         // 学生数据
 const props = defineProps({       // 参数 defineProps
@@ -151,10 +115,7 @@ colorArr = [
 
 // === 初始加载完 ===
 onMounted(() => {
-  //activeTopic.value = dataList.value.map((_, index) => index + 1);
+  activeTopic.value = dataList.value.map((_, index) => index + 1);
-  if (dataList.value[activeTopic.value-1].def != null && dataList.value[activeTopic.value-1].def != undefined) {
-    activeExam.value = dataList.value[activeTopic.value-1].def;
-  }
 })
 
 // === 方法(methods) ===
@@ -224,13 +185,8 @@ const initData = () => {
       })
     }
     else if (o.worktype == '填空题') { // 填空题
-      //console.log('填空题->', o.title);
+      const regex = /<!--BA-->(.*?)<!--EA-->/g // 定义正则表达式，匹配 <!--BA-->xxx<!--EA--> 格式的内容
-      let title = o.title.replace(/_{3,}/g, '_____');   //将3-10的下划线统一格式为5个
+      children = (o.title||'').match(regex).map((v,i) => {
-      let regex = /<!--BA-->(.*?)<!--EA-->/g // 定义正则表达式，匹配 <!--BA-->xxx<!--EA--> 格式的内容
-      if (title.indexOf('_____') != -1) {
-        regex = /_{5}/g // 定义正则表达式，匹配 <!--BA-->xxx<!--EA--> 格式的内容
-      }
-      children = (title||'').match(regex).map((v,i) => {
         const def = `填空项 ${i+1}`
         //const code = '(&emsp;)'
         const code = '(略)', txt=v
@@ -323,24 +279,12 @@ const getStudentName = id => studentList.value.length && (studentList.value.find
 // 获取-选中题
 const getActive = ind => activeTopic.value != ind
 
-// 完成情况-点击题
+// 答题情况-点击题
 const clickInfo = async ind => {
   activeTopic.value = activeTopic.value != ind ? ind : 0
   setTimeout(() => {scrollToElement('collapse-' + ind)}, 300);
   // elementPlus.ElMessage.warning('功能未开放!')
 }
-
-// 点击试题
-const clickItem = async (index) => {
-  if (index > dataList.length-1 ) {
-    return
-  }
-  if (dataList.value[index].def == null || dataList.value[index].def == undefined) {
-    return;
-  }
-  activeExam.value = dataList.value[index].def;
-}
-
 // === 通用工具 ===
 // 滚动到指定位置
 const scrollToElement = id => {
@@ -369,14 +313,8 @@ watchEffect(() => { initData() })
   background: #F2F3F5;
   height: 100%;
   margin: 0 !important;
-  .left{
+  .left{padding-left: 0 !important; height: 100%;}
-    padding-left: 0 !important; 
+  .right{padding-right: 0 !important;}
-    height: 100%;
-  }
-  .right{
-    padding-right: 0 !important; 
-    height: 100%;
-  }
   .c-item{
     padding: 10px;
     background: #fff;
@@ -424,7 +362,7 @@ watchEffect(() => { initData() })
       margin-bottom: 10px;
     }
     .respond{
-      /* height: calc(100% - 65px);*/
+      height: calc(100% - 65px);
       overflow: auto;
       .el-space{padding: 5px;}
       .card-warp{
@@ -438,17 +376,6 @@ watchEffect(() => { initData() })
         flex-direction: column;
       }
     }
-    
-    .item-card {
-      max-width: 100%; 
-      margin-bottom: 10px; 
-      text-align: left;
-      font-size: 18px;
-
-      :deep(.el-collapse-item__content){
-        font-size: 18px;
-      }
-    }
   }
 }
 </style>

src/renderer/src/views/classTask/newClassTask.vue

@@ -15,11 +15,11 @@
       <!-- 标题 -->
       <el-row style="align-items: center; margin-bottom: 0px; flex: 0 0 auto">
         <el-col :span="12" style="padding-left: 20px; text-align: left;">
-          <div v-if="!isOpenLeftBook" class="unit-top-left" @click="onOpenLeftBook">
+          <div v-if="!isOpenLeftBook" class="unit-top-left cursor-pointer" @click="onOpenLeftBook">
             <i v-if="isback" class="iconfont icon-xiangzuo cursor-pointer" style="color: blue;" @click="goBack">返回上页</i>
-            <!-- <i v-if="!isCollapse" class="iconfont icon-xiangzuo" style="color: blue;"></i> -->
+            <i v-if="!isCollapse" class="iconfont icon-xiangzuo" style="color: blue;"></i>
-            <span>作业设计</span>
+            <span>课程目录</span>
-            <!-- <i v-if="isCollapse" class="iconfont icon-xiangyou" style="color: blue;"></i> -->
+            <i v-if="isCollapse" class="iconfont icon-xiangyou" style="color: blue;"></i>
           </div>
           <div v-else class="unit-top-left">
             <i class="iconfont icon-xiangzuo cursor-pointer" style="color: blue;" @click="goBack">返回上页</i>
@@ -69,7 +69,6 @@ const classWorkForm =  reactive({
   chooseWorkLists: classtaskObj? JSON.parse(classtaskObj).chooseWorkLists : [],// 设计中的框架梳理list
   fileHomeworkList: classtaskObj? JSON.parse(classtaskObj).fileHomeworkList : [],// 设计中的常规文件作业list
   whiteboardObj: classtaskObj? JSON.parse(classtaskObj).whiteboardObj : '',// 设计中的 课堂展示 板书作业
-  question: classtaskObj? JSON.parse(classtaskObj).question : '',// 设计中的 课堂展示 输入的问题
 })
 
 
@@ -114,7 +113,7 @@ const onOpenLeftBook = () => {
     proxy.$modal.msgError(`当前为编辑状态不可选择课程！`);
   }else{
     // 新增状态
-    // isCollapse.value = !isCollapse.value
+    isCollapse.value = !isCollapse.value
   }
 }
 // 返回上一页---返回布置页面

src/renderer/src/views/classTask/teachClassTask.vue

@@ -3,7 +3,7 @@
     <div class="teachClassTask_header">
       <div style="font-size: 18px; display: flex; flex-wrap: nowrap">
         <div style="flex: 1">
-          {{ classWorkAnalysis.title }}完成情况
+          {{ classWorkAnalysis.title }}答题情况
           <el-tag :type="classWorkAnalysis.workclass" size="large" style="height: 25px">{{
             classWorkAnalysis.worktype
           }}</el-tag>
@@ -23,13 +23,13 @@
               v-if="classWorkAnalysis.row.worktype == '习题训练'"
               :type="classWorkAnalysis.view == 'quizStats' ? 'success' : ''"
               @click="workHandle('quizStats')"
-              >逐题讲评</el-button
+              >逐题分析</el-button
             >
             <el-button
               v-if="classWorkAnalysis.row.worktype == '习题训练'"
               :type="classWorkAnalysis.view == 'report' ? 'success' : ''"
               @click="handleClassOverviewOpen('report')"
-              >训练报告</el-button
+              >整体分析</el-button
             >
           </el-button-group>
         </div>
@@ -77,31 +77,26 @@
                 <span v-if="tableRadio.value==1">{{ scope.row.updatedate }}</span>
               </template>
             </el-table-column>
-            <el-table-column :label="tableRadio.value==0?'':'得分'" prop="score" width="80" align="center" >
+            <el-table-column label="批阅状态" prop="teacherRating" align="center" width="120" sortable>
-              <template #default="scope" v-if="tableRadio.value==1">
-                <span style="color: #2196f3">{{scope.row.getScore || 0}}</span>
-              </template>
-            </el-table-column> 
-            <el-table-column label="批阅状态" prop="rating" align="center" width="120" sortable>
               <template #default="scope">
-                <template v-if="scope.row.rating == 0">
+                <template v-if="scope.row.teacherRating == 0">
                   <span v-if="tableRadio.value==1" style="color: #2196f3">待批阅</span>
                 </template>
                 <!-- 1-优 2-优减 3-良 4-良减 5-差 -->
-                <template v-if="scope.row.rating == 1"
+                <template v-if="scope.row.teacherRating == 1"
-                  ><el-tag type="danger">完美</el-tag></template
+                  ><el-tag type="danger">优</el-tag></template
                 >
-                <template v-if="scope.row.rating == 2"
+                <template v-if="scope.row.teacherRating == 2"
-                  ><el-tag type="danger">优秀</el-tag></template
+                  ><el-tag type="danger">优-</el-tag></template
                 >
-                <template v-if="scope.row.rating == 3"
+                <template v-if="scope.row.teacherRating == 3"
-                  ><el-tag type="warning">良好</el-tag></template
+                  ><el-tag type="warning">良</el-tag></template
                 >
-                <template v-if="scope.row.rating == 4"
+                <template v-if="scope.row.teacherRating == 4"
-                  ><el-tag type="info">及格</el-tag></template
+                  ><el-tag type="info">良-</el-tag></template
                 >
-                <template v-if="scope.row.rating == 5"
+                <template v-if="scope.row.teacherRating == 5"
-                  ><el-tag type="info">不及格</el-tag></template
+                  ><el-tag type="info">差</el-tag></template
                 >
               </template>
             </el-table-column>
@@ -136,15 +131,15 @@
         </div>
       </div>
 
-      <!-- 逐题讲评 -->
+      <!-- 逐题分析 -->
       <div v-else-if="classWorkAnalysis.view == 'quizStats'" style="width: 100%;">
         <quiz-stats :active-data="classWorkActiveData" style="width: 100%;height: 100%;"/>
       </div>
 
-      <!-- 训练报告-->
+      <!-- 整体分析-->
       <div v-else-if="classWorkAnalysis.view == 'report'" style="width: 100%;overflow-y: scroll">
         <!-- <ClassOverview :table-list="overviewData" :eval-id="courseObj.evalid"></ClassOverview> -->
-        <ClassOverview :active-data="classWorkActiveData" :table-list="overviewData" style="width: 100%;"></ClassOverview>
+        <ClassOverview :table-list="overviewData" style="width: 100%;"></ClassOverview>
       </div>
 
     </div>
@@ -162,8 +157,6 @@ import ItemDialogScore from '@/views/classTask/container/classTask/item-dialog-s
 import quizStats from '@/views/classTask/container/quizStats.vue'
 import ClassOverview from '@/views/classTask/container/classOverview.vue'
 import {sessionStore} from '@/utils/store'
-import Chat from '@/utils/chat' // im 登录初始化
-
 
 const { proxy } = getCurrentInstance()
 const emit = defineEmits(['cle-click'])
@@ -179,7 +172,7 @@ const classWorkAnalysis = reactive({
   entpcourseworklistarray: [], // 当前学习任务所包含的试题ID
 })
 const tableRadio = reactive({
-  value: 1, // 已交
+  value: '1', // 已交
   list: [], // 已交list
   num1: 0, // 已交人数
   num0: 0 // 未交人数
@@ -187,7 +180,7 @@ const tableRadio = reactive({
 const loading_dt_table = ref(false)
 const isopen_dtwk_table = ref(false)
 
-// zdg: 逐题讲评
+// zdg: 逐题分析
 const classWorkActiveData = reactive({
   quizlist: [], // 当前习题列表
   studentList: [], // 当前课程-所有学生
@@ -210,16 +203,15 @@ const classWorkAnalysisScore = reactive({
 //     form.name = newValue.label
 //   }
 // )
-const openDialog = (data, isInit=true) => {
+const openDialog = (data) => {
-  console.log(data, '点击的item完成情况')
+  console.log(data, '点击的item答题情况')
 
-  if (isInit) {
   classWorkAnalysis.title = data.uniquekey ? data.uniquekey + '--' : ''
   classWorkAnalysis.worktype = data.worktype
   classWorkAnalysis.workclass = data.workclass
   // 重置学生列表
   tableRadio.list = []
-    tableRadio.value = 1
+  tableRadio.value = '1'
   tableRadio.num0 = 0
   tableRadio.num1 = 0
 
@@ -240,8 +232,6 @@ const openDialog = (data, isInit=true) => {
     ? JSON.parse(`[${data.classworkdatastudentids}]`)
     : []
   classWorkActiveData.studentList = studentArr
-  }
-  
   /** 学生完成情况分析--获取作业学生list数据 */
   getClassWorkStudentList(data.id)
 
@@ -258,7 +248,6 @@ const openDialog = (data, isInit=true) => {
     }
     classWorkAnalysis.quizlist = idres.rows
     classWorkActiveData.quizlist = idres.rows // zdg: 作业概览组件使用
-    processList(classWorkActiveData.quizlist);
 
     // 统计每个题目的正误率
     // 这个学习任务所有题目+所有学生的答题数据 , pageSize: 100
@@ -345,7 +334,7 @@ const getClassWorkStudentList = (rowId) => {
         }
 
         // 老师批阅状态 默认0 未批改
-        response.rows[i].rating = 0
+        response.rows[i].teacherRating = 0
 
         // 计算每个学生的得分率
         if (
@@ -354,44 +343,35 @@ const getClassWorkStudentList = (rowId) => {
           response.rows[i].classworkevallist != 'null'
         ) {
           // 将标签中双引号改为转义, 测试数据: "{\"id\":172910, \"feedcontent\":\"毛泽东，<bdo class=\"mathjye-underpoint2\">浮想联翩</bdo>。\", \"score\":4, \"rightanswer\":\"毛泽东重，<bdo class=\"mathjye-underpoint2\">浮想联翩</bdo>。\"},{\"id\":172911, \"rating\":0, \"teacherRating\":0, \"entpcourseworkid\":363100, \"feedcontent\":\"毛泽东重游橘子洲，面对如画的秋色和大好的革命形势，回忆过去战斗的岁月，不禁心潮起伏，<bdo class=\"mathjye-underpoint2\">浮想联翩</bdo>。\", \"score\":4, \"rightanswer\":\"毛泽东重游橘子洲，面对如画的秋色和大好的革命形势，回忆过去战斗的岁月，不禁心潮起伏，<bdo class=\"mathjye-underpoint2\">浮想联翩</bdo>。\"}"
-          // 主题作业（去除【】前后引号）.replace(/"(\[.*\])"/g, '$1'); ：eg: "feedcontent\":\"[{\"name\":\"Bliss.jpg\",\"url\":\"https://wzyzoss.3b8daa474.jpg\"}]\",
+          // 常规作业（去除【】前后引号）.replace(/"(\[.*\])"/g, '$1'); ：eg: "feedcontent\":\"[{\"name\":\"Bliss.jpg\",\"url\":\"https://wzyzoss.3b8daa474.jpg\"}]\",
           // json转换会报错； .replace(/""/g, '"')   eg:  ""宇宙环境安全""
           response.rows[i].classworkevallist = escapeHtmlQuotes(response.rows[i].classworkevallist)
           //console.log('学生完成情况分析classworkevallist', response.rows[i].classworkevallist)
           const evalarray = JSON.parse('[' + response.rows[i].classworkevallist + ']')
           var scoingCount = 0
           var feedcount = 0
-          let score = 0
           for (var e = 0; e < evalarray.length; e++) {
             if (evalarray[e].feedcontent != '') {
               feedcount++
               // 与答案对比正误。注意注意，这里仅限单选题
               if (evalarray[e].feedcontent == evalarray[e].rightanswer) {
                 scoingCount++
-                score += evalarray[e].score;
-                evalarray[e].teacherRating = evalarray[e].score 
-              }
-
               }
             }
-          
+          }
-          const allTeacherRating = evalarray.reduce((acc, cur) => acc + cur.teacherRating, 0) // 老师评分
           //console.log(evalarray, 'evalarray------------------------------------')
           if (feedcount > 0) {
             // 多个题目的总得分率: 正确题数/（题目数*100）
-            response.rows[i].scoingRate = ((score / allTeacherRating) * 100).toFixed(0) + '%'
+            response.rows[i].scoingRate = ((scoingCount / feedcount) * 100).toFixed(0) + '%'
-            response.rows[i].getScore = allTeacherRating
           } else {
             response.rows[i].scoingRate = '0%'
-            response.rows[i].getScore = 0
           }
           // 批阅状态  优良类 :注意：这里题目中的评价都是一样的，所以取第一个
           if (evalarray[0].rating != '') {
-            response.rows[i].rating = evalarray[0].rating
+            response.rows[i].teacherRating = evalarray[0].rating
           }
         } else {
           response.rows[i].scoingRate = '0%'
-          response.rows[i].getScore = 0
         }
       }
       classWorkAnalysis.classworkdata = response.rows
@@ -401,61 +381,14 @@ const getClassWorkStudentList = (rowId) => {
       tableRadio.list =
         classWorkAnalysis.classworkdata &&
         classWorkAnalysis.classworkdata.filter((item) => item.finishtimelength != '0')
-      tableRadio.value = 1
+      tableRadio.value = '1'
       tableRadio.num0 = classWorkAnalysis.classworkdata.length - tableRadio.list.length
       tableRadio.num1 = tableRadio.list.length
-      // 自动批阅判断
-      teacherCriticism();
     })
     .catch(() => {
       loading_dt_table.value = false
     })
 }
-/**
- * 自动批阅判断：
- * 已交 并 作业类型为习题训练
- */
-const teacherCriticism = ()=>{
-  // 已交的list才自动批阅判断
-  if(tableRadio.value == 1 && classWorkAnalysis.worktype == '习题训练'){
-    // 只有习题训练才会自动批阅
-    tableRadio.list = tableRadio.list.map((item) => {
-      return {
-        ...item,
-        rating : item.rating || checkWorkType(item)
-      }
-    })
-  }
-}
-const checkWorkType = (item) => {
-  //这里判断题目类型
-  const subType = classWorkActiveData.quizlist.map(item => item.worktype)
-  const objectiveQuestion = ['单选题','多选题','判断题']
-  let rating = 0
-  //判断题目是不是客观题
-  if(subType.every(item => objectiveQuestion.includes(item))){
-    // 获取学生答题列表 scoingRate 得分率
-    const score = extractedNumber(item.scoingRate)
-    if(0<=score && score<=59){
-      rating = 5
-    }else if(60<=score && score<=69){
-      rating = 4 
-    }else if(70<=score && score<=79){
-      rating = 3
-    }else if(80<=score && score<=99){
-      rating = 2
-    }else{
-      rating = 1
-    }
-  }
-  return rating
-
-}
-// 获取百分比的数字
-const extractedNumber = (score) => {
-  const match = score.match(/\d+/);
-  return match ? parseInt(match[0], 10) : null;
-}
 /** 2、查看某一个学生的学习任务完成详情*/
 const getStudentClassWorkDataDetail = (row) => {
   // 这里取出的是学生完成情况
@@ -526,7 +459,7 @@ const getStudentClassWorkDataDetail = (row) => {
       }
     })
     .catch(() => {
-      console.log('获取完成情况失败')
+      console.log('获取答题情况失败')
       ElMessage({
         type: 'warning',
         message: '未获取到答题信息！'
@@ -538,7 +471,7 @@ const onClassWorkScoreSubmit = () => {
   console.log('批改后返回的方法')
   loading_dt_table.value = true
   isopen_dtwk_table.value = false
-  // 1、清空完成情况的两个table数据，- 左侧学生列表：classWorkAnalysis.classworkdata；- 右侧学生回答题目列表：classWorkAnalysis.activeStudentQuizlist
+  // 1、清空答题情况的两个table数据，- 左侧学生列表：classWorkAnalysis.classworkdata；- 右侧学生回答题目列表：classWorkAnalysis.activeStudentQuizlist
   //  - 左侧学生列表
   classWorkAnalysis.classworkdata = []
   classWorkAnalysis.activeStudentQuizlist = []
@@ -572,16 +505,14 @@ const tableRadioChange = (e) => {
   isopen_dtwk_table.value = false;
   console.log(e,'??????')
   console.log("学生列表：", classWorkAnalysis.classworkdata)
-  if(e==1){
+  if(e=='1'){
     tableRadio.list = classWorkAnalysis.classworkdata.filter(item => item.finishtimelength != '0')
-    tableRadio.value = 1;
+    tableRadio.value = '1';
     tableRadio.num0 = classWorkAnalysis.classworkdata.length - tableRadio.list.length;
     tableRadio.num1 = tableRadio.list.length;
-    // 自动批阅判断
+  }else if(e=='0'){
-    teacherCriticism();
-  }else if(e==0){
     tableRadio.list = classWorkAnalysis.classworkdata.filter(item => item.finishtimelength == '0')
-    tableRadio.value = 0;
+    tableRadio.value = '0';
     tableRadio.num0 = tableRadio.list.length;
     tableRadio.num1 = classWorkAnalysis.classworkdata.length - tableRadio.list.length;
   }
@@ -597,7 +528,7 @@ const escapeHtmlQuotes = (str) => {
   return result;
 }
 
-//#region 逐题讲评
+//#region 逐题分析
 // 查看学生-作业概览
 const workHandle = (type) => {
   // 关闭右侧批阅ui
@@ -632,17 +563,13 @@ const getWorkFeedList = async() =>{
 //#endregion
 
 
-//#regin 训练报告
+//#regin 整体分析
 /*
   author: yangws
   time: 2024-8-06 16:35:33
-  function: 训练报告的处理
+  function: 整体分析的处理
 */
 const handleClassOverviewOpen = (type) =>{
-  // 每次进来都重新调用一次
-  if(type == 'report') {
-    getWorkFeedList();
-  }
   // 关闭右侧批阅ui
   isopen_dtwk_table.value = false;
   classWorkAnalysis.view = type
@@ -653,7 +580,6 @@ const handleClassOverviewOpen = (type) =>{
       response.rows.forEach(item => {
         let rightAnswer = 0
         let answers = 0
-        let score = 0
         if(!item.classworkevallist) return
         // 使用正则表达式替换字符串值中的双引号为单引号
         let replacedString = item.classworkevallist.replace(/""/g, "\"");
@@ -672,18 +598,12 @@ const handleClassOverviewOpen = (type) =>{
               //正确答案，仅限单选题
               if(itemTopic.feedcontent === itemTopic.rightanswer){
                 rightAnswer ++
-                score += itemTopic.score
-                itemTopic.teacherRating = itemTopic.score
               }
             }
           })
-          const allTeacherRating = allTopic.reduce((acc, cur) => acc + cur.teacherRating, 0)
+          rightAnswer > 0?item.scoingRate = (rightAnswer/answers * 100).toFixed(0):item.scoingRate = ''
-          
-          rightAnswer > 0?item.scoingRate = (score/allTeacherRating * 100).toFixed(0):item.scoingRate = ''
-          item.getScore = allTeacherRating
         }else{
           item.scoingRate = ''
-          item.getScore = 0
         }
         //获得总分
         const point = allTopic.reduce((acc, cur) => {
@@ -712,79 +632,33 @@ const closeDialog = () => {
   emit('cle-click')
 }
 
-// im监听消息回调
-const msgHandle = (msg) => {
-  const { type, data } = msg
-  switch(type) {
-    case 'TIMAddRecvNewMsgCallback': // 收到新消息 data=[]
-      {
-        (data||[]).forEach(o => {
-          const msgArr = o?.message_elem_array||[]
-          msgArr.forEach(info => {
-            const msgType = info?.elem_type // 消息类型 TIMElemType
-            const msgData = !!info.text_elem_content ? JSON.parse(info.text_elem_content)||'' : ''
-            // 处理学生端反馈得消息
-            //console.log('msgData->', msgData);
-            if (msgData.msgKey == "finishHomework"){
-              // 刷新
-              const data = JSON.parse(localStorage.getItem('teachClassWorkItem'));
-              //console.log('data->', data);
-              openDialog(data, false);
-            }
-          })
-        })
-      }
-      break
-  }
-}
-
-const reloadTimer = ref(0); // 开启定时查询，作业id是否刷新了，刷新了就重新获取
-const cutid = ref(0); // 当前初始化的作业id
 onMounted(() => {
-  const data = JSON.parse(localStorage.getItem('teachClassWorkItem'));
+  
-  // const data = sessionStore.get('teachClassWorkItem');
+  // const data = JSON.parse(localStorage.getItem('teachClassWorkItem'));
+  const data = sessionStore.get('teachClassWorkItem');
+  console.log(data,'????????????????????' )
   if(data){
     openDialog(data)
   }
-  // 开始定时查询
-  cutid.value = data.id;
-  isReloadTimer();
-
-  // im监听消息
-  if (!Chat.imChat) {
-    Chat.init(true, true, msgHandle);
-  } else {
-    Chat.listenMsg(msgHandle);
-  }
 })
-const isReloadTimer = () =>{
-  clearInterval(reloadTimer.value) // 关闭定时器 
-  // 开启定时查询，作业id是否刷新了，刷新了就重新获取
-  reloadTimer.value = setInterval(() => {
-    const data = JSON.parse(localStorage.getItem('teachClassWorkItem'));
-    if(cutid.value != data.id){
-      cutid.value = data.id;
-      openDialog(data)
-    }
-  }, 1000)
-}
 
 watch(classWorkAnalysis, (newVal, oldVal) => {
   if(newVal.view != 'quizStats'){
     console.log('关闭zdg: 定时执行')
-    clearInterval(classWorkActiveData.timerId) // 关闭定时器 逐题讲评的
+    clearInterval(classWorkActiveData.timerId) // 关闭定时器 逐题分析的
   }
 })
 
 onUnmounted(() => {
-  clearInterval(classWorkActiveData.timerId) // 关闭定时器 逐题讲评的
+  clearInterval(classWorkActiveData.timerId) // 关闭定时器 逐题分析的
-  clearInterval(reloadTimer.value) // 关闭定时器 查询作业id是否刷新了
 })
 
 // defineExpose({
 // })
 </script>
 
+<style src="@/assets/styles/JYStyle.css"></style>
+
 <style scoped lang="scss">
 .teachClassTask{
   height: 100%;
@@ -824,12 +698,100 @@ onUnmounted(() => {
       overflow: hidden;
 
       .classwork-score{
-        /* overflow-y: auto; */
+        // overflow-y: auto;
         height: 100%;
       }
     }
   }
 }
+
+
+
+
+
+
+
+// .clwk_dialog {
+  
+// }
+
+// .clwk_dialog {
+//   display: flex;
+//   justify-content: center;
+//   overflow: hidden;
+// }
+// .clwk_dialog .el-dialog {
+//   margin: 0 auto !important;
+//   height: 85%!important;
+//   overflow: hidden;
+// }
+// .clwk_dialog .el-dialog__header {
+//   /* position: absolute;
+//   top: 0;
+//   left: 0; */
+//   width: 100%!important;
+// }
+// .clwk_dialog .el-dialog__body {
+//   position: absolute;
+//   left: 0;
+//   top: 15px;
+//   bottom: 1px;
+//   right:0;
+//   padding:5px;
+//   z-index:1;
+//   display: flex;
+//   flex-direction: column;
+//   overflow: hidden;
+//   /* overflow:hidden;
+//   overflow-y: auto; */
+// }
+// .clwk_dialog .el-dialog__footer{
+//   position: absolute;
+//   bottom: 10px;
+//   right: 10px;
+// }
+// .clwk_dialog .classwork-score{
+//   overflow-y: auto;
+// }
 </style>
 
-<style src="@/assets/styles/JYStyle.css"></style>
+<style scoped>
+/* .clwk_dialog {
+  display: flex;
+  justify-content: center;
+  overflow: hidden;
+}
+.clwk_dialog .el-dialog {
+  margin: 0 auto !important;
+  height: 85%!important;
+  overflow: hidden;
+}
+.clwk_dialog .el-dialog__header {
+  /* position: absolute;
+  top: 0;
+  left: 0; 
+  width: 100%!important;
+}
+.clwk_dialog .el-dialog__body {
+  position: absolute;
+  left: 0;
+  top: 15px;
+  bottom: 1px;
+  right:0;
+  padding:5px;
+  z-index:1;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+  /* overflow:hidden;
+  overflow-y: auto; 
+}
+.clwk_dialog .el-dialog__footer{
+  position: absolute;
+  bottom: 10px;
+  right: 10px;
+}
+.clwk_dialog .classwork-score{
+  overflow-y: auto;
+} */
+</style>

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

@@ -14,15 +14,14 @@
             <div class="class-left flex">
               <div class="class-name flex">
                 <span class="name">{{ item.uniquekey }}</span>
-                <!-- <el-tag class="tag" round :type="tagType(item.deaddate)" effect="dark" size="small">{{
+                <el-tag class="tag" round :type="tagType(item.deaddate)" effect="dark" size="small">{{
-                  getCurrentTime('YYYY-MM-DD HH:mm') > item.deaddate ? '已批改' : '待批改' }}</el-tag> -->
+                  getCurrentTime('YYYY-MM-DD HH:mm') > item.deaddate ? '已结束' : '进行中' }}</el-tag>
-                <el-tag class="tag" round :type="tagType(item.deaddate)" effect="dark" size="small">待批改</el-tag>
                   <el-tag :type="item.workclass" size="large">{{ item.worktype }}</el-tag>
               </div>
               <div class="class-time">{{ item.classcaption }} | 截止时间：{{ item.deaddate }} </div>
             </div>
             <div class="class-right">
-              <div><span class="num">{{ item.workdataresultcount }}</span> / {{ item.workdataresultsum }}</div>
+              <div><span class="num">{{ item.workdataresultcount }}</span> / {{ item.workdatacount }}</div>
               <div>已交</div>
             </div>
           </li>
@@ -53,10 +52,9 @@ const getHomework = async () => {
   const { edustage, edusubject } = user
   try {
     const { rows } = await homeworklist({ edituserid: user.userId, edustage, edusubject, deaddate: getTomorrow(), status: '1', orderby: 'deaddate DESC', pageSize: 500 })
-    // 只展示待批改的
+    // 只展示进行中的
-    //homeworkList.value = rows.filter(item => item.deaddate && item.uniquekey && getCurrentTime('YYYY-MM-DD HH:mm') < item.deaddate) // 当前日期的时分与截止日期进行判断
+    homeworkList.value = rows.filter(item => item.deaddate && item.uniquekey && getCurrentTime('YYYY-MM-DD HH:mm') < item.deaddate) // 当前日期的时分与截止日期进行判断
-    // homeworkList.value = rows.filter(item => item.deaddate && item.uniquekey && getTomorrow() <= item.deaddate)   //大于今天的才算待批改 弃用
+    // homeworkList.value = rows.filter(item => item.deaddate && item.uniquekey && getTomorrow() <= item.deaddate)   //大于今天的才算进行中 弃用
-    homeworkList.value = rows || [];
     homeworkList.value.forEach((item) => {
       // 处理任务类型的UI
       if (item.worktype == '学习目标定位') {
@@ -74,6 +72,7 @@ const getHomework = async () => {
         item.workclass = ''
       }
 
+      item.workdatacount = JSON.parse('[' + item.classworkdatastudentids + ']').length
       // 如果是习题训练任务，则检查一共有多少道
       if (item.entpcourseworklist != '') {
         item.entpcourseworklistarray = JSON.parse(
@@ -97,14 +96,12 @@ const debounceOpenWin = debounce(() => {
 // 批改作业
 const onClickItem = (item) => {
   console.log('防抖开启弹窗')
-  // sessionStore.set('teachClassWorkItem', item); // 缓存点击的item 
+  sessionStore.set('teachClassWorkItem', item); // 缓存点击的item 
-  localStorage.setItem('teachClassWorkItem', JSON.stringify(item));
   debounceOpenWin();
 }
 
 const tagType = (time) => {
-  return 'warning';
+  return getCurrentTime('YYYY-MM-DD HH:mm') > time ? 'info' : 'warning'
-  //return getCurrentTime('YYYY-MM-DD HH:mm') > time ? 'info' : 'warning'
 }
 
 

src/renderer/src/views/examReport/container/examReview.vue

@@ -17,12 +17,8 @@
     <el-table-column align="center" prop="worktag" width="120"></el-table-column>
   </el-table>
 
-  <!-- 试题详细信息 -->
+  <!-- 试题详情 -->
-  <examDetailsDrawer ref="examDetailsDrawerRef"></examDetailsDrawer>
+  <el-drawer v-model="activeExamInfoDrawer" title="题目详情" :with-header="false" direction="rtl" size="60%">
-  
-  <!-- <el-drawer v-model="activeExamInfoDrawer" title="题目详情" :with-header="false" direction="rtl" size="60%">
-    <div style="height: calc(100% - 50px);">
-      <el-scrollbar style="background: #F3F5F8;border-radius: 8px;">
     <el-row class="drawer-main">
       <el-col :span="24">
         <span>{{activeExam.worktag}}</span>
@@ -39,18 +35,11 @@
       <el-col :span="3"  class="drawer-main-col" ><em>【点评】</em></el-col>
       <el-col :span="20" class="drawer-main-col" v-html="activeExam.discuss"></el-col>
     </el-row>
-      </el-scrollbar>
+  </el-drawer>
-    </div>
-    <div class="drawer-footer">
-      <el-button type="primary" @click="activeExamInfoDrawer = false">关闭</el-button>
-    </div>
-  </el-drawer> -->
 </template>
 
 <script setup>
-import {ref, reactive, getCurrentInstance, nextTick} from 'vue'
+import {ref, reactive} from 'vue'
-import examDetailsDrawer from '@/components/exam-question/examDetailsDrawer.vue'
-const { proxy } = getCurrentInstance()
 
 const props = defineProps({
   listExamQuestion: {type: Array},
@@ -61,12 +50,8 @@ const activeExamInfoDrawer = ref(false);
 const activeExam = ref({});
 
 const showExamAnalyseDrawer = (row) => {
-  nextTick(() => {
+  activeExam.value = row;
-    const activeParams = {
+  activeExamInfoDrawer.value = true;
-      activeExam: row,
-    }
-    proxy.$refs.examDetailsDrawerRef.acceptParams(activeParams);
-  })
 }
 
 
@@ -104,17 +89,13 @@ const showExamAnalyseDrawer = (row) => {
 
   .drawer-main{
     margin: 1%; 
-    padding: 2%; 
+    padding: 1% 2%; 
+    border: 2px dotted;
     display: flex;
     text-align: left;
+    
     .drawer-main-col{
       padding: 10px 0px;
     }
   }
-  .drawer-footer{
-    padding-top: 15px;
-    display: flex;
-    justify-content: flex-end;
-    box-sizing: border-box;
-  }
 </style>

src/renderer/src/views/examReport/index.vue

@@ -161,7 +161,7 @@ const getData = async (data) => {
   const params = {
     eid: curNode.value.id,
     workgroup: '1',
-    worktype: '999',     // 这里需要传自定义不存在的字段，以使本地查询不到数据从而触发查询第三方
+    worktype: '不限',
     workTypeId: '0',
     edusubject: curNode.value.edusubject,
     edustage: curNode.value.edustage,

src/renderer/src/views/experiment/components/experimentBook.vue

@@ -1,333 +0,0 @@
-<template>
-    <div class="book-wrap">
-      <el-scrollbar height="100%">
-        <div class="book-name flex" @click="dialogVisible = true">
-          <span>{{ curBook.data.itemtitle }}</span>
-          <i class="iconfont icon-xiangyou"></i>
-        </div>
-        <div class="book-list" v-loading="treeLoading">
-          <el-tree :data="treeData" accordion :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>
-            </template>
-          </el-tree>
-        </div>
-      </el-scrollbar>
-    </div>
-    <!--弹窗 选择教材-->
-    <el-dialog v-model="dialogVisible" append-to-body :show-close="false" width="550"
-      style="border-radius: 10px; padding: 10px 15px;">
-      <template #header>
-        <div class="choose-book-header flex">
-          <span>切换教材</span>
-          <i class="iconfont icon-guanbi" @click="dialogVisible = false"></i>
-        </div>
-      </template>
-  
-      <div class="textbook-container">
-        <el-scrollbar height="450px">
-          <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 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>
-      </div>
-    </el-dialog>
-</template>
-  
-  <script setup>
-  import { onMounted, ref, nextTick, toRaw, reactive } from 'vue';
-  import { cloneDeep } from 'lodash'
-  import { listEvaluation } from '@/api/subject'
-  import { sessionStore } from '@/utils/store'
-  
-  const BaseUrl = import.meta.env.VITE_APP_BUILD_BASE_PATH
-  // 定义要发送的emit事件
-  const emit = defineEmits(['nodeClick', 'changeBook'])
-  // 章节List
-  const unitList = ref([])
-  const subjectList = ref([])
-  const dialogVisible = ref(false)
-  // 当前教材下面单元内容数据
-  const treeData = ref([])
-  const defaultProps = {
-    children: 'children',
-    label: 'itemtitle',
-    class: 'textbook-tree'
-  }
-  //查当前学科
-  const subjectParams = reactive(
-    {
-    edusubject: '科学',
-    edustage:'小学',
-    itemkey: 'version',
-    orderby: 'orderidx asc',
-    pageSize: 10000
-    }
-  )
-  // 查所有的学科
-  const unitParams = reactive({
-    edusubject:'科学',
-    edustage:'小学',
-    itemgroup: 'textbook',
-    orderby: 'orderidx asc',
-    pageSize: 10000
-    })
-  // 当前选中的教材
-  const curBook = reactive({
-    data: {}
-  })
-  // 当前节点
-  const curNode = reactive({
-    data:{}
-  })
-  const treeLoading = ref(false)
-  // 默认展开的节点
-  const defaultExpandedKeys = ref([])
-  
-  //选择教材
-  const changeBook = (data) => {
-    curBook.data = data
-    treeData.value = getTreeData(data.id)
-    //切换教材后默认展开第一个并选中
-    nextTick(() =>{
-      defaultExpandedKeys.value = [treeData.value[0].id]
-      curNode.data = getLastLevelData(treeData.value)[0]
-      handleNodeClick(curNode.data)
-    })
-    // 延迟关闭 视觉上选中
-    setTimeout(() => {
-      dialogVisible.value = false
-    }, 100);
-  }
-  
-  const getLastLevelData = (tree) => {
-    let lastLevelData = [];
-    // 递归函数遍历树形结构
-    function traverseTree(nodes) {
-      nodes.forEach((node) => {
-        // 如果当前节点有子节点，继续遍历
-        if (node.children && node.children.length > 0) {
-          traverseTree(node.children);
-        } else {
-          // 如果没有子节点，说明是最后一层的节点
-          lastLevelData.push(node);
-        }
-      });
-    }
-  
-    // 调用递归函数开始遍历
-    traverseTree(tree);
-  
-    // 返回最后一层的数据
-    return lastLevelData;
-  }
-  // 根据id 拿到父节点数据
-  const findParentByChildId = (treeData, targetNodeId) => {
-    // 递归查找函数
-    // 遍历树中的每个节点
-    for (let node of treeData) {
-      // 检查当前节点的子节点是否包含目标子节点 ID
-      if (node.children && node.children.some(child => child.id === targetNodeId)) {
-        // 如果当前节点的某个子节点的 ID 匹配目标子节点 ID，则当前节点即为父节点
-        return node;
-      }
-      // 如果当前节点没有匹配的子节点，则递归检查当前节点的子节点
-      if (node.children) {
-        let parentNode = findParentByChildId(node.children, targetNodeId);
-        if (parentNode) {
-          return parentNode;
-        }
-      }
-    }
-    // 如果未找到匹配的父节点，则返回 null 或者适当的默认值
-    return null;
-  }
-  
-  
-  const handleNodeClick = (data) => {
-    /**
-     * data : 当前节点数据
-     */
-    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: curBook.data.id,
-        curBookName: curBook.data.itemtitle,
-        curBookImg: BaseUrl + curBook.data.avartar,
-        curBookPath: curBook.data.fileurl
-      },
-      node: nodeData
-    }
-    // 本地存储:electron-store
-    emit('nodeClick', curData)
-  }
-  // 单元章节数据转为“树”结构
-  const getTreeData = (bookId) =>{
-    // 根据当前教材的id 查找出对应的章节 
-    let data = unitList.value.filter(item => item.rootid == bookId && item.level == 1)       
-    data.forEach( item => {
-      item.children = unitList.value.filter( item2 => item2.parentid == item.id && item2.level == 2)
-    }) 
-    return data
-  }
-
-
-  onMounted( async () => {
-    treeLoading.value = true
-    try{
-        //获取学科列表
-      const { rows } = await listEvaluation(subjectParams)
-        // 获取所有的教材
-      subjectList.value = rows
-      
-      const res = await listEvaluation(unitParams)
-      unitList.value = [...res.rows]
-      // 当前教材
-        curBook.data = rows[0]
-  
-      // 章节"树"rows
-      treeData.value = getTreeData(rows[0].id)
-      
-      nextTick(() =>{
-        // 默认展开 选中
-        defaultExpandedKeys.value = [treeData.value[0].id]
-        curNode.data = getLastLevelData(treeData.value)[0]
-        handleNodeClick(curNode.data)
-      })
-    
-    } finally{
-      treeLoading.value = false
-    }
-  
-  })
-  
-  </script>
-  
-  <style lang="scss" scoped>
-  .book-wrap {
-    width: 300px;
-    height: 100%;
-    background: #ffffff;
-    border-radius: 10px;
-    box-shadow: 0px 0px 20px 0px rgba(99, 99, 99, 0.06);
-    display: flex;
-    flex-direction: column;
-    position: relative;
-  
-    .book-name {
-      background-color: #ffffff;
-      position: absolute;
-      left: 0;
-      top: 0;
-      width: 100%;
-      height: 45px;
-      padding: 0 15px;
-      z-index: 1;
-      justify-content: space-between;
-      align-items: center;
-      color: #3b3b3b;
-      cursor: pointer;
-      border-bottom: solid #f4f5f7 1px;
-      font-size: 15px;
-      font-weight: 600;
-      border-radius: 10px 10px 0 0;
-    }
-  
-    .book-list {
-      padding: 45px 10px 0 10px;
-      flex: 1;
-    }
-  }
-  
-  :deep(.choose-dialog) {
-    border-radius: 10px;
-  }
-  
-  .choose-book-header {
-    justify-content: space-between;
-    font-size: 15px;
-    font-weight: bold;
-  
-    .icon-guanbi {
-      font-size: 20px;
-      cursor: pointer;
-    }
-  }
-  
-  .textbook-container {
-    .textbook-item {
-      padding: 10px 20px;
-      align-items: center;
-      border-radius: 5px;
-      cursor: pointer;
-  
-      .book-name {
-        margin-left: 20px;
-        color: #3b3b3b;
-        font-size: 13px;
-      }
-  
-      &:hover {
-        background: #f4f7f9;
-      }
-    }
-  
-    .active-item {
-      background-color: #f4f7f9;
-  
-      .book-name {
-        color: #368fff;
-        font-weight: bold
-      }
-    }
-  
-    .textbook-img {
-      width: 55px;
-      height: 70px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-    }
-  }
-  
-  :deep(.el-tree-node) {
-    .el-tree-node__content {
-      height: 40px;
-      border-radius: 10px;
-  
-      &:hover {
-        background-color: #eaf3ff;
-      }
-    }
-  }
-  
-  .tree-label {
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-  }
-  
-  :deep(.el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content) {
-    background-color: #eaf3ff !important;
-    color: #409EFF
-  }
-  </style>
-  

src/renderer/src/views/experiment/components/videoLog.vue

@@ -1,25 +0,0 @@
-<template>
-    <el-dialog v-model="model" class="preview-drawer" :title="row.fileShowName" :modal="true" :destroy-on-close="true" :with-header="false" :append-to-body="true"
-    width="60%">
-    <video style="margin: 0 auto;" :src="row.fileFullPath" controls autoplay></video>
-    </el-dialog>
-</template>
-<script setup>
-const model = defineModel()
-const props = defineProps({
-  row: {
-    type: Object,
-    default(){
-      return {}
-    }
-  },
-})
-
-</script>
-<style scoped>
-.header-close {
-  padding: 0;
-  cursor: pointer;
-  text-align: right;
-}
-</style>

src/renderer/src/views/experiment/index.vue

@@ -1,259 +0,0 @@
-<template>
-  <div class="page-resource flex">
-    <!-- 左侧 教材 目录 -->
-    <experimentBook @node-click="getData"/>
-    <div class="page-right">
-      <!-- 排序 -->
-      <div style="margin-left: 5px;margin-top: 10px;height: 45px;">
-        <el-form size="large">
-          <el-form-item label="排序:">
-            <div 
-              :class="['score-circle', { 'active': active == item.active }]"
-              v-for="(item,index) in screenList" :key="index" @click="chooseItem(item)">
-              <el-text
-                :style="{fontWeight:'bold', color: active == item.active ? 'rgb(57, 184, 244)':'rgb(131,131,131)' }"
-                size="large">{{ item.title }}</el-text>
-            </div>
-          </el-form-item>
-        </el-form>
-      </div>
-      <div class="list-content">
-        <div class="list-container" v-loading="loading">
-          <div v-for="(item, index) in experimentList" :key="index" class="content">
-            <div class="content-list">
-            <!-- 封面 -->
-            <el-image style="width: 100%;border-radius: 8px;" :src="item.coverPic" fit="contain" @click="chooseVedio(item)"/>
-            
-          </div>
-          <!-- 标题 -->
-          <div style="text-align: left;">
-              <el-text>{{ item.fileShowName }}</el-text>
-            </div>
-            <!-- 观看人数 -->
-            <!-- <div style="text-align: left;display: flex;align-items: center;">
-              <el-icon type="info"><View /></el-icon><el-text size="small" type="info">{{ item.nums }}</el-text>
-            </div> -->
-          </div>
-        </div>
-        <div class="pagination-box">
-          <el-pagination
-            v-model:current-page="query.pageNum"
-            v-model:page-size="query.pageSize"
-            :page-sizes="[20, 30, 50, 100]"
-            background
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="resultTotal"
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-          />
-        </div>
-      </div>
-    </div>
-  </div>
-  <!-- 播放视频 -->
-  <VideoLog v-model="isShow" :row="curRow"></VideoLog>
-</template>
-
-<script setup>
-import { ref, onMounted } from 'vue'
-import experimentBook from './components/experimentBook.vue';
-import { View } from '@element-plus/icons-vue'
-import { getSmarttalkPage } from '@/api/file/index'
-import VideoLog from './components/VideoLog.vue'
-
-// 排序列表
-const screenList = ref([
-  {
-    title: '最新发布',
-    active: 1,
-  }
-])
-const active = ref(1)
-// 获取视频的总条数
-const resultTotal = ref(0) 
-// 弹出视频
-const isShow = ref(false)
-const curRow = ref({})
-// loading框
-const loading = ref(false)
-
-// 实验图片结构
-const experimentList = ref([])
-// 请求视频资源的参数
-const query = ref({
-  textbookId: '',
-  fileSource: '平台',
-  // 资源格式  mp3 ppt ...
-  fileSuffix: 'mp4',
-  fileFlags: "'素材'",
-  fileRoot: '资源',
-  fileName: '',
-  orderByColumn: 'uploadTime',
-  isAsc: 'desc',
-  pageNum: 1,
-  pageSize: 20,
-  levelFirstId: 0,
-  levelSecondId: 0
-})
-
-const getData = (data) => {
-  const { textBook, node } = data
-  if (node.parentNode) {
-    query.value.levelFirstId = node.parentNode.id
-    query.value.levelSecondId = node.id
-  } else {
-    query.value.levelFirstId = node.id
-    query.value.levelSecondId = ''
-  }
-  query.value.textbookId = node.rootid
-  getVideoList()
-}
-
-const chooseItem = (item) => {
-  active.value = item.active
-}
-
-// 获取视频资源
-const getVideoList = async () => {
-  loading.value = true
-  const res = await getSmarttalkPage(query.value)
-  loading.value = false
-  experimentList.value = [...res.rows]
-  resultTotal.value = res.total
-}
-
-const handleSizeChange = (limit) => {
-  query.pageNum = limit
-  getVideoList()
-}
-const handleCurrentChange = (page) => {
-  query.pageSize = page
-  getVideoList()
-}
-const chooseVedio = (item) => {
-  isShow.value = true
-  curRow.value = item
-}
-</script>
-
-<style lang="scss" scoped>
-.page-resource {
-  height: 100%;
-  padding: 10px 15px 0;
-
-  .page-right {
-    min-width: 0;
-    display: flex;
-    flex-direction: column;
-    flex: 1;
-    margin-left: 20px;
-    height: 100%;
-    background: #ffffff;
-    border-radius: 10px;
-    box-shadow: 0px 0px 20px 0px rgba(99, 99, 99, 0.06);
-  }
-  .icon-jiahao {
-    font-size: 12px;
-    margin-right: 3px;
-    font-weight: bold;
-  }
-}
-.create-btn {
-  font-size: 13px;
-  padding: 5px 13px;
-}
-.list-content {
-  border-radius: 8px;
-  height: 90%;
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-}
-.list-container {
-  display: flex;
-  flex-wrap: wrap;
-  overflow-y: auto;
-}
-
-.content {
-  border-radius: 8px;
-  //   box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
-  width: calc(20%);
-  cursor: pointer;
-  transition: all 0.3s ease;
-  padding: 5px;
-  display: flex;
-  flex-direction: column;
-  // justify-content: space-between;
-}
-
-.content:hover {
-  transform: translateY(-4px);
-  //   box-shadow: 0 4px 16px 0 rgba(0, 0, 0, 0.15);
-}
-.content-list{
-  height: 150px;
-  display: flex;
-  align-items: center
-}
-
-.item-content {
-  display: flex;
-  align-items: center;
-}
-
-.item-icon {
-  font-size: 24px;
-  color: #409eff;
-  margin-right: 16px;
-}
-
-.item-text {
-  flex: 1;
-}
-
-.item-title {
-  font-size: 16px;
-  font-weight: 500;
-  color: #303133;
-  margin-bottom: 4px;
-  font-weight: bold;
-}
-
-.title-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-
-.item-bottom {
-  text-align: right;
-}
-
-/* 过渡动画 */
-.fade-enter-active, .fade-leave-active {
-  transition: opacity 0.3s;
-}
-
-.fade-enter, .fade-leave-to {
-  opacity: 0;
-}
-.score-circle {
-  background-color: #fff;
-  cursor: pointer;
-  margin-right: 5px;
-  width: auto;
-  text-align: center;
-  padding: 0 10px;
-}
-
-.score-circle.active {
-  background-color: rgb(218, 236, 255);
-  color: white;
-}
-.pagination-box {
-  display: flex;
-  justify-content: center;
-  height: 65px;
-}
-</style>

src/renderer/src/views/fullScreenPdf/index.vue

@@ -18,10 +18,7 @@ const loadPdfAnimation = (path) => {
   },2000)
 }
 onMounted(() => {
-  const pdfUrl1 = localStorage.getItem('PDF-TOOL-PATH')
+  const bookpath = localStorage.getItem('PDF-LOCAL-PATH')
-  const pdfUrl2 = localStorage.getItem('PDF-LOCAL-PATH')
-  console.log('tool-pdf 地址: ',pdfUrl1, pdfUrl2)
-  const bookpath = pdfUrl1 || pdfUrl2
   // const filepath = import.meta.env.VITE_APP_RES_FILE_PATH + bookpath
   // const isDev = process.env.NODE_ENV == 'development'
 // if (isDev) 
@@ -31,7 +28,7 @@ onMounted(() => {
   // const newpath = getStaticUrl(bookpath, 'user', 'selfFile', true)
   loadPdfAnimation(bookpath)
   // pdfUrl.value = filepath
-  // console.log('课件路径',bookpath);
+  // console.log('课件路径',newpath);
 })
 </script>
 <style>

src/renderer/src/views/login/components/Register.vue

@@ -28,7 +28,7 @@
         <el-input v-model="ruleForm.phoneNumber"  placeholder="请输入手机号" />
       </el-form-item>
       <el-form-item label="验证码" prop="Code" v-if="activeIndex==1">
-        <el-input style="width:60%" v-model="ruleForm.Code" :disabled="false" placeholder="请输入验证码"  />
+        <el-input style="width:60%" v-model="ruleForm.Code" :disabled="true" placeholder="请输入验证码"  />
         <el-button type="primary" style="margin-left:10px"  @click="sendcaptchaImg">发送验证码</el-button>
       </el-form-item>
       <el-form-item label="设置密码" prop="password" v-if="activeIndex==1">
@@ -409,13 +409,11 @@ const sbmitImg=()=>{
       type: type.value
     }
     sendCode(params).then(res=>{
-      isImg.value=false
       if(res.code==200){
-        // ruleForm.Code=res.data
+        ruleForm.Code=res.data
-        ElMessage.success(res.msg||'验证码-已发送')
-      }
-    }).catch(err=>{
         isImg.value=false
+      }
+
     })
    }else{
     ElMessage.error('请根据图片输入验证码')

src/renderer/src/views/login/defult-login.vue

@@ -1,264 +0,0 @@
-<template>
-  <div class="login-container">
-    <div class="box-item desc">
-      <div class="welcome">
-        <p>欢迎登录 {{ homeTitle }}</p>
-      </div>
-      <img class="welcome-img" :src="leftBg2" />
-    </div>
-    <div class="box-item login">
-      <WindowTools :is-has-max="false" />
-      <div class="login-title">账号登录</div>
-      <el-form ref="formRef" class="login-form" :model="loginForm" :rules="rules" size="large">
-        <el-form-item prop="username">
-          <el-input v-model.trim="loginForm.username" placeholder="请输入用户名" />
-        </el-form-item>
-        <el-form-item prop="password" style="margin-bottom: 15px">
-          <el-input v-model="loginForm.password" autocomplete="on" type="password" placeholder="请输入密码" />
-        </el-form-item>
-        <div class="flex mb-5">
-          <el-checkbox v-model="loginForm.rememberMe">记住密码</el-checkbox>
-          <!-- <el-checkbox >阅读并同意《xxx》</el-checkbox> -->
-        </div>
-
-        <el-form-item>
-          <el-button :loading="btnLoading" class="btn" type="primary" @click="submitForm(formRef)">登录</el-button>
-        </el-form-item>
-        <div class="flex mb-4" style="display: flex;justify-content: center;color: #ccc;cursor: pointer;">
-          <a class="hover:text-sky-500" style="margin-right: 10px;" @click="RegisterModel(1)">注册账号</a>
-          |
-          <a class="hover:text-sky-500" style="margin-left: 10px;" @click="RegisterModel(2)">忘记密码</a>
-        </div>
-      </el-form>
-    </div>
-  </div>
-  <el-dialog v-model="showDownLoading" width="500" :show-close="false" :close-on-click-modal="false"
-    :close-on-press-escape="false" align-center>
-    <el-progress :text-inside="true" :stroke-width="22" :percentage="downloadProp" :show-text="false"
-      status="success" />
-  </el-dialog>
-  <!--选择学科-->
-  <SelectSubject v-model="isSubject" :login-data="loginForm" />
-  <!--注册弹框-->
-  <Register ref="RegModel"></Register>
-</template>
-<script setup>
-import { onMounted, reactive, ref } from 'vue'
-import { ElMessage } from 'element-plus'
-import { encrypt, decrypt } from '@/utils/jsencrypt'
-import useUserStore from '@/store/modules/user'
-import leftBg2 from '@/assets/images/login/left-bg2.png'
-import WindowTools from '@/components/window-tools/index.vue'
-import SelectSubject from '@/components/select-subject/index.vue'
-import Register from './components/Register.vue'
-import { sessionStore } from '@/utils/store'
-
-const { session } = require('@electron/remote')
-const downloadProp = ref(0)
-const showDownLoading = ref(false)
-const { ipcRenderer } = window.electron || {}
-const formRef = ref()
-const userStore = useUserStore()
-const btnLoading = ref(false)
-const isSubject = ref(false)
-const RegModel = ref(false)
-//表单
-const loginForm = reactive({
-  username: '',
-  password: '',
-  rememberMe: false
-})
-
-//表单规则
-const rules = reactive({
-  username: [{ required: true, trigger: 'blur', message: '请输入您的账号' }],
-  password: [{ required: true, trigger: 'blur', message: '请输入您的密码' }]
-})
-
-let curWinUrl = import.meta.env.VITE_APP_BUILD_BASE_PATH
-let homeTitle = ref(import.meta.env.VITE_APP_TITLE)
-ipcRenderer.on('update-app-progress', (e, prop) => {
-  downloadProp.value = prop
-  showDownLoading.value = prop !== 100
-})
-// 打开弹窗
-const RegisterModel = type => {
-  RegModel.value.OpenModel(type)
-}
-//登录
-const submitForm = async (formEl) => {
-  if (!formEl) return
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      btnLoading.value = true
-
-      // 勾选了需要记住密码设置在 cookie 中设置记住用户名和密码
-      if (loginForm.rememberMe) {
-        await setCookie('username', loginForm.username)
-        await setCookie('password', encrypt(loginForm.password))
-        await setCookie('rememberMe', loginForm.rememberMe.toString())
-      } else {
-        // 否则移除
-        await session.defaultSession.clearStorageData({
-          origin: curWinUrl,
-          storages: ['cookies']
-        })
-      }
-
-      try {
-        await userStore.login(loginForm)
-        await userStore.getInfo()
-        if (userStore.user.edustage || userStore.user.edusubject) {
-          ElMessage.success('登录成功')
-          ipcRenderer && ipcRenderer.send('openMainWindow')
-        } else {
-          isSubject.value = true
-        }
-      } finally {
-        btnLoading.value = false
-      }
-    }
-  })
-}
-
-const getCookie = async () => {
-  const username = (await getCookieDetail('username'))[0]
-  const password = (await getCookieDetail('password'))[0]
-  const rememberMe = (await getCookieDetail('rememberMe'))[0]
-  loginForm.username = username ? username.value : loginForm.username
-  loginForm.password = password ? decrypt(password.value) : loginForm.password
-  loginForm.rememberMe = rememberMe ? Boolean(rememberMe.value) : false
-}
-
-// 获取cookie
-const getCookieDetail = (name) => {
-  return session.defaultSession.cookies.get({ url: curWinUrl, name })
-}
-
-// 设置cookie
-const setCookie = (name, value) => {
-  // 30天过期
-  let Days = 30
-  let times = Math.round(Date.now() / 1000) + Days * 24 * 60 * 60
-  const cookie = {
-    url: curWinUrl,
-    name,
-    value,
-    expirationDate: times
-  }
-  return session.defaultSession.cookies.set(cookie)
-}
-
-onMounted(() => {
-  localStorage.clear()
-  sessionStore.set('subject', {   
-    bookList: null, 
-    curBook: null, 
-    curNode: null, 
-    defaultExpandedKeys: [], 
-    subjectTree: [] 
-  })
-  getCookie()
-})
-</script>
-<style lang="scss" scoped>
-.login-container {
-  width: 100%;
-  height: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  -webkit-app-region: drag;
-
-  .box-item {
-    width: 444px;
-    height: 520px;
-
-    &.desc {
-      background: #ffffff;
-      border-radius: 12px 0px 0px 12px;
-      box-shadow: 0px 16px 73px 8px rgba(203, 203, 203, 0.2);
-      padding: 23px 25px;
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      justify-content: flex-start;
-      background-color: #003b94;
-    }
-
-    &.login {
-      background: #ffffff;
-      border-radius: 0px 12px 12px 0px;
-      padding: 34px 42px;
-      position: relative;
-    }
-
-    .welcome {
-      padding-top: 35px;
-
-      p {
-        color: #ffffff;
-        line-height: 25px;
-        letter-spacing: 0.26px;
-        text-align: center;
-        font-weight: 700;
-        font-size: 26px;
-      }
-    }
-
-    .welcome-img {
-      margin-top: 20px;
-      width: 350px;
-      height: 350px;
-    }
-
-    .login-title {
-      font-size: 20px;
-      text-align: center;
-      color: #1e1e1e;
-      margin-bottom: 35px;
-      margin-top: 50px;
-    }
-
-    .login-form {
-      -webkit-app-region: no-drag;
-
-      .captcha-input {
-        width: 60%;
-      }
-
-      .captcha-img {
-        cursor: pointer;
-      }
-    }
-
-    .btn {
-      width: 350px;
-      height: 50px;
-      border-radius: 4px;
-      font-size: 16px;
-      font-weight: 700;
-      text-align: center;
-      color: #ffffff;
-      line-height: 50px;
-      cursor: pointer;
-    }
-  }
-}
-
-.header-tool {
-  position: absolute;
-  right: 0;
-  top: 0;
-  -webkit-app-region: no-drag;
-
-  span {
-    padding: 5px 10px;
-    cursor: pointer;
-  }
-}
-
-.el-form-item {
-  margin-bottom: 40px;
-}
-</style>

src/renderer/src/views/login/index.vue

@@ -1,13 +1,264 @@
 <template>
-  <ycLogin v-if="buildMode === 'yc'">
+  <div class="login-container">
-  </ycLogin>
+    <div class="box-item desc">
-  <defultLogin v-else>
+      <div class="welcome">
-  </defultLogin>
+        <p>欢迎登录 {{ homeTitle }}</p>
+      </div>
+      <img class="welcome-img" :src="leftBg2" />
+    </div>
+    <div class="box-item login">
+      <WindowTools :is-has-max="false" />
+      <div class="login-title">账号登录</div>
+      <el-form ref="formRef" class="login-form" :model="loginForm" :rules="rules" size="large">
+        <el-form-item prop="username">
+          <el-input v-model.trim="loginForm.username" placeholder="请输入用户名" />
+        </el-form-item>
+        <el-form-item prop="password" style="margin-bottom: 15px">
+          <el-input v-model="loginForm.password" autocomplete="on" type="password" placeholder="请输入密码" />
+        </el-form-item>
+        <div class="flex mb-5">
+          <el-checkbox v-model="loginForm.rememberMe">记住密码</el-checkbox>
+          <!-- <el-checkbox >阅读并同意《xxx》</el-checkbox> -->
+        </div>
+
+        <el-form-item>
+          <el-button :loading="btnLoading" class="btn" type="primary" @click="submitForm(formRef)">登录</el-button>
+        </el-form-item>
+        <div class="flex mb-4" style="display: flex;justify-content: center;color: #ccc;cursor: pointer;">
+          <a class="hover:text-sky-500" style="margin-right: 10px;" @click="RegisterModel(1)">注册账号</a>
+          |
+          <a class="hover:text-sky-500" style="margin-left: 10px;" @click="RegisterModel(2)">忘记密码</a>
+        </div>
+      </el-form>
+    </div>
+  </div>
+  <el-dialog v-model="showDownLoading" width="500" :show-close="false" :close-on-click-modal="false"
+    :close-on-press-escape="false" align-center>
+    <el-progress :text-inside="true" :stroke-width="22" :percentage="downloadProp" :show-text="false"
+      status="success" />
+  </el-dialog>
+  <!--选择学科-->
+  <SelectSubject v-model="isSubject" :login-data="loginForm" />
+  <!--注册弹框-->
+  <Register ref="RegModel"></Register>
 </template>
 <script setup>
-import ycLogin from './yc-login.vue'
+import { onMounted, reactive, ref } from 'vue'
-import defultLogin from './defult-login.vue'
+import { ElMessage } from 'element-plus'
-const buildMode = import.meta.env.MODE
+import { encrypt, decrypt } from '@/utils/jsencrypt'
+import useUserStore from '@/store/modules/user'
+import leftBg2 from '@/assets/images/login/left-bg2.png'
+import WindowTools from '@/components/window-tools/index.vue'
+import SelectSubject from '@/components/select-subject/index.vue'
+import Register from './components/Register.vue'
+import { sessionStore } from '@/utils/store'
+
+const { session } = require('@electron/remote')
+const downloadProp = ref(0)
+const showDownLoading = ref(false)
+const { ipcRenderer } = window.electron || {}
+const formRef = ref()
+const userStore = useUserStore()
+const btnLoading = ref(false)
+const isSubject = ref(false)
+const RegModel = ref(false)
+//表单
+const loginForm = reactive({
+  username: '',
+  password: '',
+  rememberMe: false
+})
+
+//表单规则
+const rules = reactive({
+  username: [{ required: true, trigger: 'blur', message: '请输入您的账号' }],
+  password: [{ required: true, trigger: 'blur', message: '请输入您的密码' }]
+})
+
+let curWinUrl = import.meta.env.VITE_APP_BUILD_BASE_PATH
+let homeTitle = ref(import.meta.env.VITE_APP_TITLE)
+ipcRenderer.on('update-app-progress', (e, prop) => {
+  downloadProp.value = prop
+  showDownLoading.value = prop !== 100
+})
+// 打开弹窗
+const RegisterModel = type => {
+  RegModel.value.OpenModel(type)
+}
+//登录
+const submitForm = async (formEl) => {
+  if (!formEl) return
+  await formEl.validate(async (valid) => {
+    if (valid) {
+      btnLoading.value = true
+
+      // 勾选了需要记住密码设置在 cookie 中设置记住用户名和密码
+      if (loginForm.rememberMe) {
+        await setCookie('username', loginForm.username)
+        await setCookie('password', encrypt(loginForm.password))
+        await setCookie('rememberMe', loginForm.rememberMe.toString())
+      } else {
+        // 否则移除
+        await session.defaultSession.clearStorageData({
+          origin: curWinUrl,
+          storages: ['cookies']
+        })
+      }
+
+      try {
+        await userStore.login(loginForm)
+        await userStore.getInfo()
+        if (userStore.user.edustage || userStore.user.edusubject) {
+          ElMessage.success('登录成功')
+          ipcRenderer && ipcRenderer.send('openMainWindow')
+        } else {
+          isSubject.value = true
+        }
+      } finally {
+        btnLoading.value = false
+      }
+    }
+  })
+}
+
+const getCookie = async () => {
+  const username = (await getCookieDetail('username'))[0]
+  const password = (await getCookieDetail('password'))[0]
+  const rememberMe = (await getCookieDetail('rememberMe'))[0]
+  loginForm.username = username ? username.value : loginForm.username
+  loginForm.password = password ? decrypt(password.value) : loginForm.password
+  loginForm.rememberMe = rememberMe ? Boolean(rememberMe.value) : false
+}
+
+// 获取cookie
+const getCookieDetail = (name) => {
+  return session.defaultSession.cookies.get({ url: curWinUrl, name })
+}
+
+// 设置cookie
+const setCookie = (name, value) => {
+  // 30天过期
+  let Days = 30
+  let times = Math.round(Date.now() / 1000) + Days * 24 * 60 * 60
+  const cookie = {
+    url: curWinUrl,
+    name,
+    value,
+    expirationDate: times
+  }
+  return session.defaultSession.cookies.set(cookie)
+}
+
+onMounted(() => {
+  localStorage.clear()
+  sessionStore.set('subject', {   
+    bookList: null, 
+    curBook: null, 
+    curNode: null, 
+    defaultExpandedKeys: [], 
+    subjectTree: [] 
+  })
+  getCookie()
+})
 </script>
 <style lang="scss" scoped>
+.login-container {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  -webkit-app-region: drag;
+
+  .box-item {
+    width: 444px;
+    height: 520px;
+
+    &.desc {
+      background: #ffffff;
+      border-radius: 12px 0px 0px 12px;
+      box-shadow: 0px 16px 73px 8px rgba(203, 203, 203, 0.2);
+      padding: 23px 25px;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: flex-start;
+      background-color: #003b94;
+    }
+
+    &.login {
+      background: #ffffff;
+      border-radius: 0px 12px 12px 0px;
+      padding: 34px 42px;
+      position: relative;
+    }
+
+    .welcome {
+      padding-top: 35px;
+
+      p {
+        color: #ffffff;
+        line-height: 25px;
+        letter-spacing: 0.26px;
+        text-align: center;
+        font-weight: 700;
+        font-size: 26px;
+      }
+    }
+
+    .welcome-img {
+      margin-top: 20px;
+      width: 350px;
+      height: 350px;
+    }
+
+    .login-title {
+      font-size: 20px;
+      text-align: center;
+      color: #1e1e1e;
+      margin-bottom: 35px;
+      margin-top: 50px;
+    }
+
+    .login-form {
+      -webkit-app-region: no-drag;
+
+      .captcha-input {
+        width: 60%;
+      }
+
+      .captcha-img {
+        cursor: pointer;
+      }
+    }
+
+    .btn {
+      width: 350px;
+      height: 50px;
+      border-radius: 4px;
+      font-size: 16px;
+      font-weight: 700;
+      text-align: center;
+      color: #ffffff;
+      line-height: 50px;
+      cursor: pointer;
+    }
+  }
+}
+
+.header-tool {
+  position: absolute;
+  right: 0;
+  top: 0;
+  -webkit-app-region: no-drag;
+
+  span {
+    padding: 5px 10px;
+    cursor: pointer;
+  }
+}
+
+.el-form-item {
+  margin-bottom: 40px;
+}
 </style>

src/renderer/src/views/login/yc-login.vue

@@ -1,287 +0,0 @@
-<template>
-  <div class="login-container">
-    <div class="login-yc">
-      <img class="welcome-img" :src="buildMode === 'yc2?'?leftBg2:leftBg1" />
-    </div>
-    <div class="box-item login">
-      <WindowTools :is-has-max="false" />
-      <div style="display: flex;justify-content: center;"><img class="title-logo" :src="yclogo" /></div>
-      <div class="login-title">永川中小学</div>
-      <div class="login-title2">{{buildMode === 'yc2?'?'重庆永川虚拟仿真AI实训教学管理系统':'人工智能赋能科学素养与劳动技能系统'}}</div>
-      <el-form ref="formRef" class="login-form" :model="loginForm" :rules="rules" size="large">
-        <el-form-item prop="username">
-          <el-input v-model.trim="loginForm.username" placeholder="请输入用户名" />
-        </el-form-item>
-        <el-form-item prop="password" style="margin-bottom: 15px">
-          <el-input v-model="loginForm.password" autocomplete="on" type="password" placeholder="请输入密码" />
-        </el-form-item>
-        <div class="flex mb-5">
-          <el-checkbox v-model="loginForm.rememberMe">记住密码</el-checkbox>
-          <!-- <el-checkbox >阅读并同意《xxx》</el-checkbox> -->
-        </div>
-
-        <el-form-item style="margin-bottom: 20px;">
-          <el-button :loading="btnLoading" class="btn" type="primary" @click="submitForm(formRef)">登录</el-button>
-        </el-form-item>
-        <div class="flex mb-4" style="display: flex;justify-content: center;color: #ccc;cursor: pointer;">
-          <a class="hover:text-sky-500" style="margin-right: 10px;" @click="RegisterModel(1)">注册账号</a>
-          |
-          <a class="hover:text-sky-500" style="margin-left: 10px;" @click="RegisterModel(2)">忘记密码</a>
-        </div>
-        <div class="title-bottom">
-          重庆市永川区教育委员会
-        </div>
-      </el-form>
-    </div>
-  </div>
-  <el-dialog v-model="showDownLoading" width="500" :show-close="false" :close-on-click-modal="false"
-    :close-on-press-escape="false" align-center>
-    <el-progress :text-inside="true" :stroke-width="22" :percentage="downloadProp" :show-text="false"
-      status="success" />
-  </el-dialog>
-  <!--选择学科-->
-  <SelectSubject v-model="isSubject" :login-data="loginForm" />
-  <!--注册弹框-->
-  <Register ref="RegModel"></Register>
-</template>
-<script setup>
-import { onMounted, reactive, ref } from 'vue'
-import { ElMessage } from 'element-plus'
-import { encrypt, decrypt } from '@/utils/jsencrypt'
-import useUserStore from '@/store/modules/user'
-import yclogo from '@/assets/images/login/yc-logo.png'
-import leftBg1 from '@/assets/images/login/ycpeitu.png'
-import leftBg2 from '@/assets/images/login/ycpeitu2.jpg'
-import WindowTools from '@/components/window-tools/index.vue'
-import SelectSubject from '@/components/select-subject/index.vue'
-import Register from './components/Register.vue'
-import { sessionStore } from '@/utils/store'
-const buildMode = import.meta.env.MODE
-const { session } = require('@electron/remote')
-const downloadProp = ref(0)
-const showDownLoading = ref(false)
-const { ipcRenderer } = window.electron || {}
-const formRef = ref()
-const userStore = useUserStore()
-const btnLoading = ref(false)
-const isSubject = ref(false)
-const RegModel = ref(false)
-//表单
-const loginForm = reactive({
-  username: '',
-  password: '',
-  rememberMe: false
-})
-
-//表单规则
-const rules = reactive({
-  username: [{ required: true, trigger: 'blur', message: '请输入您的账号' }],
-  password: [{ required: true, trigger: 'blur', message: '请输入您的密码' }]
-})
-
-let curWinUrl = import.meta.env.VITE_APP_BUILD_BASE_PATH
-ipcRenderer.on('update-app-progress', (e, prop) => {
-  downloadProp.value = prop
-  showDownLoading.value = prop !== 100
-})
-// 打开弹窗
-const RegisterModel = type => {
-  RegModel.value.OpenModel(type)
-}
-//登录
-const submitForm = async (formEl) => {
-  if (!formEl) return
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      btnLoading.value = true
-
-      // 勾选了需要记住密码设置在 cookie 中设置记住用户名和密码
-      if (loginForm.rememberMe) {
-        await setCookie('username', loginForm.username)
-        await setCookie('password', encrypt(loginForm.password))
-        await setCookie('rememberMe', loginForm.rememberMe.toString())
-      } else {
-        // 否则移除
-        await session.defaultSession.clearStorageData({
-          origin: curWinUrl,
-          storages: ['cookies']
-        })
-      }
-
-      try {
-        await userStore.login(loginForm)
-        await userStore.getInfo()
-        if (userStore.user.edustage || userStore.user.edusubject) {
-          ElMessage.success('登录成功')
-          ipcRenderer && ipcRenderer.send('openMainWindow')
-        } else {
-          isSubject.value = true
-        }
-      } finally {
-        btnLoading.value = false
-      }
-    }
-  })
-}
-
-const getCookie = async () => {
-  const username = (await getCookieDetail('username'))[0]
-  const password = (await getCookieDetail('password'))[0]
-  const rememberMe = (await getCookieDetail('rememberMe'))[0]
-  loginForm.username = username ? username.value : loginForm.username
-  loginForm.password = password ? decrypt(password.value) : loginForm.password
-  loginForm.rememberMe = rememberMe ? Boolean(rememberMe.value) : false
-}
-
-// 获取cookie
-const getCookieDetail = (name) => {
-  return session.defaultSession.cookies.get({ url: curWinUrl, name })
-}
-
-// 设置cookie
-const setCookie = (name, value) => {
-  // 30天过期
-  let Days = 30
-  let times = Math.round(Date.now() / 1000) + Days * 24 * 60 * 60
-  const cookie = {
-    url: curWinUrl,
-    name,
-    value,
-    expirationDate: times
-  }
-  return session.defaultSession.cookies.set(cookie)
-}
-
-onMounted(() => {
-  localStorage.clear()
-  sessionStore.set('subject', {
-    bookList: null,
-    curBook: null,
-    curNode: null,
-    defaultExpandedKeys: [],
-    subjectTree: []
-  })
-  getCookie()
-})
-</script>
-<style lang="scss" scoped>
-.login-container {
-  width: 100%;
-  height: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  -webkit-app-region: drag;
-  .login-yc{
-    width: 100%;
-    height: 100%;
-    img{
-      width: 100%;
-      height: 100%;
-    }
-  }
-  .box-item {
-    width: 444px;
-    height: 520px;
-
-    &.desc {
-      background: #ffffff;
-      border-radius: 12px 0px 0px 12px;
-      box-shadow: 0px 16px 73px 8px rgba(203, 203, 203, 0.2);
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      justify-content: flex-start;
-      background-color: #003b94;
-    }
-
-    &.login {
-      background: #ffffff;
-      border-radius: 0px 12px 12px 0px;
-      padding: 34px 15px;
-      position: relative;
-      .title-logo{
-        width: 50px;
-      }
-    }
-
-    .welcome {
-      padding-top: 35px;
-
-      p {
-        color: #ffffff;
-        line-height: 25px;
-        letter-spacing: 0.26px;
-        text-align: center;
-        font-weight: 700;
-        font-size: 26px;
-      }
-    }
-
-    /*.welcome-img {
-      margin-top: 20px;
-      width: 350px;
-      height: 350px;
-    }*/
-
-    .login-title {
-      font-size: 20px;
-      text-align: center;
-      color: #1e1e1e;
-      margin-bottom: 10px;
-      margin-top: 5px;
-      font-width: bold;
-    }
-
-    .login-title2 {
-      margin-bottom: 20px;
-    }
-
-    .login-form {
-      -webkit-app-region: no-drag;
-
-      .captcha-input {
-        width: 60%;
-      }
-
-      .captcha-img {
-        cursor: pointer;
-      }
-      .title-bottom{
-        text-align: center;
-        width: 100%;
-        font-size: 14px;
-        color: rgba(0, 0, 0, 0.45);
-      }
-    }
-
-    .btn {
-      width: 350px;
-      height: 50px;
-      border-radius: 4px;
-      font-size: 16px;
-      font-weight: 700;
-      text-align: center;
-      color: #ffffff;
-      line-height: 50px;
-      cursor: pointer;
-    }
-  }
-}
-
-.header-tool {
-  position: absolute;
-  right: 0;
-  top: 0;
-  -webkit-app-region: no-drag;
-
-  span {
-    padding: 5px 10px;
-    cursor: pointer;
-  }
-}
-
-.el-form-item {
-  margin-bottom: 40px;
-}
-</style>

src/renderer/src/views/prepare/components/chooseTextbook.vue

@@ -1,308 +0,0 @@
-<template>
-    <div class="book-wrap">
-      <el-scrollbar height="100%">
-        <div class="book-name flex" @click="dialogVisible = true">
-          <span>{{ curBook.data.itemtitle }}</span>
-          <i class="iconfont icon-xiangyou"></i>
-        </div>
-        <div class="book-list" v-loading="treeLoading">
-          <el-tree :data="treeData" accordion :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>
-            </template>
-          </el-tree>
-        </div>
-      </el-scrollbar>
-    </div>
-    <!--弹窗 选择教材-->
-    <el-dialog v-model="dialogVisible" append-to-body :show-close="false" width="550"
-      style="border-radius: 10px; padding: 10px 15px;">
-      <template #header>
-        <div class="choose-book-header flex">
-          <span>切换教材</span>
-          <i class="iconfont icon-guanbi" @click="dialogVisible = false"></i>
-        </div>
-      </template>
-  
-      <div class="textbook-container">
-        <el-scrollbar height="450px">
-          <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 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>
-      </div>
-    </el-dialog>
-</template>
-  
-  <script setup>
-  import { onMounted, ref, nextTick, toRaw, reactive } from 'vue';
-  import { cloneDeep } from 'lodash'
-  import { sessionStore } from '@/utils/store'
-  import { useGetSubject } from '@/hooks/useGetSubject'
-  
-  const BaseUrl = import.meta.env.VITE_APP_BUILD_BASE_PATH
-  // 定义要发送的emit事件
-  const emit = defineEmits(['nodeClick', 'changeBook'])
-  let useSubject = null
-  const subjectList = ref([])
-  const dialogVisible = ref(false)
-  // 当前教材下面单元内容数据
-  const treeData = ref([])
-  const defaultProps = {
-    children: 'children',
-    label: 'itemtitle',
-    class: 'textbook-tree'
-  }
-  // 当前选中的教材
-  const curBook = reactive({
-    data: {}
-  })
-  // 当前节点
-  const curNode = reactive({
-    data:{}
-  })
-  const treeLoading = ref(false)
-  // 默认展开的节点
-  const defaultExpandedKeys = ref([])
-  
-  //选择教材
-  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(() => {
-      dialogVisible.value = false
-    }, 100);
-  }
-  
-  const getLastLevelData = (tree) => {
-    let lastLevelData = [];
-    // 递归函数遍历树形结构
-    function traverseTree(nodes) {
-      nodes.forEach((node) => {
-        // 如果当前节点有子节点，继续遍历
-        if (node.children && node.children.length > 0) {
-          traverseTree(node.children);
-        } else {
-          // 如果没有子节点，说明是最后一层的节点
-          lastLevelData.push(node);
-        }
-      });
-    }
-  
-    // 调用递归函数开始遍历
-    traverseTree(tree);
-  
-    // 返回最后一层的数据
-    return lastLevelData;
-  }
-  // 根据id 拿到父节点数据
-  const findParentByChildId = (treeData, targetNodeId) => {
-    // 递归查找函数
-    // 遍历树中的每个节点
-    for (let node of treeData) {
-      // 检查当前节点的子节点是否包含目标子节点 ID
-      if (node.children && node.children.some(child => child.id === targetNodeId)) {
-        // 如果当前节点的某个子节点的 ID 匹配目标子节点 ID，则当前节点即为父节点
-        return node;
-      }
-      // 如果当前节点没有匹配的子节点，则递归检查当前节点的子节点
-      if (node.children) {
-        let parentNode = findParentByChildId(node.children, targetNodeId);
-        if (parentNode) {
-          return parentNode;
-        }
-      }
-    }
-    // 如果未找到匹配的父节点，则返回 null 或者适当的默认值
-    return null;
-  }
-  
-  
-  const handleNodeClick = (data) => {
-    /**
-     * data : 当前节点数据
-     */
-    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: curBook.data.id,
-        curBookName: curBook.data.itemtitle,
-        curBookImg: BaseUrl + curBook.data.avartar,
-        curBookPath: curBook.data.fileurl
-      },
-      node: nodeData
-    }
-    // 本地存储:electron-store
-    emit('nodeClick', curData)
-  }
-  onMounted( async () => {
-    treeLoading.value = true
-    try{
-      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]
-      }
-  
-      // 章节"树"
-      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)
-      })
-    
-    } finally{
-      treeLoading.value = false
-    }
-  
-  })
-  
-  </script>
-  
-  <style lang="scss" scoped>
-  .book-wrap {
-    width: 300px;
-    height: 100%;
-    background: #ffffff;
-    border-radius: 10px;
-    box-shadow: 0px 0px 20px 0px rgba(99, 99, 99, 0.06);
-    display: flex;
-    flex-direction: column;
-    position: relative;
-  
-    .book-name {
-      background-color: #ffffff;
-      position: absolute;
-      left: 0;
-      top: 0;
-      width: 100%;
-      height: 45px;
-      padding: 0 15px;
-      z-index: 1;
-      justify-content: space-between;
-      align-items: center;
-      color: #3b3b3b;
-      cursor: pointer;
-      border-bottom: solid #f4f5f7 1px;
-      font-size: 15px;
-      font-weight: 600;
-      border-radius: 10px 10px 0 0;
-    }
-  
-    .book-list {
-      padding: 45px 10px 0 10px;
-      flex: 1;
-    }
-  }
-  
-  :deep(.choose-dialog) {
-    border-radius: 10px;
-  }
-  
-  .choose-book-header {
-    justify-content: space-between;
-    font-size: 15px;
-    font-weight: bold;
-  
-    .icon-guanbi {
-      font-size: 20px;
-      cursor: pointer;
-    }
-  }
-  
-  .textbook-container {
-    .textbook-item {
-      padding: 10px 20px;
-      align-items: center;
-      border-radius: 5px;
-      cursor: pointer;
-  
-      .book-name {
-        margin-left: 20px;
-        color: #3b3b3b;
-        font-size: 13px;
-      }
-  
-      &:hover {
-        background: #f4f7f9;
-      }
-    }
-  
-    .active-item {
-      background-color: #f4f7f9;
-  
-      .book-name {
-        color: #368fff;
-        font-weight: bold
-      }
-    }
-  
-    .textbook-img {
-      width: 55px;
-      height: 70px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-    }
-  }
-  
-  :deep(.el-tree-node) {
-    .el-tree-node__content {
-      height: 40px;
-      border-radius: 10px;
-  
-      &:hover {
-        background-color: #eaf3ff;
-      }
-    }
-  }
-  
-  .tree-label {
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-  }
-  
-  :deep(.el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content) {
-    background-color: #eaf3ff !important;
-    color: #409EFF
-  }
-  </style>
-  

src/renderer/src/views/prepare/components/treeLog.vue

@@ -1,64 +0,0 @@
-<template>
-    <div style="padding: 10px;">
-      <el-dialog
-        v-model="dialogVisible"
-        width="350"
-        append-to-body
-      >
-        <div style="display: flex;justify-content: center;">
-          <ChooseTextbook @node-click="nodeClick" />
-        </div>
-        <template #footer>
-          <div class="dialog-footer">
-            <el-button @click="dialogVisible = false">取消</el-button>
-            <el-button type="primary" @click.stop="save">确定</el-button>
-          </div>
-        </template>
-      </el-dialog>
-    </div>
-</template>
-
-  <script setup>
-  import { ref, defineExpose,defineEmits } from 'vue'
-  import ChooseTextbook from './chooseTextbook.vue'
-  const emit = defineEmits(['onsuccess'])
-
-  const dialogVisible = ref(false)
-  const getNodeInfo = ref({})
-
-  const openDialog = () => {
-    dialogVisible.value = true
-  }
-
-  const getFullObj = (node) => {
-    const obj = []
-    const recursive = (currentNode) => {
-      // 这里添加节点参数
-      if (currentNode.parentNode) {
-        obj.unshift({id: currentNode.id,title:currentNode.itemtitle})
-        recursive(currentNode.parentNode)
-      } else {
-        obj.unshift({id: currentNode.id,title:currentNode.itemtitle})
-      }
-    }
-    recursive(node)
-    return obj
-  }
-
-  const nodeClick = (data) => {
-    getNodeInfo.value = {
-      textbookId:data.node.rootid,
-      cataList:getFullObj(data.node)
-    }
-    console.log(getNodeInfo.value,'log')
-  }
-
-  const save = () => {
-    dialogVisible.value = false
-    emit('onsuccess', getNodeInfo.value)
-  }
-
-  defineExpose({
-    openDialog
-  })
-  </script>

src/renderer/src/views/prepare/container/ai-ppt.vue

@@ -620,7 +620,7 @@ const changeCursor = (cursorStyle) => {
 };
 
 onMounted(() => {
-  // let url = "https://bjcdn.openstorage.cn/xinghuo-privatedata/%2Ftmp/apiTempFileba724e0344f74e1480535eedf3ebec661601807661085006275/%E9%87%91%E9%A9%AC%E5%A5%96%E5%B0%B4%E5%B0%AC%E4%BA%8B%E4%BB%B6%E5%88%86%E6%9E%90%E4%B8%8E%E5%BA%94%E5%AF%B9%E7%AD%96%E7%95%A5.pptx"
+  // let url = "https://bjcdn.openstorage.cn/xinghuo-privatedata/%2Ftmp/apiTempFiledf28bf990a4c40ffb7477ed4b65392c27232357022409613439/%E3%80%8A%E9%9D%99%E5%A5%B3%E3%80%8B%E6%B7%B1%E5%BA%A6%E8%A7%A3%E8%AF%BB%E4%B8%8E%E7%A0%94%E7%A9%B6.pptx"
   // creatAIPPT(props.currentNode.itemtitle + '.pptx',url, props.uploadData).then((res) => {
   //   emit('addSuccess',res)
   // })

src/renderer/src/views/prepare/container/ai-pptV2.vue

@@ -1,389 +0,0 @@
-<template>
-  <div class="ai-container">
-    <el-steps style="max-width:100% " :active="activeStep" align-center>
-      <el-step title="生成大纲" />
-      <el-step title="选择模板" />
-      <el-step title="制作PPT" />
-    </el-steps>
-    <div class="card-box">
-      <el-card class="card2" v-if="activeStep === 0">
-          <div class="paragraphs">
-            {{ outputText }}
-          </div>
-         <el-button style="margin-bottom: 5px;" type="primary" @click="addMessage">从新生成</el-button>
-        <el-button style="margin-bottom: 5px;" type="primary" @click="activeStep = 1">下一步</el-button>
-      </el-card>
-      <el-card v-if="activeStep === 1">
-        <div style="padding-bottom: 10px">ppt模板选择</div>
-        <div class="themes">
-          <div v-for="item in backGroundList" :key="item.templateIndexId" :style="{
-            padding: '5px',
-            paddingRight: '5px',
-            paddingLeft: '5px',
-            margin: '5px',
-            backgroundColor: getBackgroundColor(item.templateIndexId),
-            borderRadius: '10px',
-            borderBlock: '10px solid #e6e6e6'
-          }" @click="chooseBackground(item.templateIndexId)" @mouseenter="changeCursor('pointer')" @mouseleave="changeCursor('default')">
-            {{ item.name }}
-            <img style="width: 150px; height: auto" :src="getBackGroundImg(item.detailImage)" alt="" />
-          </div>
-        </div>
-        <el-row class="el-row">
-<!--          <el-col :span="6" class="el-col">
-            <div class="grid-content-1">
-              <div>演讲备注</div>
-              <el-switch v-model="outlineData.is_card_note" />
-            </div>
-          </el-col>-->
-<!--          <el-col :span="6" class="el-col">
-            <div class="grid-content-2">
-              <div>生成封面</div>
-              <el-switch v-model="outlineData.is_cover_img" />
-            </div>
-          </el-col>-->
-          <el-col :span="6" class="el-col">
-            <div class="grid-content-1">
-              <div>自动配图</div>
-              <el-switch v-model="outlineData.isFigure" />
-            </div>
-          </el-col>
-          <el-col :span="6" class="el-col">
-            <div class="grid-content-2">
-              <div>PPT作者名：</div>
-              <el-input v-model="outlineData.author" style="width: 50%" />
-            </div>
-          </el-col>
-        </el-row>
-        <div>
-          <el-button style="margin-bottom: 5px;" type="primary" @click="activeStep = 0">上一步</el-button>
-          <el-button style="margin-bottom: 5px;" type="primary" v-loading="createPPTLoading" @click="outlineCreatePPT()">生成PPT</el-button>
-        </div>
-      </el-card>
-      <el-card v-if="activeStep === 2">
-        <el-progress :percentage="percentage" type="circle"></el-progress>
-      </el-card>
-    </div>
-  </div>
-</template>
-
-
-<script setup>
-import { ref, onMounted } from "vue";
-import { ElMessage } from 'element-plus'
-import {
-  getBackGroundV2,
-  createPPTV2,
-  getProgressV2,
-} from "@/utils/ppt-request.js";
-import CryptoJS from "crypto-js"
-
-import { getSignature } from "@/utils/index.js";
-import {sessionStore} from "@/utils/store";
-
-let appId = "01ec9aa3";
-let secret = "M2QxMDAxMjYyYTEzODMwMGRkZTQ4NmUy";
-let apikey = "39d05b269fa229f431a56c21794a8ea5"
-let timestamp = Math.floor(Date.now() / 1000);
-let signature = getSignature(appId, secret, timestamp);
-const { ipcRenderer } = window.electron || {}
-
-
-const outputText = ref("");  // 用于展示的大纲数据
-const stagingData = ref([]);  //储存的对话数据，用于多轮对话
-const stagOutputText = ref("");  // 暂存大纲用于拆分
-let extractedParts = ref([]) // 初步拆分
-
-let firstArray = ref([]); //大纲的大纲等级数字部分
-let secondArray = ref([]); //大纲的文字部分
-
-
-const backGroundList = ref([]);
-let subjectdata = sessionStore.get('subject.curNode')
-const inputTheme = ref(subjectdata.edustage + subjectdata.edusubject + "《" + subjectdata.itemtitle + "》的授课课件"); // 输入的主题
-const inputRequire = ref("") // 输入的需求
-const activeStep = ref(0);  // 上方进度条
-const combined = ref('')  // 修改完毕的大纲数据，准备传入ppt生成模型
-
-const treeData = ref([]);
-const status = ref("init");
-
-const percentage = ref(0);
-
-const createPPTLoading = ref(false);
-
-const getBackgrounds = () => {
-  treeData.value = [];
-  getBackGroundV2().then((res) => {
-    console.log(res);
-    backGroundList.value = res.records;
-  });
-};
-
-const getBackGroundImg = (imgUrlStr) => {
-  return JSON.parse(imgUrlStr).titleCoverImage
-};
-
-const outlineData = ref({
-  query: '',  // 用户要求（最多8000字）
-  // templateId: 'auto',  // ppt生成主题
-  author: 'AIX平台',
-  isFigure: false,   // 是否自动配图
-  search: true,
-  language: "cn"
-}
-)
-
-const emit = defineEmits(['addSuccess'])
-const props = defineProps({
-  dataList: {
-      type: Array,
-      default: () => []
-    }
-})
-
-// 将输入数据或返回数据存入记忆中
-function updateStagingData(role, newData) {
-  stagingData.value.push({ role: role, content: newData });
-}
-//大纲直接生成ppt
-const outlineCreatePPT = () => {
-  const newOutlineData = { ...outlineData.value, };
-  newOutlineData.query = outputText.value;
-  createPPTLoading.value = true;
-  createPPTV2(newOutlineData).then((res) => {
-    console.log(res, "正在生成中");
-    createPPTLoading.value = false;
-    activeStep.value = 2
-
-    const checkProgress = () => {
-      getProgressV2(res.sid).then(response => {
-        percentage.value = Math.round(response?.donePages*100/response?.totalPages);
-        if (response.pptStatus === "done") {
-          emit('addSuccess',{...res,url:response.pptUrl})
-          ElMessage.success("生成成功");
-        } else {
-          const sleepTime = 2000;
-          let remainingTime = sleepTime;
-          const intervalId = setInterval(() => {
-            remainingTime -= 100;
-            if (remainingTime <= 0) {
-              clearInterval(intervalId);
-              checkProgress();
-            }
-          }, 100);
-        }
-      });
-    };
-
-    checkProgress();
-  })
-};
-
-//初次对话
-const addMessage = () => {
-  const themeValue = inputTheme.value;
-  const requireValue = inputRequire.value;
-  firstArray.value = []
-  secondArray.value = []
-  extractedParts.value = []
-  stagOutputText.value = ''
-  const combinedString = `请帮我生成一个ppt大纲，主题为：${themeValue}。具体内容要求为：${requireValue}。注意，用三个等级大纲展示，如1. 1.1 1.1.2 2. 2.1这种类型，且按照这种顺序，不要有完全相同数字等级的大纲，不要有目录`
-  updateStagingData("user", combinedString);
-  connectWebSocket(stagingData.value);
-  // activeStep.value = 3
-};
-
-let ttsWS
-function connectWebSocket(data) {
-  outputText.value = "";    //清楚展示部分内容
-  status.value = "ttsing";
-  return getWebsocketUrl().then((url) => {
-    ttsWS = new WebSocket(url);
-    ttsWS.onopen = () => {
-      webSocketSend(ttsWS, data);
-    };
-    ttsWS.onmessage = (e) => {
-      result1(e.data);
-    };
-    ttsWS.onerror = (e) => {
-      status.value = "error";
-      console.log("WebSocket error:", e);
-    };
-    ttsWS.onclose = () => {
-      status.value = "init";
-    };
-  });
-}
-
-const getBackgroundColor = (key) => {
-  return outlineData.value.templateId === key ? '#83e2b6' : '#f5f5f5';
-};
-
-function getWebsocketUrl() {
-  return new Promise((resolve, reject) => {
-    var apiKey = apikey;
-    var apiSecret = secret;
-    var url = "wss://spark-api.xf-yun.com/v4.0/chat";
-
-    var host = "spark-api.xf-yun.com";
-    var date = new Date().toGMTString();
-    var algorithm = "hmac-sha256";
-    var headers = "host date request-line";
-    var signatureOrigin = `host: ${host}\ndate: ${date}\nGET /v4.0/chat HTTP/1.1`;
-    var signatureSha = CryptoJS.HmacSHA256(signatureOrigin, apiSecret);
-    var signature = CryptoJS.enc.Base64.stringify(signatureSha);
-
-    var authorizationOrigin = `api_key="${apiKey}", algorithm="${algorithm}", headers="${headers}", signature="${signature}"`;
-    var authorization = CryptoJS.enc.Base64.stringify(
-      CryptoJS.enc.Utf8.parse(authorizationOrigin)
-    );
-
-    url = `${url}?authorization=${authorization}&date=${date}&host=${host}`;
-    console.log(url);
-    resolve(url);
-  });
-}
-function webSocketSend(ws, data) {
-  const params = {
-    header: {
-      app_id: appId,
-    },
-    parameter: {
-      chat: {
-        domain: "4.0Ultra",
-        temperature: 0.5,
-        max_tokens: 1024,
-      },
-    },
-    payload: {
-      message: {
-        text: data,
-      },
-    },
-  };
-  ws.send(JSON.stringify(params));
-}
-
-function result1(resultData) {
-  let jsonData = JSON.parse(resultData);
-  outputText.value += jsonData.payload.choices.text[0].content;
-  const div = document.querySelector('.paragraphs');
-  if (div) {
-    div.scrollTop = div.scrollHeight;
-  }
-  if (jsonData.payload && jsonData.payload.usage) {
-    updateStagingData("assistant", outputText.value)  //返回数据存入记忆池
-  }
-  if (jsonData.header.code !== 0) {
-    alert(`提问失败: ${jsonData.header.code}:${jsonData.header.message}`);
-  }
-}
-
-const chooseBackground = (data) => {
-  outlineData.value.templateId = data
-}
-
-const changeCursor = (cursorStyle) => {
-  document.documentElement.style.cursor = cursorStyle;
-};
-
-onMounted(() => {
-  // let pptUrl = "https://bjcdn.openstorage.cn/xinghuo-privatedata/zhiwen/2024-12-06/23754754-b5bb-494a-b96d-7a5dc78820eb/89c1aefc634a4566a1779b2bc8ffa943.pptx";
-  // emit('addSuccess',{url:pptUrl})
-  props.dataList.filter(item => {
-    inputRequire.value += item.answer
-  })
-  getBackgrounds();
-  // addMessage()
-});
-</script>
-
-<style scoped>
-.ai-container {
-  width: 100%;
-  background-color: #f5f7f6;
-  padding: 20px
-}
-
-.card-box {
-  margin-top: 20px;
-}
-
-.card1 {
-  padding: 0;
-  width: 100%;
-}
-
-.paragraphs {
-  white-space: pre-wrap;
-  text-align: left;
-  max-height: 60vh;
-  overflow-y: auto;
-  border: 1px solid #409EFF;
-  padding: 10px;
-  margin: 5px
-}
-
-.themes {
-  display: flex;
-  flex-wrap: wrap;
-  height: 250px;
-  overflow-y: auto;
-}
-
-.outline {
-  white-space: pre-wrap;
-  text-align: left;
-
-  border: 1px solid #409EFF;
-  padding: 10px;
-  outline-style: none;
-  /* margin: 5px */
-}
-
-.outline-row {
-  display: flex;
-}
-
-.outline-row>.el-col {
-  display: flex;
-  flex-direction: column
-}
-
-.outline-row>.el-col>div,
-.outline-row>.el-col>div>.el-input {
-  flex: 1;
-  display: flex;
-  align-items: center;
-  padding: 3px;
-}
-
-.item-with-dash {
-  margin-left: 100px
-}
-
-.item-with-dash::after {
-  content: "";
-  border-bottom: 1px dashed #000;
-  flex-grow: 1;
-  margin-left: 4px;
-}
-
-.grid-content-1 {
-  border-radius: 4px;
-  background-color: #c2dbf3;
-}
-
-.grid-content-2 {
-  border-radius: 4px;
-  background-color: #f5f5f5;
-}
-
-.el-row {
-  padding: 20px
-}
-:deep(.el-card__body){
-  padding: 10px 15px;
-}
-</style>

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

@@ -226,7 +226,7 @@ const getClasscourseList = async type => {
   const {classid} = classForm.form
   const {entpcourseid} = myClassActive.value
   if (!classid || !entpcourseid) return
-  const params = {classid, entpcourseid, entpcoursefileid: 0, pageSize: 1000}
+  const params = {classid, entpcourseid, entpcoursefileid: 0}
   const res = await Http_Classcourse.listClasscourse(params)
   if (res.code == 200) {
     // zdg: 排序id大的在前(最新的)
@@ -255,9 +255,9 @@ const createClasscourse = async () => {
     entpcourseid, evalid, coursetitle,
     plandate: curDate, opendate: curDate
   }
-  teacherForm.form.classcourseid = await Http_Classcourse.addClasscourseReturnId(params)
+  await Http_Classcourse.addClasscourseReturnId(params)
   dt.loading = false
-  // getClasscourseList('update') // 更新列表
+  getClasscourseList('update') // 更新列表
   ElMessage.success('创建课程-成功')
 
 }

src/renderer/src/views/prepare/container/file-list-item.vue

@@ -126,12 +126,6 @@
                     <span>下载</span>
                   </el-button>
                 </div>
-                <div v-if="item.fileSuffix === 'ppt' || item.fileSuffix === 'pptx'" class="item-popover-item">
-                  <el-button text @click="adToKj(item)">
-                    <i class="iconfont icon-jiahao"></i>
-                    <span>加入课件</span>
-                  </el-button>
-                </div>
                 <div class="item-popover-item">
                   <el-button text @click="moveSmarttalkFun(item)">
                     <el-icon>
@@ -159,7 +153,7 @@ import FileImage from '@/components/file-image/index.vue'
 import { asyncLocalFile } from '@/utils/talkFile'
 import { toTimeText } from '@/utils/date'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { deleteSmarttalk, updateSmarttalk, getPrepareById, addFileToKj } from '@/api/file'
+import { deleteSmarttalk, updateSmarttalk, getPrepareById } from '@/api/file'
 import useUserStore from '@/store/modules/user'
 import outLink from '@/utils/linkConfig'
 
@@ -189,14 +183,6 @@ export default {
     }
   },
   methods: {
-    adToKj(item) {
-      addFileToKj(item.id).then(res=>{
-        console.log(res)
-        item.fileFlag = "课件"
-      },error=>{
-        console.log(error)
-      })
-    },
     editTalk(item) {
       console.log(item,this.userInfo,'this.userInfo')
       ElMessageBox.prompt('请输入新的名称', '重命名', {
@@ -280,14 +266,14 @@ export default {
               cookie,
               fileType: item.fileType
             })
-            /*ipcRenderer.on('listen-file-change-on' + item.fileNewName, () => {
+            ipcRenderer.on('listen-file-change-on' + item.fileNewName, () => {
               items.async = 'on'
             })
             ipcRenderer.on('listen-file-change-success' + item.fileNewName, (e, { data, md5 }) => {
               items.fileSize = data.fileSize
               items.md5 = md5
               items.async = true
-            })*/
+            })
           }
         })
       })

src/renderer/src/views/prepare/container/kj-list-item.vue

@@ -98,7 +98,7 @@ import FileImage from '@/components/file-image/index.vue'
 import { asyncLocalFile } from '@/utils/talkFile'
 import { toTimeText } from '@/utils/date'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { deleteSmarttalk, updateSmarttalk, getPrepareById, getSmarttalkPage } from '@/api/file'
+import { deleteSmarttalk, updateSmarttalk, getPrepareById } from '@/api/file'
 import useUserStore from '@/store/modules/user'
 import outLink from '@/utils/linkConfig'
 import { sessionStore } from '@/utils/store'
@@ -208,7 +208,6 @@ export default {
               }
               if (action === 'cancel'){
                 // 继续上课
-                console.log(obj.bookImg)
                 if (obj.bookImg) {
                   //PPT
                   listEntpcourse({
@@ -242,20 +241,9 @@ export default {
                     }
                   })
                 }else {
-                  console.log(obj)
-                  getSmarttalkPage({fileId: obj.entpcoursefileid}).then(res2=>{
-                    console.log(res2)
                   //APT
-                    if (res2&&res2.rows.length>0) {
+                  this.$emit('on-start-class', item, obj)
-                      this.$emit('on-start-class', res2.rows[0], obj)
-                    }else {
-                      ElMessage({
-                        message: '该文件未关联PPT，无法打开！',
-                        type: 'warning'
-                      })
-                    }
                   done()
-                  })
                 }
               }
               if (action === 'close') {
@@ -347,7 +335,7 @@ export default {
         Object.assign(items, item)
         asyncLocalFile(items).then(() => {
           ipcRenderer.send('open-path-app', item.fileNewName)
-          if (this.listenList?.indexOf(item.fileNewName) === -1) {
+          if (this.listenList.indexOf(item.fileNewName) === -1) {
             this.listenList.push(item.fileNewName)
             let cookie = localStorage.getItem('Admin-Token')
             ipcRenderer.send('listen-file-change', {
@@ -357,14 +345,14 @@ export default {
               cookie,
               fileType: item.fileType
             })
-            /*ipcRenderer.on('listen-file-change-on' + item.fileNewName, () => {
+            ipcRenderer.on('listen-file-change-on' + item.fileNewName, () => {
               items.async = 'on'
             })
             ipcRenderer.on('listen-file-change-success' + item.fileNewName, (e, { data, md5 }) => {
               items.fileSize = data.fileSize
               items.md5 = md5
               items.async = true
-            })*/
+            })
           }
         })
       })

src/renderer/src/views/prepare/container/ppt-dialog.vue

@@ -13,7 +13,7 @@
 </template>
 
 <script setup>
-  import AiPpt from './ai-pptV2.vue';
+  import AiPpt from './ai-ppt.vue';
   const model = defineModel()
   const emit = defineEmits(['addSuccess'])
   const props = defineProps({

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

@@ -162,7 +162,7 @@ import KjListItem from '@/views/prepare/container/kj-list-item.vue'
 import { getSmarttalkPage, moveSmarttalk, creatAPT } from '@/api/file'
 import { toTimeText } from '@/utils/date'
 import { ElMessage } from 'element-plus'
-import { parseCataByNode, creatPPT, asyncLocalFile, creatAIPPT } from '@/utils/talkFile'
+import { parseCataByNode, creatPPT, asyncLocalFile } from '@/utils/talkFile'
 import FileOperBatch from '@/views/prepare/container/file-oper-batch.vue'
 import SetHomework from '@/components/set-homework/index.vue'
 import outLink from '@/utils/linkConfig'
@@ -178,7 +178,6 @@ import ClassReserv from '@/views/classManage/classReserv.vue'
 import classStart from './container/class-start.vue' // 预备上课
 import MsgEnum from '@/plugins/imChat/msgEnum'  // im 消息枚举
 import Chat from '@/utils/chat' // im 登录初始化
-import TreeLog from './components/treeLog.vue'
 if (!Chat.imChat) Chat.init()
 
 const toolStore = useToolState()
@@ -236,9 +235,7 @@ export default {
       isOpenHomework: false,
       // 当前上课课程
       activeClass: null,
-      pptDialog: false,
+      pptDialog: false
-      // 打开章节的弹窗
-      treelogRef:null
     }
   },
   computed: {
@@ -293,12 +290,8 @@ export default {
   // },
   methods: {
     addAiPPT(item) {
-      console.log(this.currentNode.itemtitle + '.pptx',item.url, {...this.uploadData,fileShowName: this.currentNode.itemtitle + '.pptx'})
+      this.currentFileList.unshift(item.resData)
-      creatAIPPT(this.currentNode.itemtitle + '.pptx',item.url, {...this.uploadData,fileShowName: this.currentNode.itemtitle + '.pptx'}).then((res) => {
-        this.currentFileList.unshift(res.resData)
-        KjListItem.methods.openFileWin(res.resData);
       this.pptDialog = false
-      })
     },
     // test() {
     //   toolStore.resetDef() // 重置状态
@@ -540,7 +533,7 @@ export default {
       }
     },
     clickChoose(value) {
-      this.checkFileList = value ? this.currentSCFileList : []
+      this.checkFileList = value ? this.currentFileList : []
     },
     deleteTalk(item) {
       let index = this.currentFileList.indexOf(item)
@@ -636,18 +629,12 @@ export default {
         })
     },
     async nodeClick(data) {
-      console.log(data,'data');
-
       if (this.currentNode.id === data.node.id) return
       this.curBookImg = data.textBook.curBookImg
       this.curBookPath = data.textBook.curBookPath
       const path = await this.getBookPathFromServer(data.textBook.curBookPath)
       const localpath = getAppInstallUrl('pdfjs-dist/web/viewer.html', 'user', '\\out\\renderer', true) + "?file="
       localStorage.setItem('PDF-LOCAL-PATH',localpath + encodeURIComponent(import.meta.env.VITE_APP_RES_FILE_PATH + path))
-      // 相关数据存储session中
-      sessionStore.set('curr.textBook', data.textBook)
-      sessionStore.set('env.pdfBasePath', localpath)
-      sessionStore.set('env.fileBasePath', import.meta.env.VITE_APP_RES_FILE_PATH)
       this.checkFileList = []
       this.currentWorkList = []
       let cata = parseCataByNode(data.node)

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

@@ -161,11 +161,7 @@ const delRow = (item) => {
 }
 
 // 加入备课
-const addLesson = ({ id, fileSize }) => {
+const addLesson = ({ id }) => {
-  if (fileSize>1024*1024*150) {
-    ElMessage.warning('文件超过150M，暂停超过150M资源的下载，请重新选择')
-    return
-  }
   let data = {
     id,
     fileRoot: '备课',
@@ -194,8 +190,6 @@ const handleRow = (item) => {
   })
   curRow.value = item
   isShow.value = true
-  console.log(item,'item');
-
 }
 </script>
 

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

@@ -18,17 +18,21 @@
       </el-col>
     </el-row>
 
-    <el-row class="resoure-btns">
+<!--    第三方资源筛选-->
+    <!-- <el-row class="resoure-btns" v-if="isThird">
       <el-col :span="24" class="query-row flex">
         <div class="flex row-left">
-      <!--    第三方资源筛选-->
+          <el-button v-for="item in coursewareTypeList" :key="item.id"
-          <el-select v-if="isThird" v-model="sourceStore.thirdQuery.type" @change="sourceStore.thirdChangeType"
+                     :type="sourceStore.thirdQuery.type == item.value ? 'primary' : ''" round
-            style="width: 110px">
+                     @click="sourceStore.thirdChangeType(item.value)">
-            <el-option v-for="item in coursewareTypeList" :key="item.value" :label="item.label"
+            {{item.label }}
-              :value="item.value" />
+          </el-button>
-          </el-select>
+        </div>
-
+      </el-col>
-         <el-select v-else v-model="sourceStore.query.fileSuffix" @change="sourceStore.changeSuffix"
+    </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"
             style="width: 110px">
             <el-option v-for="item in sourceStore.resourceFormatList" :key="item.value" :label="item.label"
               :value="item.value" />

src/renderer/src/views/resource/container/third-list.vue

@@ -7,11 +7,12 @@
           v-for="item in sourceStore.thirdResult.list"
           :key="item.itemId"
           class="list-item"
-          @click="handleRow(item)"
+          @click="handleRow"
         >
           <div class="item-left flex">
-            <div style="position: relative">
+            <div style="position: relative" @click="clickImg(item.itemId)">
               <FileImage :file-name="item.fileType" :size="50" />
+              <el-icon style="position: absolute;top: 1px;right: 5px"><Search /></el-icon>
             </div>
             <div class="flex item-left-content">
               <div class="name flex" :title="item.title">
@@ -50,10 +51,6 @@
               </div>
             </div>
           </div>
-          <el-button v-loading="item.loading" size="small" plain round type="primary" @click.stop="openChapter(item)">
-            <i class="iconfont icon-jiahao"></i>
-            备课</el-button
-          >
         </li>
       </ul>
     </el-scrollbar>
@@ -69,28 +66,35 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <FilePreview ref="thirdPreview" v-model="isViewImg"></FilePreview>
+    <el-dialog v-model="isViewImg" width="80%" :modal-append-to-body="false" :append-to-body="false">
-    <TreeLog ref="treelogRef" @onsuccess="addToPrepare"/>
+      <div class="demo-image__lazy">
+        <el-image v-for="(url,index) in srcList" :key="index" :src="url" lazy />
+      </div>
+    </el-dialog>
+<!--    <video width="550" controls autoplay loop>-->
+<!--       <source src="https://sf1-cdn-tos.huoshanstatic.com/obj/media-fe/xgplayer_doc_video/mp4/xgplayer-demo-360p.mp4" type="video/mp4" />-->
+<!--      </video>-->
   </div>
 </template>
 
 <script setup>
 import { ref } from 'vue'
-import { ElMessage } from 'element-plus'
+// import { ElMessage, ElMessageBox } from 'element-plus'
-import { Clock,View,Folder } from '@element-plus/icons-vue'
+import { Clock,View,Folder,Search } from '@element-plus/icons-vue'
 import FileImage from '@/components/file-image/index.vue'
-import FilePreview from '@/components/thirdFile-preview/index.vue'
+import { getFileSuffix } from '@/utils/ruoyi'
+import useUserStore from '@/store/modules/user'
 import useResoureStore from '../store'
-import { addFileToPrepareThird } from '@/api/file'
+import {getImgPath} from "@/api/file/third";
-import TreeLog from '@/views/prepare/components/treeLog.vue'
 
+const userstore = useUserStore()
 const sourceStore = useResoureStore()
 
+// const userInfo = userstore.user
 //判断是否预览图片
 const isViewImg = ref(false)
-const thirdPreview = ref()
+//显示图片的路径
-const treelogRef = ref()
+const srcList = ref([])
-const currentItem = ref()
 
 // 分页change
 const handleSizeChange = (limit) => {
@@ -116,36 +120,18 @@ function timestampToDate(timestamp) {
   return `${year}-${month}-${day}`;
 }
 //获取图片的路径
-const handleRow = (item) => {
+const clickImg = (id) => {
-  isViewImg.value = true
+  srcList.value = []
-  thirdPreview.value.init(item.itemId)
+  getImgPath({itemId:id}).then(res => {
-}
-const openChapter = (item)=>{
-  if (item.size>1024*1024*150) {
-    ElMessage.warning('文件超过150M，暂停超过150M资源的下载，请重新选择')
-    return
-  }
-  currentItem.value = item
-  // 打开弹窗
-  treelogRef.value.openDialog()
-}
-const addToPrepare = (data) => {
-  console.log(data)
-  let chapterArr = []
-  for (let i = 0; i < data.cataList.length; i++) {
-    chapterArr.push({id: data.cataList[i].id,name: data.cataList[i].title})
-  }
-  let postData = {
-      itemId: currentItem.value.itemId,
-      textBookId: data.textbookId,
-      chapter: JSON.stringify(chapterArr)
-  }
-  currentItem.value.loading = true
-  addFileToPrepareThird(postData).then((res) => {
-    currentItem.value.loading = false
-    console.log(res)
     if(res.code === 200){
-      ElMessage.success("加入备课成功")
+      isViewImg.value = true
+      res.data.forEach(item => {
+        item.subsets.forEach(previewItem => {
+          previewItem.previewFiles.forEach(fileItem => {
+            srcList.value.push(fileItem.fileUrl)
+          })
+        })
+      })
     }
   })
 }

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

@@ -84,11 +84,11 @@ 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'
-import { pdfCallBack } from '@/utils/pdftools'
 const userStore = useUserStore()
 const sourceStore = useResoureStore()
 // import { getStaticUrl } from '@/utils/tool'
@@ -171,6 +171,52 @@ 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
@@ -249,9 +295,53 @@ onMounted(async () => {
   window.addEventListener('message',(event) => {
     // console.log('------------');
     const iframeMes = event.data;
-    //监听pdf返回事件，在pdf工具类中统一处理
+    if(iframeMes.storageInfo){
-    pdfCallBack(iframeMes)
+      // 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">

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

@@ -83,15 +83,17 @@ 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'
 import { sessionStore } from '@/utils/store'
 import { useGetSubject } from '@/hooks/useGetSubject'
-import { pdfCallBack, getAnalysisList, addAnalysis, updateAnalusis } from '@/utils/pdftools'
 const userStore = useUserStore()
 const sourceStore = useResoureStore()
+// import { getStaticUrl } from '@/utils/tool'
 
 const route = useRoute();
 const pdfUrl = ref('');
@@ -109,6 +111,7 @@ const bookInfo = ref(null);
 const booksel = ref(0);
 const bookList = ref([])
 
+
 const searchOptions = [{
     value: '0',
     label: '按时间',
@@ -119,6 +122,17 @@ const searchOptions = [{
 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 {
@@ -159,7 +173,75 @@ 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;
@@ -177,7 +259,6 @@ const getAllSubject = async () => {
   bookList.value = dataList
   const session = sessionStore.get('subject.curNode')
   console.log('session',session);
-  console.log('datalist',dataList[0]);
   let filePath = import.meta.env.VITE_APP_RES_FILE_PATH;
   if(session.rootid){
     const idx = dataList.findIndex(item => item.id === session.rootid)
@@ -188,11 +269,11 @@ const getAllSubject = async () => {
       bookInfo.value = {...dataList[0]}
       filePath += dataList[0].fileurl.replace('.txt','.pdf')
     }
+    await loadPdfAnimation(filePath)
   }else{
     bookInfo.value = {...dataList[0]}
     filePath += dataList[0].fileurl.replace('.txt','.pdf')
   }
-  await loadPdfAnimation(filePath)
 }
 const bookChange = async (item, idx) => {
   booksel.value = idx
@@ -212,14 +293,6 @@ const loadPdfAnimation = (path) => {
 onMounted(async () => {
   await useGetSubject();
   await getAllSubject();
-  await getAnalysisList({evalid: bookInfo.value.id, parentid: 0, cluegroup: 'textbookAnalysis', orderby: "timestamp desc", pageSize: 100}).then((res) => {
-    if(res.code === 200){
-      const newData = formaterTime(res.rows)
-      standList.value = newData
-      // showData.value = filterList(newData)
-      showData.value = newData
-    }
-  })
   if(cardref.value && headref.value){
     const cardH = cardref.value.offsetHeight;
     const headh = headref.value.offsetHeight;
@@ -236,10 +309,46 @@ onMounted(async () => {
     }
   })
   window.addEventListener('message',(event) => {
-    console.log('------------');
+    // console.log('------------');
     const iframeMes = event.data;
-    console.log('------------',iframeMes);
+    if(iframeMes.storageInfo){
-    pdfCallBack(iframeMes)
+      // 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'

src/renderer/src/views/tool/components/homework.vue

@@ -85,11 +85,10 @@ import FileImage from '@/components/file-image/index.vue'
 import { useGetHomework } from '@/hooks/useGetHomework'
 import { ipcMsgSend, ipcMsgInvoke } from '@/utils/tool'
 import { useToolState } from '@/store/modules/tool'
-import {createWindow} from '@/utils/tool'
 import Lesson from './lesson.vue';
 import { parseCataByNode } from '@/utils/talkFile'
 import MsgEnum from '@/plugins/imChat/msgEnum' // 消息枚举
-import { createHomework, getClassWorkList, getStudentClassWorkData } from '../createHomework'
+import { createHomework } from '../createHomework'
 import { sessionStore } from '@/utils/store'
 
 const route = useRoute();
@@ -111,13 +110,7 @@ const curNode = reactive({
   data: {}
 })
 
-const props = defineProps(['curNode'])
-const emit = defineEmits(['closeActive'])
-
-
 const sendHomework = (row,type) => {
-
-  
   if(type == 'item'){
     // 布置推送单个作业
     curRow.value = [row]
@@ -129,30 +122,13 @@ const sendHomework = (row,type) => {
 }
 //
 const closeHomework = async() => {
-  // ipcMsgSend('tool-sphere:set:ignore', true)
+  ipcMsgSend('tool-sphere:set:ignore', true)
 }
-
-
 // 推送成功
-const successHomework = async (data)=>{
+const successHomework = (data)=>{
-  // data.msg
   // console.log('推送成功', data)
   // 发送im消息-推送作业(app|平板)
   // ipcMsgInvoke('im-chat:msg', data, MsgEnum.HEADS.MSG_0016)
-
-  /**
-   * 推送成功 打开作业批改
-   * 2024/10/23
-   * 以下两个函数 代码 参照"作业批改" 页面
-   */
-  let result = await getClassWorkList(data.msg)
-  result = await getStudentClassWorkData()
-  localStorage.setItem('teachClassWorkItem', JSON.stringify(result[0]));
-  toolStore.isTaskWin=true; // 设置打开批改窗口
-  emit('closeActive')
-  createWindow('open-taskwin',{url:'/teachClassTask'}); // 调用新窗口批改页面
- 
-
 }
 // 章节目录change
 const changeChapter = async (data)=>{
@@ -246,8 +222,7 @@ onMounted(async () => {
   entpcourseid.value = route.query.entpcourseid
   lesson.value = route.query.label
   // 当前节点  mounted 的时候从缓存里拿
-  // curNode.data = sessionStore.get('subject.curNode')
+  curNode.data = sessionStore.get('subject.curNode')
-  curNode.data = props.curNode
   getHomework()
   getResource()
 })

src/renderer/src/views/tool/components/side.vue

@@ -25,24 +25,7 @@
       <div class="c-popover" :style="`--top: ${topPos}px;--height:${hPost}px;`" v-show="isVisible">
         <div class="content" v-if="isVisible">
           <slot name="content">
-            <homework v-if="activeObj?.prop === 'resource'" :curNode="curNode" @closeActive="closeActive" />
+            <homework v-if="activeObj?.prop === 'resource'" />
-            <template v-else-if="activeObj?.prop === 'book'">
-              <div class="item">
-                <div class="item-title">
-                  <h3>{{ curNode.label }}</h3>
-                  <span class="sub">{{ curNode.edusubject }}</span>
-                </div>
-                <div class="item-content" v-loading="loading">
-                  <el-scrollbar height="300px">
-                    <div class="item-content-item" v-for="item in cData">
-                      <el-tag effect="dark">{{ item.tag }}</el-tag>
-                      <span>{{ item.name }}</span>
-                      <el-button :color="item.color||'#349d44'" size="small" @click="openFile(item)">打开</el-button>
-                    </div>
-                  </el-scrollbar>
-                </div>
-              </div>
-            </template>
             <span v-else style="color:red;">{{activeObj}}</span>
           </slot>
         </div>
@@ -52,10 +35,7 @@
 </template>
 <script setup>
 import { computed, defineProps, ref, reactive, watchEffect, onMounted } from 'vue'
-import { sessionStore } from '@/utils/store'
 import homework from './homework.vue';
-import { ElMessage } from 'element-plus';
-import { toRoter, createWindow } from '@/utils/tool' // 相关工具
 
 // 功能说明：侧边-工具栏
 const colors = ['#409EFF','#00f389', '#ff7f00', '#ffff00', '#00baff', '#13b189', '#F56C6C']
@@ -68,7 +48,7 @@ const props = defineProps({
   data: { // 数据
     type: Array,
     default: () => [
-      { label: '资源', prop: 'book', icon: 'icon--kejian' },
+      { label: '课件', prop: 'book', isExtra: true, icon: 'icon--kejian' },
       { label: '活动', prop: 'resource', icon: 'icon-kechengziyuan1' },
       // { label: '互动', prop: 'interact', icon: 'icon-hudong' },
       // { label: '窗口', prop: 'win', icon: 'icon-tubiaozhizuomobanyihuifu-' },
@@ -82,10 +62,7 @@ const btnRef = ref(null)      // 按钮元素-ref
 const topPos = ref(30)        // 顶部距离-内容的距离
 const hPost = ref(0)         // 顶部距离-内容的距离
 const isFold = ref(false)    // 是否折叠
-const cData = ref(null)       // 内容数据
-const loading = ref(false)    // 加载中
 let posBtnAll = {}  // 存储位置
-let curNode = null // 当前节点（作业需要）
 // === 计算属性 ===
 const list = computed(() => props.data.map((o,i) => {
   o.style = getStyle(o.style, i)
@@ -93,9 +70,7 @@ const list = computed(() => props.data.map((o,i) => {
 }))
 onMounted(() => {
   posBtnAll = btnRef.value.getBoundingClientRect()
-  hPost.value = Math.round(posBtnAll.height)
+  hPost.value = posBtnAll.height
-  // btnRef.value.style.marginTop = -hPost.value / 2 + 'px'
-  curNode = sessionStore?.get?.('subject.curNode')
 })
 // === 方法 ===
 // 获取颜色索引
@@ -109,16 +84,7 @@ const getStyle = (style,index) => {
     return `${style}${style.endsWith(';')?'':';'}color:${color};`
   }
 }
-// 获取内容数据
+// 事件
-const getContent = o => {
-  loading.value = true
-  const { roottitle, edustage, edusubject } = curNode
-  const textbook = { type: 'book', tag: '教材', name: roottitle }
-  const course = { type: 'course', tag: '课标', name: `${edustage}-${edusubject}-课标` }
-  cData.value = [textbook, course]
-  loading.value = false
-}
-// 回调: 菜单点击
 const clickHandel = (o, e) => {
   if (!o.isExtra) { // 忽略其他操作: 打开内容窗口，指示器指向当前
     const node = e.target.parentNode.getBoundingClientRect()
@@ -126,44 +92,10 @@ const clickHandel = (o, e) => {
     isVisible.value = !isColse // 相同的按钮且打开状态，点击关闭
     activeObj.value = o
     const nodeH = parseInt(node.height / 2) // 高度的一半
-    topPos.value = Math.round(parseInt(node.top) - posBtnAll.top + nodeH)
+    topPos.value = parseInt(node.top) - posBtnAll.top + nodeH
-
-    // 获取内容数据
-    if (['book'].includes(o.prop)) getContent(o)
   }
   emit('change', o)
 }
-// 回调: 打开文件
-const openFile = item => {
-  if (['book', 'course'].includes(item.type)) {
-    const isBool = sessionStore.has('curr.textBook')
-    if (!isBool) return ElMessage.error('打开失败，请重试!')
-    const textBook = sessionStore.get('curr.textBook')
-    const pdfBasePath = sessionStore.get('env.pdfBasePath')
-    const fileBasePath = sessionStore.get('env.fileBasePath')
-    let path = ''
-    if (item.type == 'book') path = (textBook.curBookPath||'').replace('.txt', '.pdf')
-    else path = textBook.curBookPath.replace(/([^-]*)$/, '课标.pdf')
-    const url = pdfBasePath + encodeURIComponent(`${fileBasePath}${path}`)
-    console.log(url)
-    localStorage.setItem('PDF-TOOL-PATH', url)
-    // 打开新窗口
-    // toRoter(`${process.env['ELECTRON_RENDERER_URL']}/#/fullscreenpdf`)
-    console.log('pdf_old:' + localStorage.getItem('PDF-LOCAL-PATH'))
-    console.log('pdf_new:' + localStorage.getItem('PDF-TOOL-PATH'))
-    // emit('change', { prop: 'bookOpen' })
-    createWindow('open-win', {url: '/fullscreenpdf'})
-  }
-}
-// 回调: 关闭事件
-const closeActive = () =>{
-  if (isVisible.value) { // 打开状态，关闭
-    isVisible.value = false
-    emit('change', { prop: 'close' })
-  }
-}
-
-defineExpose({closeActive})
 </script>
 <style lang="scss" scoped>
 .warp{
@@ -171,17 +103,11 @@ defineExpose({closeActive})
   position: fixed;
   top: 50%;
   transform: translateY(-50%);
-  z-index: 1;
   right: 10px;
+  //min-height: 40vh;
   min-width: 4em;
   border-radius: 4em;
-  background-color: rgba(18,18,18,0.3);
+  background-color: #121212;
-  border-color: rgba(1, 1, 1, 0.1);
-  &:hover{
-    opacity: 1;
-    background-color: rgba(18,18,18,1);
-    border-color: rgba(1, 1, 1, 1);
-  }
   .el-space{margin: 20px 0 0;}
   .c-btn{
     color: #d9dce3;
@@ -214,8 +140,8 @@ defineExpose({closeActive})
   --top: 30px;
   --height: 40vh;
   position: fixed;
-  inset: 0 75px auto auto;
+  inset: 50% 75px auto auto;
-  // transform: translateY(-50%);
+  transform: translateY(-50%);
   background-color: #121212;
   padding: 10px;
   border-radius: 4px;
@@ -233,33 +159,5 @@ defineExpose({closeActive})
     top: var(--top);
     transform: rotate(45deg);
   }
-  .content{
-    // 每个菜单
-    .item{
-      margin: 0 15px;
-      &-title{
-        margin-bottom: 20px;
-        h3{
-          font-size: 20px;
-          font-weight: bold;
-          color: #fff;
-        }
-        .sub{
-          color: #cecece;
-          font-size: 15px;
-        }
-      }
-      &-content-item{
-        display: flex;
-        background-color: #384342;
-        padding: 15px 10px;
-        margin-bottom: 10px;
-        justify-content: space-between;
-        align-items: center;
-        color: #fff;
-        border-radius: 5px;
-      }
-    }
-  }
 }
 </style>

src/renderer/src/views/tool/components/upvote.vue

@@ -1,6 +1,6 @@
 <template>
   <div v-if="props.test">
-    <el-button type="primary" @click="trigger(1)"  v-tap:trigger="[1,'']">点赞</el-button>
+    <el-button type="primary" @click="trigger" v-tap:trigger="">点赞</el-button>
     <el-button type="primary" @click="trigger(2, '学生A')" v-tap:trigger="[2,'学生A']">疑惑</el-button>
   </div>
   <!-- 温度计-模式 -->
@@ -257,12 +257,12 @@ defineExpose({ trigger })
     border-radius: 3px;
     min-width: 15px;
     // height: 500px;
-    &.like{ // 点赞
+    &.like{
-      background-image: linear-gradient(to top, #d2f0cb, #2f9e44);
+      background-image: linear-gradient(to top, #fef0f0, #f56c6c);
       // animation: striped-flow 5s linear infinite;
     }
-    &.doubt{ // 疑惑
+    &.doubt{
-      background-image: linear-gradient(to top, #ebc6c6, #ff0000);
+      background-image: linear-gradient(to top, #fdf6ec, #e6a23c);
     }
   }
 }

src/renderer/src/views/tool/createHomework.js

@@ -1,225 +1,37 @@
-
 import useUserStore from '@/store/modules/user'
 import { addClassworkReturnId } from '@/api/teaching/classwork'
-import { listClassworkdata } from '@/api/classTask'
-import { homeworklist } from '@/api/teaching/classwork'
-
-
 
 export const createHomework = ({ uniquekey, evalid, data, entpcourseid }) =>{
     const usertore = useUserStore().user
 
-  var formObj = {}
+    var formObj = {};
-  formObj.id = 0
+    formObj.id = 0;
 
-  formObj.deaddate = ''
+    formObj.deaddate = '';
-  formObj.entpid = usertore.deptId
+    formObj.entpid = usertore.deptId;
-  formObj.level = 1
+    formObj.level = 1;
-  formObj.parentid = 0
+    formObj.parentid = 0;
-  formObj.worktype = '常规作业'
+    formObj.worktype = '常规作业';
-  formObj.workkey = ''
+    formObj.workkey = '';
-  formObj.worktag = ''
+    formObj.worktag = '';
 
-  formObj.uniquekey = uniquekey
+    formObj.uniquekey = uniquekey;
     
-  formObj.classid = 0
+    formObj.classid = 0;
-  formObj.classcourseid = 0
+    formObj.classcourseid = 0;
 
-  formObj.entpcourseid = entpcourseid
+    formObj.entpcourseid = entpcourseid;
 
-  formObj.slideid = 0
+    formObj.slideid = 0;
 
-  formObj.workcodes = JSON.stringify(data)
+    formObj.workcodes = JSON.stringify(data);
 
-  formObj.edusubject = usertore.edusubject
+    formObj.edusubject = usertore.edusubject;
     formObj.evalid = evalid
 
-  formObj.edustage = usertore.edustage
+    formObj.edustage = usertore.edustage;
-  formObj.status = ''
+    formObj.status = '';
-  formObj.edituserid = usertore.userId
+    formObj.edituserid = usertore.userId;
-  formObj.entpcourseworklist = JSON.stringify([{ id: -2, score: '10' }])
+    formObj.entpcourseworklist = JSON.stringify([{'id':-2, 'score': '10'}]);
     return addClassworkReturnId(formObj)
 }
-
-let classWorkList = []
-
-// 将标签中的双引号增加转义
-let escapeHtmlQuotes = (str) => {
-  // 后端已replace双引号, 故前端不用在处理
-  const regex1 = /\\+/g;  // 匹配多个反斜杠
-  let result = str.replace(regex1, '\\');
-  result = str.replace(/(?<!\\)\n/g, '<br />');    //替换\n而不替换\\n 为 \\n
-  return result;
-}
-
-/**
- * 获取班级作业
- */
-export const getClassWorkList = async (id) => {
-  // 班级作业数据，包含多个班级 homeworklist
-  const response = await homeworklist({ id })
-
-  /**
-   * 2024-10-17 由于 后面截止时间加了 时分，特加判断
-   * 1、待批改、以前是以明天判断。现改为传当天的日期，并根据当前日期的时分与截止日期进行判断，
-   * 2、已批改、以前默认是以明天判断。现依然以明天为判断，并根据当前日期时分大于截止日期时分判断。
-   */
-
-  let list = response.rows
-
-  for (var i = 0; i < list.length; i++) {
-    // 初始化部分新增字段值
-    list[i].workdatalist = []
-    list[i].workdatalistVisible = false
-    list[i].workdatafeedbackcount = 0 // 已交人数
-    list[i].feedtimelength = 0
-    list[i].rightAnswerCount = 0
-    list[i].scoingRate = 0 + '%' // 得分率
-    list[i].averagetime = 0 // 平均用时
-
-    // ----------------------------------------------
-    // 处理任务类型的UI
-    if (list[i].worktype == '学习目标定位') {
-      list[i].workclass = 'success'
-      list[i].workcodesList = JSON.parse(list[i].workcodes)
-    } else if (list[i].worktype == '教材研读') {
-      list[i].workclass = 'primary'
-    } else if (list[i].worktype == '框架梳理') {
-      list[i].workclass = 'warning'
-    } else if (list[i].worktype == '学科定位') {
-      list[i].workclass = 'info'
-    } else if (list[i].worktype == '习题训练') {
-      list[i].workclass = 'danger'
-    } else {
-      list[i].workclass = ''
-    }
-    // 如果是习题训练任务，则检查一共有多少道
-    if (list[i].entpcourseworklist != '') {
-      list[i].entpcourseworklistarray = JSON.parse('[' + list[i].entpcourseworklist + ']')
-    } else {
-      list[i].entpcourseworklistarray = []
-    }
-  }
-  // 显示分配人数(workdataresultsum)>0 的
-  if (list && list.length > 0) {
-    classWorkList = list && list.filter((item) => item.workdataresultsum > 0)
-    //TODO： 这里没分页，貌似这个 total 不重要，后续看
-  } else {
-    classWorkList = []
-  }
-
-  return classWorkList
-}
-
-export const getStudentClassWorkData = async () => {
-  const ids = classWorkList.map((item) => item.id).join(',')
-  if (ids == '') {
-    return
-  }
-  const res = await listClassworkdata({
-    classworkids: ids,
-    pageSize: 1000
-  })
-
-  for (var t = 0; t < classWorkList.length; t++) {
-    for (var i = 0; i < res.rows.length; i++) {
-      if (
-        res.rows[i].classworkid == classWorkList[t].id &&
-        res.rows[i].finishtimelength != '0'
-      ) {
-        console.log('==================')
-        // 有几个学生完成/正在完成学习任务
-        // 至少resultcount不是0
-        classWorkList[t].workdatafeedbackcount++
-
-        // 在参与学习任务的人中，汇总计算用时
-        classWorkList[t].feedtimelength += parseInt(res.rows[i].finishtimelength)
-
-        // 计算得分率
-        if (
-          res.rows[i].classworkevallist != '' &&
-          res.rows[i].classworkevallist != null &&
-          res.rows[i].classworkevallist != 'null'
-        ) {
-          let replacedString = res.rows[i].classworkevallist.replace(/""/g, '"')
-          // 将标签中双引号改为转义, 测试数据: "{\"id\":172907, \"rating\":0, \"teacherRating\":0, \"entpcourseworkid\":358520, \"feedcontent\":\"④①⑤③②\", \"score\":4, \"rightanswer\":\"④①⑤③②\"},{\"id\":172908, \"rating\":0, \"teacherRating\":0, \"entpcourseworkid\":358521, \"feedcontent\":\"气壮山威，鲲鹏展翅楚云飞\", \"score\":4, \"rightanswer\":\"志远天高，春风杨柳麓山青\"},{\"id\":172909, \"rating\":0, \"teacherRating\":0, \"entpcourseworkid\":363096, \"feedcontent\":\"《红烛》化用“蜡矩”这一古典意象，赋予它新的含义，赞美了红烛以“蜡炬成灰”来点亮世界的奉献精神。\", \"score\":4, \"rightanswer\":\"《立在地球边上放号》中，全诗采用间接抒情的方式，描绘了太平洋的浪潮，吟唱了一曲惊心动魄的力的颂歌，意在赞美摧毁旧世界、创造新生活的“五四”精神。\"},{\"id\":172910, \"rating\":0, \"teacherRating\":0, \"entpcourseworkid\":363098, \"feedcontent\":\"毛泽东重游橘子洲，面对如画的秋色和大好的革命形势，回忆过去战斗的岁月，不禁心潮起伏，<bdo class=\"mathjye-underpoint2\">浮想联翩</bdo>。\", \"score\":4, \"rightanswer\":\"毛泽东重游橘子洲，面对如画的秋色和大好的革命形势，回忆过去战斗的岁月，不禁心潮起伏，<bdo class=\"mathjye-underpoint2\">浮想联翩</bdo>。\"},{\"id\":172911, \"rating\":0, \"teacherRating\":0, \"entpcourseworkid\":363100, \"feedcontent\":\"毛泽东重游橘子洲，面对如画的秋色和大好的革命形势，回忆过去战斗的岁月，不禁心潮起伏，<bdo class=\"mathjye-underpoint2\">浮想联翩</bdo>。\", \"score\":4, \"rightanswer\":\"毛泽东重游橘子洲，面对如画的秋色和大好的革命形势，回忆过去战斗的岁月，不禁心潮起伏，<bdo class=\"mathjye-underpoint2\">浮想联翩</bdo>。\"}"
-          replacedString = escapeHtmlQuotes(res.rows[i].classworkevallist).replace(
-            /"(\[.*\])"/g,
-            '$1'
-          )
-          replacedString = escapeHtmlQuotes(res.rows[i].classworkevallist)
-          var evalarray
-          try {
-            evalarray = JSON.parse('[' + res.rows[i].classworkevallist + ']')
-          } catch {
-            evalarray = JSON.parse('[' + replacedString + ']')
-          }
-
-          for (var e = 0; e < evalarray.length; e++) {
-            if (res.rows[i].worktype == '常规作业') {
-              evalarray[e].feedcontent = escapeHtmlQuotes(evalarray[e].feedcontent).replace(
-                /"(\[.*\])"/g,
-                '$1'
-              )
-              evalarray[e].feedcontent = escapeHtmlQuotes(evalarray[e].feedcontent)
-            }
-            if (evalarray[e].feedcontent == evalarray[e].rightanswer) {
-              // 正确，得分
-              classWorkList[t].rightAnswerCount++
-            }
-          }
-        }
-      }
-      // 当前这个学习任务，共推送给了几个学生，workdataresultsum
-      if (res.rows[i].classworkid == classWorkList[t].id) {
-        classWorkList[t].workdatalist.push(res.rows[i])
-      }
-    }
-    // 计算完成进度    workdataresultsum 人数要大于0
-    if (
-      classWorkList[t].workdataresultcount > 0 &&
-      classWorkList[t].workdataresultsum > 0
-    ) {
-      classWorkList[t].finishpercent = parseInt(
-        (classWorkList[t].workdataresultcount / classWorkList[t].workdataresultsum) * 100
-      )
-    } else {
-      classWorkList[t].finishpercent = 0
-    }
-
-    // 以下四个参数，都要计算
-    // 2024-04-12，酉阳，by jackyshen
-
-    // 计算参与学习任务的平均用时
-    if (classWorkList[t].workdatafeedbackcount > 0) {
-      classWorkList[t].averagetime = Math.ceil(
-        classWorkList[t].feedtimelength / classWorkList[t].workdatafeedbackcount / 60
-      ).toFixed(0)
-    } else {
-      classWorkList[t].averagetime = 0
-    }
-
-    // 计算批阅异常，需要获取每个题目的类型，找出主观题
-    // 暂缓
-
-    // 计算平均得分率： 正确题数/（题目总数*学生人数）*100
-    if (
-      classWorkList[t].entpcourseworklistarray &&
-      classWorkList[t].entpcourseworklistarray.length > 0
-    ) {
-      var dd =
-        (classWorkList[t].rightAnswerCount /
-          (classWorkList[t].entpcourseworklistarray.length *
-            classWorkList[t].workdataresultsum)) *
-        100
-      classWorkList[t].scoingRate = dd.toFixed(0) + '%'
-    } else {
-      classWorkList[t].scoingRate = '0%'
-    }
-
-    
-    // 设定典型作答，需要获取每个题目的类型，找出主观题
-    // 暂缓
-    }
-    return classWorkList
-}

src/renderer/src/views/tool/sphere.vue

@@ -1,12 +1,10 @@
 <template>
   <div class="warp-all">
-    <!-- 遮罩层 -->
-    <div class="mask" v-show="isMask" @click="maskChange(true)"></div>
     <!-- 画板 -->
     <board-vue v-model="tabActive" v-show="isShow" ref="boardVueRef"></board-vue>
 
     <!-- 侧边工具栏 -->
-    <side-vue ref="sideVueRef" v-ignore @ignore-mounted="sideMouse" @change="sideChange"></side-vue>
+    <side-vue v-ignore @ignore-mounted="sideMouse" @change="sideChange"></side-vue>
 
     <!-- 点赞组件 -->
     <upvote-vue ref="upvoteRef" type="2"></upvote-vue>
@@ -15,7 +13,7 @@
     <im-chat ref="imChatRef" @change="chatChange" group />
 
     <!-- 底部工具栏 -->
-    <!-- <div class="tool-bottom-all"
+    <div class="tool-bottom-all"
       @mouseenter="mouseChange(0)" @mouseleave="mouseChange(1)">
       <div v-drag="{handle:'.tool-bottom-all', dragtime}"
         @v-drag-start="dragtime = Date.now()">
@@ -36,7 +34,7 @@
           </el-segmented>
         </div>
       </transition>
-    </div> -->
+    </div>
   </div>
 </template>
 
@@ -64,13 +62,11 @@ const isDrag = ref(false)         // 开始拖拽
 const dragtime = ref(0)           // 拖拽时间-计算点击还是拖动
 const isShow = ref(false)         // 是否显示-画板
 const isOver = ref(false)         // 是否下课
-const isOpenBook = ref(false)     // 是否打开pdf课本
+const isOpenBook = ref(false)
-const isMask = ref(false)         // 是否显示遮罩层
 const toolStore = useToolState()  // 状态管理
 const boardVueRef=ref(null)       // 画板ref
 const upvoteRef = ref(null)       // 点赞 ref
 const imChatRef = ref(null)       // im-chat ref
-const sideVueRef = ref(null)      // 侧边栏 ref
 const classObj = reactive({       // 课程相关
   id: route.query.reservId,       // 课程id
   data: {}                        // 课程信息
@@ -87,8 +83,6 @@ const btnList = [                 // 工具栏按钮列表
   // { label: '聚焦', value: 'focus', icon: 'icon-jujiao' },
   // { label: '更多', value: 'more', icon: 'icon-xiazai9' },
 ]
-let timingSide = null             // 计时器-侧边栏
-
 // === 页面加载完毕 ===
 onMounted(async() => {
   if (!electron) return // 浏览器端
@@ -96,6 +90,7 @@ onMounted(async() => {
   // window.test1 = toolStore
   getClassInfo()        // 获取课堂详情 ex3
   resetStatus()       // 开启重置状态-监听
+ 
 })
 
 // ==== 方法 ===
@@ -103,7 +98,7 @@ onMounted(async() => {
 const getClassInfo = async () => {
   const { data } = await classManageApi.getClassInfo(classObj.id)
   classObj.data = data
-  sessionStore.set('curr.curClassRoom', classObj) // 课堂信息-缓存
+  sessionStore.set('curClassRoom', classObj) // 课堂信息-缓存
   // 群id
   let timGroupId = data?.ex3 || ''
   console.log('获取群ID:', timGroupId)
@@ -145,8 +140,7 @@ const logoHandle = (e,t) => {
 // 底部工具栏：移入移出-是否穿透
 const mouseChange = (bool) => {
   let resBool = false
-  // console.log('mouseChange:', bool, resBool)
+  if (bool == 0) return setIgnore(resBool) // 移入不穿透
-  if (!bool) return setIgnore(resBool) // 移入不穿透
   if (tabActive.value == 'select') resBool = !!bool
   else {
     if (!isShow.value) resBool = !!bool
@@ -154,10 +148,12 @@ const mouseChange = (bool) => {
     const isPdf = !resBool && toolStore.isPdfWin
     if (isPdf) resBool = true
   }
-  // console.log('mouseChange:', bool, resBool)
+  console.log('mouseChange:', bool, resBool)
   setIgnore(resBool)
 }
-
+const touchChange = (e) => {
+  console.log(e)
+}
 // im-chat: 聊天事件 {type, data}
 const chatChange = (type, data, ...args) => {
   if (type == 'createGroup') {  // 创建群-监听
@@ -189,6 +185,14 @@ const setIgnore = (bool) => {ipcMsgSend('tool-sphere:set:ignore', bool)}
 // 重置状态: 鼠标|画板
 const resetStatus = () => {
   if (toolStore.isToolWin) return // 已经打开过-忽略
+  // 以下代码废弃-暂时无用
+  // ipcMain?.removeHandler('tool-sphere:reset') // 避免已绑定，先移除在绑定
+  // ipcMain?.handle?.('tool-sphere:reset', () => {
+  //   setTimeout(() => {
+  //     boardVueRef.value.handleMode(tabActive.value)
+  //     mouseChange(1)
+  //   }, 500)
+  // })
   toolStore.isToolWin = true // 标记状态
 }
 // 侧边工具栏: 移入移出
@@ -198,16 +202,13 @@ const sideMouse = e => {
     setIgnore(false) // 关闭窗口鼠标-穿透
     return
   }
-  // 打开内容且触发移出事件时
+  mouseChange(type == 'mouseleave')
-  const bool = isMask.value && type =='mouseleave'
-  if (bool) mouseChange(false) // 不穿透
-  else mouseChange(type == 'mouseleave')
 }
 // 侧边工具栏: 操作变化
 const sideChange = async o => {
   // console.log(o)
   switch(o.prop) {
-    case 'bookOpen':
+    case 'book':
       if(isOpenBook.value) {
         isOpenBook.value = false
         ElMessage.info('已经打开课本了哦')
@@ -217,14 +218,7 @@ const sideChange = async o => {
         isOpenBook.value = true
       }
       break
-    case 'book':
-      isMask.value = !isMask.value
-      break
-    case 'close': // 关闭
-      maskChange(false)
-      break
     case 'resource': // 资源
-      isMask.value = !isMask.value
       break
     case 'interact': // 互动
       break
@@ -261,13 +255,6 @@ const sideChange = async o => {
   }
 }
 
-// 遮罩层-触发事件
-const maskChange = (bool) => {
-  isMask.value = false
-  bool && sideVueRef.value.closeActive() // 关闭侧边栏内容窗口
-  mouseChange(true)              // 允许穿透
-}
-
 // === 监听器 ===
 watchEffect(() => {
   if (isOver.value) return // 下课, 不往下执行
@@ -287,12 +274,6 @@ watchEffect(() => {
 .warp-all{
   position: relative;
 }
-// 遮罩层
-.mask{
-  position: fixed;
-  inset: 0;
-  background: rgba(1, 1, 1, 0.3);
-}
 // 底部工具栏
 .tool-bottom-all{
   // width: 45vw;
@@ -335,7 +316,6 @@ watchEffect(() => {
     }
   }
 }
-// 底部动画
 .a-fade-leave-active,.a-fade-enter-active{
   transition: all .3s;
 }