diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index be680155..6bc6f760 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -172,7 +172,7 @@ if (process.env.NODE_ENV == "development") {
     // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工）
     // axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地
     // 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://jxj.zhgdyun.com:61212/' //彭洁远程
@@ -185,11 +185,10 @@ if (process.env.NODE_ENV == "development") {
     // axios.defaults.baseURL = 'http://47.93.215.234:9809/'//鞍钢正式地址(弃用)
     // axios.defaults.baseURL = 'http://42.180.188.17:9809/'//鞍钢正式地址
     // axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用)
-    // axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址
+    axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址
     // axios.defaults.baseURL = 'http://8.136.222.164:8808/' //中科安信正式地址
     // axios.defaults.baseURL = 'http://1.13.185.209:9820/' //中科佳成正式地址
-    // axios.defaults.baseURL = 'http://192.168.100.4:9809/' //南京汇创正式地址
-
+    // axios.defaults.baseURL = 'http://192.168.100.4:9809/' //乌丹(合肥启程)新正式地址
 } else if (process.env.NODE_ENV == "debug") {
     axios.defaults.baseURL = "https://www.ceshi.com";
 } else if (process.env.NODE_ENV == "production") {
diff --git a/src/components/header.vue b/src/components/header.vue
index ec9052af..069ea113 100644
--- a/src/components/header.vue
+++ b/src/components/header.vue
@@ -145,7 +145,7 @@
       <p
         v-show="
           $route.path.indexOf('projectIndex') != -1 &&
-            $store.state.userInfo.projectKanban == 0 && company != 'agjt'
+            $store.state.userInfo.projectKanban == 0
         "
         class="header-btn"
         @click="toOverview2()"
diff --git a/src/store/index.js b/src/store/index.js
index e82c8eae..a7fb0e25 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -46,27 +46,25 @@ export default new Vuex.Store({
 
     state: {
         PAGESIZRS: [10, 20, 30, 50],
-        // UPLOADURL: 'http://192.168.100.4:9809/upload/image/', // 南京汇创
-        // FILEURL: 'http://192.168.100.4:9809/image/', //南京汇创
         // UPLOADURL:' http://101.43.164.214:11111/upload/image/',//  百色
         // FILEURL:' http://101.43.164.214:11111/image/',// 百色
         // UPLOADURL:'http://182.90.224.237:51234/upload/image/',
         // FILEURL:'http://182.90.224.237:51234/image/',
         // UPLOADURL: "http://http://192.168.34.155:19111/upload/image/", // 洁本地
         // FILEURL: "http://http://192.168.34.155:19111/image/", //洁本地
-        UPLOADURL: 'http://192.168.34.221:9111/upload/image/', // 郭圣雄本地
-        FILEURL: 'http://192.168.34.221:9111/image/', //郭圣雄本地
+        // UPLOADURL: 'http://192.168.34.221:9111/upload/image/', // 郭圣雄本地
+        // FILEURL: 'http://192.168.34.221:9111/image/', //郭圣雄本地
         // WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地)
-        WORKFLOWURL: "http://192.168.34.175:88/#/workspace/forms", //罗峰工作流地址(本地)
+        // WORKFLOWURL: "http://192.168.34.126:88/#/workspace/forms", //罗峰工作流地址(本地)
         // UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程
         // FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程
-        // UPLOADURL: 'http://42.180.188.17:11211/upload/image', //测试
-        // FILEURL: 'http://42.180.188.17:11211/image/', //测试
-        // BASEURL: baseUrl ?
-        //     baseUrl :
-        //     window.location.protocol + "//" + window.location.host + "/", //正式环境
-        // UPLOADURL: window.location.protocol + "//" + window.location.host + "/upload/image", //正式环境
-        // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
+        // UPLOADURL:'http://42.180.188.17:11211/upload/image',//测试
+        // FILEURL:'http://42.180.188.17:11211/image/',//测试
+        BASEURL: baseUrl ?
+            baseUrl :
+            window.location.protocol + "//" + window.location.host + "/", //正式环境
+        UPLOADURL: window.location.protocol + "//" + window.location.host + "/upload/image", //正式环境
+        FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
         // // WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用)
         // // WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址(弃用)
         // WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms',//鞍钢平台工作流地址
diff --git a/src/views/home/login_v2.vue b/src/views/home/login_v2.vue
index 9f6f713c..5f9a3abc 100644
--- a/src/views/home/login_v2.vue
+++ b/src/views/home/login_v2.vue
@@ -1086,7 +1086,7 @@ export default {
       this.$http.defaults.headers.common["operateId"] = data.userId;
       this.$store.commit("setUserInfo", data);
       localStorage.setItem("jumpToken", data.token); //储存token到本地
-
+      let isHaveUserCenterMenu = false; // 判断是否有用户中心模块
       var moduleList = data.menuAuthority.moduleList
         ? data.menuAuthority.moduleList
         : [];
@@ -1108,6 +1108,9 @@ export default {
         if (element.moduleType == 5) {
           projectModule.push(element);
         }
+        if (element.modulePath == "/userCenter/userConfig") {
+          isHaveUserCenterMenu = true;
+        }
       });
       var menu2 = [
         {
@@ -1141,7 +1144,6 @@ export default {
         //   path: '/brand'
         // }
       ];
-      console.log(data.accountType, "777888");
       switch (data.accountType) {
         case 1:
           this.$store.commit("setMenuList", menu2);
@@ -1198,7 +1200,8 @@ export default {
             if (!arr2.length) {
               if (this.loginType == 1) {
                 // this.$router.push("/projectIndex");
-                if (!this.$store.state.userInfo.personMail && this.company == 'agjt') {
+                console.log(123456,isHaveUserCenterMenu)
+                if (!this.$store.state.userInfo.personMail && this.company == 'agjt' && isHaveUserCenterMenu) {
                   this.checkInfoComplete();
                 }
                 this.$router.push("/workSpace");
@@ -1210,13 +1213,15 @@ export default {
             }
           } else {
             // styleType == 3 衢州版
+            console.log(data,111222333);
             if (
               (data.styleType != 2 && data.styleType != 3) ||
               !data.styleType
             ) {
               if (this.loginType == 1) {
                 // this.$router.push("/projectIndex");
-                if (!this.$store.state.userInfo.personMail && this.company == 'agjt') {
+                console.log(123456,isHaveUserCenterMenu)
+                if (!this.$store.state.userInfo.personMail && this.company == 'agjt' && isHaveUserCenterMenu) {
                   this.checkInfoComplete();
                 }
                 this.$router.push("/workSpace");
diff --git a/src/views/projectFront/carManage/carManage.vue b/src/views/projectFront/carManage/carManage.vue
index 4f56de5a..81ae2212 100644
--- a/src/views/projectFront/carManage/carManage.vue
+++ b/src/views/projectFront/carManage/carManage.vue
@@ -132,6 +132,7 @@
           prop="isBlack"
           :label="$t('message.carManage.isBlack')"
           align="center"
+          v-permission="{key: 'clgl_blackWhiteList', menuPath: '/project/carManage/carManage'}"
         >
           <template slot-scope="scope">
             <!-- {{ $t('message.carManage.isBlackArr')[scope.row.isBlack] }} -->