Browse Source

Merge branch 'release_v4.0.1' of http://git.qmth.com.cn/examcloud-frontend/examcloud-admin-web into release_v4.0.1

lideyin 4 years ago
parent
commit
9efe52adc2

+ 2 - 2
src/modules/basic/view/sys_login_rule_list.vue

@@ -253,8 +253,8 @@ export default {
       rootOrgList: [],
       loginRuleTypes: [
         { label: "考生登录", value: "STUDENT_LOGIN" },
-        { label: "考生端登录", value: "STUDENT_CLIENT_LOGIN" }
-        /*{ label: "极验验证码登录", value: "GEETEST_LOGIN" }*/
+        { label: "考生端登录", value: "STUDENT_CLIENT_LOGIN" },
+        { label: "极验验证码登录", value: "GEETEST_LOGIN" }
       ],
       isCreate: true,
       loginRuleDialog: false,

+ 1 - 0
src/modules/oe/views/export_task_list.vue

@@ -80,6 +80,7 @@
     >
       <el-table-column label="ID" prop="id" width="80px" sortable />
       <el-table-column label="考试ID" prop="examId" width="100px" sortable />
+      <el-table-column label="考试名称" prop="examName" sortable />
       <el-table-column
         label="任务类型"
         prop="typeTitle"