From 97c9918b46ab7cfa1687a0e5c2956d9d33eb0db3 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 06 Dec 2021 09:43:33 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises_ys
---
src/views/applyexam/index.vue | 2 +-
public/papers.html | 4 ++--
src/views/system/user.vue | 4 ++++
src/views/trainingRegistration/index.vue | 3 ++-
public/papersApply.html | 4 ++--
src/views/resource/attachCopyzb.vue | 2 +-
src/views/applydetailed/index.vue | 2 +-
src/views/dispatch/dispatchChildoperable.vue | 2 ++
src/views/exam/singleperformance.vue | 7 +++++++
9 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/public/papers.html b/public/papers.html
index c6df9ac..b053db1 100644
--- a/public/papers.html
+++ b/public/papers.html
@@ -140,8 +140,8 @@
var examType = JSON.parse(getData("data")).examType;
// console.log(JSON.parse(getData("data")), 111);
- // axios.get('http://223.82.109.183:2088/api/apply/getApplyInfo?id=' + id + "&applyExamType=" + examType).then(function(res) {
- axios.get('http://localhost:83/apply/getApplyInfo?id=' + id + "&applyExamType=" + examType).then(function(res) {
+ axios.get('http://223.82.109.183:2088/api/apply/getApplyInfo?id=' + id + "&applyExamType=" + examType).then(function(res) {
+ // axios.get('http://localhost:83/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 9607aa9..28ba915 100644
--- a/public/papersApply.html
+++ b/public/papersApply.html
@@ -96,8 +96,8 @@
var name = JSON.parse(getData("data")).name;
// console.log(JSON.parse(getData("data")), 111);
- axios.get('http://223.82.109.183:2080/api/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:2088/api/apply/getApplyDetailList?examId=' + id).then(function(res) {
+ // axios.get('http://localhost:83/apply/getApplyDetailList?examId=' + id).then(function(res) {
var data = res.data;
var list = data.applyList;
console.log(data, 123);
diff --git a/src/views/applydetailed/index.vue b/src/views/applydetailed/index.vue
index 22310e7..ec7a6e1 100644
--- a/src/views/applydetailed/index.vue
+++ b/src/views/applydetailed/index.vue
@@ -69,7 +69,7 @@
</avue-crud>
<el-dialog
- title="清册数据导入"
+ title="报名清册附件上传"
append-to-body
:visible.sync="excelBox"
width="555px"
diff --git a/src/views/applyexam/index.vue b/src/views/applyexam/index.vue
index a97f6a1..bae3a72 100644
--- a/src/views/applyexam/index.vue
+++ b/src/views/applyexam/index.vue
@@ -435,10 +435,10 @@
editBtn: false,
addBtn: true,
addBtnText: "报名信息新增",
+ addTitle: "报名信息新增",
selection: false,
menu: true,
// 导出按钮
- // excelBtn: true,
viewBtn: true,
// title: '题库',
diff --git a/src/views/dispatch/dispatchChildoperable.vue b/src/views/dispatch/dispatchChildoperable.vue
index 6e7ece0..bdd5c96 100644
--- a/src/views/dispatch/dispatchChildoperable.vue
+++ b/src/views/dispatch/dispatchChildoperable.vue
@@ -109,6 +109,7 @@
cellBtn: false,
delBtnText: "结束派遣",
editBtnText: "更改派遣",
+ editTitle: "更改派遣",
addTitle: "记录添加",
addBtnText: "记录添加",
// addBtn: false,
@@ -346,6 +347,7 @@
cellBtn: false,
delBtnText: "结束派遣",
editBtnText: "更改派遣",
+ editTitle: "更改派遣",
addTitle: "记录添加",
addBtnText: "记录添加",
// addBtn: false,
diff --git a/src/views/exam/singleperformance.vue b/src/views/exam/singleperformance.vue
index 8f4ed78..eaddbc1 100644
--- a/src/views/exam/singleperformance.vue
+++ b/src/views/exam/singleperformance.vue
@@ -30,6 +30,9 @@
<template slot-scope="{ row }" slot="learnGrade">
{{ row.learnGrade == -1 ? "暂未录入" : row.learnGrade }}
</template>
+ <template slot-scope="{ row }" slot="isExam">
+ {{ row.isExam == -1 ? "" : row.isExam }}
+ </template>
<template slot-scope="{ row }" slot="theoryGrade">
{{ row.learnGrade == -1 ? "" : row.theoryGrade }}
</template>
@@ -283,6 +286,10 @@
label: "考试中",
value: 3,
},
+ {
+ label: "",
+ value: -1,
+ },
],
// 表单新增时是否禁止
addDisabled: false,
diff --git a/src/views/resource/attachCopyzb.vue b/src/views/resource/attachCopyzb.vue
index b786764..d9518a3 100644
--- a/src/views/resource/attachCopyzb.vue
+++ b/src/views/resource/attachCopyzb.vue
@@ -61,7 +61,7 @@
</template>
</avue-crud>
<el-dialog
- title="附件管理"
+ title="单位装备清单附件上传"
append-to-body
:visible.sync="attachBox"
width="555px"
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index e311496..5a10827 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -291,6 +291,10 @@
border: true,
index: true,
delBtnText: "注销",
+ addBtnText: "系统用户注册",
+ addTitle: "系统用户注册",
+ editBtnText: "修改",
+ editTitle: "用户信息修改",
selection: true,
viewBtn: true,
//dialogType: 'drawer',
diff --git a/src/views/trainingRegistration/index.vue b/src/views/trainingRegistration/index.vue
index 387610b..1fd29ac 100644
--- a/src/views/trainingRegistration/index.vue
+++ b/src/views/trainingRegistration/index.vue
@@ -425,7 +425,8 @@
delBtn: false,
editBtn: false,
addBtn: true,
- addBtnText: "报名新增",
+ addBtnText: "培训报名新增",
+ addTitle: "培训报名新增",
selection: false,
menu: true,
// 导出按钮
--
Gitblit v1.9.3