From ce1e4ac5c12823a9abcd7a11ac743183ffa60a6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=AE=B6=E4=B8=9C?= <1654135867@qq.com>
Date: Mon, 5 Aug 2024 16:32:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B4=E5=BA=A6=E6=AF=94=E8=B5=9B=E9=A1=B9?=
=?UTF-8?q?=E7=9B=AE=E4=BF=AE=E6=94=B9=E4=B8=BA=E9=A1=B9=E7=9B=AE/?=
=?UTF-8?q?=E8=B5=9B=E9=81=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../annualCompPoint/committee/AnnualCompPoint.data.ts | 6 +++---
.../annualCompPoint/committee/AnnualCompPointList.vue | 2 +-
.../committee/components/AnnualCompPointForm.vue | 4 ++--
.../committee/components/AnnualCompPointFormscgl.vue | 4 ++--
.../annualCompPoint/department/AnnualCompPoint.data.ts | 4 ++--
.../annualCompPoint/department/AnnualCompPointList.vue | 2 +-
.../department/components/AnnualCompPointForm.vue | 4 ++--
.../views/annualCompPoint/student/AnnualCompPoint.data.ts | 8 ++++----
.../views/annualCompPoint/student/AnnualCompPointList.vue | 2 +-
.../student/components/AnnualCompPointForm.vue | 4 ++--
.../annualCompPoint/student2/AnnualCompPoint.data.ts | 6 +++---
.../annualCompPoint/student2/AnnualCompPointList.vue | 4 ++--
.../annualCompPoint/student2/AnnualCompPointList2.vue | 4 ++--
.../student2/components/AnnualCompPointForm.vue | 8 ++++----
.../annualCompPoint/superAdmin/AnnualCompPoint.data.ts | 4 ++--
.../superAdmin/AnnualCompPointListAwaitPass.vue | 4 ++--
.../superAdmin/AnnualCompPointListAwaitReject.vue | 4 ++--
.../superAdmin/AnnualCompPointListPass.vue | 4 ++--
.../annualCompPoint/superAdmin/AnnualCompPointListZJ.vue | 2 +-
.../superAdmin/components/AnnualCompPointForm.vue | 4 ++--
20 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPoint.data.ts b/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPoint.data.ts
index 53da78f6..dfda007c 100644
--- a/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPoint.data.ts
+++ b/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPoint.data.ts
@@ -11,12 +11,12 @@ export const columns: BasicColumn[] = [
dataIndex: 'annualCompId_dictText'
},
{
- title: '项目名称',
+ title: '项目/赛道名称',
align: "center",
dataIndex: 'objName'
},
{
- title: '项目层次',
+ title: '项目/赛道层次',
align: "center",
dataIndex: 'objLevel_dictText',
// customRender: function (objLevel) {
@@ -44,7 +44,7 @@ export const columns: BasicColumn[] = [
},
},
{
- title: '年度比赛项目状态',
+ title: '年度比赛项目/赛道状态',
align: "center",
dataIndex: 'annualCompState',
customRender: function (annualCompState) {
diff --git a/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue b/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue
index e833fb10..5b2f316d 100644
--- a/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue
+++ b/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue
@@ -116,7 +116,7 @@
},
},
exportConfig: {
- name: "年度比赛项目管理",
+ name: "年度比赛项目/赛道管理",
url: getExportUrl,
params: queryParam,
},
diff --git a/jeecgboot-vue3-master/src/views/annualCompPoint/committee/components/AnnualCompPointForm.vue b/jeecgboot-vue3-master/src/views/annualCompPoint/committee/components/AnnualCompPointForm.vue
index 1b7c9116..fc7d5f55 100644
--- a/jeecgboot-vue3-master/src/views/annualCompPoint/committee/components/AnnualCompPointForm.vue
+++ b/jeecgboot-vue3-master/src/views/annualCompPoint/committee/components/AnnualCompPointForm.vue
@@ -19,9 +19,9 @@
-
-
diff --git a/jeecgboot-vue3-master/src/views/annualCompPoint/committee/components/AnnualCompPointFormscgl.vue b/jeecgboot-vue3-master/src/views/annualCompPoint/committee/components/AnnualCompPointFormscgl.vue
index 1e9777c9..77a87d45 100644
--- a/jeecgboot-vue3-master/src/views/annualCompPoint/committee/components/AnnualCompPointFormscgl.vue
+++ b/jeecgboot-vue3-master/src/views/annualCompPoint/committee/components/AnnualCompPointFormscgl.vue
@@ -19,9 +19,9 @@
-
-
diff --git a/jeecgboot-vue3-master/src/views/annualCompPoint/department/AnnualCompPoint.data.ts b/jeecgboot-vue3-master/src/views/annualCompPoint/department/AnnualCompPoint.data.ts
index c1489cfd..6f151621 100644
--- a/jeecgboot-vue3-master/src/views/annualCompPoint/department/AnnualCompPoint.data.ts
+++ b/jeecgboot-vue3-master/src/views/annualCompPoint/department/AnnualCompPoint.data.ts
@@ -11,7 +11,7 @@ export const columns: BasicColumn[] = [
dataIndex: 'annualCompId_dictText'
},
{
- title: '项目名称',
+ title: '项目/赛道名称',
align: "center",
dataIndex: 'objName'
},
@@ -44,7 +44,7 @@ export const columns: BasicColumn[] = [
},
},
{
- title: '年度比赛项目状态',
+ title: '年度比赛项目/赛道状态',
align: "center",
dataIndex: 'annualCompState',
customRender: function (annualCompState) {
diff --git a/jeecgboot-vue3-master/src/views/annualCompPoint/department/AnnualCompPointList.vue b/jeecgboot-vue3-master/src/views/annualCompPoint/department/AnnualCompPointList.vue
index d12aa024..514722d5 100644
--- a/jeecgboot-vue3-master/src/views/annualCompPoint/department/AnnualCompPointList.vue
+++ b/jeecgboot-vue3-master/src/views/annualCompPoint/department/AnnualCompPointList.vue
@@ -100,7 +100,7 @@ const {prefixCls, tableContext, onExportXls, onImportXls} = useListPage({
},
},
exportConfig: {
- name: "年度比赛项目管理",
+ name: "年度比赛项目/赛道管理",
url: getExportUrl,
params: queryParam,
},
diff --git a/jeecgboot-vue3-master/src/views/annualCompPoint/department/components/AnnualCompPointForm.vue b/jeecgboot-vue3-master/src/views/annualCompPoint/department/components/AnnualCompPointForm.vue
index ee835845..1f994f37 100644
--- a/jeecgboot-vue3-master/src/views/annualCompPoint/department/components/AnnualCompPointForm.vue
+++ b/jeecgboot-vue3-master/src/views/annualCompPoint/department/components/AnnualCompPointForm.vue
@@ -19,9 +19,9 @@
-
-
diff --git a/jeecgboot-vue3-master/src/views/annualCompPoint/student/AnnualCompPoint.data.ts b/jeecgboot-vue3-master/src/views/annualCompPoint/student/AnnualCompPoint.data.ts
index 8be6c21a..fc73b22b 100644
--- a/jeecgboot-vue3-master/src/views/annualCompPoint/student/AnnualCompPoint.data.ts
+++ b/jeecgboot-vue3-master/src/views/annualCompPoint/student/AnnualCompPoint.data.ts
@@ -11,12 +11,12 @@ export const columns: BasicColumn[] = [
dataIndex: 'annualCompId_dictText'
},
{
- title: '项目名称',
+ title: '项目/赛道名称',
align: "center",
dataIndex: 'objName'
},
{
- title: '项目层次',
+ title: '项目/赛道层次',
align: "center",
dataIndex: 'objLevel_dictText',
},
@@ -100,12 +100,12 @@ export const formSchema: FormSchema[] = [
},
},
{
- label: '项目名称',
+ label: '项目/赛道名称',
field: 'objName',
component: 'Input',
dynamicRules: ({model, schema}) => {
return [
- {required: true, message: '请输入项目名称!'},
+ {required: true, message: '请输入项目/赛道名称!'},
];
},
},
diff --git a/jeecgboot-vue3-master/src/views/annualCompPoint/student/AnnualCompPointList.vue b/jeecgboot-vue3-master/src/views/annualCompPoint/student/AnnualCompPointList.vue
index 0f0968e4..9967b1aa 100644
--- a/jeecgboot-vue3-master/src/views/annualCompPoint/student/AnnualCompPointList.vue
+++ b/jeecgboot-vue3-master/src/views/annualCompPoint/student/AnnualCompPointList.vue
@@ -79,7 +79,7 @@
//注册table数据
const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
tableProps: {
- title: '年度比赛项目管理',
+ title: '年度比赛项目/赛道管理',
api: list,
columns,
canResize: false,
diff --git a/jeecgboot-vue3-master/src/views/annualCompPoint/student/components/AnnualCompPointForm.vue b/jeecgboot-vue3-master/src/views/annualCompPoint/student/components/AnnualCompPointForm.vue
index 714edf41..555833f3 100644
--- a/jeecgboot-vue3-master/src/views/annualCompPoint/student/components/AnnualCompPointForm.vue
+++ b/jeecgboot-vue3-master/src/views/annualCompPoint/student/components/AnnualCompPointForm.vue
@@ -22,8 +22,8 @@
-
-
+
diff --git a/jeecgboot-vue3-master/src/views/annualCompPoint/student2/AnnualCompPoint.data.ts b/jeecgboot-vue3-master/src/views/annualCompPoint/student2/AnnualCompPoint.data.ts
index 346c8df7..fb9801a4 100644
--- a/jeecgboot-vue3-master/src/views/annualCompPoint/student2/AnnualCompPoint.data.ts
+++ b/jeecgboot-vue3-master/src/views/annualCompPoint/student2/AnnualCompPoint.data.ts
@@ -11,7 +11,7 @@ export const columns: BasicColumn[] = [
dataIndex: 'annualCompId_dictText'
},
{
- title: '项目名称',
+ title: '项目/赛道名称',
align: "center",
dataIndex: 'objName'
},
@@ -100,12 +100,12 @@ export const formSchema: FormSchema[] = [
},
},
{
- label: '项目名称',
+ label: '项目/赛道名称',
field: 'objName',
component: 'Input',
dynamicRules: ({model, schema}) => {
return [
- {required: true, message: '请输入项目名称!'},
+ {required: true, message: '请输入项目/赛道名称!'},
];
},
},
diff --git a/jeecgboot-vue3-master/src/views/annualCompPoint/student2/AnnualCompPointList.vue b/jeecgboot-vue3-master/src/views/annualCompPoint/student2/AnnualCompPointList.vue
index 314be7b8..ff5872ad 100644
--- a/jeecgboot-vue3-master/src/views/annualCompPoint/student2/AnnualCompPointList.vue
+++ b/jeecgboot-vue3-master/src/views/annualCompPoint/student2/AnnualCompPointList.vue
@@ -79,7 +79,7 @@
//注册table数据
const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
tableProps: {
- title: '年度比赛项目管理',
+ title: '年度比赛项目/赛道管理',
api: list,
columns,
canResize: false,
@@ -93,7 +93,7 @@
},
},
exportConfig: {
- name: '年度比赛项目管理',
+ name: '年度比赛项目/赛道管理',
url: getExportUrl,
params: queryParam,
},
diff --git a/jeecgboot-vue3-master/src/views/annualCompPoint/student2/AnnualCompPointList2.vue b/jeecgboot-vue3-master/src/views/annualCompPoint/student2/AnnualCompPointList2.vue
index 5407ef90..ee5cbe38 100644
--- a/jeecgboot-vue3-master/src/views/annualCompPoint/student2/AnnualCompPointList2.vue
+++ b/jeecgboot-vue3-master/src/views/annualCompPoint/student2/AnnualCompPointList2.vue
@@ -96,7 +96,7 @@ const [signUp4TeamModal, {openModal: openSignUp4TeamModal}] = useModal();
//注册table数据
const {prefixCls, tableContext, onExportXls, onImportXls} = useListPage({
tableProps: {
- title: '年度比赛项目管理',
+ title: '年度比赛项目/赛道管理',
api: list,
columns,
canResize: false,
@@ -110,7 +110,7 @@ const {prefixCls, tableContext, onExportXls, onImportXls} = useListPage({
},
},
exportConfig: {
- name: '年度比赛项目管理',
+ name: '年度比赛项目/赛道管理',
url: getExportUrl,
params: queryParam,
},
diff --git a/jeecgboot-vue3-master/src/views/annualCompPoint/student2/components/AnnualCompPointForm.vue b/jeecgboot-vue3-master/src/views/annualCompPoint/student2/components/AnnualCompPointForm.vue
index 714edf41..2f57c003 100644
--- a/jeecgboot-vue3-master/src/views/annualCompPoint/student2/components/AnnualCompPointForm.vue
+++ b/jeecgboot-vue3-master/src/views/annualCompPoint/student2/components/AnnualCompPointForm.vue
@@ -22,15 +22,15 @@
-
-
+
-
+
list({ ...params, compStatus: compStatus }),
columns,
@@ -101,7 +101,7 @@ const {prefixCls, tableContext, onExportXls, onImportXls} = useListPage({
},
},
exportConfig: {
- name: "年度比赛项目管理",
+ name: "年度比赛项目/赛道管理",
url: getExportUrl,
params: queryParam,
},
diff --git a/jeecgboot-vue3-master/src/views/annualCompPoint/superAdmin/AnnualCompPointListZJ.vue b/jeecgboot-vue3-master/src/views/annualCompPoint/superAdmin/AnnualCompPointListZJ.vue
index 3a6fad68..2caa7494 100644
--- a/jeecgboot-vue3-master/src/views/annualCompPoint/superAdmin/AnnualCompPointListZJ.vue
+++ b/jeecgboot-vue3-master/src/views/annualCompPoint/superAdmin/AnnualCompPointListZJ.vue
@@ -102,7 +102,7 @@ const {prefixCls, tableContext, onExportXls, onImportXls} = useListPage({
},
},
exportConfig: {
- name: "年度比赛项目管理",
+ name: "年度比赛项目/赛道管理",
url: getExportUrl,
params: queryParam,
},
diff --git a/jeecgboot-vue3-master/src/views/annualCompPoint/superAdmin/components/AnnualCompPointForm.vue b/jeecgboot-vue3-master/src/views/annualCompPoint/superAdmin/components/AnnualCompPointForm.vue
index fb0a6410..25a204a0 100644
--- a/jeecgboot-vue3-master/src/views/annualCompPoint/superAdmin/components/AnnualCompPointForm.vue
+++ b/jeecgboot-vue3-master/src/views/annualCompPoint/superAdmin/components/AnnualCompPointForm.vue
@@ -19,9 +19,9 @@
-
-