From 4de879b236bf25adc816f5774ecd0c971183d86d Mon Sep 17 00:00:00 2001
From: RenCheng <RCMessage@outlook.com>
Date: Sat, 21 Jun 2025 21:38:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/data/dataCleansing.vue | 58 +++++++++++++-------------------
 1 file changed, 23 insertions(+), 35 deletions(-)

diff --git a/src/views/data/dataCleansing.vue b/src/views/data/dataCleansing.vue
index 2a34e50..1cefc03 100644
--- a/src/views/data/dataCleansing.vue
+++ b/src/views/data/dataCleansing.vue
@@ -28,7 +28,7 @@
         <div class="table-page-search-wrapper" style="padding:10px;">
           <a-form layout="inline">
             <a-row :gutter="24">
-              <a-col :md="4" :sm="8">
+              <a-col :md="12">
                   <a-form-item label="型号">
                       <a-select placeholder="选择型号" option-filter-prop="children" show-search :filter-option="filterOption" v-model="cleaningData.shipModel" @change="changeshipModel">
                           <a-select-option v-for="item in shipModel" :value="item">
@@ -37,7 +37,7 @@
                       </a-select>
                   </a-form-item>
               </a-col>
-              <a-col :md="4" :sm="8">
+              <a-col :md="12">
                   <a-form-item label="舷号">
                       <a-select placeholder="选择舷号" option-filter-prop="children" show-search :filter-option="filterOption" v-model="cleaningData.shipNumber" @change="changeshipNumber">
                           <a-select-option v-for="item in shipNumber" :value="item">
@@ -48,7 +48,7 @@
               </a-col>
             </a-row>
             <a-row :gutter="24">
-              <a-col :md="6" :sm="8">
+              <a-col :md="12">
                   <a-form-item label="数据类型">
                       <a-select mode="multiple" placeholder="选择数据类型"  option-filter-prop="children" v-model="cleaningData.dataType">
                           <a-select-option v-for="item in dataTypeList" :value="item.enName">
@@ -57,7 +57,7 @@
                       </a-select>
                   </a-form-item>
               </a-col>
-              <a-col :md="5">
+              <a-col :md="12">
                 <a-button @click="dataAdd" type="primary">数据清洗整编</a-button>
               </a-col>
             </a-row>
@@ -102,6 +102,7 @@ export default {
         schemaMass: "",
         sourceType: 1
       },
+      dataTypeList:[],
       cleaningData:{
         shipModel:'',
         shipNumber:'',
@@ -173,27 +174,6 @@ export default {
     openlink(url) {
         window.location.href = url;
     },
-    getDataType() {
-        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.cleaningData.shipModel = this.shipModel[0]
-                this.cleaningData.shipNumber = this.shipNumber[0]
-                this.cleaningData.dataType = this.dataTypeList[0].enName
-            } else {
-                this.$message.warning(res.message);
-            }
-        });
-    },
     filterOption(input, option) {
         return (
         option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
@@ -258,16 +238,24 @@ export default {
     },
     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.datatypequeryParam.schemaMass = res.result.result.DATA_CONN_ORIGINAL[0].cnName
-          }
-          this.getTables();
-        } else {
-          this.$message.warning(res.message);
-        }
-      });
+            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.cleaningData.shipModel = this.shipModel[0]
+                this.cleaningData.shipNumber = this.shipNumber[0]
+                this.cleaningData.dataType = this.dataTypeList[0].enName
+            } else {
+                this.$message.warning(res.message);
+            }
+        });
     },
     getTables() {
       getAction("/dataManager/getDataManagerInfo", this.datatypequeryParam).then((res) => {