Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
王刘锁
/
jianlin-tms-view
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
12035a0c
authored
Oct 17, 2022
by
郑艺斌
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
fix: 修复BUG
parent
1a87d636
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
2 deletions
src/views/layout/_common_top.vue
src/views/modules/equipmentAdmin/equipmentAccount/index.vue
src/views/modules/message/index.vue
src/views/modules/siteAdmin/positionAdmin/index.vue
src/views/layout/_common_top.vue
View file @
12035a0c
...
@@ -143,10 +143,12 @@ export default {
...
@@ -143,10 +143,12 @@ export default {
notifyService
:
null
,
notifyService
:
null
,
mailBoxService
:
null
,
mailBoxService
:
null
,
loginService
:
null
,
loginService
:
null
,
Message
:
null
,
beforeCreate
()
{
beforeCreate
()
{
this
.
notifyService
=
new
NotifyService
()
this
.
notifyService
=
new
NotifyService
()
this
.
mailBoxService
=
new
MailBoxService
()
this
.
mailBoxService
=
new
MailBoxService
()
this
.
loginService
=
new
LoginService
()
this
.
loginService
=
new
LoginService
()
this
.
Message
=
new
Message
()
},
},
computed
:
{
computed
:
{
messageCount
:
{
messageCount
:
{
...
@@ -242,9 +244,11 @@ export default {
...
@@ -242,9 +244,11 @@ export default {
})
})
},
},
mounted
()
{
mounted
()
{
this
.
getMessageCount
()
if
(
this
.
defaultLayout
===
'top'
)
{
if
(
this
.
defaultLayout
===
'top'
)
{
this
.
fixTopMenu
()
this
.
fixTopMenu
()
}
}
setInterval
(()
=>
this
.
getMessageCount
(),
1000
*
60
)
},
},
watch
:
{
watch
:
{
topMenuActiveIndex
(
val
)
{
topMenuActiveIndex
(
val
)
{
...
@@ -305,6 +309,12 @@ export default {
...
@@ -305,6 +309,12 @@ export default {
}
}
},
},
methods
:
{
methods
:
{
async
getMessageCount
()
{
this
.
Message
.
getMessageCount
(
this
.
user
.
loginName
).
then
(({
data
})
=>
{
this
.
$set
(
this
.
messageCount
,
'total'
,
data
.
body
)
})
},
// 跳转消息通知页面
goMessage
()
{
goMessage
()
{
this
.
$router
.
push
({
name
:
"message"
})
this
.
$router
.
push
({
name
:
"message"
})
},
},
...
...
src/views/modules/equipmentAdmin/equipmentAccount/index.vue
View file @
12035a0c
...
@@ -64,6 +64,7 @@
...
@@ -64,6 +64,7 @@
types: ['xlsx'],
types: ['xlsx'],
modes: ['current', 'selected', 'all']
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=
"equipmentType_dictText"
title=
"设备类型"
align=
"center"
width=
"100px"
></vxe-column>
<vxe-column
field=
"equipmentNo"
title=
"设备ID"
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>
<vxe-column
field=
"name"
title=
"设备名称"
align=
"center"
width=
"180px"
></vxe-column>
...
...
src/views/modules/message/index.vue
View file @
12035a0c
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
<div
class=
"list-item"
v-for=
"item in tableData"
>
<div
class=
"list-item"
v-for=
"item in tableData"
>
<div
class=
"item-left"
>
<div
class=
"item-left"
>
<div
class=
"title"
:title=
"item.title"
>
{{
item
.
title
}}
</div>
<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=
"content"
:title=
"item.content"
>
异常内容:
{{
item
.
content
}}
</div>
<div
class=
"date"
>
{{
item
.
createDate
}}
- 系统发送
</div>
<div
class=
"date"
>
{{
item
.
createDate
}}
- 系统发送
</div>
</div>
</div>
...
@@ -98,7 +98,7 @@ export default {
...
@@ -98,7 +98,7 @@ export default {
this
.
tablePage
.
pageSize
=
pageSize
this
.
tablePage
.
pageSize
=
pageSize
this
.
getMessagePage
()
this
.
getMessagePage
()
},
},
// 获取tabs
列表
// 获取tabs
消息数量
getMessageTypeCount
()
{
getMessageTypeCount
()
{
this
.
Message
.
getMessageTypeCount
(
this
.
user
.
loginName
).
then
(({
data
})
=>
{
this
.
Message
.
getMessageTypeCount
(
this
.
user
.
loginName
).
then
(({
data
})
=>
{
this
.
tabs
=
data
.
body
this
.
tabs
=
data
.
body
...
...
src/views/modules/siteAdmin/positionAdmin/index.vue
View file @
12035a0c
...
@@ -58,6 +58,7 @@
...
@@ -58,6 +58,7 @@
importMethod: importMethod,
importMethod: importMethod,
types: ['csv', 'xls', 'xlsx'],
types: ['csv', 'xls', 'xlsx'],
remote: true}">
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=
"equipmentType_dictText"
title=
"设备类型"
align=
"center"
></vxe-column>
<vxe-column
field=
"mapId_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>
<vxe-column
field=
"name"
title=
"点位编号"
align=
"center"
></vxe-column>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment