From 82c05e248641ef23976a78351c96680a30d8565e Mon Sep 17 00:00:00 2001 From: lty <876263681@qq.com> Date: 星期一, 07 四月 2025 08:50:44 +0800 Subject: [PATCH] #初始化地图 --- src/main/webapp/static/js/console.map.js | 80 ++++++++++++++++++++------------------- pom.xml | 11 +++++ src/main/resources/application.yml | 8 +++- 3 files changed, 57 insertions(+), 42 deletions(-) diff --git a/pom.xml b/pom.xml index 1e6de96..cb0bf18 100644 --- a/pom.xml +++ b/pom.xml @@ -189,11 +189,20 @@ <scope>system</scope> <systemPath>${project.basedir}/src/main/resources/lib/oscarJDBC8.jar</systemPath> </dependency> + <!-- 鎵嬪姩瀹夎鏈湴椹卞姩 --> + <dependency> + <groupId>com.dameng</groupId> + <artifactId>DmJdbcDriver</artifactId> + <version>8.0</version> + <scope>system</scope> + <systemPath>${project.basedir}/lib/DmJdbcDriver18.jar</systemPath> + </dependency> + </dependencies> <build> - <finalName>shzhwcs</finalName> + <finalName>shydwcs</finalName> <plugins> <plugin> <groupId>org.springframework.boot</groupId> diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 92fc61b..a48d6d8 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -11,7 +11,11 @@ # url: jdbc:sqlserver://127.0.0.1:1433;databasename=tzglasrs # username: sa # password: sa@123 - driver-class-name: com.oscar.Driver +# driver-class-name: com.oscar.Driver +# url: jdbc:oscar://127.0.0.1:2003/osrdb?CURRENTSCHEMA=DBO +# username: SYSDBA +# password: szoscar55 + driver-class-name: com.dameng.Driver url: jdbc:oscar://127.0.0.1:2003/osrdb?CURRENTSCHEMA=DBO username: SYSDBA password: szoscar55 @@ -38,7 +42,7 @@ enable: false wms: - url: 127.0.0.1:8080/tzglwms + url: 127.0.0.1:8080/shydwms # 涓嬩綅鏈洪厤缃� wcs-slave: diff --git a/src/main/webapp/static/js/console.map.js b/src/main/webapp/static/js/console.map.js index df3241d..9352713 100644 --- a/src/main/webapp/static/js/console.map.js +++ b/src/main/webapp/static/js/console.map.js @@ -337,47 +337,49 @@ { "type": "stn", "id": "site-106", "text": "106", "top": 130, "left": 1540, "width": 40, "height": 23 }, { "type": "stn", "id": "site-107", "text": "107", "top": 130, "left": 1582, "width": 40, "height": 23 }, { "type": "stn", "id": "site-108", "text": "108", "top": 130, "left": 1624, "width": 40, "height": 23 }, - { "type": "stn", "id": "site-109", "text": "109", "top": 160, "left": 1540, "width": 40, "height": 23 }, - { "type": "stn", "id": "site-110", "text": "110", "top": 160, "left": 1582, "width": 40, "height": 23 }, - { "type": "stn", "id": "site-111", "text": "111", "top": 160, "left": 1624, "width": 40, "height": 23 }, + { "type": "stn", "id": "site-109", "text": "109", "top": 130, "left": 1742, "width": 40, "height": 23 }, + { "type": "stn", "id": "site-110", "text": "110", "top": 130, "left": 1784, "width": 40, "height": 23 }, + { "type": "stn", "id": "site-111", "text": "111", "top": 130, "left": 1826, "width": 40, "height": 23 }, + { "type": "stn", "id": "site-112", "text": "112", "top": 160, "left": 1540, "width": 40, "height": 23 }, + { "type": "stn", "id": "site-113", "text": "113", "top": 160, "left": 1582, "width": 40, "height": 23 }, + { "type": "stn", "id": "site-114", "text": "114", "top": 160, "left": 1624, "width": 40, "height": 23 }, + { "type": "stn", "id": "site-115", "text": "115", "top": 210, "left": 1540, "width": 40, "height": 23 }, + { "type": "stn", "id": 'site-116', "text": "116", "top": 210, "left": 1582, "width": 40, "height": 23 }, + { "type": "stn", "id": "site-117", "text": "117", "top": 210, "left": 1624, "width": 40, "height": 23 }, + { "type": "stn", "id": "site-118", "text": "118", "top": 240, "left": 1540, "width": 40, "height": 23 }, + { "type": "stn", "id": "site-119", "text": "119", "top": 240, "left": 1582, "width": 40, "height": 23 }, + { "type": "stn", "id": "site-120", "text": "120", "top": 240, "left": 1624, "width": 40, "height": 23 }, - { "type": "stn", "id": "site-112", "text": "112", "top": 210, "left": 1540, "width": 40, "height": 23 }, - { "type": "stn", "id": "site-113", "text": "113", "top": 210, "left": 1582, "width": 40, "height": 23 }, - { "type": "stn", "id": "site-114", "text": "114", "top": 210, "left": 1624, "width": 40, "height": 23 }, - { "type": "stn", "id": "site-115", "text": "115", "top": 240, "left": 1540, "width": 40, "height": 23 }, - { "type": "stn", "id": "site-116", "text": "116", "top": 240, "left": 1582, "width": 40, "height": 23 }, - { "type": "stn", "id": "site-117", "text": "117", "top": 240, "left": 1624, "width": 40, "height": 23 }, - - { "type": "stn", "id": "site-118", "text": "118", "top": 240, "left": 1742, "width": 40, "height": 23 }, - { "type": "stn", "id": "site-119", "text": "119", "top": 240, "left": 1784, "width": 40, "height": 23 }, - { "type": "stn", "id": "site-120", "text": "120", "top": 240, "left": 1826, "width": 40, "height": 23 }, - { "type": "stn", "id": "site-121", "text": "121", "top": 265, "left": 1826, "width": 40, "height": 23 }, - { "type": "stn", "id": "site-122", "text": "122", "top": 290, "left": 1540, "width": 40, "height": 23 }, - { "type": "stn", "id": "site-123", "text": "123", "top": 290, "left": 1582, "width": 40, "height": 23 }, - { "type": "stn", "id": "site-124", "text": "124", "top": 290, "left": 1624, "width": 40, "height": 23 }, - { "type": "stn", "id": "site-125", "text": "125", "top": 290, "left": 1742, "width": 40, "height": 23 }, - { "type": "stn", "id": "site-126", "text": "126", "top": 290, "left": 1784, "width": 40, "height": 23 }, - { "type": "stn", "id": "site-127", "text": "127", "top": 290, "left": 1826, "width": 40, "height": 23 }, - { "type": "stn", "id": "site-128", "text": "128", "top": 320, "left": 1540, "width": 40, "height": 23 }, - { "type": "stn", "id": "site-129", "text": "129", "top": 320, "left": 1582, "width": 40, "height": 23 }, - { "type": "stn", "id": "site-130", "text": "130", "top": 320, "left": 1624, "width": 40, "height": 23 }, - { "type": "stn", "id": "site-131", "text": "131", "top": 370, "left": 1540, "width": 40, "height": 23 }, - { "type": "stn", "id": "site-132", "text": "132", "top": 370, "left": 1582, "width": 40, "height": 23 }, - { "type": "stn", "id": "site-133", "text": "133", "top": 370, "left": 1624, "width": 40, "height": 23 }, - { "type": "stn", "id": "site-134", "text": "134", "top": 400, "left": 1540, "width": 40, "height": 23 }, - { "type": "stn", "id": "site-135", "text": "135", "top": 400, "left": 1582, "width": 40, "height": 23 }, - { "type": "stn", "id": "site-136", "text": "136", "top": 400, "left": 1624, "width": 40, "height": 23 }, - { "type": "stn", "id": "site-137", "text": "137", "top": 400, "left": 1742, "width": 40, "height": 23 }, - { "type": "stn", "id": "site-138", "text": "138", "top": 400, "left": 1784, "width": 40, "height": 23 }, - { "type": "stn", "id": "site-139", "text": "139", "top": 400, "left": 1826, "width": 40, "height": 23 }, - { "type": "stn", "id": "site-140", "text": "140", "top": 450, "left": 1540, "width": 40, "height": 23 }, - { "type": "stn", "id": "site-141", "text": "141", "top": 450, "left": 1582, "width": 40, "height": 23 }, - { "type": "stn", "id": "site-142", "text": "142", "top": 450, "left": 1624, "width": 40, "height": 23 }, - { "type": "stn", "id": "site-143", "text": "143", "top": 450, "left": 1742, "width": 40, "height": 23 }, - { "type": "stn", "id": "site-144", "text": "144", "top": 450, "left": 1784, "width": 40, "height": 23 }, - { "type": "stn", "id": "site-145", "text": "145", "top": 450, "left": 1826, "width": 40, "height": 23 }, + { "type": "stn", "id": "site-121", "text": "121", "top": 240, "left": 1742, "width": 40, "height": 23 }, + { "type": "stn", "id": "site-122", "text": "122", "top": 240, "left": 1784, "width": 40, "height": 23 }, + { "type": "stn", "id": "site-123", "text": "123", "top": 240, "left": 1826, "width": 40, "height": 23 }, + { "type": "stn", "id": "site-124", "text": "124", "top": 265, "left": 1826, "width": 40, "height": 23 }, + { "type": "stn", "id": "site-125", "text": "125", "top": 290, "left": 1540, "width": 40, "height": 23 }, + { "type": "stn", "id": "site-126", "text": "126", "top": 290, "left": 1582, "width": 40, "height": 23 }, + { "type": "stn", "id": "site-127", "text": "127", "top": 290, "left": 1624, "width": 40, "height": 23 }, + { "type": "stn", "id": "site-128", "text": "128", "top": 290, "left": 1742, "width": 40, "height": 23 }, + { "type": "stn", "id": "site-129", "text": "129", "top": 290, "left": 1784, "width": 40, "height": 23 }, + { "type": "stn", "id": "site-130", "text": "130", "top": 290, "left": 1826, "width": 40, "height": 23 }, + { "type": "stn", "id": "site-131", "text": "131", "top": 320, "left": 1540, "width": 40, "height": 23 }, + { "type": "stn", "id": "site-132", "text": "132", "top": 320, "left": 1582, "width": 40, "height": 23 }, + { "type": "stn", "id": "site-133", "text": "133", "top": 320, "left": 1624, "width": 40, "height": 23 }, + { "type": "stn", "id": "site-134", "text": "134", "top": 370, "left": 1540, "width": 40, "height": 23 }, + { "type": "stn", "id": "site-135", "text": "135", "top": 370, "left": 1582, "width": 40, "height": 23 }, + { "type": "stn", "id": "site-136", "text": "136", "top": 370, "left": 1624, "width": 40, "height": 23 }, + { "type": "stn", "id": "site-137", "text": "137", "top": 400, "left": 1540, "width": 40, "height": 23 }, + { "type": "stn", "id": "site-138", "text": "138", "top": 400, "left": 1582, "width": 40, "height": 23 }, + { "type": "stn", "id": "site-139", "text": "139", "top": 400, "left": 1624, "width": 40, "height": 23 }, + { "type": "stn", "id": "site-140", "text": "140", "top": 400, "left": 1742, "width": 40, "height": 23 }, + { "type": "stn", "id": "site-141", "text": "141", "top": 400, "left": 1784, "width": 40, "height": 23 }, + { "type": "stn", "id": "site-142", "text": "142", "top": 400, "left": 1826, "width": 40, "height": 23 }, + { "type": "stn", "id": "site-143", "text": "143", "top": 450, "left": 1540, "width": 40, "height": 23 }, + { "type": "stn", "id": "site-144", "text": "144", "top": 450, "left": 1582, "width": 40, "height": 23 }, + { "type": "stn", "id": "site-145", "text": "145", "top": 450, "left": 1624, "width": 40, "height": 23 }, + { "type": "stn", "id": "site-146", "text": "146", "top": 450, "left": 1742, "width": 40, "height": 23 }, + { "type": "stn", "id": "site-147", "text": "147", "top": 450, "left": 1784, "width": 40, "height": 23 }, + { "type": "stn", "id": "site-148", "text": "148", "top": 450, "left": 1826, "width": 40, "height": 23 }, { "type": "stn", "id": "site-1000", "text": "1000", "top": 160, "left": 1675, "width": 60, "height": 23 }, - { "type": "stn", "id": "site-1001", "text": "1001", "top": 400, "left": 1675, "width": 60, "height": 23 }, + { "type": "stn", "id": "site-1001", "text": "1001", "top": 370, "left": 1675, "width": 60, "height": 23 }, ], "barcode": [] -- Gitblit v1.9.1