按钮样式优化

src/modules/marking/views/CourseDetail.vue

@@ -38,8 +38,8 @@
               -->
               <el-button
                 size="small"
-                type="success"
-                icon="el-icon-caret-left"
+                type="primary"
+                icon="el-icon-arrow-left"
                 @click="back"
                 >返回</el-button
               >

src/modules/marking/views/MarkPaperCheck.vue

@@ -8,9 +8,9 @@
             :inline="true"
             :model="formSearch"
             ref="formSearch"
-            label-width="100px"
+            label-width="70px"
           >
-            <el-form-item label="学习中心" class="pull-left" prop="orgCode">
+            <el-form-item label="学习中心" prop="orgCode">
               <el-select
                 :remote-method="getOrgs"
                 remote
@@ -31,21 +31,21 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="姓名" class="pull-left" prop="studentName">
+            <el-form-item label="姓名" prop="studentName">
               <el-input
                 placeholder="请输入姓名"
                 v-model="formSearch.studentName"
                 style="width:150px;"
               ></el-input>
             </el-form-item>
-            <el-form-item label="学号" class="pull-left" prop="studentCode">
+            <el-form-item label="学号" prop="studentCode">
               <el-input
                 placeholder="请输入学号"
                 v-model="formSearch.studentCode"
                 style="width:150px;"
               ></el-input>
             </el-form-item>
-            <el-form-item label="标记卷" class="pull-left" prop="tag">
+            <el-form-item label="标记卷" prop="tag">
               <el-select
                 clearable
                 v-model="formSearch.tag"
@@ -62,7 +62,7 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="课程" class="pull-left" prop="courseCode">
+            <el-form-item label="课程" prop="courseCode">
               <el-select
                 clearable
                 @change="getUserList"
@@ -81,7 +81,7 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="评委" class="pull-left" prop="userId">
+            <el-form-item label="评委" prop="userId">
               <el-select
                 clearable
                 class="input"
@@ -99,14 +99,15 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="评卷备注" class="pull-left" prop="markRemark">
+            <el-form-item label="评卷备注" prop="markRemark">
               <el-input
                 placeholder="请输入备注"
                 v-model="formSearch.markRemark"
                 style="width:150px;"
               ></el-input>
             </el-form-item>
-            <el-form-item style="margin-left:30px;">
+            <div></div>
+            <el-form-item>
               <el-button
                 size="small"
                 type="primary"
@@ -115,17 +116,22 @@
                 >查询</el-button
               >
               <el-button
+                @click="resetForm('formSearch')"
                 size="small"
-                type="success"
-                icon="el-icon-caret-left"
+                icon="el-icon-refresh"
+                >重置</el-button
+              >
+              <el-button
+                size="small"
+                type="primary"
+                icon="el-icon-arrow-left"
                 @click="back"
                 >返回</el-button
               >
-              <el-button @click="resetForm('formSearch')" size="small"
-                >重置</el-button
-              >
             </el-form-item>
           </el-form>
+
+          <div class="block-seperator"></div>
           <!-- 页面列表 -->
           <el-table
             stripe
@@ -166,20 +172,21 @@
                 </el-popover>
               </template>
             </el-table-column>
-            <el-table-column fixed="right" label="操作" width="150">
+            <el-table-column fixed="right" label="操作" width="180">
               <template slot-scope="scope">
                 <el-button
                   @click="viewPaper(scope.row)"
                   type="primary"
                   size="mini"
+                  icon="el-icon-view"
                   plain
                   >原卷</el-button
                 >
                 <el-button
                   @click="backRefresh(scope.row)"
                   type="danger"
+                  icon="el-icon-arrow-left"
                   size="mini"
-                  plain
                   >打回</el-button
                 >
               </template>

src/modules/marking/views/MarkSettingFast.vue

@@ -53,8 +53,8 @@
                 >
                 <el-button
                   size="small"
-                  type="success"
-                  icon="el-icon-caret-left"
+                  type="primary"
+                  icon="el-icon-arrow-left"
                   @click="back"
                   >返回</el-button
                 >

src/modules/marking/views/MarkSettingMain.vue

@@ -41,18 +41,38 @@
               >
               <el-button
                 size="small"
-                type="success"
-                icon="el-icon-caret-left"
+                type="primary"
+                icon="el-icon-arrow-left"
                 @click="back"
                 >返回</el-button
               >
-              <el-dropdown style="margin-left:10px;" @command="handleCommand">
-                <el-button size="small" type="primary"
-                  >更多 <i class="el-icon-arrow-down el-icon--right"></i>
+              <el-dropdown
+                style="margin-left:10px;"
+                @command="handleCommand"
+                placement="bottom-start"
+              >
+                <el-button size="small" type="primary">
+                  更多 <i class="el-icon-arrow-down el-icon--right"></i>
                 </el-button>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item command="in">导入</el-dropdown-item>
-                  <el-dropdown-item command="out">导出</el-dropdown-item>
+                  <el-dropdown-item command="in">
+                    <el-button
+                      size="small"
+                      type="primary"
+                      icon="el-icon-upload2"
+                      @click="back"
+                      >导入</el-button
+                    >
+                  </el-dropdown-item>
+                  <el-dropdown-item command="out">
+                    <el-button
+                      size="small"
+                      type="primary"
+                      icon="el-icon-download"
+                      @click="back"
+                      >导出</el-button
+                    >
+                  </el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </el-form-item>

src/modules/marking/views/MarkSettingWork.vue

@@ -7,7 +7,7 @@
             :inline="true"
             :model="formSearch"
             label-position="right"
-            label-width="110px"
+            label-width="100px"
           >
             <el-form-item label="评卷工作名称" class="pull-left">
               <el-input

src/modules/marking/views/MarkWork.vue

@@ -7,7 +7,7 @@
             :inline="true"
             :model="formSearch"
             label-position="right"
-            label-width="110px"
+            label-width="100px"
           >
             <el-form-item label="评卷工作名称" class="pull-left">
               <el-input
@@ -112,7 +112,6 @@
                           type="danger"
                           size="mini"
                           icon="el-icon-delete"
-                          plain
                           >删除</el-button
                         >
                       </el-dropdown-item>
@@ -151,73 +150,59 @@
             v-loading="loading"
             element-loading-text="拼命加载中"
             :visible.sync="markWorkDialog"
+            width="500px"
           >
             <el-form
               :model="formMarkWork"
+              label-width="120px"
               :rules="rules"
               ref="formMarkWork"
-              label-position="right"
-              label-width="110px"
+              inline
               inline-message
             >
-              <el-row>
-                <el-col :xs="12" :sm="12" :md="12" :lg="12">
-                  <el-form-item label="评卷工作名称" prop="name">
-                    <el-input
-                      placeholder="评卷工作名称"
-                      v-model="formMarkWork.name"
-                    ></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :xs="12" :sm="12" :md="12" :lg="12">
-                  <el-form-item label="考试批次" prop="examId">
-                    <el-select
-                      v-if="!examDisabled"
-                      @change="update"
-                      v-model="formMarkWork.examId"
-                      filterable
-                      placeholder="考试批次"
-                    >
-                      <el-option
-                        v-for="item in examSelect"
-                        :label="item.label"
-                        :value="item.value"
-                        :key="item.value"
-                      ></el-option>
-                    </el-select>
-                    <el-input
-                      v-if="examDisabled"
-                      :disabled="true"
-                      v-model="formMarkWork.examName"
-                    ></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :xs="20" :sm="20" :md="20" :lg="20">
-                  <el-form-item label="备注" prop="remark">
-                    <el-input
-                      type="textarea"
-                      :rows="5"
-                      placeholder="备注"
-                      v-model="formMarkWork.remark"
-                    ></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row style="margin-top:10px;">
-                <el-col>
-                  <el-form-item>
-                    <el-button type="primary" @click="saveMarkWork"
-                      >保存</el-button
-                    >
-                    <el-button @click="closeMarkWork">取消</el-button>
-                    <el-button @click="resetForm">重置</el-button>
-                  </el-form-item>
-                </el-col>
-              </el-row>
+              <el-form-item label="评卷工作名称" prop="name">
+                <el-input
+                  placeholder="评卷工作名称"
+                  v-model="formMarkWork.name"
+                  style="width: 200px"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="考试批次" prop="examId">
+                <el-select
+                  v-if="!examDisabled"
+                  @change="update"
+                  v-model="formMarkWork.examId"
+                  filterable
+                  placeholder="考试批次"
+                  style="width: 200px"
+                >
+                  <el-option
+                    v-for="item in examSelect"
+                    :label="item.label"
+                    :value="item.value"
+                    :key="item.value"
+                  ></el-option>
+                </el-select>
+                <el-input
+                  v-if="examDisabled"
+                  :disabled="true"
+                  v-model="formMarkWork.examName"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="备注" prop="remark">
+                <el-input
+                  style="width: 200px"
+                  type="textarea"
+                  :rows="3"
+                  placeholder="备注"
+                  v-model="formMarkWork.remark"
+                ></el-input>
+              </el-form-item>
+              <el-form-item style="margin-top:10px;margin-left: 100px">
+                <el-button type="primary" @click="saveMarkWork">保存</el-button>
+                <el-button @click="closeMarkWork">取消</el-button>
+                <el-button @click="resetForm">重置</el-button>
+              </el-form-item>
             </el-form>
           </el-dialog>
         </div>

src/modules/marking/views/MarkWorkOverview.vue

@@ -44,8 +44,8 @@
                   >
                   <el-button
                     size="small"
-                    type="success"
-                    icon="el-icon-caret-left"
+                    type="primary"
+                    icon="el-icon-arrow-left"
                     @click="back"
                     >返回</el-button
                   >

src/modules/marking/views/Marker.vue

@@ -33,8 +33,8 @@
               >
               <el-button
                 size="small"
-                type="success"
-                icon="el-icon-caret-left"
+                type="primary"
+                icon="el-icon-arrow-left"
                 @click="back"
                 >返回</el-button
               >

src/modules/marking/views/MarkerDetail.vue

@@ -29,7 +29,7 @@
               <el-button
                 size="small"
                 type="primary"
-                icon="search"
+                icon="el-icon-search"
                 @click="searchSetting"
                 >查询</el-button
               >
@@ -38,8 +38,8 @@
               -->
               <el-button
                 size="small"
-                type="success"
-                icon="caret-left"
+                type="primary"
+                icon="el-icon-arrow-left"
                 @click="back"
                 >返回</el-button
               >

src/modules/marking/views/ViewPaper.vue

@@ -3,7 +3,7 @@
     <LinkTitlesCustom :currentPaths="['试卷检查', '试卷列表', '试卷详情']" />
     <div style="position: absolute;right: 10px;">
       <el-button
-        type="success"
+        type="primary"
         size="small"
         @click="back"
         style="padding-bottom:8px;"