Conflicts:
	jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/basicsskill/controller/BasicsskillController.java
main
喻忠伟 4 months ago
commit 70839057e4
  1. 3
      jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompetitionprojectregistration/controller/AnnualCompetitionProjectRegistrationController.java
  2. 2
      jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/basicsskill/controller/BasicsskillController.java
  3. 2
      jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/basicsskill/entity/Basicsskill.java
  4. 8
      jeecgboot-vue3-master/src/views/chooseTopicPersion/ChaoseTopicPersionList.vue
  5. 4
      jeecgboot-vue3-master/src/views/chooseTopicPersion/ChaoseTopicPersionList1.vue
  6. 4
      jeecgboot-vue3-master/src/views/chooseTopicPersion/ChaoseTopicPersionList2.vue

@ -1192,6 +1192,9 @@ public class AnnualCompetitionProjectRegistrationController {
} }
} }
if(map.isEmpty()){
return Result.error("无可用的比赛项目");
}
return Result.OK(map); return Result.OK(map);
} }

@ -310,7 +310,7 @@ public class BasicsskillController extends JeecgController<Basicsskill, IBasicss
* @param response * @param response
* @return * @return
*/ */
@RequiresPermissions("basicsskill:basicsskill:importExcel") /* @RequiresPermissions("basicsskill:basicsskill:importExcel")*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST) @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, Basicsskill.class); return super.importExcel(request, response, Basicsskill.class);

@ -52,7 +52,7 @@ public class Basicsskill implements Serializable {
@ApiModelProperty(value = "所属部门") @ApiModelProperty(value = "所属部门")
private String sysOrgCode; private String sysOrgCode;
/**上级*/ /**上级*/
@Excel(name = "上级", width = 15) /*@Excel(name = "上级", width = 15)*/
@ApiModelProperty(value = "上级") @ApiModelProperty(value = "上级")
private String pid; private String pid;
/**名称*/ /**名称*/

@ -12,13 +12,13 @@
<BasicTable @register="registerTable" :rowSelection="rowSelection"> <BasicTable @register="registerTable" :rowSelection="rowSelection">
<!--插槽:table标题--> <!--插槽:table标题-->
<template #tableTitle> <template #tableTitle>
<a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增 <!-- <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增
</a-button> </a-button>-->
<a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出 <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出
</a-button> </a-button>
<j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls"> <!-- <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">
导入 导入
</j-upload-button> </j-upload-button>-->
<a-dropdown v-if="selectedRowKeys.length > 0"> <a-dropdown v-if="selectedRowKeys.length > 0">
<template #overlay> <template #overlay>
<a-menu> <a-menu>

@ -11,9 +11,9 @@
<BasicTable @register="registerTable" :rowSelection="rowSelection"> <BasicTable @register="registerTable" :rowSelection="rowSelection">
<!--插槽:table标题--> <!--插槽:table标题-->
<template #tableTitle> <template #tableTitle>
<a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button> <!-- <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> <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> <!-- <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>-->
<a-dropdown v-if="selectedRowKeys.length > 0"> <a-dropdown v-if="selectedRowKeys.length > 0">
<template #overlay> <template #overlay>
<a-menu> <a-menu>

@ -11,9 +11,9 @@
<BasicTable @register="registerTable" :rowSelection="rowSelection"> <BasicTable @register="registerTable" :rowSelection="rowSelection">
<!--插槽:table标题--> <!--插槽:table标题-->
<template #tableTitle> <template #tableTitle>
<a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button> <!-- <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> <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> <!-- <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>-->
<a-dropdown v-if="selectedRowKeys.length > 0"> <a-dropdown v-if="selectedRowKeys.length > 0">
<template #overlay> <template #overlay>
<a-menu> <a-menu>

Loading…
Cancel
Save