修改样式 修改数据检索页面
This commit is contained in:
parent
00ecdc80bf
commit
c57323efb7
|
@ -4,9 +4,12 @@ const metaDataTypeTree = (params)=>getAction("/dataManager/getAllTable",params);
|
||||||
const metaDatalist = (params)=>getAction("/dataManager/getTableColumns",params);
|
const metaDatalist = (params)=>getAction("/dataManager/getTableColumns",params);
|
||||||
const tableDataList = (params)=>getAction("/dataManager/getTableData",params);
|
const tableDataList = (params)=>getAction("/dataManager/getTableData",params);
|
||||||
const tableIndexes = (params)=>getAction("/tableIndex/getTableIndexes",params);
|
const tableIndexes = (params)=>getAction("/tableIndex/getTableIndexes",params);
|
||||||
|
const DmExportTool = (params)=>postAction("/dataManager/DmExportTool",params);
|
||||||
|
|
||||||
export {
|
export {
|
||||||
metaDataTypeTree,
|
metaDataTypeTree,
|
||||||
metaDatalist,
|
metaDatalist,
|
||||||
tableIndexes
|
tableIndexes,
|
||||||
|
tableDataList,
|
||||||
|
DmExportTool
|
||||||
}
|
}
|
|
@ -645,7 +645,7 @@ textarea,
|
||||||
.ant-select-dropdown.ant-select-dropdown--multiple .ant-select-dropdown-menu-item-selected .ant-select-selected-icon,
|
.ant-select-dropdown.ant-select-dropdown--multiple .ant-select-dropdown-menu-item-selected .ant-select-selected-icon,
|
||||||
.ant-select-dropdown.ant-select-dropdown--multiple .ant-select-dropdown-menu-item:hover .ant-select-selected-icon {
|
.ant-select-dropdown.ant-select-dropdown--multiple .ant-select-dropdown-menu-item:hover .ant-select-selected-icon {
|
||||||
color: @defaultWhiteColor !important;
|
color: @defaultWhiteColor !important;
|
||||||
min-height: 32px;
|
//min-height: 32px;
|
||||||
}
|
}
|
||||||
|
|
||||||
input:not(.ant-calendar-input):not(.ant-calendar-range-picker-input):not(.ant-select-search__field):not(.ant-input-lg),
|
input:not(.ant-calendar-input):not(.ant-calendar-range-picker-input):not(.ant-select-search__field):not(.ant-input-lg),
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
</a-col>
|
</a-col>
|
||||||
</a-row>
|
</a-row>
|
||||||
<a-row :gutter="24">
|
<a-row :gutter="24">
|
||||||
<a-col :md="6" :sm="8">
|
<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" size="large" v-model="queryParam.schemaMass"
|
||||||
@change="handleTypeChange">
|
@change="handleTypeChange">
|
||||||
|
@ -38,16 +38,20 @@
|
||||||
</a-select>
|
</a-select>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :md="6" :sm="8">
|
<a-col :md="6" :sm="6">
|
||||||
<a-form-item label="时间范围">
|
<a-form-item label="时间范围">
|
||||||
<a-range-picker :default-value="defaultTime" :format="dateFormat" @change="onChangeTime" />
|
<a-range-picker :default-value="defaultTime" :format="dateFormat" @change="onChangeTime" />
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :md="6" :sm="8">
|
<a-col :md="6" :sm="6">
|
||||||
<a-form-item label="关键词">
|
<a-form-item label="关键词">
|
||||||
<a-input placeholder="请输入搜索关键词" v-model="queryParam.massKey"></a-input>
|
<a-input placeholder="请输入搜索关键词" v-model="queryParam.massKey"></a-input>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
|
<a-col :md="6" :sm="6">
|
||||||
|
<a-button @click="getTableDataList" type="primary">查询</a-button>
|
||||||
|
<a-button @click="exportTool" type="primary">导出</a-button>
|
||||||
|
</a-col>
|
||||||
</a-row>
|
</a-row>
|
||||||
</a-form>
|
</a-form>
|
||||||
</div>
|
</div>
|
||||||
|
@ -75,7 +79,8 @@
|
||||||
</a-card>
|
</a-card>
|
||||||
</template>
|
</template>
|
||||||
<script>
|
<script>
|
||||||
import { metaDataTypeTree, tableDataList } from '@/api/metaData'
|
import { metaDataTypeTree, tableDataList,DmExportTool } from '@/api/metaData'
|
||||||
|
import { getAction, deleteAction, putAction, postAction } from '@/api/manage'
|
||||||
import moment from 'moment';
|
import moment from 'moment';
|
||||||
export default {
|
export default {
|
||||||
name: "metadata",
|
name: "metadata",
|
||||||
|
@ -208,6 +213,16 @@ export default {
|
||||||
}
|
}
|
||||||
|
|
||||||
})
|
})
|
||||||
|
},
|
||||||
|
exportTool(){
|
||||||
|
if(this.queryParam.schemaMass == ""){
|
||||||
|
this.$message.warning("请选择导出的数据类型");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
postAction("/dataManager/DmExportTool?schemaMass="+this.queryParam.schemaMass,{}).then(res => {
|
||||||
|
|
||||||
|
|
||||||
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
226
src/views/data/modules/dataIndexingModal.vue
Normal file
226
src/views/data/modules/dataIndexingModal.vue
Normal file
|
@ -0,0 +1,226 @@
|
||||||
|
<template>
|
||||||
|
<a-modal
|
||||||
|
:title="title"
|
||||||
|
:width="800"
|
||||||
|
:visible="visible"
|
||||||
|
:confirmLoading="confirmLoading"
|
||||||
|
@ok="handleOk"
|
||||||
|
@cancel="handleCancel"
|
||||||
|
okText="保存"
|
||||||
|
cancelText="关闭">
|
||||||
|
|
||||||
|
<a-spin :spinning="confirmLoading">
|
||||||
|
<a-form :form="form">
|
||||||
|
<a-form-item label="任务名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
||||||
|
<a-input v-decorator="['name']" ></a-input>
|
||||||
|
</a-form-item>
|
||||||
|
<a-form-item label="选择型号" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
||||||
|
<a-select show-search
|
||||||
|
placeholder="选择型号"
|
||||||
|
option-filter-prop="children" :filter-option="filterOption" size="large" v-decorator="['shipModelId', {}]"
|
||||||
|
@change="selectModel">
|
||||||
|
<a-select-option v-for="d in shipMode" :key="d.id">
|
||||||
|
{{ d.name }}
|
||||||
|
</a-select-option>
|
||||||
|
</a-select>
|
||||||
|
</a-form-item>
|
||||||
|
<a-form-item label="选择舷号" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
||||||
|
<a-select show-search
|
||||||
|
placeholder="选择舷号"
|
||||||
|
option-filter-prop="children" :filter-option="filterOption" size="large" v-decorator="['shipNumId', {}]">
|
||||||
|
<a-select-option v-for="d in shipNum" :key="d.id">
|
||||||
|
{{ d.name }}
|
||||||
|
</a-select-option>
|
||||||
|
</a-select>
|
||||||
|
</a-form-item>
|
||||||
|
<a-form-item
|
||||||
|
label="开始结束时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
||||||
|
<a-range-picker
|
||||||
|
style="width:500px"
|
||||||
|
:show-time="{ format: 'HH:mm:ss' }"
|
||||||
|
v-model="rangeTime"
|
||||||
|
format="YYYY-MM-DD HH:mm:ss"
|
||||||
|
:placeholder="['任务开始时间', '任务结束时间']"
|
||||||
|
@change="onChange"
|
||||||
|
@ok="onOk"
|
||||||
|
|
||||||
|
/>
|
||||||
|
</a-form-item>
|
||||||
|
|
||||||
|
<a-form-item
|
||||||
|
label="说明">
|
||||||
|
<a-textarea placeholder="请输入描述" :rows="3" v-decorator="['describe', {}]" />
|
||||||
|
</a-form-item>
|
||||||
|
</a-form>
|
||||||
|
</a-spin>
|
||||||
|
</a-modal>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import moment from "moment"
|
||||||
|
import {
|
||||||
|
shipNumPageList,
|
||||||
|
shipNumQueryByModelId,
|
||||||
|
shipModelPageList
|
||||||
|
} from '@/api/ship'
|
||||||
|
import { taskCreate,
|
||||||
|
taskUpdateById } from '@/api/task'
|
||||||
|
import JCron from "@/components/jeecg/JCron";
|
||||||
|
import JSelectMultiple from '@/components/jeecg/JSelectMultiple'
|
||||||
|
import pick from 'lodash.pick'
|
||||||
|
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: "taskModal",
|
||||||
|
components: {
|
||||||
|
JCron,
|
||||||
|
JSelectMultiple
|
||||||
|
},
|
||||||
|
data () {
|
||||||
|
return {
|
||||||
|
title:"操作",
|
||||||
|
buttonStyle: 'solid',
|
||||||
|
visible: false,
|
||||||
|
dateFormat:'YYYY-MM-DD HH:mm:ss',
|
||||||
|
status:'',
|
||||||
|
model: {},
|
||||||
|
confirmLoading: false,
|
||||||
|
form: this.$form.createForm(this),
|
||||||
|
strategys:[],
|
||||||
|
dataStrategySelected:'',
|
||||||
|
idcDataStrategyId:"",
|
||||||
|
shipMode:{},
|
||||||
|
shipNum:{},
|
||||||
|
rangeTime:[],
|
||||||
|
queryParam: {
|
||||||
|
pageNum :1,
|
||||||
|
pageSize:20
|
||||||
|
},
|
||||||
|
labelCol: {
|
||||||
|
xs: { span: 24 },
|
||||||
|
sm: { span: 5 },
|
||||||
|
},
|
||||||
|
wrapperCol: {
|
||||||
|
xs: { span: 24 },
|
||||||
|
sm: { span: 16 },
|
||||||
|
},
|
||||||
|
}
|
||||||
|
},
|
||||||
|
created () {
|
||||||
|
this.loadData();
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
loadData() {
|
||||||
|
shipModelPageList(this.queryParam).then((res) => {
|
||||||
|
if (res.success) {
|
||||||
|
this.shipMode = res.result.rows
|
||||||
|
} else {
|
||||||
|
this.$message.warning(res.message);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
shipNumPageList(this.queryParam).then((res) => {
|
||||||
|
if (res.success) {
|
||||||
|
this.shipNum = res.result.rows
|
||||||
|
} else {
|
||||||
|
this.$message.warning(res.message);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
},
|
||||||
|
filterOption(input, option) {
|
||||||
|
return (
|
||||||
|
option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
|
||||||
|
);
|
||||||
|
},
|
||||||
|
selectModel(value){
|
||||||
|
shipNumQueryByModelId({modelId:value}).then((res) => {
|
||||||
|
if (res.success) {
|
||||||
|
this.shipNum = res.result
|
||||||
|
} else {
|
||||||
|
this.$message.warning(res.message);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
},
|
||||||
|
add () {
|
||||||
|
this.rangeTime=[];
|
||||||
|
this.edit({});
|
||||||
|
},
|
||||||
|
edit (record) {
|
||||||
|
this.visible =true;
|
||||||
|
let that = this;
|
||||||
|
that.form.resetFields();
|
||||||
|
this.model = Object.assign({},record);
|
||||||
|
this.rangeTime.push(moment(this.model.startTime),moment(this.model.endTime))
|
||||||
|
this.$nextTick(() => {
|
||||||
|
this.form.setFieldsValue(pick(this.model,'name','describe','shipModelId','shipNumId'));
|
||||||
|
});
|
||||||
|
},
|
||||||
|
onChange(value, dateString) {
|
||||||
|
this.model.startTime = dateString[0];
|
||||||
|
this.model.endTime = dateString[1];
|
||||||
|
console.log(this.model);
|
||||||
|
},
|
||||||
|
onOk(value) {
|
||||||
|
this.model.startTime = value[0].format('YYYY-MM-DD HH:mm:ss');
|
||||||
|
this.model.endTime = value[1].format('YYYY-MM-DD HH:mm:ss');
|
||||||
|
console.log(this.model);
|
||||||
|
},
|
||||||
|
close () {
|
||||||
|
this.$emit('close');
|
||||||
|
this.visible = false;
|
||||||
|
},
|
||||||
|
handleOk () {
|
||||||
|
const that = this;
|
||||||
|
// 触发表单验证
|
||||||
|
this.form.validateFields((err, values) => {
|
||||||
|
console.log('values',values)
|
||||||
|
if (!err) {
|
||||||
|
that.confirmLoading = true;
|
||||||
|
if(!this.model.id){
|
||||||
|
this.model.name = values.name;
|
||||||
|
this.model.shipModelId = values.shipModelId;
|
||||||
|
this.model.shipNumId = values.shipNumId;
|
||||||
|
this.model.describe = values.describe;
|
||||||
|
this.model.startTime = this.rangeTime[0].format('YYYY-MM-DD HH:mm:ss');
|
||||||
|
this.model.endTime = this.rangeTime[1].format('YYYY-MM-DD HH:mm:ss');
|
||||||
|
console.log(this.model);
|
||||||
|
taskCreate(this.model).then((res)=>{
|
||||||
|
if(res.success){
|
||||||
|
that.$message.success(res.message);
|
||||||
|
that.$emit('ok');
|
||||||
|
}else{
|
||||||
|
that.$message.warning(res.message);
|
||||||
|
}
|
||||||
|
}).finally(() => {
|
||||||
|
that.confirmLoading = false;
|
||||||
|
that.close();
|
||||||
|
})
|
||||||
|
}else{
|
||||||
|
taskUpdateById({id:this.model.id,name:values.name,describe:values.describe,shipModelId:values.shipModelId,shipNumId:values.shipNumId,
|
||||||
|
startTime:this.model.startTime,endTime:this.model.endTime
|
||||||
|
}).then((res)=>{
|
||||||
|
if(res.success){
|
||||||
|
that.$message.success(res.message);
|
||||||
|
that.$emit('ok');
|
||||||
|
}else{
|
||||||
|
that.$message.warning(res.message);
|
||||||
|
}
|
||||||
|
}).finally(() => {
|
||||||
|
that.confirmLoading = false;
|
||||||
|
that.close();
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
},
|
||||||
|
handleCancel () {
|
||||||
|
this.close()
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
.disabled{
|
||||||
|
pointer-events: none;
|
||||||
|
}
|
||||||
|
</style>
|
Loading…
Reference in New Issue
Block a user