Explorar el Código

feat: 页面风格标准化

zhangjie hace 10 meses
padre
commit
11bef00bb8

+ 5 - 5
src/assets/styles/base.scss

@@ -423,19 +423,19 @@ body {
 }
 .btn-primary {
   &.el-button--text:not(.is-disabled) {
-    color: $--color-text-dark-1 !important;
+    color: $--color-primary !important;
     &:hover {
       font-weight: 600;
-      color: $--color-primary !important;
+      color: mix(#000, $--color-primary, 20%) !important;
     }
   }
 }
-.btn-act-primary {
+.btn-success {
   &.el-button--text:not(.is-disabled) {
-    color: $--color-primary !important;
+    color: $--color-success !important;
     &:hover {
       font-weight: 600;
-      color: mix(#000, $--color-primary, 20%) !important;
+      color: mix(#000, $--color-success, 20%) !important;
     }
   }
 }

+ 27 - 0
src/assets/styles/element-ui-costom.scss

@@ -18,6 +18,33 @@
       z-index: 9;
       background-color: #fff;
       border-bottom: 1px solid $--color-border;
+
+      .el-dialog__headerbtn {
+        top: 8px;
+        width: auto;
+        height: 32px;
+        padding: 5px 10px;
+        line-height: 20px;
+        background: none;
+        border: 1px solid #ddd;
+        border-radius: 5px;
+        font-size: 14px;
+        font-weight: 500;
+        color: #606266;
+
+        &::before {
+          content: "返回";
+        }
+        &::after {
+          font-family: element-icons !important;
+          content: "\e6e0";
+        }
+
+        &:hover {
+          color: $--color-danger;
+          border-color: $--color-danger;
+        }
+      }
     }
     .el-dialog__body {
       padding-top: 90px;

+ 8 - 0
src/assets/styles/home.scss

@@ -314,6 +314,14 @@
         text-overflow: ellipsis;
       }
     }
+
+    .menu-item-logout {
+      opacity: 1;
+
+      &:hover {
+        color: $--color-danger;
+      }
+    }
   }
 
   // .head-menu-btn

+ 43 - 43
src/assets/styles/variables.scss

@@ -1,43 +1,43 @@
-// color ------------------->
-$--color-text-dark: #1f2230 !default;
-$--color-text-dark-1: #434656 !default;
-$--color-text-gray: #6f7482 !default;
-$--color-text-gray-1: #7a7c87 !default;
-$--color-text-gray-2: #8b8fa1 !default;
-$--color-text-gray-3: #aaa !default;
-$--color-text-gray-4: #ccc !default;
-$--color-text-gray-5: #d3d5e0 !default;
-$--color-text-gray-6: #e0e1eb !default;
-$--color-text-gray-7: #f2f4fa !default;
-$--color-border: #eff0f5;
-$--color-border-bold: #e6e6e6;
-$--color-background: #eff0f5;
-// status
-$--color-primary: #3a5ae5 !default;
-$--color-primary-light: mix(#fff, $--color-primary, 20%) !default;
-$--color-success: #3fcb98 !default;
-$--color-success-light: #32cf8a !default;
-$--color-warning: #ff9427 !default;
-$--color-danger: #fe5d4e !default;
-$--color-cyan: #2abcff !default;
-$--color-cyan-light: #5fc9fa !default;
-$--color-blue: #556dff !default;
-$--color-blue-white: #4f79ff !default;
-$--color-blue-dark: #172666 !default;
-$--color-purple: #9877ff !default;
-$--color-white: #ffffff;
-$--color-dark: #1f2230;
-
-// shadow
-$--shadow-light: 0 0 1px rgba(0, 0, 0, 0.15) !default;
-
-// size ------------------->
-$--font-size-base: 14px !default;
-$--font-size-medium: 16px !default;
-$--font-size-large: 18px !default;
-$--border-radius: 8px;
-$--border-radius-large: 12px;
-$--border-radius-huge: 20px;
-// font-family
-$--font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB",
-  "Microsoft YaHei", Arial, sans-serif;
+// color ------------------->
+$--color-text-dark: #1f2230 !default;
+$--color-text-dark-1: #434656 !default;
+$--color-text-gray: #6f7482 !default;
+$--color-text-gray-1: #7a7c87 !default;
+$--color-text-gray-2: #8b8fa1 !default;
+$--color-text-gray-3: #aaa !default;
+$--color-text-gray-4: #ccc !default;
+$--color-text-gray-5: #d3d5e0 !default;
+$--color-text-gray-6: #e0e1eb !default;
+$--color-text-gray-7: #f2f4fa !default;
+$--color-border: #eff0f5;
+$--color-border-bold: #e6e6e6;
+$--color-background: #eff0f5;
+// status
+$--color-primary: #3a5ae5 !default;
+$--color-primary-light: mix(#fff, $--color-primary, 20%) !default;
+$--color-success: #3fcb98 !default;
+$--color-success-light: #32cf8a !default;
+$--color-warning: #ff9427 !default;
+$--color-danger: #fe5d4e !default;
+$--color-cyan: #2abcff !default;
+$--color-cyan-light: #5fc9fa !default;
+$--color-blue: #556dff !default;
+$--color-blue-white: #4f79ff !default;
+$--color-blue-dark: #172666 !default;
+$--color-purple: #9877ff !default;
+$--color-white: #ffffff;
+$--color-dark: #1f2230;
+
+// shadow
+$--shadow-light: 0 0 1px rgba(0, 0, 0, 0.15) !default;
+
+// size ------------------->
+$--font-size-base: 14px !default;
+$--font-size-medium: 16px !default;
+$--font-size-large: 18px !default;
+$--border-radius: 8px;
+$--border-radius-large: 12px;
+$--border-radius-huge: 20px;
+// font-family
+$--font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB",
+  "Microsoft YaHei", Arial, sans-serif;

+ 3 - 2
src/modules/admin/views/Admin.vue

@@ -12,8 +12,9 @@
             <i class="icon icon-account"></i>
             <span :title="username">{{ username }}</span>
           </li>
-          <li class="menu-item" @click="toLogout">
-            <i class="icon icon-logout" title="退出登录"></i>
+          <li class="menu-item menu-item-logout" @click="toLogout">
+            <i class="el-icon-switch-button" title="退出登录"></i>
+            <span>退出</span>
           </li>
         </ul>
       </div>

+ 1 - 1
src/modules/base/components/course-simple/CourseWeightManage.vue

@@ -32,7 +32,7 @@
             <el-button
               v-else
               type="text"
-              class="btn-act-primary"
+              class="btn-primary"
               @click="toEdit(scope.row)"
             >
               查看详情

+ 1 - 1
src/modules/base/components/course-simple/ModifyCourseTarget.vue

@@ -28,7 +28,7 @@
         <el-form-item prop="dimensionIdList" label="毕业要求指标:">
           <el-button
             type="text"
-            class="btn-act-primary"
+            class="btn-primary"
             icon="el-icon-circle-plus-outline"
             @click="toSelectDimension"
             >选择知识点</el-button

+ 1 - 1
src/modules/exam/components/createExamAndPrintTask/SelectTikuPaperDialog.vue

@@ -51,7 +51,7 @@
           <template slot-scope="scope">
             <el-button
               :class="
-                scope.row.id === row.paperId ? 'btn-act-primary' : 'btn-primary'
+                scope.row.id === row.paperId ? 'btn-success' : 'btn-primary'
               "
               type="text"
               @click="toSelect(scope.row)"

+ 1 - 4
src/modules/mark/components/ModifyMarkSetting.vue

@@ -68,10 +68,7 @@
           <span class="ml-1">%</span>
         </el-form-item>
         <el-form-item v-if="!isMultiple" prop="sheetConfig" label="原图遮盖:">
-          <el-button
-            class="btn-act-primary"
-            type="text"
-            @click="toSetSheetConfig"
+          <el-button class="btn-primary" type="text" @click="toSetSheetConfig"
             >设置</el-button
           >
           <i

+ 4 - 4
src/modules/mark/components/markDetail/MarkDetailProgress.vue

@@ -60,7 +60,7 @@
         >
           <template slot-scope="scope">
             <el-button
-              class="btn-act-primary"
+              class="btn-primary"
               type="text"
               @click="toMarker(scope.row)"
               >{{ scope.row.markerCount }}</el-button
@@ -94,7 +94,7 @@
         >
           <template slot-scope="scope">
             <el-button
-              class="btn-act-primary"
+              class="btn-primary"
               type="text"
               @click="toArbitrate(scope.row)"
               >{{ scope.row.arbitrateCount }}</el-button
@@ -134,7 +134,7 @@
         >
           <template slot-scope="scope">
             <el-button
-              class="btn-act-primary"
+              class="btn-primary"
               type="text"
               @click="toMarker(scope.row)"
               >{{ scope.row.markerCount }}</el-button
@@ -178,7 +178,7 @@
         >
           <template slot-scope="scope">
             <el-button
-              class="btn-act-primary"
+              class="btn-primary"
               type="text"
               @click="toArbitrate(scope.row)"
               >{{ scope.row.arbitrateCount }}</el-button

+ 1 - 1
src/modules/target/components/course-outline/ModifyCourseOutlineTarget.vue

@@ -38,7 +38,7 @@
 
           <el-button
             type="text"
-            class="btn-act-primary ml-1"
+            class="btn-primary ml-1"
             icon="el-icon-circle-plus-outline"
             @click="toSelectDimension"
             >选择知识点</el-button

+ 1 - 1
src/modules/target/components/requirement-statistics/RequirementStatisticsRadar.vue

@@ -64,7 +64,7 @@
                     </template>
                   </el-table-column>
                 </el-table>
-                <el-button slot="reference" class="btn-act-primary" type="text"
+                <el-button slot="reference" class="btn-primary" type="text"
                   >查看详情</el-button
                 >
               </el-popover>

+ 3 - 2
src/views/Home.vue

@@ -31,8 +31,9 @@
             <i class="icon icon-account"></i>
             <span :title="username">{{ username }}</span>
           </li>
-          <li class="menu-item" @click="toLogout">
-            <i class="icon icon-logout" title="退出登录"></i>
+          <li class="menu-item menu-item-logout" @click="toLogout">
+            <i class="el-icon-switch-button" title="退出登录"></i>
+            <span>退出</span>
           </li>
         </ul>
       </div>