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

src/modules/oe/mixin/pagePrivilege.js

@@ -2,38 +2,31 @@ export default {
   data() {
     return {};
   },
-  created: function() {
-    this.getPagePrivilege();
-  },
-  methods: {
-    getPagePrivilege() {
-      var groupCode = "NETEXAM_WORK_MENUS";
-      this.$http
-        .post(
-          "/api/ecs_core/rolePrivilege/getUserPrivileges?groupCode=" +
-            groupCode +
-            "&full=" +
-            false
-        )
-        .then(response => {
-          var pagePermissions = this.filterPagePermission(response.data);
-          if (pagePermissions.length > 0) {
-            for (var currentPagePrivilege in this.currentPagePrivileges) {
-              if (pagePermissions.indexOf(currentPagePrivilege) > -1) {
-                this.currentPagePrivileges[currentPagePrivilege] = true;
-              }
+  beforeCreate() {
+    var groupCode = "NETEXAM_WORK_MENUS";
+    this.$http
+      .post(
+        "/api/ecs_core/rolePrivilege/getUserPrivileges?groupCode=" +
+          groupCode +
+          "&full=" +
+          false
+      )
+      .then(response => {
+        var allpermissions = response.data;
+        var pagePermissions = [];
+        for (var i = 0; i < allpermissions.length; i++) {
+          if (allpermissions[i].ext1 == "PAGE") {
+            pagePermissions.push(allpermissions[i].code);
+          }
+        }
+        if (pagePermissions.length > 0) {
+          for (var currentPagePrivilege in this.currentPagePrivileges) {
+            if (pagePermissions.indexOf(currentPagePrivilege) > -1) {
+              this.currentPagePrivileges[currentPagePrivilege] = true;
             }
           }
-        });
-    },
-    filterPagePermission(allpermissions) {
-      var pagePermissions = [];
-      for (var i = 0; i < allpermissions.length; i++) {
-        if (allpermissions[i].ext1 == "PAGE") {
-          pagePermissions.push(allpermissions[i].code);
         }
-      }
-      return pagePermissions;
-    }
+        this.getPermissionStatus = true; //获取权限完成
+      });
   }
 };

src/modules/oe/views/alreadyAudited.vue

@@ -27,6 +27,8 @@
                 <el-option value="UN_PASS" label="不通过"></el-option>
               </el-select>
               <el-input
+                size="small"
+                class="form_search_width"
                 v-if="!currentPagePrivileges.INVIGILATE_AUDIT_STATUS"
                 placeholder="不通过"
                 :disabled="true"
@@ -271,7 +273,8 @@ export default {
       currentPagePrivileges: {
         INVIGILATE_AUDIT_STATUS: false, //数据状态
         SNAPSHOT_DETAILS: false //详情查看
-      }
+      },
+      getPermissionStatus: false //获取权限状态
     };
   },
   computed: {
@@ -327,6 +330,9 @@ export default {
       }
       this.tableLoading = true;
       var params = JSON.parse(JSON.stringify(this.form));
+      if (!this.currentPagePrivileges.INVIGILATE_AUDIT_STATUS) {
+        params.status = "UN_PASS";
+      }
       this.$http
         .post("/api/ecs_oe_admin/exam/audit/list", params)
         .then(response => {
@@ -388,16 +394,17 @@ export default {
     }
   },
   watch: {
-    "currentPagePrivileges.INVIGILATE_AUDIT_STATUS": function(val) {
-      this.form.status = val ? "" : "UN_PASS";
+    //监控权限是否获取完成
+    getPermissionStatus: function(val) {
+      if (val) {
+        if (!this.currentPagePrivileges.INVIGILATE_AUDIT_STATUS) {
+          this.form.status = "UN_PASS";
+        }
+        this.backFill();
+      }
     }
   },
-  created() {
-    this.form.status = this.currentPagePrivileges.INVIGILATE_AUDIT_STATUS
-      ? ""
-      : "UN_PASS";
-    this.backFill();
-  }
+  created() {}
 };
 </script>
 <style scoped src="../style/common.css"></style>