-
\ No newline at end of file
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 1f66ece..a1b8c38 100644
--- a/src/app/key-unit/water-road/water-road.component.ts
+++ b/src/app/key-unit/water-road/water-road.component.ts
@@ -1,7 +1,9 @@
+import { HttpClient } from '@angular/common/http';
import { Component, ElementRef, Inject, OnInit, Renderer2 } from '@angular/core';
import { FormBuilder, FormControl, FormGroup } from '@angular/forms';
import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
+import { ActivatedRoute } from '@angular/router';
declare var AMap: any;
@Component({
@@ -11,17 +13,28 @@ declare var AMap: any;
})
export class WaterRoadComponent implements OnInit {
- constructor(public renderer2: Renderer2,public snackBar: MatSnackBar,public dialog: MatDialog,private fb: FormBuilder) { }
+ constructor(private http: HttpClient,public renderer2: Renderer2,public snackBar: MatSnackBar,public dialog: MatDialog,private fb: FormBuilder,private route:ActivatedRoute) { }
+
+ //获得单位信息
+ unitData:any
+
+ async getUnitData(){
+ await new Promise((resolve, reject) =>{
+ this.http.get(`/api/Companies/${this.route.snapshot.queryParams.id}`).subscribe(data => {
+ this.unitData = data
+ resolve(data)
+ })
+ })
+ }
map:any //地图
- markers:any = [{_position: [121.472644,31.231706]}] //当前单位坐标
watertForm:FormGroup //gis右上角水源表单
waterList = [
- {id:'0',name:'消火栓',selected:false},
- {id:'1',name:'消防水池',selected:false},
- {id:'2',name:'天然水源',selected:false},
+ {id:'0',name:'消火栓',selected:true},
+ {id:'1',name:'消防水池',selected:true},
+ {id:'2',name:'天然水源',selected:true},
]
- waterAreaDefault:any = '0' //默认水源范围
+ waterAreaDefault:any = '5000' //默认水源范围
selectedWaterList:any = [] //选择提交的水源
//地图范围圆圈---水源
circleofwater = new AMap.Circle({
@@ -32,11 +45,11 @@ export class WaterRoadComponent implements OnInit {
strokeStyle: 'dashed',
strokeDasharray: [10, 10],
// 线样式还支持 'dashed'
- fillColor: '#ee2200',
+ fillColor: '#1791fc',
zIndex: 50,
})
- ngOnInit(): void {
+ async ngOnInit(): Promise
- 说明:
- 水源情况主要包括消火栓位置、管径、外观完好情况、停车取水位置试水情况，消防水池位置、容量、停车取水位置、取水测试情况，取消码头位置、水位、停车取水位置等；道路情况主要包括道路长度、宽度、起始点、沿线重点单位、立交、桥梁、涵洞及其通车能力。
- 【该项主要在道路水源熟悉时填写】
-
-
-
-
-
-
-确认
- 取消
- ' +
+ ' 
' +
+ '
'
creatMap(){
- let that = this
- var layer = new AMap.createDefaultLayer({
- zooms:[3,20], //可见级别
- visible:true, //是否可见
- opacity:1, //透明度
- zIndex:0, //叠加层级
- resizeEnable: true //是否监控地图容器尺寸变化,
- })
- that.map = new AMap.Map('center',{
- layers:[layer], //当只想显示标准图层时layers属性可缺省,
+ this.map = new AMap.Map('center',{
+ zoom: 13, //初始地图级别
});
- that.map.setCity('上海市');
+ if(this.unitData.location && this.unitData.location.x){
+ this.map.setCenter([this.unitData.location.x,this.unitData.location.y]);
+ this.unitMarker = new AMap.Marker({
+ position: [this.unitData.location.x,this.unitData.location.y],
+ content: this.newPositionMarkerContent,
+ offset: new AMap.Pixel(-10, -13)
+ })
+ // 将 markers 添加到地图
+ this.map.add(this.unitMarker);
+ this.waterSubmit(1)
+ }else{
+ this.map.setCity('上海市');
+ let config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('请先前往基本信息标注单位位置','确定',config);
+ }
+
}
}
-
-//编辑水源道路情况
-@Component({
- selector: 'app-editBuilding',
- templateUrl: './edittext.html',
- styleUrls: ['./water-road.component.scss']
-})
-export class EditText {
-
- constructor(public snackBar: MatSnackBar,public dialog: MatDialog,public dialogRef: MatDialogRef' +
+ '
@@ -97,7 +97,7 @@
-
-
|
{{item.contentType=='1'?'Ⅰ级预案':item.contentType=='2'?'Ⅱ级预案':item.contentType=='3'?'Ⅲ级预案':item.contentType=='4'?'Ⅳ级预案':item.contentType=='5'?
@@ -118,7 +118,7 @@
-
diff --git a/src/app/plan-audit/plan-record/plan-record.component.scss b/src/app/plan-audit/plan-record/plan-record.component.scss
index 14ee4bc..8698bd7 100644
--- a/src/app/plan-audit/plan-record/plan-record.component.scss
+++ b/src/app/plan-audit/plan-record/plan-record.component.scss
@@ -41,8 +41,9 @@
}
table{
//margin: 20px 20px;
- margin-left: 20px;
- width: 97%;
+ margin-left: 10px;
+ margin-right: 10px;
+ width: 97.5%;
//border: 1px solid #2196F3;
thead{
@@ -64,6 +65,17 @@
width: 55%;
background-color: #FFFFFF;
margin-left: 10px;
+ .word{
+ width: 100%;
+ height: 100%;
+ //margin: 10px 10px 0 10px;
+ iframe{
+ height: 94%;
+ width: 97%;
+ margin: 30px 10px 10px 10px;
+ overflow-y: auto;
+ }
+ }
}
}
th,td{
@@ -77,6 +89,7 @@ th,td{
//滚动条样式
::-webkit-scrollbar{
+ margin-right: 3px;
width: 6px;
background-color: white;
}
diff --git a/src/app/plan-audit/plan-record/plan-record.component.ts b/src/app/plan-audit/plan-record/plan-record.component.ts
index 3fc1f35..93550be 100644
--- a/src/app/plan-audit/plan-record/plan-record.component.ts
+++ b/src/app/plan-audit/plan-record/plan-record.component.ts
@@ -4,12 +4,14 @@
* @Author: sueRimn
* @Date: 2020-12-25 10:19:31
* @LastEditors: sueRimn
- * @LastEditTime: 2021-01-21 10:15:50
+ * @LastEditTime: 2021-01-28 13:40:31
*/
import { Component, OnInit } from '@angular/core';
import { FormControl } from '@angular/forms';
import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
import { HttpClient } from '@angular/common/http'
+import { DomSanitizer } from '@angular/platform-browser';
+import CryptoJS from 'crypto-js/crypto-js'
@Component({
selector: 'app-plan-record',
@@ -18,7 +20,7 @@ import { HttpClient } from '@angular/common/http'
})
export class PlanRecordComponent implements OnInit {
- constructor(private http:HttpClient,public snackBar: MatSnackBar) { }
+ constructor(private http:HttpClient,public snackBar: MatSnackBar,private sanitizer: DomSanitizer) { }
ngOnInit(): void {
let level = sessionStorage.getItem("level");
@@ -52,8 +54,13 @@ export class PlanRecordComponent implements OnInit {
]
this.PlanLevel=3
}
+ this.iframeSrc=this.sanitizer.bypassSecurityTrustResourceUrl(this.src);
this.getAlltabledate()
}
+
+ wordShow=true
+ iframeSrc
+ src=''
selected = new FormControl(0); //选项卡 实例
preparelevels:any
level=''//类型
@@ -109,5 +116,40 @@ export class PlanRecordComponent implements OnInit {
}
this.getAlltabledate()
}
+ //表格点击事件
+ tableClick(e,item){
+ //e.target.parentElement.bgColor='#2196F3'
+ //console.log(e,item)
+ let filename:string
+ let fetchUrl
+ this.http.get(`/api/PlanComponents/${item.itemId}`).subscribe((data:any)=>{
+ fetchUrl=data.attachmentUrls[0]
+ this.http.get(`/api/ObjectMetadata/PlanPlatform/${fetchUrl}`).subscribe((data:any)=>{
+ filename=data.fileName
+ let json={
+ doc: {
+ docId: item.id,
+ title: filename,
+ //title: filename,
+ fetchUrl: "http://39.106.78.171:8000/api/Objects/PlanPlatform/"+fetchUrl
+ },
+ user: {
+ uid: "test",
+ nickName: "test",
+ avatar: "",
+ privilege: [
+ 'FILE_READ','FILE_DOWNLOAD', 'FILE_PRINT'
+ ],
+ },
+ }
+ var stringjson=JSON.stringify(json)
+ var wordArray = CryptoJS.enc.Utf8.parse(stringjson);
+ var base64 = CryptoJS.enc.Base64.stringify(wordArray);
+ this.src=`http://121.5.10.84/apps/editor/openPreview?data=${base64}`
+ this.iframeSrc=this.sanitizer.bypassSecurityTrustResourceUrl(this.src);
+ //window.open(`http://121.5.10.84/apps/editor/openPreview?data=${base64}`)
+ })
+ })
+ }
}
diff --git a/src/app/plan-audit/wait-examineer/wait-examineer.component.html b/src/app/plan-audit/wait-examineer/wait-examineer.component.html
index fccb149..87f144e 100644
--- a/src/app/plan-audit/wait-examineer/wait-examineer.component.html
+++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.html
@@ -54,7 +54,7 @@
+
+
|
|
-
+
@@ -87,7 +87,7 @@
+
+
+
+
-
+
\ No newline at end of file
diff --git a/src/app/plan-management/maintain-up/maintain-up.component.scss b/src/app/plan-management/maintain-up/maintain-up.component.scss
new file mode 100644
index 0000000..1c435e5
--- /dev/null
+++ b/src/app/plan-management/maintain-up/maintain-up.component.scss
@@ -0,0 +1,256 @@
+.header {
+ width: 100%;
+ padding: 12px 10px;
+ // margin-bottom: 10px;
+ box-sizing: border-box;
+ // border-bottom: 1px solid black;
+ .queryBox {
+ box-sizing: border-box;
+ padding: 5px 25px 0 25px;
+ display: flex;
+ flex-direction: row;
+ flex-wrap: wrap;
+ align-items:center;
+ // justify-content:center;
+ .queryField {
+ margin: 0 40px;
+ input {
+ width: 180px;
+ height: 22px;
+ line-height: 22px;
+ border-radius: 3px;}
+ }
+
+ } //queryBox
+ .butclass{
+ button{
+ width: 80px;height: 36px;
+ font-size: 16px;
+ }
+ }
+ .ordiv{
+ position: relative;
+
+ .organizationbox{
+ width:450px;
+ height: 200px;
+ background: white;
+ position: absolute;
+ top: 48px;
+ left: 77px;
+ z-index: 999;
+ border: 1px solid grey;
+ overflow-y: auto;
+ background-color: #fafafa;
+ li{
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ background-color: #fafafa;
+ }
+ mat-tree-node{
+ cursor: pointer;
+ white-space:pre;
+ background-color: #fafafa;
+ }
+ mat-tree-node:hover{
+ background: rgba(225, 225, 225, 0.8);
+ li{
+ background: rgba(225, 225, 225, 0.8);
+ }
+ }
+ .closediv{
+ z-index: 100;
+ position: absolute;
+ right: 0;
+ top: 0;
+ width: 30px;
+ height: 30px;
+ cursor: pointer;
+ line-height: 30px;
+ text-align: center;
+ }
+ .closediv:hover{
+ background:rgba(225, 225, 225, 0.8);
+ }
+ }
+
+ }
+ }
+ .newadd{
+ margin-top: 12px;
+ margin-left: 70px;
+ display: flex;
+ button{
+ font-size: 16px;
+ width: 100px;
+ height: 36px;
+ }
+}
+ .body{
+ .buttonbox{
+ padding-left: 50px;
+ button{
+ margin:0 10px
+ }
+ }
+ .tablebox{
+ table{
+ width: 100%;
+ margin-left: 0%;
+ margin-top:15px;
+ }
+ mat-paginator{
+ width: 100%;
+ margin-left: 0%;
+ }
+ .mat-column-unitname{
+ width: 15%;
+ }
+ .mat-column-integrity{
+ width: 13%;
+ }
+ .mat-column-operation{
+ width: 5%;
+ }
+ .mat-column-jurisdictionsquadron{
+ width: 10%;
+ }
+ }
+ }
+
+ .mat-header-cell{
+ text-align: center;
+ }
+ .mat-cell{
+ text-align: center;
+ span{
+ // color:red;
+ // margin: 0 3px;
+ cursor: pointer;
+ }
+ span:hover{
+ text-decoration:underline
+ }
+ .grey{
+ color: grey;
+ pointer-events: none;
+ }
+ }
+
+ //完整度
+ .integrityDiv{
+ width: 70%;
+ height: 30px;
+ background-color: #e2e7ee;
+ // background-image: linear-gradient(to right, #e2e7ee ,#FF4500, #FF8C00,#32cd32);
+ margin: 0 auto;
+ position: relative;
+ .integrityNum{
+ position: absolute;
+ left: 50%;
+ top: 50%;
+ transform: translate(-50%, -50%);
+ color: black;
+ font-weight: 800;
+ font-size: 15px;
+ cursor: default;
+ }
+ .integrityColorDiv{
+ height: 100%;
+ }
+ .integrityDetails{
+ position: absolute;
+ display: none;
+ width: 350px;
+ height:280px;
+ border: 1px solid rgba(0, 0, 0, 0.22);
+ background-color: white;
+ .integrityDetailsTop{
+ width: 100%;
+ height: 23px;
+ line-height:23px;
+ border-bottom: 1px solid rgba(0, 0, 0, 0.22);
+ margin-bottom: 1px;
+ font-size: 14px;
+ span{
+ display: inline-block;
+ text-align: center;
+ font-weight: 800;
+ }
+ .span1{
+ width: 25%;
+ }
+ .span2{
+ width: 60%;
+ }
+ .span3{
+ width: 15%;
+ }
+ }
+ .integrityDetailsBody{
+ ul{
+ li{
+ width: 100%;
+ height: 23px;
+ line-height: 23px;
+ margin: 3px 0;
+ div{
+ float: left;
+ font-size: 13px;
+ }
+ .name{
+ width: 25%;
+ height: 100%;
+ }
+ .colorDiv{
+ width: 60%;
+ height: 100%;
+ position: relative;
+ .colorDivBac{
+ width: 90%;
+ height: 100%;
+ position: absolute;
+ left: 50%;
+ top: 50%;
+ transform: translate(-50%,-50%);
+ background-color: #dfe5ec;
+ border-radius: 5px;
+ .colorDivCon{
+ border-radius: 5px;
+ height: 100%;
+ background-color: #2398f1;
+ }
+ }
+ span{
+ position: absolute;
+ left: 50%;
+ top: 50%;
+ transform: translate(-50%,-50%);
+ // color: white;
+ font-weight: 600;
+ }
+ }
+ .number{
+ width: 15%;
+ height: 100%;
+ }
+ }
+ }
+
+ }
+ }
+ .bottomposition{
+ top: 2px;
+ left: 188px;
+ }
+ .topposition{
+ top: -252px;
+ left: 188px;
+ }
+ }
+ .integrityDiv:hover{
+ .integrityDetails{
+ display: block;
+ }
+ }
\ No newline at end of file
diff --git a/src/app/plan-management/maintain-up/maintain-up.component.spec.ts b/src/app/plan-management/maintain-up/maintain-up.component.spec.ts
new file mode 100644
index 0000000..fcd7853
--- /dev/null
+++ b/src/app/plan-management/maintain-up/maintain-up.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { MaintainUpComponent } from './maintain-up.component';
+
+describe('MaintainUpComponent', () => {
+ let component: MaintainUpComponent;
+ let fixture: ComponentFixture
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -73,7 +74,7 @@
+ 预案类型 |
- {{element.planType=='1'?'二维预案':element.planType=='2'?'三维预案':element.planType=='4'?'其他预案':'卡片预案'}} |
+ {{element.disasterType}} |
审核状态 |
@@ -133,7 +134,7 @@
操作 |
- 查看预案
+ 查看预案
提交审核
撤销审核
审批结果
diff --git a/src/app/plan-management/meet-plan/meet-plan.component.scss b/src/app/plan-management/meet-plan/meet-plan.component.scss
index e1288e2..b85f11d 100644
--- a/src/app/plan-management/meet-plan/meet-plan.component.scss
+++ b/src/app/plan-management/meet-plan/meet-plan.component.scss
@@ -6,7 +6,7 @@
// border-bottom: 1px solid black;
.queryBox {
box-sizing: border-box;
- padding: 5px 25px;
+ padding: 5px 25px 0 25px;
display: flex;
flex-direction: row;
flex-wrap: wrap;
@@ -22,6 +22,12 @@
}
} //queryBox
+ .butclass{
+ button{
+ width: 80px;height: 36px;
+ font-size: 16px;
+ }
+ }
.ordiv{
position: relative;
@@ -72,7 +78,7 @@
}
}
.newadd{
- margin-top: 10px;
+ margin-top: 12px;
margin-left: 70px;
display: flex;
button{
@@ -92,7 +98,7 @@
table{
width: 100%;
margin-left: 0%;
- margin-top:15px;
+ margin-top:12px;
th,td{
text-align: center;
font-size: 15px;
diff --git a/src/app/plan-management/meet-plan/meet-plan.component.ts b/src/app/plan-management/meet-plan/meet-plan.component.ts
index cc7d5f8..286cc16 100644
--- a/src/app/plan-management/meet-plan/meet-plan.component.ts
+++ b/src/app/plan-management/meet-plan/meet-plan.component.ts
@@ -9,6 +9,10 @@ import { PageEvent } from '@angular/material/paginator';
import { MatDialogRef, MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog';
import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
import { TreeService } from '../../http-interceptors/tree.service'
+import CryptoJS from 'crypto-js/crypto-js'
+//import Base64 from 'crypto-js/enc-base64';
+
+
@Component({
selector: 'app-meet-plan',
@@ -54,6 +58,7 @@ export class MeetPlanComponent implements OnInit {
plcheck:boolean //编制级别勾选框
displayedColumns: string[] = ['unitname','level','addname','addtime', 'plantype', 'passstate','isopen','projectlevel','operation'];
tabledataSource
+ typePlan//新预案类型
unitname//预案名称
level//预案级别
addname//添加人
@@ -84,7 +89,8 @@ export class MeetPlanComponent implements OnInit {
let paramsdata:any = {
Name:this.unitname||'',
planCategories:this.level||[6,7],
- PlanType:reservePlanType||'',
+ //PlanType:reservePlanType||'',
+ DisasterType:this.typePlan||'',
CreatorName:this.addname||'',
AuditStatus:this.unitstate|| '',
CreationTimeRangeStart:this.addtime||'',
@@ -158,6 +164,37 @@ export class MeetPlanComponent implements OnInit {
this.getAlltabledate()
})
}
+
+
+
+ //查看预案
+ openPlan(element){
+ let filename:string
+ let fetchUrl = element.attachmentUrls[0]
+ this.http.get(`/api/ObjectMetadata/PlanPlatform/${fetchUrl}`).subscribe((data:any)=>{
+ filename=data.fileName
+ let json={
+ doc: {
+ docId: element.id,
+ title: filename,
+ //title: filename,
+ fetchUrl: "http://39.106.78.171:8000/api/Objects/PlanPlatform/"+fetchUrl
+ },
+ user: {
+ uid: "test",
+ nickName: "test",
+ avatar: "",
+ privilege: [
+ 'FILE_READ','FILE_DOWNLOAD', 'FILE_PRINT'
+ ],
+ },
+ }
+ var stringjson=JSON.stringify(json)
+ var wordArray = CryptoJS.enc.Utf8.parse(stringjson);
+ var base64 = CryptoJS.enc.Base64.stringify(wordArray);
+ window.open(`http://121.5.10.84/apps/editor/openPreview?data=${base64}`)
+ })
+ }
//下载↓
selectDownloadFile:any; //选择下载的文件
@@ -259,6 +296,7 @@ export class MeetPlanComponent implements OnInit {
//重置
reset(){
+ this.typePlan=''
this.unitname=''
this.level=''
this.addname=''
@@ -369,7 +407,7 @@ export class newunitMeet{
let body:any = {
Name:this.unitname||'',
PlanCategory:Number(this.level)||'',
- PlanType: Number(this.reservePlanType),
+ disasterType: this.reservePlanType,
PlanLevel:PlanLevel,
PlanMode:1,
attachmentUrls:[`${this.objectName}`]
@@ -461,7 +499,7 @@ export class newunitMeet{
let body:any = {
Name:this.unitname||'',
PlanCategory:Number(this.level)||'',
- PlanType: Number(this.reservePlanType),
+ disasterType: this.reservePlanType,
PlanLevel:PlanLevel,
PlanMode:1,
attachmentUrls:[`${this.objectName}`]
diff --git a/src/app/plan-management/meet-plan/newunit.html b/src/app/plan-management/meet-plan/newunit.html
index 96e7e79..e427cfa 100644
--- a/src/app/plan-management/meet-plan/newunit.html
+++ b/src/app/plan-management/meet-plan/newunit.html
@@ -4,7 +4,7 @@
* @Author: sueRimn
* @Date: 2020-12-24 16:26:16
* @LastEditors: sueRimn
- * @LastEditTime: 2021-01-13 15:43:05
+ * @LastEditTime: 2021-01-27 15:00:57
-->
|
@@ -19,12 +19,7 @@
diff --git a/src/app/plan-management/onetwo-entry-plan/newunit.html b/src/app/plan-management/onetwo-entry-plan/newunit.html
index dd60ef4..06a9324 100644
--- a/src/app/plan-management/onetwo-entry-plan/newunit.html
+++ b/src/app/plan-management/onetwo-entry-plan/newunit.html
@@ -4,7 +4,7 @@
* @Author: sueRimn
* @Date: 2020-12-24 16:26:16
* @LastEditors: sueRimn
- * @LastEditTime: 2021-01-13 15:17:47
+ * @LastEditTime: 2021-01-27 15:17:26
-->
@@ -19,12 +19,7 @@
@@ -39,12 +39,13 @@
-
@@ -73,7 +74,7 @@
+ 预案类型 |
- {{element.planType=='1'?'二维预案':element.planType=='2'?'三维预案':element.planType=='4'?'其他预案':'卡片预案'}} |
+ {{element.disasterType}} |
审核状态 |
@@ -133,7 +134,7 @@
操作 |
- 查看预案
+ 查看预案
提交审核
撤销审核
审批结果
diff --git a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.scss b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.scss
index b801081..cdbb1c2 100644
--- a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.scss
+++ b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.scss
@@ -6,14 +6,14 @@
// border-bottom: 1px solid black;
.queryBox {
box-sizing: border-box;
- padding: 5px 25px;
+ padding: 5px 25px 0 25px;
display: flex;
flex-direction: row;
flex-wrap: wrap;
align-items:center;
// justify-content:center;
.queryField {
- margin: 3px 40px;
+ margin: 0 40px;
input {
width: 180px;
height: 22px;
@@ -22,6 +22,12 @@
}
} //queryBox
+ .butclass{
+ button{
+ width: 80px;height: 36px;
+ font-size: 16px;
+ }
+ }
.ordiv{
position: relative;
@@ -72,7 +78,7 @@
}
}
.newadd{
- margin-top: 10px;
+ margin-top: 12px;
margin-left: 70px;
display: flex;
button{
@@ -92,7 +98,7 @@
table{
width: 100%;
margin-left: 0%;
- margin-top:15px;
+ margin-top:12px;
th,td{
text-align: center;
font-size: 15px;
diff --git a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts
index 01ff599..8922a76 100644
--- a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts
+++ b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts
@@ -4,7 +4,7 @@
* @Author: sueRimn
* @Date: 2020-12-24 14:15:10
* @LastEditors: sueRimn
- * @LastEditTime: 2021-01-22 09:17:40
+ * @LastEditTime: 2021-01-28 14:07:24
*/
import { Component, OnInit, ViewChild, Inject } from '@angular/core';
import { HttpClient } from '@angular/common/http'
@@ -20,6 +20,7 @@ import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
import { TreeService } from '../../http-interceptors/tree.service'
import { ConstantPool } from '@angular/compiler';
import { MatTableDataSource } from '@angular/material/table';
+import CryptoJS from 'crypto-js/crypto-js'
@Component({
@@ -76,6 +77,7 @@ export class OnetwoEntryPlanComponent implements OnInit {
reservePlanType//预案类型
unitstate//审核状态
projectlevel//编制级别
+ typePlan//新预案类型
//分页
@ViewChild(MatPaginator, {static: true})
pageEvent: PageEvent;
@@ -95,7 +97,8 @@ export class OnetwoEntryPlanComponent implements OnInit {
let paramsdata:any = {
Name:this.unitname||'',
planCategories:this.url=='2'?2:1,
- PlanType:reservePlanType||'',
+ //PlanType:reservePlanType||'',
+ DisasterType:this.typePlan||'',
CreatorName:this.addname||'',
AuditStatus:this.unitstate|| '',
CreationTimeRangeStart:this.addtime||'',
@@ -119,6 +122,7 @@ export class OnetwoEntryPlanComponent implements OnInit {
//重置
reset(){
+ this.typePlan=''
this.unitname=''
this.level=''
this.addname=''
@@ -184,12 +188,46 @@ export class OnetwoEntryPlanComponent implements OnInit {
this.getAlltabledate()
})
}
+ //查看预案
+ openPlan(element){
+ let filename:string
+ let fetchUrl=element.attachmentUrls[0]
+ this.http.get(`/api/ObjectMetadata/PlanPlatform/${fetchUrl}`).subscribe((data:any)=>{
+ filename=data.fileName
+ let json={
+ doc: {
+ docId: element.id,
+ title: filename,
+ //title: filename,
+ fetchUrl: "http://39.106.78.171:8000/api/Objects/PlanPlatform/"+fetchUrl
+ },
+ user: {
+ uid: "test",
+ nickName: "test",
+ avatar: "",
+ privilege: [
+ 'FILE_READ','FILE_DOWNLOAD', 'FILE_PRINT'
+ ],
+ },
+ }
+ var stringjson=JSON.stringify(json)
+ var wordArray = CryptoJS.enc.Utf8.parse(stringjson);
+ var base64 = CryptoJS.enc.Base64.stringify(wordArray);
+
+ //let base64Date=this.BASE64.encode(stringjson)
+ //let filedata= CryptoJS.enc.Base64.stringify(json)
+ console.log(base64)
+ window.open(`http://121.5.10.84/apps/editor/openPreview?data=${base64}`)
+ })
+
+
+ }
//新增预案弹窗
addunit(){
const dialogRef = this.dialog.open(newunitComponent, {
width: '340px',
- height:'400px',
+ height:'410px',
disableClose:true
//data: paperDataInfo
});
@@ -393,7 +431,7 @@ export class newunitComponent{
let body:any = {
Name:this.unitname||'',
PlanCategory:this.url=='2'?2:1,
- PlanType: Number(this.reservePlanType),
+ disasterType: this.reservePlanType,
PlanLevel:PlanLevel,
PlanMode:1,
attachmentUrls:[`${this.objectName}`]
@@ -484,7 +522,7 @@ export class newunitComponent{
let body:any = {
Name:this.unitname||'',
PlanCategory:this.url=='2'?2:1,
- PlanType: Number(this.reservePlanType),
+ disasterType: this.reservePlanType,
PlanLevel:PlanLevel,
PlanMode:1,
attachmentUrls:[`${this.objectName}`]
diff --git a/src/app/plan-management/pass-plan/pass-plan.component.html b/src/app/plan-management/pass-plan/pass-plan.component.html
index 6c0411c..326e79f 100644
--- a/src/app/plan-management/pass-plan/pass-plan.component.html
+++ b/src/app/plan-management/pass-plan/pass-plan.component.html
@@ -85,7 +85,7 @@
- |
+
-
+ 操作 |
- 查看预案
+ 查看预案
提交审核
撤销审核
审批结果
diff --git a/src/app/plan-management/type-plan/type-plan.component.scss b/src/app/plan-management/type-plan/type-plan.component.scss
index 43059ae..dab8169 100644
--- a/src/app/plan-management/type-plan/type-plan.component.scss
+++ b/src/app/plan-management/type-plan/type-plan.component.scss
@@ -6,7 +6,7 @@
// border-bottom: 1px solid black;
.queryBox {
box-sizing: border-box;
- padding: 5px 25px;
+ padding: 5px 25px 0 25px;
display: flex;
flex-direction: row;
flex-wrap: wrap;
@@ -22,6 +22,12 @@
}
} //queryBox
+ .butclass{
+ button{
+ width: 80px;height: 36px;
+ font-size: 16px;
+ }
+ }
.ordiv{
position: relative;
@@ -72,7 +78,7 @@
}
}
.newadd{
- margin-top: 10px;
+ margin-top: 12px;
margin-left: 70px;
display: flex;
button{
@@ -92,7 +98,7 @@
table{
width: 100%;
margin-left: 0%;
- margin-top:15px;
+ margin-top:12px;
th,td{
text-align: center;
font-size: 15px;
diff --git a/src/app/plan-management/type-plan/type-plan.component.ts b/src/app/plan-management/type-plan/type-plan.component.ts
index 91227db..76dfee7 100644
--- a/src/app/plan-management/type-plan/type-plan.component.ts
+++ b/src/app/plan-management/type-plan/type-plan.component.ts
@@ -4,7 +4,7 @@
* @Author: sueRimn
* @Date: 2021-01-06 09:47:43
* @LastEditors: sueRimn
- * @LastEditTime: 2021-01-23 09:45:17
+ * @LastEditTime: 2021-01-27 15:49:53
*/
import { Component, OnInit, ViewChild, Inject } from '@angular/core';
import { HttpClient } from '@angular/common/http'
@@ -17,6 +17,7 @@ import { PageEvent } from '@angular/material/paginator';
import { MatDialogRef, MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog';
import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
import { TreeService } from '../../http-interceptors/tree.service'
+import CryptoJS from 'crypto-js/crypto-js'
@Component({
selector: 'app-type-plan',
@@ -170,6 +171,40 @@ export class TypePlanComponent implements OnInit {
this.http.put(`/api/PlanComponentsMajor/${element.id}/Cancel`,"").subscribe(data=>{
this.getAlltabledate()
})
+ }
+ //查看预案
+ openPlan(element){
+ let filename:string
+ let fetchUrl=element.attachmentUrls[0]
+ this.http.get(`/api/ObjectMetadata/PlanPlatform/${fetchUrl}`).subscribe((data:any)=>{
+ filename=data.fileName
+ let json={
+ doc: {
+ docId: element.id,
+ title: filename,
+ //title: filename,
+ fetchUrl: "http://39.106.78.171:8000/api/Objects/PlanPlatform/"+fetchUrl
+ },
+ user: {
+ uid: "test",
+ nickName: "test",
+ avatar: "",
+ privilege: [
+ 'FILE_READ','FILE_DOWNLOAD', 'FILE_PRINT'
+ ],
+ },
+ }
+ var stringjson=JSON.stringify(json)
+ var wordArray = CryptoJS.enc.Utf8.parse(stringjson);
+ var base64 = CryptoJS.enc.Base64.stringify(wordArray);
+
+ //let base64Date=this.BASE64.encode(stringjson)
+ //let filedata= CryptoJS.enc.Base64.stringify(json)
+ console.log(base64)
+ window.open(`http://121.5.10.84/apps/editor/openPreview?data=${base64}`)
+ })
+
+
}
//新增预案弹窗
addunit(){
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 dd5db9b..f797fd0 100644
--- a/src/app/ui/collection-tools-plan/collection-tools.component.ts
+++ b/src/app/ui/collection-tools-plan/collection-tools.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, Inject, ViewChild,ElementRef,Renderer2, ViewContainerRef } from '@angular/core';
+import { Component, OnInit, Inject, ViewChild,ElementRef,Renderer2, ViewContainerRef, NgZone } from '@angular/core';
import { HttpClient, HttpHeaders } from '@angular/common/http';
import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
@@ -27,7 +27,7 @@ export class CollectionToolsPlanComponent implements OnInit {
@ViewChild('canvas',{static: true}) canvas:WorkingAreaComponent; //父组件中获得子组件的引用
- constructor(private maskLayerService:MaskLayerService,private tabbarService: TabbarAndScoreService,private http:HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,private element: ElementRef,public canvasData: CanvasShareDataService,private router:Router,private route:ActivatedRoute) { }
+ constructor(public _ngZone:NgZone,private maskLayerService:MaskLayerService,private tabbarService: TabbarAndScoreService,private http:HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,private element: ElementRef,public canvasData: CanvasShareDataService,private router:Router,private route:ActivatedRoute) { }
@ViewChild('nzTreeComponent', { static: false }) nzTreeComponent!: NzTreeComponent;
// tree配置
private _transformer = (node, level: number) => {//要给渲染节点传那些属性参数
@@ -627,7 +627,6 @@ export class CollectionToolsPlanComponent implements OnInit {
firstMultipleAssetData:any//当前多选的第一个素材
ngOnInit(): void {
let _this = this
-
AxMessageSystem.addListener('selectionChanged', ()=>{
if(this.canvas.selection.size() == 1){//如果是单选
this.isMultipleAsset = false
@@ -771,16 +770,17 @@ export class CollectionToolsPlanComponent implements OnInit {
//多选状态动态属性素材input框值改变
multipleAssetInputChange(i,e){
e.stopPropagation()
- this.multipleAssetData.forEach(item=>{
- // console.log(item)
- item.assetData.PropertyInfos.forEach(element => {
- if(element.PropertyName == i.PropertyName){
- element.PropertyValue = i.PropertyValue
- this.canvas.refreshIcon(item.assetData.Id)
- this.canvasData.isChange = true
- }
+ setTimeout(() => {
+ this.multipleAssetData.forEach(item=>{
+ item.assetData.PropertyInfos.forEach(element => {
+ if(element.PropertyName == i.PropertyName){
+ element.PropertyValue = i.PropertyValue
+ this.canvas.refreshIcon(item.assetData.Id)
+ this.canvasData.isChange = true
+ }
+ })
})
- })
+ }, 0);
}
//多选状态动态属性素材radio框值改变
multipleAssetRadioChange(i,value){
@@ -800,7 +800,6 @@ export class CollectionToolsPlanComponent implements OnInit {
multipleSupplyArea(i,e){
e.stopPropagation()
this.multipleAssetData.forEach(item=>{
- // console.log(item)
item.assetData.PropertyInfos.forEach(element => {
if(element.PropertyName == i.PropertyName){
element.PropertyValue = i.PropertyValue
diff --git a/src/app/ui/collection-tools/collection-tools.component.ts b/src/app/ui/collection-tools/collection-tools.component.ts
index 2ad033f..3787df7 100644
--- a/src/app/ui/collection-tools/collection-tools.component.ts
+++ b/src/app/ui/collection-tools/collection-tools.component.ts
@@ -822,7 +822,14 @@ export class CollectionToolsComponent implements OnInit {
copyAssetData:any //存储用于复制的素材
//复制素材
copyAsset(){
- this.canvas.copy()
+ if(this.canvas.selection.allowEdit()){//如果当前选中素材可以编辑
+ this.canvas.copy()
+ }else{
+ let config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('当前选中素材不可复制','确定',config);
+ }
}
//粘贴素材
pasteAsset(){
diff --git a/src/app/working-area/model/axGrid.ts b/src/app/working-area/model/axGrid.ts
index 348c709..4e178ad 100644
--- a/src/app/working-area/model/axGrid.ts
+++ b/src/app/working-area/model/axGrid.ts
@@ -8,58 +8,38 @@ const DEFAULT_LINE_STYLE = {
native: true,
};
-/**
- * @description 在屏幕上绘制网格的实用程序类。
- * @extends PIXI.Graphics
- */
export class AxGrid extends PIXI.Graphics {
- private _cellSize: number;
- private _correctedWidth: number;
- private _gridWidth: number;
- private _useCorrectedWidth: boolean;
- private _drawBoundaries: any;
- private _amtLines: any;
- /**
- * @param {number} cellSize 默认值:网格边长的平方根
- */
+ private _cellSize: number;
+ private _correctedWidth: number;
+ private _gridWidth: number;
+ private _useCorrectedWidth: boolean;
+ private _drawBoundaries: any;
+ private _amtLines: any;
+
set cellSize(cellSize) {
this._cellSize = cellSize || Math.sqrt(this._correctedWidth);
}
-
get cellSize() {
return this._cellSize;
}
-
- /**
- * 网格边等距线的数量
- */
get amtLines() {
return Math.floor(this.gridWidth / this.cellSize);
}
-
- /**
- * 由' width '构造函数参数给出的网格的请求宽度。
- */
get originalWidth() {
return this._gridWidth;
}
-
/**
- * 修正后的网格宽度，即大于最小平方根的数
- * 修正后的宽度。
+ * 修正后的网格宽度，大于最小平方根的数
*/
get correctedWidth() {
return this._correctedWidth;
}
-
get useCorrectedWidth() {
return this._useCorrectedWidth;
}
/**
* 网格中每个角落的坐标。
- * @returns {{ x1: number, y1: number, x2: number, y2: number}}
- * 最左边(**x1**)，最上面(**y1**)，最右边(**x2**)和最下面(**y2**)的坐标。
*/
get bounds() {
return {
@@ -78,50 +58,11 @@ export class AxGrid extends PIXI.Graphics {
return this._drawBoundaries;
}
- /**
- * 网格的实际宽度。
- * 当' cellSize '不是默认值时，网格的宽度将为
- * 在' width '构造函数中给出的宽度。否则，就是修改后的宽度。
- */
get gridWidth() {
if (!this.useCorrectedWidth) { return this._gridWidth; }
return Math.abs(this.cellSize - Math.sqrt(this._correctedWidth)) <= 1e-6 ? this._correctedWidth : this._gridWidth;
}
- /**
- *
- * @param {number} width number. Required.
- *
- * The target sidelength of the grid. It is best for `width` to be a perfect square (i.e., 2, 4, 9, 16, 25, etc.). If
- * not and the parameter `useCorrectedWidth` is set to **false**, then the grid will use a corrected width,
- * which is the smallest perfect square greater than `width`.
- *
- * @param {number} cellSize number, null. Optional, default: square root of corrected width
- *
- * The size of each cell in the grid.
- * If the value is **null**, the grid will use the default value.
- *
- * @param {{ width: number, color: number, alpha: number, alignment: number, native: boolean }}. Object. Optional.
- *
- * default:
- * **{
- * width: 1,
- * color: 0xffffff,
- * alpha: 1,
- * alignment: 0.5,
- * native: true
- * }**
- *
- * Configuration for the line style on the object. See documentation on `PIXI.Graphics` for more on the `LineStyle` class.
- *
- * @param {boolean} useCorrectedWidth boolean. Optional. default: **true**
- * If **true**, the grid will use the smallest perfect square greater than `width`.
- * Otherwise, the grid will use the exact value given by `width`.
- *
- * @param {boolean} drawBoundaries boolean. Optional. default: **true**
- * If **true**, the grid will draw its boundaries.
- * Otherwise, the grid will not draw its boundaries. Mouse pointer detection is not affected.
- */
constructor(
width,
cellSize= null,
@@ -151,12 +92,9 @@ export class AxGrid extends PIXI.Graphics {
lConfig.alignment,
lConfig.native
);
-
- // handle mouse move
this.interactive = true;
this.on('mousemove', (evt) => {
const mouseCoords = evt.data.getLocalPosition(evt.currentTarget.parent);
- // 检查鼠标是否在此网格的范围内。如果不是，那就什么都不做。
if (
mouseCoords.x >= this.bounds.x1 &&
mouseCoords.x <= this.bounds.x2 &&
@@ -192,11 +130,6 @@ export class AxGrid extends PIXI.Graphics {
/**
* 清除网格
- *
- * @param {boolean} retainLineStyle 可选，默认：true
- *
- * 当**true**时，线条样式对象的配置将被保留。
- * 否则，对象的行样式将恢复为' PIXI '指定的默认值。图形的对象。
*/
clearGrid(retainLineStyle = true) {
const { width, alignment, color, alpha, native } = this.line;
@@ -207,14 +140,10 @@ export class AxGrid extends PIXI.Graphics {
return this;
}
-
/**
- * Transforms global coordinates to grid coordinates.
- * @param {number} x
- * The global X coordinate.
- *
- * @param {number} y
- * The global Y coordinate.
+ * 返回网格的坐标
+ * @param x 坐标x
+ * @param y 坐标y
*/
getCellCoordinates(x, y) {
return {
@@ -222,22 +151,15 @@ export class AxGrid extends PIXI.Graphics {
y: Math.floor((y - this.bounds.y1) / this.cellSize),
};
}
-
/**
- * 检测到mousemove事件后触发的回调。
- *
- * @param {PIXI.InteractionData} evt
- * 'PIXI.InteractionData '事件
- *
- * @param {{x: number, y: number}} gridCoords
- * 网格坐标
+ * 鼠标移动事件
+ * @param evt 鼠标事件
+ * @param gridCoords 鼠标所在网格坐标
*/
onMousemove(evt, gridCoords) {
}
-
- // 计算修正后的宽度。如果`useCorrectedWidth`构造函数参数设置为**false**，
- // 然后，它简单地保持“width”的给定值作为修正后的宽度。
+ // 默认宽度
_correctWidth() {
if (!this._useCorrectedWidth) {
this._correctedWidth = this._gridWidth;
@@ -245,9 +167,7 @@ export class AxGrid extends PIXI.Graphics {
this._correctedWidth = Math.ceil(Math.sqrt(this._gridWidth)) ** 2;
}
-
- // 计算修正后的宽度。如果`useCorrectedWidth`构造函数参数设置为**false**，
- // 然后，它简单地保持“width”的给定值作为修正后的宽度。
+ // 自定义宽度
correctWidth(width: number) {
if (!this._useCorrectedWidth) {
this._correctedWidth = width;
diff --git a/src/app/working-area/model/axSelection.ts b/src/app/working-area/model/axSelection.ts
index 8bd6400..f075523 100644
--- a/src/app/working-area/model/axSelection.ts
+++ b/src/app/working-area/model/axSelection.ts
@@ -1,3 +1,5 @@
+import { allowedNodeEnvironmentFlags } from "process";
+
/**
* 选择器
*/
@@ -17,6 +19,17 @@ export class AxSelection {
public has(obj: any): boolean {
return this.objects.has(obj);
}
+ // 是否所有选择对象都允许编辑
+ public allowEdit(): boolean {
+ let allowEdit = true;
+ for (const item of this.objects) {
+ if (!item.allowEdit) {
+ allowEdit = false;
+ break;
+ }
+ }
+ return allowEdit;
+ }
// 获得所有对象
public all() {
return [...this.objects];
diff --git a/src/app/working-area/model/axShape.ts b/src/app/working-area/model/axShape.ts
index 3a5dae7..06176d7 100644
--- a/src/app/working-area/model/axShape.ts
+++ b/src/app/working-area/model/axShape.ts
@@ -10,10 +10,8 @@ export class AxShape extends Graphics {
assetData: any;
pointTexture: PIXI.Texture = PIXI.Texture.from('assets/images/handle-main.png');
workingArea: WorkingAreaComponent;
- // 可以被移动的
- moveable = true;
- // 可以被选中的
- selectable = true;
+ // 允许选择
+ allowSelect = true;
// 允许编辑
allowEdit = true;
// 是否显示名称
@@ -38,10 +36,10 @@ export class AxShape extends Graphics {
this
.on('pointerdown', event => {
event.stopPropagation();
- if (this.selectable) {
+ if (this.allowSelect) {
this.workingArea.select(this);
}
- if (this.moveable) {
+ if (this.allowEdit) {
this.mouseDragging = true;
this.mousePosition = new PIXI.Point(event.data.global.x, event.data.global.y);
}
diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts
index 5cc6f48..d07f88e 100644
--- a/src/app/working-area/working-area.component.ts
+++ b/src/app/working-area/working-area.component.ts
@@ -490,21 +490,26 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
switch (floorData[key].InteractiveMode) {
case 0:
const singleIcon = new AxImageShape(floorData[key], this);
- singleIcon.moveable = this.allowEdit && this.canvasData.gameMode === singleIcon.assetData.GameMode;
+ singleIcon.allowEdit = this.allowEdit && this.canvasData.gameMode === singleIcon.assetData.GameMode;
break;
case 1:
const icon = new MultipointIcon(floorData[key], this);
+ icon.allowEdit = this.allowEdit && this.canvasData.gameMode === icon.assetData.GameMode;
break;
case 2:
const polygonIcon = new PolygonIcon(floorData[key], this);
+ polygonIcon.allowEdit = this.allowEdit && this.canvasData.gameMode === polygonIcon.assetData.GameMode;
break;
case 3:
if (floorData[key].Name === '水带') {
- const distance = new AxArrowConnector(floorData[key], this, false, true);
+ const waterLine = new AxArrowConnector(floorData[key], this, false, true);
+ waterLine.allowEdit = this.allowEdit && this.canvasData.gameMode === waterLine.assetData.GameMode;
} else if (floorData[key].Name === '距离') {
const distance = new AxArrowConnector(floorData[key], this, true, true);
+ distance.allowEdit = this.allowEdit && this.canvasData.gameMode === distance.assetData.GameMode;
} else if (floorData[key].Name === '普通墙' || floorData[key].Name === '承重墙') {
const wall = new AxArrowConnector(floorData[key], this, false, false);
+ wall.allowEdit = this.allowEdit && this.canvasData.gameMode === wall.assetData.GameMode;
}
break;
}
@@ -522,22 +527,24 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
switch (nodeData[key][tempKey].InteractiveMode) {
case 0:
const singleIcon = new AxImageShape(nodeData[key][tempKey], this);
- singleIcon.moveable = this.allowEdit && this.canvasData.gameMode === singleIcon.assetData.GameMode;
+ singleIcon.allowEdit = this.allowEdit && this.canvasData.gameMode === singleIcon.assetData.GameMode;
break;
case 1:
- const icon = new MultipointIcon(nodeData[key][tempKey], this);
- break;
+ const icon = new MultipointIcon(nodeData[key][tempKey], this);
+ icon.allowEdit = this.allowEdit && this.canvasData.gameMode === icon.assetData.GameMode;
+ break;
case 2:
const polygonIcon = new PolygonIcon(nodeData[key][tempKey], this);
+ polygonIcon.allowEdit = this.allowEdit && this.canvasData.gameMode === polygonIcon.assetData.GameMode;
break;
case 3:
const pipeline = new AxArrowConnector(nodeData[key][tempKey], this, false, true);
+ pipeline.allowEdit = this.allowEdit && this.canvasData.gameMode === pipeline.assetData.GameMode;
break;
}
});
});
}
- // this.emit('backgroundScale', this.backgroundImage.scale.x);
}
/**
* 创建确认绘制结束按钮
diff --git a/src/assets/font/SourceHanSansCN-Regular.otf b/src/assets/font/SourceHanSansCN-Regular.otf
new file mode 100644
index 0000000..886f82f
Binary files /dev/null and b/src/assets/font/SourceHanSansCN-Regular.otf differ
diff --git a/src/main.ts b/src/main.ts
index 611c343..831dd10 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -3,7 +3,7 @@ import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
import { AppModule } from './app/app.module';
import { environment } from './environments/environment';
-
+import 'default-passive-events'
if (environment.production) {
enableProdMode();
}
diff --git a/src/styles.scss b/src/styles.scss
index 7c77928..f69d5a0 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -1,12 +1,22 @@
@import './app/theme.scss';
@import "./app/ngZorroTree.css"; /* 引入组件样式 */
+
+@font-face
+{
+ font-family: Regular;
+ src: url('./assets/font/SourceHanSansCN-Regular.otf'),
+}
html,body{
width: 100%;
height:100%;
margin:0 auto;
padding:0;
overflow: hidden;
+ font-family: Regular;
+ textarea{
+ font-family: Regular
+ }
}
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;
@@ -112,7 +122,7 @@ table td.mat-footer-cell:last-of-type{
border-radius: 4px;
margin: 0 5px;
font-size: 14px;
- font-family: Source Han Sans CN;
+ // font-family: Source Han Sans CN;
font-weight: 400;
line-height: 36px;
color: #0080FF;
| |