diff --git a/src/assets/js/http.js b/src/assets/js/http.js index bb3911a4..6778e31c 100644 --- a/src/assets/js/http.js +++ b/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:19111/' //郭圣雄本地 + 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/' //彭洁远程 diff --git a/src/components/account.vue b/src/components/account.vue index f53aa28d..68085a4e 100644 --- a/src/components/account.vue +++ b/src/components/account.vue @@ -9,9 +9,23 @@ @hide="sendMsg2" >
-
+
- + +
+ +
+

{{ $store.state.userInfo.companyName }}

@@ -22,7 +36,7 @@

入场码：{{ $store.state.currentProDetail.placeCode }} @@ -32,7 +46,10 @@ -

+
- + {{ enterpriseFront }}
@@ -58,12 +79,16 @@ @click="goto2" v-if=" $route.path.indexOf('/companyAdmin/companyDiagram') == -1 && - ![5, 6, 10].includes($store.state.userInfo.accountType) + ![5, 6, 10].includes($store.state.userInfo.accountType) " :title="enterpriseBackground" > - + {{ enterpriseBackground }} @@ -74,12 +99,16 @@ @click="goProjectBackstage" v-if=" $route.path.indexOf('/projectIndex') == -1 && - $store.state.userInfo.enterProjectBackType === 0 + $store.state.userInfo.enterProjectBackType === 0 " :title="projectBackground" > - + {{ projectBackground }}
@@ -89,12 +118,16 @@ @click="goDevcenter" v-if=" seeEquipment === 0 && - $route.path.indexOf('/equipmentCenterIndx') == -1 + $route.path.indexOf('/equipmentCenterIndx') == -1 " :title="equipmentChina" > - + {{ equipmentChina }}
@@ -115,13 +148,15 @@
- + {{ dataCenter }}
@@ -131,9 +166,8 @@ @click="goto6()" v-if=" $route.path.indexOf('/firm/projectManage') == -1 && - $store.state.userInfo.systemLogoConfig.isShowProjectFront == - 1 && - [5, 6].includes($store.state.userInfo.accountType) + $store.state.userInfo.systemLogoConfig.isShowProjectFront == 1 && + [5, 6].includes($store.state.userInfo.accountType) " :title="projectFront" > @@ -219,8 +253,8 @@ export default { if (this.loginData.enterpriseFront != "") { this.enterpriseFront = this.loginData.enterpriseFront; } - if (this.loginData.projectFront != '') { - this.projectFront = this.loginData.projectFront + if (this.loginData.projectFront != "") { + this.projectFront = this.loginData.projectFront; } }, mounted() { @@ -433,7 +467,7 @@ export default { .accountBox { padding: 10px 10px 0; } -.accountInfo{ +.accountInfo { margin-bottom: 17px; } .logout { diff --git a/src/views/userCenter/userCenter/componentsModule/dataInfoFormData.vue b/src/views/userCenter/userCenter/componentsModule/dataInfoFormData.vue index 866028cd..5b56835c 100644 --- a/src/views/userCenter/userCenter/componentsModule/dataInfoFormData.vue +++ b/src/views/userCenter/userCenter/componentsModule/dataInfoFormData.vue @@ -31,7 +31,7 @@ :src="$store.state.FILEURL + this.ruleForm.avatar" class="avatar">
- +
@@ -252,6 +252,13 @@ export default { width: 178px; height: 178px; display: block; + .image-slot{ + width: 100%; + height: 100%; + display: flex; + align-items: center; + justify-content: center; + } } } diff --git a/src/views/workSpace/index.vue b/src/views/workSpace/index.vue index cd001fc8..be7f46ab 100644 --- a/src/views/workSpace/index.vue +++ b/src/views/workSpace/index.vue @@ -10,9 +10,7 @@ @@ -28,11 +26,13 @@ :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false" - :visible.sync="selectGroupDialog" > -
- +
+
import vhead from "@/components/header"; import { getProjectDetail } from "@/assets/js/api/baseInfo.js"; -import { getGroupListByCompanyApi, jumpLargeUserInfoApi } from "@/assets/js/api/loginSign.js"; +import { + getGroupListByCompanyApi, + jumpLargeUserInfoApi, +} from "@/assets/js/api/loginSign.js"; import { getAllModuleApi, getNewUserAllModulePageApi, @@ -83,6 +86,9 @@ export default { // this.selectGroupDialog = true; // } this.getGroupTreeData(); + if (!this.$store.state.userInfo.personMail) { + this.checkInfoComplete(); + } }, mounted() { // 挂载后来给iframe传递菜单数据 @@ -96,19 +102,39 @@ export default { iframe.removeEventListener("load", this.onIframeLoad); }, methods: { + checkInfoComplete() { + this.$confirm( + "系统检测到您未完善邮箱，请去后台中心完善，以免忘记密码时无法通过邮箱验证，导致重置密码失败！", + "温馨提示", + { + confirmButtonText: "用户中心", + cancelButtonText: "取消", + type: "warning", + } + ) + .then(() => { + this.$router.push("/userCenter/userConfig"); + }) + .catch(() => { + this.$message({ + type: "info", + message: "已取消", + }); + }); + }, // 查询全部模块 getModuleMenuList() { getNewUserAllModulePageApi({ projectSn: this.$store.state.projectSn, userId: this.$store.state.userInfo.userId, }).then((res) => { - console.log(res,'我爱你测试') + console.log(res, "我爱你测试"); this.$store.commit("setUserInfo", { ...this.$store.state.userInfo, menuAuthority: { menuList: res.result.menuList, - moduleList: res.result.moduleList - } + moduleList: res.result.moduleList, + }, }); }); }, @@ -146,7 +172,7 @@ export default { // console.error("================发消息之前的userInfo==================") // console.error(this.$store.state.userInfo) // console.error("================发消息之前的userInfo==================") - + // console.error("================发消息之前的projectSn==================") // console.error(this.$store.state.projectSn) // console.error("================发消息之前的projectSn==================") @@ -208,7 +234,7 @@ export default { this.$nextTick(() => { let iframe = this.$refs.myIframeRef; iframe.addEventListener("load", this.onIframeLoad); - }) + }); }); }, // 默认选中已选中组织的第一个项目 @@ -223,24 +249,24 @@ export default { // 加判断是为了在循环中只选中第一个 this.projectSn = obj.sn; // 修改全局projectSn - console.log(obj.sn,'我爱你测试') + console.log(obj.sn, "我爱你测试"); this.$store.commit("setProjectSn", obj.sn); } - this.getModuleMenuList(); - this.getDataDateils(); + this.getModuleMenuList(); + this.getDataDateils(); } }, // 点击选中组织 selectedGroupData(item) { let data = { token: this.$store.state.userInfo.token, - headquartersSn: item.companySn + headquartersSn: item.companySn, }; jumpLargeUserInfoApi(data).then((res) => { - console.log(res,'重新获取信息'); - if(res.result){ + console.log(res, "重新获取信息"); + if (res.result) { this.$store.commit("setUserInfo", res.result); - console.log(item,123456789) + console.log(item, 123456789); if (item) { this.selectedDataSn = item.companySn; this.$store.commit("setSelectedGroupSn", item.companySn); // 存储选中的组织Sn @@ -266,11 +292,11 @@ export default { // console.log(res); if (res.code == 200 && res.result) { this.groupListData = res.result; - console.log("this.groupListData",this.groupListData) - if(this.groupListData.length==1){ + console.log("this.groupListData", this.groupListData); + if (this.groupListData.length == 1) { this.selectedGroupData(this.groupListData[0]); - }else{ - this.selectGroupDialog = true + } else { + this.selectGroupDialog = true; } this.$store.commit("setGroupTreeList", res.result); // 存储组织树数据 }