From 9b84e9f4da8260173d14bf401feaf619c80b31f2 Mon Sep 17 00:00:00 2001
From: RenCheng <RCMessage@outlook.com>
Date: Sun, 8 Jun 2025 13:48:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=B8=85=E6=B4=97=E5=89=A9?=
 =?UTF-8?q?=E4=BD=99=E4=B8=A4=E4=B8=AA=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/consistencyCheckRules.js             |  15 ++
 src/api/outlierReplaceRules.js               |  18 ++
 src/views/datawashing/tempone/index.vue      | 130 +++++---------
 src/views/datawashing/tempone/rulesModel.vue | 107 +++++++-----
 src/views/datawashing/tempone/subPage.vue    | 169 +++++++++++++++++++
 src/views/datawashing/temptwo/index.vue      |  42 +++--
 src/views/datawashing/temptwo/rulesModel.vue |   9 +-
 7 files changed, 338 insertions(+), 152 deletions(-)
 create mode 100644 src/api/consistencyCheckRules.js
 create mode 100644 src/api/outlierReplaceRules.js
 create mode 100644 src/views/datawashing/tempone/subPage.vue

diff --git a/src/api/consistencyCheckRules.js b/src/api/consistencyCheckRules.js
new file mode 100644
index 0000000..6ed0987
--- /dev/null
+++ b/src/api/consistencyCheckRules.js
@@ -0,0 +1,15 @@
+import { getAction, deleteAction, putAction, postAction } from '@/api/manage'
+
+const createRules = (params)=>postAction("/consistencyCheckRules/createRules",params);
+const updateRules = (params)=>putAction("/consistencyCheckRules/updateRules",params);
+const deleteRules = (params)=>deleteAction("/consistencyCheckRules/deleteRules",params);
+const queryPage = (params)=>getAction("/consistencyCheckRules/queryPage",params);
+const queryById = (params)=>getAction("/consistencyCheckRules/queryById",params);
+
+export {
+    createRules,
+    updateRules,
+    deleteRules,
+    queryPage,
+    queryById
+}
\ No newline at end of file
diff --git a/src/api/outlierReplaceRules.js b/src/api/outlierReplaceRules.js
new file mode 100644
index 0000000..5f6678f
--- /dev/null
+++ b/src/api/outlierReplaceRules.js
@@ -0,0 +1,18 @@
+import { getAction, deleteAction, putAction, postAction } from '@/api/manage'
+
+const createRules = (params)=>postAction("/outlierReplaceRules/createRules",params);
+const updateRules = (params)=>putAction("/outlierReplaceRules/updateRules",params);
+const deleteRules = (params)=>deleteAction("/outlierReplaceRules/deleteRules",params);
+const queryPage = (params)=>getAction("/outlierReplaceRules/queryPage",params);
+const queryById = (params)=>getAction("/outlierReplaceRules/queryById",params);
+const queryRulesByTableName = (params)=>getAction("/outlierReplaceRules/queryRulesByTableName",params);
+const querytableColumns = (params)=>getAction("/outlierReplaceRules/getTableColumns",params);
+export {
+    createRules,
+    updateRules,
+    deleteRules,
+    queryPage,
+    queryById,
+    queryRulesByTableName,
+    querytableColumns
+}
\ No newline at end of file
diff --git a/src/views/datawashing/tempone/index.vue b/src/views/datawashing/tempone/index.vue
index 251fa17..f09963b 100644
--- a/src/views/datawashing/tempone/index.vue
+++ b/src/views/datawashing/tempone/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"
-                                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>
@@ -22,7 +21,7 @@
                     </a-col>
                     <a-col :md="6" :sm="8">
                         <a-form-item label="报文名">
-                            <a-input placeholder="请输入报文名" v-model="queryParam.msgName" allow-clear></a-input>
+                            <a-input placeholder="请输入报文名称" v-model="queryParam.msgName" allow-clear></a-input>
                         </a-form-item>
                     </a-col>
                     <a-col :md="6" :sm="24">
@@ -41,34 +40,34 @@
                 <!-- 表格区域 -->
                 <div style="height:calc(100vh - 316px);background: #e6e9f1;overflow:hidden;padding: 15px;">
                     <a-table size="middle" bordered :columns="columns" :data-source="dataSource" :loading="loading"
-                        :pagination="pagination" :scroll="{ y: 'calc(100vh - 380px)' }" rowKey="id"
+                        :pagination="pagination" :scroll="{ y: 'calc(100vh - 420px)' }" rowKey="ROW_ID"
                         @change="handleTableChange">
                         <!-- <span slot="createTime" slot-scope="text, record">
                             {{ moment(text).format('YYYY-MM-DD') }}
                         </span> -->
                         <span slot="action" slot-scope="text, record">
                             <a @click="handleEdit(record)">配置</a>
-                            <a-divider v-if="record.id" type="vertical" />
-                            <a v-if="record.id" @click="handleRemove(record.id)">删除</a>
+                            <!-- <a-divider type="vertical" />
+                            <a @click="handleRemove(record.id)">删除</a> -->
                         </span>
                     </a-table>
                 </div>
                 <div class="linese"></div>
             </a-col>
         </a-row>
-
-        <rulesModel ref="modalForm" @fatherMethod="getQueryPage" />
+        <subPage ref="subPage" /> 
     </a-card>
 </template>
 <script>
 import moment from 'moment'
-import { deleteRules, queryPage } from '@/api/missingvalueRules'
+import { queryPage } from '@/api/outlierReplaceRules'
 import { dataTypeQueryAll } from '@/api/dataType'
-import rulesModel from './rulesModel.vue'
+import {getAction} from '@/api/manage'
+import subPage from './subPage.vue'
 export default {
-    name: "tempOne",
+    name: "outlierReplaceRules",
     components: {
-        rulesModel
+        subPage
     },
     data() {
         return {
@@ -108,45 +107,6 @@ export default {
                     align: "center",
                     dataIndex: 'msgName',
                 },
-                // {
-                //     title: '字符串策略',
-                //     align: "center",
-                //     width: 110,
-                //     dataIndex: 'stringStrategy',
-                // },
-                {
-                    title: '字符串策略',
-                    align: "center",
-                    dataIndex: 'stringStrategyDescribe',
-                },
-                // {
-                //     title: '数值策略',
-                //     align: "center",
-                //     width: 100,
-                //     dataIndex: 'digitStrategy',
-                // },
-                {
-                    title: '数值策略',
-                    align: "center",
-                    dataIndex: 'digitStrategyDescribe',
-                },
-                // {
-                //     title: '时间策略',
-                //     align: "center",
-                //     width: 100,
-                //     dataIndex: 'dateTimeStrategy',
-                // },
-                {
-                    title: '时间策略',
-                    align: "center",
-                    dataIndex: 'dateTimeStrategyDescribe',
-                },
-                {
-                    title: '创建时间',
-                    align: "center",
-                    dataIndex: 'createTime',
-                    scopedSlots: { customRender: 'createTime' },
-                },
                 {
                     title: '操作',
                     key: 'action',
@@ -165,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_ORIGINAL
+                if(res.result.result.DATA_CONN_ORIGINAL.length > 0){
+                    this.queryParam.dataType = res.result.result.DATA_CONN_ORIGINAL[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
@@ -191,48 +159,26 @@ export default {
                     this.dataSource = res.result.rows
                     this.pagination = pagination
                 } else {
-                    // this.$notification.error({
-                    //     message: '系统提示',
-                    //     description: res.message
-                    // })
+                    this.$notification.error({
+                        message: '系统提示',
+                        description: res.message
+                    })
                 }
             })
         },
-        handleAdd() {
-            this.$refs.modalForm.add();
-            this.$refs.modalForm.title = "新增";
-        },
+       
         handleEdit(record) {
-            this.$refs.modalForm.eidt(record);
-            this.$refs.modalForm.title = "配置";
+            console.log('编辑', this.queryParam.dataType)
+            // this.$refs.modalForm.eidt(record, this.queryParam.dataType);
+            // this.$refs.modalForm.title = "配置";
+            this.$refs.subPage.queryParam.tableName = record.tableName
+            this.$refs.subPage.queryParam.schemaName = record.schemaName
+            this.$refs.subPage.datetypeF = this.queryParam.dataType
+            this.$refs.subPage.title = "配置";
+            this.$refs.subPage.pagevisible = true
+            this.$refs.subPage.getTableInfo()
         },
-        handleRemove(recordId) {
-            console.log('dfs', recordId)
-            const _that = this
-            _that.$confirm({
-                title: '你确认执行删除操作吗?',
-                okText: '确认',
-                cancelText: '取消',
-                onOk() {
-                    console.log('dfs', recordId)
-                    deleteRules({ id: recordId }).then(res => {
-                        if (res.code === 200) {
-                            _that.$notification.success({
-                                message: '系统提示',
-                                description: res.message
-                            })
-                            _that.getQueryPage()
-                        } else {
-                            _that.$notification.warning({
-                                message: '系统提示',
-                                description: res.message
-                            })
-                        }
-                    })
-                },
-                onCancel() { }
-            })
-        }
+       
     }
 }
 </script>
\ No newline at end of file
diff --git a/src/views/datawashing/tempone/rulesModel.vue b/src/views/datawashing/tempone/rulesModel.vue
index 5ddb0c2..d358981 100644
--- a/src/views/datawashing/tempone/rulesModel.vue
+++ b/src/views/datawashing/tempone/rulesModel.vue
@@ -7,27 +7,21 @@
                 <a-form-model-item label="表名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tableName">
                     <a-input v-model="form.tableName" placeholder="请输入"></a-input>
                 </a-form-model-item>
-                <a-form-model-item label="字符串策略" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="stringStrategy">
-                    <a-select v-model="form.stringStrategy">
-                        <a-select-option :value="1">直接删除</a-select-option>
-                        <a-select-option :value="2">复制上条数据</a-select-option>
-                        <a-select-option :value="3">复制下条数据</a-select-option>
-                        <a-select-option :value="4">空</a-select-option>
+                <a-form-model-item label="转换字段" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="field">
+                    <a-tree-select v-model="form.field" style="width: 100%"
+                        :tree-data="treeData" :show-checked-strategy="SHOW_PARENT" search-placeholder="请选项" 
+                        :dropdownStyle="{ maxHeight: '400px', overflowY: 'auto'}"/>
+                </a-form-model-item>
+                <a-form-model-item label="识别算法" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="algorithm">
+                    <a-select v-model="form.algorithm">
+                        <a-select-option :value="1">标准差法</a-select-option>
                     </a-select>
                 </a-form-model-item>
-                <a-form-model-item label="数值策略" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="digitStrategy">
-                    <a-select v-model="form.digitStrategy">
-                        <a-select-option :value="1">直接删除</a-select-option>
+                <a-form-model-item label="替换策略" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="strategy">
+                    <a-select v-model="form.strategy">
+                        <a-select-option :value="1">填充0</a-select-option>
                         <a-select-option :value="2">复制上条数据</a-select-option>
-                        <a-select-option :value="3">复制下条数据</a-select-option>
-                        <a-select-option :value="4">前后均值填充</a-select-option>
-                        <a-select-option :value="5">填0</a-select-option>
-                    </a-select>
-                </a-form-model-item>
-                <a-form-model-item label="时间策略" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="dateTimeStrategy">
-                    <a-select v-model="form.dateTimeStrategy">
-                        <a-select-option :value="1">直接删除</a-select-option>
-                        <a-select-option :value="2">前后均值填充</a-select-option>
+                        <a-select-option :value="3">删除</a-select-option>
                     </a-select>
                 </a-form-model-item>
             </a-form-model>
@@ -38,8 +32,9 @@
 <script>
 import JCron from "@/components/jeecg/JCron";
 import JSelectMultiple from '@/components/jeecg/JSelectMultiple'
-import { createRules, updateRules, queryById } from '@/api/missingvalueRules'
-
+import { createRules, updateRules, queryById,querytableColumns } from '@/api/outlierReplaceRules'
+import { TreeSelect } from 'ant-design-vue';
+const SHOW_PARENT = TreeSelect.SHOW_PARENT;
 
 export default {
     name: "rulesModal",
@@ -49,21 +44,23 @@ export default {
     },
     data() {
         return {
+            SHOW_PARENT,
             title: "操作",
             visible: false,
             model: {},
             confirmLoading: false,
             form: {
                 tableName: null,
-                stringStrategy: null,
-                digitStrategy: null,
-                dateTimeStrategy: null
+                field: null,
+                algorithm: null,
+                strategy: null,
+                schemaName:""
             },
             rules: {
                 tableName: [{ required: true, message: '请输入表名', trigger: 'blur' }],
-                stringStrategy: [{ required: true, message: '请选择字符串策略', trigger: 'change' }],
-                digitStrategy: [{ required: true, message: '请选择数值策略', trigger: 'change' }],
-                dateTimeStrategy: [{ required: true, message: '请选择时间策略', trigger: 'change' }]
+                field: [{ required: true, message: '请选择', trigger: 'change' }],
+                strategy: [{ required: true, message: '请选择', trigger: 'change' }],
+                algorithm: [{ required: true, message: '请选择', trigger: 'change' }]
             },
             labelCol: {
                 xs: { span: 24 },
@@ -73,23 +70,48 @@ export default {
                 xs: { span: 24 },
                 sm: { span: 16 },
             },
-            treeData: []
+            treeData: [],
+            checkedList: []
         }
     },
     created() {
+        // this.loadData();
     },
     methods: {
-        add() {
-            this.form = {
-                tableName: null,
-                stringStrategy: null,
-                digitStrategy: null,
-                dateTimeStrategy: null,
-                schemaName: null
+        getQuerytableColumns(dataType, tableName) {
+            querytableColumns({ dataType: dataType, tableName: tableName }).then(res => {
+                if (res.code == 200) {
+                    this.treeData = []
+                    res.result.forEach(element => {
+                        this.treeData.push({
+                            title: element,
+                            value: element,
+                            key: element,
+                        })
+                    });
+                }
+            })
+        },
+        handleChange(value) {
+            if (value == 1) {
+                this.form.judgmentField = 'ALL'
+            } else {
+
             }
+        },
+        add(schemaName,tableName, dataType) {
+            this.getQuerytableColumns(dataType, tableName)
+            this.form = {
+                tableName: tableName,
+                field: null,
+                algorithm: null,
+                strategy: null,
+                schemaName :schemaName
+            }
+            this.checkedList = []
             this.visible = true;
         },
-        eidt(record) {
+        eidt(record, dataType1) {
             if (record.id) {
                 queryById({ id: record.id }).then(res => {
                     if (res.code == 200) {
@@ -100,14 +122,14 @@ export default {
                 this.form = {
                     id: null,
                     tableName: record.tableName,
-                    stringStrategy: null,
-                    digitStrategy: null,
-                    dateTimeStrategy: null,
-                    schemaName: record.schemaName
+                    field: null,
+                    algorithm: null,
+                    strategy: null,
+                    schemaName:record.schemaName
                 }
             }
+            this.getQuerytableColumns(dataType1, record.tableName)
             this.visible = true;
-
         },
         close() {
             this.visible = false;
@@ -116,6 +138,7 @@ export default {
             this.$refs.ruleForm.validate(valid => {
                 if (valid) {
                     this.confirmLoading = true;
+                    this.form.transfFileds = this.checkedList.join(',')
                     if (!this.form.id) {
                         createRules(this.form).then(res => {
                             if (res.code === 200) {
@@ -129,7 +152,7 @@ export default {
                             } else {
                                 this.$notification.error({
                                     message: '系统提示',
-                                    description: '操作失败'
+                                    description: res.message
                                 })
                                 this.confirmLoading = false
                             }
@@ -147,7 +170,7 @@ export default {
                             } else {
                                 this.$notification.error({
                                     message: '系统提示',
-                                    description: '操作失败'
+                                    description: res.message
                                 })
                                 this.confirmLoading = false
                             }
diff --git a/src/views/datawashing/tempone/subPage.vue b/src/views/datawashing/tempone/subPage.vue
new file mode 100644
index 0000000..cfc9fe4
--- /dev/null
+++ b/src/views/datawashing/tempone/subPage.vue
@@ -0,0 +1,169 @@
+<template>
+      <a-modal :title="title" :width="900" :visible="pagevisible" :footer="null"
+      @cancel="handleCancel" >
+    <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="24" :sm="24" style="text-align: right;">
+                        <a-button type="primary" style="right: 10px" icon="plus" @click="handleAdd">新建</a-button>
+                    </a-col>
+                </a-row>
+            </a-form>
+        </div>
+        <!-- 查询区域 --> 
+        <a-row :gutter="30" style="padding: 0 10px;">
+            <a-col :md="24">
+                <div class="linese"></div>
+                <!-- 表格区域 -->
+                <div style="height:calc(100vh - 316px);background: #e6e9f1;overflow:hidden;padding: 15px;">
+                    <a-table size="middle" bordered :columns="columns" :data-source="dataSource" 
+                        :pagination="false" :scroll="{ y: 'calc(100vh - 380px)' }" rowKey="id"
+                      >
+                        <span slot="algorithm" slot-scope="text, record">
+                           <span v-if="text == 1">标准差法</span>
+                        </span>
+                        <span slot="strategy" slot-scope="text, record">
+                           <span v-if="text == 1">填充0</span>
+                           <span v-if="text == 2">复制上条数据</span>
+                           <span v-if="text == 3">删除</span>
+                        </span>
+                        <span slot="action" slot-scope="text, record">
+                            <a @click="handleEdit(record)">编辑</a>
+                            <a-divider type="vertical" />
+                            <a @click="handleRemove(record.id)">删除</a>
+                        </span>
+                    </a-table>
+                </div>
+                <div class="linese"></div>
+            </a-col>
+        </a-row> 
+
+        <rulesModel ref="modalForm" @fatherMethod="getTableInfo" />
+    </a-card>
+</a-modal>
+</template>
+<script> 
+import { deleteRules, queryRulesByTableName } from '@/api/outlierReplaceRules'
+import rulesModel from './rulesModel.vue'
+export default {
+    name: "outlierReplaceRulessubpage",
+    components: { 
+        rulesModel
+    },
+    data() {
+        return {  
+            title: '',
+            datetypeF: '',
+            pagevisible: false,
+            queryParam: { 
+                tableName: null
+            },
+            dataSource: [],
+            columns: [
+                {
+                    title: '序号',
+                    width: 70,
+                    customRender: (text, record, index) => `${index + 1}`,
+                },
+                {
+                    title: '表名',
+                    align: "center",
+                    dataIndex: 'tableName',
+                },
+                {
+                    title: '字段名称',
+                    align: "center",
+                    dataIndex: 'field',
+                },
+                {
+                    title: '识别算法',
+                    align: "center",
+                    dataIndex: 'algorithm',
+                    scopedSlots: { customRender: 'algorithm' },
+                },
+                {
+                    title: '替换策略',
+                    align: "center",
+                    dataIndex: 'strategy',
+                    scopedSlots: { customRender: 'strategy' },
+                },
+                {
+                    title: '操作',
+                    key: 'action',
+                    width: 130,
+                    align: "center",
+                    scopedSlots: { customRender: 'action' },
+                },
+            ]
+        }
+    },
+
+    mounted() {
+
+    },
+    computed: {
+
+    },
+    created() {  },
+    methods: {
+        getTableInfo() {
+            queryRulesByTableName(this.queryParam).then(res => {
+                if (res.code == 200) {
+                    this.dataSource = res.result
+                } else {
+                    this.$notification.error({
+                        message: '系统提示',
+                        description: res.message
+                    })
+                }
+            })
+        },
+        handleAdd() {
+            this.$refs.modalForm.add(this.queryParam.schemaName,this.queryParam.tableName, this.datetypeF);
+            this.$refs.modalForm.title = "新增";
+        },
+        handleEdit(record) {
+            this.$refs.modalForm.eidt(record, this.datetypeF);
+            this.$refs.modalForm.title = "编辑";
+        },
+        handleRemove(recordId) {
+            console.log('dfs', recordId)
+            const _that = this
+            _that.$confirm({
+                title: '你确认执行删除操作吗?',
+                okText: '确认',
+                cancelText: '取消',
+                onOk() {
+                    console.log('dfs', recordId)
+                    deleteRules({ id: recordId }).then(res => {
+                        if (res.code === 200) {
+                            _that.$notification.success({
+                                message: '系统提示',
+                                description: res.message
+                            })
+                            _that.getTableInfo()
+                        } else {
+                            _that.$notification.warning({
+                                message: '系统提示',
+                                description: res.message
+                            })
+                        }
+                    })
+                },
+                onCancel() { }
+            })
+        },
+        handleCancel() {
+            this.pagevisible = false
+        },
+    }
+}
+</script>
\ No newline at end of file
diff --git a/src/views/datawashing/temptwo/index.vue b/src/views/datawashing/temptwo/index.vue
index 54ec46e..44197c8 100644
--- a/src/views/datawashing/temptwo/index.vue
+++ b/src/views/datawashing/temptwo/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"
-                                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>
@@ -22,7 +21,13 @@
                     </a-col>
                     <a-col :md="6" :sm="8">
                         <a-form-item label="报文名">
-                            <a-input placeholder="请输入报文名" v-model="queryParam.msgName" allow-clear></a-input>
+                            <a-input placeholder="请输入报文名" v-decorator="['msgName',{
+             rules: [
+              { required: true, message: '报文名不能为空' },
+              { min: 1, max: 60, message: '长度1-60位' },
+            ],
+            validateTrigger: 'change'
+          }]" v-model="queryParam.msgName" allow-clear></a-input>
                         </a-form-item>
                     </a-col>
                     <a-col :md="6" :sm="24">
@@ -41,7 +46,7 @@
                 <!-- 表格区域 -->
                 <div style="height:calc(100vh - 316px);background: #e6e9f1;overflow:hidden;padding: 15px;">
                     <a-table size="middle" bordered :columns="columns" :data-source="dataSource" :loading="loading"
-                        :pagination="pagination" :scroll="{ y: 'calc(100vh - 380px)' }" rowKey="id"
+                        :pagination="pagination" :scroll="{ y: 'calc(100vh - 420px)' }" rowKey="id"
                         @change="handleTableChange">
                         <!-- <span slot="createTime" slot-scope="text, record">
                             {{ moment(text).format('YYYY-MM-DD') }}
@@ -62,11 +67,12 @@
 </template>
 <script>
 import moment from 'moment'
-import { deleteRules, queryPage } from '@/api/missingvalueRules'
+import { deleteRules, queryPage } from '@/api/consistencyCheckRules'
 import { dataTypeQueryAll } from '@/api/dataType'
 import rulesModel from './rulesModel.vue'
+import {getAction} from '@/api/manage'
 export default {
-    name: "missingvalueRules",
+    name: "consistencyCheckRules",
     components: {
         rulesModel
     },
@@ -165,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_ORIGINAL
+                if(res.result.result.DATA_CONN_ORIGINAL.length > 0){
+                    this.queryParam.dataType = res.result.result.DATA_CONN_ORIGINAL[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
@@ -191,10 +205,10 @@ export default {
                     this.dataSource = res.result.rows
                     this.pagination = pagination
                 } else {
-                    // this.$notification.error({
-                    //     message: '系统提示',
-                    //     description: res.message
-                    // })
+                    this.$notification.error({
+                        message: '系统提示',
+                        description: res.message
+                    })
                 }
             })
         },
diff --git a/src/views/datawashing/temptwo/rulesModel.vue b/src/views/datawashing/temptwo/rulesModel.vue
index fbfd20f..db5aea5 100644
--- a/src/views/datawashing/temptwo/rulesModel.vue
+++ b/src/views/datawashing/temptwo/rulesModel.vue
@@ -38,7 +38,7 @@
 <script>
 import JCron from "@/components/jeecg/JCron";
 import JSelectMultiple from '@/components/jeecg/JSelectMultiple'
-import { createRules, updateRules, queryById } from '@/api/missingvalueRules'
+import { createRules, updateRules, queryById } from '@/api/consistencyCheckRules'
 
 
 export default {
@@ -58,7 +58,7 @@ export default {
                 stringStrategy: null,
                 digitStrategy: null,
                 dateTimeStrategy: null,
-                schemaName: null
+                schemaName:null
             },
             rules: {
                 tableName: [{ required: true, message: '请输入表名', trigger: 'blur' }],
@@ -85,7 +85,8 @@ export default {
                 tableName: null,
                 stringStrategy: null,
                 digitStrategy: null,
-                dateTimeStrategy: null
+                dateTimeStrategy: null,
+                schemaName:null
             }
             this.visible = true;
         },
@@ -103,7 +104,7 @@ export default {
                     stringStrategy: null,
                     digitStrategy: null,
                     dateTimeStrategy: null,
-                    schemaName: record.schemaName
+                    schemaName:record.schemaName
                 }
             }
             this.visible = true;