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

src/modules/basic/view/role_privilege_settings.vue

@@ -3,12 +3,7 @@
     <div class="box box-info">
       <div class="box-body">
         <!-- 选择 -->
-        <el-form
-          :inline="true"
-          :model="form"
-          label-position="right"
-          label-width="100px"
-        >
+        <el-form :inline="true" :model="form" label-position="right">
           <el-row>
             <el-form-item label="顶级机构" class="pull-left">
               <el-select
@@ -59,14 +54,14 @@
           </el-row>
         </el-form>
 
-        <div style="margin-bottom:10px;margin-left: 50px;">
+        <div style="margin-bottom:10px;">
           <el-button type="primary" :disabled="!treeChanged" @click="save">
             保 存
           </el-button>
         </div>
 
         <!-- 权限树 -->
-        <div style="width: 50%;margin-left: 50px;">
+        <div style="width: 50%;">
           <el-tree
             class="el-tree"
             :data="treeData"

src/modules/examwork/view/examInfo.vue

@@ -54,17 +54,23 @@
 
         <!-- 弹出窗口 -->
         <el-dialog
-          title="请选择考试类型："
-          size="small"
+          title="请选择考试类型"
+          width="600px"
           :visible.sync="examInfoDialog"
         >
-          <el-button type="primary" @click="toTradition">传统考试</el-button>
-          <el-button type="primary" @click="toOnline">网络考试</el-button>
-          <el-button type="primary" @click="toPractice">练习考试</el-button>
-          <el-button type="primary" @click="toOffline">离线考试</el-button>
-          <el-button type="primary" @click="toPrint"> 分布式印刷考试</el-button>
-          <div slot="footer" class="dialog-footer">
-            <el-button @click="examInfoDialog = false">取 消</el-button>
+          <el-button-group>
+            <el-button @click="toTradition">传统考试</el-button>
+            <el-button @click="toOnline">网络考试</el-button>
+            <el-button @click="toPractice">练习考试</el-button>
+            <el-button @click="toOffline">离线考试</el-button>
+            <el-button @click="toPrint">
+              分布式印刷考试</el-button
+            ></el-button-group
+          >
+          <div style="margin-top: 10px;text-align: center;">
+            <el-button type="primary" @click="examInfoDialog = false"
+              >取 消</el-button
+            >
           </div>
         </el-dialog>
 
@@ -112,12 +118,12 @@
                   content="禁用"
                   placement="left"
                 >
-                  <i class="el-icon-success" style="color:red;"></i>
+                  <i class="el-icon-error" style="color:red;"></i>
                 </el-tooltip>
               </span>
             </span>
           </el-table-column>
-          <el-table-column label="操作" width="160">
+          <el-table-column label="操作" width="190">
             <template slot-scope="scope">
               <div>
                 <el-button
@@ -125,6 +131,7 @@
                   size="mini"
                   plain
                   type="primary"
+                  icon="el-icon-edit"
                   @click="editExamInfoDialog(scope.row)"
                 >
                   编辑

src/modules/examwork/view/examStudent.vue

@@ -673,7 +673,7 @@
                   content="禁用"
                   placement="left"
                 >
-                  <i class="el-icon-success" style="color:red;"></i>
+                  <i class="el-icon-error" style="color:red;"></i>
                 </el-tooltip>
               </span>
             </span>
@@ -685,11 +685,11 @@
                 <el-button
                   v-if="rolePrivileges.update_examStudent"
                   size="mini"
-                  type="warning"
+                  type="primary"
                   plain
                   @click="openUpdateDialog(scope.row)"
                 >
-                  修改
+                  编辑
                 </el-button>
                 <el-button
                   v-if="
@@ -698,7 +698,7 @@
                       rolePrivileges.change_exam_student_availability
                   "
                   size="mini"
-                  type="warning"
+                  type="primary"
                   plain
                   @click="enableExamStudent(scope.row)"
                   >启用
@@ -706,7 +706,7 @@
                 <el-button
                   v-else-if="rolePrivileges.change_exam_student_availability"
                   size="mini"
-                  type="warning"
+                  type="primary"
                   plain
                   @click="disableExamStudent(scope.row)"
                   >禁用
@@ -730,7 +730,7 @@
                     <el-dropdown-item>
                       <el-button
                         size="mini"
-                        type="info"
+                        type="primary"
                         plain
                         @click="showPhoto(scope.row)"
                       >

src/modules/examwork/view/offlineExam.vue

@@ -59,12 +59,12 @@
                 </el-row>
                 <el-row>
                   <el-form-item
-                    label="是否开启"
+                    label="状态"
                     :label-width="style.label_width_tab1"
                   >
                     <el-radio-group v-model="form.enable" class="input">
-                      <el-radio label="true">开启</el-radio>
-                      <el-radio label="false">关闭</el-radio>
+                      <el-radio label="true">启用</el-radio>
+                      <el-radio label="false">禁用</el-radio>
                     </el-radio-group>
                   </el-form-item>
                 </el-row>

src/modules/examwork/view/onlineExam.vue

@@ -59,12 +59,12 @@
                 </el-row>
                 <el-row>
                   <el-form-item
-                    label="是否开启"
+                    label="状态"
                     :label-width="style.label_width_tab1"
                   >
                     <el-radio-group v-model="form.enable" class="input">
-                      <el-radio label="true">开启</el-radio>
-                      <el-radio label="false">关闭</el-radio>
+                      <el-radio label="true">启用</el-radio>
+                      <el-radio label="false">禁用</el-radio>
                     </el-radio-group>
                   </el-form-item>
                 </el-row>

src/modules/examwork/view/practiceExam.vue

@@ -59,12 +59,12 @@
                 </el-row>
                 <el-row>
                   <el-form-item
-                    label="是否开启"
+                    label="状态"
                     :label-width="style.label_width_tab1"
                   >
                     <el-radio-group v-model="form.enable" class="input">
-                      <el-radio label="true">开启</el-radio>
-                      <el-radio label="false">关闭</el-radio>
+                      <el-radio label="true">启用</el-radio>
+                      <el-radio label="false">禁用</el-radio>
                     </el-radio-group>
                   </el-form-item>
                 </el-row>

src/modules/examwork/view/printExam.vue

@@ -59,12 +59,12 @@
                 </el-row>
                 <el-row>
                   <el-form-item
-                    label="是否开启"
+                    label="状态"
                     :label-width="style.label_width_tab1"
                   >
                     <el-radio-group v-model="form.enable" class="input">
-                      <el-radio label="true">开启</el-radio>
-                      <el-radio label="false">关闭</el-radio>
+                      <el-radio label="true">启用</el-radio>
+                      <el-radio label="false">禁用</el-radio>
                     </el-radio-group>
                   </el-form-item>
                 </el-row>

src/modules/examwork/view/student.vue

@@ -204,7 +204,7 @@
                   content="禁用"
                   placement="left"
                 >
-                  <i class="el-icon-success" style="color:red;"></i>
+                  <i class="el-icon-error" style="color:red;"></i>
                 </el-tooltip>
               </span>
             </span>

src/modules/examwork/view/traditionExam.vue

@@ -59,12 +59,12 @@
                 </el-row>
                 <el-row>
                   <el-form-item
-                    label="是否开启"
+                    label="状态"
                     :label-width="style.label_width_tab1"
                   >
                     <el-radio-group v-model="form.enable" class="input">
-                      <el-radio label="true">开启</el-radio>
-                      <el-radio label="false">关闭</el-radio>
+                      <el-radio label="true">启用</el-radio>
+                      <el-radio label="false">禁用</el-radio>
                     </el-radio-group>
                   </el-form-item>
                 </el-row>

src/modules/oe/views/absent.vue

@@ -17,6 +17,7 @@
       </el-col>
       <el-row>
         <el-col>
+          <div class="block-seperator"></div>
           <span>批量操作：</span>
           <commonExportVue
             :form="form"
@@ -34,8 +35,6 @@
             :data="tableData"
             border
           >
-            <el-table-column width="50" type="index" label="序号">
-            </el-table-column>
             <el-table-column sortable label="课程" prop="courseName">
             </el-table-column>
             <el-table-column
@@ -176,4 +175,7 @@ export default {
 .header-title {
   text-align: left;
 }
+.margin-top-10 {
+  margin-top: 10px;
+}
 </style>

src/modules/oe/views/alreadyAudited.vue

@@ -153,7 +153,7 @@
             <el-table-column sortable label="审核人" prop="auditUserName">
             </el-table-column>
           </el-table>
-          <div class="block">
+          <div class="block pull-right">
             <el-pagination
               @size-change="handleSizeChange"
               @current-change="handleCurrentChange"

src/modules/oe/views/awaitingAudit.vue

@@ -111,9 +111,10 @@
         </el-button>
       </el-col>
       <el-row>
-        <el-col
-          ><span>批量操作：</span
-          ><el-dropdown
+        <el-col>
+          <div class="block-seperator"></div>
+          <span>批量操作：</span>
+          <el-dropdown
             class="button_left"
             v-show="currentPagePrivileges.PANEING_BATCHAUDIT"
           >
@@ -266,7 +267,7 @@
               </div>
             </el-table-column>
           </el-table>
-          <div class="block">
+          <div class="block pull-right">
             <el-pagination
               @size-change="handleSizeChange"
               @current-change="handleCurrentChange"

src/modules/oe/views/examDetail.vue

@@ -69,6 +69,7 @@
       </el-col>
       <el-row>
         <el-col>
+          <div class="block-seperator"></div>
           <span>批量操作：</span>
           <commonExportVue
             v-show="currentPagePrivileges.EXAM_DETAIL_EXPORT"
@@ -169,7 +170,7 @@
               </template>
             </el-table-column>
           </el-table>
-          <div class="block">
+          <div class="block pull-right">
             <el-pagination
               @size-change="handleSizeChange"
               @current-change="handleCurrentChange"

src/modules/oe/views/examScheduling.vue

@@ -6,6 +6,7 @@
           <el-col :span="6">
             <el-form-item label="完成状态">
               <el-select
+                v-if="form.examType == '' || form.examType == 'ONLINE'"
                 class="form_search_width"
                 size="small"
                 v-model="form.finished"
@@ -15,6 +16,18 @@
                 <el-option value="true" label="已完成"></el-option>
                 <el-option value="false" label="未完成"></el-option>
               </el-select>
+              <el-select
+                v-if="form.examType == 'OFFLINE'"
+                class="form_search_width"
+                size="small"
+                v-model="form.finished"
+                clearable
+                placeholder="全部"
+              >
+                <el-option value="0" label="未抽题"></el-option>
+                <el-option value="1" label="已抽题"></el-option>
+                <el-option value="2" label="已上传"></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -59,6 +72,7 @@
           >重置</el-button
         >
       </el-col>
+      <div class="block-seperator"></div>
       <el-row>
         <el-col :span="24">
           <span>批量操作：</span>
@@ -106,23 +120,8 @@
             </el-table-column>
             <el-table-column fixed="right" sortable label="完成状态">
               <template slot-scope="scope">
-                <span
-                  v-show="scope.row.finished && scope.row.examType == 'ONLINE'"
-                  ><el-tag type="success">已完成</el-tag>
-                </span>
-                <span
-                  v-show="!scope.row.finished && scope.row.examType == 'ONLINE'"
-                  ><el-tag type="danger">未完成</el-tag>
-                </span>
-                <span
-                  v-show="scope.row.finished && scope.row.examType == 'OFFLINE'"
-                  ><el-tag type="success">已抽题</el-tag>
-                </span>
-                <span
-                  v-show="
-                    !scope.row.finished && scope.row.examType == 'OFFLINE'
-                  "
-                  ><el-tag type="danger">未抽题</el-tag>
+                <span>
+                  <el-tag> {{ scope.row.finishedStatus }} </el-tag>
                 </span>
               </template>
             </el-table-column>
@@ -131,8 +130,9 @@
                 <el-row class="operateRow">
                   <el-col :span="24">
                     <el-button
-                      size="mini"
+                      plain
                       type="primary"
+                      size="mini"
                       icon="el-icon-view"
                       @click="previewPaper(scope.row.examStudentId)"
                       v-if="scope.row.examType == 'OFFLINE'"
@@ -143,8 +143,9 @@
                 <el-row class="operateRow">
                   <el-col :span="24">
                     <el-button
+                      plain
+                      type="primary"
                       size="mini"
-                      type="success"
                       icon="el-icon-download"
                       @click="exportPaper(scope.row.examStudentId)"
                       v-if="scope.row.examType == 'OFFLINE'"
@@ -155,8 +156,9 @@
                 <el-row class="operateRow">
                   <el-col :span="24">
                     <el-button
+                      plain
+                      type="primary"
                       size="mini"
-                      type="warning"
                       icon="el-icon-upload2"
                       @click="openUploadAnswerDialog(scope.row.examStudentId)"
                       v-if="
@@ -259,7 +261,7 @@ export default {
         filterCondition: ""
       },
       tableData: [],
-      exportUrl: "/api/ecs_oe_admin/exam/student/all/list/export",
+      exportUrl: "/api/ecs_oe_admin/exam/student/examScheduling/list/export",
       exportFileName: "考试进度详情",
       currentOfflineExamRecordDataId: "",
       offlineAnswerFile: "",
@@ -314,7 +316,7 @@ export default {
       }
       this.tableLoading = true;
       this.$http
-        .post("/api/ecs_oe_admin/exam/student/all/list", this.form)
+        .post("/api/ecs_oe_admin/exam/student/examScheduling/list", this.form)
         .then(response => {
           if (response.data) {
             var dataList = response.data.content;
@@ -354,9 +356,7 @@ export default {
           if (response.data) {
             var examRecordList = response.data;
             if (examRecordList && examRecordList.length > 0) {
-              window.open(
-                "/questions/preview_paper/" + examRecordList[0].basePaperId
-              );
+              window.open("/preview_paper/" + examRecordList[0].basePaperId);
             } else {
               this.$message({
                 message: "该考生未参加考试",

src/modules/oe/views/scoreStatistics.vue

@@ -89,7 +89,7 @@
             <el-table-column sortable label="成绩统计时间" prop="startTime">
             </el-table-column>
           </el-table>
-          <div class="block">
+          <div class="block pull-right">
             <el-pagination
               @size-change="handleSizeChange"
               @current-change="handleCurrentChange"

src/modules/questions/routes/routes.js

@@ -138,7 +138,7 @@ export default [
     component: SelectQuestion
   },
   {
-    path: "preview_paper/:paperId", //预览试卷
+    path: "/preview_paper/:paperId", //预览试卷
     component: PreviewPaper
   }
 ];