[完善]放开其他预案选项

package.json

@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "scripts": {
     "ng": "ng",
-    "start": "ng serve --proxy-config  proxy.config.json  --open",
+    "start": "ng serve --proxy-config  proxy.config.json  --open --port 7542 ",
     "build": "ng build",
     "build-prod": "node --max_old_space_size=5048 ./node_modules/@angular/cli/bin/ng build --prod",
     "publish": "ng build --prod --verbose",

proxy.config.json

@@ -1,6 +1,6 @@
 {
     "/api": {
-      "target": "http://121.36.37.70:8201",
+      "target": "http://121.36.37.70:8205",
       "secure": false,
       "changeOrigin": true
     }

reset.css

@@ -1,27 +1,66 @@
 @charset "utf-8";
-html,body,ul,ol,dl,li,dt,dd,p,form,input,h1,h2,h3,h4,h5,h6,section,article,aside,header,footer,nav,figure,time,mark,main,canvas{
-	margin:0;
-	padding:0;
-	font-size:16px;
+html,
+body,
+ul,
+ol,
+dl,
+li,
+dt,
+dd,
+p,
+form,
+input,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+section,
+article,
+aside,
+header,
+footer,
+nav,
+figure,
+time,
+mark,
+main,
+canvas {
+	margin: 0;
+	padding: 0;
+	font-size: 16px;
 }
-b,strong,i,em,h1,h2,h3,h4,h5,h6{
-	font-weight:500;
-	font-style:normal;
+b,
+strong,
+i,
+em,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+	font-weight: 500;
+	font-style: normal;
 }
-img{
-	border:none;
+img {
+	border: none;
 }
-a{
+a {
 	text-decoration: none;
-	color:#000;
-ul,ol,li{
-	list-style:none;
+	color: #000;
 }
-.clearfn:after{
-	content:"";
-	clear:both;
+ul,
+ol,
+li {
+	list-style: none;
+}
+.clearfn:after {
+	content: "";
+	clear: both;
 	display: block;
-	overflow:hidden;
-	height:0;
+	overflow: hidden;
+	height: 0;
 	visibility: hidden;
-}
+}

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"

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"

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"

src/app/gis-management/gis-labeling/gis-labeling.component.ts

@@ -1044,7 +1044,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
@@ -1064,7 +1064,7 @@ export class GisLabelingComponent implements OnInit {
             layers: [layer],
             WebGLParams: { preserveDrawingBuffer: true }
         });
-        that.map.setCity('上海市');
+        that.map.setCity('唐山市');
         that.mouseTool = MapFactory.MouseToolInstance(that.map);
 
     }

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

src/app/key-unit/edit-plan-info/edit-plan-info.component.html

@@ -45,7 +45,7 @@
       <app-function-division></app-function-division>
     </ng-template>
   </mat-tab>
-  <mat-tab label="8.行车路线">
+  <!-- <mat-tab label="8.行车路线">
     <ng-template matTabContent>
       <app-router-gis></app-router-gis>
     </ng-template>
@@ -54,22 +54,22 @@
     <ng-template matTabContent>
       <app-water-road></app-water-road>
     </ng-template>
-  </mat-tab>
-  <mat-tab label="10.实景图">
+  </mat-tab> -->
+  <mat-tab label="8.实景图">
     <ng-template matTabContent>
       <app-realistic-picture></app-realistic-picture>
     </ng-template>
   </mat-tab>
-  <mat-tab label="11.上传CAD">
+  <mat-tab label="9.上传CAD">
     <ng-template matTabContent>
       <app-uploading-cad></app-uploading-cad>
     </ng-template>
   </mat-tab>
-  <mat-tab label="12.特别警示">
+  <!-- <mat-tab label="12.特别警示">
     <ng-template matTabContent>
       <app-special-warning></app-special-warning>
     </ng-template>
-  </mat-tab>
+  </mat-tab> -->
   <!-- <mat-tab label="12.unity平面图">
       <ng-template matTabContent>
         <iframe id="main" src="/unityApp2Basic/index.html" name="unityApp" frameborder="0" width="96%" height="100%" style="margin-left: 2%;"></iframe>

src/app/key-unit/edit-unit-info/edit-unit-info.component.html

@@ -5,7 +5,7 @@
   </div>
 </div>
 
-<mat-tab-group selectedIndex="10" style="height: 100%;">
+<mat-tab-group selectedIndex="7" style="height: 100%;">
     <mat-tab label="1.基本信息">
         <ng-template matTabContent>
             <app-basicinfo></app-basicinfo>
@@ -31,7 +31,7 @@
             <app-function-division></app-function-division>
         </ng-template>
     </mat-tab>
-    <mat-tab label="6.行车路线">
+    <!-- <mat-tab label="6.行车路线">
       <ng-template matTabContent>
          <app-router-gis></app-router-gis>
       </ng-template>
@@ -40,23 +40,23 @@
         <ng-template matTabContent>
           <app-water-road></app-water-road>
         </ng-template>
-    </mat-tab>
-    <mat-tab label="8.实景图">
+    </mat-tab> -->
+    <mat-tab label="6.实景图">
         <ng-template matTabContent>
           <app-realistic-picture></app-realistic-picture>
         </ng-template>
     </mat-tab>
-    <mat-tab label="9.上传CAD">
+    <mat-tab label="7.上传CAD">
         <ng-template matTabContent>
           <app-uploading-cad></app-uploading-cad>
         </ng-template>
     </mat-tab>
-    <mat-tab label="10.特别警示">
+    <!-- <mat-tab label="10.特别警示">
       <ng-template matTabContent>
         <app-special-warning></app-special-warning>
       </ng-template>
-    </mat-tab>
-    <mat-tab label="11.作战部署">
+    </mat-tab> -->
+    <mat-tab label="8.作战部署">
         <ng-template matTabContent>
             <app-collection-tools></app-collection-tools>
         </ng-template>

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('唐山市'); //设置地图中心点
   }
 
   //交换起始点

src/app/key-unit/view-unit-details-plan/view-unit-details-plan.component.html

@@ -1,4 +1,4 @@
-<mat-tab-group selectedIndex="10" style="height: 99%;" >
+<mat-tab-group selectedIndex="7" style="height: 99%;" >
     <mat-tab label="1.基本信息">
         <ng-template matTabContent>
             <app-basicinfo-look></app-basicinfo-look>
@@ -24,7 +24,7 @@
             <app-function-division-look></app-function-division-look>
         </ng-template>
     </mat-tab>
-    <mat-tab label="6.行车路线">
+    <!-- <mat-tab label="6.行车路线">
       <ng-template matTabContent>
          <app-router-gis></app-router-gis>
       </ng-template>
@@ -33,23 +33,23 @@
         <ng-template matTabContent>
           <app-water-road></app-water-road>
         </ng-template>
-    </mat-tab>
-    <mat-tab label="8.实景图">
+    </mat-tab> -->
+    <mat-tab label="6.实景图">
         <ng-template matTabContent>
             <app-realistic-picture-look></app-realistic-picture-look>
         </ng-template>
     </mat-tab>
-    <mat-tab label="9.上传CAD">
+    <mat-tab label="7.上传CAD">
         <ng-template matTabContent>
             <app-uploading-cad-look></app-uploading-cad-look>
         </ng-template>
     </mat-tab>
-    <mat-tab label="10.特别警示">
+    <!-- <mat-tab label="10.特别警示">
         <ng-template matTabContent>
           <app-special-warning></app-special-warning>
         </ng-template>
-      </mat-tab>
-    <mat-tab label="11.作战部署">
+      </mat-tab> -->
+    <mat-tab label="8.作战部署">
         <ng-template matTabContent>
           <app-collection-tools></app-collection-tools>
         </ng-template>

src/app/key-unit/view-unit-details/view-unit-details.component.html

@@ -44,7 +44,7 @@
             <app-function-division-look></app-function-division-look>
         </ng-template>
     </mat-tab>
-    <mat-tab label="8.行车路线">
+    <!-- <mat-tab label="8.行车路线">
         <ng-template matTabContent>
             <app-router-gis></app-router-gis>
         </ng-template>
@@ -53,22 +53,22 @@
         <ng-template matTabContent>
             <app-water-road></app-water-road>
         </ng-template>
-    </mat-tab>
-    <mat-tab label="10.实景图">
+    </mat-tab> -->
+    <mat-tab label="8.实景图">
         <ng-template matTabContent>
             <app-realistic-picture-look></app-realistic-picture-look>
         </ng-template>
     </mat-tab>
-    <mat-tab label="11.上传CAD">
+    <mat-tab label="9.上传CAD">
         <ng-template matTabContent>
             <app-uploading-cad-look></app-uploading-cad-look>
         </ng-template>
     </mat-tab>
-    <mat-tab label="12.特别警示">
+    <!-- <mat-tab label="12.特别警示">
         <ng-template matTabContent>
             <app-special-warning></app-special-warning>
         </ng-template>
-    </mat-tab>
+    </mat-tab> -->
     <!-- <mat-tab label="12.unity平面图">
       <ng-template matTabContent>
         <iframe id="main" src="/unityApp2Basic/index.html" name="unityApp" frameborder="0" width="96%" height="100%" style="margin-left:2%;"></iframe>

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

src/app/pages/home/home.component.ts

@@ -889,7 +889,7 @@ export class HomeComponent implements OnInit {
      
 
     //初始化地图
-    adcode:any = 310000 //行政编码 
+    adcode:any = 130200 //行政编码 
     mapInit () {
       //创建地图
       this.map = new AMap.Map('chartMap', {
@@ -1029,7 +1029,7 @@ export class HomeComponent implements OnInit {
         districtExplorer.on('outsideClick', (e) => {
           // console.log('区域外点击');
           this.chartsSetOption('','province')
-          adcode = 310000
+          adcode = 130200
           districtExplorer.loadAreaNode(adcode, (error, areaNode)=> {
             //更新地图视野
             // this.map.setBounds(areaNode.getBounds(), null, null, true);

src/app/pages/login/login.component.ts

@@ -74,10 +74,10 @@ export class LoginComponent implements OnInit {
 
             dialogRef.afterClosed().subscribe((data) => {
                 sessionStorage.setItem('isDefaultPassword', 'false')
-                this.lookUpdateData()
+                // this.lookUpdateData()
             });
         } else {
-            this.lookUpdateData()
+            // this.lookUpdateData()
         }
     }
 

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);

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);

src/app/plan-audit/plan-record/plan-record.component.html

@@ -32,18 +32,18 @@
                 <span>类型：</span>
                 <mat-form-field>
                   <mat-select placeholder='请选择单位类型' name="unittype" [(ngModel)]="projectlevel">
-                    <mat-option value="1">Ⅰ级预案</mat-option>
-                    <mat-option value="2">Ⅱ级预案</mat-option>
+                    <!-- <mat-option value="1">Ⅰ级预案</mat-option>
+                    <mat-option value="2">Ⅱ级预案</mat-option> -->
                     <mat-option value="3">Ⅲ级预案</mat-option>
                     <mat-option value="4">Ⅳ级预案</mat-option>
                     <mat-option value="5">Ⅴ级预案</mat-option>
-                    <mat-option value="6">应急预案(国家级)</mat-option>
-                    <mat-option value="7">应急预案(市级)</mat-option>
+                    <!-- <mat-option value="6">应急预案(国家级)</mat-option>
+                    <mat-option value="7">应急预案(市级)</mat-option> -->
                     <mat-option value="8">类型预案</mat-option>
                     <mat-option value="11">重点单位</mat-option>
-                    <mat-option value="12">消防水源</mat-option>
+                    <!-- <mat-option value="12">消防水源</mat-option>
                     <mat-option value="13">消防力量</mat-option>
-                    <mat-option value="14">联动力量</mat-option>
+                    <mat-option value="14">联动力量</mat-option> -->
                   </mat-select>
               </mat-form-field>
               <span>状态：</span>

src/app/plan-audit/wait-examineer/wait-examineer.component.html

@@ -17,18 +17,18 @@
             <span>类型：</span>
           <mat-form-field>
             <mat-select placeholder='请选择单位类型' name="unittype" [(ngModel)]="projectlevel">
-              <mat-option value="1">Ⅰ级预案</mat-option>
-              <mat-option value="2">Ⅱ级预案</mat-option>
+              <!-- <mat-option value="1">Ⅰ级预案</mat-option>
+              <mat-option value="2">Ⅱ级预案</mat-option> -->
               <mat-option value="3">Ⅲ级预案</mat-option>
               <mat-option value="4">Ⅳ级预案</mat-option>
               <mat-option value="5">Ⅴ级预案</mat-option>
-              <mat-option value="6">应急预案(国家级)</mat-option>
-              <mat-option value="7">应急预案(市级)</mat-option>
+              <!-- <mat-option value="6">应急预案(国家级)</mat-option>
+              <mat-option value="7">应急预案(市级)</mat-option> -->
               <mat-option value="8">类型预案</mat-option>
               <mat-option value="11">重点单位</mat-option>
-              <mat-option value="12">消防水源</mat-option>
+              <!-- <mat-option value="12">消防水源</mat-option>
               <mat-option value="13">消防力量</mat-option>
-              <mat-option value="14">联动力量</mat-option>
+              <mat-option value="14">联动力量</mat-option> -->
             </mat-select>
           </mat-form-field>
           <span class="bzjb">编制级别：</span>

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);

src/app/plan-management/entry-plan-look/AddPlanone.html

@@ -61,23 +61,20 @@
                             <input style="width: 175px;" type="file" name="" id="uploadFile" *ngIf="isup" (change)="filechange($event)">
                             <span *ngIf="uploadover" style="font-size: 13px;">(已上传)</span>
                         </div>
-                        <div *ngIf="inputword">
+                        <!-- <div *ngIf="inputword">
                           <mat-radio-button value="2" style="margin-right: 10px;">模板在线编制</mat-radio-button>
                         </div>
                         <div *ngIf="inputNew">
                           <mat-radio-button value="4" style="margin-right: 10px;">自定义在线编制</mat-radio-button>
-                        </div>
+                        </div> -->
 
                         <!-- <div *ngIf="inputword">
                           <mat-radio-button value="1" style="margin-right: 10px;">导入word文档</mat-radio-button>
                           <input type="file" name="" id="" *ngIf="isinput" (change)="fileInput($event)">
                         </div> -->
-                        <div *ngIf="pswShow">
-                          <!-- <mat-radio-group >
-                            <mat-radio-button   value='psw' >是否为全景图</mat-radio-button>
-                          </mat-radio-group> -->
+                        <!-- <div *ngIf="pswShow">
                           <mat-checkbox [(ngModel)]='psw' name='psw' style="margin-left: 2px;">是否为全景图</mat-checkbox>
-                        </div>
+                        </div> -->
                         <div *ngIf="onlineedit">
                             <mat-radio-button value="2">在线编辑</mat-radio-button>
                         </div>

src/app/plan-management/entry-plan-look/entry-plan-look.component.html

@@ -108,8 +108,8 @@
                     <th mat-header-cell *matHeaderCellDef>操作</th>
                     <td mat-cell *matCellDef="let element">
                         <span (click)="changeName(element)" *ngIf="element.auditStatus==8">改名</span>
-                        <span (click)="upzhuanMb(element)"
-                            *ngIf="element.planMode==1&&element.planType==16&&element.planCategory==5">转在线导入</span>
+                        <!-- <span (click)="upzhuanMb(element)"
+                            *ngIf="element.planMode==1&&element.planType==16&&element.planCategory==5">转在线导入</span> -->
                         <span (click)="editPlan(element)"
                             [ngClass]="{'grey': !(element.auditStatus!='16' && element.auditStatus != '1' )}">编辑</span>
                         <span (click)="lookPlan(element)"

src/app/plan-management/entry-plan/entry-plan.component.html

@@ -152,12 +152,12 @@
                         </mat-select>
                     </mat-form-field>
                 </div>
-                <div class="queryField" *ngIf="!padMore&&!pcMore">
+                <!-- <div class="queryField" *ngIf="!padMore&&!pcMore">
                     <mat-checkbox (ngModelChange)="templatePlanChange($event,1)" [(ngModel)]="templatePlan" name="templatePlan">模板录入预案</mat-checkbox>
                 </div>
                 <div class="queryField" *ngIf="!padMore&&!pcMore">
                     <mat-checkbox (ngModelChange)="templatePlanChange($event,2)" [(ngModel)]="customPlan" name="customPlan">自定义预案</mat-checkbox>
-                </div>
+                </div> -->
             </div>
         </form>
     </div>

src/app/plan-management/open-plan/open-plan.component.html

@@ -66,14 +66,14 @@
             </mat-select>
           </mat-form-field>
         </div>
-        <div class="queryField" *ngIf="!padMore">
+        <!-- <div class="queryField" *ngIf="!padMore">
           <mat-checkbox (ngModelChange)="templatePlanChange($event,1)" [(ngModel)]="templatePlan" name="templatePlan">
             模板录入预案</mat-checkbox>
         </div>
         <div class="queryField" *ngIf="!padMore">
           <mat-checkbox (ngModelChange)="templatePlanChange($event,2)" [(ngModel)]="customPlan" name="customPlan">自定义预案
           </mat-checkbox>
-        </div>
+        </div> -->
         <div class="queryField" *ngIf="pcfind">
           <button mat-raised-button color="primary">查询</button>
           <button mat-raised-button style="margin-left: 25px;" type="button" (click)="reset()">重置</button>

src/app/plan-management/pass-plan/pass-plan.component.html

@@ -90,11 +90,11 @@
           <label style="margin-right: 10px;">预案级别:</label>
           <mat-form-field>
             <mat-select placeholder='请选择预案级别' [(ngModel)]="planCategory" name="planCategory" [multiple]="true">
-              <mat-option value=6>应急预案(国家级)</mat-option>
-              <mat-option value=7>应急预案(市级)</mat-option>
+              <!-- <mat-option value=6>应急预案(国家级)</mat-option>
+              <mat-option value=7>应急预案(市级)</mat-option> -->
               <mat-option value=8>类型预案</mat-option>
-              <mat-option value=1>Ⅰ级预案</mat-option>
-              <mat-option value=2>Ⅱ级预案</mat-option>
+              <!-- <mat-option value=1>Ⅰ级预案</mat-option>
+              <mat-option value=2>Ⅱ级预案</mat-option> -->
               <mat-option value=3>Ⅲ级预案</mat-option>
               <mat-option value=4>Ⅳ级预案</mat-option>
               <mat-option value=5>Ⅴ级预案</mat-option>
@@ -131,14 +131,14 @@
             </mat-select>
           </mat-form-field>
         </div>
-        <div class="queryField" *ngIf="!padMore&&!pcMore">
+        <!-- <div class="queryField" *ngIf="!padMore&&!pcMore">
           <mat-checkbox (ngModelChange)="templatePlanChange($event,1)" [(ngModel)]="templatePlan" name="templatePlan">
             模板录入预案</mat-checkbox>
         </div>
         <div class="queryField" *ngIf="!padMore&&!pcMore">
           <mat-checkbox (ngModelChange)="templatePlanChange($event,2)" [(ngModel)]="customPlan" name="customPlan">自定义预案
           </mat-checkbox>
-        </div>
+        </div> -->
       </div>
 
     </form>

src/app/statistic-analysis/combined-query/combined-query.component.html

@@ -95,8 +95,8 @@
                 <label style="margin-right: 10px;">预案级别:</label>
                 <mat-form-field>
                   <mat-select placeholder='请选择预案级别' [(ngModel)]="planCategory" name="planCategory" [multiple]="true">
-                    <mat-option value=1>Ⅰ级预案</mat-option>
-                    <mat-option value=2>Ⅱ级预案</mat-option>
+                    <!-- <mat-option value=1>Ⅰ级预案</mat-option>
+                    <mat-option value=2>Ⅱ级预案</mat-option> -->
                     <mat-option value=3>Ⅲ级预案</mat-option>
                     <mat-option value=4>Ⅳ级预案</mat-option>
                     <mat-option value=5>Ⅴ级预案</mat-option>

src/app/tabbar/tabbar.component.html

@@ -230,30 +230,12 @@
         <mat-icon>help</mat-icon>
     </button>
     <mat-menu #appSetHelp="matMenu" yPosition="below" xPosition="after">
-        <button mat-menu-item (click)='lookUpdate()'>
-            <mat-icon>update</mat-icon>
-            <span>查看更新内容</span>
-        </button>
+
         <button mat-menu-item (click)="aFile('/assets/helpword/help.pdf','数字化预案编制管理平台手册.pdf')">
             <mat-icon>save_alt</mat-icon>
             <span>下载帮助文档</span>
         </button>
-        <button mat-menu-item (click)="aFile('/assets/helpword/plantemplate.zip','V级文本预案模板.zip')">
-            <mat-icon>save_alt</mat-icon>
-            <span>V级文本预案模板</span>
-        </button>
-        <button mat-menu-item (click)="aFile('/assets/helpword/plancustom.zip','V级预案自定义.zip')">
-            <mat-icon>save_alt</mat-icon>
-            <span>V级预案自定义</span>
-        </button>
-        <button mat-menu-item (click)="aFile('/assets/helpword/planonlineedit.zip','V级在线编制.zip')">
-            <mat-icon>save_alt</mat-icon>
-            <span>V级在线编制</span>
-        </button>
-        <button mat-menu-item (click)="aFile('/assets/helpword/planonlineimport.zip','V级预案转在线导入.zip')">
-            <mat-icon>save_alt</mat-icon>
-            <span>V级预案转在线导入</span>
-        </button>
+
     </mat-menu>
     <!-- 全屏  -->
     <button mat-button (click)="!isfullscreen?fullscreenToggle():closefullscreen()" class="fullscreen">

src/app/test/test.component.ts

@@ -18,7 +18,7 @@ export class TestComponent implements OnInit {
         }
       });
 
-      this.map.setCity('上海市');
+      this.map.setCity('唐山市');
     }, 0);
   }
   //生成图片

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) => {

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 = 130200 //上海行政编码
             districtExplorer.loadAreaNode(adcode, (error, areaNode) => {
 
                 //更新地图视野
@@ -184,7 +184,7 @@ export class GaoDeMap extends GaodeBasic implements IMap {
 
                 districtExplorer.on('outsideClick', (e) => {
                     setData && setData.call(component);
-                    let adcode = 310000
+                    let adcode = 130200
                     districtExplorer.loadAreaNode(adcode, (error, areaNode) => {
 
                         //设置定位节点，支持鼠标位置识别

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[] = [121.469167918, 31.232262275]; //唐山市 坐标
+const beforCity: string = "唐山市"; //当前城市
+const cityCode: string = "130200"; //当前城市 行政编码
 
 export class KeDaMap extends KedaBasic implements IMap {
     public isLoadEnd:boolean = false