Browse Source

修复监考待审权限问题

lideyin 6 years ago
parent
commit
d2583a329f
2 changed files with 31 additions and 34 deletions
  1. 21 24
      src/modules/oe/views/awaitingAudit.vue
  2. 10 10
      src/modules/oe/views/captureDetail.vue

+ 21 - 24
src/modules/oe/views/awaitingAudit.vue

@@ -49,7 +49,7 @@
                 v-model="form.faceSuccessPercentLower"
                 v-model="form.faceSuccessPercentLower"
                 placeholder="下限"
                 placeholder="下限"
               ></el-input>
               ></el-input>
-              <span> - </span>
+              <span>-</span>
               <el-input
               <el-input
                 class="form_search_width_50"
                 class="form_search_width_50"
                 size="small"
                 size="small"
@@ -67,7 +67,7 @@
                   v-model="form.livenessSuccessPercentLower"
                   v-model="form.livenessSuccessPercentLower"
                   placeholder="下限"
                   placeholder="下限"
                 ></el-input>
                 ></el-input>
-                <span> - </span>
+                <span>-</span>
                 <el-input
                 <el-input
                   class="form_search_width_50"
                   class="form_search_width_50"
                   size="small"
                   size="small"
@@ -85,33 +85,30 @@
           size="small"
           size="small"
           type="primary"
           type="primary"
           icon="el-icon-search"
           icon="el-icon-search"
-          >查询
-        </el-button>
+          >查询</el-button
+        >
         <el-button
         <el-button
           size="small"
           size="small"
           type="primary"
           type="primary"
           icon="el-icon-more"
           icon="el-icon-more"
           v-if="!showAllCondition"
           v-if="!showAllCondition"
           @click="showMoreCondition"
           @click="showMoreCondition"
+          >高级查询</el-button
         >
         >
-          高级查询
-        </el-button>
         <el-button
         <el-button
           size="small"
           size="small"
           type="primary"
           type="primary"
           v-if="showAllCondition"
           v-if="showAllCondition"
           @click="showSimpleCondition"
           @click="showSimpleCondition"
+          >简单查询</el-button
         >
         >
-          简单查询
-        </el-button>
         <el-button
         <el-button
           size="small"
           size="small"
           icon="el-icon-refresh"
           icon="el-icon-refresh"
           @click="resetForm"
           @click="resetForm"
           class="margin-bottom-10"
           class="margin-bottom-10"
+          >重置</el-button
         >
         >
-          重置
-        </el-button>
       </el-col>
       </el-col>
       <el-row>
       <el-row>
         <el-col v-show="currentPagePrivileges.PANEING_BATCHAUDIT">
         <el-col v-show="currentPagePrivileges.PANEING_BATCHAUDIT">
@@ -169,12 +166,11 @@
                   v-show="currentPagePrivileges.SNAPSHOT_DETAILS"
                   v-show="currentPagePrivileges.SNAPSHOT_DETAILS"
                   @click="gotoCaptureDetail(scope.row.dataId)"
                   @click="gotoCaptureDetail(scope.row.dataId)"
                   type="text"
                   type="text"
+                  >{{ scope.row.dataId }}</el-button
                 >
                 >
-                  {{ scope.row.dataId }}
-                </el-button>
-                <span v-show="!currentPagePrivileges.SNAPSHOT_DETAILS">
-                  {{ scope.row.dataId }}
-                </span>
+                <span v-show="!currentPagePrivileges.SNAPSHOT_DETAILS">{{
+                  scope.row.dataId
+                }}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
             <el-table-column
             <el-table-column
@@ -257,8 +253,8 @@
                       type="success"
                       type="success"
                       icon="el-icon-success"
                       icon="el-icon-success"
                       @click="auditPass(scope.row.dataId)"
                       @click="auditPass(scope.row.dataId)"
-                      >通&nbsp;&nbsp;&nbsp;&nbsp;过
-                    </el-button>
+                      >通&nbsp;&nbsp;&nbsp;&nbsp;过</el-button
+                    >
                   </el-col>
                   </el-col>
                 </el-row>
                 </el-row>
                 <el-row class="operateRow">
                 <el-row class="operateRow">
@@ -269,8 +265,8 @@
                       type="danger"
                       type="danger"
                       icon="el-icon-error"
                       icon="el-icon-error"
                       @click="openAuditDialog(scope.row.dataId)"
                       @click="openAuditDialog(scope.row.dataId)"
-                      >不通过
-                    </el-button>
+                      >不通过</el-button
+                    >
                   </el-col>
                   </el-col>
                 </el-row>
                 </el-row>
               </div>
               </div>
@@ -308,8 +304,7 @@
                 :key="item.name"
                 :key="item.name"
                 :label="item.desc"
                 :label="item.desc"
                 :value="item.name"
                 :value="item.name"
-              >
-              </el-option>
+              ></el-option>
             </el-select>
             </el-select>
           </el-form-item>
           </el-form-item>
           <el-form-item label="详情描述" style="margin-top:15px;">
           <el-form-item label="详情描述" style="margin-top:15px;">
@@ -318,8 +313,7 @@
               type="textarea"
               type="textarea"
               :autosize="{ minRows: 6, maxRows: 10 }"
               :autosize="{ minRows: 6, maxRows: 10 }"
               placeholder="请输入内容"
               placeholder="请输入内容"
-            >
-            </el-input>
+            ></el-input>
           </el-form-item>
           </el-form-item>
           <div class="dialog-footer margin-top-10 text-center">
           <div class="dialog-footer margin-top-10 text-center">
             <el-button type="primary" @click="doAudit">确 定</el-button>
             <el-button type="primary" @click="doAudit">确 定</el-button>
@@ -564,8 +558,11 @@ export default {
         });
         });
     },
     },
     gotoCaptureDetail(examRecordDataId) {
     gotoCaptureDetail(examRecordDataId) {
+      let pendingOperate = !this.currentPagePrivileges.PENDING_OPERATE;
       this.$router.push({
       this.$router.push({
-        path: "/oe/captureDetail/" + examRecordDataId + "/awaitingAudit"
+        path: "/oe/captureDetail/" + examRecordDataId + "/awaitingAudit",
+        // name: "captureDetail",
+        query: { pendingOperate }
       });
       });
     },
     },
     backFill() {
     backFill() {

+ 10 - 10
src/modules/oe/views/captureDetail.vue

@@ -38,9 +38,8 @@
                 icon="el-icon-arrow-left"
                 icon="el-icon-arrow-left"
                 type="primary"
                 type="primary"
                 @click="back"
                 @click="back"
+                >返回</el-button
               >
               >
-                返回
-              </el-button>
             </el-col>
             </el-col>
           </el-row>
           </el-row>
           <el-row class="margin-top-10">
           <el-row class="margin-top-10">
@@ -123,8 +122,7 @@
                   <template slot-scope="scope">
                   <template slot-scope="scope">
                     <span
                     <span
                       v-html="disciplineTypeFilter(scope.row.disciplineDetail)"
                       v-html="disciplineTypeFilter(scope.row.disciplineDetail)"
-                    >
-                    </span>
+                    ></span>
                   </template>
                   </template>
                 </el-table-column>
                 </el-table-column>
                 <el-table-column
                 <el-table-column
@@ -178,8 +176,7 @@
                 :key="item.name"
                 :key="item.name"
                 :label="item.desc"
                 :label="item.desc"
                 :value="item.name"
                 :value="item.name"
-              >
-              </el-option>
+              ></el-option>
             </el-select>
             </el-select>
           </el-form-item>
           </el-form-item>
           <el-form-item label="详情描述" style="margin-top:15px;">
           <el-form-item label="详情描述" style="margin-top:15px;">
@@ -188,8 +185,7 @@
               type="textarea"
               type="textarea"
               :autosize="{ minRows: 6, maxRows: 10 }"
               :autosize="{ minRows: 6, maxRows: 10 }"
               placeholder="请输入内容"
               placeholder="请输入内容"
-            >
-            </el-input>
+            ></el-input>
           </el-form-item>
           </el-form-item>
           <div class="dialog-footer margin-top-10 text-center">
           <div class="dialog-footer margin-top-10 text-center">
             <el-button type="primary" @click="doAuditNoPass">确 定</el-button>
             <el-button type="primary" @click="doAuditNoPass">确 定</el-button>
@@ -222,7 +218,8 @@ export default {
         isPass: null
         isPass: null
       },
       },
       currentPaths: ["抓拍详情"],
       currentPaths: ["抓拍详情"],
-      disciplineTypeList: DISCIPLINE_TYPE_LIST
+      disciplineTypeList: DISCIPLINE_TYPE_LIST,
+      pendingOperate: false
     };
     };
   },
   },
   computed: {
   computed: {
@@ -233,11 +230,13 @@ export default {
       var param = new URLSearchParams({
       var param = new URLSearchParams({
         examRecordDataId: this.examRecordDataId
         examRecordDataId: this.examRecordDataId
       });
       });
+      let isPendingAudit = this.pendingOperate;
       this.$http
       this.$http
         .post("/api/ecs_oe_admin/exam/capture/audit/detail", param)
         .post("/api/ecs_oe_admin/exam/capture/audit/detail", param)
         .then(response => {
         .then(response => {
           if (response.data) {
           if (response.data) {
-            this.showAudit = response.data.isWarn && !response.data.isAudit;
+            this.showAudit =
+              !isPendingAudit && response.data.isWarn && !response.data.isAudit;
             this.examAuditData.push(response.data);
             this.examAuditData.push(response.data);
             var studentId = response.data.studentId;
             var studentId = response.data.studentId;
             this.getStudentInfo(studentId);
             this.getStudentInfo(studentId);
@@ -329,6 +328,7 @@ export default {
   },
   },
   created() {
   created() {
     this.examRecordDataId = this.$route.params.examRecordDataId;
     this.examRecordDataId = this.$route.params.examRecordDataId;
+    this.pendingOperate = this.$route.query.pendingOperate;
     var fromPage = this.$route.params.from;
     var fromPage = this.$route.params.from;
     var currentPathJson = {
     var currentPathJson = {
       illegalityNameList: ["违纪名单", "抓拍详情"],
       illegalityNameList: ["违纪名单", "抓拍详情"],