Browse Source

fix 框架

master
张泽亮 1 day ago
parent
commit
d9cad067a2
3 changed files with 8 additions and 8 deletions
  1. +2
    -2
      ruoyi-admin/src/main/resources/application.yml
  2. +3
    -3
      ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
  3. +3
    -3
      ruoyi-generator/src/main/resources/vm/vue/index.vue.vm

+ 2
- 2
ruoyi-admin/src/main/resources/application.yml View File

@@ -59,9 +59,9 @@ spring:
servlet:
multipart:
# 单个文件大小
max-file-size: 10MB
max-file-size: 50MB
# 设置总上传的文件大小
max-request-size: 20MB
max-request-size: 50MB
# 服务模块
devtools:
restart:


+ 3
- 3
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java View File

@@ -32,7 +32,7 @@ public class SysDept extends BaseEntity
private String ancestors;

/** 部门名称 */
@Excel(name = "部门名称")
@Excel(name = "行政区划名称")
private String deptName;

/** 显示顺序 */
@@ -57,11 +57,11 @@ public class SysDept extends BaseEntity
private String parentName;

/** 导入代码 */
@Excel(name = "导入代码")
@Excel(name = "导入级联代码")
private String importCode;

/** 行政代码 */
@Excel(name = "行政代码")
@Excel(name = "行政区划代码")
private String orgCode;

/** 经度 */


+ 3
- 3
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm View File

@@ -163,11 +163,11 @@
<el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers" :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
<i class="el-icon-upload"></i>
<div class="el-upload__text">将文件拖到此处,或<em>点击上传</em></div>
<div class="el-upload__tip text-center" slot="tip">
<div class="el-upload__tip text-left" slot="tip">
<div class="el-upload__tip" slot="tip">
<el-checkbox v-model="upload.updateSupport" />是否更新已经存在的${functionName}
<el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的${functionName}
</div>
<span>仅允许导入xls、xlsx格式文件。</span>
<p style="color: red">1、仅允许导入xls、xlsx格式文件;</p>
<el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline" @click="importTemplate">下载模板</el-link>
</div>
</el-upload>


Loading…
Cancel
Save