From 20074f0fc32323c0ef56025b0f77a18f30c33aa5 Mon Sep 17 00:00:00 2001 From: lSun <15893999301@qq.com> Date: Fri, 16 Aug 2024 09:49:24 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=95=B4=E4=BD=93=E5=8E=BB=E9=99=A4token.j?= =?UTF-8?q?s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hxy-web/html/photoView.html | 1 - .../wireManager/attendance/attendance.html | 1 - .../attendance/attendanceDetail.html | 1 - hxy-web/html/wireManager/index.html | 1 - .../html/wireManager/project/addTower.html | 1 - .../html/wireManager/project/projectAdd.html | 1 - .../wireManager/project/projectAddUser.html | 1 - .../wireManager/project/projectDetail.html | 1 - .../wireManager/project/projectImport.html | 1 - .../html/wireManager/project/projectList.html | 1 - .../html/wireManager/project/updTower.html | 1 - hxy-web/html/wireManager/staff/staffAdd.html | 1 - .../html/wireManager/staff/staffImport.html | 1 - hxy-web/html/wireManager/staff/staffList.html | 1 - .../wireManager/viewPlan/addMonthPlan.html | 1 - .../viewPlan/monthPlanDetails.html | 1 - .../wireManager/viewPlan/monthPlanImport.html | 1 - .../wireManager/viewPlan/revokeMonthPlan.html | 1 - .../wireManager/viewPlan/updateMonthPlan.html | 1 - .../wireManager/viewPlan/viewPlanList.html | 2 +- .../viewResult/normalInspectionUpload.html | 1 - .../viewResult/patrolOutsideAdd.html | 1 - .../viewResult/specialPatrolAdd.html | 1 - .../wireManager/viewResult/uploadPhoto.html | 1 - .../wireManager/viewResult/viewResult.html | 1 - .../viewResult/viewResultDetail.html | 1 - .../viewResult/viewResultUpdate.html | 1 - .../wagesReport/producePayroll.html | 1 - .../wagesReport/producePayrollDetails.html | 1 - .../wagesReport/producePayrollUpdate.html | 1 - .../wagesReport/wagesReportList.html | 1 - hxy-web/js/public/public.js | 3 +- hxy-web/js/public/token.js | 33 +++++++++++-------- 33 files changed, 22 insertions(+), 46 deletions(-) diff --git a/hxy-web/html/photoView.html b/hxy-web/html/photoView.html index 66482ad..1d86c3f 100644 --- a/hxy-web/html/photoView.html +++ b/hxy-web/html/photoView.html @@ -3,7 +3,6 @@ 公共照片查看 - diff --git a/hxy-web/html/wireManager/attendance/attendance.html b/hxy-web/html/wireManager/attendance/attendance.html index 8102571..573deac 100644 --- a/hxy-web/html/wireManager/attendance/attendance.html +++ b/hxy-web/html/wireManager/attendance/attendance.html @@ -5,7 +5,6 @@ 人员考勤 - diff --git a/hxy-web/html/wireManager/attendance/attendanceDetail.html b/hxy-web/html/wireManager/attendance/attendanceDetail.html index 8326f1f..e9a488c 100644 --- a/hxy-web/html/wireManager/attendance/attendanceDetail.html +++ b/hxy-web/html/wireManager/attendance/attendanceDetail.html @@ -3,7 +3,6 @@ 护线员考勤 - diff --git a/hxy-web/html/wireManager/index.html b/hxy-web/html/wireManager/index.html index 5377151..30e9edf 100644 --- a/hxy-web/html/wireManager/index.html +++ b/hxy-web/html/wireManager/index.html @@ -5,7 +5,6 @@ 护线员首页 - diff --git a/hxy-web/html/wireManager/project/addTower.html b/hxy-web/html/wireManager/project/addTower.html index b11b11d..10d4f01 100644 --- a/hxy-web/html/wireManager/project/addTower.html +++ b/hxy-web/html/wireManager/project/addTower.html @@ -5,7 +5,6 @@ 护线员考勤 - diff --git a/hxy-web/html/wireManager/project/projectAdd.html b/hxy-web/html/wireManager/project/projectAdd.html index a2f6b84..ae0764a 100644 --- a/hxy-web/html/wireManager/project/projectAdd.html +++ b/hxy-web/html/wireManager/project/projectAdd.html @@ -5,7 +5,6 @@ 护线员考勤 - diff --git a/hxy-web/html/wireManager/project/projectAddUser.html b/hxy-web/html/wireManager/project/projectAddUser.html index 42b757e..a2280e9 100644 --- a/hxy-web/html/wireManager/project/projectAddUser.html +++ b/hxy-web/html/wireManager/project/projectAddUser.html @@ -3,7 +3,6 @@ 护线员考勤 - diff --git a/hxy-web/html/wireManager/project/projectDetail.html b/hxy-web/html/wireManager/project/projectDetail.html index 08ff93c..dc79525 100644 --- a/hxy-web/html/wireManager/project/projectDetail.html +++ b/hxy-web/html/wireManager/project/projectDetail.html @@ -5,7 +5,6 @@ 护线员考勤 - diff --git a/hxy-web/html/wireManager/project/projectImport.html b/hxy-web/html/wireManager/project/projectImport.html index 70ae67f..8e27471 100644 --- a/hxy-web/html/wireManager/project/projectImport.html +++ b/hxy-web/html/wireManager/project/projectImport.html @@ -5,7 +5,6 @@ 导入 - diff --git a/hxy-web/html/wireManager/project/projectList.html b/hxy-web/html/wireManager/project/projectList.html index 2aa9d1e..0fcc9d1 100644 --- a/hxy-web/html/wireManager/project/projectList.html +++ b/hxy-web/html/wireManager/project/projectList.html @@ -5,7 +5,6 @@ 工程库 - diff --git a/hxy-web/html/wireManager/project/updTower.html b/hxy-web/html/wireManager/project/updTower.html index c147c2c..b637475 100644 --- a/hxy-web/html/wireManager/project/updTower.html +++ b/hxy-web/html/wireManager/project/updTower.html @@ -5,7 +5,6 @@ 护线员考勤 - diff --git a/hxy-web/html/wireManager/staff/staffAdd.html b/hxy-web/html/wireManager/staff/staffAdd.html index acdf4d4..2eceae1 100644 --- a/hxy-web/html/wireManager/staff/staffAdd.html +++ b/hxy-web/html/wireManager/staff/staffAdd.html @@ -3,7 +3,6 @@ 护线员考勤 - diff --git a/hxy-web/html/wireManager/staff/staffImport.html b/hxy-web/html/wireManager/staff/staffImport.html index 8e3335d..7c65349 100644 --- a/hxy-web/html/wireManager/staff/staffImport.html +++ b/hxy-web/html/wireManager/staff/staffImport.html @@ -3,7 +3,6 @@ 护线员考勤 - diff --git a/hxy-web/html/wireManager/staff/staffList.html b/hxy-web/html/wireManager/staff/staffList.html index fd300aa..2f90d79 100644 --- a/hxy-web/html/wireManager/staff/staffList.html +++ b/hxy-web/html/wireManager/staff/staffList.html @@ -3,7 +3,6 @@ 人员库 - diff --git a/hxy-web/html/wireManager/viewPlan/addMonthPlan.html b/hxy-web/html/wireManager/viewPlan/addMonthPlan.html index 3f55c41..974662a 100644 --- a/hxy-web/html/wireManager/viewPlan/addMonthPlan.html +++ b/hxy-web/html/wireManager/viewPlan/addMonthPlan.html @@ -3,7 +3,6 @@ 护线员考勤 - diff --git a/hxy-web/html/wireManager/viewPlan/monthPlanDetails.html b/hxy-web/html/wireManager/viewPlan/monthPlanDetails.html index 73dcffd..0039ad9 100644 --- a/hxy-web/html/wireManager/viewPlan/monthPlanDetails.html +++ b/hxy-web/html/wireManager/viewPlan/monthPlanDetails.html @@ -3,7 +3,6 @@ 护线员考勤 - diff --git a/hxy-web/html/wireManager/viewPlan/monthPlanImport.html b/hxy-web/html/wireManager/viewPlan/monthPlanImport.html index 7fb03c9..e2b4912 100644 --- a/hxy-web/html/wireManager/viewPlan/monthPlanImport.html +++ b/hxy-web/html/wireManager/viewPlan/monthPlanImport.html @@ -3,7 +3,6 @@ 护线员考勤 - diff --git a/hxy-web/html/wireManager/viewPlan/revokeMonthPlan.html b/hxy-web/html/wireManager/viewPlan/revokeMonthPlan.html index e9527c4..e625d4b 100644 --- a/hxy-web/html/wireManager/viewPlan/revokeMonthPlan.html +++ b/hxy-web/html/wireManager/viewPlan/revokeMonthPlan.html @@ -3,7 +3,6 @@ 特巡结果上传 - diff --git a/hxy-web/html/wireManager/viewPlan/updateMonthPlan.html b/hxy-web/html/wireManager/viewPlan/updateMonthPlan.html index 2d93be0..e32912f 100644 --- a/hxy-web/html/wireManager/viewPlan/updateMonthPlan.html +++ b/hxy-web/html/wireManager/viewPlan/updateMonthPlan.html @@ -3,7 +3,6 @@ 护线员考勤 - diff --git a/hxy-web/html/wireManager/viewPlan/viewPlanList.html b/hxy-web/html/wireManager/viewPlan/viewPlanList.html index ef5ed96..8b08537 100644 --- a/hxy-web/html/wireManager/viewPlan/viewPlanList.html +++ b/hxy-web/html/wireManager/viewPlan/viewPlanList.html @@ -2,7 +2,7 @@ - 护线员考勤 + 巡视计划 diff --git a/hxy-web/html/wireManager/viewResult/normalInspectionUpload.html b/hxy-web/html/wireManager/viewResult/normalInspectionUpload.html index fa3ab87..62cbab2 100644 --- a/hxy-web/html/wireManager/viewResult/normalInspectionUpload.html +++ b/hxy-web/html/wireManager/viewResult/normalInspectionUpload.html @@ -3,7 +3,6 @@ 正常巡视照片上传 - diff --git a/hxy-web/html/wireManager/viewResult/patrolOutsideAdd.html b/hxy-web/html/wireManager/viewResult/patrolOutsideAdd.html index a952202..0a89c29 100644 --- a/hxy-web/html/wireManager/viewResult/patrolOutsideAdd.html +++ b/hxy-web/html/wireManager/viewResult/patrolOutsideAdd.html @@ -3,7 +3,6 @@ 特巡结果上传 - diff --git a/hxy-web/html/wireManager/viewResult/specialPatrolAdd.html b/hxy-web/html/wireManager/viewResult/specialPatrolAdd.html index ccb3433..4097c8b 100644 --- a/hxy-web/html/wireManager/viewResult/specialPatrolAdd.html +++ b/hxy-web/html/wireManager/viewResult/specialPatrolAdd.html @@ -3,7 +3,6 @@ 特巡结果上传 - diff --git a/hxy-web/html/wireManager/viewResult/uploadPhoto.html b/hxy-web/html/wireManager/viewResult/uploadPhoto.html index 880c863..9f8eadd 100644 --- a/hxy-web/html/wireManager/viewResult/uploadPhoto.html +++ b/hxy-web/html/wireManager/viewResult/uploadPhoto.html @@ -3,7 +3,6 @@ 特巡结果上传 - diff --git a/hxy-web/html/wireManager/viewResult/viewResult.html b/hxy-web/html/wireManager/viewResult/viewResult.html index c7c90e2..2adfdc6 100644 --- a/hxy-web/html/wireManager/viewResult/viewResult.html +++ b/hxy-web/html/wireManager/viewResult/viewResult.html @@ -3,7 +3,6 @@ 护线员考勤 - diff --git a/hxy-web/html/wireManager/viewResult/viewResultDetail.html b/hxy-web/html/wireManager/viewResult/viewResultDetail.html index 6502918..15f9403 100644 --- a/hxy-web/html/wireManager/viewResult/viewResultDetail.html +++ b/hxy-web/html/wireManager/viewResult/viewResultDetail.html @@ -3,7 +3,6 @@ 巡视结果上传-查看 - diff --git a/hxy-web/html/wireManager/viewResult/viewResultUpdate.html b/hxy-web/html/wireManager/viewResult/viewResultUpdate.html index 62502d9..c3fd6e1 100644 --- a/hxy-web/html/wireManager/viewResult/viewResultUpdate.html +++ b/hxy-web/html/wireManager/viewResult/viewResultUpdate.html @@ -3,7 +3,6 @@ 巡视结果上传 - diff --git a/hxy-web/html/wireManager/wagesReport/producePayroll.html b/hxy-web/html/wireManager/wagesReport/producePayroll.html index adb89fe..6570de0 100644 --- a/hxy-web/html/wireManager/wagesReport/producePayroll.html +++ b/hxy-web/html/wireManager/wagesReport/producePayroll.html @@ -3,7 +3,6 @@ 工资上报 - diff --git a/hxy-web/html/wireManager/wagesReport/producePayrollDetails.html b/hxy-web/html/wireManager/wagesReport/producePayrollDetails.html index 131156d..129553f 100644 --- a/hxy-web/html/wireManager/wagesReport/producePayrollDetails.html +++ b/hxy-web/html/wireManager/wagesReport/producePayrollDetails.html @@ -3,7 +3,6 @@ 工资上报 - diff --git a/hxy-web/html/wireManager/wagesReport/producePayrollUpdate.html b/hxy-web/html/wireManager/wagesReport/producePayrollUpdate.html index 50e965d..b464ccc 100644 --- a/hxy-web/html/wireManager/wagesReport/producePayrollUpdate.html +++ b/hxy-web/html/wireManager/wagesReport/producePayrollUpdate.html @@ -3,7 +3,6 @@ 工资上报 - diff --git a/hxy-web/html/wireManager/wagesReport/wagesReportList.html b/hxy-web/html/wireManager/wagesReport/wagesReportList.html index 4609d37..1a5abed 100644 --- a/hxy-web/html/wireManager/wagesReport/wagesReportList.html +++ b/hxy-web/html/wireManager/wagesReport/wagesReportList.html @@ -3,7 +3,6 @@ 工资上报 - diff --git a/hxy-web/js/public/public.js b/hxy-web/js/public/public.js index 48bb43e..4be4bd1 100644 --- a/hxy-web/js/public/public.js +++ b/hxy-web/js/public/public.js @@ -5,7 +5,8 @@ let PATH_URL="http://127.0.0.1:1917/line" let LOGIN_PATH="http://127.0.0.1:8849/ah-bns-web/html/test/test.html"; //加解密开关 let jm_switch=false; -let token=localStorage.getItem("smz-token") +let token=localStorage.getItem("token") +console.log(window.location.href) console.log(token) diff --git a/hxy-web/js/public/token.js b/hxy-web/js/public/token.js index 02629f1..c5218d4 100644 --- a/hxy-web/js/public/token.js +++ b/hxy-web/js/public/token.js @@ -1,21 +1,26 @@ var queryString = window.location.search; var params = parseQueryString(queryString); //存入localStorage -localStorage.setItem("token",params.token) //获取location 地址栏参数 -function parseQueryString(queryString) { - var params = {}; - var queryStringWithoutQuestionMark = queryString.slice(1); - var queryParts = queryStringWithoutQuestionMark.split('&'); - - queryParts.forEach(function(part) { - var keyValue = part.split('='); - var key = decodeURIComponent(keyValue[0]); - var value = decodeURIComponent(keyValue[1]); - params[key] = value; - }); - - return params; +function parseQueryString() { + if(queryString){ + console.log("刷新token...") + var params = {}; + var queryStringWithoutQuestionMark = queryString.slice(1); + var queryParts = queryStringWithoutQuestionMark.split('&'); + + queryParts.forEach(function(part) { + var keyValue = part.split('='); + var key = decodeURIComponent(keyValue[0]); + var value = decodeURIComponent(keyValue[1]); + params[key] = value; + }); + if(typeof(params.token)!='undefiend'){ + localStorage.setItem("token",params.token) + } + return params; + } + } \ No newline at end of file From 1feec7655c73f66cbe462a85f16355a7d04e1145 Mon Sep 17 00:00:00 2001 From: lSun <15893999301@qq.com> Date: Fri, 16 Aug 2024 11:19:49 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=8A=A0token?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hxy-web/html/wireManager/project/projectList.html | 2 +- hxy-web/js/public/jq.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hxy-web/html/wireManager/project/projectList.html b/hxy-web/html/wireManager/project/projectList.html index 0fcc9d1..8b0c0aa 100644 --- a/hxy-web/html/wireManager/project/projectList.html +++ b/hxy-web/html/wireManager/project/projectList.html @@ -4,7 +4,7 @@ 工程库 - + diff --git a/hxy-web/js/public/jq.js b/hxy-web/js/public/jq.js index 2afcd54..5979f32 100644 --- a/hxy-web/js/public/jq.js +++ b/hxy-web/js/public/jq.js @@ -1,4 +1,4 @@ -let Authorization = localStorage.getItem("smz-token"); +let Authorization = localStorage.getItem("token"); $.ajaxSetup({ cache : false, @@ -13,7 +13,7 @@ $.ajaxSetup({ if (code == 400) { layer.msg(message); } else if (code == 401) { - localStorage.removeItem("smz-token"); + localStorage.removeItem("token"); location.href = '/login.html'; } else if (code == 403) { console.log("未授权:" + message); From 29d899caa16cf2e51afa9f0f3dc70cf3160cb5c0 Mon Sep 17 00:00:00 2001 From: lSun <15893999301@qq.com> Date: Mon, 19 Aug 2024 15:20:07 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=B7=A1=E8=A7=86=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wireManager/viewPlan/addMonthPlan.html | 22 +- .../viewPlan/monthPlanDetails.html | 31 +- .../wireManager/viewPlan/monthPlanImport.html | 7 +- .../wireManager/viewPlan/revokeMonthPlan.html | 15 +- .../wireManager/viewPlan/updateMonthPlan.html | 139 +++-- .../wireManager/viewPlan/viewPlanList.html | 31 +- .../js/wireManager/viewPlan/addMonthPlan.js | 504 ++++++++++------ .../wireManager/viewPlan/monthPlanDetails.js | 170 ++++-- .../wireManager/viewPlan/monthPlanImport.js | 111 ++-- .../wireManager/viewPlan/revokeMonthPlan.js | 71 ++- .../wireManager/viewPlan/updateMonthPlan.js | 548 ++++++++++++------ .../js/wireManager/viewPlan/viewPlanList.js | 405 +++++++------ 12 files changed, 1263 insertions(+), 791 deletions(-) diff --git a/hxy-web/html/wireManager/viewPlan/addMonthPlan.html b/hxy-web/html/wireManager/viewPlan/addMonthPlan.html index 974662a..61131ca 100644 --- a/hxy-web/html/wireManager/viewPlan/addMonthPlan.html +++ b/hxy-web/html/wireManager/viewPlan/addMonthPlan.html @@ -3,13 +3,14 @@ 护线员考勤 + + - - + @@ -167,8 +168,13 @@
-
运检一公司昆明运检一站 2024-03 月护线员工作计划
-
● 待审核
+
+ + + + 月护线员工作计划 +
+
@@ -176,14 +182,14 @@ 提交计划 -
-
+
diff --git a/hxy-web/html/wireManager/viewPlan/monthPlanDetails.html b/hxy-web/html/wireManager/viewPlan/monthPlanDetails.html index 0039ad9..1584e25 100644 --- a/hxy-web/html/wireManager/viewPlan/monthPlanDetails.html +++ b/hxy-web/html/wireManager/viewPlan/monthPlanDetails.html @@ -3,13 +3,13 @@ 护线员考勤 + + - - @@ -165,12 +165,17 @@
-
运检一公司昆明运检一站 2024-03 月护线员工作计划
-
● 待审核
+
+ + + + 月护线员工作计划 +
+
- @@ -183,30 +188,30 @@
-
李小萌
-
2024-03-25 23:26:08
+
+
分公司审核
-
审核通过
+
-
李小刚
-
2024-03-25 23:26:08
+
+
总公司审核
-
完结
+
-
总公司
-
待处理
+
+
diff --git a/hxy-web/html/wireManager/viewPlan/monthPlanImport.html b/hxy-web/html/wireManager/viewPlan/monthPlanImport.html index e2b4912..5a94690 100644 --- a/hxy-web/html/wireManager/viewPlan/monthPlanImport.html +++ b/hxy-web/html/wireManager/viewPlan/monthPlanImport.html @@ -3,13 +3,14 @@ 护线员考勤 + + - - + @@ -27,7 +28,7 @@
填写导入数据信息
请按照数据模板的格式准备导入数据，模板中的表头名称不可更改，表头行不能删除。
- 下载模板 + 下载模板
diff --git a/hxy-web/html/wireManager/viewPlan/revokeMonthPlan.html b/hxy-web/html/wireManager/viewPlan/revokeMonthPlan.html index e625d4b..6fc8e78 100644 --- a/hxy-web/html/wireManager/viewPlan/revokeMonthPlan.html +++ b/hxy-web/html/wireManager/viewPlan/revokeMonthPlan.html @@ -3,13 +3,14 @@ 特巡结果上传 - - - - - - - + + + + + + + + - +
- +
-
运检一公司昆明运检一站 2024-03 月护线员工作计划
-
● 待审核
+
+ + + + 月护线员工作计划 +
+
@@ -180,15 +204,16 @@
-
+
提交
-
李小萌
-
2024-03-25 23:26:08
+
+
分公司审核 @@ -198,23 +223,23 @@
-
李小刚
-
2024-03-25 23:26:08
+
+
总公司审核
-
完结
+
-
总公司
-
待处理
+
+
- - + +
@@ -222,6 +247,6 @@
-
+
\ No newline at end of file diff --git a/hxy-web/html/wireManager/viewPlan/viewPlanList.html b/hxy-web/html/wireManager/viewPlan/viewPlanList.html index 8b08537..cbead49 100644 --- a/hxy-web/html/wireManager/viewPlan/viewPlanList.html +++ b/hxy-web/html/wireManager/viewPlan/viewPlanList.html @@ -3,14 +3,14 @@ 巡视计划 - + + - - + @@ -34,31 +34,26 @@
- +
- -
-
-
-
- -
-
-
-
- + + + + + +
- - diff --git a/hxy-web/js/wireManager/viewPlan/addMonthPlan.js b/hxy-web/js/wireManager/viewPlan/addMonthPlan.js index 5d2f187..4a957a0 100644 --- a/hxy-web/js/wireManager/viewPlan/addMonthPlan.js +++ b/hxy-web/js/wireManager/viewPlan/addMonthPlan.js @@ -1,179 +1,242 @@ - - var pers = [] -var table,form,laydate -layui.use(['form','layer','table','laydate'], function () { - table = layui.table; - form = layui.form; - laydate = layui.laydate - - - - table.on('tool(table)', function (obj) { - switch (obj.event) { - case 'details': - console.log('详情',obj) - detailsView(obj.id) - break; - case 'uploadResult': - console.log('上传结果',obj) - updateView() - break; - } - }); - init(); - -}); +var table, form, laydate - // 静态数据 - var tableData = [ - {id: 1, lineName: '±500kV永富直'}, - {id: 1, lineName: '±500kV永富直'}, - {id: 1, lineName: '±500kV永富直'}, - {id: 1, lineName: '±500kV永富直'}, - {id: 1, lineName: '±500kV永富直'}, - {id: 1, lineName: '±500kV永富直'}, - {id: 1, lineName: '±500kV永富直'}, - {id: 1, lineName: '±500kV永富直'}, - {id: 1, lineName: '±500kV永富直'}, - {id: 1, lineName: '±500kV永富直'}, - {id: 1, lineName: '±500kV永富直'}, - {id: 1, lineName: '±500kV永富直'}, - {id: 1, lineName: '±500kV永富直'}, - {id: 1, lineName: '±500kV永富直'}, - {id: 1, lineName: '±500kV永富直'}, - {id: 1, lineName: '±500kV永富直'}, - ]; +function setYjId(yjId) { + layui.use(['form', 'layer', 'table', 'laydate'], function() { + table = layui.table; + form = layui.form; + laydate = layui.laydate + dataTable(yjId); + }); +} - +// 静态数据 +var tableData = [ + +]; + +function dataTable(yjId) { + $.ajax({ + type: 'POST', + async: false, // 默认异步true,false表示同步 + url: PATH_URL + '/inspectionPlan/getInspectionPlanList', + contentType: "application/json; charset=utf-8", + data: JSON.stringify({ + "yjId": yjId + }), //获取提交的表单字段 + dataType: 'json', // 服务器返回数据类型 + success: function(data) { + if (data.code == 200) { + $('#fgsName').html(data.data[0].fgsName); + $('#yjName').html(data.data[0].yjName); + $('#insMonth').html(data.data[0].insMonth); + + for (var i = 0; i < data.data.length; i++) { + tableData.push({ + id: data.data[i].id, + proName: data.data[i].proName, + yjId:data.data[i].yjId, + insMonth:data.data[i].insMonth + }) + } + } else { + layer.alert(data.msg, { + icon: 2 + }); + } + }, + error: function(XMLHttpRequest, textStatus, e) { + top.layer.close(loadingMsg); + layer.msg('数据请求发生异常,请稍后重试', { + icon: 16, + scrollbar: false + }); + } + }); + + init(); +} /** * 初始化数据 */ -function init(){ - // 渲染表格 - table.render({ - elem: '#table', - // url: "/sys/achievement", - // page: true, - skin: 'line', // 表格样式 - cols: [[ - { - title: '序号', - field: 'zizeng', - align: 'center', - type: 'numbers', - width: '5%' - }, - {field:'lineName', title: '线路名称',align: 'center',width: '15%'}, - { - field: '', - title: '工作内容', - align: 'center', - templet: function(d){ - var id = d.id - var html = ``; - return html; - }, +function init() { + // 渲染表格 + table.render({ + elem: '#table', + // url: "/sys/achievement", + // page: true, + skin: 'line', // 表格样式 + cols: [ + [{ + title: '序号', + field: 'zizeng', + align: 'center', + type: 'numbers', + width: '5%' + }, + { + field: 'proName', + title: '线路名称', + align: 'center', + width: '15%', + }, + { + field: '', + title: '工作内容', + align: 'center', + templet: function(d) { + var id = d.id; + var yjId = d.yjId; + var proName = d.proName; + var insMonth = d.insMonth; + var html = + ``; + return html; + }, + }, + { + field: '', + title: '计划开始时间', + align: 'center', + templet: function(d) { + var id = d.id + var html = + ``; + return html; + }, + }, + { + field: '', + title: '计划结束时间', + align: 'center', + templet: function(d) { + var id = d.id + var html = + ``; + return html; + }, + }, + { + field: '', + title: '责任人（护线员）', + align: 'center', + templet: function(d) { + var id = d.id + var html = + ``; + return html; + }, + }, + { + field: '', + title: '督办人（设备主人）', + align: 'center', + templet: function(d) { + var id = d.id + var html = + ``; + return html; + }, + }, + { + field: '', + title: '完成标准', + align: 'center', + templet: function(d) { + var id = d.id + var html = + ``; + return html; + }, + }, + { + field: '', + title: '备注', + align: 'center', + templet: function(d) { + var id = d.id + var html = + ``; + return html; + }, + } + ] + ], + data: tableData, + done: function(res, curr, count, origin) { + // 初始化开始时间和结束时间的变量 + var startDate = null; + var endDate = null; + 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('结束时间不能早于开始时间！'); + } + } + } + }); }, - { - field: '', - title: '计划开始时间', - align: 'center', - templet: function(d){ - var id = d.id - var html = ``; - return html; - }, - }, - { - field: '', - title: '计划结束时间', - align: 'center', - templet: function(d){ - var id = d.id - var html = ``; - return html; - }, - }, - { - field: '', - title: '责任人（护线员）', - align: 'center', - templet: function(d){ - var id = d.id - var html = ``; - return html; - }, - }, - { - field: '', - title: '督办人（设备主人）', - align: 'center', - templet: function(d){ - var id = d.id - var html = ``; - return html; - }, - }, - { - field: '', - title: '完成标准', - align: 'center', - templet: function(d){ - var id = d.id - var html = ``; - return html; - }, - }, - { - field: '', - title: '备注', - align: 'center', - templet: function(d){ - var id = d.id - var html = ``; - return html; - }, - } - ]], - data: tableData, - done: function(res, curr, count, origin){ - console.log(res); // 得到当前渲染的数据 - console.log(curr); // 得到当前页码 - console.log(count); // 得到数据总量 - console.log(origin); // 回调函数所执行的来源 --- 2.8.7+ - laydate.render({ - elem: '.planStartTime' - }); - laydate.render({ - elem: '.planEndTime' - }); - }, - }); - + }); + } //提交月计划 -function saveMonthPlan(){ +function saveMonthPlan() { //获取工作内容 DOM var workContents = $(".workContent"); //获取计划开始时间 DOM - var planStartTimes = $(".planStartTime"); + var planStartTimes = $(".planStartTime"); //获取计划结束时间 DOM - var planEndTimes = $(".planEndTime"); + var planEndTimes = $(".planEndTime"); //获取责任人（护线员） DOM - var liablePersons = $(".liablePerson"); + var liablePersons = $(".liablePerson"); //获取督办人（设备主人） DOM - var proctorPersons = $(".proctorPerson"); + var proctorPersons = $(".proctorPerson"); //获取完成标准 DOM - var standards = $(".standard"); + var standards = $(".standard"); //获取备注 DOM var remarks = $(".remark"); - + var arr = []; //循环获取的 DOM，将数据整合 for (var i = 0; i < workContents.length; i++) { //获取此行数据 的id var id = $(workContents[i]).attr("key"); + var yjId = $(workContents[i]).attr("yjId"); + var proName = $(workContents[i]).attr("proName"); + var insMonth = $(workContents[i]).attr("insMonth"); + //获取工作内容 var workContent = $(workContents[i]).val(); //获取计划开始时间 @@ -188,75 +251,138 @@ function saveMonthPlan(){ var standard = $(standards[i]).val(); //获取备注 var remark = $(remarks[i]).val(); - - if(workContent == ""){ - layer.msg("请填写工作内容", {icon: 0}); + + if (workContent == "") { + layer.msg("请填写工作内容", { + icon: 0 + }); $(workContents[i]).focus(); return; } - if(planStartTime == ""){ - layer.msg("请填写计划开始时间", {icon: 0}); + if (planStartTime == "") { + layer.msg("请填写计划开始时间", { + icon: 0 + }); $(planStartTimes[i]).focus(); return; } - if(planEndTime == ""){ - layer.msg("请填写计划结束时间", {icon: 0}); + if (planEndTime == "") { + layer.msg("请填写计划结束时间", { + icon: 0 + }); $(planEndTimes[i]).focus(); return; } - if(liablePerson == ""){ - layer.msg("请填写责任人（护线员）", {icon: 0}); + if (liablePerson == "") { + layer.msg("请填写责任人（护线员）", { + icon: 0 + }); $(liablePersons[i]).focus(); return; } - if(proctorPerson == ""){ - layer.msg("请填写督办人（设备主人）", {icon: 0}); + if (proctorPerson == "") { + layer.msg("请填写督办人（设备主人）", { + icon: 0 + }); $(proctorPersons[i]).focus(); return; } - if(standard == ""){ - layer.msg("请填写完成标准", {icon: 0}); + if (standard == "") { + layer.msg("请填写完成标准", { + icon: 0 + }); $(standards[i]).focus(); return; } - if(remark == ""){ - layer.msg("请填写备注", {icon: 0}); + if (remark == "") { + layer.msg("请填写备注", { + icon: 0 + }); $(remarks[i]).focus(); return; } - var json = { - "id": id, + "proId": id, + "yjId": yjId, + "proName": proName, "workContent": workContent, - "planStartTime": planStartTime, - "planEndTime": planEndTime, - "liablePerson": liablePerson, - "proctorPerson": proctorPerson, - "standard": standard, - "remark": remark + "stateTime": planStartTime, + "enTime": planEndTime, + "dutyUser": liablePerson, + "supervisor": proctorPerson, + "complete": standard, + "remarks": remark, + "insMonth":insMonth } arr.push(json); console.log(arr) - + } + + // 加载提示 + let loadingMsg = layer.msg('数据上传中,请稍候...', { + icon: 16, + scrollbar: false, + time: 0, + shade: [0.8, '#393D49'] + }); + // form请求地址 + let formUrl = PATH_URL + "/inspectionPlan/insertInspectionPlan"; + $.ajax({ + type: 'POST', + url: formUrl, // 请求地址 + contentType: "application/json; charset=utf-8", + data: JSON.stringify(arr), + 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.close(index); //再执行关闭 + reloading(); + } else { + layer.alert(data.msg); + } + }, + error: function(XMLHttpRequest, textStatus, e) { + layer.close(loadingMsg); + layer.msg('数据请求发生异常,请稍后重试', { + icon: 16, + scrollbar: false + }); + } + }); + + } //撤销月计划 -function revokeMonthPlan(){ +function revokeMonthPlan() { let height = '60%'; let width = '40%'; var index = layer.open({ - title: ['计划撤销', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], - type: 2, - content: './revokeMonthPlan.html', - area: [width, height], - maxmin: false, - success: function (layero, index) { - // var myIframe = window[layero.find('iframe')[0]['name']]; - // myIframe.hideSubmit(); - // var fnc = myIframe.setData(data.data); //aaa()为子页面的方法 - - }, + title: ['计划撤销', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], + type: 2, + content: './revokeMonthPlan.html', + area: [width, height], + maxmin: false, + success: function(layero, index) { + // var myIframe = window[layero.find('iframe')[0]['name']]; + // myIframe.hideSubmit(); + // var fnc = myIframe.setData(data.data); //aaa()为子页面的方法 + + }, }); +} + +/** + * 关闭页面 刷新页面 + */ +function reloading() { + var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引 + parent.layer.close(index); //再执行关闭 + window.parent.location.reload(); } \ No newline at end of file diff --git a/hxy-web/js/wireManager/viewPlan/monthPlanDetails.js b/hxy-web/js/wireManager/viewPlan/monthPlanDetails.js index c93163d..229cfe1 100644 --- a/hxy-web/js/wireManager/viewPlan/monthPlanDetails.js +++ b/hxy-web/js/wireManager/viewPlan/monthPlanDetails.js @@ -1,5 +1,3 @@ - - var pers = [] var table,form,laydate layui.use(['form','layer','table','laydate'], function () { @@ -7,39 +5,14 @@ layui.use(['form','layer','table','laydate'], function () { form = layui.form; laydate = layui.laydate - init(); - -}); - - // 静态数据 - var tableData = [ - {id: 1, lineName: '±500kV永富直', workContent: '500kV草宝甲线开展2次/月巡视，按全线开展。开展2次巡视，第2次执行关键重要区段巡视。2、关键重要区段：（1）关键交叉跨越管控区段：#001-#003、#046-#047 （2）重要交叉跨越管控区段：#107-#108、#115-#116 ', planStartTime: '2024-03-01', planEndTime: '2024-03-31', liablePerson: '周应福、毕兴武、李永辉', proctorPerson: '马俊伟', standard: '巡视表单、通话记录', remark: '备注'}, - {id: 1, lineName: '±500kV永富直', workContent: '500kV草宝甲线开展2次/月巡视，按全线开展。开展2次巡视，第2次执行关键重要区段巡视。2、关键重要区段：（1）关键交叉跨越管控区段：#001-#003、#046-#047 （2）重要交叉跨越管控区段：#107-#108、#115-#116 ', planStartTime: '2024-03-01', planEndTime: '2024-03-31', liablePerson: '周应福、毕兴武、李永辉', proctorPerson: '马俊伟', standard: '巡视表单、通话记录', remark: '备注'}, - {id: 1, lineName: '±500kV永富直', workContent: '500kV草宝甲线开展2次/月巡视，按全线开展。开展2次巡视，第2次执行关键重要区段巡视。2、关键重要区段：（1）关键交叉跨越管控区段：#001-#003、#046-#047 （2）重要交叉跨越管控区段：#107-#108、#115-#116 ', planStartTime: '2024-03-01', planEndTime: '2024-03-31', liablePerson: '周应福、毕兴武、李永辉', proctorPerson: '马俊伟', standard: '巡视表单、通话记录', remark: '备注'}, - {id: 1, lineName: '±500kV永富直', workContent: '500kV草宝甲线开展2次/月巡视，按全线开展。开展2次巡视，第2次执行关键重要区段巡视。2、关键重要区段：（1）关键交叉跨越管控区段：#001-#003、#046-#047 （2）重要交叉跨越管控区段：#107-#108、#115-#116 ', planStartTime: '2024-03-01', planEndTime: '2024-03-31', liablePerson: '周应福、毕兴武、李永辉', proctorPerson: '马俊伟', standard: '巡视表单、通话记录', remark: '备注'}, - {id: 1, lineName: '±500kV永富直', workContent: '500kV草宝甲线开展2次/月巡视，按全线开展。开展2次巡视，第2次执行关键重要区段巡视。2、关键重要区段：（1）关键交叉跨越管控区段：#001-#003、#046-#047 （2）重要交叉跨越管控区段：#107-#108、#115-#116 ', planStartTime: '2024-03-01', planEndTime: '2024-03-31', liablePerson: '周应福、毕兴武、李永辉', proctorPerson: '马俊伟', standard: '巡视表单、通话记录', remark: '备注'}, - {id: 1, lineName: '±500kV永富直', workContent: '500kV草宝甲线开展2次/月巡视，按全线开展。开展2次巡视，第2次执行关键重要区段巡视。2、关键重要区段：（1）关键交叉跨越管控区段：#001-#003、#046-#047 （2）重要交叉跨越管控区段：#107-#108、#115-#116 ', planStartTime: '2024-03-01', planEndTime: '2024-03-31', liablePerson: '周应福、毕兴武、李永辉', proctorPerson: '马俊伟', standard: '巡视表单、通话记录', remark: '备注'}, - {id: 1, lineName: '±500kV永富直', workContent: '500kV草宝甲线开展2次/月巡视，按全线开展。开展2次巡视，第2次执行关键重要区段巡视。2、关键重要区段：（1）关键交叉跨越管控区段：#001-#003、#046-#047 （2）重要交叉跨越管控区段：#107-#108、#115-#116 ', planStartTime: '2024-03-01', planEndTime: '2024-03-31', liablePerson: '周应福、毕兴武、李永辉', proctorPerson: '马俊伟', standard: '巡视表单、通话记录', remark: '备注'}, - {id: 1, lineName: '±500kV永富直', workContent: '500kV草宝甲线开展2次/月巡视，按全线开展。开展2次巡视，第2次执行关键重要区段巡视。2、关键重要区段：（1）关键交叉跨越管控区段：#001-#003、#046-#047 （2）重要交叉跨越管控区段：#107-#108、#115-#116 ', planStartTime: '2024-03-01', planEndTime: '2024-03-31', liablePerson: '周应福、毕兴武、李永辉', proctorPerson: '马俊伟', standard: '巡视表单、通话记录', remark: '备注'}, - {id: 1, lineName: '±500kV永富直', workContent: '500kV草宝甲线开展2次/月巡视，按全线开展。开展2次巡视，第2次执行关键重要区段巡视。2、关键重要区段：（1）关键交叉跨越管控区段：#001-#003、#046-#047 （2）重要交叉跨越管控区段：#107-#108、#115-#116 ', planStartTime: '2024-03-01', planEndTime: '2024-03-31', liablePerson: '周应福、毕兴武、李永辉', proctorPerson: '马俊伟', standard: '巡视表单、通话记录', remark: '备注'}, - {id: 1, lineName: '±500kV永富直', workContent: '500kV草宝甲线开展2次/月巡视，按全线开展。开展2次巡视，第2次执行关键重要区段巡视。2、关键重要区段：（1）关键交叉跨越管控区段：#001-#003、#046-#047 （2）重要交叉跨越管控区段：#107-#108、#115-#116 ', planStartTime: '2024-03-01', planEndTime: '2024-03-31', liablePerson: '周应福、毕兴武、李永辉', proctorPerson: '马俊伟', standard: '巡视表单、通话记录', remark: '备注'}, - {id: 1, lineName: '±500kV永富直', workContent: '500kV草宝甲线开展2次/月巡视，按全线开展。开展2次巡视，第2次执行关键重要区段巡视。2、关键重要区段：（1）关键交叉跨越管控区段：#001-#003、#046-#047 （2）重要交叉跨越管控区段：#107-#108、#115-#116 ', planStartTime: '2024-03-01', planEndTime: '2024-03-31', liablePerson: '周应福、毕兴武、李永辉', proctorPerson: '马俊伟', standard: '巡视表单、通话记录', remark: '备注'}, - {id: 1, lineName: '±500kV永富直', workContent: '500kV草宝甲线开展2次/月巡视，按全线开展。开展2次巡视，第2次执行关键重要区段巡视。2、关键重要区段：（1）关键交叉跨越管控区段：#001-#003、#046-#047 （2）重要交叉跨越管控区段：#107-#108、#115-#116 ', planStartTime: '2024-03-01', planEndTime: '2024-03-31', liablePerson: '周应福、毕兴武、李永辉', proctorPerson: '马俊伟', standard: '巡视表单、通话记录', remark: '备注'}, - {id: 1, lineName: '±500kV永富直', workContent: '500kV草宝甲线开展2次/月巡视，按全线开展。开展2次巡视，第2次执行关键重要区段巡视。2、关键重要区段：（1）关键交叉跨越管控区段：#001-#003、#046-#047 （2）重要交叉跨越管控区段：#107-#108、#115-#116 ', planStartTime: '2024-03-01', planEndTime: '2024-03-31', liablePerson: '周应福、毕兴武、李永辉', proctorPerson: '马俊伟', standard: '巡视表单、通话记录', remark: '备注'}, - {id: 1, lineName: '±500kV永富直', workContent: '500kV草宝甲线开展2次/月巡视，按全线开展。开展2次巡视，第2次执行关键重要区段巡视。2、关键重要区段：（1）关键交叉跨越管控区段：#001-#003、#046-#047 （2）重要交叉跨越管控区段：#107-#108、#115-#116 ', planStartTime: '2024-03-01', planEndTime: '2024-03-31', liablePerson: '周应福、毕兴武、李永辉', proctorPerson: '马俊伟', standard: '巡视表单、通话记录', remark: '备注'}, - {id: 1, lineName: '±500kV永富直', workContent: '500kV草宝甲线开展2次/月巡视，按全线开展。开展2次巡视，第2次执行关键重要区段巡视。2、关键重要区段：（1）关键交叉跨越管控区段：#001-#003、#046-#047 （2）重要交叉跨越管控区段：#107-#108、#115-#116 ', planStartTime: '2024-03-01', planEndTime: '2024-03-31', liablePerson: '周应福、毕兴武、李永辉', proctorPerson: '马俊伟', standard: '巡视表单、通话记录', remark: '备注'}, - {id: 1, lineName: '±500kV永富直', workContent: '500kV草宝甲线开展2次/月巡视，按全线开展。开展2次巡视，第2次执行关键重要区段巡视。2、关键重要区段：（1）关键交叉跨越管控区段：#001-#003、#046-#047 （2）重要交叉跨越管控区段：#107-#108、#115-#116 ', planStartTime: '2024-03-01', planEndTime: '2024-03-31', liablePerson: '周应福、毕兴武、李永辉', proctorPerson: '马俊伟', standard: '巡视表单、通话记录', remark: '备注'}, - {id: 1, lineName: '±500kV永富直', workContent: '500kV草宝甲线开展2次/月巡视，按全线开展。开展2次巡视，第2次执行关键重要区段巡视。2、关键重要区段：（1）关键交叉跨越管控区段：#001-#003、#046-#047 （2）重要交叉跨越管控区段：#107-#108、#115-#116 ', planStartTime: '2024-03-01', planEndTime: '2024-03-31', liablePerson: '周应福、毕兴武、李永辉', proctorPerson: '马俊伟', standard: '巡视表单、通话记录', remark: '备注'}, - {id: 1, lineName: '±500kV永富直', workContent: '500kV草宝甲线开展2次/月巡视，按全线开展。开展2次巡视，第2次执行关键重要区段巡视。2、关键重要区段：（1）关键交叉跨越管控区段：#001-#003、#046-#047 （2）重要交叉跨越管控区段：#107-#108、#115-#116 ', planStartTime: '2024-03-01', planEndTime: '2024-03-31', liablePerson: '周应福、毕兴武、李永辉', proctorPerson: '马俊伟', standard: '巡视表单、通话记录', remark: '备注'}, - {id: 1, lineName: '±500kV永富直', workContent: '500kV草宝甲线开展2次/月巡视，按全线开展。开展2次巡视，第2次执行关键重要区段巡视。2、关键重要区段：（1）关键交叉跨越管控区段：#001-#003、#046-#047 （2）重要交叉跨越管控区段：#107-#108、#115-#116 ', planStartTime: '2024-03-01', planEndTime: '2024-03-31', liablePerson: '周应福、毕兴武、李永辉', proctorPerson: '马俊伟', standard: '巡视表单、通话记录', remark: '备注'}, - {id: 1, lineName: '±500kV永富直', workContent: '500kV草宝甲线开展2次/月巡视，按全线开展。开展2次巡视，第2次执行关键重要区段巡视。2、关键重要区段：（1）关键交叉跨越管控区段：#001-#003、#046-#047 （2）重要交叉跨越管控区段：#107-#108、#115-#116 ', planStartTime: '2024-03-01', planEndTime: '2024-03-31', liablePerson: '周应福、毕兴武、李永辉', proctorPerson: '马俊伟', standard: '巡视表单、通话记录', remark: '备注'}, - {id: 1, lineName: '±500kV永富直', workContent: '500kV草宝甲线开展2次/月巡视，按全线开展。开展2次巡视，第2次执行关键重要区段巡视。2、关键重要区段：（1）关键交叉跨越管控区段：#001-#003、#046-#047 （2）重要交叉跨越管控区段：#107-#108、#115-#116 ', planStartTime: '2024-03-01', planEndTime: '2024-03-31', liablePerson: '周应福、毕兴武、李永辉', proctorPerson: '马俊伟', standard: '巡视表单、通话记录', remark: '备注'}, - {id: 1, lineName: '±500kV永富直', workContent: '500kV草宝甲线开展2次/月巡视，按全线开展。开展2次巡视，第2次执行关键重要区段巡视。2、关键重要区段：（1）关键交叉跨越管控区段：#001-#003、#046-#047 （2）重要交叉跨越管控区段：#107-#108、#115-#116 ', planStartTime: '2024-03-01', planEndTime: '2024-03-31', liablePerson: '周应福、毕兴武、李永辉', proctorPerson: '马俊伟', standard: '巡视表单、通话记录', remark: '备注'}, - {id: 1, lineName: '±500kV永富直', workContent: '500kV草宝甲线开展2次/月巡视，按全线开展。开展2次巡视，第2次执行关键重要区段巡视。2、关键重要区段：（1）关键交叉跨越管控区段：#001-#003、#046-#047 （2）重要交叉跨越管控区段：#107-#108、#115-#116 ', planStartTime: '2024-03-01', planEndTime: '2024-03-31', liablePerson: '周应福、毕兴武、李永辉', proctorPerson: '马俊伟', standard: '巡视表单、通话记录', remark: '备注'}, - {id: 1, lineName: '±500kV永富直', workContent: '500kV草宝甲线开展2次/月巡视，按全线开展。开展2次巡视，第2次执行关键重要区段巡视。2、关键重要区段：（1）关键交叉跨越管控区段：#001-#003、#046-#047 （2）重要交叉跨越管控区段：#107-#108、#115-#116 ', planStartTime: '2024-03-01', planEndTime: '2024-03-31', liablePerson: '周应福、毕兴武、李永辉', proctorPerson: '马俊伟', standard: '巡视表单、通话记录', remark: '备注'}, - ]; - + init() +}); +var yjIds,insMonths; + +// 静态数据 +var tableData = []; + /** * 初始化数据 */ @@ -58,36 +31,125 @@ function init(){ type: 'numbers', width: '5%' }, - {field:'lineName', title: '线路名称',align: 'center'}, + {field:'proName', title: '线路名称',align: 'center'}, {field:'workContent', title: '工作内容',align: 'center'}, - {field:'planStartTime', title: '计划开始时间',align: 'center'}, - {field:'planEndTime', title: '计划结束时间',align: 'center'}, - {field:'liablePerson', title: '责任人（护线员）',align: 'center'}, - {field:'proctorPerson', title: '督办人（设备主人）',align: 'center'}, - {field:'standard', title: '完成标准',align: 'center'}, - {field:'remark', title: '备注',align: 'center'}, + {field:'stateTime', title: '计划开始时间',align: 'center'}, + {field:'enTime', title: '计划结束时间',align: 'center'}, + {field:'dutyUser', title: '责任人（护线员）',align: 'center'}, + {field:'supervisor', title: '督办人（设备主人）',align: 'center'}, + {field:'complete', title: '完成标准',align: 'center'}, + {field:'remarks', title: '备注',align: 'center'}, ]], data: tableData, done: function(res, curr, count, origin){ - console.log(res); // 得到当前渲染的数据 - console.log(curr); // 得到当前页码 - console.log(count); // 得到数据总量 - console.log(origin); // 回调函数所执行的来源 --- 2.8.7+ - laydate.render({ - elem: '.planStartTime' - }); - laydate.render({ - elem: '.planEndTime' - }); + }, }); } +function setData(data,yjId,insMonth){ + yjIds = yjId; + insMonths = insMonth; + if(data.length>0){ + $('#fgsName').html(data[0].fgsName); + $('#yjName').html(data[0].yjName); + $('#insMonth').html(data[0].insMonth); + + setAiDitStatus(data[0].aiDitStatus); + + $('#createUser').html(data[0].createUser); + $('#createTime').html(data[0].createTime); + + //分公司 + if(data[0].aiDitStatuses){ + $('#aiDitStatuses').html(data[0].aiDitStatuses); + $('#auditUserName').html(data[0].auditUserName); + $('#auditTime').html(data[0].auditTime); + }else{ + $('#aiDitStatuses').html(""); + $('#auditUserName').html(""); + $('#auditTime').html(""); + } + + //总公司 + if(data[0].aiDitStatusTotal){ + $('#aiDitStatusTotal').html(data[0].aiDitStatusTotal); + $('#auditUserNameTotal').html(data[0].auditUserNameTotal); + $('#auditTimeTotal').html(data[0].auditTimeTotal); + }else{ + $('#aiDitStatusTotal').html(""); + $('#auditUserNameTotal').html(""); + $('#auditTimeTotal').html(""); + } + + for (var i = 0; i < data.length; i++) { + tableData.push({ + id: data[i].id, + proName: data[i].proName, + yjId:data[i].yjId, + insMonth:data[i].insMonth, + + workContent:data[i].workContent, + stateTime:data[i].stateTime, + enTime:data[i].enTime, + dutyUser:data[i].dutyUser, + supervisor:data[i].supervisor, + complete:data[i].complete, + remarks:data[i].remarks, + + }) + } + init(); + }else{ + layer.alert("无数据，请联系管理员", { + icon: 2 + }); + } +} + + +function setAiDitStatus(status){ + $("#subComName").empty(); + var text; + var color; + var html = ""; + if(status == '2'){ + text = '已通过'; + color = '#19BE6B'; + } + if(status == '0'){ + text = '待审核'; + color = '#FF9900'; + } + if(status == '3'){ + text = '未通过'; + color = '#F56C6C'; + } + if(status == '1'){ + text = '已撤销'; + color = '#999999'; + } + html += "" + html += `  ` + html += `${text}` + html += "" + + $("#subComName").append(html); +} + //导出 function exportData(){ - // let search1 = $('#search1').val(); - // let search2 = $('#search2').val(); - window.location.href = oiPlanUrl + "/monthlyPlanSubmission/export?token=" + token; + + + window.location.href = PATH_URL + `/inspectionPlan/exportMonthPlanData?token=` + token + + "&insMonth=" + insMonths + + "&yjId=" + yjIds + + + layer.msg('下载中,请稍等', { + icon: 16, + scrollbar: false + }); } \ No newline at end of file diff --git a/hxy-web/js/wireManager/viewPlan/monthPlanImport.js b/hxy-web/js/wireManager/viewPlan/monthPlanImport.js index 45a1d72..b4da0dd 100644 --- a/hxy-web/js/wireManager/viewPlan/monthPlanImport.js +++ b/hxy-web/js/wireManager/viewPlan/monthPlanImport.js @@ -5,83 +5,64 @@ var trainFilePaths = []; var examFileNames = []; var examFilePaths = []; -layui.use(['layer', 'form', 'upload'], function () { - var upload1 = layui.upload; - var upload2 = layui.upload; - var form = layui.form; - var layer = layui.layer; - - getProjectSelect(); - - - $("#closeBt").click(function () { - var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引 - parent.layer.close(index); //再执行关闭 - }); - $("#saveBt").click(function () { - - if(!$('#file')[0].files[0]){ - layer.msg("请上传填好的信息表", { icon: 0 }) - return - } - - $("#hideUpload1").trigger("click"); - - excelUpload(); - }); - -}); - -function importData() { - var fileData = new FormData(); - fileData.append('file', $('#file')[0].files[0]); - // 加载提示 - loadingMsg = top.layer.msg('数据上传中,请稍候...', {icon: 16, scrollbar: false, time: 0, shade: [0.8, '#393D49']}); - // form请求地址 - var formUrl = oiPlanUrl + "/monthlyPlanSubmission/importData"; - $.ajax({ - type: 'POST', - url: formUrl, // 请求地址 - data: fileData, - processData: false, - contentType: false, - success: function (data) { - top.layer.close(loadingMsg); //再执行关闭 - if (data.code == 200) { - top.layer.alert(data.msg); - - reloading(); - } else { - top.layer.alert(data.msg, {icon: 2}); - } - }, - error: function (XMLHttpRequest, textStatus, e) { - layer.msg('数据请求发生异常,请稍后重试', {icon: 16, scrollbar: false}); - top.layer.close(addLoadingMsg); //再执行关闭 - } - }); +function setYjId(yjId){ + layui.use(['layer', 'form', 'upload'], function () { + var upload1 = layui.upload; + var upload2 = layui.upload; + var form = layui.form; + var layer = layui.layer; + + $("#closeBt").click(function () { + var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引 + parent.layer.close(index); //再执行关闭 + }); + $("#saveBt").click(function () { + + if(!$('#file')[0].files[0]){ + layer.msg("请上传填好的信息表", { icon: 0 }) + return + } + excelUploads(yjId); + }); + + }); } -function excelUpload() { - loadingMsg = top.layer.msg('数据上传中,请稍候...', {icon: 16, scrollbar: false, time: 0, shade: [0.8, '#393D49']}); //④创建一个formData对象 + + +function getNextMonth(currentDate) { + let nextMonth = new Date(currentDate); + nextMonth.setMonth(nextMonth.getMonth() + 1); + // 确保日期格式为 YYYY-MM + let year = nextMonth.getFullYear(); + let month = (nextMonth.getMonth() + 1).toString().padStart(2, '0'); + return `${year}-${month}`; +} + +function excelUploads(yjId) { + let currentDate = new Date(); + let nextMonth = getNextMonth(currentDate); + console.log(nextMonth); + loadingMsg = layer.msg('数据上传中,请稍候...', {icon: 16, scrollbar: false, time: 0, shade: [0.8, '#393D49']}); //④创建一个formData对象 var fileData = new FormData(); fileData.append('file', $('#file')[0].files[0]); + fileData.append('insMonth', nextMonth); + fileData.append('yjId', yjId); $.ajax({ - url : oiPlanUrl + "/monthlyPlanSubmission/importData", + url : PATH_URL + "/inspectionPlan/importData", type : 'POST', data : fileData, processData : false,// ⑧告诉jQuery不要去处理发送的数据 contentType : false, // ⑨告诉jQuery不要去设置Content-Type请求头 success : function(result) { console.log(result) - top.layer.close(loadingMsg); - if (result.data.success) { - layer.msg(result.data.msg,{icon:1,time:1500},function () { - // reloadData(); - reloading(); - }); + layer.close(loadingMsg); + if (result.code == 200) { + parent.layer.alert(result.msg,{icon:1}); + var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引 + parent.layer.close(index); //再执行关闭 } else { - showModal(result.data); + layer.alert(result.msg,{icon:2}); } }, error : function(XMLHttpRequest, textStatus, errorThrown,result) { diff --git a/hxy-web/js/wireManager/viewPlan/revokeMonthPlan.js b/hxy-web/js/wireManager/viewPlan/revokeMonthPlan.js index b25cbb0..628b7dd 100644 --- a/hxy-web/js/wireManager/viewPlan/revokeMonthPlan.js +++ b/hxy-web/js/wireManager/viewPlan/revokeMonthPlan.js @@ -5,21 +5,66 @@ var upload; var id; var formData; - -layui.use(['form', 'table', 'upload'], function () { - let form = layui.form; //只有执行了这一步，部分表单元素才会自动修饰成功 - form.render(); - upload = layui.upload; - - - form.on('submit(formDemo)', function (data) { - }); +function setData(yjId,insMonth){ + layui.use(['form', 'table', 'upload'], function () { + let form = layui.form; //只有执行了这一步，部分表单元素才会自动修饰成功 + form.render(); + upload = layui.upload; - $("#closeBt").click(function(){ - var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引 - parent.layer.close(index); //再执行关闭 + + form.on('submit(formDemo)', function (data) { + edit(yjId,insMonth); + }); + + $("#closeBt").click(function(){ + var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引 + parent.layer.close(index); //再执行关闭 + }); + + + + }); +} + +function edit(yjId,insMonth){ + var reason = $("#revokeReason").val(); + // 加载提示 + let loadingMsg = layer.msg('数据上传中,请稍候...', { + icon: 16, + scrollbar: false, + time: 0, + shade: [0.8, '#393D49'] + }); + $.ajax({ + type: 'POST', + url: PATH_URL + '/inspectionPlan/updateRevokeReason', + contentType: "application/json; charset=utf-8", + data: JSON.stringify({ "yjId": yjId,"insMonth": insMonth,"reason":"" }), + 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.close(index); //再执行关闭 + } else { + layer.alert(data.msg); + } + }, + error: function(XMLHttpRequest, textStatus, e) { + layer.close(loadingMsg); + layer.msg('数据请求发生异常,请稍后重试', { + icon: 16, + scrollbar: false + }); + } }) -}); +} + + //设置弹窗关闭 function reloading() { diff --git a/hxy-web/js/wireManager/viewPlan/updateMonthPlan.js b/hxy-web/js/wireManager/viewPlan/updateMonthPlan.js index 5d2f187..e954139 100644 --- a/hxy-web/js/wireManager/viewPlan/updateMonthPlan.js +++ b/hxy-web/js/wireManager/viewPlan/updateMonthPlan.js @@ -1,179 +1,199 @@ - - var pers = [] -var table,form,laydate -layui.use(['form','layer','table','laydate'], function () { - table = layui.table; - form = layui.form; - laydate = layui.laydate - - - - table.on('tool(table)', function (obj) { - switch (obj.event) { - case 'details': - console.log('详情',obj) - detailsView(obj.id) - break; - case 'uploadResult': - console.log('上传结果',obj) - updateView() - break; - } - }); - init(); - -}); +var table, form, laydate +var yjIds,insMonths - // 静态数据 - var tableData = [ - {id: 1, lineName: '±500kV永富直'}, - {id: 1, lineName: '±500kV永富直'}, - {id: 1, lineName: '±500kV永富直'}, - {id: 1, lineName: '±500kV永富直'}, - {id: 1, lineName: '±500kV永富直'}, - {id: 1, lineName: '±500kV永富直'}, - {id: 1, lineName: '±500kV永富直'}, - {id: 1, lineName: '±500kV永富直'}, - {id: 1, lineName: '±500kV永富直'}, - {id: 1, lineName: '±500kV永富直'}, - {id: 1, lineName: '±500kV永富直'}, - {id: 1, lineName: '±500kV永富直'}, - {id: 1, lineName: '±500kV永富直'}, - {id: 1, lineName: '±500kV永富直'}, - {id: 1, lineName: '±500kV永富直'}, - {id: 1, lineName: '±500kV永富直'}, - ]; - +// 静态数据 +var tableData = []; /** * 初始化数据 */ -function init(){ - // 渲染表格 - table.render({ - elem: '#table', - // url: "/sys/achievement", - // page: true, - skin: 'line', // 表格样式 - cols: [[ - { - title: '序号', - field: 'zizeng', - align: 'center', - type: 'numbers', - width: '5%' - }, - {field:'lineName', title: '线路名称',align: 'center',width: '15%'}, - { - field: '', - title: '工作内容', - align: 'center', - templet: function(d){ - var id = d.id - var html = ``; - return html; - }, +function init() { + // 渲染表格 + table.render({ + elem: '#table', + // url: "/sys/achievement", + // page: true, + skin: 'line', // 表格样式 + cols: [ + [{ + title: '序号', + field: 'zizeng', + align: 'center', + type: 'numbers', + width: '5%' + }, + { + field: 'proName', + title: '线路名称', + align: 'center', + width: '15%' + }, + { + field: '', + title: '工作内容', + align: 'center', + templet: function(d) { + var id = d.id + var workContent = d.workContent + var yjId = d.yjId; + var proName = d.proName; + var insMonth = d.insMonth; + var html = + ``; + return html; + }, + }, + { + field: '', + title: '计划开始时间', + align: 'center', + templet: function(d) { + var id = d.id + var stateTime = d.stateTime + var html = + ``; + return html; + }, + }, + { + field: '', + title: '计划结束时间', + align: 'center', + templet: function(d) { + var id = d.id + var enTime = d.enTime + var html = + ``; + return html; + }, + }, + { + field: '', + title: '责任人（护线员）', + align: 'center', + templet: function(d) { + var id = d.id + var dutyUser = d.dutyUser + var html = + ``; + return html; + }, + }, + { + field: '', + title: '督办人（设备主人）', + align: 'center', + templet: function(d) { + var id = d.id + var supervisor = d.supervisor + var html = + ``; + return html; + }, + }, + { + field: '', + title: '完成标准', + align: 'center', + templet: function(d) { + var id = d.id + var complete = d.complete + var html = + ``; + return html; + }, + }, + { + field: '', + title: '备注', + align: 'center', + templet: function(d) { + var id = d.id + var remarks = d.remarks + var html = + ``; + return html; + }, + } + ] + ], + data: tableData, + done: function(res, curr, count, origin) { + + // 初始化开始时间和结束时间的变量 + var startDate = null; + var endDate = null; + 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('结束时间不能早于开始时间！'); + } + } + } + }); }, - { - field: '', - title: '计划开始时间', - align: 'center', - templet: function(d){ - var id = d.id - var html = ``; - return html; - }, - }, - { - field: '', - title: '计划结束时间', - align: 'center', - templet: function(d){ - var id = d.id - var html = ``; - return html; - }, - }, - { - field: '', - title: '责任人（护线员）', - align: 'center', - templet: function(d){ - var id = d.id - var html = ``; - return html; - }, - }, - { - field: '', - title: '督办人（设备主人）', - align: 'center', - templet: function(d){ - var id = d.id - var html = ``; - return html; - }, - }, - { - field: '', - title: '完成标准', - align: 'center', - templet: function(d){ - var id = d.id - var html = ``; - return html; - }, - }, - { - field: '', - title: '备注', - align: 'center', - templet: function(d){ - var id = d.id - var html = ``; - return html; - }, - } - ]], - data: tableData, - done: function(res, curr, count, origin){ - console.log(res); // 得到当前渲染的数据 - console.log(curr); // 得到当前页码 - console.log(count); // 得到数据总量 - console.log(origin); // 回调函数所执行的来源 --- 2.8.7+ - laydate.render({ - elem: '.planStartTime' - }); - laydate.render({ - elem: '.planEndTime' - }); - }, - }); - + }); + } //提交月计划 -function saveMonthPlan(){ +function saveMonthPlan() { //获取工作内容 DOM var workContents = $(".workContent"); //获取计划开始时间 DOM - var planStartTimes = $(".planStartTime"); + var planStartTimes = $(".planStartTime"); //获取计划结束时间 DOM - var planEndTimes = $(".planEndTime"); + var planEndTimes = $(".planEndTime"); //获取责任人（护线员） DOM - var liablePersons = $(".liablePerson"); + var liablePersons = $(".liablePerson"); //获取督办人（设备主人） DOM - var proctorPersons = $(".proctorPerson"); + var proctorPersons = $(".proctorPerson"); //获取完成标准 DOM - var standards = $(".standard"); + var standards = $(".standard"); //获取备注 DOM var remarks = $(".remark"); - + var arr = []; //循环获取的 DOM，将数据整合 for (var i = 0; i < workContents.length; i++) { //获取此行数据 的id var id = $(workContents[i]).attr("key"); + var yjId = $(workContents[i]).attr("yjId"); + var proName = $(workContents[i]).attr("proName"); + var insMonth = $(workContents[i]).attr("insMonth"); + //获取工作内容 var workContent = $(workContents[i]).val(); //获取计划开始时间 @@ -188,75 +208,223 @@ function saveMonthPlan(){ var standard = $(standards[i]).val(); //获取备注 var remark = $(remarks[i]).val(); - - if(workContent == ""){ - layer.msg("请填写工作内容", {icon: 0}); + + if (workContent == "") { + layer.msg("请填写工作内容", { + icon: 0 + }); $(workContents[i]).focus(); return; } - if(planStartTime == ""){ - layer.msg("请填写计划开始时间", {icon: 0}); + if (planStartTime == "") { + layer.msg("请填写计划开始时间", { + icon: 0 + }); $(planStartTimes[i]).focus(); return; } - if(planEndTime == ""){ - layer.msg("请填写计划结束时间", {icon: 0}); + if (planEndTime == "") { + layer.msg("请填写计划结束时间", { + icon: 0 + }); $(planEndTimes[i]).focus(); return; } - if(liablePerson == ""){ - layer.msg("请填写责任人（护线员）", {icon: 0}); + if (liablePerson == "") { + layer.msg("请填写责任人（护线员）", { + icon: 0 + }); $(liablePersons[i]).focus(); return; } - if(proctorPerson == ""){ - layer.msg("请填写督办人（设备主人）", {icon: 0}); + if (proctorPerson == "") { + layer.msg("请填写督办人（设备主人）", { + icon: 0 + }); $(proctorPersons[i]).focus(); return; } - if(standard == ""){ - layer.msg("请填写完成标准", {icon: 0}); + if (standard == "") { + layer.msg("请填写完成标准", { + icon: 0 + }); $(standards[i]).focus(); return; } - if(remark == ""){ - layer.msg("请填写备注", {icon: 0}); + if (remark == "") { + layer.msg("请填写备注", { + icon: 0 + }); $(remarks[i]).focus(); return; } - + var json = { "id": id, + "yjId": yjId, "workContent": workContent, - "planStartTime": planStartTime, - "planEndTime": planEndTime, - "liablePerson": liablePerson, - "proctorPerson": proctorPerson, - "standard": standard, - "remark": remark + "stateTime": planStartTime, + "enTime": planEndTime, + "dutyUser": liablePerson, + "supervisor": proctorPerson, + "complete": standard, + "remarks": remark } arr.push(json); console.log(arr) - + } + + // 加载提示 + let loadingMsg = layer.msg('数据上传中,请稍候...', { + icon: 16, + scrollbar: false, + time: 0, + shade: [0.8, '#393D49'] + }); + + // form请求地址 + let formUrl = PATH_URL + "/inspectionPlan/updateInspectionPlan"; + $.ajax({ + type: 'POST', + url: formUrl, // 请求地址 + contentType: "application/json; charset=utf-8", + data: JSON.stringify(arr), + 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.close(index); //再执行关闭 + } else { + layer.alert(data.msg); + } + }, + error: function(XMLHttpRequest, textStatus, e) { + layer.close(loadingMsg); + layer.msg('数据请求发生异常,请稍后重试', { + icon: 16, + scrollbar: false + }); + } + }); } //撤销月计划 -function revokeMonthPlan(){ - let height = '60%'; - let width = '40%'; +function revokeMonthPlan() { + let height = '63%'; + let width = '43%'; var index = layer.open({ - title: ['计划撤销', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], - type: 2, - content: './revokeMonthPlan.html', - area: [width, height], - maxmin: false, - success: function (layero, index) { - // var myIframe = window[layero.find('iframe')[0]['name']]; - // myIframe.hideSubmit(); - // var fnc = myIframe.setData(data.data); //aaa()为子页面的方法 - - }, + title: ['计划撤销', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], + type: 2, + content: './revokeMonthPlan.html', + area: [width, height], + maxmin: false, + success: function(layero, index) { + var myIframe = window[layero.find('iframe')[0]['name']]; + var fnc = myIframe.setData(yjIds,insMonths); //aaa()为子页面的方法 + }, + }); +} + +function setData(data, yjId, insMonth) { + layui.use(['form', 'layer', 'table', 'laydate'], function() { + table = layui.table; + form = layui.form; + laydate = layui.laydate + + + yjIds = yjId; + insMonths = insMonth; + if (data.length > 0) { + $('#fgsName').html(data[0].fgsName); + $('#yjName').html(data[0].yjName); + $('#insMonth').html(data[0].insMonth); + + setAiDitStatus(data[0].aiDitStatus); + + $('#createUser').html(data[0].createUser); + $('#createTime').html(data[0].createTime); + + //分公司 + if (data[0].aiDitStatuses) { + $('#aiDitStatuses').html(data[0].aiDitStatuses); + $('#auditUserName').html(data[0].auditUserName); + $('#auditTime').html(data[0].auditTime); + } else { + $('#aiDitStatuses').html(""); + $('#auditUserName').html(""); + $('#auditTime').html(""); + } + + //总公司 + if (data[0].aiDitStatusTotal) { + $('#aiDitStatusTotal').html(data[0].aiDitStatusTotal); + $('#auditUserNameTotal').html(data[0].auditUserNameTotal); + $('#auditTimeTotal').html(data[0].auditTimeTotal); + } else { + $('#aiDitStatusTotal').html(""); + $('#auditUserNameTotal').html(""); + $('#auditTimeTotal').html(""); + } + + for (var i = 0; i < data.length; i++) { + tableData.push({ + id: data[i].id, + proName: data[i].proName, + yjId: data[i].yjId, + insMonth: data[i].insMonth, + + workContent: data[i].workContent, + stateTime: data[i].stateTime, + enTime: data[i].enTime, + dutyUser: data[i].dutyUser, + supervisor: data[i].supervisor, + complete: data[i].complete, + remarks: data[i].remarks, + + }) + } + init(); + } else { + layer.alert("无数据，请联系管理员", { + icon: 2 + }); + } + init(); + }); +} + + +function setAiDitStatus(status) { + $("#subComName").empty(); + var text; + var color; + var html = ""; + if (status == '2') { + text = '已通过'; + color = '#19BE6B'; + } + if (status == '0') { + text = '待审核'; + color = '#FF9900'; + } + if (status == '3') { + text = '未通过'; + color = '#F56C6C'; + } + if (status == '1') { + text = '已撤销'; + color = '#999999'; + } + html += "" + html += `  ` + html += `${text}` + html += "" + + $("#subComName").append(html); } \ No newline at end of file diff --git a/hxy-web/js/wireManager/viewPlan/viewPlanList.js b/hxy-web/js/wireManager/viewPlan/viewPlanList.js index 0e40459..68602ef 100644 --- a/hxy-web/js/wireManager/viewPlan/viewPlanList.js +++ b/hxy-web/js/wireManager/viewPlan/viewPlanList.js @@ -1,5 +1,3 @@ - - var pers = [] var table,form,laydate layui.use(['form','layer','table','laydate'], function () { @@ -9,81 +7,62 @@ layui.use(['form','layer','table','laydate'], function () { //初始化日期选择框 laydate.render({ - elem: '#dataTime', + elem: '#insMonth', type: 'month', + value: (new Date()).toISOString().substr(0, 7), // 获取当前日期并转换为'yyyy-MM'格式 + btns: ['now', 'confirm'] }); - // 触发submit提交 按钮点击或者表单被执行提交时触发 - form.on('submit(query)', function (data) { - console.log("搜索") - // 对表格进行重载。id 即 table表格的id - table.reload('table', { - // //设定异步数据接口的额外参数 - page:{curr : 1} - ,where: data.field - }) - return false; // 阻止表单跳转。如果需要表单跳转，去掉这段即可。 - }); - $("#reset").click(function(){ - console.log("重置") - $('#search1').val(''); - $('#search2').val(''); - $('#search3').val(''); - let obj = { - search1:'', - search2:'', - search3:'' - } - // 对表格进行重载。id 即 table表格的id - table.reload('table', { - // //设定异步数据接口的额外参数 - page:{curr : 1} - ,where: obj - }) - }) - - table.on('tool(table)', function (obj) { - switch (obj.event) { - case 'details': - console.log('详情',obj) - detailsView(obj.id) - break; - case 'uploadResult': - console.log('上传结果',obj) - updateView() - break; - } - }); - init(); + init(); }); - // 静态数据 - var tableData = [ - {id: 1, comName: '运检一公司',sName: '昆明运检一站', month: '2024-03', workPlan: '21', subPerson: '郭福林', subTime: '2024-02-28 18:10:10', status: '1'}, - {id: 1, comName: '运检一公司',sName: '昆明运检一站', month: '2024-03', workPlan: '21', subPerson: '郭福林', subTime: '2024-02-28 18:10:10', status: '1'}, - {id: 1, comName: '运检一公司',sName: '昆明运检一站', month: '2024-03', workPlan: '21', subPerson: '郭福林', subTime: '2024-02-28 18:10:10', status: '1'}, - {id: 1, comName: '运检一公司',sName: '昆明运检一站', month: '2024-03', workPlan: '21', subPerson: '郭福林', subTime: '2024-02-28 18:10:10', status: '2'}, - {id: 1, comName: '运检一公司',sName: '昆明运检一站', month: '2024-03', workPlan: '21', subPerson: '郭福林', subTime: '2024-02-28 18:10:10', status: '2'}, - {id: 1, comName: '运检一公司',sName: '昆明运检一站', month: '2024-03', workPlan: '21', subPerson: '郭福林', subTime: '2024-02-28 18:10:10', status: '2'}, - {id: 1, comName: '运检一公司',sName: '昆明运检一站', month: '2024-03', workPlan: '21', subPerson: '郭福林', subTime: '2024-02-28 18:10:10', status: '3'}, - {id: 1, comName: '运检一公司',sName: '昆明运检一站', month: '2024-03', workPlan: '21', subPerson: '郭福林', subTime: '2024-02-28 18:10:10', status: '3'}, - {id: 1, comName: '运检一公司',sName: '昆明运检一站', month: '2024-03', workPlan: '21', subPerson: '郭福林', subTime: '2024-02-28 18:10:10', status: '3'}, - {id: 1, comName: '运检一公司',sName: '昆明运检一站', month: '2024-03', workPlan: '21', subPerson: '郭福林', subTime: '2024-02-28 18:10:10', status: '4'}, - {id: 1, comName: '运检一公司',sName: '昆明运检一站', month: '2024-03', workPlan: '21', subPerson: '郭福林', subTime: '2024-02-28 18:10:10', status: '4'}, - {id: 1, comName: '运检一公司',sName: '昆明运检一站', month: '2024-03', workPlan: '21', subPerson: '郭福林', subTime: '2024-02-28 18:10:10', status: '4'}, - {id: 1, comName: '运检一公司',sName: '昆明运检一站', month: '2024-03', workPlan: '21', subPerson: '郭福林', subTime: '2024-02-28 18:10:10', status: '4'}, - {id: 1, comName: '运检一公司',sName: '昆明运检一站', month: '2024-03', workPlan: '21', subPerson: '郭福林', subTime: '2024-02-28 18:10:10', status: '4'} - ]; +//查询 +function queryClick(){ + let insMonth = $('#insMonth').val(); + let aiDitStatus = $('#aiDitStatus').val(); + table.reload('layui_table', { + where: { + yjId:$(window.parent.document).find("input[id='taskSourceId']").attr("stationId"), + insMonth: insMonth, + aiDitStatus: aiDitStatus, + } + }) +} +//重置 +function resetClick(){ + var today = new Date(); + var year = today.getFullYear(); + var month = today.getMonth() + 1; + if (month < 10) { + month = '0' + month; + } + var currentMonth = year + '-' + month; + $('#insMonth').val(currentMonth); + $('#aiDitStatus').val(''); + form.render(); + table.reload('layui_table', { + where: { + yjId: "", + insMonth: $('#insMonth').val(), + aiDitStatus: "", + } + }) +} - /** * 初始化数据 */ function init(){ // 渲染表格 table.render({ + id: 'layui_table', elem: '#table', - // url: "/sys/achievement", - page: true, + url: PATH_URL + '/inspectionPlan/getLineProjectListPage', + where: { + insMonth:$('#insMonth').val(), + yjId:$(window.parent.document).find("input[id='taskSourceId']").attr("stationId") + }, + page: true, + method:'post', skin: 'line', // 表格样式 cols: [[ { @@ -93,27 +72,27 @@ function init(){ type: 'numbers', width: '5%' }, - {field:'comName', title: '分公司',align: 'center',width: '15%'}, - {field:'sName', title: '运检站',align: 'center',width: '15%'}, - {field:'month', title: '月份',align: 'center',width: '6%'}, - {field:'workPlan', title: '工程计划数量',align: 'center',width: '7%'}, - {field:'subPerson', title: '提交人',align: 'center',width: '7%'}, - {field:'subTime', title: '提交时间',align: 'center',width: '15%'}, + {field:'fgsName', title: '分公司',align: 'center',width: '15%'}, + {field:'yjName', title: '运检站',align: 'center',width: '15%'}, + {field:'insMonth', title: '月份',align: 'center',width: '6%'}, + {field:'proPlanNum', title: '工程计划数量',align: 'center',width: '7%'}, + {field:'createUser', title: '提交人',align: 'center',width: '7%'}, + {field:'createTime', title: '提交时间',align: 'center',width: '15%'}, { field: '', title: '审核状态', align: 'center', width: '10%', templet: function(d){ - var status = d.status; + var status = d.aiDitStatus; var text; var color; var html = ""; - if(status == '1'){ - text = '已审核'; + if(status == '2'){ + text = '已通过'; color = '#19BE6B'; } - if(status == '2'){ + if(status == '0'){ text = '待审核'; color = '#FF9900'; } @@ -121,7 +100,7 @@ function init(){ text = '未通过'; color = '#F56C6C'; } - if(status == '4'){ + if(status == '1'){ text = '已撤销'; color = '#999999'; } @@ -138,152 +117,183 @@ function init(){ align: 'center', width: '20%', templet: function(d){ - var id= d.id; - var status = d.status; + var id = id; + var yjId= d.yjId; + var insMonth= d.insMonth; + var status = d.aiDitStatus; + var status = d.aiDitStatus; var text; var html = ""; - if(status == '1'){ - //已审核 - html += `` - html += `` - } if(status == '2'){ + //已通过 + html += `` + html += `` + } + if(status == '0'){ //待审核 - html += `` - html += `` - html += `` + html += `` + html += `` + html += `` } if(status == '3'){ //未通过 - html += `` - html += `` - html += `` - html += `` + html += `` + html += `` + html += `` + html += `` } - if(status == '4'){ + if(status == '1'){ //已撤销 - html += `` - html += `` - html += `` - html += `` + html += `` + html += `` + html += `` + html += `` } return html; }, } ]], - data: tableData }); } //详情 -function detailsView(id) { - /* $.ajax({ - type: 'post', - contentType: "application/x-www-form-urlencoded", - url: oiPlanUrl + '/monthlyPlanSubmission/getDataById', - dataType: 'json', - data: { - id: id - }, +function detailsView(yjId,insMonth) { + let height = '98%'; + let width = '95%'; + $.ajax({ + type: 'POST', + url: PATH_URL + '/inspectionPlan/getDetails', + contentType: "application/json; charset=utf-8", + data: JSON.stringify({"yjId": yjId,"insMonth": insMonth}), success: function (data) { + console.log("data:", data) + + var index = layer.open({ - title: ['详情', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], + title: ['详情'], type: 2, - content: './wagesReport/producePayrollDetails.html', + content: './monthPlanDetails.html', area: [width, height], maxmin: false, success: function (layero, index) { - console.log(data); + // console.log(data); var myIframe = window[layero.find('iframe')[0]['name']]; - myIframe.hideSubmit(); - // var fnc = myIframe.setData(data.data); //aaa()为子页面的方法 - + // myIframe.hideSubmit(); + var fnc = myIframe.setData(data.data,yjId,insMonth); //aaa()为子页面的方法 + }, }); } - }) */ - - //测试 - let height = '98%'; - let width = '99%'; - var index = layer.open({ - title: ['月计划详情', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], - type: 2, - content: './monthPlanDetails.html', - area: [width, height], - maxmin: false, - success: function (layero, index) { - // var myIframe = window[layero.find('iframe')[0]['name']]; - // myIframe.hideSubmit(); - // var fnc = myIframe.setData(data.data); //aaa()为子页面的方法 - - }, - }); + }) } //撤销 -function revokeView(id){ - layer.confirm("确定撤销吗？", {icon: 0}, function () { - +function revokeView(yjId,insMonth){ + let aiDitStatus = $('#aiDitStatus').val(); + let index = layer.confirm("确定撤销吗？", {icon: 0}, function () { + $.ajax({ + type: 'POST', + url: PATH_URL + '/inspectionPlan/updateRevokeReason', + contentType: "application/json; charset=utf-8", + data: JSON.stringify({ "yjId": yjId,"insMonth": insMonth,"reason":"" }), + success: function (data) { + layer.close(index); + if (data.code == 200) { + layer.confirm("撤销成功", {icon: 1}, function () { + table.reload('layui_table', { + where: { + yjId:yjId, + insMonth: insMonth, + aiDitStatus:aiDitStatus + } + }) + }); + } else { + layer.msg("撤销失败", {icon: 2}, function () { + // example.ajax.reload(); // 刷新页面 + }); + } + } + }) }) } //删除 -function delData(id){ - layer.confirm("确定删除吗？", {icon: 0}, function () { - +function delData(yjId,insMonth){ + let aiDitStatus = $('#aiDitStatus').val(); + let index = layer.confirm("确定删除吗？", {icon: 0}, function () { + $.ajax({ + type: 'POST', + url: PATH_URL + '/inspectionPlan/delPlanId', + contentType: "application/json; charset=utf-8", + data: JSON.stringify({ "yjId": yjId,"insMonth": insMonth }), + success: function (data) { + layer.close(index); + if (data.code == 200) { + layer.msg("删除成功", {icon: 1}, function () { + table.reload('layui_table', { + where: { + yjId:yjId, + insMonth: insMonth, + aiDitStatus:aiDitStatus + } + }) + }); + } else { + layer.msg("删除失败", {icon: 2}, function () { + // example.ajax.reload(); // 刷新页面 + }); + } + } + }) }) } //修改 -function updateView(id) { +function updateView(yjId,insMonth) { let height = '98%'; - let width = '99%'; - /* $.ajax({ - type: 'post', - contentType: "application/x-www-form-urlencoded", - url: oiPlanUrl + '/monthlyPlanSubmission/getDataById', - dataType: 'json', - data: { - id: id - }, + let width = '95%'; + let aiDitStatus = $('#aiDitStatus').val(); + $.ajax({ + type: 'POST', + url: PATH_URL + '/inspectionPlan/getDetails', + contentType: "application/json; charset=utf-8", + data: JSON.stringify({"yjId": yjId,"insMonth": insMonth}), success: function (data) { var index = layer.open({ - title: ['巡视结果上传', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], + title: ['月计划上报'], type: 2, - content: './wagesReport/producePayrollDetails.html', + content: './updateMonthPlan.html', area: [width, height], maxmin: false, success: function (layero, index) { - console.log(data); + // console.log(data); var myIframe = window[layero.find('iframe')[0]['name']]; - myIframe.hideSubmit(); - // var fnc = myIframe.setData(data.data); //aaa()为子页面的方法 - + // myIframe.hideSubmit(); + var fnc = myIframe.setData(data.data,yjId,insMonth); //aaa()为子页面的方法 + }, + end:function(){ + table.reload('layui_table', { + where: { + yjId:yjId, + insMonth: insMonth, + aiDitStatus:aiDitStatus + } + }) + } }); } - }) */ - - //测试 - var index = layer.open({ - title: ['月计划上报', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], - type: 2, - content: './updateMonthPlan.html', - area: [width, height], - maxmin: false, - success: function (layero, index) { - // var myIframe = window[layero.find('iframe')[0]['name']]; - // myIframe.hideSubmit(); - // var fnc = myIframe.setData(data.data); //aaa()为子页面的方法 - - }, - }); + }) } //新增月计划addMonthPlan function addMonthPlan(id) { + let yjId = $(window.parent.document).find("input[id='taskSourceId']").attr("stationId"); + let insMonth = $('#insMonth').val(); + let aiDitStatus = $('#aiDitStatus').val(); + let height = '98%'; let width = '99%'; var index = layer.open({ @@ -293,16 +303,29 @@ function addMonthPlan(id) { area: [width, height], maxmin: false, success: function (layero, index) { - // var myIframe = window[layero.find('iframe')[0]['name']]; - // myIframe.hideSubmit(); + var myIframe = window[layero.find('iframe')[0]['name']]; + myIframe.setYjId($(window.parent.document).find("input[id='taskSourceId']").attr("stationId")); // var fnc = myIframe.setData(data.data); //aaa()为子页面的方法 }, + end:function(){ + table.reload('layui_table', { + where: { + yjId:yjId, + insMonth: insMonth, + aiDitStatus:aiDitStatus + } + }) + } }); } //导入计划 function importData(){ + let yjId = $(window.parent.document).find("input[id='taskSourceId']").attr("stationId"); + let insMonth = $('#insMonth').val(); + let aiDitStatus = $('#aiDitStatus').val(); + let height = '98%'; let width = '62%'; var index = layer.open({ @@ -312,17 +335,51 @@ function importData(){ area: [width, height], maxmin: false, success: function (layero, index) { - // var myIframe = window[layero.find('iframe')[0]['name']]; - // myIframe.hideSubmit(); + var myIframe = window[layero.find('iframe')[0]['name']]; + myIframe.setYjId($(window.parent.document).find("input[id='taskSourceId']").attr("stationId")); // var fnc = myIframe.setData(data.data); //aaa()为子页面的方法 }, + end:function(){ + table.reload('layui_table', { + where: { + yjId:yjId, + insMonth: insMonth, + aiDitStatus:aiDitStatus + } + }) + } }); } //导出 function exportData(){ - // let search1 = $('#search1').val(); - // let search2 = $('#search2').val(); - window.location.href = oiPlanUrl + "/monthlyPlanSubmission/export?token=" + token; + let insMonth = $('#insMonth').val(); + let aiDitStatus = $('#aiDitStatus').val(); + let yjId = $(window.parent.document).find("input[id='taskSourceId']").attr("stationId"); + + window.location.href = PATH_URL + `/inspectionPlan/exportPlanData?token=` + token + + "&insMonth=" + insMonth + + "&aiDitStatus=" + aiDitStatus + "&yjId=" + yjId + + layer.msg('下载中,请稍等', { + icon: 16, + scrollbar: false + }); +} + + +//导出 +function exportDataDetails(yjId,insMonth){ + + + window.location.href = PATH_URL + `/inspectionPlan/exportMonthPlanData?token=` + token + + "&insMonth=" + insMonth + + "&yjId=" + yjId + + + layer.msg('下载中,请稍等', { + icon: 16, + scrollbar: false + }); } \ No newline at end of file From 880954d8f0b9ca980130f55d34b964058169dc59 Mon Sep 17 00:00:00 2001 From: lSun <15893999301@qq.com> Date: Mon, 19 Aug 2024 15:20:14 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=B7=A1=E8=A7=86=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hxy-web/templateDown/导入上传月计划模板.xlsx | Bin 0 -> 10660 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 hxy-web/templateDown/导入上传月计划模板.xlsx diff --git a/hxy-web/templateDown/导入上传月计划模板.xlsx b/hxy-web/templateDown/导入上传月计划模板.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..ae36278fe465b4c5b083db35121094a14b556c71 GIT binary patch literal 10660 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 Date: Tue, 20 Aug 2024 10:10:05 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=BA=93=E5=8F=8A?= =?UTF-8?q?=E5=B7=A1=E6=9F=A5=E7=BB=93=E6=9E=9C=E4=B8=8A=E4=BC=A0-?= =?UTF-8?q?=E8=B4=BE=E8=83=9C=E5=87=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hxy-web/html/photoView.html | 4 +- hxy-web/html/wireManager/header.html | 2 + hxy-web/html/wireManager/staff/staffAdd.html | 52 +- hxy-web/html/wireManager/staff/staffList.html | 19 +- .../viewResult/specialPatrolAdd.html | 4 +- .../wireManager/viewResult/uploadPhoto.html | 5 +- .../wireManager/viewResult/viewResult.html | 10 +- .../viewResult/viewResultUpdate.html | 4 +- hxy-web/js/formSelects-v4.css | 174 ++ hxy-web/js/formSelects-v4.js | 1791 +++++++++++++++++ hxy-web/js/public/public.js | 2 + hxy-web/js/wireManager/header.js | 4 +- hxy-web/js/wireManager/staff/staffAdd.js | 584 +++--- hxy-web/js/wireManager/staff/staffList.js | 144 +- .../viewResult/specialPatrolAdd.js | 63 +- .../js/wireManager/viewResult/uploadPhoto.js | 69 +- .../js/wireManager/viewResult/viewResult.js | 156 +- .../viewResult/viewResultUpdate.js | 334 ++- 18 files changed, 2847 insertions(+), 574 deletions(-) create mode 100644 hxy-web/js/formSelects-v4.css create mode 100644 hxy-web/js/formSelects-v4.js diff --git a/hxy-web/html/photoView.html b/hxy-web/html/photoView.html index 1d86c3f..8af33e9 100644 --- a/hxy-web/html/photoView.html +++ b/hxy-web/html/photoView.html @@ -43,10 +43,10 @@ } //测试用 - path = 'http://192.168.0.14:1909/file/ynRealName/violationBlack/2024/05/13/08ffd23539df47ed873058a163249ffe005Qblgkgy1h3h38c7wwrj30q70q7gs5.jpg'; + // path = 'http://192.168.0.14:1909/file/ynRealName/violationBlack/2024/05/13/08ffd23539df47ed873058a163249ffe005Qblgkgy1h3h38c7wwrj30q70q7gs5.jpg'; // path = fileUrl + "/" + filePath[i]; - var html = `` + var html = `` $("#content").empty(); $("#content").append(html); }); diff --git a/hxy-web/html/wireManager/header.html b/hxy-web/html/wireManager/header.html index 7c58845..302986f 100644 --- a/hxy-web/html/wireManager/header.html +++ b/hxy-web/html/wireManager/header.html @@ -10,7 +10,9 @@ + + diff --git a/hxy-web/html/wireManager/staff/staffAdd.html b/hxy-web/html/wireManager/staff/staffAdd.html index 2eceae1..f5c0b13 100644 --- a/hxy-web/html/wireManager/staff/staffAdd.html +++ b/hxy-web/html/wireManager/staff/staffAdd.html @@ -8,8 +8,10 @@ + - + + @@ -113,6 +115,9 @@
+ + +
人员基本信息 @@ -134,8 +139,8 @@
- +
@@ -154,7 +159,7 @@
- +
@@ -163,8 +168,8 @@
- +
@@ -183,8 +188,8 @@
- +
@@ -193,8 +198,8 @@
- +
@@ -203,8 +208,8 @@
-
正式人员
-
临时人员
+
正式人员
+
临时人员
@@ -222,13 +227,7 @@
- +
@@ -259,7 +258,7 @@ style="color: red;font-size: 20px">* 工资核定标准（按量）：
-
元/基
@@ -271,7 +270,7 @@ style="color: red;font-size: 20px">* 工资核定标准（按天）：
-
元/天
@@ -322,7 +321,7 @@
-
@@ -332,7 +331,7 @@
-
@@ -342,7 +341,7 @@
-
@@ -352,7 +351,7 @@
-
@@ -362,6 +361,7 @@
+
diff --git a/hxy-web/html/wireManager/staff/staffList.html b/hxy-web/html/wireManager/staff/staffList.html index 2f90d79..bbda79a 100644 --- a/hxy-web/html/wireManager/staff/staffList.html +++ b/hxy-web/html/wireManager/staff/staffList.html @@ -9,7 +9,7 @@ - + @@ -34,34 +34,35 @@
+
- +
- +
- - - - + + +
- - +
diff --git a/hxy-web/html/wireManager/viewResult/specialPatrolAdd.html b/hxy-web/html/wireManager/viewResult/specialPatrolAdd.html index 4097c8b..017fcf6 100644 --- a/hxy-web/html/wireManager/viewResult/specialPatrolAdd.html +++ b/hxy-web/html/wireManager/viewResult/specialPatrolAdd.html @@ -1,4 +1,4 @@ - + @@ -9,7 +9,7 @@ - +