diff --git a/czl-screen/js/map_data.js b/czl-screen/js/map_data.js index 3083f0e..a6e5c42 100644 --- a/czl-screen/js/map_data.js +++ b/czl-screen/js/map_data.js @@ -34,9 +34,9 @@ $(function () { }); function init(){ - initMap(); - madeBoundary(); //加载区域图 - selectMap(); + //initMap(); + // madeBoundary(); //加载区域图 + //selectMap(); } //设置区域图start diff --git a/czl-screen/login.html b/czl-screen/login.html index 122bcb0..ac75563 100644 --- a/czl-screen/login.html +++ b/czl-screen/login.html @@ -120,10 +120,10 @@ //请求成功 success: function (result) { console.log(result); - $("#uuid").val(result.obj.uuid); - $("#vCode").attr("src", "data:image/png;base64," + result.obj.img); + $("#uuid").val(result.uuid); + $("#vCode").attr("src", "data:image/png;base64," + result.img); code = result.resMsg; - uuid = result.obj.uuid; + uuid = result.uuid; //fastLogin(); }, //请求失败，包含具体的错误信息 diff --git a/czl-screen/pages/home/mainList.html b/czl-screen/pages/home/mainList.html index 5fb62d6..03fa448 100644 --- a/czl-screen/pages/home/mainList.html +++ b/czl-screen/pages/home/mainList.html @@ -96,11 +96,12 @@ - + + diff --git a/czl-screen/pages/home/map.html b/czl-screen/pages/home/map.html index f849b90..41bb378 100644 --- a/czl-screen/pages/home/map.html +++ b/czl-screen/pages/home/map.html @@ -11,7 +11,7 @@ - + diff --git a/czl-screen/pages/home/preReleaseResourceList.html b/czl-screen/pages/home/preReleaseResourceList.html index 2ce93e2..659f174 100644 --- a/czl-screen/pages/home/preReleaseResourceList.html +++ b/czl-screen/pages/home/preReleaseResourceList.html @@ -112,8 +112,8 @@ - + diff --git a/czl-screen/pages/home/preReleaseResourceView.html b/czl-screen/pages/home/preReleaseResourceView.html index d06f919..c9ce61e 100644 --- a/czl-screen/pages/home/preReleaseResourceView.html +++ b/czl-screen/pages/home/preReleaseResourceView.html @@ -206,8 +206,9 @@ - + + diff --git a/czl-screen/pages/home/z_companyTeamList.html b/czl-screen/pages/home/z_companyTeamList.html index 4343167..59904bc 100644 --- a/czl-screen/pages/home/z_companyTeamList.html +++ b/czl-screen/pages/home/z_companyTeamList.html @@ -137,7 +137,6 @@ - diff --git a/czl-screen/pages/home/z_companyTeam_populationList.html b/czl-screen/pages/home/z_companyTeam_populationList.html index 915edb5..5f68d45 100644 --- a/czl-screen/pages/home/z_companyTeam_populationList.html +++ b/czl-screen/pages/home/z_companyTeam_populationList.html @@ -91,10 +91,12 @@ - + - + + + diff --git a/czl-screen/pages/home/z_constructionMachinesList.html b/czl-screen/pages/home/z_constructionMachinesList.html index cf1692b..3621be8 100644 --- a/czl-screen/pages/home/z_constructionMachinesList.html +++ b/czl-screen/pages/home/z_constructionMachinesList.html @@ -130,8 +130,8 @@ - + diff --git a/czl-screen/pages/home/z_ownTeamList.html b/czl-screen/pages/home/z_ownTeamList.html index 10fde7c..7eac5b0 100644 --- a/czl-screen/pages/home/z_ownTeamList.html +++ b/czl-screen/pages/home/z_ownTeamList.html @@ -139,9 +139,9 @@ - - + + diff --git a/czl-screen/pages/home/z_ownTeam_populationList.html b/czl-screen/pages/home/z_ownTeam_populationList.html index d70f8c6..f1dc005 100644 --- a/czl-screen/pages/home/z_ownTeam_populationList.html +++ b/czl-screen/pages/home/z_ownTeam_populationList.html @@ -91,10 +91,11 @@ - - + + + diff --git a/czl-screen/pages/home/z_projectList.html b/czl-screen/pages/home/z_projectList.html index 05c4ce9..270e4bd 100644 --- a/czl-screen/pages/home/z_projectList.html +++ b/czl-screen/pages/home/z_projectList.html @@ -140,7 +140,6 @@ - diff --git a/czl-screen/pages/home/z_project_arrange_List.html b/czl-screen/pages/home/z_project_arrange_List.html index 7e55e31..899108e 100644 --- a/czl-screen/pages/home/z_project_arrange_List.html +++ b/czl-screen/pages/home/z_project_arrange_List.html @@ -130,7 +130,6 @@ - diff --git a/czl-screen/pages/home/z_realNameList.html b/czl-screen/pages/home/z_realNameList.html index d8627a0..4feeeb1 100644 --- a/czl-screen/pages/home/z_realNameList.html +++ b/czl-screen/pages/home/z_realNameList.html @@ -143,6 +143,7 @@ + - diff --git a/czl-screen/pages/home/z_subcontractingTeams_populationList.html b/czl-screen/pages/home/z_subcontractingTeams_populationList.html index 4d44508..2ab18ae 100644 --- a/czl-screen/pages/home/z_subcontractingTeams_populationList.html +++ b/czl-screen/pages/home/z_subcontractingTeams_populationList.html @@ -92,7 +92,6 @@ - diff --git a/ldlz-web/vue.config.js b/ldlz-web/vue.config.js index 0b846de..97582f8 100644 --- a/ldlz-web/vue.config.js +++ b/ldlz-web/vue.config.js @@ -35,7 +35,7 @@ module.exports = { proxy: { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { - target: `http://192.168.0.38:18080/bnscloud/ldlz/`, + target: `http://192.168.0.14:1999/hncloud/ldlz/`, // target: `http://47.104.226.90:9002`, changeOrigin: true, pathRewrite: { diff --git a/login.html b/login.html index de9c839..8aa568d 100644 --- a/login.html +++ b/login.html @@ -91,18 +91,33 @@ } else { $.ajax({ type : 'post', - url : request_url + '/realname/allSystem/login', + url : request_url + '/realname/allSystem/innerLogin', contentType:'application/json;charset=UTF-8', data :JSON.stringify( { - username:encryptCBC(username), - password:encryptCBC(password), + username:username, + password:password, code:verifyCode, uuid:uuid }), success : function(data) { + debugger $('#verifyCode').val('') if(data && data.code){ if(data.code=='200'){ + let czl=data.data.czl; + let ldlz=data.data.ldlz; + let czlweb=data.data.czlweb; + let smzweb=data.data.smzweb; + + + localStorage.setItem("czl-token",czl.token); + localStorage.setItem('userName', czl.username); + localStorage.setItem("ldlz-token",ldlz); + localStorage.setItem("Admin-Token",ldlz); + localStorage.setItem("czldp-token", czlweb.token); + localStorage.setItem('smzweb-token', smzweb.token); + localStorage.setItem('companyId', smzweb.companyId); + localStorage.setItem('remeberName', czl.username); localStorage.setItem("public_token",data.data.access_token); localStorage.setItem("auth_type",data.data.user.dataType) localStorage.setItem("public_username",username); diff --git a/public/html/index.html b/public/html/index.html index 799933f..a086890 100644 --- a/public/html/index.html +++ b/public/html/index.html @@ -96,7 +96,7 @@ -
+

承载力大屏子系统

@@ -119,11 +119,11 @@ let token=localStorage.getItem("public_token"); let url=web_url+contentPath; if(id==='1'){ - window.open(url+'/smz-web/lodingIndex.html?token='+username,'smz_html'); + window.open(url+'/smz-web/lodingIndex.html?token='+username,'smz2_html'); }else if(id==='2'){ window.open(url+'/smz-screen/lodingIndex.html?token='+username,'smz_web_html'); }else if(id==='3'){ - window.open('http://20.56.230.91:10080/ldlz/ywgllogin?username='+username+"&token="+token,'ldlz_html'); + window.open('http://127.0.0.1:80/ldlz/ywgllogin?username='+username+"&token="+token,'ldlz_html'); }else if(id==='4'){ window.open(url+'/czl-web/lodingIndex.html?token='+username,'czl_html'); }else if(id==='5'){ diff --git a/public/public.js b/public/public.js index d2e324b..5ac3792 100644 --- a/public/public.js +++ b/public/public.js @@ -4,12 +4,12 @@ //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/bnscloud" +let request_url="http://127.0.0.1:18080/hncloud" //承载力大屏 -let czl_url= request_url+"/czldp"; +let czl_url= request_url+"/czl"; //承载力后台 let czl_ht_url= request_url+"/czl"; //实名制大屏 diff --git a/smz-screen/js/home/home.js b/smz-screen/js/home/home.js index 486d978..8d75ae8 100644 --- a/smz-screen/js/home/home.js +++ b/smz-screen/js/home/home.js @@ -50,11 +50,11 @@ $(function(){ // } // //获取当前城市 - var myCity = new BMap.LocalCity(); - myCity.get(function(data){ - var cityData = document.getElementById("city"); - cityData.innerHTML=data.name; - }); + // var myCity = new BMap.LocalCity(); + // myCity.get(function(data){ + // var cityData = document.getElementById("city"); + // cityData.innerHTML=data.name; + // }); getAgeStructureList();//年龄结构 // getProList();//项目概况 getWorkerList();//考勤管理 diff --git a/smz-screen/page/home/home.html b/smz-screen/page/home/home.html index a6a2913..b72ed41 100644 --- a/smz-screen/page/home/home.html +++ b/smz-screen/page/home/home.html @@ -7,7 +7,7 @@ 农民工实名制管理系统 - +