From 27f553fd77d6e646d67d3eb4f153a869e63e9f46 Mon Sep 17 00:00:00 2001
From: Vce <daisy_vce@yeah.net>
Date: Tue, 25 Jun 2024 15:01:21 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix=EF=BC=9A=E7=BB=99=E8=BD=A6=E8=BE=86?=
 =?UTF-8?q?=E9=BB=91=E7=99=BD=E5=90=8D=E5=8D=95=E4=B8=AD=E7=9A=84=E9=BB=91?=
 =?UTF-8?q?=E7=99=BD=E5=90=8D=E5=8D=95=E6=8C=89=E9=92=AE=E5=8A=A0=E4=B8=8A?=
 =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectFront/carManage/carManage.vue | 1 +
 1 file changed, 1 insertion(+)

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] }} -->

From 1a8d01b2083a7ce4d9a85fe6693c4dbb9c2c4bd7 Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Tue, 25 Jun 2024 18:10:33 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E9=82=AE=E7=AE=B1=E6=A0=87=E8=AF=86=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?(=E7=99=BB=E5=BD=95=E6=97=B6)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/js/http.js       |  1 +
 src/components/header.vue   |  2 +-
 src/store/index.js          | 16 ++++++++--------
 src/views/home/login_v2.vue | 13 +++++++++----
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index ceb5c8ac..6bc6f760 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -188,6 +188,7 @@ if (process.env.NODE_ENV == "development") {
     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/' //乌丹(合肥启程)新正式地址
 } 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 087ca546..a7fb0e25 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -58,17 +58,17 @@ export default new Vuex.Store({
         // 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',//鞍钢平台工作流地址
-        WORKFLOWURL: "http://42.180.188.17:19098/#/workspace/forms", //鞍钢测试平台工作流地址
+        // WORKFLOWURL: "http://42.180.188.17:19098/#/workspace/forms", //鞍钢测试平台工作流地址
         //---------------------------------------------------------------------------------------------
         // BASEURL: baseUrl
         //   ? baseUrl
diff --git a/src/views/home/login_v2.vue b/src/views/home/login_v2.vue
index 959a8d74..fe3a6c02 100644
--- a/src/views/home/login_v2.vue
+++ b/src/views/home/login_v2.vue
@@ -1066,7 +1066,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
         : [];
@@ -1088,6 +1088,9 @@ export default {
         if (element.moduleType == 5) {
           projectModule.push(element);
         }
+        if (element.modulePath == "/userCenter/userConfig") {
+          isHaveUserCenterMenu = true;
+        }
       });
       var menu2 = [
         {
@@ -1121,7 +1124,6 @@ export default {
         //   path: '/brand'
         // }
       ];
-      console.log(data.accountType, "777888");
       switch (data.accountType) {
         case 1:
           this.$store.commit("setMenuList", menu2);
@@ -1178,7 +1180,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");
@@ -1190,13 +1193,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");