Commit 12035a0c by 郑艺斌

fix: 修复BUG

parent 1a87d636
......@@ -143,10 +143,12 @@ export default {
notifyService: null,
mailBoxService: null,
loginService: null,
Message: null,
beforeCreate () {
this.notifyService = new NotifyService()
this.mailBoxService = new MailBoxService()
this.loginService = new LoginService()
this.Message = new Message()
},
computed: {
messageCount: {
......@@ -242,9 +244,11 @@ export default {
})
},
mounted () {
this.getMessageCount()
if (this.defaultLayout === 'top') {
this.fixTopMenu()
}
setInterval(() => this.getMessageCount(), 1000 * 60)
},
watch: {
topMenuActiveIndex (val) {
......@@ -305,6 +309,12 @@ export default {
}
},
methods: {
async getMessageCount () {
this.Message.getMessageCount(this.user.loginName).then(({ data }) => {
this.$set(this.messageCount, 'total', data.body)
})
},
// 跳转消息通知页面
goMessage () {
this.$router.push({ name: "message" })
},
......
......@@ -64,6 +64,7 @@
types: ['xlsx'],
modes: ['current', 'selected', 'all']
}">
<vxe-column type="checkbox" width="40px" align="center"></vxe-column>
<vxe-column field="equipmentType_dictText" title="设备类型" align="center" width="100px"></vxe-column>
<vxe-column field="equipmentNo" title="设备ID" align="center" width="100px"></vxe-column>
<vxe-column field="name" title="设备名称" align="center" width="180px"></vxe-column>
......
......@@ -16,7 +16,7 @@
<div class="list-item" v-for="item in tableData">
<div class="item-left">
<div class="title" :title="item.title">{{item.title}}</div>
<div class="subTitle" :title="item.subTitle">{{item.subTitle}},</div>
<div class="subTitle" :title="item.subTitle">{{item.subTitle}}</div>
<div class="content" :title="item.content">异常内容:{{item.content}}</div>
<div class="date">{{item.createDate}} - 系统发送</div>
</div>
......@@ -98,7 +98,7 @@ export default {
this.tablePage.pageSize = pageSize
this.getMessagePage()
},
// 获取tabs列表
// 获取tabs消息数量
getMessageTypeCount () {
this.Message.getMessageTypeCount(this.user.loginName).then(({ data }) => {
this.tabs = data.body
......
......@@ -58,6 +58,7 @@
importMethod: importMethod,
types: ['csv', 'xls', 'xlsx'],
remote: true}">
<vxe-column type="checkbox" width="40px" align="center"></vxe-column>
<vxe-column field="equipmentType_dictText" title="设备类型" align="center"></vxe-column>
<vxe-column field="mapId_dictText" title="地图名称" align="center"></vxe-column>
<vxe-column field="name" title="点位编号" align="center"></vxe-column>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment