From 7aa6e90a14b05dae1e53e80cc62025fca217602e Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Fri, 5 Dec 2025 15:39:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=87=AA=E5=8A=A8=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E5=8F=8A=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- czl-screen/js/jq.js | 2 +- czl-screen/login.html | 47 ++++++++--------- czl-screen/pages/home/z_companyTeamList.html | 2 +- .../home/z_constructionMachinesList.html | 2 +- czl-screen/pages/home/z_ownTeamList.html | 2 +- czl-screen/pages/home/z_projectList.html | 4 +- .../pages/home/z_project_arrange_List.html | 4 +- czl-screen/pages/home/z_realNameList.html | 2 +- .../pages/home/z_subcontractingTeamsList.html | 2 +- czl-web/js/companypro/FreeInquiryList.js | 2 +- czl-web/js/companypro/proManageTeamList.js | 2 +- czl-web/js/jq.js | 6 +-- czl-web/js/log/logList.js | 2 +- czl-web/js/machineTool/MachineToolLibrary.js | 2 +- czl-web/js/machineTool/activeDevice.js | 2 +- czl-web/js/newPro/newProPreArrangementList.js | 2 +- czl-web/js/ownteam/ownTeamList.js | 2 +- czl-web/js/personnelPool/branchStaffList.js | 2 +- czl-web/js/personnelPool/dome.js | 4 +- czl-web/js/personnelPool/selfOwnedList.js | 2 +- czl-web/js/personnelPool/subcontractorList.js | 2 +- czl-web/js/project/lineProjectList.js | 2 +- .../js/project/proScheduleManagementList.js | 2 +- .../js/project/proScheduleManagementView.js | 2 +- czl-web/js/project/rnProjectBind.js | 2 +- czl-web/js/publicJs.js | 2 +- .../js/subTeamResource/SubcontractaList.js | 2 +- czl-web/js/subTeamResource/subTeamList.js | 2 +- czl-web/login.html | 48 ++++++++--------- czl-web/pages/newpro/historyProList.html | 2 +- .../pages/newpro/preReleaseResourceList.html | 2 +- czl-web/pages/real/personAttendanceList.html | 2 +- czl-web/pages/real/personRosterList.html | 2 +- smz-web/js/companyTree.js | 2 +- smz-web/js/dict.js | 2 +- smz-web/js/jq.js | 2 +- smz-web/js/main.js | 4 +- smz-web/js/work/basic/ProManagerForm.js | 2 +- smz-web/js/work/basic/ProManagerFormView.js | 2 +- smz-web/js/work/basic/SuperTeamForm.js | 2 +- smz-web/js/work/basic/SuperTeamRankingList.js | 2 +- smz-web/js/work/basic/commonProblemList.js | 2 +- smz-web/js/work/basic/proManager.js | 2 +- smz-web/js/work/fileLibrary/fileAllLibrary.js | 4 +- smz-web/js/work/fileLibrary/latelyLibrary.js | 4 +- smz-web/js/work/fileLibrary/proLibrary.js | 2 +- smz-web/js/work/fileLibrary/starLibrary.js | 4 +- smz-web/js/work/fileLibrary/subLibrary.js | 2 +- .../js/work/fileLibrary/uploadMeLibrary.js | 4 +- smz-web/js/work/jobType/jobManagement.js | 2 +- smz-web/js/work/jobType/jobManagementForm.js | 2 +- .../managementReview/managementResultsView.js | 4 +- smz-web/js/work/ownPerson/contractDetails.js | 2 +- smz-web/js/work/ownPerson/paySlip.js | 6 +-- smz-web/js/work/ownPerson/paySlipForm.js | 2 +- smz-web/js/work/ownPerson/workerBenefits.js | 2 +- .../js/work/ownPerson/workerBenefitsList.js | 2 +- .../ownPerson/workerContractManagementForm.js | 2 +- .../workerContractManagementFormOld.js | 2 +- .../ownPerson/workerContractManagementList.js | 8 +-- .../workerContractManagementRenewal.js | 2 +- smz-web/js/work/ownPerson/workerDepart.js | 4 +- .../ownPerson/workerDepartAgreementForm.js | 2 +- .../workerDepartAgreementFormHireOfWork.js | 2 +- .../workerDepartEvidenceDismissForm.js | 2 +- .../ownPerson/workerDepartEvidenceForm.js | 2 +- .../ownPerson/workerDepartEvidenceFormCl.js | 2 +- .../workerDepartEvidenceFormHireOfWork.js | 2 +- .../ownPerson/workerDepartFaceContrast.js | 4 +- smz-web/js/work/ownPerson/workerDepartForm.js | 2 +- .../work/ownPerson/workerDepartHandleForm.js | 2 +- .../work/ownPerson/workerDepartNoticeForm.js | 2 +- .../ownPerson/workerDepartPersonnelForm.js | 2 +- .../js/work/ownPerson/workerDepartRecord.js | 2 +- .../work/ownPerson/workerDepartRecordOld.js | 2 +- smz-web/js/work/ownPerson/workerDeparts.js | 2 +- smz-web/js/work/ownPerson/workerNoticeForm.js | 2 +- smz-web/js/work/ownPerson/workerOn.js | 8 +-- .../js/work/ownPerson/workerOnBatchForm.js | 2 +- .../js/work/ownPerson/workerOnContractForm.js | 2 +- smz-web/js/work/ownPerson/workerOnEntry.js | 2 +- smz-web/js/work/ownPerson/workerOnForm.js | 2 +- smz-web/js/work/ownPerson/workerOnIncome.js | 2 +- .../js/work/ownPerson/workerOnRegistration.js | 2 +- .../ownPersonContract/certainJobContract.js | 2 +- .../contractingHNLaborContract.js | 2 +- .../contractingQiliLaborContract.js | 2 +- .../driverQiliLaborContract.js | 2 +- .../employProtocolContract.js | 2 +- .../managementNengyongLaborContract.js | 2 +- .../managementQiliLaborContract.js | 2 +- .../nonFiveInsurancesContract.js | 2 +- smz-web/js/work/person/accessFieldInfor.js | 2 +- smz-web/js/work/person/baseManager.js | 2 +- smz-web/js/work/person/blacklist.js | 2 +- .../certificateManage/certificateTypeFrom.js | 2 +- .../workCertificateNumList.js | 2 +- .../workerCertificateFrom.js | 2 +- .../workerCertificateRecheck.js | 2 +- smz-web/js/work/person/faceContrast.js | 4 +- .../WorkNumberListByCurrentDay.js | 2 +- .../js/work/person/faceContrast/workPerson.js | 2 +- smz-web/js/work/person/faceContrastDetail.js | 2 +- .../WorkNumberListByCurrentDay.js | 2 +- .../person/faceContrastNew/faceContrast.js | 2 +- .../faceContrastNew/faceContrastDetail.js | 2 +- .../work/person/faceContrastNew/workPerson.js | 2 +- .../employmentManagementAccountForm.js | 2 +- .../employmentManagementAccountList.js | 2 +- .../reportStatistics/salaryApprovalForm.js | 2 +- .../salaryApprovalFormList.js | 2 +- .../salaryPaymentStatisticsForm.js | 2 +- .../salaryPaymentStatisticsList.js | 2 +- .../person/templateManage/contractDetails.js | 2 +- .../templateManage/contractManageList.js | 4 +- .../person/templateManage/templateManage.js | 2 +- .../work/person/training/trainingDetails.js | 2 +- .../person/wagesManage/generatePayroll.js | 2 +- .../person/wagesManage/generatePayrollList.js | 2 +- .../work/person/wagesManage/wagesCheckView.js | 2 +- .../person/wagesManage/wagesGrantDetails.js | 2 +- .../work/person/wagesManage/wagesGrantList.js | 4 +- .../js/work/person/wagesManage/wagesInfo.js | 2 +- .../person/wagesManage/wagesInfoAuditForm.js | 2 +- .../person/wagesManage/wagesInfoAuditList.js | 4 +- .../person/wagesManage/wagesInfoConveyForm.js | 2 +- .../person/wagesManage/wagesInfoConveyList.js | 4 +- .../wagesManage/wagesInfoReceiptList.js | 4 +- .../wagesManage/wagesInfoReceiptUploadList.js | 2 +- .../person/wagesManage/wagesPaymentDetails.js | 2 +- .../person/wagesManage/wagesPaymentForm.js | 2 +- .../person/wagesManage/wagesPaymentList.js | 4 +- .../person/wagesManage/wagesPaymentSeeForm.js | 2 +- .../personnelWarning/attentionWarningList.js | 2 +- .../personnelWarning/specialWarningList.js | 2 +- .../salaryAttendanceDetails.js | 2 +- .../salaryAttendance/salaryAttendanceList.js | 2 +- .../smallSubPermissionForm.js | 2 +- .../smallSubManagement/stat/contractStat.js | 2 +- .../stat/contractStatView.js | 8 +-- .../js/work/smallSubManagement/stat/gxStat.js | 4 +- .../smallSubManagement/stat/gxStatView.js | 2 +- .../smallSubManagement/stat/personnelStat.js | 2 +- .../stat/personnelStatView.js | 2 +- .../smallSubManagement/stat/projectStat.js | 2 +- .../stat/projectStatView.js | 6 +-- .../teamPackageManageContractForm.js | 2 +- .../teamPackageManageContractPreview.js | 2 +- .../teamPackageManageDetailForm.js | 2 +- .../teamPackageManageForm.js | 2 +- .../teamPackageManageList.js | 2 +- .../totalProWorkloadManageForm.js | 2 +- .../totalProWorkloadManageList.js | 2 +- smz-web/js/work/sysMag/audit.js | 4 +- smz-web/js/work/sysMag/user.js | 8 +-- smz-web/js/work/sysMag/usersAudit.js | 4 +- smz-web/js/work/train/trainList.js | 2 +- .../js/work/uploadResults/monthWagesList.js | 2 +- .../js/work/uploadResults/personWagesList.js | 2 +- smz-web/js/work/uploadResults/proWagesList.js | 2 +- .../uploadResults/uploadResultsAddForm.js | 2 +- .../work/uploadResults/uploadResultsView.js | 4 +- smz-web/login.html | 52 +++++++++---------- 163 files changed, 273 insertions(+), 274 deletions(-) diff --git a/czl-screen/js/jq.js b/czl-screen/js/jq.js index ca377de..833ffa1 100644 --- a/czl-screen/js/jq.js +++ b/czl-screen/js/jq.js @@ -1,7 +1,7 @@ $.ajaxSetup({ cache : false, headers : { - "token" : localStorage.getItem("token") + "token" : localStorage.getItem("czldp-token") }, error : function(xhr, textStatus, errorThrown) { var msg = xhr.responseText; diff --git a/czl-screen/login.html b/czl-screen/login.html index e1e4988..90eebda 100644 --- a/czl-screen/login.html +++ b/czl-screen/login.html @@ -87,25 +87,25 @@ if (top != self) { //parent.location.href = '/login.html'; } - var token = localStorage.getItem("token"); - if (token != null && token.trim().length != 0) { - $.ajax({ - type: 'get', - url: ctxPath + '/users/current?token=' + token, - success: function (data) { - location.href = pagesPath + '/pages/home/home.html'; - }, - error: function (xhr, textStatus, errorThrown) { - var msg = xhr.responseText; - var response = JSON.parse(msg); - var code = response.code; - var message = response.message; - if (code == 401) { - localStorage.removeItem("token"); - } - } - }); - } + var token = localStorage.getItem("czldp-token"); + // if (token != null && token.trim().length != 0) { + // $.ajax({ + // type: 'get', + // url: ctxPath + '/users/current?token=' + token, + // success: function (data) { + // location.href = pagesPath + '/pages/home/home.html'; + // }, + // error: function (xhr, textStatus, errorThrown) { + // var msg = xhr.responseText; + // var response = JSON.parse(msg); + // var code = response.code; + // var message = response.message; + // if (code == 401) { + // localStorage.removeItem("token"); + // } + // } + // }); + // } //获取验证码 function getVerifyCode() { var url = ctxPath + "/getCode/vCode?" + Math.random(); @@ -139,8 +139,7 @@ function login(obj) { - debugger - $(obj).attr("disabled", true); + //$(obj).attr("disabled", true); var username = $.trim($('#username').val()); var password = $.trim($('#password').val()); var verifyCode = $.trim($('#verifyCode').val()); @@ -160,8 +159,8 @@ uuid: uuid }, success: function (data) { - localStorage.setItem("token", data.token); - location.href = pagesPath + '/pages/home/home.html'; + localStorage.setItem("czldp-token", data.token); + location.href = 'pages/home/home.html'; //以前密码复杂度校验 // let pattern = /^(?![0-9]+$)(?![0-9\W]+$)(?![0-9A-Z]+$)(?![0-9a-z]+$)(?![a-z\W]+$)(?![A-Z\W]+$)[0-9A-Za-z\W]{8,16}$/; // if(!pattern.test(password)) { @@ -177,7 +176,7 @@ var response = JSON.parse(msg); $("#info").html(response.message); getVerifyCode(); - $(obj).attr("disabled", false); + //$(obj).attr("disabled", false); } }); diff --git a/czl-screen/pages/home/z_companyTeamList.html b/czl-screen/pages/home/z_companyTeamList.html index a501609..9248f66 100644 --- a/czl-screen/pages/home/z_companyTeamList.html +++ b/czl-screen/pages/home/z_companyTeamList.html @@ -154,7 +154,7 @@ let orgId = ""; let teamStatus = ""; let volLevel = ""; - const token = localStorage.getItem("token"); + const token = localStorage.getItem("czldp-token"); var orgType = localStorage.getItem("orgType"); let state = localStorage.getItem("state"); console.log("state:" + state); diff --git a/czl-screen/pages/home/z_constructionMachinesList.html b/czl-screen/pages/home/z_constructionMachinesList.html index 92b3926..264995a 100644 --- a/czl-screen/pages/home/z_constructionMachinesList.html +++ b/czl-screen/pages/home/z_constructionMachinesList.html @@ -146,7 +146,7 @@ let oldKeyWord = ""; let teamStatus = ""; let subStatus = ""; - const token = localStorage.getItem("token"); + const token = localStorage.getItem("czldp-token"); layui.use(['layer', 'table', 'form', 'laydate'], function () { layer = layui.layer; diff --git a/czl-screen/pages/home/z_ownTeamList.html b/czl-screen/pages/home/z_ownTeamList.html index 87d0bb4..15dc8a4 100644 --- a/czl-screen/pages/home/z_ownTeamList.html +++ b/czl-screen/pages/home/z_ownTeamList.html @@ -156,7 +156,7 @@ let oldKeyWord = ""; let teamStatus = ""; let subStatus = ""; - const token = localStorage.getItem("token"); + const token = localStorage.getItem("czldp-token"); var ownType = localStorage.getItem("ownType"); let state = localStorage.getItem("state"); layui.use(['layer', 'table', 'form', 'laydate'], function () { diff --git a/czl-screen/pages/home/z_projectList.html b/czl-screen/pages/home/z_projectList.html index 4525954..2d5c136 100644 --- a/czl-screen/pages/home/z_projectList.html +++ b/czl-screen/pages/home/z_projectList.html @@ -154,7 +154,7 @@ var layer; var table; var laydate; - const token = localStorage.getItem("token"); + const token = localStorage.getItem("czldp-token"); const ds_pro_status = localStorage.getItem("ds_pro_status"); layui.use(['layer', 'table', 'form', 'laydate'], function () { @@ -162,7 +162,7 @@ table = layui.table; form = layui.form; laydate = layui.laydate; - const token = localStorage.getItem("token"); + const token = localStorage.getItem("czldp-token"); setInterval(function () { $("#nowTime").text(getNowTime()) }, 1000); diff --git a/czl-screen/pages/home/z_project_arrange_List.html b/czl-screen/pages/home/z_project_arrange_List.html index 4f8f217..1833672 100644 --- a/czl-screen/pages/home/z_project_arrange_List.html +++ b/czl-screen/pages/home/z_project_arrange_List.html @@ -144,14 +144,14 @@ var layer; var table; var laydate; - const token = localStorage.getItem("token"); + const token = localStorage.getItem("czldp-token"); layui.use(['layer', 'table', 'form', 'laydate'], function () { layer = layui.layer; table = layui.table; form = layui.form; laydate = layui.laydate; - const token = localStorage.getItem("token"); + const token = localStorage.getItem("czldp-token"); setInterval(function () { $("#nowTime").text(getNowTime()) }, 1000); diff --git a/czl-screen/pages/home/z_realNameList.html b/czl-screen/pages/home/z_realNameList.html index c9113a3..02f2d2e 100644 --- a/czl-screen/pages/home/z_realNameList.html +++ b/czl-screen/pages/home/z_realNameList.html @@ -151,7 +151,7 @@ let oldKeyWord = ""; let teamStatus = ""; let subStatus = ""; - const token = localStorage.getItem("token"); + const token = localStorage.getItem("czldp-token"); layui.use(['layer', 'table', 'form', 'laydate'], function () { layer = layui.layer; table = layui.table; diff --git a/czl-screen/pages/home/z_subcontractingTeamsList.html b/czl-screen/pages/home/z_subcontractingTeamsList.html index ed9390f..bf34027 100644 --- a/czl-screen/pages/home/z_subcontractingTeamsList.html +++ b/czl-screen/pages/home/z_subcontractingTeamsList.html @@ -161,7 +161,7 @@ let teamStatus = ""; let subStatus = ""; var subType = localStorage.getItem("subType"); - const token = localStorage.getItem("token"); + const token = localStorage.getItem("czldp-token"); let state = localStorage.getItem("state"); layui.use(['layer', 'table', 'form', 'laydate'], function () { layer = layui.layer; diff --git a/czl-web/js/companypro/FreeInquiryList.js b/czl-web/js/companypro/FreeInquiryList.js index 46b644f..89c9d9d 100644 --- a/czl-web/js/companypro/FreeInquiryList.js +++ b/czl-web/js/companypro/FreeInquiryList.js @@ -9,7 +9,7 @@ var tree; var table; var notice; var layNotify; -const token = localStorage.getItem("token"); +const token = localStorage.getItem("czl-token"); $("#resetBt").click(function(){ table.reload('menuTable', { url: ctxPath + '/owmTeamQuery/getowmTeamQueryTeamsList' diff --git a/czl-web/js/companypro/proManageTeamList.js b/czl-web/js/companypro/proManageTeamList.js index 3cc427c..cb2b9eb 100644 --- a/czl-web/js/companypro/proManageTeamList.js +++ b/czl-web/js/companypro/proManageTeamList.js @@ -11,7 +11,7 @@ var table; var notice; var layNotify; let pers = checkPermission(); -const token = localStorage.getItem("token"); +const token = localStorage.getItem("czl-token"); $("#resetBt").click(function(){ table.reload('menuTable', { url: ctxPath + '/proManage/getProjectManagementTeamsList' diff --git a/czl-web/js/jq.js b/czl-web/js/jq.js index 6c550a8..5c13587 100644 --- a/czl-web/js/jq.js +++ b/czl-web/js/jq.js @@ -9,7 +9,7 @@ function getContextPathNew() { $.ajaxSetup({ cache : false, headers : { - "token" : localStorage.getItem("token") + "token" : localStorage.getItem("czl-token") }, error : function(xhr, textStatus, errorThrown) { var msg = xhr.responseText; @@ -19,8 +19,8 @@ $.ajaxSetup({ if (code == 400) { layer.msg(message); } else if (code == 401) { - localStorage.removeItem("token"); - location.href = contentPath+'/login.html'; + localStorage.removeItem("czl-token"); + //location.href = contentPath+'/login.html'; } else if (code == 403) { console.log("未授权:" + message); layer.msg('未授权'); diff --git a/czl-web/js/log/logList.js b/czl-web/js/log/logList.js index 002ae70..7d56433 100644 --- a/czl-web/js/log/logList.js +++ b/czl-web/js/log/logList.js @@ -4,7 +4,7 @@ var timeEnd; var laydate let form var table -const token = localStorage.getItem("token"); +const token = localStorage.getItem("czl-token"); layui.use(['table', 'layer', 'laydate', 'jquery', 'form'], function () { table = layui.table; laydate = layui.laydate; diff --git a/czl-web/js/machineTool/MachineToolLibrary.js b/czl-web/js/machineTool/MachineToolLibrary.js index c2a179c..809b5ad 100644 --- a/czl-web/js/machineTool/MachineToolLibrary.js +++ b/czl-web/js/machineTool/MachineToolLibrary.js @@ -16,7 +16,7 @@ var deviceName = ""; var orgId = ""; var statusId = ""; var volLevelIds = ""; -const token = localStorage.getItem("token"); +const token = localStorage.getItem("czl-token"); let pers = checkPermission(); $("#resetBt").click(function(){ table.reload('menuTable', { diff --git a/czl-web/js/machineTool/activeDevice.js b/czl-web/js/machineTool/activeDevice.js index 8098667..613ac87 100644 --- a/czl-web/js/machineTool/activeDevice.js +++ b/czl-web/js/machineTool/activeDevice.js @@ -12,7 +12,7 @@ var layNotify; var oldKeyWord = ""; var dictKey = ""; var deviceName = ""; -const token = localStorage.getItem("token"); +const token = localStorage.getItem("czl-token"); let pers = checkPermission(); $("#resetBt").click(function(){ table.reload('menuTable', { diff --git a/czl-web/js/newPro/newProPreArrangementList.js b/czl-web/js/newPro/newProPreArrangementList.js index d96afde..2b45a3a 100644 --- a/czl-web/js/newPro/newProPreArrangementList.js +++ b/czl-web/js/newPro/newProPreArrangementList.js @@ -8,7 +8,7 @@ let form; var table; var notice; var layNotify; -const token = localStorage.getItem("token"); +const token = localStorage.getItem("czl-token"); let pers = checkPermission(); $("#resetBt").click(function(){ table.reload('menuTable', { diff --git a/czl-web/js/ownteam/ownTeamList.js b/czl-web/js/ownteam/ownTeamList.js index b02e97a..82f8525 100644 --- a/czl-web/js/ownteam/ownTeamList.js +++ b/czl-web/js/ownteam/ownTeamList.js @@ -9,7 +9,7 @@ var tree; var table; var notice; var layNotify; -const token = localStorage.getItem("token"); +const token = localStorage.getItem("czl-token"); let pers = checkPermission(); $("#resetBt").click(function(){ table.reload('menuTable', { diff --git a/czl-web/js/personnelPool/branchStaffList.js b/czl-web/js/personnelPool/branchStaffList.js index 91c90e5..09163c8 100644 --- a/czl-web/js/personnelPool/branchStaffList.js +++ b/czl-web/js/personnelPool/branchStaffList.js @@ -10,7 +10,7 @@ var table; var notice; var layNotify; var upload; -const token = localStorage.getItem("token"); +const token = localStorage.getItem("czl-token"); let pers = checkPermission(); $("#resetBt").click(function(){ table.reload('menuTable', { diff --git a/czl-web/js/personnelPool/dome.js b/czl-web/js/personnelPool/dome.js index 0bd1150..7e2ecff 100644 --- a/czl-web/js/personnelPool/dome.js +++ b/czl-web/js/personnelPool/dome.js @@ -275,7 +275,7 @@ function exportData() { var index = layer.msg("数据导出中，请稍等。。。", { icon: 4, }); - var token = localStorage.getItem("token"); + var token = localStorage.getItem("czl-token"); var djCode = $("#djCode").val(); var maCode = $("#maCode").val(); var param = { @@ -315,7 +315,7 @@ function exportData() { } function downloadFile() { - var token = localStorage.getItem("token"); + var token = localStorage.getItem("czl-token"); window.location.href = ctxPath + "/download/download?filename=发货冲销对应表-导入模板.xlsx&token=" + diff --git a/czl-web/js/personnelPool/selfOwnedList.js b/czl-web/js/personnelPool/selfOwnedList.js index a1a1ce0..2ee8b1e 100644 --- a/czl-web/js/personnelPool/selfOwnedList.js +++ b/czl-web/js/personnelPool/selfOwnedList.js @@ -10,7 +10,7 @@ var table; var notice; var layNotify; let pers = checkPermission(); -const token = localStorage.getItem("token"); +const token = localStorage.getItem("czl-token"); $("#resetBt").click(function(){ table.reload('menuTable', { url: ctxPath + '/personnel/getSelfOwnedList' diff --git a/czl-web/js/personnelPool/subcontractorList.js b/czl-web/js/personnelPool/subcontractorList.js index 5b2a3ba..120f00d 100644 --- a/czl-web/js/personnelPool/subcontractorList.js +++ b/czl-web/js/personnelPool/subcontractorList.js @@ -10,7 +10,7 @@ var table; var notice; var layNotify; let pers = checkPermission(); -const token = localStorage.getItem("token"); +const token = localStorage.getItem("czl-token"); $("#resetBt").click(function(){ table.reload('menuTable', { url: ctxPath + '/personnel/getSubcontractorList' diff --git a/czl-web/js/project/lineProjectList.js b/czl-web/js/project/lineProjectList.js index 7d51ea0..efe3cef 100644 --- a/czl-web/js/project/lineProjectList.js +++ b/czl-web/js/project/lineProjectList.js @@ -13,7 +13,7 @@ var oldKeyWord = ""; var orgId = ""; var statusId = ""; var volLevelIds = ""; -const token = localStorage.getItem("token"); +const token = localStorage.getItem("czl-token"); let pers = checkPermission(); $("#resetBt").click(function(){ table.reload('menuTable', { diff --git a/czl-web/js/project/proScheduleManagementList.js b/czl-web/js/project/proScheduleManagementList.js index c300530..1ac208f 100644 --- a/czl-web/js/project/proScheduleManagementList.js +++ b/czl-web/js/project/proScheduleManagementList.js @@ -9,7 +9,7 @@ var tree; var table; var notice; var layNotify; -const token = localStorage.getItem("token"); +const token = localStorage.getItem("czl-token"); $("#resetBt").click(function(){ table.reload('menuTable', { url: ctxPath + '/proProgress/getBasicDataList' diff --git a/czl-web/js/project/proScheduleManagementView.js b/czl-web/js/project/proScheduleManagementView.js index a811594..08e3c3b 100644 --- a/czl-web/js/project/proScheduleManagementView.js +++ b/czl-web/js/project/proScheduleManagementView.js @@ -1,4 +1,4 @@ -const token = localStorage.getItem("token"); +const token = localStorage.getItem("czl-token"); layui.config({ base: '../../js/layuiModules/', // 第三方模块所在目录 version: 'v1.6.4' // 插件版本号 diff --git a/czl-web/js/project/rnProjectBind.js b/czl-web/js/project/rnProjectBind.js index 8bf1dd5..a87d939 100644 --- a/czl-web/js/project/rnProjectBind.js +++ b/czl-web/js/project/rnProjectBind.js @@ -12,7 +12,7 @@ var layNotify; var proName = ""; var realName = ""; var statusId = ""; -const token = localStorage.getItem("token"); +const token = localStorage.getItem("czl-token"); let pers = checkPermission(); $("#resetBt").click(function(){ diff --git a/czl-web/js/publicJs.js b/czl-web/js/publicJs.js index d562890..90e56c5 100644 --- a/czl-web/js/publicJs.js +++ b/czl-web/js/publicJs.js @@ -1,5 +1,5 @@ // var ctxPath = getContextPath(); -let contentPath="/czl-web" +let contentPath="czl-web" contentPath = getContextPath(); console.log(contentPath); diff --git a/czl-web/js/subTeamResource/SubcontractaList.js b/czl-web/js/subTeamResource/SubcontractaList.js index ce5600c..8e50f0f 100644 --- a/czl-web/js/subTeamResource/SubcontractaList.js +++ b/czl-web/js/subTeamResource/SubcontractaList.js @@ -13,7 +13,7 @@ var oldKeyWord = ""; var orgId = ""; var statusId = ""; var volLevelIds = ""; -const token = localStorage.getItem("token"); +const token = localStorage.getItem("czl-token"); let pers = checkPermission(); $("#resetBt").click(function(){ table.reload('menuTable', { diff --git a/czl-web/js/subTeamResource/subTeamList.js b/czl-web/js/subTeamResource/subTeamList.js index c7fb27d..752de66 100644 --- a/czl-web/js/subTeamResource/subTeamList.js +++ b/czl-web/js/subTeamResource/subTeamList.js @@ -9,7 +9,7 @@ var tree; var table; var notice; var layNotify; -const token = localStorage.getItem("token"); +const token = localStorage.getItem("czl-token"); let pers = checkPermission(); $("#resetBt").click(function(){ table.reload('menuTable', { diff --git a/czl-web/login.html b/czl-web/login.html index 7a32670..fdb1599 100644 --- a/czl-web/login.html +++ b/czl-web/login.html @@ -126,29 +126,29 @@ $("#info").html(''); }); if (top != self) { - location.href = contentPath+'/login.html'; + //location.href = 'czl-web/login.html'; } - var token = localStorage.getItem("token"); - if (token != null && token.trim().length != 0) { - $.ajax({ - type: 'get', - url: ctxPath + '/users/current?token=' + token, - success: function (data) { - localStorage.setItem("userId", data.id); - window.location.href=contentPath+"/index.html"; + // var token = localStorage.getItem("czl-token"); + // if (token != null && token.trim().length != 0) { + // $.ajax({ + // type: 'get', + // url: ctxPath + '/users/current?token=' + token, + // success: function (data) { + // localStorage.setItem("userId", data.id); + // window.location.href="index.html"; - }, - error: function (xhr, textStatus, errorThrown) { - var msg = xhr.responseText; - var response = JSON.parse(msg); - var code = response.code; - var message = response.message; - if (code == 401) { - localStorage.removeItem("token"); - } - } - }); - } + // }, + // error: function (xhr, textStatus, errorThrown) { + // var msg = xhr.responseText; + // var response = JSON.parse(msg); + // var code = response.code; + // var message = response.message; + // if (code == 401) { + // localStorage.removeItem("token"); + // } + // } + // }); + // } //获取验证码 function getVerifyCode() { @@ -200,7 +200,7 @@ uuid: uuid }, success: function (data) { - localStorage.setItem("token", data.token); + localStorage.setItem("czl-token", data.token); var rememberCheckbox = document.getElementById('remember'); if (rememberCheckbox.checked) { // 保存用户名和密码到本地存储 @@ -218,11 +218,11 @@ time: 3000, area: ['350px', '70px'] }, function () { - window.location.href=contentPath+"/index.html"; + window.location.href="index.html"; }); } else { - window.location.href=contentPath+"/index.html"; + window.location.href="index.html"; } }, diff --git a/czl-web/pages/newpro/historyProList.html b/czl-web/pages/newpro/historyProList.html index ee6479f..522d2ce 100644 --- a/czl-web/pages/newpro/historyProList.html +++ b/czl-web/pages/newpro/historyProList.html @@ -81,7 +81,7 @@ let form; var table; var laydate; - const token = localStorage.getItem("token"); + const token = localStorage.getItem("czl-token"); $("#resetBt").click(function(){ getReleaseData(form,""); table.reload('menuTable', { diff --git a/czl-web/pages/newpro/preReleaseResourceList.html b/czl-web/pages/newpro/preReleaseResourceList.html index 50a8e01..4244209 100644 --- a/czl-web/pages/newpro/preReleaseResourceList.html +++ b/czl-web/pages/newpro/preReleaseResourceList.html @@ -61,7 +61,7 @@