Merge branch 'develop' of https://gitea.joylink.club/joylink/xian-ncc-da-client into develop

src/drawApp/graphics/RunLineInteraction.ts

@@ -23,6 +23,7 @@ import { RunLineGraphicHitArea } from 'src/graphics/runLine/RunLineDrawAssistant
 import { Dialog } from 'quasar';
 import SetDashLineDialog from '../../components/draw-app/dialogs/SetDashLineDialog.vue';
 import SetGaryLineDialog from '../../components/draw-app/dialogs/SetGaryLineDialog.vue';
+import { useLineNetStore } from 'src/stores/line-net-store';
 
 export class RunLineData extends GraphicDataBase implements IRunLineData {
   constructor(data?: graphicData.RunLine) {
@@ -235,7 +236,6 @@ export class DrawRunLinePlugin extends GraphicInteractionPlugin<RunLine> {
       });
     };
     setGrayLineConfig.handler = () => {
-      console.log(runLine.datas, '11111');
       Dialog.create({
         title: '设置灰线段',
         message: '',
@@ -280,10 +280,22 @@ export class RunLineOperateInteraction extends GraphicInteractionPlugin<RunLine>
     g.cursor = 'pointer';
     g.lineBody.hitArea = new RunLineGraphicHitArea(g);
     g.selectable = true;
+    g.on('_leftclick', this.leftClick, this);
   }
 
   unbind(g: RunLine): void {
     g.selectable = false;
     g.eventMode = 'none';
+    g.off('_leftclick', this.leftClick, this);
+  }
+
+  leftClick(e: FederatedMouseEvent) {
+    const target = e.target as DisplayObject;
+    const runLine = target.getGraphic() as RunLine;
+    const lineId = runLine.datas.lineId;
+    if (lineId) {
+      useLineNetStore().jumpLineCount++;
+      useLineNetStore().jumpLineId = lineId;
+    }
   }
 }

src/pages/MonitorPage.vue

@@ -35,13 +35,10 @@ watch(
   }
 );
 watch(
-  () => lineNetStore.selectedGraphic,
+  () => lineNetStore.jumpLineCount,
   (val) => {
-    if (val && lineNetStore.selectedGraphicType == RunLine.Type) {
+    if (val) {
-      const lineId = (val as RunLine)?.datas.lineId;
+      router.replace(`/line/monitor/${lineNetStore.jumpLineId}`);
-      if (lineId) {
-        router.replace(`/line/monitor/${lineId}`);
-      }
     }
   }
 );

src/stores/line-net-store.ts

@@ -38,6 +38,8 @@ export const useLineNetStore = defineStore('lineNet', {
     closeAllAlarmInfoDialog: false,
     connectButtonColor: 'green',
     connectInfo: null as state.WarnLineMessage | null,
+    jumpLineCount: 0,
+    jumpLineId: '',
   }),
   getters: {
     untreatedNum: (state) => {