zhanghaijun пре 2 година
родитељ
комит
15540d1af5
41 измењених фајлова са 5 додато и 45 уклоњено
  1. 0 0
      train-web/demo/clothes/Editor.ts
  2. 0 0
      train-web/demo/clothes/Effector.ts
  3. 0 0
      train-web/demo/clothes/index.vue
  4. 0 0
      train-web/demo/examples/Camera.vue
  5. 0 0
      train-web/demo/examples/Group.vue
  6. 0 0
      train-web/demo/examples/HelloWorld.vue
  7. 0 0
      train-web/demo/examples/Img.vue
  8. 0 0
      train-web/demo/examples/Img2D.vue
  9. 0 0
      train-web/demo/examples/ImgControler.vue
  10. 0 0
      train-web/demo/examples/MatrixOfCanvas.vue
  11. 0 0
      train-web/demo/examples/OrbitControler.vue
  12. 0 0
      train-web/demo/examples/Scene.vue
  13. 0 0
      train-web/demo/examples/Text2D.vue
  14. 0 0
      train-web/demo/examples/TransformControler.vue
  15. 0 0
      train-web/demo/lmm/controler/ControlFrame.ts
  16. 0 0
      train-web/demo/lmm/controler/Frame.ts
  17. 0 0
      train-web/demo/lmm/controler/ImgControler.ts
  18. 0 0
      train-web/demo/lmm/controler/ImgTransformer.ts
  19. 0 0
      train-web/demo/lmm/controler/MouseShape.ts
  20. 0 0
      train-web/demo/lmm/controler/Object2DTransformer.ts
  21. 0 0
      train-web/demo/lmm/controler/OrbitControler.ts
  22. 0 0
      train-web/demo/lmm/controler/TransformControler.ts
  23. 0 0
      train-web/demo/lmm/core/Camera.ts
  24. 0 0
      train-web/demo/lmm/core/EventDispatcher.ts
  25. 0 0
      train-web/demo/lmm/core/Scene.ts
  26. 0 0
      train-web/demo/lmm/math/MathUtils.ts
  27. 0 0
      train-web/demo/lmm/math/Matrix3.ts
  28. 0 0
      train-web/demo/lmm/math/Vector2.ts
  29. 0 0
      train-web/demo/lmm/objects/Group.ts
  30. 0 0
      train-web/demo/lmm/objects/Img.ts
  31. 0 0
      train-web/demo/lmm/objects/Img2D.ts
  32. 0 0
      train-web/demo/lmm/objects/Object2D.ts
  33. 0 0
      train-web/demo/lmm/objects/ObjectUtils.ts
  34. 0 0
      train-web/demo/lmm/objects/Text2D.ts
  35. 0 0
      train-web/demo/lmm/style/BasicStyle.ts
  36. 0 0
      train-web/demo/lmm/style/StandStyle.ts
  37. 0 0
      train-web/demo/lmm/style/TextStyle.ts
  38. 2 2
      train-web/src/pages/train/controller/DrawTrack.ts
  39. 0 1
      train-web/src/pages/train/index.vue
  40. 0 39
      train-web/src/router/index.ts
  41. 3 3
      train-web/src/store/socket.ts

train-web/src/pages/clothes/Editor.ts → train-web/demo/clothes/Editor.ts


train-web/src/pages/clothes/Effector.ts → train-web/demo/clothes/Effector.ts


train-web/src/pages/clothes/index.vue → train-web/demo/clothes/index.vue


train-web/src/pages/demo/examples/Camera.vue → train-web/demo/examples/Camera.vue


train-web/src/pages/demo/examples/Group.vue → train-web/demo/examples/Group.vue


train-web/src/pages/demo/examples/HelloWorld.vue → train-web/demo/examples/HelloWorld.vue


train-web/src/pages/demo/examples/Img.vue → train-web/demo/examples/Img.vue


train-web/src/pages/demo/examples/Img2D.vue → train-web/demo/examples/Img2D.vue


train-web/src/pages/demo/examples/ImgControler.vue → train-web/demo/examples/ImgControler.vue


train-web/src/pages/demo/examples/MatrixOfCanvas.vue → train-web/demo/examples/MatrixOfCanvas.vue


train-web/src/pages/demo/examples/OrbitControler.vue → train-web/demo/examples/OrbitControler.vue


train-web/src/pages/demo/examples/Scene.vue → train-web/demo/examples/Scene.vue


train-web/src/pages/demo/examples/Text2D.vue → train-web/demo/examples/Text2D.vue


train-web/src/pages/demo/examples/TransformControler.vue → train-web/demo/examples/TransformControler.vue


train-web/src/pages/demo/lmm/controler/ControlFrame.ts → train-web/demo/lmm/controler/ControlFrame.ts


train-web/src/pages/demo/lmm/controler/Frame.ts → train-web/demo/lmm/controler/Frame.ts


train-web/src/pages/demo/lmm/controler/ImgControler.ts → train-web/demo/lmm/controler/ImgControler.ts


train-web/src/pages/demo/lmm/controler/ImgTransformer.ts → train-web/demo/lmm/controler/ImgTransformer.ts


train-web/src/pages/demo/lmm/controler/MouseShape.ts → train-web/demo/lmm/controler/MouseShape.ts


train-web/src/pages/demo/lmm/controler/Object2DTransformer.ts → train-web/demo/lmm/controler/Object2DTransformer.ts


train-web/src/pages/demo/lmm/controler/OrbitControler.ts → train-web/demo/lmm/controler/OrbitControler.ts


train-web/src/pages/demo/lmm/controler/TransformControler.ts → train-web/demo/lmm/controler/TransformControler.ts


train-web/src/pages/demo/lmm/core/Camera.ts → train-web/demo/lmm/core/Camera.ts


train-web/src/pages/demo/lmm/core/EventDispatcher.ts → train-web/demo/lmm/core/EventDispatcher.ts


train-web/src/pages/demo/lmm/core/Scene.ts → train-web/demo/lmm/core/Scene.ts


train-web/src/pages/demo/lmm/math/MathUtils.ts → train-web/demo/lmm/math/MathUtils.ts


train-web/src/pages/demo/lmm/math/Matrix3.ts → train-web/demo/lmm/math/Matrix3.ts


train-web/src/pages/demo/lmm/math/Vector2.ts → train-web/demo/lmm/math/Vector2.ts


train-web/src/pages/demo/lmm/objects/Group.ts → train-web/demo/lmm/objects/Group.ts


train-web/src/pages/demo/lmm/objects/Img.ts → train-web/demo/lmm/objects/Img.ts


train-web/src/pages/demo/lmm/objects/Img2D.ts → train-web/demo/lmm/objects/Img2D.ts


train-web/src/pages/demo/lmm/objects/Object2D.ts → train-web/demo/lmm/objects/Object2D.ts


train-web/src/pages/demo/lmm/objects/ObjectUtils.ts → train-web/demo/lmm/objects/ObjectUtils.ts


train-web/src/pages/demo/lmm/objects/Text2D.ts → train-web/demo/lmm/objects/Text2D.ts


train-web/src/pages/demo/lmm/style/BasicStyle.ts → train-web/demo/lmm/style/BasicStyle.ts


train-web/src/pages/demo/lmm/style/StandStyle.ts → train-web/demo/lmm/style/StandStyle.ts


train-web/src/pages/demo/lmm/style/TextStyle.ts → train-web/demo/lmm/style/TextStyle.ts


+ 2 - 2
train-web/src/pages/train/controller/DrawTrack.ts

@@ -1,5 +1,5 @@
 import {crtPath} from '../core/Utils'
-import {DirectionEnum, RouteItem, SectionStatusEnum, SelectionItem, SignalItem, SignalStateEnum, SwitchItem, TowardEnum} from "@/types/train-travel";
+import {DirectionEnum, RouteItem, SectionStatusEnum, SelectionItem, SignalItem, SwitchItem, TowardEnum} from "@/types/train-travel";
 import {LINE_DOWN, LINE_UP} from './Constant'
 import {useStoreSocket} from '@/store/socket'
 
@@ -125,7 +125,7 @@ export class DrawTrack {
       this.canvas.closePath()
       this.canvas.stroke();
       this.canvas.save();
-      if (!item.isSwitch && (item.name.indexOf("-") == -1 || item.name.split("-")[1] == "2")) {
+      if (!item.switch && (item.name.indexOf("-") == -1 || item.name.split("-")[1] == "2")) {
         this.canvas.font = '12px Arial';
         this.canvas.fillStyle = '#31355d';
         this.canvas.fillText(item.name.split("-")[0], Number(item.startKilometer) + Number(item.selectionLength) * 0.5, Y - 3);

+ 0 - 1
train-web/src/pages/train/index.vue

@@ -8,7 +8,6 @@ import {DrawTrack} from './controller/DrawTrack'
 import {DrewTrain} from './controller/DrewTrain.ts'
 import {StoreTrain} from '@/store/modules/train.ts'
 import {useStoreSocket} from '@/store/socket'
-import {TrainItem} from "@/types/train-travel";
 
 const canvasRef = ref<HTMLCanvasElement>();
 const storeTrain = StoreTrain();

+ 0 - 39
train-web/src/router/index.ts

@@ -25,45 +25,6 @@ const routes = [
                 component: () => import("@/pages/situation/index.vue")
             }
         ],
-    }, {
-        path: '/demo',
-        redirect: "/demo/hello",
-        children: [
-            {
-                path: '/demo/clothes',
-                component: () => import('@/pages/clothes/index.vue'),
-            }, {
-                path: '/demo/hello',
-                component: () => import('@/pages/demo/examples/HelloWorld.vue'),
-            }, {
-                path: '/demo/MatrixOfCanvas',
-                component: () => import('@/pages/demo/examples/MatrixOfCanvas.vue'),
-            }, {
-                path: '/demo/Camera',
-                component: () => import('@/pages/demo/examples/Camera.vue'),
-            }, {
-                path: '/demo/Img',
-                component: () => import('@/pages/demo/examples/Img.vue'),
-            }, {
-                path: '/demo/Img2D',
-                component: () => import('@/pages/demo/examples/Img2D.vue'),
-            }, {
-                path: '/demo/Group',
-                component: () => import('@/pages/demo/examples/Group.vue'),
-            }, {
-                path: '/demo/Scene',
-                component: () => import('@/pages/demo/examples/Scene.vue'),
-            }, {
-                path: '/demo/OrbitControler',
-                component: () => import('@/pages/demo/examples/OrbitControler.vue'),
-            }, {
-                path: '/demo/ImgControler',
-                component: () => import('@/pages/demo/examples/ImgControler.vue'),
-            }, {
-                path: '/demo/Text2D',
-                component: () => import('@/pages/demo/examples/Text2D.vue'),
-            }
-        ]
     }, {
         path: "/:pathMatch(.*)*",
         component: () => import("@/pages/404.vue"),

+ 3 - 3
train-web/src/store/socket.ts

@@ -1,6 +1,6 @@
 import { defineStore } from "pinia";
 import SocketClient from "@/types/WebSocketClient";
-import { CommandEnum, RouteItem, SelectionItem, TrainItem } from '@/types/train-travel'
+import { CommandEnum, RouteItem, TrainItem } from '@/types/train-travel'
 
 interface WebSocketState {
   client: SocketClient<string> | null;
@@ -42,8 +42,8 @@ export const useStoreSocket = defineStore("websocket", {
               // 进路状态信息
               const routeMap: Map<number, RouteItem[]> = result.data as Map<number, RouteItem[]>;
               const routeList: RouteItem[] = Array.from(Object.values(routeMap)).flatMap(routeItems => routeItems);
-              const ids: number[] = routeList.map(routeItem => routeItem.id);
-              this.routeList = [...this.routeList.filter(item => !ids.includes(item.id)), ...routeList];
+              const ids: number[] = routeList.map(routeItem => routeItem.sectionId);
+              this.routeList = [...this.routeList.filter(item => !ids.includes(item.sectionId)), ...routeList];
               break;
             default:
               console.log("未知的消息类型:" + result.cmd + ", message: " + data);