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
7153cc2e
Commit
7153cc2e
authored
Jul 19, 2024
by
jingnan
👀
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
架次搜索增加隐藏标识(指令下发,站位计划维护,实物构型管理)
parent
e09b830d
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
91 additions
and
42 deletions
+91
-42
stationPlanList.vue
...agement/instructionsIssued/components/stationPlanList.vue
+41
-21
stationPlanList.vue
...PlanManagement/stationPlanMaintenance/stationPlanList.vue
+50
-21
No files found.
applications/dee-mes/src/views/assemblyPlanManagement/instructionsIssued/components/stationPlanList.vue
View file @
7153cc2e
...
@@ -8,8 +8,15 @@
...
@@ -8,8 +8,15 @@
>
>
<template
slot=
"paneL"
>
<template
slot=
"paneL"
>
<div
class=
"left-container"
>
<div
class=
"left-container"
>
<div
class=
"search-box box"
>
<div
class=
"search-box box"
:style=
"
{height:showSearchConditions?'150px':'40px'}">
<div
class=
"title"
><i
class=
"search-icon"
/><span>
架次搜索
</span></div>
<div
class=
"title"
><i
class=
"search-icon"
/><span>
架次搜索
</span>
<div
class=
"search-condition-operation-item"
@
click=
"toggleSearchConditions"
><img
class=
"search-condition-operation-icon"
:src=
"showSearchConditions?'icons/circle-fold.png':'icons/circle-collapse.png'"
>
</div>
</div>
<div
v-if=
"showSearchConditions"
class=
"search-conditions"
>
<div
class=
"row"
>
<div
class=
"row"
>
<label>
机型:
</label>
<label>
机型:
</label>
<el-select
v-model=
"form.model"
size=
"mini"
placeholder=
"请选择"
:loading=
"modelLoading"
>
<el-select
v-model=
"form.model"
size=
"mini"
placeholder=
"请选择"
:loading=
"modelLoading"
>
...
@@ -26,7 +33,8 @@
...
@@ -26,7 +33,8 @@
<el-button
size=
"mini"
type=
"primary"
@
click=
"getTreeData"
>
查询
</el-button>
<el-button
size=
"mini"
type=
"primary"
@
click=
"getTreeData"
>
查询
</el-button>
</div>
</div>
</div>
</div>
<div
class=
"station-box box"
>
</div>
<div
class=
"station-box box "
:style=
"
{height:showSearchConditions?'calc(100% - 190px)':'calc(100% - 80px)'}">
<!--
<el-input
<!--
<el-input
v-model=
"filterText"
v-model=
"filterText"
placeholder=
"输入关键字进行过滤"
placeholder=
"输入关键字进行过滤"
...
@@ -130,7 +138,9 @@ export default {
...
@@ -130,7 +138,9 @@ export default {
skillType
:
''
,
skillType
:
''
,
isCooperate
:
false
,
isCooperate
:
false
,
currentNodekey
:
''
,
currentNodekey
:
''
,
filterText
:
''
filterText
:
''
,
requestUrl
:
''
,
showSearchConditions
:
true
// 控制搜索条件是否显示
}
}
},
},
watch
:
{
watch
:
{
...
@@ -541,6 +551,9 @@ export default {
...
@@ -541,6 +551,9 @@ export default {
}
}
}
}
})
})
},
toggleSearchConditions
()
{
this
.
showSearchConditions
=
!
this
.
showSearchConditions
}
}
}
}
}
}
...
@@ -557,10 +570,17 @@ export default {
...
@@ -557,10 +570,17 @@ export default {
.search-box
{
.search-box
{
height
:
150px
;
height
:
150px
;
font-size
:
14px
;
font-size
:
14px
;
position
:
relative
;
/* 允许内部元素使用绝对定位 */
.title
{
.title
{
margin-left
:
10px
;
margin-left
:
10px
;
text-align
:
left
;
text-align
:
left
;
margin-top
:
10px
;
margin-top
:
10px
;
display
:
flex
;
/* 使用flex布局来更好地控制子元素 */
align-items
:
center
;
/* 垂直居中 */
/* 添加按钮的右外边距或定位,具体取决于您的布局需求 */
.search-condition-operation-item
{
margin-left
:
auto
;
/* 将按钮推到右边 */
}
}
}
.search-icon
{
.search-icon
{
display
:
inline-block
;
display
:
inline-block
;
...
...
applications/dee-mes/src/views/assemblyPlanManagement/stationPlanMaintenance/stationPlanList.vue
View file @
7153cc2e
...
@@ -8,8 +8,15 @@
...
@@ -8,8 +8,15 @@
>
>
<template
slot=
"paneL"
>
<template
slot=
"paneL"
>
<div
class=
"left-container"
>
<div
class=
"left-container"
>
<div
class=
"search-box box"
>
<div
class=
"search-box box"
:style=
"
{height:showSearchConditions?'150px':'40px'}">
<div
class=
"title"
><i
class=
"search-icon"
/><span>
架次搜索
</span></div>
<div
class=
"title"
><i
class=
"search-icon"
/><span>
架次搜索
</span>
<div
class=
"search-condition-operation-item"
@
click=
"toggleSearchConditions"
><img
class=
"search-condition-operation-icon"
:src=
"showSearchConditions?'icons/circle-fold.png':'icons/circle-collapse.png'"
>
</div>
</div>
<div
v-if=
"showSearchConditions"
class=
"search-conditions"
>
<div
class=
"row"
>
<div
class=
"row"
>
<label>
机型:
</label>
<label>
机型:
</label>
<el-select
v-model=
"form.model"
size=
"mini"
placeholder=
"请选择"
:loading=
"modelLoading"
>
<el-select
v-model=
"form.model"
size=
"mini"
placeholder=
"请选择"
:loading=
"modelLoading"
>
...
@@ -26,7 +33,8 @@
...
@@ -26,7 +33,8 @@
<el-button
size=
"mini"
type=
"primary"
@
click=
"getTreeData"
>
查询
</el-button>
<el-button
size=
"mini"
type=
"primary"
@
click=
"getTreeData"
>
查询
</el-button>
</div>
</div>
</div>
</div>
<div
class=
"station-box box"
>
</div>
<div
class=
"station-box box "
:style=
"
{height:showSearchConditions?'calc(100% - 190px)':'calc(100% - 80px)'}">
<div
class=
"search-area"
>
<div
class=
"search-area"
>
<el-input
v-model=
"keyword"
placeholder=
"请输入关键字"
class=
"search-input"
clearable
>
<el-input
v-model=
"keyword"
placeholder=
"请输入关键字"
class=
"search-input"
clearable
>
<!--
<el-button
slot=
"append"
icon=
"el-icon-search"
@
click=
"searchData"
/>
-->
<!--
<el-button
slot=
"append"
icon=
"el-icon-search"
@
click=
"searchData"
/>
-->
...
@@ -154,7 +162,10 @@ export default {
...
@@ -154,7 +162,10 @@ export default {
},
},
activeTab
:
'0'
,
activeTab
:
'0'
,
activeNodeData
:
{},
activeNodeData
:
{},
currentNodekey
:
''
currentNodekey
:
''
,
areaUpdatingLists
:
{},
requestParams
:
[],
showSearchConditions
:
true
// 控制搜索条件是否显示
}
}
},
},
watch
:
{
watch
:
{
...
@@ -578,6 +589,17 @@ export default {
...
@@ -578,6 +589,17 @@ export default {
},
},
rowClick
(
data
)
{
rowClick
(
data
)
{
this
.
$emit
(
'getMissData'
,
data
)
this
.
$emit
(
'getMissData'
,
data
)
<<<<<<<
HEAD
=======
},
rowClickSpec
(
data
)
{
const
tmpData
=
{}
tmpData
.
row
=
data
.
row
.
extSupporting
this
.
$emit
(
'getMissData'
,
tmpData
)
},
toggleSearchConditions
()
{
this
.
showSearchConditions
=
!
this
.
showSearchConditions
>>>>>>>
0
c6d6105
(
架次搜索增加隐藏标识(指令下发,站位计划维护,实物构型管理)
)
}
}
}
}
}
}
...
@@ -595,10 +617,17 @@ export default {
...
@@ -595,10 +617,17 @@ export default {
.search-box
{
.search-box
{
height
:
150px
;
height
:
150px
;
font-size
:
14px
;
font-size
:
14px
;
position
:
relative
;
/* 允许内部元素使用绝对定位 */
.title
{
.title
{
margin-left
:
10px
;
margin-left
:
10px
;
text-align
:
left
;
text-align
:
left
;
margin-top
:
10px
;
margin-top
:
10px
;
display
:
flex
;
/* 使用flex布局来更好地控制子元素 */
align-items
:
center
;
/* 垂直居中 */
/* 添加按钮的右外边距或定位,具体取决于您的布局需求 */
.search-condition-operation-item
{
margin-left
:
auto
;
/* 将按钮推到右边 */
}
}
}
.search-icon
{
.search-icon
{
display
:
inline-block
;
display
:
inline-block
;
...
...
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