修改配置

This commit is contained in:
RenCheng 2025-04-26 16:30:12 +08:00
parent b7e23f1210
commit 64ce9dd92c
12 changed files with 145 additions and 119 deletions

View File

@ -1,4 +1,4 @@
NODE_ENV=development 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_CAS_BASE_URL=http://cas.example.org:8443/cas
VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview

View File

@ -200,10 +200,12 @@ export default {
}); });
}, },
getselect() { getselect() {
dataTypePageList(this.queryParam).then((res) => { getAction("/dataType/getExistingDataTypes", {}).then((res) => {
if (res.success) { if (res.success) {
this.dataTypedataSources = res.result.rows || res.result; this.dataTypedataSources = res.result.result.DATA_CONN_ORIGINAL
this.datatypequeryParam.schemaMass = res.result.rows[0].cnName if(res.result.result.DATA_CONN_ORIGINAL.length > 0){
this.datatypequeryParam.schemaMass = res.result.result.DATA_CONN_ORIGINAL[0].cnName
}
this.getTables(); this.getTables();
} else { } else {
this.$message.warning(res.message); this.$message.warning(res.message);

View File

@ -12,28 +12,9 @@
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :md="6" :sm="8"> <a-col :md="6" :sm="8">
<a-form-item label="数据类型"> <a-form-item label="数据类型">
<a-select placeholder="选择同步状态" option-filter-prop="children" size="large" v-model="queryParam.schemaMass" <a-select placeholder="选择数据类型" option-filter-prop="children" v-model="queryParam.schemaMass" @change="handleTypeChange">
@change="handleTypeChange"> <a-select-option v-for="d in dataTypedataSources" :key="d.cnName">
<a-select-option key="平台"> {{ d.cnName }}
平台
</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-option> </a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
@ -141,7 +122,8 @@ export default {
width: 260, width: 260,
scopedSlots: { customRender: 'action' }, scopedSlots: { customRender: 'action' },
} }
] ],
dataTypedataSources:[]
} }
}, },
watch: { watch: {
@ -157,9 +139,22 @@ export default {
}, },
created() { created() {
this.getMetaDataTypeTree() this.getselect();
}, },
methods: { 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(){ handleAdd(){
if(this.tableParams.schemaMass == null || this.tableParams.tableName == null){ if(this.tableParams.schemaMass == null || this.tableParams.tableName == null){
this.$message.warning("请先选择表信息"); this.$message.warning("请先选择表信息");

View File

@ -210,10 +210,12 @@
}); });
}, },
getselect(){ getselect(){
dataTypePageList(this.queryParam).then((res) => { getAction("/dataType/getExistingDataTypes", {}).then((res) => {
if (res.success) { if (res.success) {
this.dataTypedataSources = res.result.rows||res.result; this.dataTypedataSources = res.result.result.DATA_CONN_STANDARD
this.datatypequeryParam.schemaMass = res.result.rows[0].cnName if(res.result.result.DATA_CONN_STANDARD.length > 0){
this.datatypequeryParam.schemaMass = res.result.result.DATA_CONN_STANDARD[0].cnName
}
this.getTables(); this.getTables();
} else { } else {
this.$message.warning(res.message); this.$message.warning(res.message);

View File

@ -12,28 +12,9 @@
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :md="6" :sm="6"> <a-col :md="6" :sm="6">
<a-form-item label="数据类型"> <a-form-item label="数据类型">
<a-select placeholder="选择同步状态" option-filter-prop="children" size="large" v-model="queryParam.schemaMass" <a-select placeholder="选择数据类型" option-filter-prop="children" v-model="queryParam.schemaMass" @change="handleTypeChange">
@change="handleTypeChange"> <a-select-option v-for="d in dataTypedataSources" :key="d.cnName">
<a-select-option key="平台"> {{ d.cnName }}
平台
</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-option> </a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
@ -117,7 +98,8 @@ export default {
}, },
treeDate: [], treeDate: [],
dataSource: [], dataSource: [],
columns: [] columns: [],
dataTypedataSources:[]
} }
}, },
watch: { watch: {
@ -133,9 +115,22 @@ export default {
}, },
created() { created() {
this.getMetaDataTypeTree() this.getselect()
}, },
methods: { 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() { getMetaDataTypeTree() {
metaDataTypeTree(this.queryParam).then(res => { metaDataTypeTree(this.queryParam).then(res => {
if (res.code == 200) { if (res.code == 200) {

View File

@ -12,28 +12,9 @@
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :md="6" :sm="8"> <a-col :md="6" :sm="8">
<a-form-item label="数据类型"> <a-form-item label="数据类型">
<a-select placeholder="选择同步状态" option-filter-prop="children" size="large" <a-select placeholder="选择数据类型" option-filter-prop="children" v-model="queryParam.schemaMass" @change="handleTypeChange">
v-model="queryParam.schemaMass" @change="handleTypeChange"> <a-select-option v-for="d in dataTypedataSources" :key="d.cnName">
<a-select-option key="平台"> {{ d.cnName }}
平台
</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-option> </a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
@ -79,6 +60,7 @@
</template> </template>
<script> <script>
import {metaDataTypeTree, metaDatalist, metaViewDataTypeTree} from '@/api/metaData' import {metaDataTypeTree, metaDatalist, metaViewDataTypeTree} from '@/api/metaData'
import { getAction, deleteAction, putAction, postAction } from '@/api/manage'
export default { export default {
name: "metadata", name: "metadata",
components: { components: {
@ -130,7 +112,8 @@ export default {
align: "center", align: "center",
dataIndex: 'dataDefault', dataIndex: 'dataDefault',
} }
] ],
dataTypedataSources:[]
} }
}, },
watch: { watch: {
@ -146,9 +129,22 @@ export default {
}, },
created() { created() {
this.getMetaDataTypeTree() this.getselect()
}, },
methods: { 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() { getMetaDataTypeTree() {
metaViewDataTypeTree(this.queryParam).then(res => { metaViewDataTypeTree(this.queryParam).then(res => {
if (res.code == 200) { if (res.code == 200) {

View File

@ -3,7 +3,7 @@
<a-col :md="24" :sm="1" > <a-col :md="24" :sm="1" >
<div class="table-page-search-wrapper"style="background: #e6e9f1;padding:10px;"> <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 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 }} {{ d.cnName }}
</a-select-option> </a-select-option>
</a-select> </a-select>
@ -113,10 +113,12 @@
this.tableScrollY = container.clientHeight - paginationHeight; this.tableScrollY = container.clientHeight - paginationHeight;
}, },
getselect(){ getselect(){
dataTypePageList(this.queryParam).then((res) => { getAction("/dataType/getExistingDataTypes", {}).then((res) => {
if (res.success) { if (res.success) {
this.dataTypedataSources = res.result.rows||res.result; this.dataTypedataSources = res.result.result.DATA_CONN_SPECIAL
this.datatypequeryParam.schemaName = res.result.rows[0].cnName if(res.result.result.DATA_CONN_SPECIAL.length > 0){
this.datatypequeryParam.schemaMass = res.result.result.DATA_CONN_SPECIAL[0].cnName
}
this.getTables(); this.getTables();
} else { } else {
this.$message.warning(res.message); this.$message.warning(res.message);

View File

@ -12,8 +12,7 @@
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :md="6" :sm="8"> <a-col :md="6" :sm="8">
<a-form-item label="数据类型"> <a-form-item label="数据类型">
<a-select placeholder="选择数据类型" option-filter-prop="children" size="large" <a-select placeholder="选择数据类型" option-filter-prop="children" v-model="queryParam.dataType" @change="handleTypeChange">
v-model="queryParam.dataType" @change="handleTypeChange">
<a-select-option v-for="item in dataTypeList" :value="item.enName"> <a-select-option v-for="item in dataTypeList" :value="item.enName">
{{ item.cnName }} {{ item.cnName }}
</a-select-option> </a-select-option>
@ -63,6 +62,7 @@
import moment from 'moment' import moment from 'moment'
import { queryPage } from '@/api/dataformatsRules' import { queryPage } from '@/api/dataformatsRules'
import { dataTypeQueryAll } from '@/api/dataType' import { dataTypeQueryAll } from '@/api/dataType'
import {getAction} from '@/api/manage'
import subPage from './subPage.vue' import subPage from './subPage.vue'
export default { export default {
name: "dataformatsRules", name: "dataformatsRules",
@ -125,17 +125,25 @@ export default {
}, },
created() { created() {
this.getQueryPage()
this.getDataType() this.getDataType()
}, },
methods: { methods: {
getDataType() { getDataType() {
dataTypeQueryAll().then(res => { getAction("/dataType/getExistingDataTypes", {}).then((res) => {
if (res.code == 200) this.dataTypeList = res.result 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) { handleTypeChange(value) {
this.queryParam.dataType = value this.queryParam.dataType = value
this.getQueryPage()
}, },
handleTableChange(pagination, filters, sorter) { handleTableChange(pagination, filters, sorter) {
this.pagination = pagination this.pagination = pagination

View File

@ -12,8 +12,7 @@
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :md="6" :sm="8"> <a-col :md="6" :sm="8">
<a-form-item label="数据类型"> <a-form-item label="数据类型">
<a-select placeholder="选择数据类型" option-filter-prop="children" size="large" <a-select placeholder="选择数据类型" option-filter-prop="children" v-model="queryParam.dataType" @change="handleTypeChange">
v-model="queryParam.dataType" @change="handleTypeChange">
<a-select-option v-for="item in dataTypeList" :value="item.enName"> <a-select-option v-for="item in dataTypeList" :value="item.enName">
{{ item.cnName }} {{ item.cnName }}
</a-select-option> </a-select-option>
@ -64,6 +63,7 @@ import moment from 'moment'
import { queryPage } from '@/api/datatypeConversionRules' import { queryPage } from '@/api/datatypeConversionRules'
import { dataTypeQueryAll } from '@/api/dataType' import { dataTypeQueryAll } from '@/api/dataType'
import subPage from './subPage.vue' import subPage from './subPage.vue'
import {getAction} from '@/api/manage'
export default { export default {
name: "datatypeConversionRules", name: "datatypeConversionRules",
components: { components: {
@ -125,17 +125,25 @@ export default {
}, },
created() { created() {
this.getQueryPage()
this.getDataType() this.getDataType()
}, },
methods: { methods: {
getDataType() { getDataType() {
dataTypeQueryAll().then(res => { getAction("/dataType/getExistingDataTypes", {}).then((res) => {
if (res.code == 200) this.dataTypeList = res.result 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) { handleTypeChange(value) {
this.queryParam.dataType = value this.queryParam.dataType = value
this.getQueryPage()
}, },
handleTableChange(pagination, filters, sorter) { handleTableChange(pagination, filters, sorter) {
this.pagination = pagination this.pagination = pagination

View File

@ -12,8 +12,7 @@
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :md="6" :sm="8"> <a-col :md="6" :sm="8">
<a-form-item label="数据类型"> <a-form-item label="数据类型">
<a-select placeholder="选择数据类型" option-filter-prop="children" size="large" <a-select placeholder="选择数据类型" option-filter-prop="children" v-model="queryParam.dataType" @change="handleTypeChange">
v-model="queryParam.dataType" @change="handleTypeChange">
<a-select-option v-for="item in dataTypeList" :value="item.enName"> <a-select-option v-for="item in dataTypeList" :value="item.enName">
{{ item.cnName }} {{ item.cnName }}
</a-select-option> </a-select-option>
@ -69,6 +68,7 @@ import moment from 'moment'
import { deleteRules, queryPage } from '@/api/deEmphasisRules' import { deleteRules, queryPage } from '@/api/deEmphasisRules'
import { dataTypeQueryAll } from '@/api/dataType' import { dataTypeQueryAll } from '@/api/dataType'
import rulesModel from './modules/rulesModel.vue' import rulesModel from './modules/rulesModel.vue'
import {getAction} from '@/api/manage'
export default { export default {
name: "deEmphasisRules", name: "deEmphasisRules",
components: { components: {
@ -147,17 +147,25 @@ export default {
}, },
created() { created() {
this.getQueryPage()
this.getDataType() this.getDataType()
}, },
methods: { methods: {
getDataType() { getDataType() {
dataTypeQueryAll().then(res => { getAction("/dataType/getExistingDataTypes", {}).then((res) => {
if (res.code == 200) this.dataTypeList = res.result 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) { handleTypeChange(value) {
this.queryParam.dataType = value this.queryParam.dataType = value
this.getQueryPage()
}, },
handleTableChange(pagination, filters, sorter) { handleTableChange(pagination, filters, sorter) {
this.pagination = pagination this.pagination = pagination
@ -181,9 +189,8 @@ export default {
}) })
}, },
handleAdd() { handleAdd() {
this.$refs.modalForm.add(); this.$refs.modalForm.add(this.queryParam.dataType);
this.$refs.modalForm.title = "新增"; this.$refs.modalForm.title = "新增";
this.$refs.modalForm.dataType = this.queryParam.dataType
}, },
handleEdit(record) { handleEdit(record) {
this.$refs.modalForm.eidt(record, this.queryParam.dataType); this.$refs.modalForm.eidt(record, this.queryParam.dataType);

View File

@ -99,14 +99,16 @@ export default {
if (value == 1) { if (value == 1) {
this.form.judgmentField = 'ALL' this.form.judgmentField = 'ALL'
} else { } else {
this.getQuerytableColumns(this.dataType, this.form.tableName)
} }
}, },
add() { add(dataType) {
this.form = { this.form = {
tableName: null, tableName: null,
duplicationType: 1, duplicationType: 1,
judgmentField: null judgmentField: null
} }
this.dataType = dataType
this.checkedList =[] this.checkedList =[]
this.visible = true; this.visible = true;
}, },
@ -122,6 +124,7 @@ export default {
if (res.code == 200) this.form = res.result if (res.code == 200) this.form = res.result
}) })
} }
this.dataType = dataType
this.getQuerytableColumns(dataType, record.tableName) this.getQuerytableColumns(dataType, record.tableName)
this.visible = true; this.visible = true;
}, },
@ -132,7 +135,7 @@ export default {
this.$refs.ruleForm.validate(valid => { this.$refs.ruleForm.validate(valid => {
if (valid) { if (valid) {
this.confirmLoading = true; this.confirmLoading = true;
if(form.duplicationType == 1){ if(this.form.duplicationType == 1){
this.form.judgmentField = 'ALL' this.form.judgmentField = 'ALL'
}else{ }else{
this.form.judgmentField = this.checkedList.join(',') this.form.judgmentField = this.checkedList.join(',')

View File

@ -12,8 +12,7 @@
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :md="6" :sm="8"> <a-col :md="6" :sm="8">
<a-form-item label="数据类型"> <a-form-item label="数据类型">
<a-select placeholder="选择数据类型" option-filter-prop="children" size="large" <a-select placeholder="选择数据类型" option-filter-prop="children" v-model="queryParam.dataType" @change="handleTypeChange">
v-model="queryParam.dataType" @change="handleTypeChange">
<a-select-option v-for="item in dataTypeList" :value="item.enName"> <a-select-option v-for="item in dataTypeList" :value="item.enName">
{{ item.cnName }} {{ item.cnName }}
</a-select-option> </a-select-option>
@ -71,6 +70,7 @@ import moment from 'moment'
import { deleteRules, queryPage } from '@/api/missingvalueRules' import { deleteRules, queryPage } from '@/api/missingvalueRules'
import { dataTypeQueryAll } from '@/api/dataType' import { dataTypeQueryAll } from '@/api/dataType'
import rulesModel from './rulesModel.vue' import rulesModel from './rulesModel.vue'
import {getAction} from '@/api/manage'
export default { export default {
name: "missingvalueRules", name: "missingvalueRules",
components: { components: {
@ -171,17 +171,25 @@ export default {
}, },
created() { created() {
this.getQueryPage()
this.getDataType() this.getDataType()
}, },
methods: { methods: {
getDataType() { getDataType() {
dataTypeQueryAll().then(res => { getAction("/dataType/getExistingDataTypes", {}).then((res) => {
if (res.code == 200) this.dataTypeList = res.result 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) { handleTypeChange(value) {
this.queryParam.dataType = value this.queryParam.dataType = value
this.getQueryPage()
}, },
handleTableChange(pagination, filters, sorter) { handleTableChange(pagination, filters, sorter) {
this.pagination = pagination this.pagination = pagination