瀏覽代碼

fix 框架

master
张泽亮 4 天之前
父節點
當前提交
d9cad067a2
共有 3 個檔案被更改,包括 8 行新增8 行删除
  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 查看文件

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


+ 3
- 3
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java 查看文件

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


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


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


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


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


/** 经度 */ /** 经度 */


+ 3
- 3
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm 查看文件

@@ -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> <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> <i class="el-icon-upload"></i>
<div class="el-upload__text">将文件拖到此处,或<em>点击上传</em></div> <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"> <div class="el-upload__tip" slot="tip">
<el-checkbox v-model="upload.updateSupport" />是否更新已经存在的${functionName}
<el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的${functionName}
</div> </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> <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline" @click="importTemplate">下载模板</el-link>
</div> </div>
</el-upload> </el-upload>


Loading…
取消
儲存