From 7419244080cd6a6e4e82e7e0b803bce11f5e41f6 Mon Sep 17 00:00:00 2001
From: admin <417727563@qq.com>
Date: Fri, 19 Jul 2024 16:45:27 +0800
Subject: [PATCH 1/3] 19

---
 .../src/views/annualcompgroup/AnnualCompGroupList.vue           | 2 +-
 jeecgboot-vue3-master/src/views/receipt/ReceiptList.vue         | 2 +-
 jeecgboot-vue3-master/src/views/scpayment/ScPaymentList.vue     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/jeecgboot-vue3-master/src/views/annualcompgroup/AnnualCompGroupList.vue b/jeecgboot-vue3-master/src/views/annualcompgroup/AnnualCompGroupList.vue
index 895f29ce..2ed331e8 100644
--- a/jeecgboot-vue3-master/src/views/annualcompgroup/AnnualCompGroupList.vue
+++ b/jeecgboot-vue3-master/src/views/annualcompgroup/AnnualCompGroupList.vue
@@ -97,7 +97,7 @@
       canResize:false,
       useSearchForm: false,
       actionColumn: {
-        width: 120,
+        width: 160,
         fixed: 'right',
       },
       beforeFetch: (params) => {
diff --git a/jeecgboot-vue3-master/src/views/receipt/ReceiptList.vue b/jeecgboot-vue3-master/src/views/receipt/ReceiptList.vue
index 788690b4..3f159758 100644
--- a/jeecgboot-vue3-master/src/views/receipt/ReceiptList.vue
+++ b/jeecgboot-vue3-master/src/views/receipt/ReceiptList.vue
@@ -72,7 +72,7 @@
       canResize:false,
       useSearchForm: false,
       actionColumn: {
-        width: 120,
+        width: 160,
         fixed: 'right',
       },
       beforeFetch: (params) => {
diff --git a/jeecgboot-vue3-master/src/views/scpayment/ScPaymentList.vue b/jeecgboot-vue3-master/src/views/scpayment/ScPaymentList.vue
index ab0640bf..2d79abf0 100644
--- a/jeecgboot-vue3-master/src/views/scpayment/ScPaymentList.vue
+++ b/jeecgboot-vue3-master/src/views/scpayment/ScPaymentList.vue
@@ -72,7 +72,7 @@
       canResize:false,
       useSearchForm: false,
       actionColumn: {
-        width: 120,
+        width: 160,
         fixed: 'right',
       },
       beforeFetch: (params) => {

From 0cd515071878342e8e0b291616c8cfcaf44dfe4e Mon Sep 17 00:00:00 2001
From: admin <417727563@qq.com>
Date: Fri, 19 Jul 2024 16:56:31 +0800
Subject: [PATCH 2/3] 13

---
 .../src/views/annualcompgroup/AnnualCompGroupList.vue         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jeecgboot-vue3-master/src/views/annualcompgroup/AnnualCompGroupList.vue b/jeecgboot-vue3-master/src/views/annualcompgroup/AnnualCompGroupList.vue
index 2ed331e8..2109cc25 100644
--- a/jeecgboot-vue3-master/src/views/annualcompgroup/AnnualCompGroupList.vue
+++ b/jeecgboot-vue3-master/src/views/annualcompgroup/AnnualCompGroupList.vue
@@ -34,8 +34,8 @@
       <!--插槽:table标题-->
       <template #tableTitle>
         <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
-        <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-        <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+<!--        <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+        <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>-->
         <a-dropdown v-if="selectedRowKeys.length > 0">
           <template #overlay>
             <a-menu>

From 65ce1e693f4f7b861f57ddda59208834243597db Mon Sep 17 00:00:00 2001
From: JayChou <2064936853@qq.com>
Date: Fri, 19 Jul 2024 17:02:08 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E8=B7=AF=E7=94=B1=E6=89=93=E5=BC=80=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/router/routes/index.ts                | 96 +++++++++----------
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/jeecgboot-vue3-master/src/router/routes/index.ts b/jeecgboot-vue3-master/src/router/routes/index.ts
index e73e661d..23e65368 100644
--- a/jeecgboot-vue3-master/src/router/routes/index.ts
+++ b/jeecgboot-vue3-master/src/router/routes/index.ts
@@ -38,53 +38,53 @@ export const LoginRoute: AppRouteRecordRaw = {
     title: t('routes.basic.login'),
   },
 };
-export const comprehensiveEvaluation = {
-  path:'/comprehensiveEvaluation',
-  name:'ComprehensiveEvaluation',
-  redirect:'/comprehensiveEvaluation/comprehensiveReport',
-  component: () => import('/@/views/comprehensiveEvaluation/index.vue'),
-  meta:{
-    title:'综合评价',
-  },
-  children:[
-    {
-      path:'comprehensiveReport',
-      name:'ComprehensiveReport',
-      component: ()=> import('/@/views/comprehensiveEvaluation/comprehensiveReport.vue'),
-      meta:{
-        title:'综合报告'
-      }
-
-    },
-    {
-      path:'department',
-      name:'Department',
-      component: ()=> import('/@/views/comprehensiveEvaluation/department.vue'),
-      meta:{
-        title:'部门报告'
-      }
-
-    },
-    {
-      path:'individual',
-      name:'Individual',
-      component: ()=> import('/@/views/comprehensiveEvaluation/individual.vue'),
-      meta:{
-        title:'个人报告'
-      }
-
-    },
-    {
-      path:'organizingCommittee',
-      name:'OrganizingCommittee',
-      component: ()=> import('/@/views/comprehensiveEvaluation/organizingCommittee.vue'),
-      meta:{
-        title:'组委会报告'
-      }
-
-    },
-  ]
-}
+// export const comprehensiveEvaluation = {
+//   path:'/comprehensiveEvaluation',
+//   name:'ComprehensiveEvaluation',
+//   redirect:'/comprehensiveEvaluation/comprehensiveReport',
+//   component: () => import('/@/views/comprehensiveEvaluation/index.vue'),
+//   meta:{
+//     title:'综合评价',
+//   },
+//   children:[
+//     {
+//       path:'comprehensiveReport',
+//       name:'ComprehensiveReport',
+//       component: ()=> import('/@/views/comprehensiveEvaluation/comprehensiveReport.vue'),
+//       meta:{
+//         title:'综合报告'
+//       }
+
+//     },
+//     {
+//       path:'department',
+//       name:'Department',
+//       component: ()=> import('/@/views/comprehensiveEvaluation/department.vue'),
+//       meta:{
+//         title:'部门报告'
+//       }
+
+//     },
+//     {
+//       path:'individual',
+//       name:'Individual',
+//       component: ()=> import('/@/views/comprehensiveEvaluation/individual.vue'),
+//       meta:{
+//         title:'个人报告'
+//       }
+
+//     },
+//     {
+//       path:'organizingCommittee',
+//       name:'OrganizingCommittee',
+//       component: ()=> import('/@/views/comprehensiveEvaluation/organizingCommittee.vue'),
+//       meta:{
+//         title:'组委会报告'
+//       }
+
+//     },
+//   ]
+// }
 /*用于比赛及其比赛项目的基础路由*/
 export const compcom = {
   path:'/compp',
@@ -164,4 +164,4 @@ export const TokenLoginRoute: AppRouteRecordRaw = {
 };
 
 // Basic routing without permission
-export const basicRoutes = [LoginRoute,compcom,comprehensiveEvaluation, RootRoute, ...mainOutRoutes, REDIRECT_ROUTE, PAGE_NOT_FOUND_ROUTE, TokenLoginRoute, Oauth2LoginRoute];
+export const basicRoutes = [LoginRoute,compcom, RootRoute, ...mainOutRoutes, REDIRECT_ROUTE, PAGE_NOT_FOUND_ROUTE, TokenLoginRoute, Oauth2LoginRoute];