Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl

src/main/index.js

@@ -96,6 +96,7 @@ function createMainWindow() {
     frame: false, // 无边框
     autoHideMenuBar: true,
     maximizable: false,
+    fullscreen: true,
     icon: join(__dirname, '../../resources/logo2.ico'),
     ...(process.platform === 'linux' ? { icon } : {}),
     webPreferences: {

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

@@ -19,6 +19,8 @@
 
   <!-- 试题详情 -->
   <el-drawer v-model="activeExamInfoDrawer" title="题目详情" :with-header="false" direction="rtl" size="60%">
+    <div style="height: calc(100% - 50px);">
+      <el-scrollbar style="background: #e9e9e9;border-radius: 8px;">
         <el-row class="drawer-main">
           <el-col :span="24">
             <span>{{activeExam.worktag}}</span>
@@ -35,6 +37,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>
+    </div>
+    <div class="drawer-footer">
+      <el-button type="primary" @click="activeExamInfoDrawer = false">关闭</el-button>
+    </div>
   </el-drawer>
 </template>
 
@@ -89,13 +96,17 @@ const showExamAnalyseDrawer = (row) => {
 
   .drawer-main{
     margin: 1%; 
-    padding: 1% 2%; 
+    padding: 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>