Merge remote-tracking branch 'origin/main'

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];

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>
@@ -97,7 +97,7 @@
       canResize:false,
       useSearchForm: false,
       actionColumn: {
-        width: 120,
+        width: 160,
         fixed: 'right',
       },
       beforeFetch: (params) => {

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) => {

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) => {