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://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/' //彭洁远程

66
src/components/account.vue
View File

@ -9,9 +9,23 @@
@hide="sendMsg2"
>
<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> -->
<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>
<div style="margin-left: 10px">
<p>{{ $store.state.userInfo.companyName }}</p>
@ -32,7 +46,10 @@
<!-- <div class="flex2" style="margin-top:20px">
客服电话：{{$store.state.userInfo.customerServicePhone}}
</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">
<img src="@/assets/images/sjzx.png" width="15px" height="15px" />
<span>数据中心</span>
@ -49,7 +66,11 @@
:title="enterpriseFront"
>
<!-- <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>
</div>
<!-- // 企业后台 -->
@ -63,7 +84,11 @@
:title="enterpriseBackground"
>
<!-- <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>企业后台</span> -->
<span>{{ enterpriseBackground }}</span>
@ -79,7 +104,11 @@
:title="projectBackground"
>
<!-- <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") -->
<span>{{ projectBackground }} </span>
</div>
@ -94,7 +123,11 @@
:title="equipmentChina"
>
<!-- <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>{{ equipmentChina }}</span>
</div>
@ -115,13 +148,15 @@
<div
class="width_100"
@click="goto3"
v-if="
dataCenter1 != 1
"
v-if="dataCenter1 != 1"
:title="dataCenter"
>
<!-- <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>{{ dataCenter }}</span>
</div>
@ -131,8 +166,7 @@
@click="goto6()"
v-if="
$route.path.indexOf('/firm/projectManage') == -1 &&
$store.state.userInfo.systemLogoConfig.isShowProjectFront ==
1 &&
$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 {

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

@ -31,7 +31,7 @@
:src="$store.state.FILEURL + this.ruleForm.avatar"
class="avatar">
<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>
</el-image>
<div class="avatar-uploader-icon" v-else>
@ -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;
}
}
}
</style>

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

@ -10,9 +10,7 @@
<iframe
id="myIframe"
ref="myIframeRef"
:src="
`${$store.state.WORKFLOWURL}?token=${$store.state.userInfo.token}&projectSn=${$store.state.projectSn}`
"
:src="`${$store.state.WORKFLOWURL}?token=${$store.state.userInfo.token}&projectSn=${$store.state.projectSn}`"
style="width: 100%; height: 100%; border: medium none"
frameborder="1"
></iframe>
@ -28,11 +26,13 @@
:close-on-click-modal="false"
:close-on-press-escape="false"
:show-close="false"
:visible.sync="selectGroupDialog"
>
<div class="content-list" :style="{height: groupListData.length > 4?'300px':'auto'}">
<vue-scroll style="height: 100%;">
<div
class="content-list"
:style="{ height: groupListData.length > 4 ? '300px' : 'auto' }"
>
<vue-scroll style="height: 100%">
<div
class="content-list-item"
v-for="(item, index) in groupListData"
@ -58,7 +58,10 @@
<script>
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,
},
});
});
},
@ -208,7 +234,7 @@ export default {
this.$nextTick(() => {
let iframe = this.$refs.myIframeRef;
iframe.addEventListener("load", this.onIframeLoad);
})
});
});
},
// 默认选中已选中组织的第一个项目
@ -223,7 +249,7 @@ export default {
// 加判断是为了在循环中只选中第一个
this.projectSn = obj.sn;
// 修改全局projectSn
console.log(obj.sn,'我爱你测试')
console.log(obj.sn, "我爱你测试");
this.$store.commit("setProjectSn", obj.sn);
}
this.getModuleMenuList();
@ -234,13 +260,13 @@ export default {
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); // 存储组织树数据
}