Merge remote-tracking branch 'origin/master'

zengh

2021-08-13 3d56946c1c4443beede9d339beaa03bfd7736211

Merge remote-tracking branch 'origin/master'

 public/papers.html

@@ -121,8 +121,8 @@
            var examType = JSON.parse(getData("data")).examType;
            // console.log(JSON.parse(getData("data")), 111);

            // axios.get('http://223.82.109.183:2080/apply/getApplyInfo?id=' + id + "&applyExamType=" + examType).then(function(res) {
            axios.get('http://localhost:81/apply/getApplyInfo?id=' + id + "&applyExamType=" + examType).then(function(res) {
            axios.get('http://223.82.109.183:2080/apply/getApplyInfo?id=' + id + "&applyExamType=" + examType).then(function(res) {
                // axios.get('http://localhost:81/apply/getApplyInfo?id=' + id + "&applyExamType=" + examType).then(function(res) {
                var data = res.data.data;
                var str = `<span class="title">${data.examName}</span>
                    <span class="title">准考证信息</span>

 public/papersApply.html

@@ -77,8 +77,8 @@
            var name = JSON.parse(getData("data")).name;
            // console.log(JSON.parse(getData("data")), 111);

            // axios.get('http://223.82.109.183:2080/apply/getApplyDetailList?examId=' + id).then(function(res) {
            axios.get('http://localhost:81/apply/getApplyDetailList?examId=' + id).then(function(res) {
            axios.get('http://223.82.109.183:2080/apply/getApplyDetailList?examId=' + id).then(function(res) {
                // axios.get('http://localhost:81/apply/getApplyDetailList?examId=' + id).then(function(res) {
                var data = res.data;
                var list = data.applyList;
                console.log(data, 123);

 src/views/exam/performance.vue

@@ -158,6 +158,7 @@
                trigger: "blur",
              },
            ],
            overHidden:true,
          },
          {
            label: "保安姓名",
@@ -279,7 +280,7 @@
              label: "总成绩",
              prop: "allGrade",
              slot: true,
              hide:true,
              // hide:true,
              // 表单新增时是否禁止
              addDisabled: false,
              viewDisplay:false,

 src/views/exam/singleperformance.vue

@@ -149,6 +149,7 @@
                trigger: "blur",
              },
            ],
            overHidden:true,
          },
          {
            label: "保安姓名",

 src/views/trainExam/performance.vue

@@ -158,6 +158,7 @@
                trigger: "blur",
              },
            ],
            overHidden:true,
          },
          {
            label: "保安姓名",
@@ -279,7 +280,7 @@
              label: "总成绩",
              prop: "allGrade",
              slot: true,
              hide:true,
              // hide:true,
              // 表单新增时是否禁止
              addDisabled: false,
              viewDisplay:false,

 src/views/trainExam/singleperformance.vue

@@ -149,6 +149,7 @@
                trigger: "blur",
              },
            ],
            overHidden:true,
          },
          {
            label: "保安姓名",

 src/views/traincompany/index.vue

@@ -3,7 +3,7 @@
 * @Date: 2021-07-07 17:30:05
 * @Last Modified by: Morpheus
 * @Last Modified time: 2021-07-10 16:06:14
 * menu-name 保安培训单位
 * menu-name 保安培训报名
 */
<template>
  <basic-container>
@@ -286,6 +286,7 @@
    submit(){
        batchTrain({
          userIds: this.formTrainApply.userId.join(","),
          trainingUnitId: this.formTrainApply.trainingUnitId
        }).then(
          (res) => {
            this.onLoad(this.page);