Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
T
TF-MOM-WEB
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
TFMOM
TF-MOM-WEB
Commits
de67e4c2
Commit
de67e4c2
authored
Aug 08, 2024
by
jingnan
👀
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
看板跳转功能开发
parent
5965ff80
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
96 additions
and
48 deletions
+96
-48
AssembleKanban.vue
...ateComponents/components/Visualization/AssembleKanban.vue
+20
-15
ActionitemsDialog.vue
...nts/components/Visualization/Dialog/ActionitemsDialog.vue
+40
-7
JobPlanExecutionQueryDialog.vue
...ents/Visualization/Dialog/JobPlanExecutionQueryDialog.vue
+19
-8
SiteProblemManagementSummaryDialog.vue
...sualization/Dialog/SiteProblemManagementSummaryDialog.vue
+12
-10
ExperimentKanban.vue
...eComponents/components/Visualization/ExperimentKanban.vue
+4
-8
ProductionKanban.vue
...eComponents/components/Visualization/ProductionKanban.vue
+1
-0
No files found.
applications/dee-mes/src/privateComponents/components/Visualization/AssembleKanban.vue
View file @
de67e4c2
...
...
@@ -1908,8 +1908,9 @@
/>
<SiteProblemManagementSummaryDialog
ref=
"SiteProblemManagementSummaryDialog"
:site-problem-management-summary-params=
"siteProblemManagementSummaryParams"
/>
<ActionitemsDialog
ref=
"ActionitemsDialog"
/>
<ActionitemsDialog
ref=
"ActionitemsDialog"
:action-items-params=
"actionItemsParams"
/>
</div>
</
template
>
...
...
@@ -2484,7 +2485,7 @@ export default {
storageExpireWarningParams
:
{},
summaryOfStationMissingPartsParams
:
{},
siteProblemManagementSummaryParams
:
{},
action
i
temsParams
:
{},
action
I
temsParams
:
{},
sqcdpParams
:
{}
}
},
...
...
@@ -2779,6 +2780,7 @@ export default {
* 现场督办
*/
initSupervise
()
{
this
.
resetSuperviseOptionData
()
const
superviseOption
=
this
.
superviseOption
const
params
=
{
aircraftType
:
this
.
$route
.
query
.
model
,
...
...
@@ -2799,10 +2801,6 @@ export default {
const
chartDom
=
document
.
getElementById
(
'superviseEchart'
)
const
myChart
=
echarts
.
init
(
chartDom
)
myChart
.
on
(
'click'
,
function
(
params
)
{
if
(
params
)
{
console
.
log
(
'跳转暂时未做,需要做的时候删除这段代码!'
)
return
}
that
.
routerSiteProblemManagementSummary
(
params
.
name
)
})
myChart
.
setOption
(
superviseOption
)
...
...
@@ -2812,6 +2810,7 @@ export default {
* 行动项
*/
initActionitems
()
{
this
.
resetSuperviseOptionData
()
const
superviseOption
=
this
.
superviseOption
const
params
=
{
aircraftType
:
this
.
$route
.
query
.
model
,
...
...
@@ -2832,15 +2831,17 @@ export default {
const
chartDom
=
document
.
getElementById
(
'superviseEchart'
)
const
myChart
=
echarts
.
init
(
chartDom
)
myChart
.
on
(
'click'
,
function
(
params
)
{
if
(
params
)
{
console
.
log
(
'跳转暂时未做,需要做的时候删除这段代码!'
)
return
}
that
.
routerActionitems
(
params
.
name
)
})
myChart
.
setOption
(
superviseOption
)
})
},
resetSuperviseOptionData
()
{
this
.
superviseOption
.
series
[
0
].
data
.
map
(
item
=>
{
item
.
value
=
0
return
item
})
},
selectSuperviseTabs
(
key
)
{
// 销毁echart
const
chartDom
=
document
.
getElementById
(
'superviseEchart'
)
...
...
@@ -2862,6 +2863,7 @@ export default {
query
:
{
title
:
'站位看板'
,
planId
:
item
.
id
,
serialNumber
:
item
.
serialNumber
,
model
:
this
.
$route
.
query
.
model
,
sorties
:
this
.
$route
.
query
.
sorties
,
data
:
JSON
.
stringify
(
item
)
...
...
@@ -2940,7 +2942,7 @@ export default {
query
:
{
name
:
name
,
sorties
:
this
.
info
.
aircraftSorties
.
defCode
,
serialNumber
:
this
.
$route
.
query
.
serialNumber
,
//
serialNumber: this.$route.query.serialNumber,
data
:
data
}
}
...
...
@@ -2953,8 +2955,11 @@ export default {
this
.
siteProblemManagementSummaryParams
=
{
name
:
'siteProblemManagementSummary'
,
query
:
{
// serialNumber: this.$route.query.serialNumber,
name
:
name
,
planId
:
null
,
rootPage
:
'AssembleKanban'
,
planId
:
this
.
$route
.
query
.
planId
,
model
:
this
.
$route
.
query
.
model
,
sorties
:
this
.
$route
.
query
.
sorties
}
}
...
...
@@ -2964,11 +2969,11 @@ export default {
* 行动项
*/
routerActionitems
(
name
)
{
this
.
action
i
temsParams
=
{
name
:
'action
i
temsParams'
,
this
.
action
I
temsParams
=
{
name
:
'action
I
temsParams'
,
query
:
{
name
:
name
,
planId
:
this
.
info
.
airModel
.
resName
,
model
:
this
.
$route
.
query
.
model
,
sorties
:
this
.
$route
.
query
.
sorties
}
}
...
...
applications/dee-mes/src/privateComponents/components/Visualization/Dialog/ActionitemsDialog.vue
View file @
de67e4c2
...
...
@@ -10,20 +10,28 @@
@
close=
"close"
@
opened=
"opened"
>
<!--
<Actionitems
/>
-->Actionitems
<dee-as-com
ref=
"table"
class=
"list-table"
:lay-config=
"cmpOptions"
/>
</el-dialog>
</
template
>
<
script
>
// import Actionitems from '@/views/mes/actionItemManagement/actionItemManagementSearch/index'
export
default
{
name
:
'ActionitemsDialog'
,
components
:
{
// Actionitems
},
props
:
{
},
props
:
{
actionItemsParams
:
{
type
:
Object
,
default
:
()
=>
{}
}
},
data
()
{
return
{
visible
:
false
visible
:
false
,
cmpOptions
:
{
typeName
:
'ActionItem'
,
layKey
:
'ActionItemTable_onlyReadCopy'
}
}
},
computed
:
{
...
...
@@ -31,11 +39,36 @@ export default {
created
()
{},
methods
:
{
opened
()
{
this
.
$children
[
0
].
$children
[
0
].
getAirModelList
()
const
queryData
=
this
.
actionItemsParams
.
query
const
extraParams
=
[
{
'fieldName'
:
'state'
,
'operator'
:
'EQ'
,
'value'
:
'TF_WWC'
},
{
'fieldName'
:
'airModel'
,
'operator'
:
'EQ'
,
'value'
:
queryData
.
model
},
{
'fieldName'
:
'serialNo'
,
'operator'
:
'EQ'
,
'value'
:
queryData
.
sorties
},
{
'fieldName'
:
'categoryCode'
,
'operator'
:
'EQ'
,
'value'
:
queryData
.
name
}
]
setTimeout
(()
=>
{
this
.
$refs
.
table
.
$refs
.
asCom
.
getData
(
extraParams
)
},
500
)
},
close
()
{
this
.
visible
=
false
this
.
$parent
.
actionitemsParams
=
{}
}
}
}
...
...
applications/dee-mes/src/privateComponents/components/Visualization/Dialog/JobPlanExecutionQueryDialog.vue
View file @
de67e4c2
...
...
@@ -38,28 +38,39 @@ export default {
created
()
{},
methods
:
{
opened
()
{
const
queryData
=
this
.
jobPlanExecutionQueryParams
.
query
const
extraParams
=
[
{
'fieldName'
:
'joExecutePlan.planState'
,
'operator'
:
'IN'
,
'value'
:
this
.
jobPlanExecutionQueryParams
.
query
.
planStateCode
},
{
'fieldName'
:
'planeType'
,
'operator'
:
'EQ'
,
'value'
:
this
.
jobPlanExecutionQueryParams
.
query
.
model
'value'
:
queryData
.
model
},
{
'fieldName'
:
'sorties'
,
'operator'
:
'EQ'
,
'value'
:
this
.
jobPlanExecutionQueryParams
.
query
.
sorties
'value'
:
queryData
.
sorties
},
{
'fieldName'
:
'positionNumber'
,
'operator'
:
'LIKE'
,
'value'
:
this
.
jobPlanExecutionQueryParams
.
query
.
serialNumber
'value'
:
queryData
.
serialNumber
}
]
if
(
queryData
.
rootPage
===
'ProductionKanban'
)
{
extraParams
.
push
({
'fieldName'
:
'joExecutePlan.planState'
,
'operator'
:
'IN'
,
'value'
:
queryData
.
planStateCode
})
}
else
{
extraParams
.
push
({
'fieldName'
:
'joExecutePlan.scheduledEnd'
,
'operator'
:
'BTWN'
,
'value'
:
queryData
.
date
&&
queryData
.
date
.
value
,
'value1'
:
queryData
.
date
&&
queryData
.
date
.
value1
})
}
setTimeout
(()
=>
{
this
.
$refs
.
table
.
$refs
.
asCom
.
getData
(
extraParams
)
},
500
)
...
...
applications/dee-mes/src/privateComponents/components/Visualization/Dialog/SiteProblemManagementSummaryDialog.vue
View file @
de67e4c2
...
...
@@ -40,29 +40,31 @@ export default {
created
()
{},
methods
:
{
opened
()
{
const
extraParams
=
[
{
'fieldName'
:
'standPosition'
,
'operator'
:
'EQ'
,
'value'
:
this
.
siteProblemManagementSummaryParams
.
query
.
serialNumber
},
const
queryData
=
this
.
siteProblemManagementSummaryParams
.
query
const
extraParams
=
[
{
'fieldName'
:
'sptype'
,
'operator'
:
'LIKE'
,
'value'
:
this
.
siteProblemManagementSummaryParams
.
query
.
name
'value'
:
queryData
.
name
},
{
'fieldName'
:
'airModel'
,
'operator'
:
'EQ'
,
'value'
:
this
.
siteProblemManagementSummaryParams
.
query
.
model
'value'
:
queryData
.
model
},
{
'fieldName'
:
'sorties'
,
'operator'
:
'EQ'
,
'value'
:
this
.
siteProblemManagementSummaryParams
.
query
.
sorties
'value'
:
queryData
.
sorties
}
]
if
(
queryData
.
rootPage
===
'ExperimentKanban'
)
{
extraParams
.
push
({
'fieldName'
:
'standPosition'
,
'operator'
:
'EQ'
,
'value'
:
queryData
.
serialNumber
})
}
setTimeout
(()
=>
{
this
.
$refs
.
table
.
$refs
.
asCom
.
getData
(
extraParams
)
},
500
)
...
...
applications/dee-mes/src/privateComponents/components/Visualization/ExperimentKanban.vue
View file @
de67e4c2
...
...
@@ -1977,7 +1977,7 @@
@
click=
"isFullClick"
>
</div>
<JobPlanExecutionQueryDialog
ref=
"JobPlanExecutionQueryDialog"
/>
<JobPlanExecutionQueryDialog
ref=
"JobPlanExecutionQueryDialog"
:job-plan-execution-query-params=
"JobPlanExecutionQueryParams"
/>
<SQCDPDialog
ref=
"SQCDPDialog"
:sqcdp-params=
"sqcdpParams"
/>
<SummaryOfStationMissingPartsDialog
ref=
"SummaryOfStationMissingPartsDialog"
/>
<SiteProblemManagementSummaryDialog
ref=
"SiteProblemManagementSummaryDialog"
:site-problem-management-summary-params=
"siteProblemManagementSummaryParams"
/>
...
...
@@ -2564,10 +2564,6 @@ export default {
const
chartDom
=
document
.
getElementById
(
'experimentKanbanEchart'
)
const
myChart
=
echarts
.
init
(
chartDom
)
myChart
.
on
(
'click'
,
function
(
params
)
{
if
(
params
)
{
console
.
log
(
'跳转暂时未做,需要做的时候删除这段代码!'
)
return
}
that
.
routerJobPlanExecutionSummary
(
params
)
})
myChart
.
setOption
(
optionTrend
)
...
...
@@ -2780,11 +2776,10 @@ export default {
name
:
'jobPlanExecutionSummary'
,
query
:
{
serialNumber
:
this
.
$route
.
query
.
serialNumber
,
// planId: this.$route.query.planId
,
rootPage
:
'ExperimentKanban'
,
model
:
this
.
$route
.
query
.
model
,
sorties
:
this
.
$route
.
query
.
sorties
,
date
:
params
.
name
,
isOk
:
params
.
seriesName
===
'计划完工'
?
'Y'
:
'N'
date
:
{
value
:
params
.
name
+
' 00:00:00'
,
value1
:
params
.
name
+
' 23:59:59'
}
}
}
this
.
$refs
.
JobPlanExecutionQueryDialog
.
visible
=
true
...
...
@@ -2798,6 +2793,7 @@ export default {
query
:
{
serialNumber
:
this
.
$route
.
query
.
serialNumber
,
name
:
name
,
rootPage
:
'ExperimentKanban'
,
planId
:
this
.
$route
.
query
.
planId
,
model
:
this
.
$route
.
query
.
model
,
sorties
:
this
.
$route
.
query
.
sorties
...
...
applications/dee-mes/src/privateComponents/components/Visualization/ProductionKanban.vue
View file @
de67e4c2
...
...
@@ -346,6 +346,7 @@ export default {
const
params
=
{
name
:
'jobPlanExecutionSummary'
,
query
:
{
rootPage
:
'ProductionKanban'
,
serialNumber
:
this
.
stationRow
.
serialNumber
,
model
:
this
.
sortiesRow
.
aircraftType
.
defName
,
sorties
:
this
.
sortiesRow
.
aircraftSorties
.
defCode
,
...
...
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