Merge branch 'master' of http://git.qmth.com.cn/ExamCloud-3/examcloud-web-admin

src/modules/examwork/view/student.vue

@@ -65,12 +65,13 @@
             <el-button
               v-if="rolePrivileges.upload_student_photo"
               size="small"
-              type="info"
+              type="primary"
+              icon="el-icon-plus"
               @click="uploadPhoto"
               >上传照片
             </el-button>
             <el-button size="small" type="primary" @click="exportStudent">
-              <i class="fa fa-download" aria-hidden="true"></i>导出
+              导出
             </el-button>
           </el-form-item>
         </el-form>
@@ -81,7 +82,7 @@
         <el-button
           v-if="rolePrivileges.reset_student_password"
           size="small"
-          type="warning"
+          type="danger"
           :disabled="noBatchSelected"
           @click="resetPassword('')"
           >重置密码
@@ -89,11 +90,10 @@
         <el-button
           v-if="rolePrivileges.change_student_availability"
           size="small"
-          type="success"
+          type="danger"
           :disabled="noBatchSelected"
           @click="enableStudent('')"
-        >
-          <i class="fa fa-check" aria-hidden="true"></i>启用
+          >启用
         </el-button>
         <el-button
           v-if="rolePrivileges.change_student_availability"
@@ -102,7 +102,7 @@
           :disabled="noBatchSelected"
           @click="disableStudent('')"
         >
-          <i class="fa fa-close" aria-hidden="true"></i>禁用
+          禁用
         </el-button>
 
         <div style="width: 100%;margin-bottom: 10px;"></div>
@@ -214,7 +214,7 @@
               <el-button
                 :disabled="!scope.row.photoPath"
                 size="mini"
-                type="info"
+                type="primary"
                 plain
                 @click="showPhoto(scope.row)"
                 ><i class="fa fa-check" aria-hidden="true"></i>查看照片
@@ -226,20 +226,18 @@
                     rolePrivileges.change_student_availability
                 "
                 size="mini"
-                type="danger"
+                type="primary"
                 plain
                 @click="enableStudent(scope.row)"
-              >
-                <i class="fa fa-check" aria-hidden="true"></i>启用
+                >启用
               </el-button>
               <el-button
                 v-else-if="rolePrivileges.change_student_availability"
                 size="mini"
-                type="info"
+                type="primary"
                 plain
                 @click="disableStudent(scope.row)"
-              >
-                <i class="fa fa-close" aria-hidden="true"></i>禁用
+                >禁用
               </el-button>
 
               <el-dropdown style="margin-left: 10px;">
@@ -252,7 +250,7 @@
                   >
                     <el-button
                       size="mini"
-                      type="warning"
+                      type="danger"
                       plain
                       @click="resetPassword(scope.row)"
                       >重置密码
@@ -261,7 +259,7 @@
                   <el-dropdown-item>
                     <el-button
                       size="mini"
-                      type="info"
+                      type="primary"
                       plain
                       @click="showStuExamDialog(scope.row)"
                       >考试记录
@@ -270,7 +268,7 @@
                   <el-dropdown-item v-if="rolePrivileges.unbind_student_code">
                     <el-button
                       size="mini"
-                      type="warning"
+                      type="danger"
                       plain
                       @click="unbindStudentCode(scope.row)"
                       >解绑学号
@@ -279,7 +277,7 @@
                   <el-dropdown-item v-if="rolePrivileges.unbind_security_phone">
                     <el-button
                       size="mini"
-                      type="warning"
+                      type="danger"
                       plain
                       @click="unbindSecurityPhone(scope.row)"
                       >解绑安全手机