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

src/modules/basic/view/campus.vue

@@ -46,7 +46,11 @@
             >
               查询
             </el-button>
-            <el-button size="small" @click="resetEcsFormSearch">
+            <el-button
+              size="small"
+              icon="el-icon-refresh"
+              @click="resetEcsFormSearch"
+            >
               重置
             </el-button>
             <el-button
@@ -65,19 +69,26 @@
           size="small"
           type="success"
           :disabled="noBatchSelected"
+          icon="el-icon-check"
           @click="enableOrg"
         >
-          <i class="fa fa-check" aria-hidden="true"></i>启用
+          启用
         </el-button>
         <el-button
           size="small"
           type="danger"
           :disabled="noBatchSelected"
+          icon="el-icon-close"
           @click="disableOrg"
         >
-          <i class="fa fa-close" aria-hidden="true"></i>禁用
+          禁用
         </el-button>
-        <el-button size="small" type="primary" icon="upload2" @click="imp">
+        <el-button
+          size="small"
+          type="primary"
+          icon="el-icon-upload2"
+          @click="imp"
+        >
           导入
         </el-button>
 
@@ -264,7 +275,7 @@
               </span>
             </span>
           </el-table-column>
-          <el-table-column :context="_self" label="操作" width="200">
+          <el-table-column :context="_self" label="操作" width="210">
             <div slot-scope="scope">
               <el-button
                 size="mini"
@@ -278,6 +289,7 @@
                 size="mini"
                 type="primary"
                 @click="toExamSite(scope.row)"
+                icon="el-icon-setting"
                 plain
               >
                 考点设置

src/modules/basic/view/course.vue

@@ -83,7 +83,13 @@
               @click="handleSearchBtn"
               >查询</el-button
             >
-            <el-button size="small" @click="resetPrimaryForm"> 重置 </el-button>
+            <el-button
+              size="small"
+              @click="resetPrimaryForm"
+              icon="el-icon-refresh"
+            >
+              重置
+            </el-button>
             <el-button
               size="small"
               type="primary"
@@ -102,22 +108,34 @@
           type="success"
           @click="enableByIds"
           :disabled="noBatchSelected"
+          icon="el-icon-check"
         >
-          <i class="fa fa-check" aria-hidden="true"></i>启用
+          启用
         </el-button>
         <el-button
           size="small"
           type="warning"
           @click="disableByIds"
           :disabled="noBatchSelected"
+          icon="el-icon-close"
         >
-          <i class="fa fa-close" aria-hidden="true"></i>禁用
+          禁用
         </el-button>
-        <el-button size="small" type="primary" @click="impCourse">
-          <i class="fa fa-upload" aria-hidden="true"></i>导入
+        <el-button
+          size="small"
+          type="primary"
+          @click="impCourse"
+          icon="el-icon-upload2"
+        >
+          导入
         </el-button>
-        <el-button size="small" type="primary" @click="exportCourse">
-          <i class="fa fa-download" aria-hidden="true"></i>导出
+        <el-button
+          size="small"
+          type="primary"
+          @click="exportCourse"
+          icon="el-icon-download"
+        >
+          导出
         </el-button>
 
         <div style="width: 100%;margin-bottom: 10px;"></div>
@@ -296,10 +314,12 @@
                 <span>
                   <el-button
                     size="mini"
-                    type="info"
+                    type="primary"
                     @click="deleteRelation(scope.row)"
+                    icon="el-icon-edit"
+                    plain
                   >
-                    <i class="el-icon-edit"></i> 取消关联
+                    取消关联
                   </el-button>
                 </span>
               </div>
@@ -400,12 +420,13 @@
             </span>
           </el-table-column>
           <el-table-column prop="updateTime" label="更新时间" width="170" />
-          <el-table-column label="操作" width="260">
+          <el-table-column label="操作" width="290">
             <div slot-scope="scope">
               <el-button
                 size="mini"
                 type="primary"
                 plain
+                icon="el-icon-share"
                 @click="relation(scope.row)"
               >
                 关联专业
@@ -421,18 +442,21 @@
               <el-button
                 size="mini"
                 v-if="!scope.row.enable"
-                type="danger"
+                plain
+                type="primary"
                 @click="enableById(scope.row)"
+                icon="el-icon-check"
               >
-                <i class="fa fa-check" aria-hidden="true"></i>启用
+                启用
               </el-button>
               <el-button
                 size="mini"
                 v-if="scope.row.enable"
                 type="danger"
                 @click="disableById(scope.row)"
+                icon="el-icon-close"
               >
-                <i class="fa fa-close" aria-hidden="true"></i>禁用
+                禁用
               </el-button>
             </div>
           </el-table-column>

src/modules/basic/view/exam_site.vue

@@ -32,7 +32,11 @@
                 >
                   查询
                 </el-button>
-                <el-button size="small" @click="resetSearchForm">
+                <el-button
+                  size="small"
+                  icon="el-icon-refresh"
+                  @click="resetSearchForm"
+                >
                   重置
                 </el-button>
                 <el-button
@@ -43,7 +47,12 @@
                 >
                   新增
                 </el-button>
-                <el-button size="small" type="info" @click="back">
+                <el-button
+                  size="small"
+                  type="primary"
+                  icon="el-icon-arrow-left"
+                  @click="back"
+                >
                   退回
                 </el-button>
               </el-form-item>
@@ -169,6 +178,7 @@
                   size="mini"
                   type="primary"
                   icon="el-icon-edit"
+                  plain
                   @click="edit(scope.row)"
                 >
                   编辑

src/modules/basic/view/school.vue

@@ -19,13 +19,24 @@
           <el-button
             size="small"
             type="primary"
-            icon="search"
+            icon="el-icon-search"
             @click="handleSearchBtn"
           >
             查询
           </el-button>
-          <el-button size="small" @click="resetSearchForm"> 重置 </el-button>
-          <el-button size="small" type="primary" icon="plus" @click="insert">
+          <el-button
+            size="small"
+            icon="el-icon-refresh"
+            @click="resetSearchForm"
+          >
+            重置
+          </el-button>
+          <el-button
+            size="small"
+            type="primary"
+            icon="el-icon-plus"
+            @click="insert"
+          >
             新增
           </el-button>
         </el-form-item>
@@ -39,16 +50,18 @@
         type="success"
         :disabled="noBatchSelected"
         @click="enableOrg"
+        icon="el-icon-check"
       >
-        <i class="fa fa-check" aria-hidden="true"></i>启用
+        启用
       </el-button>
       <el-button
         size="small"
         type="danger"
         :disabled="noBatchSelected"
         @click="disableOrg"
+        icon="el-icon-close"
       >
-        <i class="fa fa-close" aria-hidden="true"></i>禁用
+        禁用
       </el-button>
 
       <div style="width: 100%;margin-bottom: 10px;"></div>
@@ -273,7 +286,7 @@
             </span>
           </span>
         </el-table-column>
-        <el-table-column :context="_self" width="200" prop="" label="操作">
+        <el-table-column :context="_self" width="210" prop="" label="操作">
           <div slot-scope="scope">
             <el-button
               size="mini"
@@ -288,6 +301,7 @@
               type="primary"
               plain
               @click="setLogo(scope.row)"
+              icon="el-icon-upload"
             >
               logo上传
             </el-button>

src/modules/basic/view/specially.vue

@@ -1,13 +1,7 @@
 <template>
   <section class="content">
     <div class="box-body">
-      <el-form
-        :inline="true"
-        :model="formSearch"
-        label-position="right"
-        label-width="70px"
-        ref="primaryForm"
-      >
+      <el-form :inline="true" :model="formSearch" ref="primaryForm">
         <el-row>
           <el-form-item label="专业名称">
             <el-input
@@ -51,7 +45,13 @@
             >
               查询
             </el-button>
-            <el-button size="small" @click="resetPrimaryForm"> 重置 </el-button>
+            <el-button
+              size="small"
+              @click="resetPrimaryForm"
+              icon="el-icon-refresh"
+            >
+              重置
+            </el-button>
             <el-button
               size="small"
               type="primary"
@@ -76,11 +76,21 @@
       >
         删除
       </el-button>
-      <el-button size="small" type="primary" @click="impSpecialty">
-        <i class="fa fa-upload" aria-hidden="true"></i>导入
+      <el-button
+        size="small"
+        type="primary"
+        @click="impSpecialty"
+        icon="el-icon-upload2"
+      >
+        导入
       </el-button>
-      <el-button size="small" type="primary" @click="exportSpeciatly">
-        <i class="fa fa-upload" aria-hidden="true"></i> 导出
+      <el-button
+        size="small"
+        type="primary"
+        @click="exportSpeciatly"
+        icon="el-icon-download"
+      >
+        导出
       </el-button>
 
       <div style="width: 100%;margin-bottom: 10px;"></div>
@@ -108,6 +118,7 @@
               v-model="speciallyForm.code"
               auto-complete="off"
               placeholder="专业代码"
+              maxlength="100"
             />
           </el-form-item>
           <el-form-item label="专业名称" prop="name">
@@ -116,13 +127,14 @@
               v-model="speciallyForm.name"
               auto-complete="off"
               placeholder="专业名称"
+              maxlength="100"
             />
           </el-form-item>
           <el-row class="pull_center">
             <el-button type="primary" @click="submitForm('speciallyForm')">
               保 存
             </el-button>
-            <el-button type="danger" @click="close">取 消</el-button>
+            <el-button @click="close">取 消</el-button>
           </el-row>
         </el-form>
       </el-dialog>
@@ -130,7 +142,7 @@
       <!-- 关联课程弹出框 -->
       <el-dialog
         :title="courseDialogTitle"
-        width="720px"
+        width="740px"
         :visible.sync="courseDialog"
       >
         <!-- 表单 -->
@@ -154,7 +166,7 @@
               <el-button
                 size="small"
                 type="primary"
-                icon="search"
+                icon="el-icon-search"
                 @click="searchCoursePage"
               >
                 查询
@@ -162,7 +174,7 @@
               <el-button
                 size="small"
                 type="primary"
-                icon="search"
+                icon="el-icon-plus"
                 @click="addRelation"
               >
                 新增
@@ -181,10 +193,11 @@
             <span slot-scope="scope">
               <el-button
                 size="mini"
-                type="info"
+                type="primary"
                 @click="deleteRelation(scope.row)"
+                icon="el-icon-edit"
               >
-                <i class="el-icon-edit"></i> 取消关联
+                取消关联
               </el-button>
             </span>
           </el-table-column>
@@ -237,7 +250,6 @@
             </el-button>
             <el-button @click="addRelationDialog = false">取 消</el-button>
           </el-row>
-          <el-row class="pull_center"> </el-row>
         </el-form>
       </el-dialog>
 
@@ -253,7 +265,7 @@
         <el-table-column prop="name" label="专业名称"> </el-table-column>
         <el-table-column prop="updateTime" label="更新时间" width="170">
         </el-table-column>
-        <el-table-column label="操作" width="280">
+        <el-table-column label="操作" width="300">
           <template slot-scope="scope">
             <div>
               <el-button
@@ -261,6 +273,7 @@
                 type="primary"
                 @click="relation(scope.row)"
                 plain
+                icon="el-icon-share"
               >
                 关联课程
               </el-button>

src/modules/basic/view/user.vue

@@ -59,7 +59,11 @@
             >
               查询
             </el-button>
-            <el-button size="small" @click="resetEcsFormSearch">
+            <el-button
+              size="small"
+              icon="el-icon-refresh"
+              @click="resetEcsFormSearch"
+            >
               重置
             </el-button>
             <el-button
@@ -376,23 +380,26 @@
               </span>
             </span>
           </el-table-column>
-          <el-table-column width="170" label="操作">
+          <el-table-column width="190" label="操作">
             <div slot-scope="scope">
               <el-button
                 v-if="!scope.row.enable"
                 size="mini"
-                type="danger"
+                type="primary"
+                plain
                 @click="enableById(scope.row)"
+                icon="el-icon-check"
               >
-                <i class="fa fa-check" aria-hidden="true"></i>启用
+                启用
               </el-button>
               <el-button
                 v-if="scope.row.enable"
                 size="mini"
                 type="danger"
                 @click="disableById(scope.row)"
+                icon="el-icon-close"
               >
-                <i class="fa fa-close" aria-hidden="true"></i>禁用
+                禁用
               </el-button>
               &nbsp;
               <el-dropdown>
@@ -426,7 +433,7 @@
                       type="danger"
                       @click="resetPass(scope.row)"
                     >
-                      <i class="el-icon-reset"></i>重置密码
+                      <v-icon name="lock" scale="0.7" /> 重置密码
                     </el-button>
                   </el-dropdown-item>
                 </el-dropdown-menu>

src/modules/portal/views/home/HomeSide.vue

@@ -3,7 +3,13 @@
     <div
       style="height: 50px; margin-top: 20px; margin-left: 20px; font-size: 20px"
     >
-      <span v-if="!isCollapse">{{ group.name }}</span>
+      <router-link
+        v-if="!isCollapse"
+        :to="{ path: group.path + '/tips' }"
+        style="color: white; text-decoration: none;"
+      >
+        {{ group.name }}
+      </router-link>
 
       <el-button
         type="text"
@@ -12,7 +18,7 @@
         style="padding: 0; padding-right: 12px;"
         @click="toggoleSidebar"
       >
-        <v-icon name="bars" scale="2" />
+        <v-icon name="bars" scale="1.6" />
       </el-button>
     </div>
     <el-menu