diff --git a/ruoyi-ui/src/assets/styles/element-ui.scss b/ruoyi-ui/src/assets/styles/element-ui.scss
index 86a738bd3..bbd3e77ed 100644
--- a/ruoyi-ui/src/assets/styles/element-ui.scss
+++ b/ruoyi-ui/src/assets/styles/element-ui.scss
@@ -122,3 +122,8 @@
     float: none;
   }
 }
+@media screen and (max-width: 992px){
+  .el-dialog, .el-message-box {
+   width: 98% !important;
+  }
+  }
diff --git a/ruoyi-ui/src/layout/components/Navbar.vue b/ruoyi-ui/src/layout/components/Navbar.vue
index 8853450f8..8fb1c6997 100644
--- a/ruoyi-ui/src/layout/components/Navbar.vue
+++ b/ruoyi-ui/src/layout/components/Navbar.vue
@@ -109,7 +109,6 @@ export default {
     },
     async logout() {
       this.$confirm("确定注销并退出系统吗？", "提示", {
-        cancelButtonClass: "btn-custom-cancel",
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
@@ -123,13 +122,6 @@ export default {
 };
 </script>
 
-<style lang="scss">
-.btn-custom-cancel {
-  float: right;
-  margin-left: 20px;
-}
-</style>
-
 <style lang="scss" scoped>
 .navbar {
   height: 50px;
diff --git a/ruoyi-ui/src/views/benyi/mathtermplan/index.vue b/ruoyi-ui/src/views/benyi/mathtermplan/index.vue
index 076645a19..a7b79e496 100644
--- a/ruoyi-ui/src/views/benyi/mathtermplan/index.vue
+++ b/ruoyi-ui/src/views/benyi/mathtermplan/index.vue
@@ -95,7 +95,7 @@
     </div>
 
     <el-table
-    border
+      border
       v-loading="loading"
       :data="mathtermplanList"
       @selection-change="handleSelectionChange"
@@ -107,7 +107,7 @@
         :selectable="isShow"
       />
       <el-table-column
-      fixed
+        fixed
         label="计划名称"
         align="center"
         prop="name"
@@ -128,20 +128,12 @@
         prop="classid"
         :formatter="classFormat"
       />
-      <el-table-column
-        label="开始月份"
-        align="center"
-        prop="startmonth"
-      >
+      <el-table-column label="开始月份" align="center" prop="startmonth">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.startmonth, "{y}-{m}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column
-        label="结束月份"
-        align="center"
-        prop="endmonth"
-      >
+      <el-table-column label="结束月份" align="center" prop="endmonth">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.endmonth, "{y}-{m}") }}</span>
         </template>
@@ -173,6 +165,7 @@
             icon="el-icon-setting"
             @click="handleSetting(scope.row)"
             v-hasPermi="['benyi:mathtermplan:edit']"
+            v-show="isShow(scope.row)"
             >设置</el-button
           >
           <el-button
@@ -223,7 +216,12 @@
     />
 
     <!-- 添加或修改游戏数学学期计划对话框 -->
-    <el-dialog :title="title" :visible.sync="open" class="v-dialog" append-to-body>
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      class="v-dialog"
+      append-to-body
+    >
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="月份" prop="startmonth">
           <el-date-picker
diff --git a/ruoyi-ui/src/views/benyi/thememonthplan/index.vue b/ruoyi-ui/src/views/benyi/thememonthplan/index.vue
index 439648fee..f09076f5e 100644
--- a/ruoyi-ui/src/views/benyi/thememonthplan/index.vue
+++ b/ruoyi-ui/src/views/benyi/thememonthplan/index.vue
@@ -196,6 +196,7 @@
             icon="el-icon-setting"
             @click="handleSetting(scope.row)"
             v-hasPermi="['benyi:thememonthplan:edit']"
+            v-show="isShow(scope.row)"
             >设置</el-button
           >
           <el-button
@@ -246,7 +247,12 @@
     />
 
     <!-- 添加或修改主题整合月计划对话框 -->
-    <el-dialog :title="title" :visible.sync="open" class="v-dialog" append-to-body>
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      class="v-dialog"
+      append-to-body
+    >
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="计划月份" prop="month">
           <el-date-picker
diff --git a/ruoyi-ui/src/views/benyi/themetermplan/index.vue b/ruoyi-ui/src/views/benyi/themetermplan/index.vue
index 2fca6bcdc..d1384e766 100644
--- a/ruoyi-ui/src/views/benyi/themetermplan/index.vue
+++ b/ruoyi-ui/src/views/benyi/themetermplan/index.vue
@@ -173,6 +173,7 @@
             icon="el-icon-setting"
             @click="handleSetting(scope.row)"
             v-hasPermi="['benyi:themetermplan:edit']"
+            v-show="isShow(scope.row)"
             >设置</el-button
           >
           <el-button
diff --git a/ruoyi-ui/src/views/benyi/themeweekplan/index.vue b/ruoyi-ui/src/views/benyi/themeweekplan/index.vue
index cedec1dba..659ae0284 100644
--- a/ruoyi-ui/src/views/benyi/themeweekplan/index.vue
+++ b/ruoyi-ui/src/views/benyi/themeweekplan/index.vue
@@ -119,7 +119,7 @@
     </div>
 
     <el-table
-    border
+      border
       v-loading="loading"
       :data="weekplanList"
       @selection-change="handleSelectionChange"
@@ -132,7 +132,7 @@
       />
       <!-- <el-table-column label="编号" align="center" prop="id" /> -->
       <el-table-column
-      fixed
+        fixed
         label="计划名称"
         align="center"
         prop="name"
@@ -173,7 +173,7 @@
         :formatter="statusFormat"
       />
       <el-table-column
-      fixed="right"
+        fixed="right"
         label="操作"
         align="center"
         class-name="small-padding fixed-width edit-btns"
@@ -186,6 +186,7 @@
             icon="el-icon-setting"
             @click="handleSetting(scope.row)"
             v-hasPermi="['benyi:themeweekplan:edit']"
+            v-show="isShow(scope.row)"
             >设置</el-button
           >
           <el-button
@@ -236,7 +237,12 @@
     />
 
     <!-- 添加或修改主题整合周计划（根据月计划明细）对话框 -->
-    <el-dialog :title="title" :visible.sync="open" class="v-dialog" append-to-body>
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      class="v-dialog"
+      append-to-body
+    >
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="学年学期" prop="xnxq">
           <el-select