Merge remote-tracking branch 'origin/20250621' into 20250621
# Conflicts: # src/views/dataSearch/integrationlibrary/index.vue
This commit is contained in:
commit
22341b5e22
|
@ -4,7 +4,7 @@
|
|||
<div class="table-page-search-wrapper">
|
||||
<a-form layout="inline">
|
||||
<a-row :gutter="24">
|
||||
<a-col :md="12">
|
||||
<a-col :md="6">
|
||||
<a-form-item label="型号">
|
||||
<a-select placeholder="选择型号" option-filter-prop="children" show-search :filter-option="filterOption" v-model="queryParam.mdl" @change="changemdl">
|
||||
<a-select-option v-for="item in shipModel" :value="item">
|
||||
|
@ -13,7 +13,7 @@
|
|||
</a-select>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :md="12">
|
||||
<a-col :md="6">
|
||||
<a-form-item label="舷号">
|
||||
<a-select placeholder="选择舷号" option-filter-prop="children" show-search :filter-option="filterOption" v-model="queryParam.hn" @change="changehn">
|
||||
<a-select-option v-for="item in shipNumber" :value="item">
|
||||
|
@ -22,9 +22,7 @@
|
|||
</a-select>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
</a-row>
|
||||
<a-row :gutter="24">
|
||||
<a-col :md="12">
|
||||
<a-col :md="6">
|
||||
<a-form-item label="数据类型">
|
||||
<a-select placeholder="选择数据类型" option-filter-prop="children" @change="getMetaDataTypeTree" v-model="queryParam.schemaMass">
|
||||
<a-select-option v-for="item in dataTypeList" :value="item.cnName">
|
||||
|
@ -33,7 +31,7 @@
|
|||
</a-select>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :md="12">
|
||||
<a-col :md="6">
|
||||
<a-form-item label="关键词">
|
||||
<a-input placeholder="请输入搜索关键词" v-model="queryParam.massKey"></a-input>
|
||||
</a-form-item>
|
||||
|
|
|
@ -43,13 +43,8 @@
|
|||
<a-input placeholder="请输入搜索关键词" v-model="queryParam.massKey"></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
</a-row>
|
||||
<a-row :gutter="24">
|
||||
<a-col :md="24" :sm="24" style="text-align: right;">
|
||||
<a-button @click="getTableDataList" type="primary">查询</a-button>
|
||||
<!-- <a-button @click="exportTool" type="primary">导出dmp</a-button>
|
||||
<a-button @click="handleAdd" type="primary">导出csv、txt</a-button>
|
||||
<a-button @click="openexptable" type="primary">导出日志</a-button> -->
|
||||
<a-col :md="3" :sm="3" style="text-align: right;">
|
||||
<a-button @click="getTableDataList" type="primary">查询</a-button>
|
||||
</a-col>
|
||||
</a-row>
|
||||
</a-form>
|
||||
|
|
|
@ -58,23 +58,15 @@
|
|||
format="YYYY-MM-DD HH:mm:ss" @change="onChangeTime" />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :md="4" :sm="4">
|
||||
<a-form-item label="编目文字" :label-col="{ span: 10 }" :wrapper-col="{ span: 14 }">
|
||||
<a-select placeholder="选择编目文字" option-filter-prop="children" @change="getMetaDataTypeTree" v-model="queryParam.tagId">
|
||||
<a-select-option v-for="d in datatagSources" :key="d.id">
|
||||
{{ d.tagName }}
|
||||
</a-select-option>
|
||||
</a-select>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :md="5" :sm="5">
|
||||
|
||||
</a-row>
|
||||
<a-row :gutter="24">
|
||||
<a-col :md="16" :sm="5">
|
||||
<a-form-item label="关键词">
|
||||
<a-input placeholder="请输入搜索关键词" v-model="queryParam.massKey"></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
</a-row>
|
||||
<a-row :gutter="24">
|
||||
<a-col :md="24" :sm="24" style="text-align: right;">
|
||||
<a-col :md="8" :sm="24" >
|
||||
<a-button @click="getTableDataList" type="primary">查询</a-button>
|
||||
<a-button @click="exportTool" type="primary">导出dmp</a-button>
|
||||
<a-button @click="handleAdd" type="primary">导出csv、txt</a-button>
|
||||
|
@ -194,7 +186,7 @@ export default {
|
|||
this.getselect()
|
||||
this.queryAllTask()
|
||||
this.getdatatagSources()
|
||||
// this.initDate()
|
||||
// this.initDate()
|
||||
},
|
||||
methods: {
|
||||
queryAllTask() {
|
||||
|
|
|
@ -58,6 +58,8 @@
|
|||
format="YYYY-MM-DD HH:mm:ss" @change="onChangeTime" />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
</a-row>
|
||||
<a-row :gutter="24">
|
||||
<a-col :md="4" :sm="4">
|
||||
<a-form-item label="编目文字" :label-col="{ span: 10 }" :wrapper-col="{ span: 14 }">
|
||||
<a-select placeholder="选择编目文字" option-filter-prop="children" @change="getMetaDataTypeTree" v-model="queryParam.tagId">
|
||||
|
@ -67,14 +69,12 @@
|
|||
</a-select>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :md="5" :sm="5">
|
||||
<a-col :md="12" :sm="5">
|
||||
<a-form-item label="关键词">
|
||||
<a-input placeholder="请输入搜索关键词" v-model="queryParam.massKey"></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
</a-row>
|
||||
<a-row :gutter="24">
|
||||
<a-col :md="24" :sm="24" style="text-align: right;">
|
||||
<a-col :md="8" :sm="24">
|
||||
<a-button @click="getTableDataList" type="primary">查询</a-button>
|
||||
<a-button @click="exportTool" type="primary">导出dmp</a-button>
|
||||
<a-button @click="handleAdd" type="primary">导出csv、txt</a-button>
|
||||
|
|
Loading…
Reference in New Issue
Block a user