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

src/modules/examwork/view/examStudentImport.vue

@@ -1,157 +1,149 @@
 <template>
-  <div>
-    <section class="content" style="margin-top: -10px;">
-      <div class="box box-info">
-        <!-- 正文信息 -->
-        <div class="box-body">
-          <el-form
-            :inline="true"
-            :model="formSearch"
-            label-position="right"
-            label-width="100px"
-          >
-            <el-form-item class="pull-right buttonframe">
-              <el-button size="small" type="primary" icon="upload2" @click="imp"
-                >导入
-              </el-button>
-            </el-form-item>
-          </el-form>
+  <section class="content" style="margin-top: -10px;">
+    <div class="box box-info">
+      <!-- 正文信息 -->
+      <div class="box-body">
+        <div style="margin-top: 20px;">
+          <span>操作：</span>
+          <el-button
+            size="small"
+            type="primary"
+            icon="el-icon-plus"
+            @click="imp"
+            >导入
+          </el-button>
+        </div>
+        <div style="width: 100%;margin-bottom: 10px;"></div>
 
-          <!-- 导入弹窗 -->
-          <el-dialog
-            title="考生信息导入页"
-            size="tiny"
-            :visible.sync="studentImportDialog"
-          >
-            <el-form :model="studentImportForm" ref="studentImportForm">
-              <el-row>
-                <el-form-item
-                  style="margin-left:30px"
-                  label="考试"
-                  prop="value"
+        <!-- 导入弹窗 -->
+        <el-dialog
+          title="考生信息导入页"
+          size="tiny"
+          :visible.sync="studentImportDialog"
+        >
+          <el-form :model="studentImportForm" ref="studentImportForm">
+            <el-row>
+              <el-form-item style="margin-left:30px" label="考试" prop="value">
+                <el-select
+                  class="input"
+                  :remote-method="queryExams"
+                  remote
+                  :loading="queryExamsLoading"
+                  filterable
+                  clearable
+                  v-model="studentImportForm.examId"
+                  placeholder="请选择"
                 >
-                  <el-select
-                    class="input"
-                    :remote-method="queryExams"
-                    remote
-                    :loading="queryExamsLoading"
-                    filterable
-                    clearable
-                    v-model="studentImportForm.examId"
-                    placeholder="请选择"
+                  <el-option
+                    v-for="item in examList"
+                    :label="item.name"
+                    :value="item.id"
+                    :key="item.id"
+                    :disabled="!item.enable"
                   >
-                    <el-option
-                      v-for="item in examList"
-                      :label="item.name"
-                      :value="item.id"
-                      :key="item.id"
-                      :disabled="!item.enable"
-                    >
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-row>
-              <el-row>
-                <el-form-item style="margin-left:30px">
-                  <el-upload
-                    class="form_left"
-                    ref="upload"
-                    accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
-                    :action="uploadAction"
-                    :headers="uploadHeaders"
-                    :data="uploadData"
-                    :before-upload="beforeUpload"
-                    :on-progress="uploadProgress"
-                    :on-success="uploadSuccess"
-                    :on-error="uploadError"
-                    :file-list="fileList"
-                    :auto-upload="false"
-                    :multiple="false"
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-row>
+            <el-row>
+              <el-form-item style="margin-left:30px">
+                <el-upload
+                  class="form_left"
+                  ref="upload"
+                  accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+                  :action="uploadAction"
+                  :headers="uploadHeaders"
+                  :data="uploadData"
+                  :before-upload="beforeUpload"
+                  :on-progress="uploadProgress"
+                  :on-success="uploadSuccess"
+                  :on-error="uploadError"
+                  :file-list="fileList"
+                  :auto-upload="false"
+                  :multiple="false"
+                >
+                  <el-button size="small" slot="trigger" type="primary"
+                    >选择文件</el-button
                   >
-                    <el-button size="small" slot="trigger" type="primary"
-                      >选择文件</el-button
-                    >
-                    <el-button
-                      size="small"
-                      style="margin-left:10px;"
-                      type="success"
-                      @click="submitUpload"
-                      >确认上传
-                    </el-button>
-                    <el-button
-                      size="small"
-                      style="margin-left: 10px;"
-                      type="danger"
-                      @click="removeFile"
-                      >清空文件
-                    </el-button>
-                    <el-button size="small" type="info" @click="exportFile"
-                      >下载模板
-                    </el-button>
-                    <div slot="tip" class="el-upload__tip">
-                      只能上传xlsx文件
-                    </div>
-                  </el-upload>
-                </el-form-item>
-              </el-row>
-            </el-form>
-          </el-dialog>
-
-          <!-- 页面列表 -->
-          <el-table
-            :data="tableData"
-            border
-            style="width: 100%;text-align:center;"
-          >
-            <el-table-column prop="id" width="100" label="ID"></el-table-column>
-            <el-table-column prop="rootOrgName" width="170" label="顶级机构">
-            </el-table-column>
-            <el-table-column prop="examName" width="170" label="考试">
-            </el-table-column>
-            <el-table-column prop="fileName" width="170" label="上传文件名">
-            </el-table-column>
-            <el-table-column prop="statusDesc" width="170" label="状态">
-            </el-table-column>
-            <el-table-column prop="errorDesc" label="异常"> </el-table-column>
-            <el-table-column prop="creationTime" width="170" label="上传时间">
-            </el-table-column>
-            <el-table-column label="操作" width="190">
-              <template slot-scope="scope">
-                <div>
                   <el-button
-                    size="mini"
-                    type="warning"
-                    @click="getUploadedFile(scope.row.id)"
-                    >下载导入文件
+                    size="small"
+                    style="margin-left:10px;"
+                    type="success"
+                    @click="submitUpload"
+                    >确认上传
                   </el-button>
                   <el-button
-                    v-if="
-                      scope.row.status == 'DATA_PROCESSING_COMPLETE' ||
-                        scope.row.status == 'ERROR'
-                    "
-                    size="mini"
-                    type="warning"
-                    @click="getReports(scope.row.id)"
-                    >导出报告
+                    size="small"
+                    style="margin-left: 10px;"
+                    type="danger"
+                    @click="removeFile"
+                    >清空文件
                   </el-button>
-                </div>
-              </template>
-            </el-table-column>
-          </el-table>
-          <div class="page pull-right">
-            <el-pagination
-              @current-change="handleCurrentChange"
-              :current-page="currentPage"
-              :page-size="pageSize"
-              layout="total, prev, pager, next, jumper"
-              :total="total"
-            >
-            </el-pagination>
-          </div>
+                  <el-button size="small" type="info" @click="exportFile"
+                    >下载模板
+                  </el-button>
+                  <div slot="tip" class="el-upload__tip">只能上传xlsx文件</div>
+                </el-upload>
+              </el-form-item>
+            </el-row>
+          </el-form>
+        </el-dialog>
+
+        <!-- 页面列表 -->
+        <el-table
+          :data="tableData"
+          border
+          style="width: 100%;text-align:center;"
+        >
+          <el-table-column prop="id" width="80" label="ID"></el-table-column>
+          <el-table-column prop="rootOrgName" label="顶级机构">
+          </el-table-column>
+          <el-table-column prop="examName" label="考试"> </el-table-column>
+          <el-table-column prop="fileName" label="上传文件名">
+          </el-table-column>
+          <el-table-column prop="statusDesc" width="150" label="状态">
+          </el-table-column>
+          <el-table-column prop="errorDesc" label="异常"> </el-table-column>
+          <el-table-column prop="creationTime" width="170" label="上传时间">
+          </el-table-column>
+          <el-table-column label="操作" width="220">
+            <template slot-scope="scope">
+              <div>
+                <el-button
+                  size="mini"
+                  type="warning"
+                  @click="getUploadedFile(scope.row.id)"
+                  >下载导入文件
+                </el-button>
+                <el-button
+                  v-if="
+                    scope.row.status == 'DATA_PROCESSING_COMPLETE' ||
+                      scope.row.status == 'ERROR'
+                  "
+                  size="mini"
+                  type="warning"
+                  @click="getReports(scope.row.id)"
+                  >导出报告
+                </el-button>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="page pull-right">
+          <el-pagination
+            @current-change="handleCurrentChange"
+            :current-page="currentPage"
+            :page-size="pageSize"
+            :page-sizes="[10, 30, 50, 100]"
+            @size-change="handleSizeChange"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="total"
+          >
+          </el-pagination>
         </div>
       </div>
-    </section>
-  </div>
+    </div>
+  </section>
 </template>
 <style scoped></style>
 <script>
@@ -190,6 +182,10 @@ export default {
       this.currentPage = val;
       this.queryTableDatas();
     },
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.queryTableDatas();
+    },
     imp() {
       this.studentImportDialog = true;
       this.initUpload();

src/modules/examwork/view/student.vue

@@ -3,12 +3,13 @@
     <div class="box box-info">
       <!-- 正文信息 -->
       <div class="box-body">
-        <el-form :model="formSearch" :inline="true" ref="formSearch">
-          <el-form-item
-            v-if="isSuperAdmin"
-            label="顶级机构"
-            :label-width="style.searchForm_label_width"
-          >
+        <el-form
+          :model="formSearch"
+          :inline="true"
+          ref="formSearch"
+          label-width="100px"
+        >
+          <el-form-item v-if="isSuperAdmin" label="顶级机构">
             <el-select
               v-model="formSearch.rootOrgId"
               placeholder="请选择"
@@ -23,40 +24,28 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item
-            label="姓名"
-            :label-width="style.searchForm_label_width"
-          >
+          <el-form-item label="姓名">
             <el-input
               placeholder="请输入姓名"
               v-model="formSearch.name"
               class="input"
             ></el-input>
           </el-form-item>
-          <el-form-item
-            label="学号"
-            :label-width="style.searchForm_label_width"
-          >
+          <el-form-item label="学号">
             <el-input
               placeholder="请输入学号"
               v-model="formSearch.studentCode"
               class="input"
             ></el-input>
           </el-form-item>
-          <el-form-item
-            label="身份证"
-            :label-width="style.searchForm_label_width"
-          >
+          <el-form-item label="身份证">
             <el-input
               placeholder="请输入身份证"
               v-model="formSearch.identityNumber"
               class="input"
             ></el-input>
           </el-form-item>
-          <el-form-item
-            label="是否上传照片"
-            :label-width="style.searchForm_label_width"
-          >
+          <el-form-item label="是否上传照片">
             <el-select v-model="formSearch.hasPhoto" class="input">
               <el-option label="未选择" value="ALL"> </el-option>
               <el-option label="是" value="TRUE"> </el-option>
@@ -322,7 +311,7 @@
               <el-button
                 size="small"
                 type="primary"
-                icon="search"
+                icon="el-icon-search"
                 @click="searchStuExam"
                 >查询
               </el-button>
@@ -446,8 +435,6 @@ import { mapState } from "vuex";
 export default {
   data() {
     return {
-      style: { searchForm_label_width: "100px" },
-
       rolePrivileges: {
         search_student: false,
         upload_student_photo: false,
@@ -926,4 +913,8 @@ export default {
   }
 };
 </script>
-<style scoped></style>
+<style scoped>
+.input {
+  width: 200px;
+}
+</style>

src/modules/print/view/CourseStatistic.vue

@@ -135,13 +135,14 @@
           element-loading-text="数据加载中"
           style="width:100%;"
           border
+          stripe
           @selection-change="handleSelection"
         >
-          <el-table-column type="selection" width="40"> </el-table-column>
+          <el-table-column type="selection" width="35px"> </el-table-column>
           <el-table-column label="课程名称" prop="courseName" />
-          <el-table-column width="150" label="课程代码" prop="courseCode" />
-          <el-table-column width="80" label="试卷类型" prop="paperType" />
-          <el-table-column width="80" label="试卷状态">
+          <el-table-column width="140px" label="课程代码" prop="courseCode" />
+          <el-table-column width="80px" label="试卷类型" prop="paperType" />
+          <el-table-column width="80px" label="试卷状态">
             <template slot-scope="scope">
               <span
                 @click="openAllotDialog(scope.row)"
@@ -150,9 +151,9 @@
               >
             </template>
           </el-table-column>
-          <el-table-column width="200" label="试卷名称" prop="paperName" />
-          <el-table-column width="80" label="试卷P数" prop="paperP" />
-          <el-table-column width="100" label="考生人数" prop="totalStudent" />
+          <el-table-column label="试卷名称" prop="paperName" />
+          <el-table-column width="80px" label="试卷P数" prop="paperP" />
+          <el-table-column width="90px" label="考生人数" prop="totalStudent" />
 
           <el-table-column width="285" label="操作" :context="_self">
             <template slot-scope="scope">
@@ -161,6 +162,7 @@
                 icon="el-icon-view"
                 v-show="scope.row.paperStatus > 1"
                 @click="preview(scope.row)"
+                plain
                 >预览
               </el-button>
 
@@ -169,6 +171,7 @@
                 icon="el-icon-download"
                 v-show="scope.row.paperStatus > 1"
                 @click="openExportDialog(scope.row)"
+                plain
                 >下载
               </el-button>
 
@@ -178,6 +181,7 @@
                 :disabled="!hasPermit"
                 v-show="scope.row.paperStatus > 1"
                 @click="openAllotDialog(scope.row)"
+                plain
                 >试卷指定
               </el-button>
             </template>

src/modules/print/view/ExamStructure.vue

@@ -69,6 +69,7 @@
           element-loading-text="数据加载中"
           style="width:100%;"
           border
+          stripe
         >
           <el-table-column label="学校名称" prop="orgName" />
           <el-table-column label="考试名称" prop="examName" />
@@ -80,13 +81,14 @@
             </template>
           </el-table-column>
 
-          <el-table-column width="200" label="操作" :context="_self">
+          <el-table-column width="200px" label="操作" :context="_self">
             <template slot-scope="scope">
               <el-button
                 size="mini"
                 icon="el-icon-menu"
                 @click="openCloneStructureDialog(scope.row)"
                 :disabled="!hasPermit"
+                plain
                 >复用
               </el-button>
 
@@ -96,6 +98,7 @@
                 icon="el-icon-delete"
                 @click="removeStructure(scope.row)"
                 :disabled="!hasPermit"
+                plain
                 >删除
               </el-button>
             </template>

src/modules/print/view/Project.vue

@@ -98,6 +98,7 @@
           element-loading-text="数据加载中"
           style="width:100%;"
           border
+          stripe
         >
           <el-table-column width="220" label="学校名称" prop="orgName" />
           <el-table-column label="考试名称" prop="examName" />
@@ -110,6 +111,7 @@
                 size="mini"
                 icon="el-icon-view"
                 @click="gotoProjectStatistic(scope.row)"
+                plain
                 >查看
               </el-button>
             </template>
@@ -122,6 +124,7 @@
                 icon="el-icon-menu"
                 @click="openProjectSettingDialog(scope.row)"
                 :disabled="!hasPermit"
+                plain
                 >项目设置
               </el-button>
             </template>

src/modules/print/view/ProjectStatistic.vue

@@ -88,6 +88,7 @@
           element-loading-text="数据加载中"
           style="width:100%;"
           border
+          stripe
         >
           <el-table-column width="60" label="类型" prop="type" />
           <el-table-column width="80" label="人科次" prop="totalStudent" />
@@ -101,7 +102,12 @@
           <el-table-column width="120" label="印刷供应商" prop="supplierName" />
           <el-table-column width="120" label="项目经理" prop="pmName" />
 
-          <el-table-column width="180" label="操作" :context="_self">
+          <el-table-column
+            width="180"
+            label="操作"
+            :context="_self"
+            fixed="right"
+          >
             <template slot-scope="scope">
               <el-button
                 size="mini"
@@ -109,6 +115,7 @@
                 v-if="scope.row.btnType == 'BACKUP'"
                 @click="openBackupSettingDialog"
                 :disabled="!hasPermit"
+                plain
                 >备份设置
               </el-button>
 
@@ -118,6 +125,7 @@
                 v-if="scope.row.btnType == 'OTHER'"
                 @click="openOtherSettingDialog(scope.row)"
                 :disabled="!hasPermit"
+                plain
                 >修改
               </el-button>
 
@@ -128,6 +136,7 @@
                 v-if="scope.row.btnType == 'OTHER'"
                 @click="removeOtherSetting(scope.row)"
                 :disabled="!hasPermit"
+                plain
                 >删除
               </el-button>
             </template>
@@ -275,7 +284,7 @@
             ></el-input>
           </el-form-item>
         </el-form>
-        <div style="text-align: center">
+        <div style="text-align: center;margin-top: 10px">
           <el-button type="primary" @click="editOtherSetting">确 定 </el-button>
           <el-button @click="closeOtherSettingDialog">取 消</el-button>
         </div>

src/modules/print/view/ProjectTemplate.vue

@@ -58,8 +58,9 @@
           element-loading-text="数据加载中"
           style="width:100%;"
           border
+          stripe
         >
-          <el-table-column label="序号" type="index" width="50">
+          <el-table-column label="序号" type="index" width="50px">
           </el-table-column>
           <el-table-column label="类别" prop="typeName" />
           <el-table-column label="上传">
@@ -83,6 +84,7 @@
                   size="mini"
                   icon="el-icon-upload"
                   :disabled="!hasPermit"
+                  plain
                   >上传</el-button
                 >
                 <span
@@ -112,13 +114,14 @@
               </el-upload>
             </template>
           </el-table-column>
-          <el-table-column label="下载">
+          <el-table-column label="下载" width="100px">
             <template slot-scope="scope">
               <el-button
                 size="mini"
                 icon="el-icon-download"
                 :disabled="checkEmptyStr(scope.row.fileName)"
                 @click="download(scope.row)"
+                plain
                 >下载
               </el-button>
             </template>