From 61c01a9476db496c9fc120d1e537c11d114444d3 Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Wed, 26 Jun 2024 15:46:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E8=B5=84=E6=96=99=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9D=83=E9=99=90=E5=8A=9F=E8=83=BD=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E4=BF=AE=E6=94=B9=E5=8A=B3=E5=8A=A1=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=B8=AD=E7=9A=84=E8=A1=A8=E6=A0=BC=E5=A4=9A?=
 =?UTF-8?q?=E9=80=89=E5=8A=9F=E8=83=BD?=
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                       | 16 +++++++++++++++-
 src/store/index.js                               | 16 ++++++++--------
 .../projectFront/laborManage/dataValidation.vue  |  2 +-
 .../laborManage/personModule/administration.vue  |  2 +-
 .../laborManage/personModule/laborComponent.vue  |  2 +-
 src/views/projectFront/laborManage/rosterNew.vue |  2 +-
 7 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index 6bc6f760..be21d583 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,7 +185,7 @@ 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/' //乌丹(合肥启程)新正式地址
diff --git a/src/components/account.vue b/src/components/account.vue
index 68085a4e..11bd4a37 100644
--- a/src/components/account.vue
+++ b/src/components/account.vue
@@ -201,13 +201,16 @@
   </div>
 </template>
 <script>
+import {
+  getNewUserAllModulePageApi,
+} from "@/assets/js/api/jxjadmin.js";
 export default {
   data() {
     return {
       COMPANY: COMPANY,
       projectType: "",
       loginData: "",
-      dataCenter1: "",
+      dataCenter1: 1,
       seeEquipment: "",
       projectBackground: "项目后台",
       enterpriseBackground: "企业后台",
@@ -233,6 +236,7 @@ export default {
     this.projectType = PROJECT_TYPE;
     this.loginData = JSON.parse(localStorage.getItem("systemInfo"));
     this.seeEquipment = this.$store.state.userInfo.seeEquipment;
+    this.getModuleList();
     console.log("seeEquipment------", this.seeEquipment);
     console.log(" this.loginData===================", this.loginData);
     if (this.loginData.headerConfiguration != "") {
@@ -263,6 +267,16 @@ export default {
     // console.log('企业后台',this.enterpriseBackground)
   },
   methods: {
+    // 获取全部模块
+    getModuleList() {
+      let allModuleList = this.$store.state.userInfo.menuAuthority.moduleList;
+      for(let i = 0;i<allModuleList.length;i++){
+        if(allModuleList[i].modulePath == '/companyAdmin/docManage'){ // 筛选资料中心
+          this.dataCenter1 = 0;
+          break;
+        }
+      }
+    },
     // 修改密码
     updatePw() {
       this.$router.push({
diff --git a/src/store/index.js b/src/store/index.js
index a7fb0e25..6cb7d067 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -52,19 +52,19 @@ export default new Vuex.Store({
         // 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.126: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/", //正式环境
+        // 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/projectFront/laborManage/dataValidation.vue b/src/views/projectFront/laborManage/dataValidation.vue
index 3db5a386..17168006 100644
--- a/src/views/projectFront/laborManage/dataValidation.vue
+++ b/src/views/projectFront/laborManage/dataValidation.vue
@@ -75,11 +75,11 @@
         :data="tableList"
         @selection-change="handleSelectionChange"
       >
+        <!-- :reserve-selection="true" -->
         <el-table-column
           align="center"
           type="selection"
           width="55"
-          :reserve-selection="true"
         >
         </el-table-column>
         <el-table-column
diff --git a/src/views/projectFront/laborManage/personModule/administration.vue b/src/views/projectFront/laborManage/personModule/administration.vue
index 70af81c8..569b8c7c 100644
--- a/src/views/projectFront/laborManage/personModule/administration.vue
+++ b/src/views/projectFront/laborManage/personModule/administration.vue
@@ -490,10 +490,10 @@
             row-key="id"
             :row-class-name="tableRowClassName"
           >
+            <!-- :reserve-selection="true" -->
             <el-table-column
               type="selection"
               width="55"
-              :reserve-selection="true"
               :selectable="selectEnable"
             ></el-table-column>
             <el-table-column prop="workerName">
diff --git a/src/views/projectFront/laborManage/personModule/laborComponent.vue b/src/views/projectFront/laborManage/personModule/laborComponent.vue
index e9db22d3..567b95e8 100644
--- a/src/views/projectFront/laborManage/personModule/laborComponent.vue
+++ b/src/views/projectFront/laborManage/personModule/laborComponent.vue
@@ -452,10 +452,10 @@
             row-key="id"
             :row-class-name="tableRowClassName"
           >
+            <!-- :reserve-selection="true" -->
             <el-table-column
               type="selection"
               width="55"
-              :reserve-selection="true"
               :selectable="selectEnable"
             ></el-table-column>
             <el-table-column prop="workerName">
diff --git a/src/views/projectFront/laborManage/rosterNew.vue b/src/views/projectFront/laborManage/rosterNew.vue
index 9e416868..3ba84772 100644
--- a/src/views/projectFront/laborManage/rosterNew.vue
+++ b/src/views/projectFront/laborManage/rosterNew.vue
@@ -221,11 +221,11 @@
           :row-class-name="tableRowClassName"
           @selection-change="handleSelectionChange"
         >
+          <!-- :reserve-selection="true" -->
           <el-table-column
             align="center"
             type="selection"
             width="55"
-            :reserve-selection="true"
           >
           </el-table-column>
           <el-table-column prop="attendanceNumber">

From ee705bd0436a734b60fce770d7c7c50412839837 Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Wed, 26 Jun 2024 20:18:18 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E6=B3=A8=E9=87=8A=E8=B5=84=E6=96=99?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=9D=83=E9=99=90=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/account.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/account.vue b/src/components/account.vue
index 11bd4a37..9e3d5efc 100644
--- a/src/components/account.vue
+++ b/src/components/account.vue
@@ -210,7 +210,7 @@ export default {
       COMPANY: COMPANY,
       projectType: "",
       loginData: "",
-      dataCenter1: 1,
+      dataCenter1: 0,
       seeEquipment: "",
       projectBackground: "项目后台",
       enterpriseBackground: "企业后台",
@@ -236,7 +236,7 @@ export default {
     this.projectType = PROJECT_TYPE;
     this.loginData = JSON.parse(localStorage.getItem("systemInfo"));
     this.seeEquipment = this.$store.state.userInfo.seeEquipment;
-    this.getModuleList();
+    // this.getModuleList();
     console.log("seeEquipment------", this.seeEquipment);
     console.log(" this.loginData===================", this.loginData);
     if (this.loginData.headerConfiguration != "") {