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

修复bug

Browse Source
This commit is contained in:
jiayu 2024-10-26 09:14:35 +08:00
parent f11176a000
commit 6190d8d64e
4 changed files with 59 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/components/layout.vue
View File

@ -91,15 +91,10 @@
<div class="wrapper" ref="wrapper">
<div class="cont" ref="cont">
<div
v-for="(item, index) in $store.state.menuList"
v-for="(item, index) in filterMenuList"
:key="index"
@click="clickItem(item)"
class="menuInnerBox"
v-if="
company != 'xingxuan' &&
item.target != '_blank' &&
(item.menuName != 'LED大屏显示器' || company != 'nanchang')
"
>
<el-menu-item
class="firstLevelMenu"
@ -199,6 +194,16 @@ export default {
console.log(this.$store.state.menuList,'7778888')
console.log(this.moduleData,'7778888')
},
computed: {
filterMenuList() {
return this.$store.state.menuList.filter(item => {
return this.company != 'xingxuan' &&
item.target != '_blank' &&
!item.menuEquipment &&
(item.menuName != 'LED大屏显示器' || this.company != 'nanchang');
});
}
},
mounted() {
console.log("mounted", this.$route);
this.$nextTick(() => {

73
src/views/equipmentCenter/equipmentCenterIndex.vue
View File

@ -6,33 +6,39 @@
<div class="pageDataContainer">
<vue-scroll>
<div class="projectIndexBox">
<div class="module_title">{{$t('message.homeLayout.existingProducts')}}</div>
<!-- <div class="module_title">{{$t('message.homeLayout.existingProducts')}}</div> -->
<div class="projectIndex">
<div
class="module canclick"
:class="{hovers:item.operation}"
v-for="(item,index) in list"
:key="index"
@click="itemClick(item)"
v-if="item.operation&&item.moduleType==2&&item.moduleEquipment==1"
>
<img v-if="iconType == 1" :src="require('../../assets/images/menu/'+item.moduleIcon+'.png')" class="icon" />
<img
v-if="iconType == 2 && item.bigModuleIcon"
:src="
require('../../assets/images/menu/' +
item.bigModuleIcon +
'.png')
"
style="margin-bottom: 10px"
class="icon"
/>
<div class="title_wrap">
<div class="head1">{{item.moduleName}}</div>
<div class="subhead">{{item.moduleDesc}}</div>
<!-- {{$t('message.projectIndex.moudleName1')}} -->
<template v-for="(item, index) in filterList">
<div style="width: 100%;height: 1px;" v-if="index == 0 || item.operationFlag || (index > 0 && filterList[index - 1].labelName != item.labelName)"></div>
<div class="moduleBox" v-if="item.operation">
<div class="module_title" v-if="index == 0 || item.operationFlag || (index > 0 && filterList[index - 1].labelName != item.labelName)">
{{ item.labelName }}
</div>
<div
class="module canclick"
:class="{hovers:item.operation}"
:key="index"
@click="itemClick(item)"
>
<img v-if="iconType == 1" :src="require('../../assets/images/menu/'+item.moduleIcon+'.png')" class="icon" />
<img
v-if="iconType == 2 && item.bigModuleIcon"
:src="
require('../../assets/images/menu/' +
item.bigModuleIcon +
'.png')
"
style="margin-bottom: 10px"
class="icon"
/>
<div class="title_wrap">
<div class="head1">{{item.moduleName}}</div>
<div class="subhead">{{item.moduleDesc}}</div>
<!-- {{$t('message.projectIndex.moudleName1')}} -->
</div>
</div>
</div>
</div>
</template>
</div>
<div class="module_title" v-if="showNotBuyMoudle">{{$t('message.homeLayout.ununlockedProducts')}}</div>
<div class="projectIndex">
@ -314,6 +320,13 @@ export default {
iconType: '1'
};
},
computed: {
filterList: function () {
return this.list.filter((item) => {
return item.operation && item.moduleType==2 && item.moduleEquipment==1
});
},
},
mounted(){
if(localStorage.getItem('systemInfo')){
this.iconType = JSON.parse(localStorage.getItem('systemInfo')).iconType ? JSON.parse(localStorage.getItem('systemInfo')).iconType:'1'
@ -460,10 +473,8 @@ var arr = this.$store.state.userInfo.menuAuthority.moduleList
width: 100%;
display: flex;
align-items: center;
// justify-content: space-around;
align-items: flex-end;
box-sizing: border-box;
// padding: 0 100px;
flex-wrap: wrap;
margin-bottom: 8px;
.module:nth-child(4n) {
@ -471,14 +482,16 @@ var arr = this.$store.state.userInfo.menuAuthority.moduleList
}
}
.module_title {
margin-left: -10px;
// margin-left: -10px;
margin-left: 0;
border-left: 2px solid #4a8bff;
padding-left: 8px;
margin-bottom: 20px;
font-size: 14px;
font-family: PingFang SC;
}
.module {
width: 320px;
width: 310px;
// height: 124px;
box-sizing: border-box;
// border-radius: 3px;

4
src/views/infoCenter/allInfo/componentsModule/dataListData.vue
View File

@ -218,7 +218,7 @@ export default {
if (row.type == 11) {
// 质量
path = "/project/quality/inspectionLedger";
const res = await getQualityNoticeStatusApi({ id: payLoadParams.data.id });
const res = await getQualityNoticeStatusApi({ id: payLoadParams?.data?.id });
if (!res.result || res.result.status == 6) {
this.$message({
type: "error",
@ -229,7 +229,7 @@ export default {
} else if (row.type == 10) {
// 安全
path = "/project/safeSame/inspectionLedger";
const res = await getNoticeStatusApi({ id: payLoadParams.data.id });
const res = await getNoticeStatusApi({ id: payLoadParams?.data?.id });
if (!res.result || res.result.status == 6) {
this.$message({
type: "error",

4
src/views/projectAdmin/projectIndex.vue
View File

@ -465,11 +465,13 @@ export default {
}
.module_title {
margin-left: -10px;
// margin-left: -10px;
margin-left: 0px;
border-left: 2px solid #4a8bff;
padding-left: 8px;
margin-bottom: 20px;
font-size: 14px;
font-family: PingFang SC;
// width: 1360px;
}