zhc077
/
hnjd_comp
forked from wangjiadong/comp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

选题审核不许导入和新增；能力不能导出

Browse Source
main
王家东 4 months ago
parent 59b5d45f64
commit 749270ceed
5 changed files with 27 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/basicsskill/controller/BasicsskillController.java
  2. 2
      jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/basicsskill/entity/Basicsskill.java
  3. 8
      jeecgboot-vue3-master/src/views/chooseTopicPersion/ChaoseTopicPersionList.vue
  4. 4
      jeecgboot-vue3-master/src/views/chooseTopicPersion/ChaoseTopicPersionList1.vue
  5. 4
      jeecgboot-vue3-master/src/views/chooseTopicPersion/ChaoseTopicPersionList2.vue

4
jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/basicsskill/controller/BasicsskillController.java
Unescape View File

@ -297,7 +297,7 @@ public class BasicsskillController extends JeecgController<Basicsskill, IBasicss
* @param request * @param request
* @param basicsskill * @param basicsskill
*/ */
@RequiresPermissions("basicsskill:basicsskill:exportXls") /*@RequiresPermissions("basicsskill:basicsskill:exportXls")*/
@RequestMapping(value = "/exportXls") @RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, Basicsskill basicsskill) { public ModelAndView exportXls(HttpServletRequest request, Basicsskill basicsskill) {
return super.exportXls(request, basicsskill, Basicsskill.class, "基础能力设置"); return super.exportXls(request, basicsskill, Basicsskill.class, "基础能力设置");
@ -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);

2
jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/basicsskill/entity/Basicsskill.java
Unescape View File

@ -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;
/**名称*/ /**名称*/

8
jeecgboot-vue3-master/src/views/chooseTopicPersion/ChaoseTopicPersionList.vue
Unescape View File

@ -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>

4
jeecgboot-vue3-master/src/views/chooseTopicPersion/ChaoseTopicPersionList1.vue
Unescape View File

@ -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>

4
jeecgboot-vue3-master/src/views/chooseTopicPersion/ChaoseTopicPersionList2.vue
Unescape View File

@ -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>

Write Preview
Loading…
Cancel
Save