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

取消lossState状态&防淹门调整

Browse Source
This commit is contained in:
joylink_fanyuhong 2024-03-29 17:29:01 +08:00
parent 8e8b0fc42d
commit 9c9a4b4ccf
10 changed files with 11 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rts-sim-testing-message

@ -1 +1 @@
Subproject commit a191e82832ec4182bfee3f7920d011ad318aaafe
Subproject commit f566f96c40882d7691c57de3f5c9989cde85b82c

6
src/components/line-app/StateProperties.vue
View File

@ -31,9 +31,9 @@
<garage-door-state
v-else-if="lineStore.selectedGraphicType === GarageDoor.Type"
></garage-door-state>
<flood-gate-property
<flood-gate-state
v-else-if="lineStore.selectedGraphicType === FloodGate.Type"
></flood-gate-property>
></flood-gate-state>
</div>
</q-scroll-area>
</template>
@ -65,7 +65,7 @@ import { Transponder } from 'src/graphics/transponder/Transponder';
import { GarageDoor } from 'src/graphics/garageDoor/GarageDoor';
import GarageDoorState from './states/GarageDoorState.vue';
import { FloodGate } from 'src/graphics/floodGate/FloodGate';
import FloodGateProperty from '../draw-app/properties/FloodGateProperty.vue';
import FloodGateState from './states/FloodGateState.vue';
const lineStore = useLineStore();
</script>

2
src/components/line-app/states/FloodGateState.vue
View File

@ -83,7 +83,6 @@ const list: KeyType[] = [
{ label: '防淹门索引', key: 'id' },
{ label: '防淹门名称', key: 'code', formatFn: getNameFormat },
{ label: '防淹门关闭', key: 'mgj', formatFn: getName },
// { label: '状态丢失', key: 'stateLoss', formatFn: getName },
{ label: '防淹门强制', key: 'param', formatFn: getForceName },
{ label: '设置故障', key: 'param', formatFn: getFaultName },
];
@ -105,6 +104,7 @@ watch(
);
onMounted(() => {
console.log('1111111111');
if (lineStore.selectedGraphics) {
initFloodGateState(lineStore.selectedGraphics[0] as FloodGate);
}

2
src/configs/UrlManage.ts
View File

@ -9,7 +9,7 @@ function getHost(): string {
// return '192.168.3.7:9091';
// return '192.168.3.47:9091';
// return '192.168.3.37:9091';
// return '192.168.33.207:9091'; // 张骞
return '192.168.33.207:9091'; // 张骞
// return '192.168.33.93:9091';
// return '192.168.3.37:9091'; //卫志宏
// return 'test.joylink.club/bjrtsts-service'; // 测试

7
src/drawApp/graphics/FloodGateInteraction.ts
View File

@ -102,13 +102,6 @@ export class FloodGateState
set mgj(v: boolean) {
this.states.mgj = v;
}
get stateLoss(): boolean {
//状态丢失
return this.states.stateLoss;
}
set stateLoss(v: boolean) {
this.states.stateLoss = v;
}
get param(): request.CkmParam {
return this.states.param;
}

7
src/drawApp/graphics/GarageDoorInteraction.ts
View File

@ -102,13 +102,6 @@ export class GarageDoorState
set mgj(v: boolean) {
this.states.mgj = v;
}
get stateLoss(): boolean {
//状态丢失
return this.states.stateLoss;
}
set stateLoss(v: boolean) {
this.states.stateLoss = v;
}
get param(): request.CkmParam {
return this.states.param;
}

5
src/drawApp/lineScene.ts
View File

@ -459,6 +459,11 @@ function handleSubscribe(lineScene: IGraphicScene) {
states.push(new GarageDoorState(item));
}
});
storage.allStatus.fymStates.forEach((item) => {
if (item.id) {
states.push(new FloodGateState(item));
}
});
storage.allStatus.trainState.forEach((item) => {
// 列车
if (!item.show) {

2
src/graphics/floodGate/FloodGate.ts
View File

@ -31,8 +31,6 @@ export interface IFloodGateState extends GraphicState {
set mgj(v: boolean);
get param(): request.CkmParam;
set param(v: request.CkmParam);
get stateLoss(): boolean; //状态丢失
set stateLoss(v: boolean);
}
const garageConsts = {

2
src/graphics/garageDoor/GarageDoor.ts
View File

@ -31,8 +31,6 @@ export interface IGarageDoorState extends GraphicState {
set mgj(v: boolean);
get param(): request.CkmParam;
set param(v: request.CkmParam);
get stateLoss(): boolean; //状态丢失
set stateLoss(v: boolean);
}
const garageConsts = {

23
src/protos/device_state.ts
View File

@ -6879,7 +6879,6 @@ export namespace state {
id?: number;
mgj?: boolean;
param?: dependency_3.request.CkmParam;
stateLoss?: boolean;
}) {
super();
pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls);
@ -6893,9 +6892,6 @@ export namespace state {
if ("param" in data && data.param != undefined) {
this.param = data.param;
}
if ("stateLoss" in data && data.stateLoss != undefined) {
this.stateLoss = data.stateLoss;
}
}
}
get id() {
@ -6919,17 +6915,10 @@ export namespace state {
get has_param() {
return pb_1.Message.getField(this, 3) != null;
}
get stateLoss() {
return pb_1.Message.getFieldWithDefault(this, 4, false) as boolean;
}
set stateLoss(value: boolean) {
pb_1.Message.setField(this, 4, value);
}
static fromObject(data: {
id?: number;
mgj?: boolean;
param?: ReturnType<typeof dependency_3.request.CkmParam.prototype.toObject>;
stateLoss?: boolean;
}): CkmState {
const message = new CkmState({});
if (data.id != null) {
@ -6941,9 +6930,6 @@ export namespace state {
if (data.param != null) {
message.param = dependency_3.request.CkmParam.fromObject(data.param);
}
if (data.stateLoss != null) {
message.stateLoss = data.stateLoss;
}
return message;
}
toObject() {
@ -6951,7 +6937,6 @@ export namespace state {
id?: number;
mgj?: boolean;
param?: ReturnType<typeof dependency_3.request.CkmParam.prototype.toObject>;
stateLoss?: boolean;
} = {};
if (this.id != null) {
data.id = this.id;
@ -6962,9 +6947,6 @@ export namespace state {
if (this.param != null) {
data.param = this.param.toObject();
}
if (this.stateLoss != null) {
data.stateLoss = this.stateLoss;
}
return data;
}
serialize(): Uint8Array;
@ -6977,8 +6959,6 @@ export namespace state {
writer.writeBool(2, this.mgj);
if (this.has_param)
writer.writeMessage(3, this.param, () => this.param.serialize(writer));
if (this.stateLoss != false)
writer.writeBool(4, this.stateLoss);
if (!w)
return writer.getResultBuffer();
}
@ -6997,9 +6977,6 @@ export namespace state {
case 3:
reader.readMessage(message.param, () => message.param = dependency_3.request.CkmParam.deserialize(reader));
break;
case 4:
message.stateLoss = reader.readBool();
break;
default: reader.skipField();
}
}