diff --git a/ldlz-web/src/layout/index.vue b/ldlz-web/src/layout/index.vue index 806b77e..3750379 100644 --- a/ldlz-web/src/layout/index.vue +++ b/ldlz-web/src/layout/index.vue @@ -61,7 +61,7 @@ export default { // 检查 URL 参数中是否有 embedded=true 或者当前处于 iframe 中 return ( // this.$route.query.embedded === "true" || window.self !== window.top - false + true ); }, classObj() { diff --git a/public/public.js b/public/public.js index 5ac3792..4500221 100644 --- a/public/public.js +++ b/public/public.js @@ -1,10 +1,10 @@ //内网测试环境 // let web_url="http://20.56.230.91:10080" // let request_url="http://20.56.230.91:10080/bnscloud" -//let contentPath="/bonus_cloud_web"; +// let contentPath="/bonus_cloud_web"; let contentPath="/hn_cloud_web"; let web_url="http://127.0.0.1:8849" -let request_url="http://127.0.0.1:18080/hncloud" +let request_url="http://127.0.0.1:18080/bnscloud" @@ -13,7 +13,7 @@ let czl_url= request_url+"/czl"; //承载力后台 let czl_ht_url= request_url+"/czl"; //实名制大屏 -let smz_web_url=request_url+"/realnameweb/"; +let smz_web_url=request_url+"/realname/"; //实名制后台 let smz_ht_url=request_url+"/realname" diff --git a/smz-screen/js/contract/contractDetails.js b/smz-screen/js/contract/contractDetails.js index d5886f1..464fd4a 100644 --- a/smz-screen/js/contract/contractDetails.js +++ b/smz-screen/js/contract/contractDetails.js @@ -6,7 +6,7 @@ $(function(){ function findContractDetails(){ $.ajax({ type: 'POST', - url: smz_web_url + 'contract/getContractDetails', + url: smz_web_url + 'screen/contract/getContractDetails', data: {idNumber:idNumber}, dataType: "json", success: function(data) { @@ -42,5 +42,5 @@ function findContractDetails(){ } //zip下载 function expDownload(){ - window.location.href=smz_web_url + 'contract/exportZip?idNumber='+idNumber + "&x-auth-token=" + token; + window.location.href=smz_web_url + 'screen/contract/exportZip?idNumber='+idNumber + "&token=" + token; } diff --git a/smz-screen/js/contract/contractInfo.js b/smz-screen/js/contract/contractInfo.js index 72c2869..0926250 100644 --- a/smz-screen/js/contract/contractInfo.js +++ b/smz-screen/js/contract/contractInfo.js @@ -13,7 +13,7 @@ function initTable() { //初始化Table $("#table").bootstrapTable({ classes: 'table table-hover', - url: smz_web_url + 'contract/getContractInfo', + url: smz_web_url + 'screen/contract/getContractInfo', method: 'post', responseHandler: responseHandler, //处理服务器返回的数据格式 height: $(window).height() - ($(window).height() * 0.13), @@ -198,7 +198,7 @@ function query(type) { $("#query").css("background-image", "url(../../img/info/queryClick.png)"); $("#reset").css("background-image", "url(../../img/info/resetQuery.png)"); var opt = { - url: smz_web_url + 'contract/getContractInfo', + url: smz_web_url + 'screen/contract/getContractInfo', silent: true, query: { keyWord: keyWord @@ -209,7 +209,7 @@ function query(type) { $("#reset").css("background-image", "url(../../img/info/resetQueryClick.png)"); $("#keyWord").val(""); opt = { - url: smz_web_url + 'contract/getContractInfo', + url: smz_web_url + 'screen/contract/getContractInfo', silent: true, }; } diff --git a/smz-screen/js/contract/contractPhoto.js b/smz-screen/js/contract/contractPhoto.js index b6dbce9..913ba2b 100644 --- a/smz-screen/js/contract/contractPhoto.js +++ b/smz-screen/js/contract/contractPhoto.js @@ -6,7 +6,7 @@ $(function(){ function findContractPhoto(){ $.ajax({ type: 'POST', - url: smz_web_url + 'contract/getContractPhoto', + url: smz_web_url + 'screen/contract/getContractPhoto', data: {idNumber:idNumber}, dataType: "json", success: function(data) { diff --git a/smz-screen/js/core/public.js b/smz-screen/js/core/public.js index 9b72aab..a3f6d0b 100644 --- a/smz-screen/js/core/public.js +++ b/smz-screen/js/core/public.js @@ -10,7 +10,6 @@ var token=localStorage.getItem('smzweb-token'); var companyId=localStorage.getItem('companyId'); $(function() { - debugger // 全局配置所有AJAX请求 $.ajaxSetup({ // 对所有类型的请求(GET/POST/PUT/DELETE等)生效 @@ -19,16 +18,16 @@ $(function() { const token = localStorage.getItem('smzweb-token'); if (token) { // 为所有请求添加Token头 - xhr.setRequestHeader('x-auth-token', token); + xhr.setRequestHeader('token', token); } }, // 全局错误处理(可选,统一处理401等错误) error: function(xhr) { if (xhr.status === 401) { //Token无效或过期,跳转登录页 - localStorage.removeItem('smzweb-token'); - sessionStorage.removeItem('smzweb-token'); - window.location.href="../../../login.html"; + // localStorage.removeItem('smzweb-token'); + // sessionStorage.removeItem('smzweb-token'); + // window.location.href="../../../login.html"; } } }); diff --git a/smz-screen/js/home/home.js b/smz-screen/js/home/home.js index 8d75ae8..ab37856 100644 --- a/smz-screen/js/home/home.js +++ b/smz-screen/js/home/home.js @@ -81,7 +81,7 @@ function getAgeStructureList(){ // 从本地存储获取token(确保登录后已保存) const token = localStorage.getItem('smzweb-token') || sessionStorage.getItem('smzweb-token'); if (token) { - xhr.setRequestHeader('x-auth-token', token); // 与后端配置的头名一致 + xhr.setRequestHeader('token', token); // 与后端配置的头名一致 } }, success: function(data) { @@ -95,7 +95,7 @@ function getAgeStructureList(){ /*function getProjectCount(){ $.ajax({ type: 'GET', - url: smz_web_url + 'workerPost/getProjectStatusCount', + url: smz_web_url + 'screen/workerPost/getProjectStatusCount', data: { }, @@ -157,7 +157,7 @@ function getWorkerPostCardList(){ var list=obj.list;//集合 $.ajax({ type: 'GET', - url: smz_web_url + 'workerPost/gerWorkerPersonAlls', + url: smz_web_url + 'screen/workerPost/gerWorkerPersonAlls', async: false, data: {}, dataType: "json", diff --git a/smz-screen/js/home/map.js b/smz-screen/js/home/map.js index 8ac6e0e..b9664b0 100644 --- a/smz-screen/js/home/map.js +++ b/smz-screen/js/home/map.js @@ -598,7 +598,7 @@ function findScene() { //map.closeInfoWindow();清除弹框 $.ajax({ type: 'GET', - url: smz_web_url + 'workerPost/getWorkerPeopleAddress', + url: smz_web_url + 'screen/workerPost/getWorkerPeopleAddress', data: {}, async: false, dataType: "json", @@ -615,7 +615,7 @@ function gerWorkerPersonAll(){ var countPersonSum = document.getElementById('countPersonSum'); $.ajax({ type: 'GET', - url: smz_web_url + 'workerPost/gerWorkerPersonAll', + url: smz_web_url + 'screen/workerPost/gerWorkerPersonAll', async: false, data: {}, dataType: "json", diff --git a/smz-screen/js/index/login.js b/smz-screen/js/index/login.js index 4313a0f..22eec14 100644 --- a/smz-screen/js/index/login.js +++ b/smz-screen/js/index/login.js @@ -74,11 +74,12 @@ function login() { uPwd = encryptCBC(uPwd); $.ajax({ type: 'POST', - url: smz_web_url + 'login', - data: { + contentType: 'application/json', + url: smz_web_url + 'publicLogin/screenLogin', + data: JSON.stringify({ username: uName, password: uPwd - }, + }), dataType: "json", success: function(data) { console.log("data", data); diff --git a/smz-screen/js/proInfo/proInfo.js b/smz-screen/js/proInfo/proInfo.js index 8e5d4fd..d8305bb 100644 --- a/smz-screen/js/proInfo/proInfo.js +++ b/smz-screen/js/proInfo/proInfo.js @@ -207,7 +207,7 @@ function exportBtn() { var proId = $("#proId").val(); var status = $("#status").val(); var keyWord = $("#keyWord").val(); - window.location.href = smz_web_url + "proInfo/expProData?keyWord=" + keyWord + "&orgId=" + orgId + "&id=" + proId + "&status=" + status+"&companyId="+companyId + "&x-auth-token=" + token; + window.location.href = smz_web_url + "proInfo/expProData?keyWord=" + keyWord + "&orgId=" + orgId + "&id=" + proId + "&status=" + status+"&companyId="+companyId + "&token=" + token; } function showRst(id){ $.ajax({ diff --git a/smz-screen/js/redBlack/workerBlack.js b/smz-screen/js/redBlack/workerBlack.js index 970dc24..0ce5473 100644 --- a/smz-screen/js/redBlack/workerBlack.js +++ b/smz-screen/js/redBlack/workerBlack.js @@ -153,5 +153,5 @@ function exportBtn() { $("#reset").css("background-image", "url(../../img/info/resetQuery.png)"); $("#export").css("background-image", "url(../../img/info/exportClick.png)"); var keyWord = $("#keyWord").val(); - window.location.href = smz_web_url + "redBlack/exportWorkerBlack?keyWord=" + keyWord + "&x-auth-token=" + token; + window.location.href = smz_web_url + "redBlack/exportWorkerBlack?keyWord=" + keyWord + "&token=" + token; } diff --git a/smz-screen/js/redBlack/workerRed.js b/smz-screen/js/redBlack/workerRed.js index 5ce3e3f..95cefba 100644 --- a/smz-screen/js/redBlack/workerRed.js +++ b/smz-screen/js/redBlack/workerRed.js @@ -172,5 +172,5 @@ function exportBtn() { $("#reset").css("background-image", "url(../../img/info/resetQuery.png)"); $("#export").css("background-image", "url(../../img/info/exportClick.png)"); var keyWord = $("#keyWord").val(); - window.location.href = smz_web_url + "redBlack/exportWorkerRed?keyWord=" + keyWord + "&x-auth-token=" + token; + window.location.href = smz_web_url + "redBlack/exportWorkerRed?keyWord=" + keyWord + "&token=" + token; } diff --git a/smz-screen/js/redBlack/workerWhite.js b/smz-screen/js/redBlack/workerWhite.js index 01c05e2..211c96a 100644 --- a/smz-screen/js/redBlack/workerWhite.js +++ b/smz-screen/js/redBlack/workerWhite.js @@ -182,5 +182,5 @@ function exportBtn() { $("#reset").css("background-image", "url(../../img/info/resetQuery.png)"); $("#export").css("background-image", "url(../../img/info/exportClick.png)"); var keyWord = $("#keyWord").val(); - window.location.href = smz_web_url + "redBlack/exportWorkerWhite?keyWord=" + keyWord + "&x-auth-token=" + token; + window.location.href = smz_web_url + "redBlack/exportWorkerWhite?keyWord=" + keyWord + "&token=" + token; } diff --git a/smz-screen/js/salary/salaryInfo.js b/smz-screen/js/salary/salaryInfo.js index c62d0fd..345669f 100644 --- a/smz-screen/js/salary/salaryInfo.js +++ b/smz-screen/js/salary/salaryInfo.js @@ -327,5 +327,5 @@ function exportBtn(salaryId) { var orgId = $("#orgId").val(); var proId = $("#proId").val(); var isPay=$("#isPay").val(); - window.location.href = smz_web_url + "salary/exportSalary?keyWord=" + keyWord + "&orgId=" + orgId + "&proId=" + proId+ "&salaryId=" + salaryId+ "&isPay=" + isPay + "&x-auth-token=" + token; + window.location.href = smz_web_url + "salary/exportSalary?keyWord=" + keyWord + "&orgId=" + orgId + "&proId=" + proId+ "&salaryId=" + salaryId+ "&isPay=" + isPay + "&token=" + token; } diff --git a/smz-screen/js/train/trainInfo.js b/smz-screen/js/train/trainInfo.js index 52cacaa..79b2cda 100644 --- a/smz-screen/js/train/trainInfo.js +++ b/smz-screen/js/train/trainInfo.js @@ -13,7 +13,7 @@ function initTable() { //初始化Table $("#table").bootstrapTable({ classes: 'table table-hover', - url: smz_web_url + 'workerPost/getWorkerTrainList', + url: smz_web_url + 'screen/workerPost/getWorkerTrainList', method: 'post', responseHandler: responseHandler, //处理服务器返回的数据格式 height: $(window).height() - ($(window).height() * 0.13), @@ -172,7 +172,7 @@ function query(type) { $("#query").css("background-image", "url(../../img/info/queryClick.png)"); $("#reset").css("background-image", "url(../../img/info/resetQuery.png)"); var opt = { - url: smz_web_url + 'workerPost/getWorkerTrainList', + url: smz_web_url + 'screen/workerPost/getWorkerTrainList', silent: true, query: { keyWord: keyWord @@ -183,7 +183,7 @@ function query(type) { $("#reset").css("background-image", "url(../../img/info/resetQueryClick.png)"); $("#keyWord").val(""); opt = { - url: smz_web_url + 'workerPost/getWorkerTrainList', + url: smz_web_url + tokengetWorkerTrainList', silent: true, }; } diff --git a/smz-screen/js/worker/workerAttendance/attendance.js b/smz-screen/js/worker/workerAttendance/attendance.js index 1513e74..8cc2e0b 100644 --- a/smz-screen/js/worker/workerAttendance/attendance.js +++ b/smz-screen/js/worker/workerAttendance/attendance.js @@ -384,7 +384,7 @@ function exportBtn() { var startTime = $("#startTime").val(); var endTime = $("#endTime").val(); window.location.href = smz_web_url + "workerAttendance/exportWorkerAttendance?keyWord=" + keyWord + "&orgId=" + orgId + "&proId=" + - proId + "&startTime=" + startTime + "&endTime=" + endTime + "&x-auth-token=" + token; + proId + "&startTime=" + startTime + "&endTime=" + endTime + "&token=" + token; } function openCheck(name,idNumber,proId) { diff --git a/smz-screen/js/worker/workerAttendance/personnelAttendance.js b/smz-screen/js/worker/workerAttendance/personnelAttendance.js index 6e0dc5b..465723b 100644 --- a/smz-screen/js/worker/workerAttendance/personnelAttendance.js +++ b/smz-screen/js/worker/workerAttendance/personnelAttendance.js @@ -358,7 +358,7 @@ function exportBtn() { var startTime = $("#startTime").val(); var endTime = $("#endTime").val(); window.location.href = smz_web_url + "workerAttendance/exportWorkerAttendanceOne?idNumber=" + idNumber + "&startTime=" + startTime + - "&endTime=" + endTime + "&proId=" + proId + "&name=" + name + "&x-auth-token=" + token; + "&endTime=" + endTime + "&proId=" + proId + "&name=" + name + "&token=" + token; } function leftTitle(time) { diff --git a/smz-screen/js/worker/workerPeople/information.js b/smz-screen/js/worker/workerPeople/information.js index a2b056f..637bb14 100644 --- a/smz-screen/js/worker/workerPeople/information.js +++ b/smz-screen/js/worker/workerPeople/information.js @@ -310,7 +310,7 @@ function exportBtn() { var keyWord = $("#keyWord").val(); var orgId = $("#orgId").val(); var proId = $("#proId").val(); - window.location.href = smz_web_url + "workerPeople/exportWorkerPeople?keyWord=" + keyWord + "&orgId=" + orgId + "&proId=" + proId + "&x-auth-token=" + token; + window.location.href = smz_web_url + "workerPeople/exportWorkerPeople?keyWord=" + keyWord + "&orgId=" + orgId + "&proId=" + proId + "&token=" + token; } //出入场管理 diff --git a/smz-screen/js/workerPost/workerPost.js b/smz-screen/js/workerPost/workerPost.js index f3dc954..47322a3 100644 --- a/smz-screen/js/workerPost/workerPost.js +++ b/smz-screen/js/workerPost/workerPost.js @@ -15,7 +15,7 @@ function initTable() { //初始化Table $("#table").bootstrapTable({ classes: 'table table-hover', - url: smz_web_url + 'workerPost/getWorkerPostInfo', + url: smz_web_url + 'screen/workerPost/getWorkerPostInfo', method: 'post', responseHandler: responseHandler, //处理服务器返回的数据格式 height: $(window).height() - ($(window).height() * 0.13), diff --git a/smz-screen/js/workerPost/workerPostPeople.js b/smz-screen/js/workerPost/workerPostPeople.js index fc69012..2931782 100644 --- a/smz-screen/js/workerPost/workerPostPeople.js +++ b/smz-screen/js/workerPost/workerPostPeople.js @@ -58,7 +58,7 @@ function initTable() { //初始化Table $("#table").bootstrapTable({ classes: 'table table-hover', - url: smz_web_url + 'workerPost/getWorkerPostPeople', + url: smz_web_url + 'screen/workerPost/getWorkerPostPeople', method: 'post', responseHandler: responseHandler, //处理服务器返回的数据格式 height: $(window).height() - ($(window).height() * 0.2), @@ -265,7 +265,7 @@ function query(type) { $("#query").css("background-image", "url(../../img/info/queryClick.png)"); $("#reset").css("background-image", "url(../../img/info/resetQuery.png)"); var opt = { - url: smz_web_url + 'workerPost/getWorkerPostPeople', + url: smz_web_url + 'screen/workerPost/getWorkerPostPeople', silent: true, query: { id:companyId, @@ -303,7 +303,7 @@ function query(type) { $("#keyWord").val(""); opt = { - url: smz_web_url + 'workerPost/getWorkerPostPeople', + url: smz_web_url + 'screen/workerPost/getWorkerPostPeople', silent: true, }; } @@ -365,7 +365,7 @@ function findAddress(){ $("#selAddress").empty(); $.ajax({ type: 'POST', - url: smz_web_url + 'workerPost/getAddressList', + url: smz_web_url + 'screen/workerPost/getAddressList', data: {}, async: false, dataType: "json", diff --git a/smz-screen/js/workerRecord/workerRecord.js b/smz-screen/js/workerRecord/workerRecord.js index f1d0721..3cd6609 100644 --- a/smz-screen/js/workerRecord/workerRecord.js +++ b/smz-screen/js/workerRecord/workerRecord.js @@ -281,5 +281,5 @@ function exportBtn() { var orgId = $("#orgId").val(); var proId = $("#proId").val(); window.location.href = smz_web_url + "workerRecord/exportWorkerRecord?keyWord=" + keyWord + "&orgId=" + orgId + "&proId=" + - proId + "&x-auth-token=" + token; + proId + "&token=" + token; }