diff --git a/src/main/resources/static/js/imageUpload/coordinatePhoto/child/coordinatePhotoForm.js b/src/main/resources/static/js/imageUpload/coordinatePhoto/child/coordinatePhotoForm.js index ce4b838..39ae3f2 100644 --- a/src/main/resources/static/js/imageUpload/coordinatePhoto/child/coordinatePhotoForm.js +++ b/src/main/resources/static/js/imageUpload/coordinatePhoto/child/coordinatePhotoForm.js @@ -14,7 +14,7 @@ let buildAfterImgList = []; // 恢复后照片 let CODE_1 = 0, CODE_2 = 0, CODE_3 = 0; -let files1,files2,files3; +let files1, files2, files3; let proId, proName, majorId, majorName, gxId, gxName; layui.use(['laydate', 'upload'], function () { @@ -195,17 +195,17 @@ layui.use(['laydate', 'upload'], function () { }); - window.removeImage1 = function (uniqueId,index) { + window.removeImage1 = function (uniqueId, index) { delete files1[index];//删除指定图片 $('#img-' + uniqueId).remove(); }; - window.removeImage2 = function (uniqueId,index) { + window.removeImage2 = function (uniqueId, index) { delete files2[index];//删除指定图片 $('#img-' + uniqueId).remove(); }; - window.removeImage3 = function (uniqueId,index) { + window.removeImage3 = function (uniqueId, index) { delete files3[index];//删除指定图片 $('#img-' + uniqueId).remove(); }; @@ -242,7 +242,7 @@ function setParams(params) { if (selectedId === '' || selectedId == '') { majorId = ''; majorName = ''; - }else { + } else { majorId = selectedId; majorName = selectedName; } @@ -258,7 +258,7 @@ function setParams(params) { if (selectedId === '' || selectedId == '') { gxId = ''; gxName = ''; - }else{ + } else { gxId = selectedId; gxName = selectedName; } @@ -379,7 +379,7 @@ function setFormData(data) { var sysFileResourceList = data.sysFileResourceList; if (sysFileResourceList && sysFileResourceList.length > 0) { - sysFileResourceList.forEach(function(photo) { + sysFileResourceList.forEach(function (photo) { if (photo.sourceType === "6") { buildBeforeImgList.push(photo); // 建设前 } else if (photo.sourceType === "7") { @@ -395,7 +395,7 @@ function setFormData(data) { for (var i = 0; i < buildBeforeImgList.length; i++) { let filePath = imgUrl + buildBeforeImgList[i].originalFilePath + "?token=" + tokens html = html + '
' + - '' + buildBeforeImgList[i].fileName + '' ; + '' + buildBeforeImgList[i].fileName + ''; if (details != 1) { html = html + ''; } @@ -410,7 +410,7 @@ function setFormData(data) { for (var i = 0; i < buildUnderImgList.length; i++) { let filePath = imgUrl + buildUnderImgList[i].originalFilePath + "?token=" + tokens html = html + '
' + - '' + buildUnderImgList[i].fileName + '' ; + '' + buildUnderImgList[i].fileName + ''; if (details != 1) { html = html + ''; } @@ -425,7 +425,7 @@ function setFormData(data) { for (var i = 0; i < buildAfterImgList.length; i++) { let filePath = imgUrl + buildAfterImgList[i].originalFilePath + "?token=" + tokens html = html + '
' + - '' + buildAfterImgList[i].fileName + '' ; + '' + buildAfterImgList[i].fileName + ''; if (details != 1) { html = html + ''; } @@ -435,7 +435,7 @@ function setFormData(data) { } } - if(details == 1){ + if (details == 1) { document.querySelector('.layui-btn.save').style.display = 'none'; document.getElementById("test1").style.display = 'none'; document.getElementById("test2").style.display = 'none'; @@ -475,57 +475,61 @@ function saveData2() { // 保存数据 function saveData(data) { - if (CODE_1 != 0) { - $("#hideUpload1").trigger("click"); - } - if (CODE_2 != 0) { - $("#hideUpload2").trigger("click"); - } - if (CODE_3 != 0) { - $("#hideUpload3").trigger("click"); - } - let loadingMsg = layer.msg('数据上传中,请稍候...', {icon: 16, scrollbar: false, time: 0}); - let url = dataUrl + "/coordinatePhoto/addCoordinatePhoto"; - data.field.uploadType = "4"; - data.field.dataSource = 1; + setTimeout(() => { + if (CODE_1 != 0) { + $("#hideUpload1").trigger("click"); + } + if (CODE_2 != 0) { + $("#hideUpload2").trigger("click"); + } + if (CODE_3 != 0) { + $("#hideUpload3").trigger("click"); + } - data.field.sysFileResourceList = [...buildBeforeImgList, ...buildUnderImgList,...buildAfterImgList]; + let url = dataUrl + "/coordinatePhoto/addCoordinatePhoto"; + data.field.uploadType = "4"; + data.field.dataSource = 1; - data.field.proId = proId; - data.field.proName = proName; - data.field.majorId = majorId; - data.field.majorName = majorName; - data.field.gxId = gxId; - data.field.gxName = gxName; - console.log("data:", data) - let params = data.field; - if (params.id != "") { - url = dataUrl + "/coordinatePhoto/updateCoordinatePhoto"; - } - console.log("params:", params) - params = { - encryptedData: encryptCBC(JSON.stringify(params)) - } - ajaxRequest(url, "POST", params, true, function () { - $('.save').addClass("layui-btn-disabled").attr("disabled", true); - $('.cancel').addClass("layui-btn-disabled").attr("disabled", true); - }, function (result) { - layer.close(loadingMsg); // 关闭提示层 - if (result.code === 200) { - closePage(1); - parent.layer.msg(result.msg, {icon: 1}); - } else { - layer.alert(result.msg, {icon: 2}) + data.field.sysFileResourceList = [...buildBeforeImgList, ...buildUnderImgList, ...buildAfterImgList]; + + data.field.proId = proId; + data.field.proName = proName; + data.field.majorId = majorId; + data.field.majorName = majorName; + data.field.gxId = gxId; + data.field.gxName = gxName; + console.log("data:", data) + let params = data.field; + if (params.id != "") { + url = dataUrl + "/coordinatePhoto/updateCoordinatePhoto"; + } + console.log("params:", params) + params = { + encryptedData: encryptCBC(JSON.stringify(params)) + } + ajaxRequest(url, "POST", params, true, function () { + $('.save').addClass("layui-btn-disabled").attr("disabled", true); + $('.cancel').addClass("layui-btn-disabled").attr("disabled", true); + }, function (result) { + layer.close(loadingMsg); // 关闭提示层 + if (result.code === 200) { + closePage(1); + parent.layer.msg(result.msg, {icon: 1}); + } else { + layer.alert(result.msg, {icon: 2}) + $('.save').removeClass("layui-btn-disabled").attr("disabled", false); + $('.cancel').removeClass("layui-btn-disabled").attr("disabled", false); + } + }, function (xhr) { + layer.close(loadingMsg); // 关闭提示层 $('.save').removeClass("layui-btn-disabled").attr("disabled", false); $('.cancel').removeClass("layui-btn-disabled").attr("disabled", false); - } - }, function (xhr) { - layer.close(loadingMsg); // 关闭提示层 - $('.save').removeClass("layui-btn-disabled").attr("disabled", false); - $('.cancel').removeClass("layui-btn-disabled").attr("disabled", false); - error(xhr) - }); + error(xhr) + }); + }, 100) + + } // 关闭页面