Merge remote-tracking branch 'origin/dev_v4.0.1' into dev_v4.0.1

src/modules/basic/routes/routes.js

@@ -15,6 +15,7 @@ import sys_prop_list from "../view/sys_prop_list";
 import client_config from "../view/clientConfig";
 import school_config from "../view/school_config";
 import unimportant_school_config from "../view/unimportant_school_config";
+import sys_notice from "../view/sys_notice";
 
 export default [
   {
@@ -99,6 +100,11 @@ export default [
         path: "unimportant_school_config", //学校设置
         meta: { privilegeCodes: "unimportant_school_config" },
         component: unimportant_school_config
+      },
+      {
+        path: "sys_notice", //系统通知
+        meta: { privilegeCodes: "sys_notice" },
+        component: sys_notice
       }
     ]
   }

src/modules/basic/view/sys_notice.vue

@@ -0,0 +1,138 @@
+<template>
+  <!-- 系统通知 -->
+  <el-container>
+    <el-main class="el-main-padding">
+      <el-form
+        :model="ruleForm"
+        :rules="rules"
+        ref="ruleForm"
+        label-width="200px"
+        class="demo-ruleForm"
+        :inline-message="true"
+      >
+        <el-form-item
+          label="有效期"
+          prop="examDatetimeRange"
+          :label-width="style.label_width_tab1"
+        >
+          <el-date-picker
+            class="input"
+            v-model="examDatetimeRange"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            :clearable="false"
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item label="通知内容">
+          <el-input
+            type="textarea"
+            placeholder="请输入内容"
+            v-model="ruleForm.content"
+            maxlength="200"
+            show-word-limit
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="submitForm('ruleForm')"
+            >保 存</el-button
+          >
+        </el-form-item>
+      </el-form>
+    </el-main>
+  </el-container>
+</template>
+<script>
+import { mapState } from "vuex";
+import moment from "moment";
+import { CORE_API } from "@/constants/constants.js";
+let _this = null;
+export default {
+  data() {
+    let validateExamDatetimeRange = (rule, value, callback) => {
+      let examDatetimeRange = _this.examDatetimeRange;
+      if (!examDatetimeRange) {
+        callback(new Error("请输入有效期"));
+      } else {
+        callback();
+      }
+    };
+    return {
+      examDatetimeRange: [],
+      ruleForm: {
+        rootOrgId: -1,
+        content: "",
+        startTime: null,
+        endTime: null
+      },
+      rules: {
+        content: [{ required: true, trigger: "blur" }],
+        examDatetimeRange: [
+          {
+            required: true,
+            validator: validateExamDatetimeRange,
+            trigger: "blur"
+          }
+        ]
+      }
+    };
+  },
+  methods: {
+    submitForm(formName) {
+      this.$refs[formName].validate(valid => {
+        if (valid) {
+          this.$httpWithMsg
+            .put(CORE_API + "/sys/notice/saveSysNotice", this.ruleForm)
+            .then(
+              () => {
+                this.$notify({
+                  message: "保存成功",
+                  type: "success"
+                });
+              },
+              () => {}
+            );
+        } else {
+          return false;
+        }
+      });
+    },
+
+    initForm() {
+      var url = CORE_API + "/sys/notice/getSysNotice/?rootOrgId=-1";
+      this.$httpWithMsg.get(url).then(response => {
+        if (response) {
+          let data = response.data;
+          (this.ruleForm.rootOrgId = data.rootOrgId),
+            (this.ruleForm.content = data.content);
+          this.ruleForm.startTime = data.startTime;
+          this.ruleForm.endTime = data.endTime;
+
+          this.examDatetimeRange = [
+            this.ruleForm.startTime,
+            this.ruleForm.endTime
+          ];
+        } else {
+          let now = moment().format("YYYY-MM-DD HH:mm:ss");
+          this.examDatetimeRange = [now, now];
+        }
+      });
+    }
+  },
+  created() {
+    _this = this;
+    this.initForm();
+  },
+  watch: {},
+  computed: {
+    ...mapState({ user: state => state.user })
+  }
+};
+</script>
+<style scoped>
+.input-width {
+  width: 638px;
+}
+</style>

src/modules/oe/views/alreadyAudited.vue

@@ -67,6 +67,54 @@
               ></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="开考时间">
+              <el-date-picker
+                class="input"
+                v-model="startExamDatetimeRange"
+                type="datetimerange"
+                start-placeholder="开始日期"
+                range-separator="至"
+                end-placeholder="结束日期"
+                value-format="yyyy/MM/dd HH:mm:ss"
+                :clearable="false"
+                size="small"
+                @change="changeStartExamDatetimeRange"
+              ></el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="交卷时间">
+              <el-date-picker
+                class="input"
+                v-model="endExamDatetimeRange"
+                type="datetimerange"
+                start-placeholder="开始日期"
+                range-separator="至"
+                end-placeholder="结束日期"
+                value-format="yyyy/MM/dd HH:mm:ss"
+                :clearable="false"
+                size="small"
+                @change="changeStartExamDatetimeRange"
+              ></el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="审核时间">
+              <el-date-picker
+                class="input"
+                v-model="AuditExamDatetimeRange"
+                type="datetimerange"
+                start-placeholder="开始日期"
+                range-separator="至"
+                end-placeholder="结束日期"
+                value-format="yyyy/MM/dd HH:mm:ss"
+                :clearable="false"
+                size="small"
+                @change="changeAuditExamDatetimeRange"
+              ></el-date-picker>
+            </el-form-item>
+          </el-col>
         </el-row>
       </commonFormVue>
       <el-col :span="24">
@@ -118,9 +166,9 @@
                   type="text"
                   >{{ scope.row.examRecordDataId }}</el-button
                 >
-                <span v-show="!currentPagePrivileges.SNAPSHOT_DETAILS">
-                  {{ scope.row.examRecordDataId }}
-                </span>
+                <span v-show="!currentPagePrivileges.SNAPSHOT_DETAILS">{{
+                  scope.row.examRecordDataId
+                }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -182,6 +230,18 @@
               prop="examOrder"
               width="120"
             ></el-table-column>
+            <el-table-column
+              sortable
+              label="开考时间"
+              prop="paperStartTime"
+              width="120"
+            ></el-table-column>
+            <el-table-column
+              sortable
+              label="交卷时间"
+              prop="paperSubmitTime"
+              width="120"
+            ></el-table-column>
             <el-table-column
               sortable
               label="审核说明"
@@ -200,6 +260,12 @@
               prop="auditUserName"
               width="180"
             ></el-table-column>
+            <el-table-column
+              sortable
+              label="审核时间"
+              prop="paperAuditTime"
+              width="120"
+            ></el-table-column>
           </el-table>
           <div class="block pull-right">
             <el-pagination
@@ -251,7 +317,13 @@ export default {
         disciplineType: "",
         auditUserName: "",
         status: "",
-        ORG_FIND_ALL: false //查询所有机构
+        ORG_FIND_ALL: false, //查询所有机构
+        startTime: null, //开考时间起
+        endTime: null, //开考时间止
+        submitStartTime: null, //交卷时间起
+        submitEndTime: null, //交卷时间止
+        auditStartTime: null, //审核时间起
+        auditEndTime: null //审核时间止
       },
 
       getExamCondition: {
@@ -268,7 +340,10 @@ export default {
         SNAPSHOT_DETAILS: false //详情查看
       },
       getPermissionStatus: false, //获取权限状态
-      disciplineTypeList: []
+      disciplineTypeList: [],
+      startExamDatetimeRange: [],
+      endExamDatetimeRange: [],
+      auditExamDatetimeRange: []
     };
   },
   computed: {
@@ -295,8 +370,17 @@ export default {
         disciplineType: "",
         auditUserName: "",
         status: "",
-        ORG_FIND_ALL: this.form.ORG_FIND_ALL
+        ORG_FIND_ALL: this.form.ORG_FIND_ALL,
+        startTime: null, //开考时间起
+        endTime: null, //开考时间止
+        submitStartTime: null, //交卷时间起
+        submitEndTime: null, //交卷时间止
+        auditStartTime: null, //审核时间起
+        auditEndTime: null //审核时间止
       };
+      this.startExamDatetimeRange = [];
+      this.endExamDatetimeRange = [];
+      this.auditExamDatetimeRange = [];
     },
     showMoreCondition() {
       this.showAllCondition = true;
@@ -403,6 +487,33 @@ export default {
             );
           }
         });
+    },
+    changeStartExamDatetimeRange(e) {
+      if (e && e.length > 0) {
+        this.form.startTime = e[0];
+        this.form.endTime = e[1];
+      } else {
+        this.form.startTime = "";
+        this.form.endTime = "";
+      }
+    },
+    changeEndExamDatetimeRange(e) {
+      if (e && e.length > 0) {
+        this.form.submitStartTime = e[0];
+        this.form.submitEndTime = e[1];
+      } else {
+        this.form.submitStartTime = "";
+        this.form.submitEndTime = "";
+      }
+    },
+    changeAuditExamDatetimeRange(e) {
+      if (e && e.length > 0) {
+        this.form.AuditStartTime = e[0];
+        this.form.AuditEndTime = e[1];
+      } else {
+        this.form.AuditStartTime = "";
+        this.form.AuditEndTime = "";
+      }
     }
   },
   watch: {

src/modules/oe/views/awaitingAudit.vue

@@ -91,6 +91,38 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="开考时间">
+              <el-date-picker
+                class="input"
+                v-model="startExamDatetimeRange"
+                type="datetimerange"
+                start-placeholder="开始日期"
+                range-separator="至"
+                end-placeholder="结束日期"
+                value-format="yyyy/MM/dd HH:mm:ss"
+                :clearable="false"
+                size="small"
+                @change="changeStartExamDatetimeRange"
+              ></el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="交卷时间">
+              <el-date-picker
+                class="input"
+                v-model="endExamDatetimeRange"
+                type="datetimerange"
+                start-placeholder="开始日期"
+                range-separator="至"
+                end-placeholder="结束日期"
+                value-format="yyyy/MM/dd HH:mm:ss"
+                :clearable="false"
+                size="small"
+                @change="changeStartExamDatetimeRange"
+              ></el-date-picker>
+            </el-form-item>
+          </el-col>
         </el-row>
       </commonFormVue>
       <el-col :span="24">
@@ -183,9 +215,9 @@
                   type="text"
                   >{{ 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>
             </el-table-column>
             <el-table-column
@@ -258,6 +290,18 @@
               prop="faceSuccessPercent"
               width="180"
             ></el-table-column>
+            <el-table-column
+              sortable
+              label="开考时间"
+              prop="paperStartTime"
+              width="120"
+            ></el-table-column>
+            <el-table-column
+              sortable
+              label="交卷时间"
+              prop="paperSubmitTime"
+              width="120"
+            ></el-table-column>
             <el-table-column
               sortable
               label="人脸真实性比率(%)"
@@ -394,7 +438,11 @@ export default {
         pageNo: 1,
         pageSize: 10,
         ORG_FIND_ALL: false, //查询所有机构
-        hasVirtual: null
+        hasVirtual: null,
+        startTime: null, //开考时间起
+        endTime: null, //开考时间止
+        submitStartTime: null, //交卷时间起
+        submitEndTime: null //交卷时间止
       },
       auditForm: {
         examRecordDataId: null,
@@ -418,7 +466,9 @@ export default {
         PENDING_OPERATE: false,
         SNAPSHOT_DETAILS: false
       },
-      disciplineTypeList: []
+      disciplineTypeList: [],
+      startExamDatetimeRange: [],
+      endExamDatetimeRange: []
     };
   },
   computed: {
@@ -456,8 +506,14 @@ export default {
         isWarn: null,
         pageNo: 1,
         pageSize: 10,
-        ORG_FIND_ALL: this.form.ORG_FIND_ALL
+        ORG_FIND_ALL: this.form.ORG_FIND_ALL,
+        startTime: null, //开考时间起
+        endTime: null, //开考时间止
+        submitStartTime: null, //交卷时间起
+        submitEndTime: null //交卷时间止
       };
+      this.startExamDatetimeRange = [];
+      this.endExamDatetimeRange = [];
     },
     showMoreCondition() {
       this.showAllCondition = true;
@@ -630,6 +686,24 @@ export default {
         }
         this.search();
       }
+    },
+    changeStartExamDatetimeRange(e) {
+      if (e && e.length > 0) {
+        this.form.startTime = e[0];
+        this.form.endTime = e[1];
+      } else {
+        this.form.startTime = "";
+        this.form.endTime = "";
+      }
+    },
+    changeEndExamDatetimeRange(e) {
+      if (e && e.length > 0) {
+        this.form.submitStartTime = e[0];
+        this.form.submitEndTime = e[1];
+      } else {
+        this.form.submitStartTime = "";
+        this.form.submitEndTime = "";
+      }
     }
   },
   watch: {