fix: BUG修改

src/assets/js/http.js

@@ -84,7 +84,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://101.43.164.214:45020/' //沈阳和盈
@@ -92,7 +92,7 @@ if (process.env.NODE_ENV == 'development') {
   // 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/'//中建四局(沙湖)线上（最新）地址
-  // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址
+  axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址
 
 
 } else if (process.env.NODE_ENV == 'debug') {

src/components/account.vue

@@ -389,7 +389,7 @@ export default {
       let routeUrl = "";
       let type = this.$store.state.userInfo.accountType;
       //  this.$store.commit("setProjectSn", value.projectSn);
-      if (type == 5 || type == 6) {
+      if (type == 5 || type == 6 || type == 10) {
         window.open("/equipmentCenter.html#/equipmentCenterIndx", "_self");
         window._paq.push(["trackEvent", "点击", "设备中台", "进入设备中台"]);
       } else {

src/components/userChange.vue

@@ -141,6 +141,9 @@ export default {
   },
   created() {
     this.getGroupTreeData();
+    if(this.$store.state.projectSn){
+      this.selectedProjectSn = this.$store.state.projectSn
+    }
   },
   mounted() {},
   methods: {
@@ -169,7 +172,7 @@ export default {
           this.selectProject(item);
         });
       } else {
-        if (!this.selectedProjectSn || !this.$store.state.projectSn) {
+        if (!this.selectedProjectSn || !this.$store.state.currentProDetail) {
           // 加判断是为了在循环中只选中第一个
           this.selectedProjectSn = obj.sn;
           // 修改全局projectSn
@@ -182,7 +185,7 @@ export default {
     // 设置树形的选中项目样式
     setTreeActive(){
       this.$nextTick(() => {
-        let activeSn = this.selectedProjectSn || this.$store.state.projectSn
+        let activeSn = this.$store.state.projectSn || this.selectedProjectSn
         if(activeSn){
           this.$refs.tree.setCurrentKey(activeSn);
         }

src/store/index.js

@@ -48,22 +48,22 @@ export default new Vuex.Store({
     PAGESIZRS: [10, 20, 30, 50],
     // UPLOADURL:' http://101.43.164.214:11111/upload/image/',//  百色
     // FILEURL:' http://101.43.164.214:11111/image/',// 百色
-    UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄
+    // UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄
-    FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄
+    // FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄
-    WORKFLOWURL: 'http://192.168.34.138:88/#/workspace/forms',//测试工作流地址(本地)
+    // WORKFLOWURL: 'http://192.168.34.138:88/#/workspace/forms',//测试工作流地址(本地)
-    // UPLOADURL:'http://10.0.1.43:6023/upload/image',//测试
+    // UPLOADURL:'http://jxj.zhgdyun.com:15551/upload/image',//测试
-    // FILEURL:'http://10.0.1.43:6023/image/',//测试
+    // FILEURL:'http://jxj.zhgdyun.com:15551/image/',//测试
 
-    // BASEURL: baseUrl
+    BASEURL: baseUrl
-    //   ? baseUrl
+      ? baseUrl
-    //   : window.location.protocol + "//" + window.location.host + "/", //正式环境
+      : window.location.protocol + "//" + window.location.host + "/", //正式环境
-    // UPLOADURL:
+    UPLOADURL:
-    //   window.location.protocol +
+      window.location.protocol +
-    //   "//" +
+      "//" +
-    //   window.location.host +
+      window.location.host +
-    //   "/upload/image", //正式环境
+      "/upload/image", //正式环境
-    // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
+    FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
-    // WORKFLOWURL: 'http://jxj.zhgdyun.com:9811/#/workspace/forms',//正式工作流地址
+    WORKFLOWURL: 'http://jxj.zhgdyun.com:9811/#/workspace/forms',//正式工作流地址
     //---------------------------------------------------------------------------------------------
     // BASEURL: baseUrl
     //   ? baseUrl

src/views/equipmentCenter/equipmentCenterIndex.vue

@@ -71,7 +71,7 @@
 <script>
 import vhead from "@/components/header";
 import { getProjectDetail } from "@/assets/js/api/baseInfo.js";
-import { getProjectModuleList,getAllModuleApi } from "@/assets/js/api/jxjadmin.js";
+import { getProjectModuleList,getAllModuleApi, getNewUserAllModulePageApi } from "@/assets/js/api/jxjadmin.js";
 export default {
   name: "projectIndex",
   components: { vhead },
@@ -325,22 +325,66 @@ var arr = this.$store.state.userInfo.menuAuthority.moduleList
       });
     },
     getAllModule(half){
-      getAllModuleApi({moduleType:2, styleType: this.$store.state.userInfo.styleType}).then(res => {
+      // getAllModuleApi({moduleType:2, styleType: this.$store.state.userInfo.styleType}).then(res => {
+      //     if (res.success) {
+      //         var all = res.result
+      //         // console.log(res)
+      //         all.forEach((element,index) => {
+      //           all[index].operation=false
+      //           half.forEach(element2 => {
+      //             if(element2.moduleId==element.moduleId){
+      //               all[index].operation=true
+      //               all[index].menuList=element2.menuList
+      //             }
+      //           });
+      //         });
+      //         this.list=all
+      //     }
+      // })
+      // 新用户功能模块
+      if(this.$store.state.userInfo.accountType == 10){
+        getNewUserAllModulePageApi({
+        projectSn: this.$store.state.projectSn,
+        userId: this.$store.state.userInfo.userId,
+        moduleType: 2,
+      }).then((res) => {
         if (res.success) {
-              var all = res.result
+          var all = res.result.moduleList;
-              // console.log(res)
+          console.log("all", all);
-              all.forEach((element,index) => {
+          all.forEach((element, index) => {
-                all[index].operation=false
+            all[index].operation = false;
-                half.forEach(element2 => {
+            res.result.menuList.forEach((element2) => {
-                  if(element2.moduleId==element.moduleId){
+              console.log(element2,77888)
-                    all[index].operation=true
+              if (element2.moduleId == element.moduleId) {
-                    all[index].menuList=element2.menuList
+                all[index].operation = true;
               }
             });
           });
-              this.list=all
+          console.log("all111", all);
+          this.list = all;
+        }
+      });
+      } else {
+        getAllModuleApi({
+        moduleType: 2,
+        styleType: this.$store.state.userInfo.styleType,
+      }).then((res) => {
+        if (res.success) {
+          var all = res.result;
+          console.log("all", all);
+          all.forEach((element, index) => {
+            all[index].operation = false;
+            half.forEach((element2) => {
+              if (element2.moduleId == element.moduleId) {
+                all[index].operation = true;
+                all[index].menuList = element2.menuList;
+              }
+            });
+          });
+          this.list = all;
+        }
+      });
       }
-      })
     },
     itemClick(item) {
       console.log(item)

src/views/jxjadmin/systemSettings.vue

@@ -636,7 +636,7 @@ export default {
   display: none;
 }
 // 下拉框样式修改
-/deep/.el-select-dropdown__item.hover, .el-select-dropdown__item:hover{
+/deep/.el-select-dropdown__item.hover,.el-select-dropdown__item.hover, .el-select-dropdown__item:hover{
   background-color: #DEE7FF;
 }
 // .vertical-radio-group .el-radio {

src/views/projectAdmin/projectIndex.vue

@@ -41,7 +41,7 @@
                   ref="refName"
                 >
                   <img
-                    v-if="iconType == 1 && item.moduleIcon"
+                    v-if="iconType == 1 && item.moduleIcon "
                     :src="
                       require('../../assets/images/menu/' +
                         item.moduleIcon +
@@ -337,11 +337,13 @@ export default {
     },
     //为了展示未解锁产品，所以需要查询所有模块
     getAllModule(half) {
+      console.log(666)
       // 新用户功能模块
       if(this.$store.state.userInfo.accountType == 10){
         getNewUserAllModulePageApi({
         projectSn: this.projectSn,
-        userId: this.$store.state.userInfo.userId
+        userId: this.$store.state.userInfo.userId,
+        moduleType: 2,
       }).then((res) => {
         if (res.success) {
           var all = res.result.moduleList;
@@ -349,6 +351,7 @@ export default {
           all.forEach((element, index) => {
             all[index].operation = false;
             res.result.menuList.forEach((element2) => {
+              console.log(element2,77888)
               if (element2.moduleId == element.moduleId) {
                 all[index].operation = true;
               }

src/views/projectFront/configManage/groupStructureManagement.vue

@@ -396,11 +396,13 @@ export default {
         phone: "",
         email: "",
         status: 0,
-        parentId: "",
+        parentId: obj.id,
       }
+      this.selectVal = obj.deptName;
       this.groupDialogVisible = true;
       this.$nextTick(() => {
         this.$refs.addEditForm.clearValidate();
+        this.$refs.groupTree.setCurrentKey(this.addEditForm.parentId);
       });
     },
     edit(obj) {
@@ -447,6 +449,7 @@ export default {
             if (result.success) {
               this.$message.success(result.message);
               this.getTableList();
+    this.getList();
             }
           });
         })
@@ -466,6 +469,7 @@ export default {
               if (result.success) {
                 this.$message.success(result.message);
                 this.getTableList();
+    this.getList();
                 this.groupDialogVisible = false;
               }
             });
@@ -475,6 +479,7 @@ export default {
               if (result.success) {
                 this.$message.success(result.message);
                 this.getTableList();
+    this.getList();
                 this.groupDialogVisible = false;
               }
             });
@@ -608,4 +613,8 @@ export default {
   padding-left: 22px;
   line-height: 15px;
 }
+// 下拉框样式修改
+/deep/.el-select-dropdown__item.hover,.el-select-dropdown__item.hover, .el-select-dropdown__item:hover{
+  background-color: transparent;
+}
 </style>

src/views/supplierAdmin/qualificationApply/components/qualification-info.vue

@@ -10,7 +10,7 @@
       <el-table
       class="tables"
         :data="tableList"
-        height="calc(100% - 100px)"
+        height="calc(100% - 50px)"
       >
         <el-table-column
           width="50"

src/views/workSpace/index.vue

@@ -98,11 +98,18 @@ export default {
         if (all.length == 0) {
           this.workSpaceShow = false;
           return;
+        } else {
+          this.workSpaceShow = false;
+          all.forEach((element, index) => {
+          if (element.moduleName == "工作台") {
+            this.workSpaceShow = true;
+          }
+        });
         }
         console.log("all", res.result);
         all.forEach((element, index) => {
           all[index].operation = false;
-          if (element.moduleName == "工作流") {
+          if (element.moduleName == "工作台") {
             element.menuList.forEach((element2) => {
               all[index].operation = true;
               responseMenuList.push({