haozq
/
yn_hxy_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://192.168.0.56:3000/haozq/yn_hxy_web into main

This commit is contained in:
pengyb 2024-08-21 21:22:45 +08:00
parent e0e41f37f9 82e9c09d62
commit 37b5bb0561
7 changed files with 128 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hxy-web/js/dataStatistics/viewPlan/monthPlanAudit.js
View File

@ -252,5 +252,14 @@ function noPass() {
var myIframe = window[layero.find('iframe')[0]['name']];
var fnc = myIframe.setData(yjIds, insMonths, ids); //aaa()为子页面的方法
},
end: function(){
var noPass = localStorage.getItem("noPass");
if(noPass =="1"){
parent.layer.msg("添加成功", { icon: 1 });
var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引
parent.layer.close(index); //再执行关闭
window.parent.location.reload();
}
}
});
}

27
hxy-web/js/dataStatistics/viewPlan/noPassReason.js
View File

@ -19,7 +19,16 @@ function setData(yjId, insMonth, id) {
var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引
parent.layer.close(index); //再执行关闭
});
$("#searchBt").click(function() {
// 验证成功后才会执行下面的操作
form.on('submit(formDemo)', function (data) {
addData();
});
});
}
function addData(){
localStorage.setItem("noPass","1");
// 加载提示
let loadingMsg = layer.msg('数据上传中,请稍候...', {
icon: 16,
@ -39,19 +48,17 @@ function setData(yjId, insMonth, id) {
"insMonth": insMonths,
"yjId": yjIds,
"id": ids,
"auditStatus": 2,
"auditStatus": 4,
"auditReason":revokeReason
}),
success: function(data) {
layer.close(loadingMsg); // 关闭提示层
if (data.code == 200) {
parent.layer.msg("审核成功", {
icon: 1
});
var index = parent.layer.getFrameIndex(window
.name); //先得到当前 iframe层的索引
parent.layer.msg("添加成功", { icon: 1 });
var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引
parent.layer.close(index); //再执行关闭
reloading();
// reloading();
localStorage.setItem("noPass","1");
} else {
layer.alert(data.msg);
}
@ -64,13 +71,9 @@ function setData(yjId, insMonth, id) {
});
}
});
});
});
}
//设置弹窗关闭
function reloading() {
var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引

14
hxy-web/js/dataStatistics/viewPlan/viewPlanList.js
View File

@ -21,9 +21,10 @@ function queryClick() {
let yjName = $('#yjName').val();
let insMonth = $('#insMonth').val();
let aiDitStatus = $('#aiDitStatus').val();
var subComId = $(window.parent.document).find("select[id='subComId']").val();
table.reload('layui_table', {
where: {
fgsId: '26',
fgsId: subComId,
fgsName: fgsName,
yjName: yjName,
insMonth: insMonth,
@ -37,10 +38,11 @@ function resetClick() {
$('#yjName').val('');
$('#insMonth').val('');
$('#aiDitStatus').val('0');
var subComId = $(window.parent.document).find("select[id='subComId']").val();
form.render();
table.reload('layui_table', {
where: {
fgsId: "26",
fgsId: subComId,
fgsName: "",
yjName: "",
insMonth: "",
@ -54,13 +56,14 @@ function resetClick() {
*/
function init() {
let aiDitStatus = $('#aiDitStatus').val();
var subComId = $(window.parent.document).find("select[id='subComId']").val();
// 渲染表格
table.render({
id: 'layui_table',
elem: '#table',
url: PATH_URL + '/inspectionPlan/getLineProjectListAuditPage',
where: {
fgsId: '26',
fgsId: subComId,
aiDitStatus: aiDitStatus
},
page: true,
@ -125,7 +128,7 @@ function init() {
text = '已通过';
color = '#19BE6B';
}
if (status == '0') {
if (status == '0' || status == '4') {
text = '待审核';
color = '#FF9900';
}
@ -303,7 +306,8 @@ function exportData() {
let yjName = $('#yjName').val();
let insMonth = $('#insMonth').val();
let aiDitStatus = $('#aiDitStatus').val();
let fgsId = '26'
var subComId = $(window.parent.document).find("select[id='subComId']").val();
let fgsId = subComId
window.location.href = PATH_URL + `/inspectionPlan/exportAuditPlanData?token=` + token +
"&fgsName=" + fgsName +

1
hxy-web/js/wireManager/header.js
View File

@ -16,6 +16,7 @@ function init(){
type: 'POST',
url: PATH_URL + '/homePageSelect/getLineProtectorSubComAndStandDropdown', // 请求地址
contentType: "application/json; charset=utf-8",
async:false,
data: {}, //获取提交的表单字段
success: function (data) {
console.log("datadatasss:", data.data)

65
hxy-web/js/wireManager/viewPlan/addMonthPlan.js
View File

@ -90,7 +90,7 @@ function init() {
var proName = d.proName;
var insMonth = d.insMonth;
var html =
`<input class="workContent layui-input" maxlength="500" key="${id}" yjId="${yjId}" proName="${proName}" insMonth="${insMonth}" type="text" style="width: 150px;height: 25px;"/>`;
`<input class="workContent layui-input" maxlength="100" key="${id}" yjId="${yjId}" proName="${proName}" insMonth="${insMonth}" type="text" style="width: 150px;height: 25px;"/>`;
return html;
},
},
@ -123,7 +123,7 @@ function init() {
templet: function(d) {
var id = d.id
var html =
`<input class="liablePerson layui-input" maxlength="200" key="${id}" type="text" style="width: 150px;height: 25px;"/>`;
`<input class="liablePerson layui-input" maxlength="100" key="${id}" type="text" style="width: 150px;height: 25px;"/>`;
return html;
},
},
@ -134,7 +134,7 @@ function init() {
templet: function(d) {
var id = d.id
var html =
`<input class="proctorPerson layui-input" maxlength="200" key="${id}" type="text" style="width: 150px;height: 25px;"/>`;
`<input class="proctorPerson layui-input" maxlength="100" key="${id}" type="text" style="width: 150px;height: 25px;"/>`;
return html;
},
},
@ -145,7 +145,7 @@ function init() {
templet: function(d) {
var id = d.id
var html =
`<input class="standard layui-input" maxlength="500" key="${id}" type="text" style="width: 150px;height: 25px;"/>`;
`<input class="standard layui-input" maxlength="100" key="${id}" type="text" style="width: 150px;height: 25px;"/>`;
return html;
},
},
@ -156,7 +156,7 @@ function init() {
templet: function(d) {
var id = d.id
var html =
`<input class="remark layui-input" maxlength="500" key="${id}" type="text" style="width: 150px;height: 25px;"/>`;
`<input class="remark layui-input" maxlength="100" key="${id}" type="text" style="width: 150px;height: 25px;"/>`;
return html;
},
}
@ -175,16 +175,16 @@ function init() {
.minutes, date.seconds);
// 确保结束时间不早于开始时间
if (startDate && endDate) {
if (endDate.getTime() < startDate.getTime()) {
// 清空结束时间
// 清除DOM元素的值
$(this.elem).val('');
// 重置endDate变量
endDate = null;
layer.msg('结束时间不能早于开始时间！');
}
}
// if (startDate && endDate) {
// if (endDate.getTime() < startDate.getTime()) {
// // 清空结束时间
// // 清除DOM元素的值
// $(this.elem).val('');
// // 重置endDate变量
// endDate = null;
// layer.msg('结束时间不能早于开始时间！');
// }
// }
}
});
laydate.render({
@ -195,16 +195,16 @@ function init() {
.minutes, date.seconds);
// 确保结束时间不早于开始时间
if (startDate && endDate) {
if (endDate.getTime() < startDate.getTime()) {
// 清空结束时间
// 清除DOM元素的值
$(this.elem).val('');
// 重置endDate变量
endDate = null;
layer.msg('结束时间不能早于开始时间！');
}
}
// if (startDate && endDate) {
// if (endDate.getTime() < startDate.getTime()) {
// // 清空结束时间
// // 清除DOM元素的值
// $(this.elem).val('');
// // 重置endDate变量
// endDate = null;
// layer.msg('结束时间不能早于开始时间！');
// }
// }
}
});
},
@ -260,19 +260,30 @@ function saveMonthPlan() {
return;
}
if (planStartTime == "") {
layer.msg("请填写计划开始时间", {
layer.msg("请选择计划开始时间", {
icon: 0
});
$(planStartTimes[i]).focus();
return;
}
if (planEndTime == "") {
layer.msg("请填写计划结束时间", {
layer.msg("请选择计划结束时间", {
icon: 0
});
$(planEndTimes[i]).focus();
return;
}
if(planStartTime !="" && planEndTime !=""){
if (planEndTime < planStartTime) {
layer.msg("结束时间不能早于开始时间！", {
icon: 0
});
$(planEndTimes[i]).focus();
return;
}
}
if (liablePerson == "") {
layer.msg("请填写责任人（护线员）", {
icon: 0

54
hxy-web/js/wireManager/viewPlan/updateMonthPlan.js
View File

@ -40,7 +40,7 @@ function init() {
var proName = d.proName;
var insMonth = d.insMonth;
var html =
`<input class="workContent layui-input" maxlength="500" value="${workContent}" key="${id}" yjId="${yjId}" proName="${proName}" insMonth="${insMonth}" type="text" style="width: 150px;height: 25px;"/>`;
`<input class="workContent layui-input" maxlength="100" value="${workContent}" key="${id}" yjId="${yjId}" proName="${proName}" insMonth="${insMonth}" type="text" style="width: 150px;height: 25px;"/>`;
return html;
},
},
@ -76,7 +76,7 @@ function init() {
var id = d.id
var dutyUser = d.dutyUser
var html =
`<input class="liablePerson layui-input" value="${dutyUser}" key="${id}" type="text" style="width: 150px;height: 25px;"/>`;
`<input class="liablePerson layui-input" maxlength="100" value="${dutyUser}" key="${id}" type="text" style="width: 150px;height: 25px;"/>`;
return html;
},
},
@ -88,7 +88,7 @@ function init() {
var id = d.id
var supervisor = d.supervisor
var html =
`<input class="proctorPerson layui-input" value="${supervisor}" key="${id}" type="text" style="width: 150px;height: 25px;"/>`;
`<input class="proctorPerson layui-input" maxlength="100" value="${supervisor}" key="${id}" type="text" style="width: 150px;height: 25px;"/>`;
return html;
},
},
@ -100,7 +100,7 @@ function init() {
var id = d.id
var complete = d.complete
var html =
`<input class="standard layui-input" value="${complete}" key="${id}" type="text" style="width: 150px;height: 25px;"/>`;
`<input class="standard layui-input" maxlength="100" value="${complete}" key="${id}" type="text" style="width: 150px;height: 25px;"/>`;
return html;
},
},
@ -112,7 +112,7 @@ function init() {
var id = d.id
var remarks = d.remarks
var html =
`<input class="remark layui-input" value="${remarks}" key="${id}" type="text" style="width: 150px;height: 25px;"/>`;
`<input class="remark layui-input" maxlength="100" value="${remarks}" key="${id}" type="text" style="width: 150px;height: 25px;"/>`;
return html;
},
}
@ -127,41 +127,13 @@ function init() {
laydate.render({
elem: '.planStartTime',
done: function(value, date, time) {
// 将laydate的日期对象转换为原生Date对象
startDate = new Date(date.year, date.month - 1, date.date, date.hours, date
.minutes, date.seconds);
// 确保结束时间不早于开始时间
if (startDate && endDate) {
if (endDate.getTime() < startDate.getTime()) {
// 清空结束时间
// 清除DOM元素的值
$(this.elem).val('');
// 重置endDate变量
endDate = null;
layer.msg('结束时间不能早于开始时间！');
}
}
}
});
laydate.render({
elem: '.planEndTime',
done: function(value, date, time) {
// 将laydate的日期对象转换为原生Date对象
endDate = new Date(date.year, date.month - 1, date.date, date.hours, date
.minutes, date.seconds);
// 确保结束时间不早于开始时间
if (startDate && endDate) {
if (endDate.getTime() < startDate.getTime()) {
// 清空结束时间
// 清除DOM元素的值
$(this.elem).val('');
// 重置endDate变量
endDate = null;
layer.msg('结束时间不能早于开始时间！');
}
}
}
});
},
@ -217,19 +189,31 @@ function saveMonthPlan() {
return;
}
if (planStartTime == "") {
layer.msg("请填写计划开始时间", {
layer.msg("请选择计划开始时间", {
icon: 0
});
$(planStartTimes[i]).focus();
return;
}
if (planEndTime == "") {
layer.msg("请填写计划结束时间", {
layer.msg("请选择计划结束时间", {
icon: 0
});
$(planEndTimes[i]).focus();
return;
}
if(planStartTime !="" && planEndTime !=""){
if (planEndTime < planStartTime) {
layer.msg("结束时间不能早于开始时间！", {
icon: 0
});
$(planEndTimes[i]).focus();
return;
}
}
if (liablePerson == "") {
layer.msg("请填写责任人（护线员）", {
icon: 0

2
hxy-web/js/wireManager/viewPlan/viewPlanList.js
View File

@ -93,7 +93,7 @@ function init(){
text = '已通过';
color = '#19BE6B';
}
if(status == '0'){
if(status == '0' || status == '4'){
text = '待审核';
color = '#FF9900';
}