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