Browse Source

fix 更新web

zhanghaijun 2 years ago
parent
commit
30c2c791b9

+ 4 - 0
README.md

@@ -15,4 +15,8 @@ git clone --depth 1 --filter=blob:none --sparse http://jiecheng2024.tpddns.cn:30
 cd Mluti-Agent_simulation
 git sparse-checkout init --cone
 git sparse-checkout set WebModule
+
+
+git clone --depth 1 --filter=blob:none http://jiecheng2024.tpddns.cn:3000/liyuezong/Mluti-Agent_simulation.git -- WebModule
+
 ```

+ 1 - 1
train-server/src/main/java/top/haijunit/train/simulation/train/TrainComputerService.java

@@ -201,7 +201,7 @@ public class TrainComputerService {
         // 列车开关门
         JSONObject trainData = JSONUtil.createObj();
         trainData.set(CommandEnum.TRAIN_OPEN_DOOR.getNameStr(), train.getTrainNo());
-        trainData.set(CommandEnum.TRAIN_OPEN_DOOR.getStatusStr(), statusEnum);
+        trainData.set(CommandEnum.TRAIN_OPEN_DOOR.getStatusStr(), statusEnum.getCode());
         TrainWebSocketUtils.sendMessage(CommandEnum.TRAIN_OPEN_DOOR, trainData);
         // 站台屏蔽门开关门
         Optional<SectionItem> optional = sectionList.stream().filter(item -> item.getSectionId().equals(train.getBlockId())).findFirst();

+ 1 - 1
train-server/src/test/java/top/haijunit/train/test/LicenseCreateTest.java

@@ -19,7 +19,7 @@ public class LicenseCreateTest {
 
     @DisplayName("生成授权")
     @ParameterizedTest
-    @CsvSource({"b6f35e941ae79841494fe2e3e7f961a9+876,2024-06-01"})
+    @CsvSource({"'',2024-06-01"})
     void generateLicense(String machineStr, String dateStr) {
         if (machineStr.contains(LicenseUtil.MARK)) {
             String machineCode = StrUtil.subBefore(machineStr, LicenseUtil.MARK, false);

+ 8 - 4
train-web/src/pages/situation/index.vue

@@ -95,14 +95,18 @@ const getDevice = function () {
             return {...item, command: device.command, postion: item.postion.trim(), top: '18vh', left: '110vh'}
           case "站台":
             return {...item, command: device.command, postion: item.postion.trim(), top: '62vh', left: '110vh'}
-          case "站厅A端":
-            return {...item, command: device.command, postion: item.postion.trim(), top: '8vh', left: '10vh'}
-          case "站厅B端":
-            return {...item, command: device.command, postion: item.postion.trim(), top: '18vh', left: '10vh'}
           case "1出口":
             return {...item, command: device.command, postion: item.postion.trim(), top: '28vh', left: '10vh'}
           case "2出口":
             return {...item, command: device.command, postion: item.postion.trim(), top: '38vh', left: '10vh'}
+          case "站厅A端":
+            return {...item, command: device.command, postion: item.postion.trim(), top: '8vh', left: '10vh'}
+          case "站厅B端":
+            return {...item, command: device.command, postion: item.postion.trim(), top: '18vh', left: '10vh'}
+          case "站台A端":
+            return {...item, command: device.command, postion: item.postion.trim(), top: '18vh', left: '20vh'}
+          case "站台B端":
+            return {...item, command: device.command, postion: item.postion.trim(), top: '18vh', left: '20vh'}
           default:
             return undefined;
         }

+ 5 - 5
train-web/src/store/modules/devices.ts

@@ -1,9 +1,9 @@
-import { defineStore } from "pinia";
-import { DeviceItem } from "@/types/device";
-import { deviceAll } from "@/api/device";
+import {defineStore} from "pinia";
+import {DeviceItem} from "@/types/device";
+import {deviceAll} from "@/api/device";
 
 export const StoreDevices = defineStore("devices", {
-  state: () => {
+  state: (): { deviceArray: Array<DeviceItem> } => {
     return {
       deviceArray: [] as Array<DeviceItem>,
     };
@@ -15,7 +15,7 @@ export const StoreDevices = defineStore("devices", {
   },
   actions: {
     async loadDeviceAll() {
-      const { data } = await deviceAll();
+      const {data} = await deviceAll();
       this.deviceArray = (data || []).sort((a, b) => {
         if (a.command < b.command) return -1;
         if (a.command > b.command) return 1;

+ 22 - 5
train-web/src/store/modules/situation.ts

@@ -1,10 +1,27 @@
-import { defineStore } from "pinia";
+import {defineStore} from "pinia";
 
 export const StoreSituation = defineStore("situation", {
-  state: () => {
-    return {};
+  state: (): { clientSpeed: number, waterSpeed: number } => {
+    return {
+      clientSpeed: 0 as number,
+      waterSpeed: 0 as number,
+    };
+  },
+  getters: {
+    getClientSpeed(): number {
+      return this.clientSpeed;
+    },
+    getWaterSpeed(): number {
+      return this.waterSpeed;
+    }
+  },
+  actions: {
+    setClientSpeed(speed: number): void {
+      this.clientSpeed = speed;
+    },
+    setWaterSpeed(speed: number): void {
+      this.waterSpeed = speed;
+    },
   },
-  getters: {},
-  actions: {},
   persist: true,
 });