From c181854b2eebecf9141f8e750232feeadb0df5f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=8D=9A?= <13889212077@163.com>
Date: Mon, 20 Jan 2025 16:17:22 +0800
Subject: [PATCH] =?UTF-8?q?zb=E4=BF=AE=E6=94=B9=E5=88=9D=E5=A7=8B=E5=8C=96?=
 =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E8=AE=BE=E5=A4=87=E7=8A=B6=E6=80=81=E6=A1=86?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/layouts/admin/admin.component.ts     |  2 +-
 src/app/routes/wcs/monitor/monitor.canvas.ts | 28 +++++++++++++++++++-
 src/assets/i18n/zh-CN.json                   |  2 +-
 src/assets/settings/srv.json                 |  2 +-
 4 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/src/app/layouts/admin/admin.component.ts b/src/app/layouts/admin/admin.component.ts
index 241dace..cc0ab58 100644
--- a/src/app/layouts/admin/admin.component.ts
+++ b/src/app/layouts/admin/admin.component.ts
@@ -240,7 +240,7 @@ export class AdminComponent implements OnDestroy {
         // console.log('---------');
         // console.log(this.alertMessages.list[0].stockBarcode );
         
-      },1000);//10秒刷新一回
+      },10000);//10秒刷新一回
      }
   
 
diff --git a/src/app/routes/wcs/monitor/monitor.canvas.ts b/src/app/routes/wcs/monitor/monitor.canvas.ts
index 33eef47..076cf6f 100644
--- a/src/app/routes/wcs/monitor/monitor.canvas.ts
+++ b/src/app/routes/wcs/monitor/monitor.canvas.ts
@@ -44,6 +44,20 @@ export class MonitorCanvas {
   public init(map: ElementRef): Promise<void> {
     map.nativeElement.firstChild.width = screen.width;
     map.nativeElement.firstChild.height = screen.height;
+    
+    // 新修改20241205 zb 增加鼠标模拟滚动事件
+    setTimeout(()=>{
+    console.log(this._canvas);
+    const down = new fabric.Point(1098, 318);
+    const scaleDown = 0.9081818181818182;
+    const up = new fabric.Point(1098, 318);
+    const scaleUp=0.9990000000000001;
+    this. canvas.zoomToPoint(down,scaleDown);
+    setTimeout(()=>{
+    this. canvas.zoomToPoint(up,scaleDown);
+    },200);
+    },100);
+
     return new Promise(resolve => {
       setTimeout(() => {
         this._canvas = new fabric.Canvas('map', { selection: false });
@@ -56,7 +70,12 @@ export class MonitorCanvas {
         this._canvas.on('mouse:down', () => panning = true);
         this._canvas.on('mouse:up', () => panning = false);
         this._canvas.on('mouse:move', (e: any) => panning && e && e.e && this._canvas.relativePan(new fabric.Point(e.e.movementX, e.e.movementY)));
-        this._canvas.on('mouse:wheel', (e: any) => e && e.e && this._canvas.zoomToPoint(new fabric.Point(e.e.pageX, e.e.pageY), Math.max(.1, Math.min(10, this._canvas.getZoom() * (e.e.deltaY > 0 ? .9 : 1.1)))));
+        //console.log(e.e.movementX);
+        //新修改
+        this. canvas.on('mouse:wheel',(e: any)=>{
+          this.wheelToggle(e);
+          });
+       // this._canvas.on('mouse:wheel', (e: any) => e && e.e && this._canvas.zoomToPoint(new fabric.Point(e.e.pageX, e.e.pageY), Math.max(.1, Math.min(10, this._canvas.getZoom() * (e.e.deltaY > 0 ? .9 : 1.1)))));
         this._canvas.on('mouse:dblclick', (e: any) => e && e.target && e.target.data && this.fire(e.target.data));
         this._canvas.on('mouse:over', (e) => e && this.focus(e));
 
@@ -65,6 +84,13 @@ export class MonitorCanvas {
     });
   }
 
+  //新修改
+  public wheelToggle(e) {
+    console.log(new fabric.Point(e.e.pageX, e.e.pageY));
+    console.log(Math.max(.1, Math.min(10, this._canvas.getZoom() * (e.e.deltaY > 0 ? .9 : 1.1))));
+    e && e.e && this._canvas.zoomToPoint(new fabric.Point(e.e.pageX, e.e.pageY), Math.max(.1, Math.min(10, this._canvas.getZoom() * (e.e.deltaY > 0 ? .9 : 1.1))))
+  }
+
   public render() {
     this._canvas?.renderAll();
   }
diff --git a/src/assets/i18n/zh-CN.json b/src/assets/i18n/zh-CN.json
index 09fc12a..6593554 100644
--- a/src/assets/i18n/zh-CN.json
+++ b/src/assets/i18n/zh-CN.json
@@ -193,7 +193,7 @@
         "autocommand":"下达自动任务",
         "systemsetting":"系统参数设置",
          "stationstatus":"站台管理",
-        "reuquestWms":"重新请求处理"
+        "reuquestWms":"入库重新请求"
       },
       "monitor": {
         "name": "库",
diff --git a/src/assets/settings/srv.json b/src/assets/settings/srv.json
index ee4b66b..4f2a357 100644
--- a/src/assets/settings/srv.json
+++ b/src/assets/settings/srv.json
@@ -1,3 +1,3 @@
 {
-  "default": "http://127.0.0.1:22222" 
+  "default": "http://192.168.16.3:22222" 
 }
\ No newline at end of file