样式修改

This commit is contained in:
lSun 2025-04-18 14:02:29 +08:00
parent f6458a209e
commit d81bd22bd6
5 changed files with 155 additions and 98 deletions

View File

@ -196,21 +196,21 @@ function delData(id) {
move: false
}, function () {
let loadingMsg = layer.msg('数据删除中,请稍候...', {icon: 16, scrollbar: false, time: 0});
let url = dataUrl + "/imgUpload/safetyViolation/delSafetyViolationById";
let url = dataUrl + "/coordinatePhoto/deleteCoordinatePhoto";
let params = {
'id': id
}
params={
encryptedData:encryptCBC(JSON.stringify(params))
}
ajaxRequest(url, "DELETE", params, true, function () {
ajaxRequest(url, "POST", params, true, function () {
}, function (result) {
layer.close(loadingMsg); // 关闭提示层
if (result.code === 200) {
parent.layer.msg(result.msg, {icon: 1})
if (result.status === 200) {
parent.layer.msg("删除成功", {icon: 1})
query()
} else if (result.code === 500) {
layer.alert(result.msg, {icon: 2})
} else if (result.status === 500) {
layer.alert("删除失败", {icon: 2})
}
}, function (xhr) {
layer.close(loadingMsg); // 关闭提示层

View File

@ -14,6 +14,8 @@ let CODE_1 = 0;
let files1;
let proId, proName, majorId, majorName, gxId, gxName;
let formData;
layui.use(['laydate', 'upload'], function () {
var upload = layui.upload;
var layer = layui.layer;
@ -70,7 +72,7 @@ layui.use(['laydate', 'upload'], function () {
}
},
allDone: function (res, index, upload) {
saveData(formData);
},
error: function (e) {
//请求异常回调
@ -78,7 +80,7 @@ layui.use(['laydate', 'upload'], function () {
}
});
window.removeImage1 = function (uniqueId) {
window.removeImage1 = function (uniqueId,index) {
delete files1[index];//删除指定图片
$('#img-' + uniqueId).remove();
};
@ -117,10 +119,10 @@ function setParams(params) {
form.on('select(majorId)', function (data) {
const selectedId = data.value; // 获取选中项的 value 值
const selectedName = $(data.elem).find("option:selected").text(); // 获取选中项的文本
if(selectedId === '' || selectedId == '' ){
if (selectedId === '' || selectedId == '') {
majorId = '';
majorName = '';
}else{
} else {
majorId = selectedId;
majorName = selectedName;
}
@ -133,10 +135,10 @@ function setParams(params) {
form.on('select(gxId)', function (data) {
const selectedId = data.value; // 获取选中项的 value 值
const selectedName = $(data.elem).find("option:selected").text(); // 获取选中项的文本
if(selectedId === ''){
if (selectedId === '') {
gxId = '';
gxName = '';
}else{
} else {
gxId = selectedId;
gxName = selectedName;
}
@ -145,7 +147,9 @@ function setParams(params) {
form.render();//重新渲染页面checkbox控件
form.on('submit(formData)', function (data) {
data.field.id = $('#id').val();
saveData(data);
//先调用上传图片接口
formData = data;
uploadPhoto()
});
});
@ -262,7 +266,7 @@ function setFormData(data) {
for (var i = 0; i < vioPhotoListEdit.length; i++) {
let filePath = imgUrl + vioPhotoListEdit[i].originalFilePath + "?token=" + tokens
html = html + '<div id="img-' + vioPhotoListEdit[i].id + '" style="display: inline-block; position: relative; margin: 5px 5px">' +
'<img src="' + filePath + '" alt="' +vioPhotoListEdit[i].fileName + '" style="width: 90px; height: 90px;">' ;
'<img src="' + filePath + '" alt="' + vioPhotoListEdit[i].fileName + '" style="width: 90px; height: 90px;">';
if (details != 1) {
html = html + '<button class="layui-btn layui-btn-xs layui-btn-danger" style="position: absolute; top: 0; right: 0;" onclick="removeImageUpdate(\'' + vioPhotoListEdit[i].id + '\')">删除</button>';
}
@ -271,7 +275,7 @@ function setFormData(data) {
demo1.append(html);
}
if(details == 1){
if (details == 1) {
document.querySelector('.layui-btn.save').style.display = 'none';
document.getElementById("test1").style.display = 'none';
}
@ -284,23 +288,46 @@ function removeImageUpdate(uniqueId) {
$('#img-' + uniqueId).remove();
uniqueId = parseInt(uniqueId, 10); // 转换为数字类型
vrImgList = vrImgList.filter(item => item.id !== uniqueId);
console.log("importantMatter",vrImgList)
console.log("importantMatter", vrImgList)
}
function saveData2() {
$('#formSubmit').trigger('click')
}
// 保存数据
function saveData(data) {
if(idParam =="" || idParam == null || idParam == undefined){
let loadingMsg;
function uploadPhoto() {
if (idParam == "" || idParam == null || idParam == undefined) {
if (CODE_1 == 0) {
layer.msg("请上传现场照片", {icon: 2, time: 2000});
layer.msg("请上传照片", {icon: 2, time: 2000});
return "";
}
let length = $('#demo1 img').length;
if (length < 1) {
layer.msg("请上传照片", {icon: 2, time: 2000});
return "";
}
} else {
let length = $('#demo1 img').length;
if (length < 1) {
layer.msg("请上传照片", {icon: 2, time: 2000});
return "";
}
}
$("#hideUpload1").trigger("click");
let loadingMsg = layer.msg('数据上传中,请稍候...', {icon: 16, scrollbar: false, time: 0});
loadingMsg = layer.msg('数据上传中,请稍候...', {icon: 16, scrollbar: false, time: 0})
setTimeout(() => {
if (CODE_1 == 1) {
$("#hideUpload1").trigger("click");
} else {
saveData(formData)
}
}, 100)
}
// 保存数据
function saveData(data) {
let url = dataUrl + "/importantMatter/addImportantMatter";
data.field.uploadType = "5";
data.field.dataSource = 1;

View File

@ -14,7 +14,7 @@ let correctionImgList = []; // 整改照片
const deleteFileList = [];// 删除照片
let CODE_1 = 0, CODE_2 = 0;
let files1,files2;
let files1, files2;
let proId, proName, majorId, majorName, gxId, gxName;
@ -80,10 +80,10 @@ layui.use(['laydate', 'upload'], function () {
}
},
allDone: function(obj){
allDone: function (obj) {
if (CODE_2 != 0) {
$("#hideUpload2").trigger("click");
}else{
} else {
saveData(formData);
}
},
@ -136,7 +136,7 @@ layui.use(['laydate', 'upload'], function () {
}
},
allDone: function(obj){
allDone: function (obj) {
saveData(formData);
},
@ -146,12 +146,12 @@ 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();
};
@ -159,19 +159,19 @@ layui.use(['laydate', 'upload'], function () {
laydate = layui.laydate;
laydate.render({
elem: '#vioDate',
done: function(value, date) {
done: function (value, date) {
validateDates();
}
});
laydate.render({
elem: '#rectDate',
done: function(value, date) {
done: function (value, date) {
validateDates();
}
});
laydate.render({
elem: '#rectTime',
done: function(value, date) {
done: function (value, date) {
validateDates();
}
});
@ -228,10 +228,10 @@ function setParams(params) {
form.on('select(majorId)', function (data) {
const selectedId = data.value; // 获取选中项的 value 值
const selectedName = $(data.elem).find("option:selected").text(); // 获取选中项的文本
if(selectedId === '' || selectedId == '' ){
if (selectedId === '' || selectedId == '') {
majorId = '';
majorName = '';
}else{
} else {
majorId = selectedId;
majorName = selectedName;
}
@ -244,10 +244,10 @@ function setParams(params) {
form.on('select(gxId)', function (data) {
const selectedId = data.value; // 获取选中项的 value 值
const selectedName = $(data.elem).find("option:selected").text(); // 获取选中项的文本
if(selectedId === '' || selectedId == '' ){
if (selectedId === '' || selectedId == '') {
gxId = '';
gxName = '';
}else{
} else {
gxId = selectedId;
gxName = selectedName;
}
@ -375,7 +375,7 @@ function setFormData(data) {
for (var i = 0; i < vioPhotoListEdit.length; i++) {
let filePath = imgUrl + data.vioPhotoList[i].originalFilePath + "?token=" + tokens
html = html + '<div id="imga-' + i + '" style="display: inline-block; position: relative; margin: 5px 5px">' +
'<img src="' + filePath + '" alt="' + data.vioPhotoList[i].fileName + '" style="width: 90px; height: 90px;">' ;
'<img src="' + filePath + '" alt="' + data.vioPhotoList[i].fileName + '" style="width: 90px; height: 90px;">';
if (details != 1) {
html = html + '<button class="layui-btn layui-btn-xs layui-btn-danger" style="position: absolute; top: 0; right: 0;" onclick="removeImageUpdate1(\'' + i + '\',\'' + data.vioPhotoList[i].id + '\')">删除</button>';
}
@ -405,7 +405,7 @@ function setFormData(data) {
$('#rectTime').val(data.rectTime)
$('#rectDesc').val(data.rectDesc)
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';
@ -417,13 +417,13 @@ function setFormData(data) {
function removeImageUpdate1(uniqueId, id) {
$('#imga-' + uniqueId).remove();
let ids = {"id":id}
let ids = {"id": id}
deleteFileList.push(ids)
};
function removeImageUpdate2(uniqueId, id) {
$('#imgb-' + uniqueId).remove();
let ids = {"id":id}
let ids = {"id": id}
deleteFileList.push(ids)
};
@ -432,42 +432,44 @@ function saveData2() {
}
let loadingMsgNewS = "";
function uploadPhoto(){
function uploadPhoto() {
vrImgList = []; // 违章照片
correctionImgList = []; // 整改照片
if(idParam =="" || idParam == null || idParam == undefined){
if (idParam == "" || idParam == null || idParam == undefined) {
if (CODE_1 == 0) {
layer.msg("请上传缺陷问题照片", {icon: 2, time: 2000});
return "";
}
let length = $('#demo1 img').length;
if(length <1){
if (length < 1) {
layer.msg("请上传缺陷问题照片", {icon: 2, time: 2000});
return "";
}
}else{
} else {
let length = $('#demo1 img').length;
if(length <1){
if (length < 1) {
layer.msg("请上传缺陷问题照片", {icon: 2, time: 2000});
return "";
}
}
loadingMsgNewS = layer.msg('数据上传中,请稍候...', {icon: 16, scrollbar: false, time: 0})
if(CODE_1==1){
$("#hideUpload1").trigger("click");
}else{
if (CODE_2 != 0) {
$("#hideUpload2").trigger("click");
}else{
saveData(formData)
setTimeout(() => {
if (CODE_1 == 1) {
$("#hideUpload1").trigger("click");
} else {
if (CODE_2 != 0) {
$("#hideUpload2").trigger("click");
} else {
saveData(formData)
}
}
}
}, 100)
}
// 保存数据
function saveData(data) {
console.log(loadingMsgNewS)
let url = dataUrl + "/imgUpload/qualityInspection/insertQualityInspection";
data.field.uploadType = "2";
data.field.dataSource = 1;
@ -475,21 +477,21 @@ function saveData(data) {
data.field.fileList = [...vrImgList, ...correctionImgList];
let rectTime = $("#rectTime").val()
if (correctionImgList.length > 0) {
if(rectTime == ""){
if (rectTime == "") {
layer.msg("请填写整改时间", {icon: 2, time: 2000});
return "";
}
data.field.rectStatus = 1;
} else {
//获取当前日期进行判断
//获取当前日期进行判断
let currentDate = getCurrentDate();
if(rectTime == ""){
if (rectTime == "") {
data.field.rectStatus = 0;
}else{
} else {
// 判断整改时间是否早于当前日期
if (new Date(rectTime) < new Date(currentDate)) {
data.field.rectStatus = 0;
}else{
} else {
data.field.rectStatus = 2;
}
}

View File

@ -14,6 +14,8 @@ let CODE_1 = 0;
let files1;
let proId, proName, majorId, majorName, gxId, gxName;
let formData;
layui.use(['laydate', 'upload'], function () {
var upload = layui.upload;
var layer = layui.layer;
@ -70,7 +72,7 @@ layui.use(['laydate', 'upload'], function () {
}
},
allDone: function (res, index, upload) {
saveData(formData);
},
error: function (e) {
//请求异常回调
@ -145,7 +147,9 @@ function setParams(params) {
form.render();//重新渲染页面checkbox控件
form.on('submit(formData)', function (data) {
data.field.id = $('#id').val();
saveData(data);
//先调用上传图片接口
formData = data;
uploadPhoto()
});
});
@ -293,17 +297,38 @@ function saveData2() {
$('#formSubmit').trigger('click')
}
// 保存数据
function saveData(data) {
let loadingMsg ;
function uploadPhoto(){
if(idParam =="" || idParam == null || idParam == undefined){
if (CODE_1 == 0) {
layer.msg("请上传现场照片", {icon: 2, time: 2000});
return "";
}
let length = $('#demo1 img').length;
if(length <1){
layer.msg("请上传现场照片", {icon: 2, time: 2000});
return "";
}
}else{
let length = $('#demo1 img').length;
if(length <1){
layer.msg("请上传现场照片", {icon: 2, time: 2000});
return "";
}
}
$("#hideUpload1").trigger("click");
loadingMsg = layer.msg('数据上传中,请稍候...', {icon: 16, scrollbar: false, time: 0})
setTimeout(() => {
if (CODE_1 == 1) {
$("#hideUpload1").trigger("click")
} else {
saveData(formData)
}
}, 100)
let loadingMsg = layer.msg('数据上传中,请稍候...', {icon: 16, scrollbar: false, time: 0});
}
// 保存数据
function saveData(data) {
let url = dataUrl + "/safetyMeasure/addSafetyMeasures";
data.field.uploadType = "3";
data.field.dataSource = 1;

View File

@ -14,7 +14,7 @@ let correctionImgList = []; // 整改照片
const deleteFileList = [];// 删除照片
let CODE_1 = 0, CODE_2 = 0;
let files1,files2;
let files1, files2;
let proId, proName, majorId, majorName, gxId, gxName;
@ -80,10 +80,10 @@ layui.use(['laydate', 'upload'], function () {
}
},
allDone: function(obj){
allDone: function (obj) {
if (CODE_2 != 0) {
$("#hideUpload2").trigger("click");
}else{
} else {
saveData(formData);
}
},
@ -136,7 +136,7 @@ layui.use(['laydate', 'upload'], function () {
}
},
allDone: function(obj){
allDone: function (obj) {
saveData(formData);
},
@ -146,12 +146,12 @@ 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();
};
@ -159,19 +159,19 @@ layui.use(['laydate', 'upload'], function () {
laydate = layui.laydate;
laydate.render({
elem: '#vioDate',
done: function(value, date) {
done: function (value, date) {
validateDates();
}
});
laydate.render({
elem: '#rectDate',
done: function(value, date) {
done: function (value, date) {
validateDates();
}
});
laydate.render({
elem: '#rectTime',
done: function(value, date) {
done: function (value, date) {
validateDates();
}
});
@ -228,10 +228,10 @@ function setParams(params) {
form.on('select(majorId)', function (data) {
const selectedId = data.value; // 获取选中项的 value 值
const selectedName = $(data.elem).find("option:selected").text(); // 获取选中项的文本
if(selectedId === '' || selectedId == '' ){
if (selectedId === '' || selectedId == '') {
majorId = '';
majorName = '';
}else{
} else {
majorId = selectedId;
majorName = selectedName;
}
@ -244,10 +244,10 @@ function setParams(params) {
form.on('select(gxId)', function (data) {
const selectedId = data.value; // 获取选中项的 value 值
const selectedName = $(data.elem).find("option:selected").text(); // 获取选中项的文本
if(selectedId === '' || selectedId == '' ){
if (selectedId === '' || selectedId == '') {
gxId = '';
gxName = '';
}else{
} else {
gxId = selectedId;
gxName = selectedName;
}
@ -375,7 +375,7 @@ function setFormData(data) {
for (var i = 0; i < vioPhotoListEdit.length; i++) {
let filePath = imgUrl + data.vioPhotoList[i].originalFilePath + "?token=" + tokens
html = html + '<div id="imga-' + i + '" style="display: inline-block; position: relative; margin: 5px 5px">' +
'<img src="' + filePath + '" alt="' + data.vioPhotoList[i].fileName + '" style="width: 90px; height: 90px;">' ;
'<img src="' + filePath + '" alt="' + data.vioPhotoList[i].fileName + '" style="width: 90px; height: 90px;">';
if (details != 1) {
html = html + '<button class="layui-btn layui-btn-xs layui-btn-danger" style="position: absolute; top: 0; right: 0;" onclick="removeImageUpdate1(\'' + i + '\',\'' + data.vioPhotoList[i].id + '\')">删除</button>';
}
@ -405,7 +405,7 @@ function setFormData(data) {
$('#rectTime').val(data.rectTime)
$('#rectDesc').val(data.rectDesc)
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';
@ -417,13 +417,13 @@ function setFormData(data) {
function removeImageUpdate1(uniqueId, id) {
$('#imga-' + uniqueId).remove();
let ids = {"id":id}
let ids = {"id": id}
deleteFileList.push(ids)
};
function removeImageUpdate2(uniqueId, id) {
$('#imgb-' + uniqueId).remove();
let ids = {"id":id}
let ids = {"id": id}
deleteFileList.push(ids)
};
@ -432,37 +432,40 @@ function saveData2() {
}
let loadingMsgNew = "";
function uploadPhoto(){
function uploadPhoto() {
vrImgList = []; // 违章照片
correctionImgList = []; // 整改照片
if(idParam =="" || idParam == null || idParam == undefined){
if (idParam == "" || idParam == null || idParam == undefined) {
if (CODE_1 == 0) {
layer.msg("请上传违章照片", {icon: 2, time: 2000});
return "";
}
let length = $('#demo1 img').length;
if(length <1){
if (length < 1) {
layer.msg("请上传违章照片", {icon: 2, time: 2000});
return "";
}
}else{
} else {
let length = $('#demo1 img').length;
if(length <1){
if (length < 1) {
layer.msg("请上传违章照片", {icon: 2, time: 2000});
return "";
}
}
loadingMsgNew = layer.msg('数据上传中,请稍候...', {icon: 16, scrollbar: false, time: 0})
if(CODE_1==1){
$("#hideUpload1").trigger("click");
}else{
if (CODE_2 != 0) {
$("#hideUpload2").trigger("click");
}else{
saveData(formData)
setTimeout(() => {
if (CODE_1 == 1) {
$("#hideUpload1").trigger("click");
} else {
if (CODE_2 != 0) {
$("#hideUpload2").trigger("click");
} else {
saveData(formData)
}
}
}
}, 100)
}
@ -475,7 +478,7 @@ function saveData(data) {
data.field.fileList = [...vrImgList, ...correctionImgList];
let rectTime = $("#rectTime").val()
if (correctionImgList.length > 0) {
if(rectTime == ""){
if (rectTime == "") {
layer.msg("请填写整改时间", {icon: 2, time: 2000});
return "";
}
@ -483,13 +486,13 @@ function saveData(data) {
} else {
//获取当前日期进行判断
let currentDate = getCurrentDate();
if(rectTime == ""){
if (rectTime == "") {
data.field.rectStatus = 0;
}else{
} else {
// 判断整改时间是否早于当前日期
if (new Date(rectTime) < new Date(currentDate)) {
data.field.rectStatus = 0;
}else{
} else {
data.field.rectStatus = 2;
}
}