[完善]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/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,121 +1,178 @@
-@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{
-	margin:0;
-	padding:0;
-}
-b,strong,i,em,h1,h2,h3,h4,h5,h6{
-	font-weight:500;
-	font-style:normal;
-}
-img{
-	border:none;
-}
-a{
+@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 {
+	margin: 0;
+	padding: 0;
+}
+b,
+strong,
+i,
+em,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+	font-weight: 500;
+	font-style: normal;
+}
+img {
+	border: none;
+}
+a {
 	text-decoration: none;
-  color:#000;
+	color: #000;
 }
-ul,ol,li{
-	list-style:none;
+ul,
+ol,
+li {
+	list-style: none;
 	overflow-x: hidden;
 }
-.clearfn:after{
-	content:"";
-	clear:both;
+.clearfn:after {
+	content: "";
+	clear: both;
 	display: block;
-	overflow:hidden;
-	height:0;
+	overflow: hidden;
+	height: 0;
 	visibility: hidden;
 }
 //root标签
-app-root{
+app-root {
 	height: 100%;
 }
 
-h1{
+h1 {
 	font-size: 16px;
 }
 .mat-expansion-panel-body {
 	padding: 0px !important;
 }
 .mat-expansion-indicator::after {
-    color: black;
+	color: black;
 }
 .example-sidenav .mat-drawer-inner-container {
 	overflow: hidden;
 }
-table th.mat-header-cell:last-of-type,table td.mat-cell:last-of-type,
-table td.mat-footer-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;
 }
-.mat-tab-body{
-  height: 100%;
-  overflow-y: auto;
+.mat-tab-body {
+	height: 100%;
+	overflow-y: auto;
 }
-.mat-drawer-backdrop.mat-drawer-shown{
-  background-color: #fff;
+.mat-drawer-backdrop.mat-drawer-shown {
+	background-color: #fff;
 }
-.mat-content { //可展开面板垂直居中
-  align-items: center;
+.mat-content {
+	//可展开面板垂直居中
+	align-items: center;
 }
 
 //x轴滚动条隐藏
-.example-sidenav-content { 
-	overflow-x: hidden; overflow-y: auto;
- }
-.mat-tab-body-wrapper{
-  overflow: auto!important
+.example-sidenav-content {
+	overflow-x: hidden;
+	overflow-y: auto;
+}
+.mat-tab-body-wrapper {
+	overflow: auto !important;
 }
 //滚动条样式
-::-webkit-scrollbar{
-  width: 5px;
-  background-color: white;
+::-webkit-scrollbar {
+	width: 5px;
+	background-color: white;
 }
-::-webkit-scrollbar-thumb{
-  background-color: #999;
+::-webkit-scrollbar-thumb {
+	background-color: #999;
 }
 
-#setPosition{
+#setPosition {
 	.custom-content-marker {
 		position: relative;
-		width: 29px;
-		height: 36px;
-	}
-	
-	.custom-content-marker img {
-		width: 100%;
-		height: 100%;
+		border: 1px solid red;
+		width: 68px;
+		height: 68px;
+		overflow: hidden;
+		display: flex;
+		justify-content: center;
+		.positionimg {
+			width: 30px;
+			height: 36px;
+		}
 	}
-	
+
 	.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;
-    	padding: 0 5px;
+		padding: 0 5px;
 		align-items: center;
-		img{
+		img {
 			width: 20px;
 			height: 20px;
 			cursor: pointer;
 		}
 	}
-	
-	.custom-content-marker .close-btn:hover{
+	.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;
 	}
 }
-