diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/ruoyi/js/zdxtUtil.js b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/ruoyi/js/zdxtUtil.js index aa9eeee4..b1d216df 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/ruoyi/js/zdxtUtil.js +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/ruoyi/js/zdxtUtil.js @@ -868,6 +868,47 @@ var table = { }); layer.full(index); }, + // 弹出层全屏 + openFullCutBtnName: function (title, url, width, height, leftBtnName) { + //如果是移动端,就使用自适应大小弹窗 + if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) { + width = 'auto'; + height = 'auto'; + } + if ($.common.isEmpty(title)) { + title = false; + } + if ($.common.isEmpty(url)) { + url = "/404.html"; + } + if ($.common.isEmpty(width)) { + width = 800; + } + if ($.common.isEmpty(height)) { + height = ($(window).height() - 50); + } + var index = layer.open({ + type: 2, + area: [width + 'px', height + 'px'], + fix: false, + //不固定 + maxmin: true, + shade: 0.3, + title: title, + content: url, + btn: [leftBtnName, '关闭'], + // 弹层外区域关闭 + shadeClose: true, + yes: function(index, layero) { + var iframeWin = layero.find('iframe')[0]; + iframeWin.contentWindow.submitHandler(index, layero); + }, + cancel: function(index) { + return true; + } + }); + layer.full(index); + }, // 弹出层全屏 openFullClose: function (title, url, width, height) { //如果是移动端,就使用自适应大小弹窗 diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/question/addNew.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/question/addNew.html index 71e336d2..49d95cb8 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/question/addNew.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/question/addNew.html @@ -274,11 +274,11 @@ function fileUploadCallBack(result) { var parent = window.parent; if (result.success) { - parent.$.modal.msgSuccess(result.message); + $.modal.msgSuccess(result.message); } else { $.modal.alertError(result.message); } - $.modal.close(); + // $.modal.close(); parent.$.table.refresh(); // $.modal.closeLoading(); // $.modal.msgReload(result.message, modal_status.SUCCESS); diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/role/view.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/role/view.html index 5955ffee..70f43f4d 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/role/view.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/role/view.html @@ -123,7 +123,7 @@ function question(id) { table.set(); - $.modal.openFull("", ctx + "small/project/role/bindNew/" + id); + $.modal.openFullCutBtnName("", ctx + "small/project/role/bindNew/" + id, null,null,"保存流程图"); } function reset() { diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneQuestionServiceImpl.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneQuestionServiceImpl.java index 29704b86..ed1c9642 100644 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneQuestionServiceImpl.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneQuestionServiceImpl.java @@ -108,6 +108,11 @@ public class SceneQuestionServiceImpl implements ISceneQuestionService { } String uploadFilePath = null; if (!ObjectUtil.isEmpty(files) && files.length == 1) { + long fileSize = files[0].getSize(); + int maxSize = 10 * 1024 * 1024; + if (fileSize > maxSize) { + return ZDResponse.error("不允许超过10MB"); + } uploadFilePath = fileUploadApi.upload(files[0]); } UserBean userBean = userApi.getCurrentUser(); @@ -131,9 +136,9 @@ public class SceneQuestionServiceImpl implements ISceneQuestionService { if (result > 0 && !ObjectUtil.isEmpty(files)) { zdxtFileCommonApi.deleteZdxtFileByIds(sceneQuestion.getGuid()); zdxtFileCommonApi.insertZdxtFile(files[0], sceneQuestion.getGuid() + "", uploadFilePath); - return ZDResponse.success(); + return ZDResponse.success("更改成功,点击'保存流程图'生效"); } else if (result > 0) { - return ZDResponse.success(); + return ZDResponse.success("更改成功,点击'保存流程图'生效"); } return ZDResponse.error("失败"); }