Merge pull request 'zhuhao_dev' (#342) from zhuhao_dev into main

Reviewed-on: #342

.env.development

@@ -15,3 +15,5 @@ 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.production

@@ -17,3 +17,5 @@ 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'

src/main/index.js

@@ -73,8 +73,7 @@ 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()
   })
@@ -96,7 +95,6 @@ function createMainWindow() {
     frame: false, // 无边框
     autoHideMenuBar: true,
     maximizable: false,
-    fullscreen: true,
     icon: join(__dirname, '../../resources/logo2.ico'),
     ...(process.platform === 'linux' ? { icon } : {}),
     webPreferences: {
@@ -129,7 +127,7 @@ function createMainWindow() {
     shell.openExternal(details.url)
     return { action: 'deny' }
   })
-  mainWindow.webContents.openDevTools()
+  if (import.meta.env.VITE_SHOW_DEV_TOOLS === 'true') mainWindow.webContents.openDevTools()
 
   if (is.dev && process.env['ELECTRON_RENDERER_URL']) {
     mainWindow.loadURL(process.env['ELECTRON_RENDERER_URL'])
@@ -139,6 +137,7 @@ function createMainWindow() {
 
   // mainWindow.setAlwaysOnTop(true, "screen-saver") // 将窗口设置为顶层窗口
   // mainWindow.setVisibleOnAllWorkspaces(true) // 如果窗口在所有工作区都可见
+  mainWindow.maximize();
   // 第三步： 开启remote服务
   remote.enable(mainWindow.webContents)
 }

src/renderer/src/utils/tool.js

@@ -138,7 +138,7 @@ export const createWindow = async (type, data) => {
       wins_tool.setIgnoreMouseEvents(true, {forward: true}) // 忽略鼠标事件但是事件继续传递给窗口
       wins_tool.setAlwaysOnTop(true,'screen-saver') // 将窗口设置为顶层窗口
       wins_tool.setVisibleOnAllWorkspaces(true) // 如果窗口在所有工作区都可见
-      wins_tool.webContents.openDevTools() // 打开调试工具
+      if (import.meta.env.VITE_SHOW_DEV_TOOLS === 'true') wins_tool.webContents.openDevTools() // 打开调试工具
       eventHandles(type, wins_tool) // 事件监听处理
       return wins_tool
     }
@@ -165,7 +165,7 @@ export const createWindow = async (type, data) => {
       win.type = type  // 唯一标识
       win.show()
       win.setFullScreen(true) // 设置窗口为全屏
-      win.webContents.openDevTools() // 打开调试工具
+      if (import.meta.env.VITE_SHOW_DEV_TOOLS === 'true') win.webContents.openDevTools() // 打开调试工具
       eventHandles(type, win) // 事件监听处理
       winPdf=win
       break

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

@@ -880,18 +880,20 @@ watch(() => courseObj.node, (newVal,oldVal) => {
 
 </script>
 
+<!--
 <style>
   .el-table .hidden-row {
     display: none !important;
     /* color: #ccc !important; */
   }
   .el-table .father-row {
-    --el-table-tr-bg-color: #fff;
+    &#45;&#45;el-table-tr-bg-color: #fff;
   }
   .el-table .son-row {
-    --el-table-tr-bg-color: #f0f0f08a;
+    &#45;&#45;el-table-tr-bg-color: #f0f0f08a;
   }
 </style>
+-->
 
 <style lang="scss" scoped>
 .page-classTaskAssign {

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

@@ -656,8 +656,6 @@ defineExpose({
 })
 </script>
 
-<style src="@/assets/styles/JYStyle.css"></style>
-
 <style scoped lang="scss">
 /*:deep(.reserv-date-pick) {
   width: 140px;
@@ -765,3 +763,4 @@ defineExpose({
   overflow-y: auto;
 }
 </style>
+<style src="@/assets/styles/JYStyle.css"></style>

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

@@ -658,8 +658,6 @@ onUnmounted(() => {
 // })
 </script>
 
-<style src="@/assets/styles/JYStyle.css"></style>
-
 <style scoped lang="scss">
 .teachClassTask{
   height: 100%;
@@ -705,94 +703,6 @@ onUnmounted(() => {
     }
   }
 }
-
-
-
-
-
-
-
-// .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 scoped>
+<style src="@/assets/styles/JYStyle.css"></style>
-/* .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/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 } from '@/api/file'
+import { deleteSmarttalk, updateSmarttalk, getPrepareById, getSmarttalkPage } from '@/api/file'
 import useUserStore from '@/store/modules/user'
 import outLink from '@/utils/linkConfig'
 import { sessionStore } from '@/utils/store'
@@ -208,6 +208,7 @@ export default {
               }
               if (action === 'cancel'){
                 // 继续上课
+                console.log(obj.bookImg)
                 if (obj.bookImg) {
                   //PPT
                   listEntpcourse({
@@ -241,9 +242,20 @@ export default {
                     }
                   })
                 }else {
+                  console.log(obj)
+                  getSmarttalkPage({fileId: obj.entpcoursefileid}).then(res2=>{
+                    console.log(res2)
                     //APT
-                  this.$emit('on-start-class', item, obj)
+                    if (res2&&res2.rows.length>0) {
+                      this.$emit('on-start-class', res2.rows[0], obj)
+                    }else {
+                      ElMessage({
+                        message: '该文件未关联PPT，无法打开！',
+                        type: 'warning'
+                      })
+                    }
                     done()
+                  })
                 }
               }
               if (action === 'close') {