diff --git a/.env.development b/.env.development
index 5aef017..0a6098f 100644
--- a/.env.development
+++ b/.env.development
@@ -1,4 +1,4 @@
 NODE_ENV=development
-VUE_APP_API_BASE_URL=http://pbl.natapp1.cc/jeecg-boot
+VUE_APP_API_BASE_URL=http://rcproject.natapp1.cc/jeecg-boot
 VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
\ No newline at end of file
diff --git a/src/views/data/dataCleansing.vue b/src/views/data/dataCleansing.vue
index 8c0d079..461d5df 100644
--- a/src/views/data/dataCleansing.vue
+++ b/src/views/data/dataCleansing.vue
@@ -200,10 +200,12 @@ export default {
       });
     },
     getselect() {
-      dataTypePageList(this.queryParam).then((res) => {
+      getAction("/dataType/getExistingDataTypes", {}).then((res) => {
         if (res.success) {
-          this.dataTypedataSources = res.result.rows || res.result;
-          this.datatypequeryParam.schemaMass = res.result.rows[0].cnName
+          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);
diff --git a/src/views/data/dataIndexing.vue b/src/views/data/dataIndexing.vue
index 832f407..0d43335 100644
--- a/src/views/data/dataIndexing.vue
+++ b/src/views/data/dataIndexing.vue
@@ -12,28 +12,9 @@
         <a-row :gutter="24">
           <a-col :md="6" :sm="8">
             <a-form-item label="数据类型">
-              <a-select placeholder="选择同步状态" option-filter-prop="children" size="large" v-model="queryParam.schemaMass"
-                @change="handleTypeChange">
-                <a-select-option key="平台">
-                  平台
-                </a-select-option>
-                <a-select-option key="编队">
-                  编队
-                </a-select-option>
-                <a-select-option key="航空兵">
-                  航空兵
-                </a-select-option>
-                <a-select-option key="陆战队">
-                  陆战队
-                </a-select-option>
-                <a-select-option key="作战">
-                  作战
-                </a-select-option>
-                <a-select-option key="反潜">
-                  反潜
-                </a-select-option>
-                <a-select-option key="舰炮">
-                  舰炮
+              <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>
@@ -141,7 +122,8 @@ export default {
           width: 260,
           scopedSlots: { customRender: 'action' },
         }
-      ]
+      ],
+      dataTypedataSources:[]
     }
   },
   watch: {
@@ -157,9 +139,22 @@ export default {
     
   },
   created() {
-    this.getMetaDataTypeTree()
+    this.getselect();
   },
   methods: {
+    getselect(){
+      getAction("/dataType/getExistingDataTypes", {}).then((res) => {
+        if (res.success) {
+          this.dataTypedataSources = res.result.result.DATA_CONN_STANDARD
+          if(res.result.result.DATA_CONN_STANDARD.length > 0){
+            this.queryParam.schemaMass = res.result.result.DATA_CONN_STANDARD[0].cnName
+          }
+          this.getMetaDataTypeTree();
+        } else {
+          this.$message.warning(res.message);
+        }
+      });
+    },
     handleAdd(){
       if(this.tableParams.schemaMass == null || this.tableParams.tableName == null){
         this.$message.warning("请先选择表信息");
diff --git a/src/views/data/dataManage.vue b/src/views/data/dataManage.vue
index be5e11f..f11bd14 100644
--- a/src/views/data/dataManage.vue
+++ b/src/views/data/dataManage.vue
@@ -210,14 +210,16 @@
         });
       },
       getselect(){
-        dataTypePageList(this.queryParam).then((res) => {
-            if (res.success) {
-                this.dataTypedataSources = res.result.rows||res.result;
-                this.datatypequeryParam.schemaMass = res.result.rows[0].cnName
-                this.getTables();
-            } else {
-                this.$message.warning(res.message);
+        getAction("/dataType/getExistingDataTypes", {}).then((res) => {
+          if (res.success) {
+            this.dataTypedataSources = res.result.result.DATA_CONN_STANDARD
+            if(res.result.result.DATA_CONN_STANDARD.length > 0){
+              this.datatypequeryParam.schemaMass = res.result.result.DATA_CONN_STANDARD[0].cnName
             }
+            this.getTables();
+          } else {
+            this.$message.warning(res.message);
+          }
         });
       },
       getTables(){
diff --git a/src/views/data/dataSearch.vue b/src/views/data/dataSearch.vue
index 2d1e406..e530a9a 100644
--- a/src/views/data/dataSearch.vue
+++ b/src/views/data/dataSearch.vue
@@ -12,28 +12,9 @@
         <a-row :gutter="24">
           <a-col :md="6" :sm="6">
             <a-form-item label="数据类型">
-              <a-select placeholder="选择同步状态" option-filter-prop="children" size="large" v-model="queryParam.schemaMass"
-                @change="handleTypeChange">
-                <a-select-option key="平台">
-                  平台
-                </a-select-option>
-                <a-select-option key="编队">
-                  编队
-                </a-select-option>
-                <a-select-option key="航空兵">
-                  航空兵
-                </a-select-option>
-                <a-select-option key="陆战队">
-                  陆战队
-                </a-select-option>
-                <a-select-option key="作战">
-                  作战
-                </a-select-option>
-                <a-select-option key="反潜">
-                  反潜
-                </a-select-option>
-                <a-select-option key="舰炮">
-                  舰炮
+              <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>
@@ -117,7 +98,8 @@ export default {
       },
       treeDate: [],
       dataSource: [],
-      columns: []
+      columns: [],
+      dataTypedataSources:[]
     }
   },
   watch: {
@@ -133,9 +115,22 @@ export default {
 
   },
   created() {
-    this.getMetaDataTypeTree()
+    this.getselect()
   },
   methods: {
+    getselect(){
+      getAction("/dataType/getExistingDataTypes", {}).then((res) => {
+        if (res.success) {
+          this.dataTypedataSources = res.result.result.DATA_CONN_STANDARD
+          if(res.result.result.DATA_CONN_STANDARD.length > 0){
+            this.queryParam.schemaMass = res.result.result.DATA_CONN_STANDARD[0].cnName
+          }
+          this.getMetaDataTypeTree();
+        } else {
+          this.$message.warning(res.message);
+        }
+      });
+    },
     getMetaDataTypeTree() {
       metaDataTypeTree(this.queryParam).then(res => {
         if (res.code == 200) {
diff --git a/src/views/data/metadata.vue b/src/views/data/metadata.vue
index 0aa4171..56c24b3 100644
--- a/src/views/data/metadata.vue
+++ b/src/views/data/metadata.vue
@@ -12,28 +12,9 @@
                 <a-row :gutter="24">
                     <a-col :md="6" :sm="8">
                         <a-form-item label="数据类型">
-                            <a-select placeholder="选择同步状态" option-filter-prop="children" size="large"
-                                v-model="queryParam.schemaMass" @change="handleTypeChange">
-                                <a-select-option key="平台">
-                                    平台
-                                </a-select-option>
-                                <a-select-option key="编队">
-                                    编队
-                                </a-select-option>
-                                <a-select-option key="航空兵">
-                                    航空兵
-                                </a-select-option>
-                                <a-select-option key="陆战队">
-                                    陆战队
-                                </a-select-option>
-                                <a-select-option key="作战">
-                                    作战
-                                </a-select-option>
-                                <a-select-option key="反潜">
-                                    反潜
-                                </a-select-option>
-                                <a-select-option key="舰炮">
-                                    舰炮
+                            <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>
@@ -79,6 +60,7 @@
 </template>
 <script>
 import {metaDataTypeTree, metaDatalist, metaViewDataTypeTree} from '@/api/metaData'
+import { getAction, deleteAction, putAction, postAction } from '@/api/manage'
 export default {
     name: "metadata",
     components: {
@@ -130,7 +112,8 @@ export default {
                     align: "center",
                     dataIndex: 'dataDefault',
                 }
-            ]
+            ],
+            dataTypedataSources:[]
         }
     },
     watch: {
@@ -146,9 +129,22 @@ export default {
 
     },
     created() {
-        this.getMetaDataTypeTree()
+        this.getselect()
     },
     methods: {
+        getselect(){
+            getAction("/dataType/getExistingDataTypes", {}).then((res) => {
+                if (res.success) {
+                this.dataTypedataSources = res.result.result.DATA_CONN_STANDARD
+                if(res.result.result.DATA_CONN_STANDARD.length > 0){
+                    this.queryParam.schemaMass = res.result.result.DATA_CONN_STANDARD[0].cnName
+                }
+                this.getMetaDataTypeTree();
+                } else {
+                this.$message.warning(res.message);
+                }
+            });
+        },
         getMetaDataTypeTree() {
           metaViewDataTypeTree(this.queryParam).then(res => {
                 if (res.code == 200) {
diff --git a/src/views/data/thematicLibrary.vue b/src/views/data/thematicLibrary.vue
index 6f24ac9..7bc5b4b 100644
--- a/src/views/data/thematicLibrary.vue
+++ b/src/views/data/thematicLibrary.vue
@@ -3,7 +3,7 @@
     <a-col :md="24" :sm="1" >
       <div class="table-page-search-wrapper"style="background: #e6e9f1;padding:10px;">
        <a-select  placeholder="选择数据类型"  option-filter-prop="children" v-model="datatypequeryParam.schemaName" @change="getTables" style="width: 40%;">
-          <a-select-option v-for="d in dataTypedataSources" :key="d.id">
+          <a-select-option v-for="d in dataTypedataSources" :key="d.cnName">
             {{ d.cnName }}
           </a-select-option>
         </a-select>
@@ -113,14 +113,16 @@
         this.tableScrollY = container.clientHeight - paginationHeight;
       },
       getselect(){
-        dataTypePageList(this.queryParam).then((res) => {
-            if (res.success) {
-                this.dataTypedataSources = res.result.rows||res.result;
-                this.datatypequeryParam.schemaName = res.result.rows[0].cnName
-                this.getTables();
-            } else {
-                this.$message.warning(res.message);
+        getAction("/dataType/getExistingDataTypes", {}).then((res) => {
+          if (res.success) {
+            this.dataTypedataSources = res.result.result.DATA_CONN_SPECIAL
+            if(res.result.result.DATA_CONN_SPECIAL.length > 0){
+              this.datatypequeryParam.schemaMass = res.result.result.DATA_CONN_SPECIAL[0].cnName
             }
+            this.getTables();
+          } else {
+            this.$message.warning(res.message);
+          }
         });
       },
       getTables(){
diff --git a/src/views/datawashing/dataformatsRules/index.vue b/src/views/datawashing/dataformatsRules/index.vue
index 1f85efd..b865540 100644
--- a/src/views/datawashing/dataformatsRules/index.vue
+++ b/src/views/datawashing/dataformatsRules/index.vue
@@ -12,8 +12,7 @@
                 <a-row :gutter="24">
                     <a-col :md="6" :sm="8">
                         <a-form-item label="数据类型">
-                            <a-select placeholder="选择数据类型" option-filter-prop="children" size="large"
-                                v-model="queryParam.dataType" @change="handleTypeChange">
+                            <a-select placeholder="选择数据类型" option-filter-prop="children" v-model="queryParam.dataType" @change="handleTypeChange">
                                 <a-select-option v-for="item in dataTypeList" :value="item.enName">
                                     {{ item.cnName }}
                                 </a-select-option>
@@ -63,6 +62,7 @@
 import moment from 'moment'
 import { queryPage } from '@/api/dataformatsRules'
 import { dataTypeQueryAll } from '@/api/dataType'
+import {getAction} from '@/api/manage'
 import subPage from './subPage.vue'
 export default {
     name: "dataformatsRules",
@@ -125,17 +125,25 @@ export default {
 
     },
     created() {
-        this.getQueryPage()
         this.getDataType()
     },
     methods: {
         getDataType() {
-            dataTypeQueryAll().then(res => {
-                if (res.code == 200) this.dataTypeList = res.result
-            })
+            getAction("/dataType/getExistingDataTypes", {}).then((res) => {
+                if (res.success) {
+                this.dataTypeList = res.result.result.DATA_CONN_STANDARD
+                if(res.result.result.DATA_CONN_STANDARD.length > 0){
+                    this.queryParam.dataType = res.result.result.DATA_CONN_STANDARD[0].enName
+                }
+                this.getQueryPage()
+                } else {
+                this.$message.warning(res.message);
+                }
+            });
         },
         handleTypeChange(value) {
             this.queryParam.dataType = value
+            this.getQueryPage()
         },
         handleTableChange(pagination, filters, sorter) {
             this.pagination = pagination
diff --git a/src/views/datawashing/datatypeConversionRules/index.vue b/src/views/datawashing/datatypeConversionRules/index.vue
index 04a2a23..bdf6c29 100644
--- a/src/views/datawashing/datatypeConversionRules/index.vue
+++ b/src/views/datawashing/datatypeConversionRules/index.vue
@@ -12,8 +12,7 @@
                 <a-row :gutter="24">
                     <a-col :md="6" :sm="8">
                         <a-form-item label="数据类型">
-                            <a-select placeholder="选择数据类型" option-filter-prop="children" size="large"
-                                v-model="queryParam.dataType" @change="handleTypeChange">
+                            <a-select placeholder="选择数据类型" option-filter-prop="children"  v-model="queryParam.dataType" @change="handleTypeChange">
                                 <a-select-option v-for="item in dataTypeList" :value="item.enName">
                                     {{ item.cnName }}
                                 </a-select-option>
@@ -64,6 +63,7 @@ import moment from 'moment'
 import { queryPage } from '@/api/datatypeConversionRules'
 import { dataTypeQueryAll } from '@/api/dataType'
 import subPage from './subPage.vue'
+import {getAction} from '@/api/manage'
 export default {
     name: "datatypeConversionRules",
     components: {
@@ -125,17 +125,25 @@ export default {
 
     },
     created() {
-        this.getQueryPage()
         this.getDataType()
     },
     methods: {
         getDataType() {
-            dataTypeQueryAll().then(res => {
-                if (res.code == 200) this.dataTypeList = res.result
-            })
+            getAction("/dataType/getExistingDataTypes", {}).then((res) => {
+                if (res.success) {
+                this.dataTypeList = res.result.result.DATA_CONN_STANDARD
+                if(res.result.result.DATA_CONN_STANDARD.length > 0){
+                    this.queryParam.dataType = res.result.result.DATA_CONN_STANDARD[0].enName
+                }
+                this.getQueryPage()
+                } else {
+                this.$message.warning(res.message);
+                }
+            });
         },
         handleTypeChange(value) {
             this.queryParam.dataType = value
+            this.getQueryPage()
         },
         handleTableChange(pagination, filters, sorter) {
             this.pagination = pagination
diff --git a/src/views/datawashing/deEmphasisRules/index.vue b/src/views/datawashing/deEmphasisRules/index.vue
index 12d57bd..24c20f9 100644
--- a/src/views/datawashing/deEmphasisRules/index.vue
+++ b/src/views/datawashing/deEmphasisRules/index.vue
@@ -12,8 +12,7 @@
                 <a-row :gutter="24">
                     <a-col :md="6" :sm="8">
                         <a-form-item label="数据类型">
-                            <a-select placeholder="选择数据类型" option-filter-prop="children" size="large"
-                                v-model="queryParam.dataType" @change="handleTypeChange">
+                            <a-select placeholder="选择数据类型" option-filter-prop="children" v-model="queryParam.dataType" @change="handleTypeChange">
                                 <a-select-option v-for="item in dataTypeList" :value="item.enName">
                                     {{ item.cnName }}
                                 </a-select-option>
@@ -69,6 +68,7 @@ import moment from 'moment'
 import { deleteRules, queryPage } from '@/api/deEmphasisRules'
 import { dataTypeQueryAll } from '@/api/dataType'
 import rulesModel from './modules/rulesModel.vue'
+import {getAction} from '@/api/manage'
 export default {
     name: "deEmphasisRules",
     components: {
@@ -147,17 +147,25 @@ export default {
 
     },
     created() {
-        this.getQueryPage()
         this.getDataType()
     },
     methods: {
         getDataType() {
-            dataTypeQueryAll().then(res => {
-                if (res.code == 200) this.dataTypeList = res.result
-            })
+            getAction("/dataType/getExistingDataTypes", {}).then((res) => {
+                if (res.success) {
+                this.dataTypeList = res.result.result.DATA_CONN_STANDARD
+                if(res.result.result.DATA_CONN_STANDARD.length > 0){
+                    this.queryParam.dataType = res.result.result.DATA_CONN_STANDARD[0].enName
+                }
+                this.getQueryPage()
+                } else {
+                this.$message.warning(res.message);
+                }
+            });
         },
         handleTypeChange(value) {
             this.queryParam.dataType = value
+            this.getQueryPage()
         },
         handleTableChange(pagination, filters, sorter) {
             this.pagination = pagination
@@ -181,9 +189,8 @@ export default {
             })
         },
         handleAdd() {
-            this.$refs.modalForm.add();
+            this.$refs.modalForm.add(this.queryParam.dataType);
             this.$refs.modalForm.title = "新增";
-            this.$refs.modalForm.dataType = this.queryParam.dataType
         },
         handleEdit(record) {
             this.$refs.modalForm.eidt(record, this.queryParam.dataType);
diff --git a/src/views/datawashing/deEmphasisRules/modules/rulesModel.vue b/src/views/datawashing/deEmphasisRules/modules/rulesModel.vue
index 6bbf641..da50651 100644
--- a/src/views/datawashing/deEmphasisRules/modules/rulesModel.vue
+++ b/src/views/datawashing/deEmphasisRules/modules/rulesModel.vue
@@ -99,14 +99,16 @@ export default {
             if (value == 1) {
                 this.form.judgmentField = 'ALL'
             } else {
+                this.getQuerytableColumns(this.dataType, this.form.tableName)
             }
         },
-        add() {
+        add(dataType) {
             this.form = {
                 tableName: null,
                 duplicationType: 1,
                 judgmentField: null
             }
+            this.dataType = dataType
             this.checkedList =[]
             this.visible = true;
         },
@@ -122,6 +124,7 @@ export default {
                     if (res.code == 200) this.form = res.result
                 })
             }
+            this.dataType = dataType
             this.getQuerytableColumns(dataType, record.tableName)
             this.visible = true;
         },
@@ -132,7 +135,7 @@ export default {
             this.$refs.ruleForm.validate(valid => {
                 if (valid) {
                     this.confirmLoading = true;
-                    if(form.duplicationType == 1){
+                    if(this.form.duplicationType == 1){
                         this.form.judgmentField = 'ALL'
                     }else{
                         this.form.judgmentField = this.checkedList.join(',')
diff --git a/src/views/datawashing/missingvalueRules/index.vue b/src/views/datawashing/missingvalueRules/index.vue
index 6a1381a..129454a 100644
--- a/src/views/datawashing/missingvalueRules/index.vue
+++ b/src/views/datawashing/missingvalueRules/index.vue
@@ -12,8 +12,7 @@
                 <a-row :gutter="24">
                     <a-col :md="6" :sm="8">
                         <a-form-item label="数据类型">
-                            <a-select placeholder="选择数据类型" option-filter-prop="children" size="large"
-                                v-model="queryParam.dataType" @change="handleTypeChange">
+                            <a-select placeholder="选择数据类型" option-filter-prop="children"  v-model="queryParam.dataType" @change="handleTypeChange">
                                 <a-select-option v-for="item in dataTypeList" :value="item.enName">
                                     {{ item.cnName }}
                                 </a-select-option>
@@ -71,6 +70,7 @@ import moment from 'moment'
 import { deleteRules, queryPage } from '@/api/missingvalueRules'
 import { dataTypeQueryAll } from '@/api/dataType'
 import rulesModel from './rulesModel.vue'
+import {getAction} from '@/api/manage'
 export default {
     name: "missingvalueRules",
     components: {
@@ -171,17 +171,25 @@ export default {
 
     },
     created() {
-        this.getQueryPage()
         this.getDataType()
     },
     methods: {
         getDataType() {
-            dataTypeQueryAll().then(res => {
-                if (res.code == 200) this.dataTypeList = res.result
-            })
+            getAction("/dataType/getExistingDataTypes", {}).then((res) => {
+                if (res.success) {
+                this.dataTypeList = res.result.result.DATA_CONN_STANDARD
+                if(res.result.result.DATA_CONN_STANDARD.length > 0){
+                    this.queryParam.dataType = res.result.result.DATA_CONN_STANDARD[0].enName
+                }
+                this.getQueryPage()
+                } else {
+                this.$message.warning(res.message);
+                }
+            });
         },
         handleTypeChange(value) {
             this.queryParam.dataType = value
+            this.getQueryPage()
         },
         handleTableChange(pagination, filters, sorter) {
             this.pagination = pagination