Compare commits
No commits in common. "80e7359359505a8fff9b318f5e6e1cd0340a1ffe" and "753ee55ca46865fe1f8b2016cf6c2a75461b7c53" have entirely different histories.
80e7359359
...
753ee55ca4
|
@ -28,38 +28,30 @@
|
||||||
<div class="table-page-search-wrapper" style="padding:10px;">
|
<div class="table-page-search-wrapper" style="padding:10px;">
|
||||||
<a-form layout="inline">
|
<a-form layout="inline">
|
||||||
<a-row :gutter="24">
|
<a-row :gutter="24">
|
||||||
<a-col :md="4" :sm="8">
|
<a-col :md="12">
|
||||||
<a-form-item label="型号">
|
<!-- <a-form-item label="日志类型">
|
||||||
<a-select placeholder="选择型号" option-filter-prop="children" show-search :filter-option="filterOption" v-model="cleaningData.shipModel" @change="changeshipModel">
|
<a-select placeholder="选择日志类型" option-filter-prop="children" size="large" v-model="queryParam.syncState">
|
||||||
<a-select-option v-for="item in shipModel" :value="item">
|
<a-select-option key="">
|
||||||
{{ item }}
|
全部
|
||||||
|
</a-select-option>
|
||||||
|
<a-select-option key="0">
|
||||||
|
未同步
|
||||||
|
</a-select-option>
|
||||||
|
<a-select-option key="1">
|
||||||
|
进行中
|
||||||
|
</a-select-option>
|
||||||
|
<a-select-option key="2">
|
||||||
|
已结束
|
||||||
</a-select-option>
|
</a-select-option>
|
||||||
</a-select>
|
</a-select>
|
||||||
</a-form-item>
|
</a-form-item> -->
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :md="4" :sm="8">
|
<a-col :md="7">
|
||||||
<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">
|
|
||||||
{{ item }}
|
|
||||||
</a-select-option>
|
|
||||||
</a-select>
|
|
||||||
</a-form-item>
|
|
||||||
</a-col>
|
|
||||||
</a-row>
|
|
||||||
<a-row :gutter="24">
|
|
||||||
<a-col :md="6" :sm="8">
|
|
||||||
<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">
|
|
||||||
{{ item.cnName }}
|
|
||||||
</a-select-option>
|
|
||||||
</a-select>
|
|
||||||
</a-form-item>
|
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :md="5">
|
<a-col :md="5">
|
||||||
<a-button @click="dataAdd" type="primary">数据清洗整编</a-button>
|
<a-button @click="dataAdd" type="primary">数据清洗整编</a-button>
|
||||||
</a-col>
|
</a-col>
|
||||||
|
|
||||||
</a-row>
|
</a-row>
|
||||||
</a-form>
|
</a-form>
|
||||||
</div>
|
</div>
|
||||||
|
@ -102,11 +94,6 @@ export default {
|
||||||
schemaMass: "",
|
schemaMass: "",
|
||||||
sourceType: 1
|
sourceType: 1
|
||||||
},
|
},
|
||||||
cleaningData:{
|
|
||||||
shipModel:'',
|
|
||||||
shipNumber:'',
|
|
||||||
dataType:''
|
|
||||||
},
|
|
||||||
queryParam: {
|
queryParam: {
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
pageSize: 9999999,
|
pageSize: 9999999,
|
||||||
|
@ -147,9 +134,6 @@ export default {
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
tableScrollY: 0,
|
tableScrollY: 0,
|
||||||
shipModel:[],
|
|
||||||
shipNumber:[],
|
|
||||||
existingDataTypes:{}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
|
@ -173,48 +157,6 @@ export default {
|
||||||
openlink(url) {
|
openlink(url) {
|
||||||
window.location.href = 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
|
|
||||||
);
|
|
||||||
},
|
|
||||||
changeshipModel(value) {
|
|
||||||
this.cleaningData.shipModel = value
|
|
||||||
var number = Object.keys(this.existingDataTypes[value])
|
|
||||||
this.shipNumber = []
|
|
||||||
number.forEach((element, index) => {
|
|
||||||
this.shipNumber.push(element);
|
|
||||||
});
|
|
||||||
this.dataTypeList =this.existingDataTypes[value][this.shipNumber[0]]
|
|
||||||
this.cleaningData.shipNumber = this.shipNumber[0]
|
|
||||||
this.cleaningData.dataType = this.dataTypeList[0].enName
|
|
||||||
},
|
|
||||||
changeshipNumber(value) {
|
|
||||||
this.dataTypeList =this.existingDataTypes[this.cleaningData.shipModel][value]
|
|
||||||
this.cleaningData.shipNumber = value
|
|
||||||
this.cleaningData.dataType = this.dataTypeList[0].enName
|
|
||||||
},
|
|
||||||
calculateScrollY() {
|
calculateScrollY() {
|
||||||
// 获取父容器高度(需减去表格内其他元素的高度,如分页栏)
|
// 获取父容器高度(需减去表格内其他元素的高度,如分页栏)
|
||||||
const container = this.$refs.tableContainer;
|
const container = this.$refs.tableContainer;
|
||||||
|
@ -250,7 +192,7 @@ export default {
|
||||||
console.log("connection closed (" + e + ")");
|
console.log("connection closed (" + e + ")");
|
||||||
},
|
},
|
||||||
dataAdd() {
|
dataAdd() {
|
||||||
getAction("/dataCleaning/cleaning?taskId=123456&shipModel="+this.cleaningData.shipModel+"&shipNumber="+this.cleaningData.shipNumber+"&dataTypes="+this.cleaningData.dataType).then((res) => {
|
getAction("/dataCleaning/cleaning?taskId=3806ce79-dc28-48a3-9250-c7729e6b3ad4").then((res) => {
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
this.$message.success(res.message);
|
this.$message.success(res.message);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user