From ea132b30c7f958d8c5d52aae942e2b337853a777 Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Fri, 22 Mar 2024 14:25:48 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/assets/js/http.js | 4 +--
src/components/account.vue | 5 +++-
.../systemSetup/enterpriseInfo.vue | 27 ++++++++++++++++++-
src/views/jxjadmin/systemSettings.vue | 15 +++++++++++
4 files changed, 47 insertions(+), 4 deletions(-)
diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index fd882353..1b2b505a 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -83,12 +83,12 @@ if (process.env.NODE_ENV == 'development') {
// axios.defaults.baseURL ='http://101.43.164.214:45001/' //上海张江
// axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工）
// axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地
- // axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
+ axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
// axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
// axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
// axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头
- axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目
+ // axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目
// axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上（最新）地址
// axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上（最新）地址
diff --git a/src/components/account.vue b/src/components/account.vue
index 31977e7d..57dc5c72 100644
--- a/src/components/account.vue
+++ b/src/components/account.vue
@@ -125,7 +125,7 @@
@click="goto6()"
v-if="
$route.path.indexOf('/firm/projectManage') == -1 &&
- $store.state.userInfo.accountType == 5
+ $store.state.userInfo.systemLogoConfig.isShowProjectFront == 1
"
:title="projectFront"
>
@@ -210,6 +210,9 @@ export default {
if (this.loginData.enterpriseFront != '') {
this.enterpriseFront = this.loginData.enterpriseFront
}
+ if (this.loginData.projectFront != '') {
+ this.projectFront = this.loginData.projectFront
+ }
},
mounted() {
console.log('this.$store.state.userInfo', this.$store.state.userInfo);
diff --git a/src/views/companyAdmin/systemSetup/enterpriseInfo.vue b/src/views/companyAdmin/systemSetup/enterpriseInfo.vue
index 7894ebed..78f40fb9 100644
--- a/src/views/companyAdmin/systemSetup/enterpriseInfo.vue
+++ b/src/views/companyAdmin/systemSetup/enterpriseInfo.vue
@@ -118,7 +118,30 @@
-
+
+
+
+
+
+
+
+
+
+
+ {{ form.isShowProjectFront == 1 ? '是' : '否' }}
+
+
+
@@ -242,6 +265,8 @@ export default {
enterpriseFront: '', //企业前台
projectBackground: '', //项目后台
equipmentChina: '', //设备中台
+ projectFront: '', // 项目前台
+ isShowProjectFront: 0, // 是否显示项目前台
dataCenter: '' //资料中心
},
zoomType: '0',
diff --git a/src/views/jxjadmin/systemSettings.vue b/src/views/jxjadmin/systemSettings.vue
index ebf6f6d5..cc76771d 100644
--- a/src/views/jxjadmin/systemSettings.vue
+++ b/src/views/jxjadmin/systemSettings.vue
@@ -132,6 +132,20 @@
>
+
+
+
+
+ {{ form.isShowProjectFront == 1 ? '是' : '否' }}
+
+
@@ -257,6 +271,7 @@ export default {
projectBackground: '', //项目后台
equipmentChina: '', //设备中台
projectFront: '', // 项目前台
+ isShowProjectFront: 0, // 是否显示项目前台
dataCenter: '', //资料中心
loginTimeOut:1,
zoomType:0,