公里标系统放开填写

This commit is contained in:
fan 2023-10-19 10:36:00 +08:00
parent 10f25f4d18
commit 1dad042c62
11 changed files with 38 additions and 144 deletions

View File

@ -51,7 +51,6 @@ import DraggableDialog from 'src/components/common/DraggableDialog.vue';
import { QTable, useQuasar } from 'quasar'; import { QTable, useQuasar } from 'quasar';
import { errorNotify, successNotify } from 'src/utils/CommonNotify'; import { errorNotify, successNotify } from 'src/utils/CommonNotify';
import { import {
CoordinateSystemOptions,
deleteKilometerConvert, deleteKilometerConvert,
loadKilometerConvertList, loadKilometerConvertList,
sameTrendOptions, sameTrendOptions,
@ -160,15 +159,7 @@ function getSameTrendName(row: graphicData.KilometerConvert) {
} }
function getKMName(km: KilometerSystem) { function getKMName(km: KilometerSystem) {
let nameArr = []; return km.coordinateSystem + '_' + km.kilometer;
const findCoordinate = CoordinateSystemOptions.find((item) => {
return item.value == km.coordinateSystem;
});
if (findCoordinate) {
nameArr.push(findCoordinate.label);
}
nameArr.push(km.kilometer);
return nameArr.join('_');
} }
</script> </script>

View File

@ -22,16 +22,13 @@
<q-list bordered separator class="rounded-borders"> <q-list bordered separator class="rounded-borders">
<q-item no-wrap class="q-gutter-y-sm column"> <q-item no-wrap class="q-gutter-y-sm column">
<div>公里标配置</div> <div>公里标配置</div>
<q-select <q-input
outlined outlined
style="margin-top: 10px" style="margin-top: 10px"
v-model="axleCountingModel.kilometerSystem.coordinateSystem" v-model="axleCountingModel.kilometerSystem.coordinateSystem"
:options="CoordinateSystemOptions" @blur="onUpdate"
:map-options="true"
:emit-value="true"
@update:model-value="onUpdate"
label="坐标系" label="坐标系"
></q-select> ></q-input>
<q-input <q-input
outlined outlined
style="margin-top: 10px" style="margin-top: 10px"
@ -138,12 +135,6 @@ const { data: axleCountingModel, onUpdate } = useFormData(
new AxleCountingData(), new AxleCountingData(),
drawStore.getDrawApp() drawStore.getDrawApp()
); );
const CoordinateSystemOptions = [
{ label: '车辆段', value: 'DEPOT' },
{ label: '停车场', value: 'PARKING_LOT' },
{ label: '正线', value: 'MAIN_LINE' },
{ label: '换线', value: 'TRANSFER' },
];
const directionOptions = [ const directionOptions = [
{ label: '左行', value: 0 }, { label: '左行', value: 0 },

View File

@ -10,12 +10,6 @@ const { data: kiloMarkerModel, onUpdate } = useFormData(
drawStore.getDrawApp() drawStore.getDrawApp()
); );
const CoordinateSystemOptions = [
{ label: '车辆段', value: 'DEPOT' },
{ label: '停车场', value: 'PARKING_LOT' },
{ label: '正线', value: 'MAIN_LINE' },
{ label: '换线', value: 'TRANSFER' },
];
const directionOptions = [ const directionOptions = [
{ label: '左行', value: 0 }, { label: '左行', value: 0 },
{ label: '右行', value: 1 }, { label: '右行', value: 1 },
@ -28,15 +22,12 @@ const directionOptions = [
<q-list bordered separator class="rounded-borders"> <q-list bordered separator class="rounded-borders">
<q-item no-wrap class="q-gutter-y-sm column"> <q-item no-wrap class="q-gutter-y-sm column">
<div>公里标配置</div> <div>公里标配置</div>
<q-select <q-input
outlined outlined
v-model="kiloMarkerModel.kilometerSystem[0].coordinateSystem" v-model="kiloMarkerModel.kilometerSystem[0].coordinateSystem"
:options="CoordinateSystemOptions" @blur="onUpdate"
:map-options="true"
:emit-value="true"
@update:model-value="onUpdate"
label="坐标系" label="坐标系"
></q-select> ></q-input>
<q-input <q-input
outlined outlined
v-model.number="kiloMarkerModel.kilometerSystem[0].kilometer" v-model.number="kiloMarkerModel.kilometerSystem[0].kilometer"
@ -58,16 +49,13 @@ const directionOptions = [
<q-list bordered separator class="rounded-borders"> <q-list bordered separator class="rounded-borders">
<q-item no-wrap class="q-gutter-y-sm column"> <q-item no-wrap class="q-gutter-y-sm column">
<div>公里标配置</div> <div>公里标配置</div>
<q-select <q-input
outlined outlined
class="q-mt-lg" class="q-mt-lg"
v-model="kiloMarkerModel.kilometerSystem[1].coordinateSystem" v-model="kiloMarkerModel.kilometerSystem[1].coordinateSystem"
:options="CoordinateSystemOptions" @blur="onUpdate"
:map-options="true"
:emit-value="true"
@update:model-value="onUpdate"
label="坐标系" label="坐标系"
></q-select> ></q-input>
<q-input <q-input
outlined outlined
v-model.number="kiloMarkerModel.kilometerSystem[1].kilometer" v-model.number="kiloMarkerModel.kilometerSystem[1].kilometer"

View File

@ -15,14 +15,11 @@
<div class="text-subtitle1">坐标A</div> <div class="text-subtitle1">坐标A</div>
</q-card-section> </q-card-section>
<q-item-section no-wrap class="q-gutter-y-sm column"> <q-item-section no-wrap class="q-gutter-y-sm column">
<q-select <q-input
style="margin-top: 10px" style="margin-top: 10px"
v-model="data.kmA.coordinateSystem" v-model="data.kmA.coordinateSystem"
:options="CoordinateSystemOptions"
:map-options="true"
:emit-value="true"
label="坐标系" label="坐标系"
></q-select> ></q-input>
<q-input <q-input
style="margin-top: 10px" style="margin-top: 10px"
v-model.number="data.kmA.kilometer" v-model.number="data.kmA.kilometer"
@ -36,14 +33,11 @@
<div class="text-subtitle1">坐标B</div> <div class="text-subtitle1">坐标B</div>
</q-card-section> </q-card-section>
<q-item-section no-wrap class="q-gutter-y-sm column"> <q-item-section no-wrap class="q-gutter-y-sm column">
<q-select <q-input
style="margin-top: 10px" style="margin-top: 10px"
v-model="data.kmB.coordinateSystem" v-model="data.kmB.coordinateSystem"
:options="CoordinateSystemOptions"
:map-options="true"
:emit-value="true"
label="坐标系" label="坐标系"
></q-select> ></q-input>
<q-input <q-input
style="margin-top: 10px" style="margin-top: 10px"
v-model.number="data.kmB.kilometer" v-model.number="data.kmB.kilometer"
@ -86,7 +80,6 @@ import {
creatKilometerConvert, creatKilometerConvert,
editKilometerConvert, editKilometerConvert,
sameTrendOptions, sameTrendOptions,
CoordinateSystemOptions,
loadKilometerConvertList, loadKilometerConvertList,
} from 'src/drawApp/commonApp'; } from 'src/drawApp/commonApp';
import { useDrawStore } from 'src/stores/draw-store'; import { useDrawStore } from 'src/stores/draw-store';

View File

@ -18,16 +18,13 @@
<q-list bordered separator class="rounded-borders"> <q-list bordered separator class="rounded-borders">
<q-item no-wrap class="q-gutter-y-sm column"> <q-item no-wrap class="q-gutter-y-sm column">
<div>公里标配置</div> <div>公里标配置</div>
<q-select <q-input
outlined outlined
class="q-mt-sm" class="q-mt-sm"
v-model="signalModel.kilometerSystem.coordinateSystem" v-model="signalModel.kilometerSystem.coordinateSystem"
:options="CoordinateSystemOptions" @blur="onUpdate"
:map-options="true"
:emit-value="true"
@update:model-value="onUpdate"
label="坐标系" label="坐标系"
></q-select> ></q-input>
<q-select <q-select
outlined outlined
class="q-mt-sm" class="q-mt-sm"
@ -136,12 +133,6 @@ const DevicePortOptions = [
{ label: 'B端', value: graphicData.RelatedRef.DevicePort.B }, { label: 'B端', value: graphicData.RelatedRef.DevicePort.B },
{ label: 'C端', value: graphicData.RelatedRef.DevicePort.C }, { label: 'C端', value: graphicData.RelatedRef.DevicePort.C },
]; ];
const CoordinateSystemOptions = [
{ label: '车辆段', value: 'DEPOT' },
{ label: '停车场', value: 'PARKING_LOT' },
{ label: '正线', value: 'MAIN_LINE' },
{ label: '换线', value: 'TRANSFER' },
];
const directionOptions = [ const directionOptions = [
{ label: '左行', value: 0 }, { label: '左行', value: 0 },
{ label: '右行', value: 1 }, { label: '右行', value: 1 },

View File

@ -10,12 +10,6 @@ const { data: kiloMarkerModel, onUpdate } = useFormData(
drawStore.getDrawApp() drawStore.getDrawApp()
); );
const CoordinateSystemOptions = [
{ label: '车辆段', value: 'DEPOT' },
{ label: '停车场', value: 'PARKING_LOT' },
{ label: '正线', value: 'MAIN_LINE' },
{ label: '换线', value: 'TRANSFER' },
];
const directionOptions = [ const directionOptions = [
{ label: '左行', value: 0 }, { label: '左行', value: 0 },
{ label: '右行', value: 1 }, { label: '右行', value: 1 },
@ -28,15 +22,12 @@ const directionOptions = [
<q-list bordered separator class="rounded-borders"> <q-list bordered separator class="rounded-borders">
<q-item no-wrap class="q-gutter-y-sm column"> <q-item no-wrap class="q-gutter-y-sm column">
<div>公里标配置</div> <div>公里标配置</div>
<QSelect <q-input
outlined outlined
v-model="kiloMarkerModel.kilometerSystem[0].coordinateSystem" v-model="kiloMarkerModel.kilometerSystem[0].coordinateSystem"
:options="CoordinateSystemOptions" @blur="onUpdate"
:map-options="true"
:emit-value="true"
@update:model-value="onUpdate"
label="坐标系" label="坐标系"
></QSelect> ></q-input>
<QInput <QInput
outlined outlined
v-model.number="kiloMarkerModel.kilometerSystem[0].kilometer" v-model.number="kiloMarkerModel.kilometerSystem[0].kilometer"
@ -58,16 +49,13 @@ const directionOptions = [
<q-list bordered separator class="rounded-borders"> <q-list bordered separator class="rounded-borders">
<q-item no-wrap class="q-gutter-y-sm column"> <q-item no-wrap class="q-gutter-y-sm column">
<div>公里标配置</div> <div>公里标配置</div>
<QSelect <q-input
outlined outlined
class="q-mt-lg" class="q-mt-lg"
v-model="kiloMarkerModel.kilometerSystem[1].coordinateSystem" v-model="kiloMarkerModel.kilometerSystem[1].coordinateSystem"
:options="CoordinateSystemOptions" @blur="onUpdate"
:map-options="true"
:emit-value="true"
@update:model-value="onUpdate"
label="坐标系" label="坐标系"
></QSelect> ></q-input>
<QInput <QInput
outlined outlined
v-model.number="kiloMarkerModel.kilometerSystem[1].kilometer" v-model.number="kiloMarkerModel.kilometerSystem[1].kilometer"

View File

@ -21,16 +21,13 @@
<q-item no-wrap class="q-gutter-y-sm column"> <q-item no-wrap class="q-gutter-y-sm column">
<template v-if="stationModel.kilometerSystem"> <template v-if="stationModel.kilometerSystem">
<div>公里标配置</div> <div>公里标配置</div>
<q-select <q-input
outlined outlined
class="q-mt-md" class="q-mt-md"
v-model="stationModel.kilometerSystem.coordinateSystem" v-model="stationModel.kilometerSystem.coordinateSystem"
:options="CoordinateSystemOptions" @blur="onUpdate"
:map-options="true"
:emit-value="true"
@update:model-value="onUpdate"
label="坐标系" label="坐标系"
></q-select> ></q-input>
<q-input <q-input
outlined outlined
class="q-mt-md" class="q-mt-md"
@ -98,13 +95,6 @@ const optionsControl = [
{ label: '否', value: false }, { label: '否', value: false },
]; ];
const CoordinateSystemOptions = [
{ label: '车辆段', value: 'DEPOT' },
{ label: '停车场', value: 'PARKING_LOT' },
{ label: '正线', value: 'MAIN_LINE' },
{ label: '换线', value: 'TRANSFER' },
];
const directionOptions = [ const directionOptions = [
{ label: '左行', value: 0 }, { label: '左行', value: 0 },
{ label: '右行', value: 1 }, { label: '右行', value: 1 },

View File

@ -22,16 +22,13 @@
<q-item no-wrap class="q-gutter-y-sm column"> <q-item no-wrap class="q-gutter-y-sm column">
<template v-if="stopPositionModel.kilometerSystem"> <template v-if="stopPositionModel.kilometerSystem">
<div>公里标配置</div> <div>公里标配置</div>
<q-select <q-input
outlined outlined
class="q-mt-md" class="q-mt-md"
v-model="stopPositionModel.kilometerSystem.coordinateSystem" v-model="stopPositionModel.kilometerSystem.coordinateSystem"
:options="CoordinateSystemOptions" @blur="onUpdate"
:map-options="true"
:emit-value="true"
@update:model-value="onUpdate"
label="坐标系" label="坐标系"
></q-select> ></q-input>
<q-select <q-select
outlined outlined
class="q-mt-md" class="q-mt-md"
@ -81,12 +78,6 @@ const { data: stopPositionModel, onUpdate } = useFormData(
drawStore.getDrawApp() drawStore.getDrawApp()
); );
const sectionList: { label: string; value: string }[] = reactive([]); const sectionList: { label: string; value: string }[] = reactive([]);
const CoordinateSystemOptions = [
{ label: '车辆段', value: 'DEPOT' },
{ label: '停车场', value: 'PARKING_LOT' },
{ label: '正线', value: 'MAIN_LINE' },
{ label: '换线', value: 'TRANSFER' },
];
const directionOptions = [ const directionOptions = [
{ label: '左行', value: 0 }, { label: '左行', value: 0 },
{ label: '右行', value: 1 }, { label: '右行', value: 1 },

View File

@ -19,16 +19,13 @@
<q-item no-wrap class="q-gutter-y-sm column"> <q-item no-wrap class="q-gutter-y-sm column">
<template v-if="transponderModel.kilometerSystem"> <template v-if="transponderModel.kilometerSystem">
<div>公里标配置</div> <div>公里标配置</div>
<q-select <q-input
outlined outlined
class="q-mt-md" class="q-mt-md"
v-model="transponderModel.kilometerSystem.coordinateSystem" v-model="transponderModel.kilometerSystem.coordinateSystem"
:options="CoordinateSystemOptions" @blur="onUpdate"
:map-options="true"
:emit-value="true"
@update:model-value="onUpdate"
label="坐标系" label="坐标系"
></q-select> ></q-input>
<q-input <q-input
outlined outlined
class="q-mt-md" class="q-mt-md"
@ -129,13 +126,6 @@ const typeOptions = [
{ label: '预告应答器', value: transponderTypeEnum.IB }, { label: '预告应答器', value: transponderTypeEnum.IB },
]; ];
const CoordinateSystemOptions = [
{ label: '车辆段', value: 'DEPOT' },
{ label: '停车场', value: 'PARKING_LOT' },
{ label: '正线', value: 'MAIN_LINE' },
{ label: '换线', value: 'TRANSFER' },
];
const directionOptions = [ const directionOptions = [
{ label: '左行', value: 0 }, { label: '左行', value: 0 },
{ label: '右行', value: 1 }, { label: '右行', value: 1 },

View File

@ -18,16 +18,13 @@
<q-list bordered separator class="rounded-borders"> <q-list bordered separator class="rounded-borders">
<q-item no-wrap class="q-gutter-y-sm column"> <q-item no-wrap class="q-gutter-y-sm column">
<div>公里标配置</div> <div>公里标配置</div>
<q-select <q-input
outlined outlined
class="q-mt-sm" class="q-mt-sm"
v-model="turnoutModel.kilometerSystem[0].coordinateSystem" v-model="turnoutModel.kilometerSystem[0].coordinateSystem"
:options="CoordinateSystemOptions" @blur="onUpdate"
:map-options="true"
:emit-value="true"
@update:model-value="onUpdate"
label="坐标系" label="坐标系"
></q-select> ></q-input>
<q-input <q-input
outlined outlined
class="q-mt-sm" class="q-mt-sm"
@ -51,16 +48,13 @@
<q-list bordered separator class="rounded-borders"> <q-list bordered separator class="rounded-borders">
<q-item no-wrap class="q-gutter-y-sm column"> <q-item no-wrap class="q-gutter-y-sm column">
<div>公里标配置</div> <div>公里标配置</div>
<q-select <q-input
outlined outlined
class="q-mt-sm" class="q-mt-sm"
v-model="turnoutModel.kilometerSystem[1].coordinateSystem" v-model="turnoutModel.kilometerSystem[1].coordinateSystem"
:options="CoordinateSystemOptions" @blur="onUpdate"
:map-options="true"
:emit-value="true"
@update:model-value="onUpdate"
label="坐标系" label="坐标系"
></q-select> ></q-input>
<q-input <q-input
outlined outlined
class="q-mt-sm" class="q-mt-sm"
@ -145,12 +139,6 @@ import { useFormData } from 'src/components/DrawAppFormUtils';
const drawStore = useDrawStore(); const drawStore = useDrawStore();
const $q = useQuasar(); const $q = useQuasar();
const CoordinateSystemOptions = [
{ label: '车辆段', value: 'DEPOT' },
{ label: '停车场', value: 'PARKING_LOT' },
{ label: '正线', value: 'MAIN_LINE' },
{ label: '换线', value: 'TRANSFER' },
];
const { data: turnoutModel, onUpdate } = useFormData( const { data: turnoutModel, onUpdate } = useFormData(
new TurnoutData(), new TurnoutData(),

View File

@ -454,13 +454,6 @@ export const sameTrendOptions = [
{ label: '相反', value: false }, { label: '相反', value: false },
{ label: '相同', value: true }, { label: '相同', value: true },
]; ];
// 公里标-坐标系
export const CoordinateSystemOptions = [
{ label: '车辆段', value: 'DEPOT' },
{ label: '停车场', value: 'PARKING_LOT' },
{ label: '正线', value: 'MAIN_LINE' },
{ label: '换线', value: 'TRANSFER' },
];
// 公里标-方向 // 公里标-方向
export const directionOptions = [ export const directionOptions = [
{ label: '左行', value: 0 }, { label: '左行', value: 0 },