From 8627f0c9f97eba59d316d62fb77c2d28b1f0365f Mon Sep 17 00:00:00 2001
From: jongbowen <970029315@qq.com>
Date: Tue, 25 Apr 2023 14:43:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                              |  2 +-
 .../data-collection/fire-force/fire-force.component.ts |  8 ++++----
 .../linkage-forces/linkage-forces.component.ts         |  4 ++--
 .../water-collection/water-collection.component.html   |  2 +-
 .../water-collection/water-collection.component.ts     |  4 ++--
 .../gis-labeling/gis-labeling.component.ts             |  4 ++--
 src/app/key-unit/basicinfo-look/basicinfo.component.ts |  2 +-
 src/app/key-unit/basicinfo/basicinfo.component.ts      |  2 +-
 src/app/key-unit/router-gis/router-gis.component.ts    |  4 ++--
 src/app/key-unit/water-road/water-road.component.ts    |  2 +-
 .../fireforce-audit/fireforce-audit.component.ts       |  2 +-
 .../linkageforces-audit.component.ts                   |  2 +-
 .../plan-audit/water-audit/water-audit.component.ts    |  6 +++---
 src/app/statistic-analysis/home/home.component.ts      |  2 +-
 src/app/test/test.component.ts                         |  2 +-
 .../collection-tools.component.ts                      |  2 +-
 src/modules/map/declare/gaode-map.ts                   |  2 +-
 src/modules/map/declare/keda-map.ts                    | 10 +++++-----
 18 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/README.md b/README.md
index 44d9663..c5cc363 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # AX.Angular4PlanPlatform
 
-上海数字化预案编制管理平台前端项目。此项目在 Angular 框架基础上编写。
+广西数字化预案编制管理平台前端项目。此项目在 Angular 框架基础上编写。
 
 统计分析假页面 + H5编制工具
 
diff --git a/src/app/data-collection/fire-force/fire-force.component.ts b/src/app/data-collection/fire-force/fire-force.component.ts
index 9fcd27f..d29f296 100644
--- a/src/app/data-collection/fire-force/fire-force.component.ts
+++ b/src/app/data-collection/fire-force/fire-force.component.ts
@@ -1028,7 +1028,7 @@ export class FireForceComponent implements OnInit {
             // 将 markers 添加到地图
             this.map.add(this.newPositionMarker);
           } else {
-            this.map.setCity('上海市');
+            this.map.setCity('广西壮族自治区');
           }
           //相关资料
           data.relevantInfomationData ? this.AttachmentArr = JSON.parse(data.relevantInfomationData) : null
@@ -1055,7 +1055,7 @@ export class FireForceComponent implements OnInit {
           alert('获取信息错误！')
         })
       } else {
-        this.map.setCity('上海市');
+        this.map.setCity('广西壮族自治区');
       }
 
       //寻找管辖单位
@@ -1333,7 +1333,7 @@ export class FireForceComponent implements OnInit {
             //  this.newPositionMarker ? this.map.remove(this.newPositionMarker) : null
             //  this.positionLngLat.x = 0
             //  this.positionLngLat.y = 0
-            //  this.map.setCity('上海市');
+            //  this.map.setCity('广西壮族自治区');
             this.selectedFireForce.contentVerify = null
             this.clearData()
           }
@@ -1524,7 +1524,7 @@ export class FireForceComponent implements OnInit {
     this.map = MapFactory.MapInstance('container', {
       zoom: 12
     })
-    this.map.setCity('上海市');
+    this.map.setCity('广西壮族自治区');
     //输入提示
     var autoOptions = {
       input: "tipinput"
diff --git a/src/app/data-collection/linkage-forces/linkage-forces.component.ts b/src/app/data-collection/linkage-forces/linkage-forces.component.ts
index 1c31b36..5f5f67d 100644
--- a/src/app/data-collection/linkage-forces/linkage-forces.component.ts
+++ b/src/app/data-collection/linkage-forces/linkage-forces.component.ts
@@ -423,7 +423,7 @@ export class LinkageForcesComponent implements OnInit {
           this.clearData()
           this.LinkageForceDetailInfo.linkageForceType = data
           this.newPositionMarker ? this.map.remove(this.newPositionMarker) : null
-          this.map.setCity('上海市');
+          this.map.setCity('广西壮族自治区');
           this.LinkageForceDetailInfo.contentVerify = null
         }  
       }
@@ -539,7 +539,7 @@ export class LinkageForcesComponent implements OnInit {
     this.map = MapFactory.MapInstance('container', {
       zoom:12
     })
-    this.map.setCity('上海市');
+    this.map.setCity('广西壮族自治区');
     //输入提示
     var autoOptions = {
       input: "tipinput"
diff --git a/src/app/data-collection/water-collection/water-collection.component.html b/src/app/data-collection/water-collection/water-collection.component.html
index 8c341b5..17b8896 100644
--- a/src/app/data-collection/water-collection/water-collection.component.html
+++ b/src/app/data-collection/water-collection/water-collection.component.html
@@ -113,7 +113,7 @@
                         </span>
                         <input [(ngModel)]="waterData.administrativeRegion" type="text">
                     </mat-grid-tile>
-                    <!-- 上海数据导入后, 行政区字段无数据, 组织机构有数据 -->
+                    <!-- 广西数据导入后, 行政区字段无数据, 组织机构有数据 -->
                     <!-- 显示暂且维持不变 -->
                     <!-- <mat-grid-tile colspan='1' rowspan='1'>
                         <span>
diff --git a/src/app/data-collection/water-collection/water-collection.component.ts b/src/app/data-collection/water-collection/water-collection.component.ts
index c28d5ba..ee1b09f 100644
--- a/src/app/data-collection/water-collection/water-collection.component.ts
+++ b/src/app/data-collection/water-collection/water-collection.component.ts
@@ -430,7 +430,7 @@ export class WaterCollectionComponent implements OnInit {
          this.newPositionMarker ? this.map.remove(this.newPositionMarker) : null
          this.positionLngLat.x = 0
          this.positionLngLat.y = 0
-         this.map.setCity('上海市');
+         this.map.setCity('广西壮族自治区');
          this.clearData()
          this.waterData.contentVerify = null
         }  
@@ -543,7 +543,7 @@ export class WaterCollectionComponent implements OnInit {
     this.map = MapFactory.MapInstance('container', {
       zoom:12
     })
-    this.map.setCity('上海市');
+    this.map.setCity('广西壮族自治区');
     //输入提示
     var autoOptions = {
       input: "tipinput"
diff --git a/src/app/gis-management/gis-labeling/gis-labeling.component.ts b/src/app/gis-management/gis-labeling/gis-labeling.component.ts
index 0bfd40c..4807a0a 100644
--- a/src/app/gis-management/gis-labeling/gis-labeling.component.ts
+++ b/src/app/gis-management/gis-labeling/gis-labeling.component.ts
@@ -1264,7 +1264,7 @@ export class GisLabelingComponent implements OnInit {
         features: ["bg", "road", "point", "building"],
         mapStyle: "amap://styles/light",
       });
-      this.map.setCity("上海市");
+      this.map.setCity("广西壮族自治区");
     }
     this.satelliteModel = false;
     this.loadModel = false;
@@ -1284,7 +1284,7 @@ export class GisLabelingComponent implements OnInit {
       layers: [layer],
       WebGLParams: { preserveDrawingBuffer: true },
     });
-    that.map.setCity("上海市");
+    that.map.setCity("广西壮族自治区");
     that.mouseTool = MapFactory.MouseToolInstance(that.map);
   }
 
diff --git a/src/app/key-unit/basicinfo-look/basicinfo.component.ts b/src/app/key-unit/basicinfo-look/basicinfo.component.ts
index 21543c8..639be38 100644
--- a/src/app/key-unit/basicinfo-look/basicinfo.component.ts
+++ b/src/app/key-unit/basicinfo-look/basicinfo.component.ts
@@ -160,7 +160,7 @@ export class BasicinfoLookComponent implements OnInit {
       this.map.add(this.oldPositionMarker);
     } else {
       // console.log('未标注单位位置')
-      this.map.setCity('上海');
+      this.map.setCity('广西壮族自治区');
     }
   }
 
diff --git a/src/app/key-unit/basicinfo/basicinfo.component.ts b/src/app/key-unit/basicinfo/basicinfo.component.ts
index bfabd90..bec9e59 100644
--- a/src/app/key-unit/basicinfo/basicinfo.component.ts
+++ b/src/app/key-unit/basicinfo/basicinfo.component.ts
@@ -200,7 +200,7 @@ export class BasicinfoComponent implements OnInit {
       this.map.add(this.oldPositionMarker);
     } else {
       // console.log('未标注单位位置')
-      this.map.setCity('上海');
+      this.map.setCity('广西壮族自治区');
     }
   }
   markerPosition2
diff --git a/src/app/key-unit/router-gis/router-gis.component.ts b/src/app/key-unit/router-gis/router-gis.component.ts
index edc9228..9b16557 100644
--- a/src/app/key-unit/router-gis/router-gis.component.ts
+++ b/src/app/key-unit/router-gis/router-gis.component.ts
@@ -100,7 +100,7 @@ export class RouterGISComponent implements OnInit {
     that.map = MapFactory.MapInstance('map',{
       layers:[layer], //当只想显示标准图层时layers属性可缺省,
     });
-    that.map.setCity('上海市');
+    that.map.setCity('广西壮族自治区');
     that.startCoordinate && that.endCoordinate? that.queryGISRoute() : null
   }
 
@@ -177,7 +177,7 @@ export class RouterGISComponent implements OnInit {
     this.endCoordinate = null
     this.routeGIS? this.routeGIS.clear() : null
     this.routes = { distance: 0, time: 0, steps: [], }
-    this.map.setCity('上海市'); //设置地图中心点
+    this.map.setCity('广西壮族自治区'); //设置地图中心点
   }
 
   //交换起始点
diff --git a/src/app/key-unit/water-road/water-road.component.ts b/src/app/key-unit/water-road/water-road.component.ts
index 78641f6..f055f2f 100644
--- a/src/app/key-unit/water-road/water-road.component.ts
+++ b/src/app/key-unit/water-road/water-road.component.ts
@@ -324,7 +324,7 @@ export class WaterRoadComponent implements OnInit {
       this.map.add(this.unitMarker);
       this.waterSubmit(1)
     } else {
-      this.map.setCity('上海市');
+      this.map.setCity('广西壮族自治区');
       let config = new MatSnackBarConfig();
       config.verticalPosition = 'top';
       config.duration = 3000
diff --git a/src/app/plan-audit/fireforce-audit/fireforce-audit.component.ts b/src/app/plan-audit/fireforce-audit/fireforce-audit.component.ts
index e7b08f5..ffdc6c2 100644
--- a/src/app/plan-audit/fireforce-audit/fireforce-audit.component.ts
+++ b/src/app/plan-audit/fireforce-audit/fireforce-audit.component.ts
@@ -53,7 +53,7 @@ export class FireforceAuditComponent implements OnInit {
         // 将 markers 添加到地图
         this.map.add(this.newPositionMarker);
       }else{
-        this.map.setCity('上海市');
+        this.map.setCity('广西壮族自治区');
       }
       
     }, 0);
diff --git a/src/app/plan-audit/linkageforces-audit/linkageforces-audit.component.ts b/src/app/plan-audit/linkageforces-audit/linkageforces-audit.component.ts
index 3ddc08d..304df41 100644
--- a/src/app/plan-audit/linkageforces-audit/linkageforces-audit.component.ts
+++ b/src/app/plan-audit/linkageforces-audit/linkageforces-audit.component.ts
@@ -59,7 +59,7 @@ export class LinkageforcesAuditComponent implements OnInit {
         // 将 markers 添加到地图
         this.map.add(this.newPositionMarker);
       }else{
-        this.map.setCity('上海市');
+        this.map.setCity('广西壮族自治区');
       }
       
     }, 0);
diff --git a/src/app/plan-audit/water-audit/water-audit.component.ts b/src/app/plan-audit/water-audit/water-audit.component.ts
index a62fdf0..cd6451c 100644
--- a/src/app/plan-audit/water-audit/water-audit.component.ts
+++ b/src/app/plan-audit/water-audit/water-audit.component.ts
@@ -38,7 +38,7 @@ export class WaterAuditComponent implements OnInit {
         // 将 markers 添加到地图
         this.map.add(this.newPositionMarker);
       }else{
-        this.map.setCity('上海市');
+        this.map.setCity('广西壮族自治区');
       }
       
     }, 0);
@@ -49,8 +49,8 @@ export class WaterAuditComponent implements OnInit {
   naturalWaterData:any = []//天然水源详情
   // waterData:any = {
   //   id: "60125d31d31fab7de81c56b0",
-  //   name: "上海中心消火栓01",
-  //   administrativeRegion: "上海区",
+  //   name: "广西壮族自治区中心消火栓01",
+  //   administrativeRegion: "广西壮族自治区区",
   //   governmentLevel: "1",
   //   village: "小高社区",
   //   address: "国际会议中心",
diff --git a/src/app/statistic-analysis/home/home.component.ts b/src/app/statistic-analysis/home/home.component.ts
index 235927e..dc82304 100644
--- a/src/app/statistic-analysis/home/home.component.ts
+++ b/src/app/statistic-analysis/home/home.component.ts
@@ -373,7 +373,7 @@ export class HomeComponent implements OnInit {
         this.addydata = []
         this.addtable = JSON.parse(JSON.stringify(this.emitService.allDate))
         this.addtable[0].organizationStatistics.organizations.forEach((value, index, array) => {
-            if (array[index].organizationId != '5687316efa75479d96c0091a167a3b84' && array[index].organizationName != '上海总队') {
+            if (array[index].organizationId != '5687316efa75479d96c0091a167a3b84' && array[index].organizationName != '广西总队') {
                 this.addxdata.push(array[index].organizationName)
                 this.addydata.push(array[index].count)
             }
diff --git a/src/app/test/test.component.ts b/src/app/test/test.component.ts
index 2fee582..c7c1f43 100644
--- a/src/app/test/test.component.ts
+++ b/src/app/test/test.component.ts
@@ -18,7 +18,7 @@ export class TestComponent implements OnInit {
         }
       });
 
-      this.map.setCity('上海市');
+      this.map.setCity('广西壮族自治区');
     }, 0);
   }
   //生成图片
diff --git a/src/app/ui/collection-tools-plan/collection-tools.component.ts b/src/app/ui/collection-tools-plan/collection-tools.component.ts
index 4c4fccb..945a463 100644
--- a/src/app/ui/collection-tools-plan/collection-tools.component.ts
+++ b/src/app/ui/collection-tools-plan/collection-tools.component.ts
@@ -1366,7 +1366,7 @@ export class CollectionToolsPlanComponent implements OnInit {
             this.map.setZoom(this.selectingSitePlan.zoomLevel); //设置地图层级
             this.map.setCenter([this.selectingSitePlan.defaultCenter.x, this.selectingSitePlan.defaultCenter.y])
         } else {
-            this.map.setCity('上海市');
+            this.map.setCity('广西壮族自治区');
         }
 
         this.map.on('click', (e) => {
diff --git a/src/modules/map/declare/gaode-map.ts b/src/modules/map/declare/gaode-map.ts
index 4fbef8e..4f2539f 100644
--- a/src/modules/map/declare/gaode-map.ts
+++ b/src/modules/map/declare/gaode-map.ts
@@ -86,7 +86,7 @@ export class GaoDeMap extends GaodeBasic implements IMap {
                 eventSupport: true, //打开事件支持
             });
 
-            let adcode = 310000 //上海行政编码
+            let adcode = 450000 //广西行政编码
             districtExplorer.loadAreaNode(adcode, (error, areaNode) => {
 
                 //更新地图视野
diff --git a/src/modules/map/declare/keda-map.ts b/src/modules/map/declare/keda-map.ts
index 7064f91..befe89e 100644
--- a/src/modules/map/declare/keda-map.ts
+++ b/src/modules/map/declare/keda-map.ts
@@ -10,9 +10,9 @@ class KedaBasic implements ISelf {
     self: any;
     discriminator: string = "ISelf";
 }
-const cityPosition: number[] = [121.469167918, 31.232262275]; //上海市 坐标
-const beforCity: string = "上海市"; //当前城市
-const cityCode: string = "310000"; //当前城市 行政编码
+const cityPosition: number[] = [108.2854170, 22.8616262]; //广西壮族自治区 坐标
+const beforCity: string = "广西壮族自治区"; //当前城市
+const cityCode: string = "450000"; //当前城市 行政编码
 
 export class KeDaMap extends KedaBasic implements IMap {
     public isLoadEnd:boolean = false
@@ -193,7 +193,7 @@ export class KeDaMap extends KedaBasic implements IMap {
     }
     setCity(city: string) {
         let that = this
-        if (city.includes("上海") && this.isLoadEnd) {
+        if (city.includes("广西壮族自治区") && this.isLoadEnd) {
             that.self.flyTo({
                 zoom: 9,
                 point: cityPosition
@@ -201,7 +201,7 @@ export class KeDaMap extends KedaBasic implements IMap {
         }
     }
     getCity(callback: Function) {
-        let autoOptions = { city: "上海" }
+        let autoOptions = { city: "广西壮族自治区" }
         return callback(autoOptions)
     }
     setZoom(zoom: number) {