Browse Source

问题修复

master
huxinglu 4 years ago
parent
commit
12bfba20f7
2 changed files with 9 additions and 4 deletions
  1. +7
    -3
      src/views/main/main.vue
  2. +2
    -1
      src/vuex/getters.js

+ 7
- 3
src/views/main/main.vue View File

@@ -91,7 +91,7 @@
<el-card class="box-card">
<div slot="header" class="clearfix">
<span>报警信息</span>
<el-button @click="waterAlarmOpen" style="float: right; padding: 3px 0" type="text">更多</el-button>
<el-button v-if="menuList.some(item=>item.type==2&&item.name=='/waterAlarm')" @click="waterAlarmOpen" style="float: right; padding: 3px 0" type="text">更多</el-button>
</div>
<div class="right-waterAlarm">
<div
@@ -114,7 +114,7 @@
<el-card style="margin-top: 10px" class="box-card">
<div slot="header" class="clearfix">
<span>预警信息</span>
<el-button @click="waterWarnOpen" style="float: right; padding: 3px 0" type="text">更多</el-button>
<el-button v-if="menuList.some(item=>item.type==2&&item.name=='/warn')" @click="waterWarnOpen" style="float: right; padding: 3px 0" type="text">更多</el-button>
</div>
<div class="right-waterWarn">
<div :key="index" v-for="(item,index) in waterWarnList">
@@ -134,7 +134,7 @@
<el-card style="margin-top: 10px" class="box-card">
<div slot="header" class="clearfix">
<span>通知公告</span>
<el-button @click="noticeOpen" style="float: right; padding: 3px 0" type="text">更多</el-button>
<el-button v-if="menuList.some(item=>item.type==2&&item.name=='/notice')" @click="noticeOpen" style="float: right; padding: 3px 0" type="text">更多</el-button>
</div>
<el-tabs v-model="noticeType" @tab-click="noticeTypeClick">
<el-tab-pane label="水务新闻" :name="1">
@@ -186,6 +186,7 @@ import mainApi from "@/api/main/index";
import mainCake from "./mainCake";
import waterAlarmInfo from "../water/waterAlarm/infoForm";
import noticeDetial from "@/components/noticeDetail";
import {mapGetters} from "vuex";

export default {
name: "main-pc-index",
@@ -210,6 +211,9 @@ export default {
this.getDetail();
this.getNoticeMainList();
},
computed: {
...mapGetters(["menuList"])
},
components: { mainCake, waterAlarmInfo, noticeDetial },
methods: {
noticeClick(id) {

+ 2
- 1
src/vuex/getters.js View File

@@ -1,6 +1,7 @@
const getters = {
fontSize: state => state.user.fontSize,
btnRule: state => state.user.btnRule,
info:state => state.user.info
info:state => state.user.info,
menuList:state => state.user.menuList,
}
export default getters

Loading…
Cancel
Save