joylink/rts-sim-testing-client
6
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

列车轮径调整

Browse Source
This commit is contained in:
dong 2023-11-13 15:08:32 +08:00
parent f81ef0204e
commit 440e2c096e
5 changed files with 156 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/components/draw-app/dialogs/AddTrainDialog.vue
View File

@ -16,7 +16,7 @@
type="number" type="number"
dense dense
outlined outlined
:label="`列车偏移(mm)[长度${props.kmLength}mm]`" :label="`列车偏移(mm)【长度${props.kmLength}mm】`"
:max="kmLength" :max="kmLength"
:min="0" :min="0"
v-model.number="offset" v-model.number="offset"
@ -41,6 +41,17 @@
:options="lengthOptions" :options="lengthOptions"
> >
</q-select> </q-select>
<q-input
type="number"
dense
outlined
label="列车轮径(mm)【长度770-840mm】"
:max="840"
:min="770"
v-model.number="wheelDiameter"
lazy-rules
:rules="wheelDiameterRules"
/>
<q-card-actions align="right" class="text-primary"> <q-card-actions align="right" class="text-primary">
<q-btn flat label="取消" @click="onDialogCancel" v-close-popup /> <q-btn flat label="取消" @click="onDialogCancel" v-close-popup />
<q-btn flat label="确认" type="submit" /> <q-btn flat label="确认" type="submit" />
@ -68,6 +79,10 @@ const props = defineProps({
type: Number, type: Number,
required: true, required: true,
}, },
wDiameter: {
type: Number,
default: 800,
},
}); });
const dir = ref(1); const dir = ref(1);
const offset = ref(0); const offset = ref(0);
@ -94,6 +109,7 @@ onMounted(() => {
if (mapId) { if (mapId) {
getLengthOption(mapId); getLengthOption(mapId);
} }
wheelDiameter.value = props.wDiameter;
}); });
function getLengthOption(mapId: number) { function getLengthOption(mapId: number) {
@ -117,9 +133,16 @@ function onCreate() {
dir: dir.value, dir: dir.value,
offset: offset.value, offset: offset.value,
trainLength: trainLength.value, trainLength: trainLength.value,
wheelDiameter: wheelDiameter.value,
}); });
} }
}); });
} }
const wheelDiameter = ref(800);
const wheelDiameterRules = [
(val: string) => (val !== null && val !== '') || '偏移量不能为空！',
(val: number) => (val >= 770 && val <= 840) || '列车轮径在770到840mm之间！',
];
</script> </script>
<style scoped></style> <style scoped></style>

12
src/drawApp/graphics/SectionInteraction.ts
View File

@ -252,13 +252,20 @@ export class SectionOperateInteraction extends GraphicInteractionPlugin<Section>
componentProps: { dev: section, kmLength: d }, componentProps: { dev: section, kmLength: d },
cancel: true, cancel: true,
persistent: true, persistent: true,
}).onOk((data: { offset: number; dir: 1 | 0; trainLength: string }) => { }).onOk(
(data: {
offset: number;
dir: 1 | 0;
trainLength: string;
wheelDiameter: number;
}) => {
const params = { const params = {
simulationId, simulationId,
mapId, mapId,
up: !!data.dir, up: !!data.dir,
id: section.datas.id, id: section.datas.id,
headOffset: data.offset, headOffset: data.offset,
wheelDiameter: data.wheelDiameter,
}; };
if (data.trainLength) { if (data.trainLength) {
Object.assign(params, { trainLength: +data.trainLength }); Object.assign(params, { trainLength: +data.trainLength });
@ -274,7 +281,8 @@ export class SectionOperateInteraction extends GraphicInteractionPlugin<Section>
message: `添加列车失败！: ${error.title}`, message: `添加列车失败！: ${error.title}`,
}); });
}); });
}); }
);
}; };
SectionOperateMenu.open(e.global); SectionOperateMenu.open(e.global);
} }

12
src/drawApp/graphics/TurnoutInteraction.ts
View File

@ -151,7 +151,13 @@ export class TurnoutOperationPlugin extends GraphicInteractionPlugin<Turnout> {
componentProps: { dev: turnout, kmLength: d }, componentProps: { dev: turnout, kmLength: d },
cancel: true, cancel: true,
persistent: true, persistent: true,
}).onOk((data: { offset: number; dir: 1 | 0; trainLength: string }) => { }).onOk(
(data: {
offset: number;
dir: 1 | 0;
trainLength: string;
wheelDiameter: number;
}) => {
const params = { const params = {
simulationId, simulationId,
mapId, mapId,
@ -159,6 +165,7 @@ export class TurnoutOperationPlugin extends GraphicInteractionPlugin<Turnout> {
id: turnout.datas.id, id: turnout.datas.id,
devicePort: port, devicePort: port,
headOffset: data.offset, headOffset: data.offset,
wheelDiameter: data.wheelDiameter,
}; };
if (data.trainLength) { if (data.trainLength) {
Object.assign(params, { trainLength: +data.trainLength }); Object.assign(params, { trainLength: +data.trainLength });
@ -174,7 +181,8 @@ export class TurnoutOperationPlugin extends GraphicInteractionPlugin<Turnout> {
message: `添加列车失败！: ${error.title}`, message: `添加列车失败！: ${error.title}`,
}); });
}); });
}); }
);
}; };
TurnoutOperationMenu.open(e.global); TurnoutOperationMenu.open(e.global);
} }

96
src/pages/TrainWheelPage.vue
View File

@ -66,14 +66,14 @@
<div class="text-h6"> <div class="text-h6">
{{ wheelEditInfo.id ? '编辑轮径' : '新建轮径' }} {{ wheelEditInfo.id ? '编辑轮径' : '新建轮径' }}
</div> </div>
<q-input <!-- <q-input
outlined outlined
label="轮径名称" label="轮径名称"
v-model="wheelEditInfo.name" v-model="wheelEditInfo.name"
lazy-rules lazy-rules
:rules="[(val) => val.length > 0 || '请输入名称！']" :rules="[(val) => val.length > 0 || '请输入名称！']"
/> /> -->
<q-input <!-- <q-input
outlined outlined
label="轮径安装轴位" label="轮径安装轴位"
v-model.number="wheelEditInfo.axial_position" v-model.number="wheelEditInfo.axial_position"
@ -99,7 +99,7 @@
label="安装方向" label="安装方向"
lazy-rules lazy-rules
:rules="[(val) => val.length > 0 || '请输入左侧或者右侧！']" :rules="[(val) => val.length > 0 || '请输入左侧或者右侧！']"
></q-select> ></q-select> -->
<q-input <q-input
outlined outlined
@ -160,53 +160,53 @@ onMounted(() => {
wheelTableRef.value.requestServerInteraction(); wheelTableRef.value.requestServerInteraction();
}); });
const directionOptions = [ // const directionOptions = [
{ label: '左侧', value: 'LEFT' }, // { label: '左侧', value: 'LEFT' },
{ label: '右侧', value: 'RIGHT' }, // { label: '右侧', value: 'RIGHT' },
]; // ];
function getDirectionName(val: string) { // function getDirectionName(val: string) {
let n = ''; // let n = '';
if (val) { // if (val) {
const find = directionOptions.find((item) => { // const find = directionOptions.find((item) => {
return item.value == val; // return item.value == val;
}); // });
n = find ? find.label : ''; // n = find ? find.label : '';
} // }
return n; // return n;
} // }
// 轮径 // 轮径
const wheelColumnDefs: QTableColumn[] = [ const wheelColumnDefs: QTableColumn[] = [
{ // {
name: 'name', // name: 'name',
label: '名称', // label: '名称',
field: 'name', // field: 'name',
required: true, // required: true,
align: 'center', // align: 'center',
}, // },
{ // {
name: 'axial_position', // name: 'axial_position',
label: '安装轴位', // label: '安装轴位',
field: 'axial_position', // field: 'axial_position',
required: true, // required: true,
align: 'center', // align: 'center',
}, // },
{ // {
name: 'diameter', // name: 'diameter',
label: '车轮直径(mm)', // label: '车轮直径(mm)',
field: 'diameter', // field: 'diameter',
required: true, // required: true,
align: 'center', // align: 'center',
}, // },
{ // {
name: 'install_direction', // name: 'install_direction',
label: '安装方向', // label: '安装方向',
field: (row) => { // field: (row) => {
return getDirectionName(row.install_direction); // return getDirectionName(row.install_direction);
}, // },
required: true, // required: true,
align: 'center', // align: 'center',
}, // },
{ {
name: 'max_diameter', name: 'max_diameter',
label: '车轮的最大直径(mm)', label: '车轮的最大直径(mm)',

23
src/protos/device_state.ts
View File

@ -1015,6 +1015,7 @@ export namespace state {
vobcState?: TrainVobcState; vobcState?: TrainVobcState;
trainKilometer?: number; trainKilometer?: number;
controlDelayTime?: number; controlDelayTime?: number;
wheelDiameter?: number;
}) { }) {
super(); super();
pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls); pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls);
@ -1064,6 +1065,9 @@ export namespace state {
if ("controlDelayTime" in data && data.controlDelayTime != undefined) { if ("controlDelayTime" in data && data.controlDelayTime != undefined) {
this.controlDelayTime = data.controlDelayTime; this.controlDelayTime = data.controlDelayTime;
} }
if ("wheelDiameter" in data && data.wheelDiameter != undefined) {
this.wheelDiameter = data.wheelDiameter;
}
} }
} }
get id() { get id() {
@ -1162,6 +1166,12 @@ export namespace state {
set controlDelayTime(value: number) { set controlDelayTime(value: number) {
pb_1.Message.setField(this, 15, value); pb_1.Message.setField(this, 15, value);
} }
get wheelDiameter() {
return pb_1.Message.getFieldWithDefault(this, 16, 0) as number;
}
set wheelDiameter(value: number) {
pb_1.Message.setField(this, 16, value);
}
static fromObject(data: { static fromObject(data: {
id?: string; id?: string;
up?: boolean; up?: boolean;
@ -1178,6 +1188,7 @@ export namespace state {
vobcState?: ReturnType<typeof TrainVobcState.prototype.toObject>; vobcState?: ReturnType<typeof TrainVobcState.prototype.toObject>;
trainKilometer?: number; trainKilometer?: number;
controlDelayTime?: number; controlDelayTime?: number;
wheelDiameter?: number;
}): TrainState { }): TrainState {
const message = new TrainState({}); const message = new TrainState({});
if (data.id != null) { if (data.id != null) {
@ -1225,6 +1236,9 @@ export namespace state {
if (data.controlDelayTime != null) { if (data.controlDelayTime != null) {
message.controlDelayTime = data.controlDelayTime; message.controlDelayTime = data.controlDelayTime;
} }
if (data.wheelDiameter != null) {
message.wheelDiameter = data.wheelDiameter;
}
return message; return message;
} }
toObject() { toObject() {
@ -1244,6 +1258,7 @@ export namespace state {
vobcState?: ReturnType<typeof TrainVobcState.prototype.toObject>; vobcState?: ReturnType<typeof TrainVobcState.prototype.toObject>;
trainKilometer?: number; trainKilometer?: number;
controlDelayTime?: number; controlDelayTime?: number;
wheelDiameter?: number;
} = {}; } = {};
if (this.id != null) { if (this.id != null) {
data.id = this.id; data.id = this.id;
@ -1290,6 +1305,9 @@ export namespace state {
if (this.controlDelayTime != null) { if (this.controlDelayTime != null) {
data.controlDelayTime = this.controlDelayTime; data.controlDelayTime = this.controlDelayTime;
} }
if (this.wheelDiameter != null) {
data.wheelDiameter = this.wheelDiameter;
}
return data; return data;
} }
serialize(): Uint8Array; serialize(): Uint8Array;
@ -1326,6 +1344,8 @@ export namespace state {
writer.writeInt64(14, this.trainKilometer); writer.writeInt64(14, this.trainKilometer);
if (this.controlDelayTime != 0) if (this.controlDelayTime != 0)
writer.writeInt64(15, this.controlDelayTime); writer.writeInt64(15, this.controlDelayTime);
if (this.wheelDiameter != 0)
writer.writeInt32(16, this.wheelDiameter);
if (!w) if (!w)
return writer.getResultBuffer(); return writer.getResultBuffer();
} }
@ -1380,6 +1400,9 @@ export namespace state {
case 15: case 15:
message.controlDelayTime = reader.readInt64(); message.controlDelayTime = reader.readInt64();
break; break;
case 16:
message.wheelDiameter = reader.readInt32();
break;
default: reader.skipField(); default: reader.skipField();
} }
} }