[完善]gis单位位置标注

src/app/interface.ts

@@ -2,7 +2,8 @@ export interface Data {
     token:string,
     refreshToken:string,
     expires: number,
-    realName:string
+    realName:string,
+    isDefaultPassword:any
 }
 
 export interface windows {

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

@@ -30,6 +30,7 @@ export class LoginComponent implements OnInit {
         password: e.password}).subscribe(
       (data: Data) => 
         {
+          sessionStorage.setItem("isDefaultPassword",data.isDefaultPassword);
           sessionStorage.setItem("token",data.token);
           this.cookieService.set("token",data.token,null,'/');
           this.cookieService.set("refreshToken",data.refreshToken,null,'/');

src/app/pages/register/register.component.html

@@ -60,13 +60,13 @@
             <label class="position"><mat-icon>lock</mat-icon></label>
             <mat-form-field>
               <input matInput id="password" name="password" type='password' #password="ngModel"
-              required pattern="^(?=.*[a-zA-Z])(?=.*[0-9])[A-Za-z0-9]{8,20}$"
+              required pattern="^(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.+[\!\@\#\$\%\^\&\*\(\)\-\=\\\`\_\+\|\~\[\]\{\}\;\'\:\,\.\/\<\>\?])[A-Za-z0-9\!\@\#\$\%\^\&\*\(\)\-\=\\\`\_\+\|\~\[\]\{\}\;\'\:\,\.\/\<\>\?]{8,32}$"
               ngModel placeholder="请输入密码">
             </mat-form-field>
           </div>
           <div *ngIf="password.invalid && (password.dirty || password.touched)" class="alert-danger">
             <div *ngIf="password.errors.pattern">
-              登录密码格式为8-20位字母+数字
+              登录密码格式为8-20位,大小写字母+数字+特殊字符
             </div>
           </div>
 

src/app/ui/basicinfo/basicinfo.component.html

@@ -10,7 +10,7 @@
             <div class="topbox">
                 <form (ngSubmit)="onSubmit(form.value,form.invalid,form)" #form="ngForm" class="example-container">
                     <div class="mainbox" >
-                        <div class="mainleft">
+                        <div class="mainleft" style="display: none;">
                             <div class="inputbox" >
                                 <span style="color: red;">*</span>
                                 <span>统一社会信用代码：</span>

src/app/ui/basicinfo/basicinfo.component.ts

@@ -91,7 +91,14 @@ export class BasicinfoComponent implements OnInit {
     this.getallunittype()
     this.getorganization()
     this.getUnitAllBuildings()//获得单位下所有建筑
+    if (sessionStorage.getItem('isDefaultPassword') == 'true') {
+      let dialogRef = this.dialog.open(ChangepasswordComponent2,
+        { width: '268px' });
 
+      dialogRef.afterClosed().subscribe((data) => {
+        sessionStorage.setItem('isDefaultPassword', 'false')
+      });
+    }
   }
   //获得单位下所有建筑
   getUnitAllBuildings() {
@@ -120,16 +127,18 @@ export class BasicinfoComponent implements OnInit {
 
   newPositionMarkerContent: any =
     '<div class="custom-content-marker">' +
-  '   <img src="/assets/images/newposition.png">' +
+    '   <img class="positionimg" src="/assets/images/newposition.png">' +
+    '   <div class="btnbox2"></div>' +
     '</div>'
   newPositionMarkerContentBtn: any =
     '<div class="custom-content-marker">' +
-  '   <img src="/assets/images/newposition.png">' +
+    '   <img class="positionimg" src="/assets/images/newposition.png">' +
     '   <div class="btnbox"><img id="setPositionOk" src="/assets/images/ok.png"><span>|</span><img id="setPositionClose" src="/assets/images/close.png"></div>' +
     '</div>'
   oldPositionMarkerContent: any =
     '<div class="custom-content-marker">' +
-  '   <img src="/assets/images/oldposition.png">' +
+    '   <img class="positionimg" src="/assets/images/oldposition.png">' +
+    '   <div class="btnbox2"></div>' +
     '</div>'
   //初始化地图
   searchTitle: any//搜索内容
@@ -156,6 +165,9 @@ export class BasicinfoComponent implements OnInit {
     this.map.on('complete', () => {
       this.isGisTopBox = true
     });
+    this.map.on('click', (e) => {
+      console.log(e.lnglat)
+    });
     //输入提示
     var autoOptions = {
       input: "tipinput"
@@ -164,8 +176,6 @@ export class BasicinfoComponent implements OnInit {
       var auto = new AMap.AutoComplete(autoOptions);
       this.placeSearch = new AMap.PlaceSearch();  //构造地点查询类
       auto.on("select", (e) => {
-          // console.log(e)
-          // console.log( this.newPositionMarker)
         this.newPositionMarker.setPosition([e.poi.location.lng, e.poi.location.lat])
         this.markerPosition2 = { x: e.poi.location.lng, y: e.poi.location.lat }
         this.map.setCenter([e.poi.location.lng, e.poi.location.lat]); //设置地图中心点
@@ -179,7 +189,7 @@ export class BasicinfoComponent implements OnInit {
       this.oldPositionMarker = new AMap.Marker({
         position: [this.unitinfo.location.x, this.unitinfo.location.y],
         content: this.newPositionMarkerContent,
-      offset: new AMap.Pixel(-15, -18)
+        offset: new AMap.Pixel(-0, -0)
       })
       // 将 markers 添加到地图
       this.map.add(this.oldPositionMarker);
@@ -195,7 +205,6 @@ export class BasicinfoComponent implements OnInit {
     this.isGisTopBoxTwo = true
     if (this.isMapLabel) {//如果已经标注单位坐标
       // console.log('已标注单位位置')
-
       if (this.oldPositionMarker) {
         this.oldPositionMarker.setContent(this.oldPositionMarkerContent)
       }
@@ -207,7 +216,7 @@ export class BasicinfoComponent implements OnInit {
         draggable: true,
         position: [this.markerPosition.x, this.markerPosition.y],
         content: this.newPositionMarkerContentBtn,
-          offset: new AMap.Pixel(-15, -18)
+        offset: new AMap.Pixel(-0, -0)
       });
       this.map.add(this.newPositionMarker);
 
@@ -218,7 +227,10 @@ export class BasicinfoComponent implements OnInit {
         this.markerPosition2 = { x: this.map.getCenter().lng, y: this.map.getCenter().lat }  //获取当前地图中心位置
       }
       this.newPositionMarker.on('dragend', (e) => {
-        this.markerPosition2 = {x: e.lnglat.lng, y: e.lnglat.lat}
+        this.markerPosition2 = { x: e.lnglat.KL, y: e.lnglat.kT }
+      })
+      this.newPositionMarker.on('dragging', (e) => {
+        this.newPositionMarker.setPosition(new AMap.LngLat(e.lnglat.lng,e.lnglat.lat));
       })
       //点击确定
       this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionOk'), 'click', (event) => {
@@ -228,7 +240,7 @@ export class BasicinfoComponent implements OnInit {
         this.newPositionMarker = new AMap.Marker({
           position: [this.markerPosition2.x, this.markerPosition2.y],
           content: this.newPositionMarkerContent,
-          offset: new AMap.Pixel(-15, -18)
+          offset: new AMap.Pixel(-0, -0)
         });
         this.markerPosition = this.markerPosition2
         this.map.add(this.newPositionMarker);
@@ -241,7 +253,7 @@ export class BasicinfoComponent implements OnInit {
         this.newPositionMarker = new AMap.Marker({
           position: [this.markerPosition.x, this.markerPosition.y],
           content: this.newPositionMarkerContent,
-          offset: new AMap.Pixel(-15, -18)
+          offset: new AMap.Pixel(-0, -0)
         });
         this.map.setCenter([this.markerPosition.x, this.markerPosition.y]); //设置地图中心点
         this.map.add(this.newPositionMarker);
@@ -253,10 +265,12 @@ export class BasicinfoComponent implements OnInit {
         this.newPositionMarker.setContent(this.oldPositionMarkerContent)
       }
       let center
+      //this.markerPosition---单位坐标
       if (this.markerPosition.x && this.markerPosition.x != 0) {
         center = [this.markerPosition.x, this.markerPosition.y]
       } else {
         center = this.map.getCenter(); //获取当前地图中心位置
+        console.log('获取当前地图中心位置', center)
         this.map.setCenter(center);
       }
 
@@ -264,18 +278,24 @@ export class BasicinfoComponent implements OnInit {
         draggable: true,
         position: center,
         content: this.newPositionMarkerContentBtn,
-          offset: new AMap.Pixel(-15, -18)
+        offset: new AMap.Pixel(-0, -0)
       });
       this.map.add(this.newPositionMarker);
 
-      // let markerPosition 
       if (this.markerPosition.x && this.markerPosition.x != 0) {
         this.markerPosition2 = { x: this.markerPosition.x, y: this.markerPosition.y }
       } else {
         this.markerPosition2 = { x: this.map.getCenter().lng, y: this.map.getCenter().lat }  //获取当前地图中心位置
       }
       this.newPositionMarker.on('dragend', (e) => {
-        this.markerPosition2 = {x: e.lnglat.lng, y: e.lnglat.lat}
+        this.markerPosition2 = { x: e.lnglat.KL, y: e.lnglat.kT }
+      })
+      this.newPositionMarker.on('dragging', (e) => {
+        console.log('dragging',e)
+        this.newPositionMarker.setPosition(new AMap.Pixel(e.pixel.x,e.pixel.y));
+        // let xxx = this.map.pixelToLngLat(e.pixel,this.map.getZoom())
+        // console.log(xxx)
+        // this.newPositionMarker.setPosition(xxx);
       })
       //点击确定
       this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionOk'), 'click', (event) => {
@@ -286,9 +306,9 @@ export class BasicinfoComponent implements OnInit {
         this.newPositionMarker = new AMap.Marker({
           position: [ this.markerPosition.x, this.markerPosition.y],
           content: this.newPositionMarkerContent,
-          offset: new AMap.Pixel(-15, -18)
+          offset: new AMap.Pixel(-0, -0)
         });
-        this.map.add(this.newPositionMarker);
+        this.newPositionMarker.setMap(this.map)
       })
       this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionClose'), 'click', (event) => {
         this.map.clearMap();
@@ -298,7 +318,7 @@ export class BasicinfoComponent implements OnInit {
           this.newPositionMarker = new AMap.Marker({
             position: [this.markerPosition.x, this.markerPosition.y],
             content: this.newPositionMarkerContent,
-            offset: new AMap.Pixel(-15, -18)
+            offset: new AMap.Pixel(-0, -0)
           });
           this.map.setCenter([this.markerPosition.x, this.markerPosition.y]); //设置地图中心点
           this.map.add(this.newPositionMarker);
@@ -489,9 +509,11 @@ export class BasicinfoComponent implements OnInit {
       }
       this.houses[this.selectedBuildingIndex].data = data
       //获得自定义信息
-      this.http.get("/api/CompanyAccount/BuildingCustomData",{params:{ //-----处理建筑自定义属性部分
+      this.http.get("/api/CompanyAccount/BuildingCustomData", {
+        params: { //-----处理建筑自定义属性部分
           buildingId: this.houses[this.selectedBuildingIndex].id
-        }}).subscribe((data:any)=>{
+        }
+      }).subscribe((data: any) => {
         if (data && data.customProperties.length != 0) {
           this.houses[this.selectedBuildingIndex].customData = data
           this.houses[this.selectedBuildingIndex].isCustomData = true
@@ -1053,16 +1075,20 @@ export class BasicinfoComponent implements OnInit {
 
       //保存建筑自定义信息
       if (item.isCustomData) {
-        this.http.post("/api/CompanyAccount/BuildingCustomData",item.customData,{params:{
+        this.http.post("/api/CompanyAccount/BuildingCustomData", item.customData, {
+          params: {
             buildingId: item.id
-        }}).subscribe(data=>{
+          }
+        }).subscribe(data => {
 
         })
       } else {
         item.customData.customProperties = []
-        this.http.post("/api/CompanyAccount/BuildingCustomData",item.customData,{params:{
+        this.http.post("/api/CompanyAccount/BuildingCustomData", item.customData, {
+          params: {
             buildingId: item.id
-        }}).subscribe(data=>{
+          }
+        }).subscribe(data => {
 
         })
       }
@@ -1133,3 +1159,41 @@ export class BasicinfoComponent implements OnInit {
     })
   }
 }
+
+
+@Component({
+  selector: 'app-changepassword',
+  templateUrl: './changePassword.html',
+  styleUrls: ['./changepassword.scss']
+})
+
+export class ChangepasswordComponent2 implements OnInit {
+
+  constructor(private http: HttpClient, public snackBar: MatSnackBar,
+    public dialogRef: MatDialogRef<ChangepasswordComponent2>) { }
+
+  ngOnInit() {
+  }
+  errmsg: string = ''
+
+  onSubmit(e) {
+    this.http.put(
+      '/api/CompanyAccount/Password',
+      {
+        newPassword: e.newPassword,
+        password: e.password
+      }
+    ).subscribe(data => {
+      this.dialogRef.close(data);
+      const config = new MatSnackBarConfig();
+      config.verticalPosition = 'top';
+      config.duration = 3000
+      this.snackBar.open('密码修改成功', '确定', config);
+    }, (err) => { this.errmsg = err }
+    )
+  }
+
+
+
+}
+

src/app/ui/basicinfo/changePassword.html

@@ -0,0 +1,48 @@
+<div mat-dialog-title>
+    修改密码
+</div>
+<div class="passwordCard" mat-dialog-content>
+
+    <form (ngSubmit)="onSubmit(form.value)" #form="ngForm" class="example-container">
+
+        <!-- <span class="cardLeft">原密码</span>
+        <mat-form-field>
+            <input matInput id="password" name="password"
+            required type="password"
+            ngModel #password="ngModel" placeholder="请输入原密码">
+        </mat-form-field> -->
+
+        <span class="cardLeft">新密码</span>
+        <mat-form-field>
+            <input matInput id="newPassword" name="newPassword" type="password"
+            required pattern="^(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.+[\!\@\#\$\%\^\&\*\(\)\-\=\\\`\_\+\|\~\[\]\{\}\;\'\:\,\.\/\<\>\?])[A-Za-z0-9\!\@\#\$\%\^\&\*\(\)\-\=\\\`\_\+\|\~\[\]\{\}\;\'\:\,\.\/\<\>\?]{8,32}$"
+            ngModel #newPassword="ngModel" placeholder="请输入新密码">
+        </mat-form-field>
+        <div *ngIf="newPassword.invalid && (newPassword.dirty || newPassword.touched)">
+            <div class="group-error-content">密码格式为8-20位,大小写字母+数字+特殊字符</div>
+        </div>
+
+        <span class="cardLeft">确认新密码</span>
+        <mat-form-field>
+            <input matInput id="newsPassword" name="newsPassword" type="password"
+            required 
+            ngModel #newsPassword="ngModel" placeholder="请确认新密码"
+            [appConfirmpsw] = "newPassword.value">
+        </mat-form-field>
+        <div *ngIf="newsPassword.touched&&newsPassword.invalid">
+            <div class="group-error-content">密码输入不一致！</div>
+        </div>
+        <div *ngIf="errmsg" class="group-error-content">
+            {{errmsg}}
+        </div>
+
+        <div mat-dialog-actions class="btnbox">
+            <button mat-raised-button color="primary" type="submit" 
+            [disabled]="!form.form.valid">
+                确定
+            </button>
+            <button mat-raised-button color="primary" mat-dialog-close>取消</button>
+        </div>
+
+    </form>
+</div>

src/app/ui/basicinfo/changePassword.scss

@@ -0,0 +1,15 @@
+.passwordCard {
+    width: 300px;
+    height: 100%;
+}
+.mat-form-field {
+    display: block;
+    width: 300px;
+}
+.group-error-content {
+    font-size: 12px;
+    color: red;
+}
+.mat-dialog-content {
+    overflow: visible
+}

src/app/ui/changepassword/changepassword.component.html

@@ -15,11 +15,11 @@
         <span class="cardLeft">新密码</span>
         <mat-form-field>
             <input matInput id="newPassword" name="newPassword" type="password"
-            required pattern="^(?=.*[a-zA-Z])(?=.*[0-9])[A-Za-z0-9]{8,20}$"
+            required pattern="^(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.+[\!\@\#\$\%\^\&\*\(\)\-\=\\\`\_\+\|\~\[\]\{\}\;\'\:\,\.\/\<\>\?])[A-Za-z0-9\!\@\#\$\%\^\&\*\(\)\-\=\\\`\_\+\|\~\[\]\{\}\;\'\:\,\.\/\<\>\?]{8,32}$"
             ngModel #newPassword="ngModel" placeholder="请输入新密码">
         </mat-form-field>
         <div *ngIf="newPassword.invalid && (newPassword.dirty || newPassword.touched)">
-            <div class="group-error-content">密码格式8-20位,字母+数字</div>
+            <div class="group-error-content">密码格式8-20位,大小写字母+数字+特殊字符</div>
         </div>
 
         <span class="cardLeft">确认新密码</span>

src/app/ui/ui.module.ts

@@ -49,7 +49,7 @@ import { IsnoPipe } from '../pipes/boolean.pipe';
 import {ConfirmpswDirective} from './changepassword/equal-validator.directive';
 import { TimePipe } from '../pipes/time.pipe';
 import { FileUploadModule } from 'ng2-file-upload';
-import { BasicinfoComponent } from './basicinfo/basicinfo.component';
+import { BasicinfoComponent, ChangepasswordComponent2 } from './basicinfo/basicinfo.component';
 import { PlanComponent } from './plan/plan.component';
 import { AllaroundComponent } from './allaround/allaround.component';
 import { FireFightingDeviceComponent } from './fire-fighting-device/fire-fighting-device.component';
@@ -69,7 +69,7 @@ import { WorkingAreaComponent } from '../working-area/working-area.component';
 import {leftFunctionalDomainComponent,editPlaneFigureComponent} from './collection-tools/leftFunctionalDomain'
 import { PaginatorModule } from './paginator/paginator.module';
 @NgModule({
-  declarations: [UserdataComponent, ChangepasswordComponent, IsnoPipe, ConfirmpswDirective, TimePipe, EditUser, BasicinfoComponent, PlanComponent, AllaroundComponent, FireFightingDeviceComponent, KeySiteComponent, FunctionDivisionComponent, RealisticPictureComponent, UploadingCADComponent, AddHouseInfo, ImgDetails, ImagesData, ImgsDataDetail, KeySiteImgs, KeyImgDetail, addPartition, addPartitionAttribute, previewImg, addRealPicture, editRealPicture, readFile, editFile, LookMaster, previewBigImg, CollectionToolsComponent, WorkingAreaComponent,CreateBuilding,EditBuilding,leftFunctionalDomainComponent,editPlaneFigureComponent,ViewDetails
+  declarations: [UserdataComponent, ChangepasswordComponent, IsnoPipe, ConfirmpswDirective, TimePipe, EditUser, BasicinfoComponent, PlanComponent, AllaroundComponent, FireFightingDeviceComponent, KeySiteComponent, FunctionDivisionComponent, RealisticPictureComponent, UploadingCADComponent, AddHouseInfo, ImgDetails, ImagesData, ImgsDataDetail, KeySiteImgs, KeyImgDetail, addPartition, addPartitionAttribute, previewImg, addRealPicture, editRealPicture, readFile, editFile, LookMaster, previewBigImg, CollectionToolsComponent, WorkingAreaComponent,CreateBuilding,EditBuilding,leftFunctionalDomainComponent,editPlaneFigureComponent,ViewDetails,ChangepasswordComponent2
   ],
 
   imports: [

src/styles.scss

@@ -1,16 +1,51 @@
-@import './app/theme.scss';
-html,body{
+@import "./app/theme.scss";
+html,
+body {
 	width: 100%;
 	height: 100%;
 	margin: 0 auto;
 	padding: 0;
 	overflow: hidden;
 }
-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{
+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;
 }
-b,strong,i,em,h1,h2,h3,h4,h5,h6{
+b,
+strong,
+i,
+em,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
 	font-weight: 500;
 	font-style: normal;
 }
@@ -21,7 +56,9 @@ a{
 	text-decoration: none;
 	color: #000;
 }
-ul,ol,li{
+ul,
+ol,
+li {
 	list-style: none;
 	overflow-x: hidden;
 }
@@ -50,7 +87,8 @@ h1{
 .example-sidenav .mat-drawer-inner-container {
 	overflow: hidden;
 }
-table th.mat-header-cell:last-of-type,table td.mat-cell:last-of-type,
+table th.mat-header-cell:last-of-type,
+table td.mat-cell:last-of-type,
 table td.mat-footer-cell:last-of-type {
 	padding-right: 0px;
 }
@@ -61,16 +99,18 @@ table td.mat-footer-cell:last-of-type{
 .mat-drawer-backdrop.mat-drawer-shown {
 	background-color: #fff;
 }
-.mat-content { //可展开面板垂直居中
+.mat-content {
+	//可展开面板垂直居中
 	align-items: center;
 }
 
 //x轴滚动条隐藏
 .example-sidenav-content {
-	overflow-x: hidden; overflow-y: auto;
+	overflow-x: hidden;
+	overflow-y: auto;
 }
 .mat-tab-body-wrapper {
-  overflow: auto!important
+	overflow: auto !important;
 }
 //滚动条样式
 ::-webkit-scrollbar {
@@ -84,24 +124,27 @@ table td.mat-footer-cell:last-of-type{
 #setPosition {
 	.custom-content-marker {
 		position: relative;
-		width: 29px;
+		border: 1px solid red;
+		width: 68px;
+		height: 68px;
+		overflow: hidden;
+		display: flex;
+		justify-content: center;
+		.positionimg {
+			width: 30px;
 			height: 36px;
 		}
-	
-	.custom-content-marker img {
-		width: 100%;
-		height: 100%;
 	}
 
 	.custom-content-marker .btnbox {
 		position: absolute;
-		left: -20px;
-		bottom: -36px;
+		left: 0px;
+		bottom: 0px;
 		width: 68px;
 		height: 30px;
-		background:#FFFFFF;
+		background: #ffffff;
 		border-radius: 60px;
-		color: #EBEBEB;
+		color: #ebebeb;
 		display: flex;
 		justify-content: space-around;
 		box-sizing: border-box;
@@ -113,9 +156,23 @@ table td.mat-footer-cell:last-of-type{
 			cursor: pointer;
 		}
 	}
+	.custom-content-marker .btnbox2 {
+		position: absolute;
+		left: 0px;
+		bottom: 0px;
+		width: 68px;
+		height: 30px;
+		opacity: 0;
+		border-radius: 60px;
+		color: #ebebeb;
+		display: flex;
+		justify-content: space-around;
+		box-sizing: border-box;
+		padding: 0 5px;
+		align-items: center;
+	}
 
 	.custom-content-marker .close-btn:hover {
 		background: #666;
 	}
 }
-