From b3cf9f9151ddbd6da2b2d8473727e52af9631064 Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Mon, 22 Dec 2025 10:54:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- czl-screen/js/map_data.js | 6 +++--- czl-screen/lodingIndex.html | 2 +- czl-screen/pages/home/map.html | 2 +- ldlz-web/.env.production | 2 +- ldlz-web/vue.config.js | 2 +- public/html/index.html | 5 +++-- smz-screen/lodingIndex.html | 8 ++++---- smz-screen/page/home/home.html | 2 +- 8 files changed, 15 insertions(+), 14 deletions(-) diff --git a/czl-screen/js/map_data.js b/czl-screen/js/map_data.js index a6e5c42..03dc38b 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/lodingIndex.html b/czl-screen/lodingIndex.html index 6e8dc68..277f1dd 100644 --- a/czl-screen/lodingIndex.html +++ b/czl-screen/lodingIndex.html @@ -225,7 +225,7 @@ headers:{ "Authorization":public_token }, - url: request_url + '/czldp/publicLogin/defaultLogin', + url: request_url + '/czl/publicLogin/defaultLogin', data: JSON.stringify(params), async : true, method:"POST", diff --git a/czl-screen/pages/home/map.html b/czl-screen/pages/home/map.html index 41bb378..f849b90 100644 --- a/czl-screen/pages/home/map.html +++ b/czl-screen/pages/home/map.html @@ -11,7 +11,7 @@ - + diff --git a/ldlz-web/.env.production b/ldlz-web/.env.production index f09a963..650f4df 100644 --- a/ldlz-web/.env.production +++ b/ldlz-web/.env.production @@ -5,4 +5,4 @@ VUE_APP_TITLE = 领导履职管理系统 ENV = 'production' # 领导履职管理系统/生产环境 -VUE_APP_BASE_API = '/hncloud/ldlz' +VUE_APP_BASE_API = '/bnsapi' diff --git a/ldlz-web/vue.config.js b/ldlz-web/vue.config.js index 97582f8..7b146ad 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.14:1999/hncloud/ldlz/`, + target: `http://127.0.0.1:18080/bnscloud/ldlz/`, // target: `http://47.104.226.90:9002`, changeOrigin: true, pathRewrite: { diff --git a/public/html/index.html b/public/html/index.html index a086890..0e85260 100644 --- a/public/html/index.html +++ b/public/html/index.html @@ -119,11 +119,12 @@ let token=localStorage.getItem("public_token"); let url=web_url+contentPath; if(id==='1'){ - window.open(url+'/smz-web/lodingIndex.html?token='+username,'smz2_html'); + window.open(url+'/smz-web/lodingIndex.html?token='+username,'smz_html'); }else if(id==='2'){ window.open(url+'/smz-screen/lodingIndex.html?token='+username,'smz_web_html'); }else if(id==='3'){ - window.open('http://127.0.0.1:80/ldlz/ywgllogin?username='+username+"&token="+token,'ldlz_html'); + window.open('http://20.56.230.91:10080/ldlz/ywgllogin?username='+username+"&token="+token,'ldlz_html'); + // window.open('http://20.56.230.91:10080/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/smz-screen/lodingIndex.html b/smz-screen/lodingIndex.html index 9808636..91dccdb 100644 --- a/smz-screen/lodingIndex.html +++ b/smz-screen/lodingIndex.html @@ -226,7 +226,7 @@ headers:{ "Authorization":public_token }, - url: request_url + '/realnameweb/publicLogin/defaultLogin', + url: request_url + '/realname/publicLogin/defaultLogin', data: JSON.stringify(params), async : true, method:"POST", @@ -239,9 +239,9 @@ if (status == "error") { window.location.href="../login.html"; } else { - var token =data.user.token; - var uName=data.user.username; - var companyId = data.user.companyId; + var token =data.token; + var uName=data.username; + var companyId = data.companyId; debugger localStorage.setItem('smzweb-token', token); localStorage.setItem('companyId', companyId); diff --git a/smz-screen/page/home/home.html b/smz-screen/page/home/home.html index b72ed41..a6a2913 100644 --- a/smz-screen/page/home/home.html +++ b/smz-screen/page/home/home.html @@ -7,7 +7,7 @@