Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
6
608-pdm-web-5g
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
pdm
608-pdm-web-5g
Commits
c0933e0c
Commit
c0933e0c
authored
Jul 23, 2024
by
xioln
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ECN、ECR详情跳转对应详情
parent
930651f6
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
109 additions
and
18 deletions
+109
-18
App.vue
src/App.vue
+1
-1
index.vue
src/components/headerNavBar/index.vue
+2
-1
index.vue
src/components/tableCell/index.vue
+28
-7
index.js
src/router/index.js
+21
-2
index.vue
src/views/InfoDetail/components/tableTab/index.vue
+7
-2
index.vue
src/views/InfoDetail/index.vue
+6
-1
index.vue
src/views/empty/index.vue
+41
-0
index.vue
src/views/tabbar/index.vue
+2
-3
todoListLazyCell.vue
src/views/todoList/components/todoListLazyCell.vue
+1
-1
No files found.
src/App.vue
View file @
c0933e0c
...
@@ -65,7 +65,7 @@ export default {
...
@@ -65,7 +65,7 @@ export default {
},
},
methods
:
{
methods
:
{
onClickLeft
()
{
onClickLeft
()
{
history
.
back
(
-
1
)
this
.
$router
.
go
(
-
1
)
}
}
}
}
}
}
...
...
src/components/headerNavBar/index.vue
View file @
c0933e0c
...
@@ -30,7 +30,8 @@ export default {
...
@@ -30,7 +30,8 @@ export default {
computed
:
{
computed
:
{
},
},
methods
:
{
methods
:
{
onClickLeft
()
{
},
onClickLeft
()
{
},
goHome
()
{
}
goHome
()
{
}
}
}
}
}
...
...
src/components/tableCell/index.vue
View file @
c0933e0c
...
@@ -11,19 +11,22 @@
...
@@ -11,19 +11,22 @@
<van-col
span=
"24"
v-for=
"column in tableColumns"
:key=
"column.title"
>
<van-col
span=
"24"
v-for=
"column in tableColumns"
:key=
"column.title"
>
<van-col
class=
"van-col-span"
span=
"8"
>
{{
column
.
title
}}
</van-col>
<van-col
class=
"van-col-span"
span=
"8"
>
{{
column
.
title
}}
</van-col>
<van-col
class=
"table-cell-content"
span=
"14"
offset=
"1"
>
<van-col
class=
"table-cell-content"
span=
"14"
offset=
"1"
>
<template
<template
v-if=
"column.hasOwnProperty('relatedDict')"
>
v-if=
"column.hasOwnProperty('relatedDict')"
>
{{
{{
findDictValue
(
findDictValue
(
column
.
relatedDict
,
getProperty
(
item
,
column
.
key
))
column
.
relatedDict
,
getProperty
(
item
,
column
.
key
)
)
}}
}}
</
template
>
</
template
>
<
template
v-else-if=
"column.key.includes('state')"
>
<
template
v-else-if=
"column.key.includes('state')"
>
{{
findDictValue
(
'ObjStatus'
,
getProperty
(
item
,
column
.
key
))
}}
{{
findDictValue
(
'ObjStatus'
,
getProperty
(
item
,
column
.
key
))
}}
</
template
>
</
template
>
<
template
v-else-if=
"column.key.includes('number')"
>
<a
@
click=
"goDetail(item)"
style=
"text-decoration: underline; color: #1b77ea"
>
{{
getProperty
(
item
,
column
.
key
)
}}
</a>
</
template
>
<
template
v-else
>
<
template
v-else
>
{{
getProperty
(
item
,
column
.
key
)
||
'—'
}}
{{
getProperty
(
item
,
column
.
key
)
||
'—'
}}
</
template
>
</
template
>
...
@@ -39,6 +42,7 @@
...
@@ -39,6 +42,7 @@
</template>
</template>
<
script
>
<
script
>
import
{
getDictListByCode
}
from
'@/api/taskDetail'
import
{
getDictListByCode
}
from
'@/api/taskDetail'
import
moment
from
'moment'
export
default
{
export
default
{
name
:
'TableCell'
,
// name写在组件的最前方,自定义组件为必填
name
:
'TableCell'
,
// name写在组件的最前方,自定义组件为必填
...
@@ -117,6 +121,23 @@ export default {
...
@@ -117,6 +121,23 @@ export default {
},
},
getProperty
(
obj
,
path
)
{
getProperty
(
obj
,
path
)
{
return
path
.
split
(
'.'
).
reduce
((
acc
,
key
)
=>
acc
[
key
],
obj
)
return
path
.
split
(
'.'
).
reduce
((
acc
,
key
)
=>
acc
[
key
],
obj
)
},
goDetail
(
item
)
{
const
target
=
item
.
target
sessionStorage
.
setItem
(
'taskInfo'
,
JSON
.
stringify
(
target
))
this
.
$router
.
push
({
path
:
'/empty'
,
query
:
{
path
:
'InfoDetail'
,
oid
:
target
.
id
,
subTypeName
:
target
.
subTypeName
,
dxClassname
:
target
.
dxClassname
.
split
(
'vo.'
)[
1
]?.
slice
(
0
,
-
2
),
title
:
target
.
name
,
type
:
'TOSELF'
,
time
:
moment
().
valueOf
()
}
})
}
}
}
}
}
}
...
...
src/router/index.js
View file @
c0933e0c
...
@@ -33,7 +33,7 @@ const routes = [
...
@@ -33,7 +33,7 @@ const routes = [
},
},
{
{
path
:
'/taskDetails-*'
,
path
:
'/taskDetails-*'
,
name
:
'详情'
,
name
:
'
流程
详情'
,
component
:
()
=>
import
(
'@/views/busniessComponents/workFlowTask/taskDetails'
),
component
:
()
=>
import
(
'@/views/busniessComponents/workFlowTask/taskDetails'
),
meta
:
{
meta
:
{
keepAlive
:
false
keepAlive
:
false
...
@@ -49,12 +49,28 @@ const routes = [
...
@@ -49,12 +49,28 @@ const routes = [
},
},
{
{
path
:
'/InfoDetail-*'
,
path
:
'/InfoDetail-*'
,
name
:
'详情页'
,
name
:
'
任务
详情页'
,
component
:
()
=>
import
(
'@/views/InfoDetail/index.vue'
),
component
:
()
=>
import
(
'@/views/InfoDetail/index.vue'
),
meta
:
{
meta
:
{
keepAlive
:
false
keepAlive
:
false
}
}
},
},
{
path
:
'/InfoDetail'
,
name
:
'任务详情页跳转'
,
component
:
()
=>
import
(
'@/views/InfoDetail/index.vue'
),
meta
:
{
keepAlive
:
false
}
},
{
path
:
'/empty'
,
name
:
'空页面'
,
component
:
()
=>
import
(
'@/views/empty/index.vue'
),
meta
:
{
keepAlive
:
false
}
},
{
{
// 重定向:默认时
// 重定向:默认时
path
:
'/'
,
path
:
'/'
,
...
@@ -99,6 +115,9 @@ router.beforeEach((to, from, next) => {
...
@@ -99,6 +115,9 @@ router.beforeEach((to, from, next) => {
if
(
token
)
{
if
(
token
)
{
// 判断当前的token是否存在(登录存入的token) 若存在则直接跳转
// 判断当前的token是否存在(登录存入的token) 若存在则直接跳转
next
()
next
()
if
(
to
.
name
===
'空页面'
&&
from
.
name
===
'任务详情页跳转'
)
{
to
.
query
.
empty
=
2
}
}
else
if
(
whiteList
.
includes
(
to
.
path
))
{
}
else
if
(
whiteList
.
includes
(
to
.
path
))
{
next
()
next
()
}
else
{
}
else
{
...
...
src/views/InfoDetail/components/tableTab/index.vue
View file @
c0933e0c
...
@@ -35,7 +35,6 @@
...
@@ -35,7 +35,6 @@
<
script
>
<
script
>
import
{
getLayOut
}
from
'@/api/taskDetail'
import
{
getLayOut
}
from
'@/api/taskDetail'
import
TableCell
from
'@/components/tableCell'
import
TableCell
from
'@/components/tableCell'
export
default
{
export
default
{
props
:
{
props
:
{
basicData
:
{
basicData
:
{
...
@@ -130,7 +129,13 @@ export default {
...
@@ -130,7 +129,13 @@ export default {
items
:
[
searchItems
],
items
:
[
searchItems
],
operator
:
'AND'
operator
:
'AND'
},
},
openProps
:
[{
name
:
'source'
},
{
name
:
'target'
}],
openProps
:
[
{
name
:
'source'
},
{
name
:
'target'
,
openProps
:
[{
name
:
'dxContext'
}]
}
],
searchOptions
:
[{
type
:
'QUERY_LINK_BY_SOURCE_LATEST'
}],
searchOptions
:
[{
type
:
'QUERY_LINK_BY_SOURCE_LATEST'
}],
sortItem
:
[{
fieldName
:
'modifyTime'
,
sortOrder
:
'desc'
}]
sortItem
:
[{
fieldName
:
'modifyTime'
,
sortOrder
:
'desc'
}]
}
}
...
...
src/views/InfoDetail/index.vue
View file @
c0933e0c
...
@@ -81,6 +81,11 @@ export default {
...
@@ -81,6 +81,11 @@ export default {
this
.
tabs
=
[{
title
:
'基本信息'
,
key
:
'baseInfo'
}]
this
.
tabs
=
[{
title
:
'基本信息'
,
key
:
'baseInfo'
}]
this
.
activeTab
=
'baseInfo'
this
.
activeTab
=
'baseInfo'
await
this
.
getIstartFormData
()
await
this
.
getIstartFormData
()
}
else
if
(
this
.
$route
.
query
.
type
===
'TOSELF'
)
{
this
.
$set
(
this
,
'tabs'
,
[{
title
:
'基本信息'
,
key
:
'baseInfo'
}])
await
this
.
getFormData
()
this
.
$set
(
this
,
'form'
,
JSON
.
parse
(
sessionStorage
.
getItem
(
'taskInfo'
)))
this
.
activeTab
=
'baseInfo'
}
else
if
([
'ExtActionItem'
].
includes
(
this
.
$route
.
query
.
dxClassname
))
{
}
else
if
([
'ExtActionItem'
].
includes
(
this
.
$route
.
query
.
dxClassname
))
{
this
.
tabs
=
[
this
.
tabs
=
[
{
title
:
'基本信息'
,
key
:
'baseInfo'
}
{
title
:
'基本信息'
,
key
:
'baseInfo'
}
...
@@ -207,7 +212,7 @@ export default {
...
@@ -207,7 +212,7 @@ export default {
}
}
]
]
this
.
$set
(
this
,
'formData'
,
formData
)
this
.
$set
(
this
,
'formData'
,
formData
)
this
.
$set
(
this
,
'form'
,
JSON
.
parse
(
local
Storage
.
getItem
(
'taskInfo'
)))
this
.
$set
(
this
,
'form'
,
JSON
.
parse
(
session
Storage
.
getItem
(
'taskInfo'
)))
},
},
async
getForm
(
oid
)
{
async
getForm
(
oid
)
{
let
id
=
''
let
id
=
''
...
...
src/views/empty/index.vue
0 → 100644
View file @
c0933e0c
<
template
>
<div
class=
'empty-page'
>
</div>
</
template
>
<
script
>
export
default
{
data
()
{
return
{
}
},
components
:
{
},
created
()
{
if
(
this
.
$route
.
query
.
empty
===
2
)
{
this
.
$router
.
go
(
-
1
)
}
else
{
this
.
$router
.
push
({
path
:
this
.
$route
.
query
.
path
,
query
:
{
...
this
.
$route
.
query
,
empty
:
1
}
})
}
},
mounted
()
{
},
methods
:
{
}
}
</
script
>
<
style
lang=
'scss'
scoped
>
</
style
>
src/views/tabbar/index.vue
View file @
c0933e0c
...
@@ -126,7 +126,7 @@ export default {
...
@@ -126,7 +126,7 @@ export default {
}
}
]
]
}
}
]
,
]
}
}
},
},
computed
:
{
computed
:
{
...
@@ -158,7 +158,6 @@ export default {
...
@@ -158,7 +158,6 @@ export default {
}
}
},
},
changeMenu
(
item
)
{
changeMenu
(
item
)
{
console
.
log
(
'item'
,
item
)
if
(
item
.
route
)
{
if
(
item
.
route
)
{
this
.
$router
.
push
(
item
.
route
)
this
.
$router
.
push
(
item
.
route
)
}
else
{
}
else
{
...
@@ -182,7 +181,7 @@ export default {
...
@@ -182,7 +181,7 @@ export default {
}
else
{
}
else
{
this
.
$router
.
push
(
component
.
route
)
this
.
$router
.
push
(
component
.
route
)
}
}
}
,
}
}
}
}
}
...
...
src/views/todoList/components/todoListLazyCell.vue
View file @
c0933e0c
...
@@ -65,7 +65,7 @@ export default {
...
@@ -65,7 +65,7 @@ export default {
// 跳转详情页面
// 跳转详情页面
goDetailsInfo
(
item
)
{
goDetailsInfo
(
item
)
{
if
(
this
.
$route
.
query
.
title
===
'我发起的任务'
)
{
if
(
this
.
$route
.
query
.
title
===
'我发起的任务'
)
{
local
Storage
.
setItem
(
'taskInfo'
,
JSON
.
stringify
(
item
))
session
Storage
.
setItem
(
'taskInfo'
,
JSON
.
stringify
(
item
))
this
.
$router
.
push
({
this
.
$router
.
push
({
path
:
`/InfoDetail-
${
item
.
id
}
`
,
path
:
`/InfoDetail-
${
item
.
id
}
`
,
query
:
{
query
:
{
...
...
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