Skip to content

T
TF-MOM-WEB
Commit 7153cc2e authored by jingnan's avatar jingnan 👀
Browse files
Options

架次搜索增加隐藏标识（指令下发，站位计划维护，实物构型管理）

parent e09b830d
Hide whitespace changes
Inline Side-by-side
Showing with 91 additions and 42 deletions
applications/dee-mes/src/views/assemblyPlanManagement/instructionsIssued/components/stationPlanList.vue
View file @ 7153cc2e
...@@ -8,25 +8,33 @@ ...@@ -8,25 +8,33 @@
> >
<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="row"> <div class="search-condition-operation-item" @click="toggleSearchConditions"><img
<label>机型:</label> class="search-condition-operation-icon"
<el-select v-model="form.model" size="mini" placeholder="请选择" :loading="modelLoading"> :src="showSearchConditions?'icons/circle-fold.png':'icons/circle-collapse.png'"
<el-option v-for="item in modelData" :key="item.id" :label="item.defName" :value="item.id" /> >
</el-select> </div>
</div> </div>
<div class="row"> <div v-if="showSearchConditions" class="search-conditions">
<label>架次:</label> <div class="row">
<el-select v-model="form.sorties" size="mini" placeholder="请选择" :loading="sortiesLoading"> <label>机型:</label>
<el-option v-for="(item, i) in sortiesData" :key="item.value + i" :label="item.label" :value="item.value" /> <el-select v-model="form.model" size="mini" placeholder="请选择" :loading="modelLoading">
</el-select> <el-option v-for="item in modelData" :key="item.id" :label="item.defName" :value="item.id" />
</div> </el-select>
<div class="row"> </div>
<el-button size="mini" type="primary" @click="getTreeData">查询</el-button> <div class="row">
<label>架次:</label>
<el-select v-model="form.sorties" size="mini" placeholder="请选择" :loading="sortiesLoading">
<el-option v-for="(item, i) in sortiesData" :key="item.value + i" :label="item.label" :value="item.value" />
</el-select>
</div>
<div class="row">
<el-button size="mini" type="primary" @click="getTreeData">查询</el-button>
</div>
</div> </div>
</div> </div>
<div class="station-box box"> <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
} }
} }
} }
...@@ -555,13 +568,20 @@ export default { ...@@ -555,13 +568,20 @@ export default {
height: 100%; height: 100%;
overflow-x:hidden; overflow-x:hidden;
.search-box { .search-box {
height: 150px; height: 150px;
font-size: 14px; font-size: 14px;
.title { position: relative; /* 允许内部元素使用绝对定位 */
.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;
width: 21px; width: 21px;
......
applications/dee-mes/src/views/assemblyPlanManagement/stationPlanMaintenance/stationPlanList.vue
View file @ 7153cc2e
...@@ -8,25 +8,33 @@ ...@@ -8,25 +8,33 @@
> >
<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="row"> <div class="search-condition-operation-item" @click="toggleSearchConditions"><img
<label>机型:</label> class="search-condition-operation-icon"
<el-select v-model="form.model" size="mini" placeholder="请选择" :loading="modelLoading"> :src="showSearchConditions?'icons/circle-fold.png':'icons/circle-collapse.png'"
<el-option v-for="item in modelData" :key="item.id" :label="item.defName" :value="item.id" /> >
</el-select> </div>
</div> </div>
<div class="row"> <div v-if="showSearchConditions" class="search-conditions">
<label>架次:</label> <div class="row">
<el-select v-model="form.sorties" size="mini" placeholder="请选择" :loading="sortiesLoading"> <label>机型:</label>
<el-option v-for="(item, i) in sortiesData" :key="item.value + i" :label="item.label" :value="item.value" /> <el-select v-model="form.model" size="mini" placeholder="请选择" :loading="modelLoading">
</el-select> <el-option v-for="item in modelData" :key="item.id" :label="item.defName" :value="item.id" />
</div> </el-select>
<div class="row"> </div>
<el-button size="mini" type="primary" @click="getTreeData">查询</el-button> <div class="row">
<label>架次:</label>
<el-select v-model="form.sorties" size="mini" placeholder="请选择" :loading="sortiesLoading">
<el-option v-for="(item, i) in sortiesData" :key="item.value + i" :label="item.label" :value="item.value" />
</el-select>
</div>
<div class="row">
<el-button size="mini" type="primary" @click="getTreeData">查询</el-button>
</div>
</div> </div>
</div> </div>
<div class="station-box box"> <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
>>>>>>> 0c6d6105 (架次搜索增加隐藏标识（指令下发，站位计划维护，实物构型管理）)
} }
} }
} }
...@@ -593,13 +615,20 @@ export default { ...@@ -593,13 +615,20 @@ export default {
overflow-x:hidden; overflow-x:hidden;
// width: 15%; // width: 15%;
.search-box { .search-box {
height: 150px; height: 150px;
font-size: 14px; font-size: 14px;
.title { position: relative; /* 允许内部元素使用绝对定位 */
.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;
width: 21px; width: 21px;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment