Merge branch '20250621' of http://git.hivekion.com:3000/IDCDatasync/IDCDatasync-vue into 20250621

src/views/data/dataCataloguing.vue

@@ -333,6 +333,7 @@ export default {
     },
     gettagTables() {
       this.tagloading = true;
+      this.queryParam.tagId = this.queryRefsParam.tagId
       getTableTagRefs(this.queryRefsParam).then((res) => {
         if (res.success) {
           this.dataRefsSources = res.result;

src/views/data/metadata.vue

@@ -3,23 +3,37 @@
         <!-- 查询区域 -->
         <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-col :md="12">
-                        <a-form-item label="数据类型">
+                <a-form-item label="型号">
-                            <a-select  placeholder="选择数据类型"  option-filter-prop="children" v-model="queryParam.schemaMass" @change="handleTypeChange">
+                  <a-select placeholder="选择型号" option-filter-prop="children" show-search :filter-option="filterOption" v-model="queryParam.mdl" @change="changemdl">
-                                <a-select-option v-for="d in dataTypedataSources" :key="d.cnName">
+                    <a-select-option v-for="item in shipModel" :value="item">
-                                {{ d.cnName }}
+                      {{ item }}
                     </a-select-option>
                   </a-select>
                 </a-form-item>
               </a-col>
-                    <a-col :md="6" :sm="8">
+              <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>
@@ -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,14 +151,47 @@ export default {
         this.getselect()
     },
     methods: {
+        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.dataTypedataSources = res.result.result.DATA_CONN_ORIGINAL
+              this.existingDataTypes = res.result.result.original
-                if(res.result.result.DATA_CONN_ORIGINAL.length > 0){
+              var ship = Object.keys(this.existingDataTypes)
-                    this.queryParam.schemaMass = res.result.result.DATA_CONN_ORIGINAL[0].cnName
+              ship.forEach((element, index) => {
-                }
+                this.shipModel.push(element);
-                this.getMetaDataTypeTree();
+              });
+              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);
             }
@@ -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()
             }
         },

src/views/dataSearch/sourceDatabase/index.vue

@@ -58,6 +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-form-item label="关键词">
                             <a-input placeholder="请输入搜索关键词" v-model="queryParam.massKey"></a-input>
@@ -113,6 +122,7 @@ import moment from 'moment';
 import tablelist from '../../data/modules/tablelist.vue'
 import exptable from '../../data/modules/exptable.vue'
 import editdataseach from '../../data/modules/editdataseach.vue'
+import {idcTableTaglist} from "@api/tag";
 
 export default {
     name: "metadata",
@@ -141,6 +151,7 @@ export default {
             // 查询条件 
             queryParam: {
                 sourceType: 1,
+                tagId: null,
                 massKey: null,
                 mdl: null, // 型号
                 hn: null, // 舷号
@@ -151,12 +162,18 @@ export default {
                 pageSize: 10,
                 pageNum: 1
             },
+            tagqueryParam: {
+              pageNum: 1,
+              pageSize: 20,
+              tagName: ""
+            },
             treeDate: [],
             dataSource: [],
             columns: [],
             dataTypeList: [],
             shipModel: [],
             shipNumber: [],
+            datatagSources: [],
             existingDataTypes: {},
             treeHeight: 0
         }
@@ -176,6 +193,7 @@ export default {
     created() {
         this.getselect()
         this.queryAllTask()
+        this.getdatatagSources()
         // this.initDate() 
     },
     methods: {
@@ -217,6 +235,16 @@ export default {
                 option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
             );
         },
+        getdatatagSources() {
+          idcTableTaglist(this.tagqueryParam).then((res) => {
+            if (res.success) {
+              this.datatagSources = res.result.records;
+              this.queryParam.tagId = res.result.records[0].id;
+            } else {
+              this.$message.warning(res.message);
+            }
+          });
+        },
         changeshipModel(value) {
             this.queryParam.shipModel = value
             var number = Object.keys(this.existingDataTypes[value])