Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
phsl
/
admin
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
5fedc667
authored
Mar 23, 2023
by
puhui999
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update: 修改了一些TODO提到的问题,简化时间格式化方法
parent
d44ceda5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
15 deletions
+11
-15
src/layout/components/Message/src/Message.vue
+2
-2
src/views/Profile/components/ProfileUser.vue
+2
-2
src/views/bpm/processInstance/detail.vue
+3
-3
src/views/infra/job/JobLog.vue
+2
-6
src/views/infra/webSocket/index.vue
+2
-2
No files found.
src/layout/components/Message/src/Message.vue
View file @
5fedc667
<
script
setup
lang=
"ts"
>
import
dayjs
from
'dayjs
'
import
{
parseTime
}
from
'@/utils/formatTime
'
import
*
as
NotifyMessageApi
from
'@/api/system/notify/message'
const
{
push
}
=
useRouter
()
...
...
@@ -57,7 +57,7 @@ onMounted(() => {
{{
item
.
templateNickname
}}
:
{{
item
.
templateContent
}}
</span>
<span
class=
"message-date"
>
{{
dayjs
(
item
.
createTime
).
format
(
'YYYY-MM-DD HH:mm:ss'
)
}}
{{
parseTime
(
item
.
createTime
)
}}
</span>
</div>
</div>
...
...
src/views/Profile/components/ProfileUser.vue
View file @
5fedc667
...
...
@@ -34,13 +34,13 @@
</li>
<li
class=
"list-group-item"
>
<Icon
icon=
"ep:calendar"
class=
"mr-5px"
/>
{{
t
(
'profile.user.createTime'
)
}}
<div
class=
"pull-right"
>
{{
dayjs
(
userInfo
?.
createTime
).
format
(
'YYYY-MM-DD'
)
}}
</div>
<div
class=
"pull-right"
>
{{
parseTime
(
userInfo
?.
createTime
)
}}
</div>
</li>
</ul>
</div>
</
template
>
<
script
setup
lang=
"ts"
>
import
dayjs
from
'dayjs
'
import
{
parseTime
}
from
'@/utils/formatTime
'
import
UserAvatar
from
'./UserAvatar.vue'
import
{
getUserProfileApi
,
ProfileVO
}
from
'@/api/system/user/profile'
...
...
src/views/bpm/processInstance/detail.vue
View file @
5fedc667
...
...
@@ -112,13 +112,13 @@
</label>
<label
style=
"font-weight: normal"
v-if=
"item.createTime"
>
创建时间:
</label>
<label
style=
"color: #8a909c; font-weight: normal"
>
{{
dayjs(item?.createTime).format('YYYY-MM-DD HH:mm:ss'
) }}
{{
parseTime(item?.createTime
) }}
</label>
<label
v-if=
"item.endTime"
style=
"margin-left: 30px; font-weight: normal"
>
审批时间:
</label>
<label
v-if=
"item.endTime"
style=
"color: #8a909c; font-weight: normal"
>
{{
dayjs(item?.endTime).format('YYYY-MM-DD HH:mm:ss'
) }}
{{
parseTime(item?.endTime
) }}
</label>
<label
v-if=
"item.durationInMillis"
style=
"margin-left: 30px; font-weight: normal"
>
耗时:
...
...
@@ -192,7 +192,7 @@
</ContentWrap>
</template>
<
script
setup
lang=
"ts"
>
import
dayjs
from
'dayjs
'
import
{
parseTime
}
from
'@/utils/formatTime
'
import
*
as
UserApi
from
'@/api/system/user'
import
*
as
ProcessInstanceApi
from
'@/api/bpm/processInstance'
import
*
as
DefinitionApi
from
'@/api/bpm/definition'
...
...
src/views/infra/job/JobLog.vue
View file @
5fedc667
...
...
@@ -12,11 +12,7 @@
/>
</
template
>
<
template
#
beginTime_default=
"{ row }"
>
<span>
{{
dayjs
(
row
.
beginTime
).
format
(
'YYYY-MM-DD HH:mm:ss'
)
+
' ~ '
+
dayjs
(
row
.
endTime
).
format
(
'YYYY-MM-DD HH:mm:ss'
)
}}
</span>
<span>
{{
parseTime
(
row
.
beginTime
)
+
' ~ '
+
parseTime
(
row
.
endTime
)
}}
</span>
</
template
>
<
template
#
duration_default=
"{ row }"
>
<span>
{{
row
.
duration
+
' 毫秒'
}}
</span>
...
...
@@ -48,7 +44,7 @@
</XModal>
</template>
<
script
setup
lang=
"ts"
name=
"JobLog"
>
import
dayjs
from
'dayjs
'
import
{
parseTime
}
from
'@/utils/formatTime
'
import
*
as
JobLogApi
from
'@/api/infra/jobLog'
import
{
allSchemas
}
from
'./jobLog.data'
...
...
src/views/infra/webSocket/index.vue
View file @
5fedc667
...
...
@@ -44,7 +44,7 @@
<li
v-for=
"item in getList"
class=
"mt-2"
:key=
"item.time"
>
<div
class=
"flex items-center"
>
<span
class=
"mr-2 text-primary font-medium"
>
收到消息:
</span>
<span>
{{
dayjs(item.time).format('YYYY-MM-DD HH:mm:ss'
) }}
</span>
<span>
{{
parseTime(item.time
) }}
</span>
</div>
<div>
{{ item.res }}
...
...
@@ -56,7 +56,7 @@
</div>
</template>
<
script
setup
lang=
"ts"
>
import
dayjs
from
'dayjs
'
import
{
parseTime
}
from
'@/utils/formatTime
'
import
{
useUserStore
}
from
'@/store/modules/user'
import
{
useWebSocket
}
from
'@vueuse/core'
...
...
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