From 3d56946c1c4443beede9d339beaa03bfd7736211 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 13 Aug 2021 17:51:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/traincompany/index.vue | 3 ++-
src/views/trainExam/performance.vue | 3 ++-
public/papers.html | 4 ++--
src/views/trainExam/singleperformance.vue | 1 +
public/papersApply.html | 4 ++--
src/views/exam/performance.vue | 3 ++-
src/views/exam/singleperformance.vue | 1 +
7 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/public/papers.html b/public/papers.html
index b39f705..dfe0ad7 100644
--- a/public/papers.html
+++ b/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>
diff --git a/public/papersApply.html b/public/papersApply.html
index 3682b04..a3300db 100644
--- a/public/papersApply.html
+++ b/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);
diff --git a/src/views/exam/performance.vue b/src/views/exam/performance.vue
index cca998d..1c9f5d8 100644
--- a/src/views/exam/performance.vue
+++ b/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,
diff --git a/src/views/exam/singleperformance.vue b/src/views/exam/singleperformance.vue
index 1920f39..f96cb01 100644
--- a/src/views/exam/singleperformance.vue
+++ b/src/views/exam/singleperformance.vue
@@ -149,6 +149,7 @@
trigger: "blur",
},
],
+ overHidden:true,
},
{
label: "保安姓名",
diff --git a/src/views/trainExam/performance.vue b/src/views/trainExam/performance.vue
index 3acf28d..d077e07 100644
--- a/src/views/trainExam/performance.vue
+++ b/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,
diff --git a/src/views/trainExam/singleperformance.vue b/src/views/trainExam/singleperformance.vue
index e45056b..ebaa576 100644
--- a/src/views/trainExam/singleperformance.vue
+++ b/src/views/trainExam/singleperformance.vue
@@ -149,6 +149,7 @@
trigger: "blur",
},
],
+ overHidden:true,
},
{
label: "保安姓名",
diff --git a/src/views/traincompany/index.vue b/src/views/traincompany/index.vue
index d7de7cb..b6ef7bf 100644
--- a/src/views/traincompany/index.vue
+++ b/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);
--
Gitblit v1.9.3