diff --git a/src/views/data/metadata.vue b/src/views/data/metadata.vue
index a6bbce4..0b6b3d8 100644
--- a/src/views/data/metadata.vue
+++ b/src/views/data/metadata.vue
@@ -2,30 +2,44 @@
     <a-card :bordered="false">
         <!-- 查询区域 -->
         <div class="table-page-search-wrapper">
-            <a-form layout="inline">
-                <a-row :gutter="30">
-                    <a-col :md="20">
-                        <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-                        </span>
-                    </a-col>
-                </a-row>
-                <a-row :gutter="24">
-                    <a-col :md="6" :sm="8">
-                        <a-form-item label="数据类型">
-                            <a-select  placeholder="选择数据类型"  option-filter-prop="children" v-model="queryParam.schemaMass" @change="handleTypeChange">
-                                <a-select-option v-for="d in dataTypedataSources" :key="d.cnName">
-                                {{ d.cnName }}
-                                </a-select-option>
-                            </a-select>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :md="6" :sm="8">
-                        <a-form-item label="关键词">
-                            <a-input placeholder="请输入搜索关键词" v-model="queryParam.massKey"></a-input>
-                        </a-form-item>
-                    </a-col>
-                </a-row>
-            </a-form>
+          <a-form layout="inline">
+            <a-row :gutter="24">
+              <a-col :md="12">
+                <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">
+                      {{ item }}
+                    </a-select-option>
+                  </a-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="12">
+                <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">
+                      {{ item }}
+                    </a-select-option>
+                  </a-select>
+                </a-form-item>
+              </a-col>
+            </a-row>
+            <a-row :gutter="24">
+              <a-col :md="12">
+                <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">
+                      {{ item.cnName }}
+                    </a-select-option>
+                  </a-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="12">
+                <a-form-item label="关键词">
+                  <a-input placeholder="请输入搜索关键词" v-model="queryParam.massKey"></a-input>
+                </a-form-item>
+              </a-col>
+            </a-row>
+          </a-form>
         </div>
 
         <a-row :gutter="30" style="padding: 0 10px;">
@@ -69,15 +83,18 @@ export default {
         return {
             loading: false,
             // 查询条件
-            queryParam: {
-                sourceType: 1,
-                schemaMass: null,
-                massKey: null
-            },
             tableParams: {
                 schemaMass: null,
                 tableName: null
             },
+            queryParam: {
+              mdl:"",
+              hn:"",
+              schemaMass:"",
+              sourceType:1,
+              massKey: null
+            },
+            dataTypeList:[],
             treeDate: [],
             dataSource: [],
             columns: [
@@ -114,6 +131,9 @@ export default {
                 }
             ],
             dataTypedataSources:[],
+            shipModel:[],
+            shipNumber:[],
+            existingDataTypes:{}
         }
     },
     watch: {
@@ -131,18 +151,51 @@ export default {
         this.getselect()
     },
     methods: {
-        getselect(){
-            getAction("/dataType/getExistingDataTypes", {}).then((res) => {
-                if (res.success) {
-                this.dataTypedataSources = res.result.result.DATA_CONN_ORIGINAL
-                if(res.result.result.DATA_CONN_ORIGINAL.length > 0){
-                    this.queryParam.schemaMass = res.result.result.DATA_CONN_ORIGINAL[0].cnName
-                }
-                this.getMetaDataTypeTree();
-                } else {
-                this.$message.warning(res.message);
-                }
-            });
+        filterOption(input, option) {
+          return (
+            option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+          );
+        },
+        changemdl(value) {
+          var number = Object.keys(this.existingDataTypes[value])
+          this.shipNumber = []
+          number.forEach((element, index) => {
+            this.shipNumber.push(element);
+          });
+          this.dataTypeList =this.existingDataTypes[value][this.shipNumber[0]]
+          this.queryParam.mdl = value
+          this.queryParam.hn = this.shipNumber[0]
+          this.queryParam.schemaMass = this.dataTypeList[0].cnName
+          this.getMetaDataTypeTree()
+        },
+        changehn(value) {
+          this.dataTypeList =this.existingDataTypes[this.queryParam.mdl][value]
+          this.queryParam.schemaMass = this.dataTypeList[0].cnName
+          this.queryParam.hn = value
+          this.getMetaDataTypeTree()
+        },
+        getselect() {
+          getAction("/dataType/getExistingDataTypes", {}).then((res) => {
+            if (res.success) {
+              this.existingDataTypes = res.result.result.original
+              var ship = Object.keys(this.existingDataTypes)
+              ship.forEach((element, index) => {
+                this.shipModel.push(element);
+              });
+              var number = Object.keys(this.existingDataTypes[this.shipModel[0]])
+              number.forEach((element, index) => {
+                this.shipNumber.push(element);
+              });
+              this.dataTypeList =this.existingDataTypes[this.shipModel[0]][this.shipNumber[0]]
+
+              this.queryParam.mdl = this.shipModel[0]
+              this.queryParam.hn = this.shipNumber[0]
+              this.queryParam.schemaMass = this.dataTypeList[0].cnName
+              this.getMetaDataTypeTree()
+            } else {
+              this.$message.warning(res.message);
+            }
+          });
         },
         getMetaDataTypeTree() {
           metaViewDataTypeTree(this.queryParam).then(res => {
@@ -177,6 +230,9 @@ export default {
             if (info.node.dataRef.type && info.node.dataRef.type == 'childern') {
                 this.tableParams.schemaMass = info.node.$parent.dataRef.title
                 this.tableParams.tableName = info.node.dataRef.key
+                this.tableParams.tableName = info.node.dataRef.key
+                this.tableParams.mdl = this.queryParam.mdl
+                this.tableParams.hn = this.queryParam.hn
                 this.getMetaDatalist()
             }
         },