From a782cc6c0f05a2044c57c44d3321b21fa6e13a2e Mon Sep 17 00:00:00 2001 From: zhoulingpo Date: Mon, 31 Jul 2023 15:54:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/jero/JModal/JModal.vue | 4 +- jero-web/src/mixins/JeroListMixin.js | 135 ++++++++++-------- jero-web/src/views/demo/JeroDemoList.vue | 2 +- .../views/modules/message/SysMessageList.vue | 2 +- .../message/SysMessageTemplateList.vue | 2 +- jero-web/src/views/system/DepartList.vue | 4 +- jero-web/src/views/system/DepartListSync.vue | 4 +- jero-web/src/views/system/DictList.vue | 2 +- jero-web/src/views/system/QuartzJobList.vue | 2 +- jero-web/src/views/system/SysCategoryList.vue | 2 +- .../src/views/system/SysCheckRuleList.vue | 2 +- .../src/views/system/SysDataSourceList.vue | 2 +- jero-web/src/views/system/SysFillRuleList.vue | 2 +- jero-web/src/views/system/UserList.vue | 2 +- .../src/views/system/log/OperatorLogList.vue | 6 + .../src/views/system/modules/DepartModal.vue | 10 +- .../src/views/system/modules/DeptBaseInfo.vue | 2 +- .../views/system/modules/PasswordModal.vue | 14 +- .../views/system/modules/PermissionModal.vue | 2 +- .../system/modules/SysAnnouncementModal.vue | 2 +- .../src/views/system/modules/UserModal.vue | 7 +- .../views/system/modules/UserRoleModal.vue | 6 +- 22 files changed, 127 insertions(+), 89 deletions(-) diff --git a/jero-web/src/components/jero/JModal/JModal.vue b/jero-web/src/components/jero/JModal/JModal.vue index 030eb12a..74e779ea 100644 --- a/jero-web/src/components/jero/JModal/JModal.vue +++ b/jero-web/src/components/jero/JModal/JModal.vue @@ -205,7 +205,9 @@ export default { } } } - + .ant-modal-body{ + height:500px !important; + } .j-modal-title-row { .left { width: calc(100% - 56px - 56px); diff --git a/jero-web/src/mixins/JeroListMixin.js b/jero-web/src/mixins/JeroListMixin.js index 052929a2..1b778597 100644 --- a/jero-web/src/mixins/JeroListMixin.js +++ b/jero-web/src/mixins/JeroListMixin.js @@ -15,6 +15,7 @@ let importModalLoading export const JeroListMixin = { data () { return { + uploading: false, /* 查询条件-请不要在queryParam中声明非字符串值的属性 */ queryParam: {}, /* 数据源 */ @@ -73,6 +74,7 @@ export const JeroListMixin = { } }, methods: { + loadData (arg) { if (!this.url.list) { this.$message.error('请设置url.list属性!') @@ -314,73 +316,90 @@ export const JeroListMixin = { modalLoading.destroy() }) }, + //导入前 + beforeUpload( file) { + // console.log(file,"jjjj") + if (file.size > 20 * 1024 * 1024) { + this.uploading = true + this.$message.warning('最大上传20M') + return false + } + this.uploading = false + return true + }, /* 导入 */ handleImportExcel (info) { // 加一个大的提示 - if (!this.loading) { - importModalLoading = this.$info({ - title: '提示', - content: 正在导入，请稍候 , - keyboard: false + if (!this.uploading) { + if (!this.loading) { + importModalLoading = this.$info({ + title: '提示', + content: 正在导入，请稍候 , + keyboard: false + }) + } + + + this.loading = true + // 把知道了这个按钮去掉 + this.$nextTick(() => { + document.getElementsByClassName('ant-modal-confirm-btns')[0].style = 'display:none' }) - } - this.loading = true - // 把知道了这个按钮去掉 - this.$nextTick(() => { - document.getElementsByClassName('ant-modal-confirm-btns')[0].style = 'display:none' - }) - if (info.file.status !== 'uploading') { - console.log(info.file, info.fileList) - } - if (info.file.status === 'done') { - // 销毁这个提示 - importModalLoading && importModalLoading.destroy() - this.loading = false - if (info.file.response.success) { - // this.$message.success(`${info.file.name} 文件上传成功`); - if (info.file.response.code === 201) { - const { message, result: { msg, fileUrl, fileName } } = info.file.response - const href = window._CONFIG.domianURL + fileUrl - this.$warning({ - title: message, - content: (
- {msg}
- 具体详情请 点击下载 -
- ) - }) + if (info.file.status !== 'uploading') { + console.log(info.file, info.fileList) + } + if (info.file.status === 'done') { + // 销毁这个提示 + importModalLoading && importModalLoading.destroy() + this.loading = false + if (info.file.response.success) { + // this.$message.success(`${info.file.name} 文件上传成功`); + if (info.file.response.code === 201) { + const { message, result: { msg, fileUrl, fileName } } = info.file.response + const href = window._CONFIG.domianURL + fileUrl + this.$warning({ + title: message, + content: (
+ {msg}
+ 具体详情请 点击下载 +
+ ) + }) + } else { + this.$message.success(info.file.response.message || `${info.file.name} 文件上传成功`) + } + this.loadData() } else { - this.$message.success(info.file.response.message || `${info.file.name} 文件上传成功`) + this.$message.error(`${info.file.name} ${info.file.response.message}.`) } - this.loadData() - } else { - this.$message.error(`${info.file.name} ${info.file.response.message}.`) - } - } else if (info.file.status === 'error') { - // 销毁这个提示 - importModalLoading && importModalLoading.destroy() - this.loading = false - if (info.file.response.status === 500) { - const data = info.file.response - const token = Vue.ls.get(ACCESS_TOKEN) - if (token && data.message.includes('Token失效')) { - this.error({ - title: '登录已过期', - content: '很抱歉，登录已过期，请重新登录', - okText: '重新登录', - mask: false, - onOk: () => { - store.dispatch('Logout').then(() => { - Vue.ls.remove(ACCESS_TOKEN) - window.location.reload() - }) - } - }) + } else if (info.file.status === 'error') { + // 销毁这个提示 + importModalLoading && importModalLoading.destroy() + this.loading = false + + if (info.file.response.status === 500) { + const data = info.file.response + const token = Vue.ls.get(ACCESS_TOKEN) + if (token && data.message.includes('Token失效')) { + this.error({ + title: '登录已过期', + content: '很抱歉，登录已过期，请重新登录', + okText: '重新登录', + mask: false, + onOk: () => { + store.dispatch('Logout').then(() => { + Vue.ls.remove(ACCESS_TOKEN) + window.location.reload() + }) + } + }) + } + } else { + this.$message.error(`文件上传失败: ${info.file.msg} `) } - } else { - this.$message.error(`文件上传失败: ${info.file.msg} `) } } + }, /* 图片预览 */ getImgView (text) { diff --git a/jero-web/src/views/demo/JeroDemoList.vue b/jero-web/src/views/demo/JeroDemoList.vue index f82e7b12..a5909e9a 100644 --- a/jero-web/src/views/demo/JeroDemoList.vue +++ b/jero-web/src/views/demo/JeroDemoList.vue @@ -58,7 +58,7 @@ 新增 一对多 导出 - + 导入 diff --git a/jero-web/src/views/modules/message/SysMessageList.vue b/jero-web/src/views/modules/message/SysMessageList.vue index 94a66833..96108457 100644 --- a/jero-web/src/views/modules/message/SysMessageList.vue +++ b/jero-web/src/views/modules/message/SysMessageList.vue @@ -42,7 +42,7 @@ 新增 导出 + @change="handleImportExcel" :before-upload='beforeUpload'> 导入 diff --git a/jero-web/src/views/modules/message/SysMessageTemplateList.vue b/jero-web/src/views/modules/message/SysMessageTemplateList.vue index a74b23c4..17c314c4 100644 --- a/jero-web/src/views/modules/message/SysMessageTemplateList.vue +++ b/jero-web/src/views/modules/message/SysMessageTemplateList.vue @@ -43,7 +43,7 @@ 新增 导出 + @change="handleImportExcel" :before-upload='beforeUpload'> 导入 diff --git a/jero-web/src/views/system/DepartList.vue b/jero-web/src/views/system/DepartList.vue index b30ef20b..526c20ee 100644 --- a/jero-web/src/views/system/DepartList.vue +++ b/jero-web/src/views/system/DepartList.vue @@ -8,7 +8,7 @@ 添加部门 添加下级 导出 - + 导入 批量删除 @@ -111,7 +111,7 @@ - + diff --git a/jero-web/src/views/system/DepartListSync.vue b/jero-web/src/views/system/DepartListSync.vue index 45170032..50b5aeed 100644 --- a/jero-web/src/views/system/DepartListSync.vue +++ b/jero-web/src/views/system/DepartListSync.vue @@ -8,7 +8,7 @@ 添加部门 添加下级 导出 - + 导入 @@ -105,7 +105,7 @@ - + diff --git a/jero-web/src/views/system/DictList.vue b/jero-web/src/views/system/DictList.vue index 5e7e6801..603a3972 100644 --- a/jero-web/src/views/system/DictList.vue +++ b/jero-web/src/views/system/DictList.vue @@ -27,7 +27,7 @@
添加 导出 - + 导入 刷新缓存 diff --git a/jero-web/src/views/system/QuartzJobList.vue b/jero-web/src/views/system/QuartzJobList.vue index 8201ab05..cc4d7025 100644 --- a/jero-web/src/views/system/QuartzJobList.vue +++ b/jero-web/src/views/system/QuartzJobList.vue @@ -36,7 +36,7 @@
新增 导出 - + 导入 diff --git a/jero-web/src/views/system/SysCategoryList.vue b/jero-web/src/views/system/SysCategoryList.vue index 2b639074..874e2423 100644 --- a/jero-web/src/views/system/SysCategoryList.vue +++ b/jero-web/src/views/system/SysCategoryList.vue @@ -5,7 +5,7 @@
新增 导出 - + 导入 diff --git a/jero-web/src/views/system/SysCheckRuleList.vue b/jero-web/src/views/system/SysCheckRuleList.vue index 92352f85..363a8f48 100644 --- a/jero-web/src/views/system/SysCheckRuleList.vue +++ b/jero-web/src/views/system/SysCheckRuleList.vue @@ -37,7 +37,7 @@
新增 导出 - + 导入 diff --git a/jero-web/src/views/system/SysDataSourceList.vue b/jero-web/src/views/system/SysDataSourceList.vue index c2779b02..4ae522d5 100644 --- a/jero-web/src/views/system/SysDataSourceList.vue +++ b/jero-web/src/views/system/SysDataSourceList.vue @@ -33,7 +33,7 @@
新增 导出 - + 导入 diff --git a/jero-web/src/views/system/SysFillRuleList.vue b/jero-web/src/views/system/SysFillRuleList.vue index 5b29106f..865d0c2d 100644 --- a/jero-web/src/views/system/SysFillRuleList.vue +++ b/jero-web/src/views/system/SysFillRuleList.vue @@ -29,7 +29,7 @@
新增 导出 - + 导入 diff --git a/jero-web/src/views/system/UserList.vue b/jero-web/src/views/system/UserList.vue index 91efdebe..23d628b3 100644 --- a/jero-web/src/views/system/UserList.vue +++ b/jero-web/src/views/system/UserList.vue @@ -91,7 +91,7 @@
添加用户 导出 - + 导入 回收站 diff --git a/jero-web/src/views/system/log/OperatorLogList.vue b/jero-web/src/views/system/log/OperatorLogList.vue index 968a1523..cce9bdaf 100644 --- a/jero-web/src/views/system/log/OperatorLogList.vue +++ b/jero-web/src/views/system/log/OperatorLogList.vue @@ -137,6 +137,12 @@ export default { dataIndex: 'createTime', align: 'center', sorter: true + }, + { + title: '操作类型', + dataIndex: 'operateType_dictText', + align: 'center' + } ], operateColumn: diff --git a/jero-web/src/views/system/modules/DepartModal.vue b/jero-web/src/views/system/modules/DepartModal.vue index 76e5650f..f3ce3676 100644 --- a/jero-web/src/views/system/modules/DepartModal.vue +++ b/jero-web/src/views/system/modules/DepartModal.vue @@ -19,7 +19,7 @@ prop="departName" :hidden="false" :hasFeedback="true" > - + - + - + - + - + diff --git a/jero-web/src/views/system/modules/DeptBaseInfo.vue b/jero-web/src/views/system/modules/DeptBaseInfo.vue index 7d92ad76..511ceab7 100644 --- a/jero-web/src/views/system/modules/DeptBaseInfo.vue +++ b/jero-web/src/views/system/modules/DeptBaseInfo.vue @@ -43,7 +43,7 @@ :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序"> - + - + + + + + - + + + + + @@ -36,6 +44,8 @@ export default { name: 'PasswordModal', data () { return { + passwordType2: 'password', + passwordType: 'password', visible: false, confirmLoading: false, confirmDirty: false, diff --git a/jero-web/src/views/system/modules/PermissionModal.vue b/jero-web/src/views/system/modules/PermissionModal.vue index a4502a7b..8045c36a 100644 --- a/jero-web/src/views/system/modules/PermissionModal.vue +++ b/jero-web/src/views/system/modules/PermissionModal.vue @@ -114,7 +114,7 @@ :wrapperCol="wrapperCol" prop="sortNo" label="排序"> - + - + diff --git a/jero-web/src/views/system/modules/UserModal.vue b/jero-web/src/views/system/modules/UserModal.vue index dcbfe05f..4e841394 100644 --- a/jero-web/src/views/system/modules/UserModal.vue +++ b/jero-web/src/views/system/modules/UserModal.vue @@ -126,9 +126,10 @@
- - 取消 - +
+ + 取消 + 提交
diff --git a/jero-web/src/views/system/modules/UserRoleModal.vue b/jero-web/src/views/system/modules/UserRoleModal.vue index f1eed2b6..555c45b9 100644 --- a/jero-web/src/views/system/modules/UserRoleModal.vue +++ b/jero-web/src/views/system/modules/UserRoleModal.vue @@ -42,9 +42,9 @@ 树操作 - - 取消 - + + 取消 + 仅保存 保存并关闭