修改进路查询方式

This commit is contained in:
ival 2019-08-14 15:19:11 +08:00
parent 576ac7eacb
commit 72d3a5f475
21 changed files with 122 additions and 57 deletions

View File

@ -50,7 +50,7 @@
:label="column.title"
:width="column.width"
:sortable="column.sortable"
>
>
<template slot-scope="scope">
<span class="hideOutContent">{{ column.columnValue(scope.row, scope.$index) }}</span>
</template>
@ -400,6 +400,7 @@ export default {
if (this.queryList.afterQuery && this.queryList.afterQuery instanceof Function) {
this.queryList.afterQuery(response.data);
}
const resultData = response.data;
this.$set(this.queryList, 'data', resultData.list);
this.$set(this.queryList, 'total', resultData.total);

View File

@ -25,7 +25,10 @@ export default {
},
props: {
mapInfo: {
type: Object
type: Object,
default() {
return null;
}
}
},
data() {
@ -40,12 +43,8 @@ export default {
labelWidth: '120px',
queryObject: {
signalCode: {
type: 'select',
label: this.$t('map.signal'),
config: {
data: []
}
}
type: 'text',
label: this.$t('map.signal') }
}
},
queryList: {

View File

@ -41,13 +41,20 @@ export default {
},
props: {
mapInfo: {
type: Object
type: Object,
default() {
return null;
}
},
selected: {
type: Object
type: Object,
default() {
return null;
}
},
cardHeight: {
type: Number || String
type: Number || String,
required: true
}
},
data() {

View File

@ -34,7 +34,9 @@ export default {
props: {
mapInfo: {
type: Object,
required: true
default() {
return null;
}
}
},
data() {

View File

@ -53,16 +53,26 @@ export default {
name: 'RouteOperation',
props: {
selected: {
type: Object
type: Object,
default() {
return null;
}
},
mapInfo: {
type: Object
type: Object,
default() {
return null;
}
},
routeData: {
type: Object
type: Object,
default() {
return null;
}
},
cardHeight: {
type: Number || String
type: Number || String,
required: true
}
},
data() {

View File

@ -23,7 +23,9 @@ export default {
props: {
mapInfo: {
type: Object,
required: true
default() {
return null;
}
}
},
data() {

View File

@ -40,12 +40,14 @@ export default {
props: {
mapInfo: {
type: Object,
required: true
default() {
return null;
}
},
selected: {
type: Object,
default: function() {
return {};
default() {
return null;
}
},
cardHeight: {

View File

@ -22,7 +22,9 @@ export default {
props: {
mapInfo: {
type: Object,
required: true
default() {
return null;
}
}
},
data() {
@ -179,12 +181,9 @@ export default {
if (data && data.list) {
const that = this;
const list = data.list;
const nameList = this.queryForm.queryObject.name.config.data = [];
if (list) {
list.map(elem => {
nameList.push({ label: elem.name, value: elem.name });
that.convertField(elem, that.mapList, 'id', 'name', ['mapId']);
that.convertField(elem, that.stationList, 'code', 'name', ['stationCode']);
that.convertField(elem, that.signalList, 'code', 'uniqueName', ['startSignalCode', 'endSignalCode']);
});

View File

@ -120,15 +120,21 @@ export default {
props: {
selected: {
type: Object,
required: true
default() {
return null;
}
},
mapInfo: {
type: Object,
required: true
default() {
return null;
}
},
routeData: {
type: Object,
required: true
default() {
return null;
}
},
cardHeight: {
type: Number || String,

View File

@ -32,7 +32,9 @@ export default {
props: {
mapInfo: {
type: Object,
required: true
default() {
return null;
}
}
},
data() {
@ -50,11 +52,8 @@ export default {
labelWidth: '120px',
queryObject: {
name: {
type: 'select',
label: '进路名称',
config: {
data: []
}
type: 'text',
label: '进路名称'
},
stationCode: {
type: 'select',
@ -306,16 +305,14 @@ export default {
if (data && data.list) {
const that = this;
const list = data.list;
const nameList = this.queryForm.queryObject.name.config.data = [];
if (list) {
list.map(elem => {
nameList.push({ label: elem.name, value: elem.name });
that.convertField(elem, that.RouteAutoTypeList, 'code', 'name', ['autoType']);
that.convertField(elem, that.RouteNatureTypeList, 'code', 'name', ['natureType']);
that.convertField(elem, that.SwitchLocateTypeList, 'code', 'name', ['overlapSwitchLocateType']);
that.convertField(elem, that.mapList, 'id', 'name', ['mapId']);
that.convertField(elem, that.switchList, 'code', 'name', ['routeOverlapSwitchList']);
that.convertField(elem, that.signalList, 'code', 'uniqueName', ['startSignalCode', 'endSignalCode']);
that.convertField(elem, that.signalList, 'code', 'name', ['startSignalCode', 'endSignalCode']);
that.convertField(elem, that.stationList, 'code', 'name', ['stationCode']);
that.convertField(elem, that.sectionList, 'code', 'name', ['nearSectionCode', 'autoTriggerSectionCode', 'turnBackSectionCode']);
});

View File

@ -43,11 +43,15 @@ export default {
props: {
mapInfo: {
type: Object,
required: true
default() {
return null;
}
},
selected: {
type: Object,
required: true
default() {
return null;
}
},
cardHeight: {
type: Number || String,

View File

@ -35,7 +35,9 @@ export default {
props: {
mapInfo: {
type: Object,
required: true
default() {
return null;
}
}
},
data() {

View File

@ -36,7 +36,9 @@ export default {
props: {
mapInfo: {
type: Object,
required: true
default() {
return null;
}
}
},
data() {

View File

@ -341,15 +341,21 @@ export default {
props: {
selected: {
type: Object,
required: true
default() {
return null;
}
},
mapInfo: {
type: Object,
required: true
default() {
return null;
}
},
routeData: {
type: Object,
required: true
default() {
return null;
}
},
cardHeight: {
type: Number || String,

View File

@ -26,7 +26,9 @@ export default {
props: {
mapInfo: {
type: Object,
required: true
default() {
return null;
}
}
},
data() {

View File

@ -42,11 +42,15 @@ export default {
props: {
mapInfo: {
type: Object,
required: true
default() {
return null;
}
},
selected: {
type: Object,
required: true
default() {
return null;
}
},
cardHeight: {
type: Number || String,

View File

@ -35,7 +35,9 @@ export default {
props: {
mapInfo: {
type: Object,
required: true
default() {
return null;
}
}
},
data() {

View File

@ -160,15 +160,21 @@ export default {
props: {
selected: {
type: Object,
required: true
default() {
return null;
}
},
mapInfo: {
type: Object,
required: true
default() {
return null;
}
},
routeData: {
type: Object,
required: true
default() {
return null;
}
},
cardHeight: {
type: Number || String,

View File

@ -21,7 +21,9 @@ export default {
props: {
mapInfo: {
type: Object,
required: true
default() {
return null;
}
}
},
data() {

View File

@ -40,11 +40,15 @@ export default {
props: {
mapInfo: {
type: Object,
required: true
default() {
return null;
}
},
selected: {
type: Object,
required: true
default() {
return null;
}
},
cardHeight: {
type: Number || String,

View File

@ -47,15 +47,21 @@ export default {
props: {
selected: {
type: Object,
required: true
default() {
return null;
}
},
mapInfo: {
type: Object,
required: true
default() {
return null;
}
},
routeData: {
type: Object,
required: true
default() {
return null;
}
},
cardHeight: {
type: Number || String,