admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: BUG修改

Browse Source
This commit is contained in:
kun 2024-05-22 19:48:09 +08:00
parent 66eadec2a3
commit db3245c961
4 changed files with 114 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/assets/js/http.js
View File

@ -84,7 +84,7 @@ if (process.env.NODE_ENV == 'development') {
// axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工） // 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:28888/' //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地 // 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://192.168.34.155:19111/' //彭洁本地
// axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程 // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程 // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程

78
src/components/account.vue
View File

@ -9,9 +9,23 @@
@hide="sendMsg2" @hide="sendMsg2"
> >
<div class="accountBox"> <div class="accountBox">
<div class="flex2 accountInfo" v-show="$store.state.userInfo.accountType != 1"> <div
class="flex2 accountInfo"
v-show="$store.state.userInfo.accountType != 1"
>
<!-- <i class="el-icon-user-solid"></i> --> <!-- <i class="el-icon-user-solid"></i> -->
<img :src="$store.state.FILEURL + $store.state.userInfo.avatar" style="width: 40px;height: 40px;" v-if="$store.state.userInfo.avatar"/> <el-image
v-if="$store.state.userInfo.avatar"
:src="$store.state.FILEURL + $store.state.userInfo.avatar"
style="width: 40px;height: 40px;border-radius: 50%;"
>
<div slot="error" class="image-slot">
<el-avatar
size="large"
icon="el-icon-user-solid"
></el-avatar>
</div>
</el-image>
<el-avatar size="large" icon="el-icon-user-solid" v-else></el-avatar> <el-avatar size="large" icon="el-icon-user-solid" v-else></el-avatar>
<div style="margin-left: 10px"> <div style="margin-left: 10px">
<p>{{ $store.state.userInfo.companyName }}</p> <p>{{ $store.state.userInfo.companyName }}</p>
@ -22,7 +36,7 @@
<p <p
v-if=" v-if="
projectType == 'hengqin' && projectType == 'hengqin' &&
$store.state.currentProDetail != null $store.state.currentProDetail != null
" "
> >
入场码：{{ $store.state.currentProDetail.placeCode }} 入场码：{{ $store.state.currentProDetail.placeCode }}
@ -32,7 +46,10 @@
<!-- <div class="flex2" style="margin-top:20px"> <!-- <div class="flex2" style="margin-top:20px">
客服电话：{{$store.state.userInfo.customerServicePhone}} 客服电话：{{$store.state.userInfo.customerServicePhone}}
</div> --> </div> -->
<div class="flex2 wrap" v-if="![1,11].includes($store.state.userInfo.accountType)"> <div
class="flex2 wrap"
v-if="![1, 11].includes($store.state.userInfo.accountType)"
>
<!-- <div class="width_100"> <!-- <div class="width_100">
<img src="@/assets/images/sjzx.png" width="15px" height="15px" /> <img src="@/assets/images/sjzx.png" width="15px" height="15px" />
<span>数据中心</span> <span>数据中心</span>
@ -44,12 +61,16 @@
@click="goto5()" @click="goto5()"
v-if=" v-if="
$route.path.indexOf('/firm/projectManage') == -1 && $route.path.indexOf('/firm/projectManage') == -1 &&
![5, 6, 10].includes($store.state.userInfo.accountType) ![5, 6, 10].includes($store.state.userInfo.accountType)
" "
:title="enterpriseFront" :title="enterpriseFront"
> >
<!-- <img src="@/assets/images/xmht.png" width="15px" height="15px" /> --> <!-- <img src="@/assets/images/xmht.png" width="15px" height="15px" /> -->
<img src="@/assets/images/headerImg/companyIcon1.png" width="15px" height="15px" /> <img
src="@/assets/images/headerImg/companyIcon1.png"
width="15px"
height="15px"
/>
<span>{{ enterpriseFront }}</span> <span>{{ enterpriseFront }}</span>
</div> </div>
<!-- // 企业后台 --> <!-- // 企业后台 -->
@ -58,12 +79,16 @@
@click="goto2" @click="goto2"
v-if=" v-if="
$route.path.indexOf('/companyAdmin/companyDiagram') == -1 && $route.path.indexOf('/companyAdmin/companyDiagram') == -1 &&
![5, 6, 10].includes($store.state.userInfo.accountType) ![5, 6, 10].includes($store.state.userInfo.accountType)
" "
:title="enterpriseBackground" :title="enterpriseBackground"
> >
<!-- <img src="@/assets/images/yyht.png" width="15px" height="15px" /> --> <!-- <img src="@/assets/images/yyht.png" width="15px" height="15px" /> -->
<img src="@/assets/images/headerImg/companyIcon2.png" width="15px" height="15px" /> <img
src="@/assets/images/headerImg/companyIcon2.png"
width="15px"
height="15px"
/>
<!-- <span>{{$t('message.companyDiagram.operatingCenter')}}</span> --> <!-- <span>{{$t('message.companyDiagram.operatingCenter')}}</span> -->
<!-- <span>企业后台</span> --> <!-- <span>企业后台</span> -->
<span>{{ enterpriseBackground }}</span> <span>{{ enterpriseBackground }}</span>
@ -74,12 +99,16 @@
@click="goProjectBackstage" @click="goProjectBackstage"
v-if=" v-if="
$route.path.indexOf('/projectIndex') == -1 && $route.path.indexOf('/projectIndex') == -1 &&
$store.state.userInfo.enterProjectBackType === 0 $store.state.userInfo.enterProjectBackType === 0
" "
:title="projectBackground" :title="projectBackground"
> >
<!-- <img src="@/assets/images/xmht.png" width="15px" height="15px" /> --> <!-- <img src="@/assets/images/xmht.png" width="15px" height="15px" /> -->
<img src="@/assets/images/headerImg/projectIcon1.png" width="15px" height="15px" /> <img
src="@/assets/images/headerImg/projectIcon1.png"
width="15px"
height="15px"
/>
<!-- $t("message.companyDiagram.projectBackEnd") --> <!-- $t("message.companyDiagram.projectBackEnd") -->
<span>{{ projectBackground }} </span> <span>{{ projectBackground }} </span>
</div> </div>
@ -89,12 +118,16 @@
@click="goDevcenter" @click="goDevcenter"
v-if=" v-if="
seeEquipment === 0 && seeEquipment === 0 &&
$route.path.indexOf('/equipmentCenterIndx') == -1 $route.path.indexOf('/equipmentCenterIndx') == -1
" "
:title="equipmentChina" :title="equipmentChina"
> >
<!-- <img src="@/assets/images/xmht.png" width="15px" height="15px" /> --> <!-- <img src="@/assets/images/xmht.png" width="15px" height="15px" /> -->
<img src="@/assets/images/headerImg/equipIcon1.png" width="15px" height="15px" /> <img
src="@/assets/images/headerImg/equipIcon1.png"
width="15px"
height="15px"
/>
<!-- <span>{{ $t("message.companyDiagram.devCenter") }}</span> --> <!-- <span>{{ $t("message.companyDiagram.devCenter") }}</span> -->
<span>{{ equipmentChina }}</span> <span>{{ equipmentChina }}</span>
</div> </div>
@ -115,13 +148,15 @@
<div <div
class="width_100" class="width_100"
@click="goto3" @click="goto3"
v-if=" v-if="dataCenter1 != 1"
dataCenter1 != 1
"
:title="dataCenter" :title="dataCenter"
> >
<!-- <img src="@/assets/images/zlzx.png" width="15px" height="15px" /> --> <!-- <img src="@/assets/images/zlzx.png" width="15px" height="15px" /> -->
<img src="@/assets/images/headerImg/documentIcon1.png" width="15px" height="15px" /> <img
src="@/assets/images/headerImg/documentIcon1.png"
width="15px"
height="15px"
/>
<!-- <span>{{ $t("message.docManage.fileCenter") }}</span> --> <!-- <span>{{ $t("message.docManage.fileCenter") }}</span> -->
<span>{{ dataCenter }}</span> <span>{{ dataCenter }}</span>
</div> </div>
@ -131,9 +166,8 @@
@click="goto6()" @click="goto6()"
v-if=" v-if="
$route.path.indexOf('/firm/projectManage') == -1 && $route.path.indexOf('/firm/projectManage') == -1 &&
$store.state.userInfo.systemLogoConfig.isShowProjectFront == $store.state.userInfo.systemLogoConfig.isShowProjectFront == 1 &&
1 && [5, 6].includes($store.state.userInfo.accountType)
[5, 6].includes($store.state.userInfo.accountType)
" "
:title="projectFront" :title="projectFront"
> >
@ -219,8 +253,8 @@ export default {
if (this.loginData.enterpriseFront != "") { if (this.loginData.enterpriseFront != "") {
this.enterpriseFront = this.loginData.enterpriseFront; this.enterpriseFront = this.loginData.enterpriseFront;
} }
if (this.loginData.projectFront != '') { if (this.loginData.projectFront != "") {
this.projectFront = this.loginData.projectFront this.projectFront = this.loginData.projectFront;
} }
}, },
mounted() { mounted() {
@ -433,7 +467,7 @@ export default {
.accountBox { .accountBox {
padding: 10px 10px 0; padding: 10px 10px 0;
} }
.accountInfo{ .accountInfo {
margin-bottom: 17px; margin-bottom: 17px;
} }
.logout { .logout {

9
src/views/userCenter/userCenter/componentsModule/dataInfoFormData.vue
View File

@ -31,7 +31,7 @@
:src="$store.state.FILEURL + this.ruleForm.avatar" :src="$store.state.FILEURL + this.ruleForm.avatar"
class="avatar"> class="avatar">
<div slot="error" class="image-slot"> <div slot="error" class="image-slot">
<el-avatar size="large" icon="el-icon-user-solid"></el-avatar> <i class="el-icon-plus" style="font-size: 28px;"></i>
</div> </div>
</el-image> </el-image>
<div class="avatar-uploader-icon" v-else> <div class="avatar-uploader-icon" v-else>
@ -252,6 +252,13 @@ export default {
width: 178px; width: 178px;
height: 178px; height: 178px;
display: block; display: block;
.image-slot{
width: 100%;
height: 100%;
display: flex;
align-items: center;
justify-content: center;
}
} }
} }
</style> </style>

72
src/views/workSpace/index.vue
View File

@ -10,9 +10,7 @@
<iframe <iframe
id="myIframe" id="myIframe"
ref="myIframeRef" ref="myIframeRef"
:src=" :src="`${$store.state.WORKFLOWURL}?token=${$store.state.userInfo.token}&projectSn=${$store.state.projectSn}`"
`${$store.state.WORKFLOWURL}?token=${$store.state.userInfo.token}&projectSn=${$store.state.projectSn}`
"
style="width: 100%; height: 100%; border: medium none" style="width: 100%; height: 100%; border: medium none"
frameborder="1" frameborder="1"
></iframe> ></iframe>
@ -28,11 +26,13 @@
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
:show-close="false" :show-close="false"
:visible.sync="selectGroupDialog" :visible.sync="selectGroupDialog"
> >
<div class="content-list" :style="{height: groupListData.length > 4?'300px':'auto'}"> <div
<vue-scroll style="height: 100%;"> class="content-list"
:style="{ height: groupListData.length > 4 ? '300px' : 'auto' }"
>
<vue-scroll style="height: 100%">
<div <div
class="content-list-item" class="content-list-item"
v-for="(item, index) in groupListData" v-for="(item, index) in groupListData"
@ -58,7 +58,10 @@
<script> <script>
import vhead from "@/components/header"; import vhead from "@/components/header";
import { getProjectDetail } from "@/assets/js/api/baseInfo.js"; 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 { import {
getAllModuleApi, getAllModuleApi,
getNewUserAllModulePageApi, getNewUserAllModulePageApi,
@ -83,6 +86,9 @@ export default {
// this.selectGroupDialog = true; // this.selectGroupDialog = true;
// } // }
this.getGroupTreeData(); this.getGroupTreeData();
if (!this.$store.state.userInfo.personMail) {
this.checkInfoComplete();
}
}, },
mounted() { mounted() {
// 挂载后来给iframe传递菜单数据 // 挂载后来给iframe传递菜单数据
@ -96,19 +102,39 @@ export default {
iframe.removeEventListener("load", this.onIframeLoad); iframe.removeEventListener("load", this.onIframeLoad);
}, },
methods: { methods: {
checkInfoComplete() {
this.$confirm(
"系统检测到您未完善邮箱，请去后台中心完善，以免忘记密码时无法通过邮箱验证，导致重置密码失败！",
"温馨提示",
{
confirmButtonText: "用户中心",
cancelButtonText: "取消",
type: "warning",
}
)
.then(() => {
this.$router.push("/userCenter/userConfig");
})
.catch(() => {
this.$message({
type: "info",
message: "已取消",
});
});
},
// 查询全部模块 // 查询全部模块
getModuleMenuList() { getModuleMenuList() {
getNewUserAllModulePageApi({ getNewUserAllModulePageApi({
projectSn: this.$store.state.projectSn, projectSn: this.$store.state.projectSn,
userId: this.$store.state.userInfo.userId, userId: this.$store.state.userInfo.userId,
}).then((res) => { }).then((res) => {
console.log(res,'我爱你测试') console.log(res, "我爱你测试");
this.$store.commit("setUserInfo", { this.$store.commit("setUserInfo", {
...this.$store.state.userInfo, ...this.$store.state.userInfo,
menuAuthority: { menuAuthority: {
menuList: res.result.menuList, menuList: res.result.menuList,
moduleList: res.result.moduleList moduleList: res.result.moduleList,
} },
}); });
}); });
}, },
@ -146,7 +172,7 @@ export default {
// console.error("================发消息之前的userInfo==================") // console.error("================发消息之前的userInfo==================")
// console.error(this.$store.state.userInfo) // console.error(this.$store.state.userInfo)
// console.error("================发消息之前的userInfo==================") // console.error("================发消息之前的userInfo==================")
// console.error("================发消息之前的projectSn==================") // console.error("================发消息之前的projectSn==================")
// console.error(this.$store.state.projectSn) // console.error(this.$store.state.projectSn)
// console.error("================发消息之前的projectSn==================") // console.error("================发消息之前的projectSn==================")
@ -208,7 +234,7 @@ export default {
this.$nextTick(() => { this.$nextTick(() => {
let iframe = this.$refs.myIframeRef; let iframe = this.$refs.myIframeRef;
iframe.addEventListener("load", this.onIframeLoad); iframe.addEventListener("load", this.onIframeLoad);
}) });
}); });
}, },
// 默认选中已选中组织的第一个项目 // 默认选中已选中组织的第一个项目
@ -223,24 +249,24 @@ export default {
// 加判断是为了在循环中只选中第一个 // 加判断是为了在循环中只选中第一个
this.projectSn = obj.sn; this.projectSn = obj.sn;
// 修改全局projectSn // 修改全局projectSn
console.log(obj.sn,'我爱你测试') console.log(obj.sn, "我爱你测试");
this.$store.commit("setProjectSn", obj.sn); this.$store.commit("setProjectSn", obj.sn);
} }
this.getModuleMenuList(); this.getModuleMenuList();
this.getDataDateils(); this.getDataDateils();
} }
}, },
// 点击选中组织 // 点击选中组织
selectedGroupData(item) { selectedGroupData(item) {
let data = { let data = {
token: this.$store.state.userInfo.token, token: this.$store.state.userInfo.token,
headquartersSn: item.companySn headquartersSn: item.companySn,
}; };
jumpLargeUserInfoApi(data).then((res) => { jumpLargeUserInfoApi(data).then((res) => {
console.log(res,'重新获取信息'); console.log(res, "重新获取信息");
if(res.result){ if (res.result) {
this.$store.commit("setUserInfo", res.result); this.$store.commit("setUserInfo", res.result);
console.log(item,123456789) console.log(item, 123456789);
if (item) { if (item) {
this.selectedDataSn = item.companySn; this.selectedDataSn = item.companySn;
this.$store.commit("setSelectedGroupSn", item.companySn); // 存储选中的组织Sn this.$store.commit("setSelectedGroupSn", item.companySn); // 存储选中的组织Sn
@ -266,11 +292,11 @@ export default {
// console.log(res); // console.log(res);
if (res.code == 200 && res.result) { if (res.code == 200 && res.result) {
this.groupListData = res.result; this.groupListData = res.result;
console.log("this.groupListData",this.groupListData) console.log("this.groupListData", this.groupListData);
if(this.groupListData.length==1){ if (this.groupListData.length == 1) {
this.selectedGroupData(this.groupListData[0]); this.selectedGroupData(this.groupListData[0]);
}else{ } else {
this.selectGroupDialog = true this.selectGroupDialog = true;
} }
this.$store.commit("setGroupTreeList", res.result); // 存储组织树数据 this.$store.commit("setGroupTreeList", res.result); // 存储组织树数据
} }