Merge remote-tracking branch 'origin/main'

.idea/dataSources.xml

@@ -2,7 +2,6 @@
 <project version="4">
   <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
     <data-source source="LOCAL" name="DM" uuid="a3a7e92a-b8da-4229-8b83-5db11f9db9a9">
-      <driver-ref>9fcb59ee-b3c5-470d-89df-ad01e7cabb15</driver-ref>
       <imported>true</imported>
       <configured-by-url>true</configured-by-url>
       <remarks>$PROJECT_DIR$/backend/roomroot-admin/src/main/resources/application-druid.yml</remarks>

frontend/src/assets/styles/roomroot.scss

@@ -109,6 +109,16 @@
   }
 
   .el-table__body-wrapper {
+    // 宽表格统一通过内容区拖拽横向查看，隐藏重复的底部滚动条但保留滚动能力。
+    -ms-overflow-style: none;
+    scrollbar-width: none;
+
+    &::-webkit-scrollbar {
+      display: none;
+      width: 0;
+      height: 0;
+    }
+
     .el-button [class*="el-icon-"] + span {
       margin-left: 1px;
     }

frontend/src/views/classHour/jointTraining/index.vue

@@ -25,12 +25,12 @@
       <div class="upload-row">
         <div class="upload-left">
           <el-button type="primary" @click="handleAdd">新增联教联训</el-button>
-          <el-button type="primary" plain @click="handleExport">导出 Excel</el-button>
+          <el-button icon="el-icon-download" @click="handleExport">导出 Excel</el-button>
-          <el-button @click="handleDownloadTemplate">【联教联训数据文件模板】下载</el-button>
+          <el-button icon="el-icon-download" @click="handleDownloadTemplate">【联教联训数据文件模板】下载</el-button>
-          <el-button plain @click="handleChooseFile">选择文件</el-button>
+          <el-button icon="el-icon-folder-opened" @click="handleChooseFile">选择文件</el-button>
           <span class="file-name" :class="{ 'has-file': selectedFile }">{{ fileName }}</span>
           <input ref="fileInputRef" type="file" accept=".xls,.xlsx" style="display: none" @change="handleFileChange" />
-          <el-button type="success" :loading="uploading" @click="handleUpload">上传数据</el-button>
+          <el-button type="primary" icon="el-icon-upload2" :loading="uploading" @click="handleUpload">上传数据</el-button>
         </div>
       </div>
     </el-card>

frontend/src/views/monitor/job/log.vue

@@ -91,8 +91,6 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="warning"
-          plain
           icon="el-icon-close"
           size="mini"
           @click="handleClose"

frontend/src/views/schedule/planImport/index.vue

@@ -75,7 +75,7 @@
     <el-card shadow="never" class="action-card">
       <div class="action-bar">
         <div class="bar-left">
-          <el-button type="primary" @click="handleDownloadTemplate">
+          <el-button icon="el-icon-download" @click="handleDownloadTemplate">
             【课程表数据文件模板】下载
           </el-button>
         </div>
@@ -83,16 +83,16 @@
         <div class="bar-center">
           <div class="file-area">
             <input ref="fileInputRef" type="file" accept=".xlsx,.xls" style="display: none" @change="handleFileChange" />
-            <el-button @click="handleChooseFile">选择文件</el-button>
+            <el-button icon="el-icon-folder-opened" @click="handleChooseFile">选择文件</el-button>
             <span class="file-name">{{ selectedFileName }}</span>
           </div>
         </div>
 
         <div class="bar-right">
           <el-button type="primary" @click="handleImportToSystem" :loading="importing">缓存数据导入到系统</el-button>
-          <el-button type="primary" @click="handleUploadToCache">上传数据至缓存</el-button>
+          <el-button type="primary" icon="el-icon-upload2" @click="handleUploadToCache">上传数据至缓存</el-button>
-          <el-button type="primary" @click="handleCheckCache">检查缓存数据</el-button>
+          <el-button @click="handleCheckCache">检查缓存数据</el-button>
-          <el-button type="danger" @click="handleDeleteCache">删除缓存数据</el-button>
+          <el-button type="danger" plain @click="handleDeleteCache">删除缓存数据</el-button>
         </div>
       </div>
     </el-card>

frontend/src/views/student/shiftTeam/index.vue

@@ -50,13 +50,13 @@
     <!-- ==================== 2. 工具栏：新增 / 导入 / 导出 ==================== -->
     <div class="toolbar">
       <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增学员队</el-button>
-      <el-button type="primary" plain icon="el-icon-download" @click="handleExport">导出 Excel</el-button>
+      <el-button icon="el-icon-download" @click="handleExport">导出 Excel</el-button>
-      <el-button type="primary" plain icon="el-icon-download" @click="handleDownloadTemplate">模板下载</el-button>
+      <el-button icon="el-icon-download" @click="handleDownloadTemplate">模板下载</el-button>
       <div class="file-input">
         <input ref="fileInputRef" type="file" accept=".xls,.xlsx" style="display: none" @change="handleFileChange" />
-        <el-button type="primary" plain icon="el-icon-upload2" @click="handleChooseFile">选择文件</el-button>
+        <el-button icon="el-icon-folder-opened" @click="handleChooseFile">选择文件</el-button>
         <span class="file-name">{{ fileName }}</span>
-        <el-button type="primary" plain :loading="uploading" @click="handleUpload">上传数据</el-button>
+        <el-button type="primary" icon="el-icon-upload2" :loading="uploading" @click="handleUpload">上传数据</el-button>
       </div>
     </div>
 

frontend/src/views/student/studentInfo/index.vue

@@ -62,7 +62,7 @@
         </el-row>
 
         <div class="search-actions">
-          <el-button class="gray-btn" @click="handleSearch">查询</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch">查询</el-button>
         </div>
       </el-form>
     </el-card>
@@ -484,21 +484,5 @@ export default {
     width: 100%;
   }
 
-  .gray-btn {
-    height: 28px;
-    padding: 2px 16px;
-    font-size: 12px;
-    background: #f5f5f5;
-    border: 1px solid #c0c4cc;
-    color: #333;
-    border-radius: 2px;
-
-    &:hover,
-    &:focus {
-      background: #ebebeb;
-      border-color: #c0c4cc;
-      color: #333;
-    }
-  }
 }
 </style>

frontend/src/views/system/dict/data.vue

@@ -80,8 +80,6 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="warning"
-          plain
           icon="el-icon-close"
           size="mini"
           @click="handleClose"
@@ -436,4 +434,4 @@ export default {
   scrollbar-width: none;
   -ms-overflow-style: none;
 }
-</style>
+</style>

frontend/src/views/system/role/authUser.vue

@@ -49,8 +49,6 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="warning"
-          plain
           icon="el-icon-close"
           size="mini"
           @click="handleClose"
@@ -233,4 +231,4 @@ export default {
   scrollbar-width: none;
   -ms-overflow-style: none;
 }
-</style>
+</style>

frontend/src/views/system/user/profile/resetPwd.vue

@@ -11,7 +11,7 @@
     </el-form-item>
     <el-form-item>
       <el-button type="primary" size="mini" @click="submit">保存</el-button>
-      <el-button type="danger" size="mini" @click="close">关闭</el-button>
+      <el-button size="mini" @click="close">关闭</el-button>
     </el-form-item>
   </el-form>
 </template>

frontend/src/views/system/user/profile/userInfo.vue

@@ -17,7 +17,7 @@
     </el-form-item>
     <el-form-item>
       <el-button type="primary" size="mini" @click="submit">保存</el-button>
-      <el-button type="danger" size="mini" @click="close">关闭</el-button>
+      <el-button size="mini" @click="close">关闭</el-button>
     </el-form-item>
   </el-form>
 </template>

frontend/src/views/teachBusiness/syllabus/index.vue

@@ -33,7 +33,13 @@
         <div class="list-title">教学大纲列表</div>
         <div class="list-actions">
           <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>
-          <el-button type="danger" icon="el-icon-delete" :disabled="!selection.length" @click="handleBatchDelete">删除所选</el-button>
+          <el-button
+            type="danger"
+            plain
+            icon="el-icon-delete"
+            :disabled="!selection.length"
+            @click="handleBatchDelete"
+          >删除所选</el-button>
           <el-button icon="el-icon-download" @click="handleDownload">下载</el-button>
         </div>
       </div>

frontend/src/views/teachBusiness/teachingTask/index.vue

@@ -48,7 +48,7 @@
           </el-col>
         </el-row>
         <div class="search-actions">
-          <el-button class="gray-btn" @click="handleQuery">查询</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="handleQuery">查询</el-button>
         </div>
       </el-form>
     </el-card>
@@ -113,7 +113,7 @@
       </el-descriptions>
       <div v-else v-loading="detailLoading" class="detail-empty">加载中...</div>
       <div slot="footer">
-        <el-button type="primary" @click="detailVisible = false">关闭</el-button>
+        <el-button @click="detailVisible = false">关闭</el-button>
       </div>
     </el-dialog>
   </div>
@@ -293,20 +293,4 @@ export default {
   }
 }
 
-.gray-btn {
-  height: 28px;
-  padding: 2px 16px;
-  font-size: 12px;
-  background: #f5f5f5;
-  border: 1px solid #c0c4cc;
-  color: #333;
-  border-radius: 2px;
-
-  &:hover,
-  &:focus {
-    background: #ebebeb;
-    border-color: #c0c4cc;
-    color: #333;
-  }
-}
 </style>

frontend/src/views/teachOffice/shiftSemester/ClassCalendarDialog.vue

@@ -24,13 +24,13 @@
       <!-- ==================== 2. 操作按钮区域 ==================== -->
       <div class="settings-panel">
         <div class="action-buttons-row">
-          <button type="button" class="blue-btn" @click="handleAdd">新增记录</button>
+          <el-button type="primary" size="small" icon="el-icon-plus" @click="handleAdd">新增记录</el-button>
-          <button type="button" class="gray-btn" @click="handleAutoGenerate">自动生成必修课程</button>
+          <el-button size="small" @click="handleAutoGenerate">自动生成必修课程</el-button>
-          <button type="button" class="gray-btn" @click="handlePresetMerge">预设合班</button>
+          <el-button size="small" @click="handlePresetMerge">预设合班</el-button>
-          <button type="button" class="gray-btn" @click="handlePresetSplit">预设拆班</button>
+          <el-button size="small" @click="handlePresetSplit">预设拆班</el-button>
-          <button type="button" class="gray-btn" @click="handleApplyRegion">选定区域应用于其它班次</button>
+          <el-button size="small" @click="handleApplyRegion">选定区域应用于其它班次</el-button>
-          <button type="button" class="gray-btn" @click="handleApplyWhole">整个班历应用于其它班次</button>
+          <el-button size="small" @click="handleApplyWhole">整个班历应用于其它班次</el-button>
-          <button type="button" class="gray-btn" @click="handleRefresh">刷新</button>
+          <el-button size="small" icon="el-icon-refresh" @click="handleRefresh">刷新</el-button>
         </div>
       </div>
 
@@ -741,44 +741,4 @@ export default {
   }
 }
 
-// ========== 银灰色 / 蓝色边框按钮 ==========
-.gray-btn {
-  min-width: 90px;
-  height: 28px;
-  padding: 0 14px;
-  font-size: 12px;
-  color: #000;
-  background: linear-gradient(180deg, #fdfdfd 0%, #ececec 50%, #dcdcdc 100%);
-  border: 1px solid #7a7a7a;
-  border-radius: 2px;
-  cursor: pointer;
-
-  &:hover {
-    background: linear-gradient(180deg, #ffffff 0%, #f4f4f4 50%, #e6e6e6 100%);
-  }
-
-  &:active {
-    background: #c8c8c8;
-  }
-}
-
-.blue-btn {
-  min-width: 90px;
-  height: 28px;
-  padding: 0 14px;
-  font-size: 12px;
-  color: #1e6fff;
-  background: #ecf5ff;
-  border: 1px solid #1e6fff;
-  border-radius: 2px;
-  cursor: pointer;
-
-  &:hover {
-    background: #d9ecff;
-  }
-
-  &:active {
-    background: #c6e2ff;
-  }
-}
 </style>

frontend/src/views/teachOffice/taskPlan/index.vue

@@ -177,7 +177,7 @@
       </el-descriptions>
       <div v-else v-loading="detailLoading" class="detail-empty">加载中...</div>
       <div slot="footer">
-        <el-button type="primary" @click="detailVisible = false">关闭</el-button>
+        <el-button @click="detailVisible = false">关闭</el-button>
       </div>
     </el-dialog>
   </div>

frontend/src/views/teachingLog/organLog/components/logView.vue

@@ -92,13 +92,13 @@
 
       <div class="search-actions">
         <div class="left-group">
-          <el-button type="primary" @click="handleDeleteSelected">删除所选</el-button>
+          <el-button type="danger" plain @click="handleDeleteSelected">删除所选</el-button>
           <el-button type="primary" @click="handleBatchReport">批准上报所选</el-button>
-          <el-button type="primary" @click="handleRecheck">重新检查通报变更情况</el-button>
+          <el-button @click="handleRecheck">重新检查通报变更情况</el-button>
-          <el-button type="primary" @click="handleExport">导出到 Word</el-button>
+          <el-button icon="el-icon-download" @click="handleExport">导出到 Word</el-button>
-          <el-button type="primary" @click="handleRefresh">刷新</el-button>
+          <el-button icon="el-icon-refresh" @click="handleRefresh">刷新</el-button>
-          <el-button type="success" :loading="importing" @click="handleImportExcel">导入教学日志</el-button>
+          <el-button icon="el-icon-upload2" :loading="importing" @click="handleImportExcel">导入教学日志</el-button>
-          <el-button type="primary" @click="handleDownloadTemplate">下载模板</el-button>
+          <el-button icon="el-icon-download" @click="handleDownloadTemplate">下载模板</el-button>
         </div>
         <el-button type="primary" @click="handleSearch">查询</el-button>
       </div>

frontend/src/views/teachingLog/organLog/components/reportedView.vue

@@ -78,12 +78,12 @@
 
       <div class="search-actions">
         <div class="left-group">
-          <el-button type="primary" @click="handleDelete">删除所选</el-button>
+          <el-button type="danger" plain @click="handleDelete">删除所选</el-button>
           <el-button type="primary" @click="handleAudit">审核通过所选</el-button>
           <el-input v-model="remark" placeholder="退回原因/意见" clearable class="action-input" />
-          <el-button type="primary" @click="handleWithdraw">撤回重填所选</el-button>
+          <el-button type="warning" plain @click="handleWithdraw">撤回重填所选</el-button>
-          <el-button type="primary" @click="handleRecheck">重新检查所选变更情况</el-button>
+          <el-button @click="handleRecheck">重新检查所选变更情况</el-button>
-          <el-button type="primary" @click="handleExport">导出到 Word</el-button>
+          <el-button icon="el-icon-download" @click="handleExport">导出到 Word</el-button>
         </div>
         <div class="right-group">
           <el-button @click="handleReset">重置</el-button>

frontend/src/views/textbook/index.vue

@@ -68,16 +68,16 @@
         <div class="list-toolbar">
           <div class="left-group">
             <el-button type="primary" icon="el-icon-plus" @click="handleNew">新建教材信息</el-button>
-            <el-button type="primary" icon="el-icon-download" @click="handleDownloadList">下载教材列表</el-button>
+            <el-button icon="el-icon-download" @click="handleDownloadList">下载教材列表</el-button>
-            <el-button type="primary" icon="el-icon-folder-opened" @click="handleDownloadZip">所选文件资料打包ZIP下载</el-button>
+            <el-button icon="el-icon-folder-opened" @click="handleDownloadZip">所选文件资料打包ZIP下载</el-button>
           </div>
           <div class="right-group">
-            <el-button type="primary" icon="el-icon-download" @click="handleDownloadTemplate">【教材数据文件模板】下载</el-button>
+            <el-button icon="el-icon-download" @click="handleDownloadTemplate">【教材数据文件模板】下载</el-button>
             <div class="file-input">
               <input ref="fileInput" type="file" accept=".xls,.xlsx" style="display: none" @change="handleFileChange" />
-              <el-button type="primary" plain icon="el-icon-upload" @click="handleChooseFile">选择文件</el-button>
+              <el-button icon="el-icon-folder-opened" @click="handleChooseFile">选择文件</el-button>
               <span class="file-name">{{ fileName }}</span>
-              <el-button type="success" icon="el-icon-upload2" @click="handleImport">上传数据</el-button>
+              <el-button type="primary" icon="el-icon-upload2" @click="handleImport">上传数据</el-button>
             </div>
           </div>
         </div>