diff --git a/debug.log b/debug.log index afb5003..242e65d 100644 --- a/debug.log +++ b/debug.log @@ -3,3 +3,4 @@ [1226/082525.401:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3) [0104/111348.201:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3) [0104/133113.885:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3) +[0105/083228.618:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3) diff --git a/src/app/examiner/create-test-score/create-test-score.component.ts b/src/app/examiner/create-test-score/create-test-score.component.ts index b6f8c58..e3b89fb 100644 --- a/src/app/examiner/create-test-score/create-test-score.component.ts +++ b/src/app/examiner/create-test-score/create-test-score.component.ts @@ -1187,6 +1187,7 @@ export class CreateTestScoreComponent implements OnInit { //灏嗙瓫閫夊嚭鏉ョ殑鏁版嵁鍙樹负鏈嶅姟鍣ㄦ彁浜ゆ暟鎹 let paperDataInfo = [] + console.log(111,copyDatas) copyDatas.forEach((item,key) =>{ paperDataInfo[key] = {} paperDataInfo[key].id = null @@ -1203,6 +1204,12 @@ export class CreateTestScoreComponent implements OnInit { paperDataInfo[key].facilityData = item.fireFacNodes ? JSON.stringify(item.fireFacNodes) : '[]' paperDataInfo[key].facilityScore = item.fireFacScore, paperDataInfo[key].originalData = JSON.stringify(this.unitId[key]) + //璧嬪煎崟椤瑰垎 + paperDataInfo[key].basicInfoItemScore = item.basicInfoItemScore + paperDataInfo[key].adjoinItemScore = item.aroundItemScore + paperDataInfo[key].importLocationItemScore = item.keySiteItemScore + paperDataInfo[key].functionalDivisionItemSocre = item.funDivItemScore + paperDataInfo[key].facilityItemScore = item.fireFacItemScore }) //鍒ゆ柇鏄惁瀛樺湪鎬诲垎濉啓鍚庢病鏈夊嬀閫 鎴栬呭嬀閫変簡娌℃湁濉啓鎬诲垎鐨勬儏鍐 @@ -1251,11 +1258,6 @@ export class CreateTestScoreComponent implements OnInit { return } } - - //璁剧疆paperPlan鐨勫垎鏁 - // console.log(123,this.unitId) - - // console.log(456,paperDataInfo) let _this = this async function setPlansScore(){ for (let index = 0; index < _this.unitId.length; index++) { @@ -1276,8 +1278,6 @@ export class CreateTestScoreComponent implements OnInit { } setPlansScore().then(()=>{ - console.log('淇敼鍒嗘暟鎴愬姛2222') - let body = { id:sessionStorage.getItem('paperId'), valid: true, @@ -1287,7 +1287,10 @@ export class CreateTestScoreComponent implements OnInit { const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 - this.snackBar.open('鍒涘缓璇曞嵎鎴愬姛','纭畾',config); + this.snackBar.open('鍒涘缓璇曞嵎鎴愬姛,椤甸潰灏嗕簬涓绉掑悗閫鍑','纭畾',config); + setTimeout(() => { + this.router.navigateByUrl('/home/createexam-index') + }, 1000); }) }) diff --git a/src/app/examiner/examiner-index/examiner-index.component.ts b/src/app/examiner/examiner-index/examiner-index.component.ts index c213bb4..e71dae8 100644 --- a/src/app/examiner/examiner-index/examiner-index.component.ts +++ b/src/app/examiner/examiner-index/examiner-index.component.ts @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-12-11 09:06:03 * @LastEditors: sueRimn - * @LastEditTime: 2020-12-29 15:18:12 + * @LastEditTime: 2021-01-04 16:13:12 */ import { Component, OnInit, ViewChild, Inject,Input } from '@angular/core'; import {HttpClient} from '@angular/common/http' @@ -126,8 +126,15 @@ export class ExaminerIndexComponent implements OnInit { //缂栬緫璇曞嵎 editPaper(item){ - sessionStorage.setItem("paperId",item.id) - this.router.navigateByUrl("/examiner/create-test-score?pattern=edit") + if(item.status == 2){ + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('鑰冭瘯缁撴潫锛屼笉鑳界紪杈','纭畾',config); + }else{ + sessionStorage.setItem("paperId",item.id) + this.router.navigateByUrl("/examiner/create-test-score?pattern=edit") + } } lookPaper(item){ sessionStorage.setItem("paperId",item.id) @@ -215,19 +222,27 @@ export class ExaminerIndexComponent implements OnInit { } //鏌ヨ鎸夐挳 findClick(){ - /* const config = new MatSnackBarConfig(); + const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 - if(this.accound==undefined){ + let paramsdata:any = { + PageNumber: this.PageNumber || '1', + PageSize: this.pageSizeOptions[0], + OrganizationId: this.jsId || '', + HasChildren:this.jscheck || '', + Sort: null, + SortType: null, + } + if(this.jsId==undefined){ this.snackBar.open('璇疯緭鍏ユ秷闃叉晳鎻撮槦鍚嶇О','纭畾',config); } else{ - this.http.get(`/api/Papers/${this.accound}`).subscribe((data:any)=>{ + this.http.get(`/api/Papers`,{params:paramsdata}).subscribe((data:any)=>{ console.log(data) }) } - console.log(this.accound) */ - //console.log(this.jscheck,this.jsId) + //console.log(this.accound) + console.log(this.jscheck,this.jsId) this.PageNumber = 1 this.pageEvent.pageIndex = 0 this.getAlltabledate() diff --git a/src/app/examiner/mark-papers-index/mark-papers-index.component.html b/src/app/examiner/mark-papers-index/mark-papers-index.component.html index c305def..a8afb70 100644 --- a/src/app/examiner/mark-papers-index/mark-papers-index.component.html +++ b/src/app/examiner/mark-papers-index/mark-papers-index.component.html @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-12-14 16:30:31 * @LastEditors: sueRimn - * @LastEditTime: 2020-12-29 14:52:17 + * @LastEditTime: 2021-01-04 16:43:45 -->
@@ -18,7 +18,7 @@
- +
diff --git a/src/app/examiner/mark-papers-index/mark-papers-index.component.ts b/src/app/examiner/mark-papers-index/mark-papers-index.component.ts index 60d99be..4d9fe2d 100644 --- a/src/app/examiner/mark-papers-index/mark-papers-index.component.ts +++ b/src/app/examiner/mark-papers-index/mark-papers-index.component.ts @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-12-14 16:30:31 * @LastEditors: sueRimn - * @LastEditTime: 2020-12-29 14:52:09 + * @LastEditTime: 2021-01-04 16:53:04 */ import { Component, OnInit, ViewChild, Inject } from '@angular/core'; import {HttpClient} from '@angular/common/http' @@ -49,10 +49,29 @@ export class MarkPapersIndexComponent implements OnInit { pageSize:any; //姣忛〉鏉℃暟 pageSizeOptions: number[] = [10] //璁剧疆姣忛〉鏉℃暟 PageNumber:any //绗嚑椤 + //鏌ヨ + findClick(){ + let paramsdata:any = { + PageNumber: this.PageNumber || '1', + PageSize: this.pageSizeOptions[0], + Title:this.markName||'', + StartTime:this.markDate||'', + Sort: null, + SortType: null, + } + this.http.get(`/api/Papers`,{params:paramsdata}).subscribe((data:any)=>{ + console.log(data) + this.dataSource=data.items + }) + this.PageNumber = 1 + this.pageEvent.pageIndex = 0 + //this.getAlltabledate() + } //閲嶇疆鍔熻兘 resert(){ - this.markName=undefined - this.markDate=undefined + this.markName='' + this.markDate='' + this.getAlltabledate() } //鐐瑰嚮闃呭嵎璺宠浆 markTwo(e,id,name){ diff --git a/src/app/examiner/review-files/review-files.component.html b/src/app/examiner/review-files/review-files.component.html index 928eae0..5088e43 100644 --- a/src/app/examiner/review-files/review-files.component.html +++ b/src/app/examiner/review-files/review-files.component.html @@ -169,18 +169,22 @@ 鎿嶄綔 - {{item.title}} - {{item.creatorName}} - {{item.modifiedTime | date:'yyyy-MM-dd'}} - {{item.planLevel | planlevel}} - xxxx - 宸查槄 + {{item.paperPlanInfo.title}} + {{item.paperPlanInfo.creatorName}} + {{item.paperPlanInfo.modifiedTime | date:'yyyy-MM-dd'}} + {{item.paperPlanInfo.planLevel | planlevel}} + {{item.score || '鏆傛湭璇勫垎'}} + {{item.score ? '宸查槄' : '鏈槄'}} 闃呭嵎
+
+ refresh + (闃呭嵎瀹屾垚鍚庤鐐瑰嚮姝ゆ寜閽埛鏂拌〃鏍兼暟鎹) +
diff --git a/src/app/examiner/review-files/review-files.component.scss b/src/app/examiner/review-files/review-files.component.scss index 6ba2af0..3d11680 100644 --- a/src/app/examiner/review-files/review-files.component.scss +++ b/src/app/examiner/review-files/review-files.component.scss @@ -77,4 +77,9 @@ button { display: inline-block; margin: 0 10px; } +} +.refresh{ + width: 100%; + text-align: center; + margin-top: 12px; } \ No newline at end of file diff --git a/src/app/examiner/review-files/review-files.component.ts b/src/app/examiner/review-files/review-files.component.ts index 791d363..68c05eb 100644 --- a/src/app/examiner/review-files/review-files.component.ts +++ b/src/app/examiner/review-files/review-files.component.ts @@ -48,19 +48,24 @@ export class ReviewFilesComponent implements OnInit { } //鑾峰緱鍗曚綅棰勬璁惧畾 - async getUnitPlans(){ + async getUnitPlans(type:boolean = true){ for (let index = 0; index < this.paperCompanyData.length; index++) { const item = this.paperCompanyData[index]; item.planScore = 0 //棰勬鎬诲垎 item.planList = [] //棰勬data let params = { - paperId : this.paperData.paperId, + examinationId : this.route.snapshot.queryParams.examId, companyId : item.companyInfo.id } await new Promise((resolve,reject)=>{ - this.http.get(`/api/PaperPlans`,{params:params}).subscribe(data => { + this.http.get(`/api/ExaminationPlans`,{params:params}).subscribe(data => { item.planList = data - item.planList.forEach(element => { item.planScore = item.planScore + element.score }); + if(type == false){ + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 5000 + this.snackBar.open('鍒锋柊鎴愬姛','纭畾',config); + } resolve(1) }) }) @@ -188,6 +193,11 @@ export class ReviewFilesComponent implements OnInit { }) } + //鍒锋柊棰勬璁惧畾琛ㄦ牸 + refreshTable(){ + this.getUnitPlans(false) + } + //鍩烘湰淇℃伅琛ㄦ牸 鏄惁灞曠ず褰撳墠琛 rowIsShow (children,tag) { let isShow:boolean = false @@ -221,14 +231,14 @@ export class ReviewFilesComponent implements OnInit { //浣滄垬閮ㄧ讲 闃呭嵎 readExam(item){ - console.log(this.selectPaper) + console.log(item) sessionStorage.setItem('companyName',this.selectPaper.companyInfo.name) - sessionStorage.setItem('planId',item.planComponentId) + sessionStorage.setItem('planId',item.paperPlanInfo.planComponentId) sessionStorage.setItem('buildingTypeId',this.selectPaper.companyInfo.buildingTypes[0].id) sessionStorage.setItem('companyId',this.selectPaper.companyInfo.id) let openType item.examPlanType == 0 ? openType = 1 : openType = 2 - window.open(`/canvasToolRead?planName=${item.title}&paperplanId=${item.id}&openType=${openType}&paperId=${this.paperId}&examId=${this.route.snapshot.queryParams.examId}&planComponentId=${item.planComponentId}`) + window.open(`/canvasToolRead?planName=${item.paperPlanInfo.title}&paperplanId=${item.paperPlanId}&openType=${openType}&paperId=${this.paperId}&examId=${this.route.snapshot.queryParams.examId}&planComponentId=${item.paperPlanInfo.planComponentId}`) } diff --git a/src/app/ui/collection-tools-examinee/collection-tools.component.ts b/src/app/ui/collection-tools-examinee/collection-tools.component.ts index b560461..e3244a8 100644 --- a/src/app/ui/collection-tools-examinee/collection-tools.component.ts +++ b/src/app/ui/collection-tools-examinee/collection-tools.component.ts @@ -525,7 +525,7 @@ export class CollectionToolsExamineeComponent implements OnInit { this.canvas.on("select",obj=>{ //閫変腑绱犳潗灞炴ф敞鍏ュ嚱鏁 this.setAssetsProperty(obj.assetData) - + console.log(obj.assetData) }) // 鐩戝惉canvas缁勪欢鍙栨秷閫変腑绱犳潗浜嬩欢 this.canvas.on("deselect",obj=>{ @@ -601,6 +601,10 @@ export class CollectionToolsExamineeComponent implements OnInit { } }).subscribe(data => { console.log('淇濆瓨鍩烘湰绱犳潗鎴愬姛') + let config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('淇濆瓨鍩烘湰绱犳潗鎴愬姛','纭畾',config); resolve(1) },err=>{ console.log('淇濆瓨鍩烘湰绱犳潗澶辫触') @@ -617,6 +621,10 @@ export class CollectionToolsExamineeComponent implements OnInit { } }).subscribe(data => { console.log('淇濆瓨鍩烘湰绱犳潗鎴愬姛') + let config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('淇濆瓨鍩烘湰绱犳潗鎴愬姛','纭畾',config); resolve(1) },err=>{ console.log('淇濆瓨鍩烘湰绱犳潗澶辫触') @@ -872,9 +880,6 @@ export class CollectionToolsExamineeComponent implements OnInit { async renovateTreeData (isRefresh:boolean = true) { this.allFireElements[this.allFireElements.length-1].children = [] this.beforeOneCheckedBuildingIsShow = false - isRefresh? await this.canvas.refresh() : null - this.canvas.setNameVisible(this.basicInfo,0) - this.canvas.setNameVisible(this.wantToWork,1) isRefresh? this.canvasData.isChange = false : null //鏈嶅姟涓 鏁版嵁鏄惁鏀瑰姩 鏀逛负false isRefresh? this.isShowProperty = true : null isRefresh? this.isShowAttribute = true : null @@ -882,45 +887,7 @@ export class CollectionToolsExamineeComponent implements OnInit { let beforeOneId = this.selectingSitePlan.id || '' //褰撳墠 閫変腑 骞抽潰鍥 妤煎眰/鍖哄煙 id let companyBuildingData = JSON.parse(JSON.stringify( this.canvasData.originalcompanyBuildingData || {} )) // 褰撳墠 鍗曚綅/寤虹瓚 鏁版嵁 let storeyData = JSON.parse(JSON.stringify( this.canvasData.originaleveryStoreyData || {} )) //褰撳墠 妤煎眰 鏁版嵁 - // console.log('鐪嬬湅杩欐槸鍟',this.Facilities) - - // this.Facilities ? this.Facilities.forEach(item => { - // item.key == this.selectingSitePlan.id ? - // this.getAllAssetLibraries(item) : - // this.canvas.loadExamineeData() - // }) : this.canvas.loadExamineeData();this.allLibrary = this.originalallLibrary - //濡傛灉鏈夐渶瑕佹爣娉ㄧ殑骞抽潰鍥 - if(this.Facilities){ - this.Facilities.some((item,key)=>{ - if(item.key == this.selectingSitePlan.id){ - let arr = [] - item.children.forEach(i => { - arr.push(i.Id) - }) - this.canvasData.hiddenBasicInfoFacilities = JSON.parse(JSON.stringify(arr)) - console.log('杩欏眰鏈夐渶瑕佹爣娉ㄧ殑鍩烘湰淇℃伅绱犳潗',item) - let allFireElements = JSON.parse(JSON.stringify(this.allFireElements)) - - if(this.clickedNodeType == 0){ - this.canvas.onExaminerClickFloor() - this.clickedNodeType = null - }else{ - this.canvas.onExamineeClickFloor() - this.clickedNodeType = null - } - - return true - } else{ - if(key == this.Facilities.length - 1){ - this.canvas.onExaminerClickFloor() - return false - } - } - }) - }else{ - this.canvas.onExamineeClickFloor() - } for(let key in storeyData.data){ //绛涢夋暟鎹 storeyData.data[key].key = storeyData.data[key].Id let noMatch = this.allFireElements.find( every=> every.id===storeyData.data[key].FireElementId ) @@ -1081,6 +1048,29 @@ export class CollectionToolsExamineeComponent implements OnInit { this.canvasData.examOriginaleveryStoreyData.version? null : this.canvasData.examOriginaleveryStoreyData.version = "2.0" this.canvasData.examOriginaleveryStoreyData.buildingAreaId? null : this.canvasData.examOriginaleveryStoreyData.buildingAreaId = e.id || null this.renovateTreeData() + if(this.Facilities){ + console.log(1111) + console.log('璧拌繖閲屼簡') + this.Facilities.forEach((item,key) => { + if(item.key == this.selectingSitePlan.id){ + console.log(333) + //濡傛灉褰撳眰鏈夐渶瑕佹爣璁扮殑鍩烘湰淇℃伅绱犳潗 + this.getAllAssetLibraries(item) + }else{ + + if(key == this.Facilities.length - 1 ){ + console.log(444) + this.canvas.onExamineeClickFloor() + } + + } + }) + }else{ + console.log('璧拌繖閲屼簡') + console.log(2222) + this.canvas.onExamineeClickFloor(); + this.allLibrary = this.originalallLibrary + } }) }) } @@ -1104,6 +1094,19 @@ export class CollectionToolsExamineeComponent implements OnInit { this.canvasData.examOriginaleveryStoreyData.version? null : this.canvasData.examOriginaleveryStoreyData.version = "2.0" this.canvasData.examOriginaleveryStoreyData.buildingAreaId? null : this.canvasData.examOriginaleveryStoreyData.buildingAreaId = e.id || null this.renovateTreeData() + if(this.Facilities){ + console.log('璧拌繖閲屼簡') + this.Facilities.forEach(item => { + if(item.key == this.selectingSitePlan.id){ + this.getAllAssetLibraries(item) + }else{ + this.canvas.onExamineeClickFloor() + } + }) + }else{ + console.log('璧拌繖閲屼簡') + this.canvas.onExamineeClickFloor();this.allLibrary = this.originalallLibrary + } }) }) } @@ -1694,7 +1697,13 @@ export class CollectionToolsExamineeComponent implements OnInit { if (this.canvasData.selectPanelPoint.DisposalNodeId != e.id) { //閫夋嫨鑺傜偣 涓嶆槸褰撳墠鑺傜偣鏃 let api - type == 0 ? api='/api/DisposalNodeData' : api='/api/ExamDisposalNodeData' + //濡傛灉鏄凡瀛樺湪棰勬 + if( this.examType == 1){ + type == 0 ? api='/api/DisposalNodeData' : api='/api/ExamDisposalNodeData' + }else{ //濡傛灉鏄嚜瀹氫箟棰勬 + api='/api/ExamDisposalNodeData' + } + let params = {nodeId: e.id} let parameter = { //鏌ヨ 鑺傜偣 瀵瑰簲 寤虹瓚/妤煎眰 index,id buildingIndex: e.sitePlanId? -1 : this.allBuildings.findIndex(item=>{ return item.id===e.buildingId }), //鎬诲钩闈㈠浘/寤虹瓚 index diff --git a/src/app/ui/collection-tools-examinee/save.ts b/src/app/ui/collection-tools-examinee/save.ts index 09d5ea2..0467d49 100644 --- a/src/app/ui/collection-tools-examinee/save.ts +++ b/src/app/ui/collection-tools-examinee/save.ts @@ -133,12 +133,12 @@ export class saveOneDialogExaminee { if(type == 'old'){ let istrue = this.canvasData.findDisposalNode(this.nodeItem.id,name) let putdata = this.nodeItem - putdata.weather = this.canvasData.selectPanelPointBaseData.weather - putdata.airTemperature = Number(this.canvasData.selectPanelPointBaseData.airTemperature) - putdata.windScale = Number(this.canvasData.selectPanelPointBaseData.windScale) - putdata.windDirection = Number(this.canvasData.selectPanelPointBaseData.windDirection) - putdata.description = this.canvasData.selectPanelPointBaseData.description - putdata.notes = this.canvasData.selectPanelPointBaseData.notes + putdata.weather = null + putdata.airTemperature = null + putdata.windScale = null + putdata.windDirection = null + putdata.description = null + putdata.notes = null if(istrue){//濡傛灉璇ュ缃妭鐐逛笅宸叉湁鍚屽悕鏁版嵁鑺傜偣 鍒欏彧淇敼 2涓帴鍙 @@ -253,12 +253,12 @@ export class saveOneDialogExaminee { disposalNodeType:1 } - dispositionNodeData.weather = this.canvasData.selectPanelPointBaseData.weather - dispositionNodeData.airTemperature = Number(this.canvasData.selectPanelPointBaseData.airTemperature) - dispositionNodeData.windScale = Number(this.canvasData.selectPanelPointBaseData.windScale) - dispositionNodeData.windDirection = Number(this.canvasData.selectPanelPointBaseData.windDirection) - dispositionNodeData.description = this.canvasData.selectPanelPointBaseData.description - dispositionNodeData.notes = this.canvasData.selectPanelPointBaseData.notes + dispositionNodeData.weather = null + dispositionNodeData.airTemperature = null + dispositionNodeData.windScale = null + dispositionNodeData.windDirection = null + dispositionNodeData.description = null + dispositionNodeData.notes = null //1.鍏堝垱寤轰竴涓缃妭鐐 鐒跺悗 .then 2.鍒涘缓鏁版嵁鑺傜偣鍒板垰鍒涘缓鐨勫缃妭鐐 3.鐒跺悗鎷跨潃鍒涘缓濂界殑鏁版嵁鑺傜偣鐨刬d 灏嗗钩闈㈠浘data淇濆瓨 new Promise((resolve,reject) => { console.log(1,dispositionNodeData) diff --git a/src/app/ui/collection-tools-read/collection-tools.component.html b/src/app/ui/collection-tools-read/collection-tools.component.html index bd3cfe3..5543520 100644 --- a/src/app/ui/collection-tools-read/collection-tools.component.html +++ b/src/app/ui/collection-tools-read/collection-tools.component.html @@ -11,8 +11,8 @@ - - + + diff --git a/src/app/ui/collection-tools-read/collection-tools.component.ts b/src/app/ui/collection-tools-read/collection-tools.component.ts index c336386..b8ee7bf 100644 --- a/src/app/ui/collection-tools-read/collection-tools.component.ts +++ b/src/app/ui/collection-tools-read/collection-tools.component.ts @@ -210,7 +210,6 @@ export class CollectionToolsReadComponent implements OnInit { this.refurbishTreeData() } }) - } paperId:any = this.route.snapshot.queryParams.paperId planData:any //褰撳墠鑰冮棰樼洰 @@ -262,12 +261,43 @@ export class CollectionToolsReadComponent implements OnInit { } - //淇濆瓨骞抽潰鍥 - saveNum :any = [] - async saveSite(){ + score(){ + let data = {score:this.planData.score} + let dialogRef = this.dialog.open(Score,{data}); } + submitScore(){ + if(!sessionStorage.getItem('scoreNum')){ + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('璇峰厛杩涜璇勫垎!','纭畾',config); + }else{ + if(window.confirm('浣犵‘瀹氳鎻愪氦姝ら槄鍗风粨鏋滃悧锛')){ + let params = { + paperPlanId : this.route.snapshot.queryParams.paperplanId, + examinationId : this.route.snapshot.queryParams.examId, + score : sessionStorage.getItem('scoreNum') + } + this.http.put('/api/ExaminationPlans/ModifyScore','',{params:params}).subscribe(data => { + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 1000 + this.snackBar.open('鎻愪氦鎴愬姛锛岄〉闈㈠皢浜庝竴绉掑悗鍏抽棴!','纭畾',config); + setTimeout(() => { + window.close() + }, 1000); + }) + return true; + }else{ + return false; + } + } + + } + + //鑾峰緱鎵鏈夌殑寤虹瓚鐗 getAllBuildings(){ this.http.get("/api/Buildings",{ @@ -397,9 +427,8 @@ export class CollectionToolsReadComponent implements OnInit { //鐐瑰嚮鏍戣妭鐐圭殑鏄剧ず闅愯棌icon clickLookItem(node){ - - // console.log(this.allFireElements) //瀛愯妭鐐硅窡闅忕埗鑺傜偣鐨刬slook鍙樺寲 + let iconVisibleArr:any = [] 聽 if(node.origin.children聽&&聽node.origin.children.length聽!=聽0){ node.origin.isLook聽= !node.origin.isLook 聽聽聽聽聽聽node.origin.children.forEach(item=>{ @@ -407,65 +436,23 @@ export class CollectionToolsReadComponent implements OnInit { 聽聽聽聽聽聽聽聽if(item.children聽&&聽item.children.length聽!=聽0){ 聽聽聽聽聽聽聽聽聽聽item.children.forEach(i=>{ 聽聽聽聽聽聽聽聽聽聽聽聽i.isLook聽=聽node.origin.isLook聽 + if(i.children聽&&聽i.children.length聽!=聽0){ + + }else{ + iconVisibleArr.push(i.Id) + } 聽聽聽聽聽聽聽聽聽聽}) -聽聽聽聽聽聽聽聽} +聽聽聽聽聽聽聽聽}else{ + iconVisibleArr.push(item.Id) + } 聽聽聽聽聽聽}) 聽聽聽聽 }else{ 聽 node.origin.isLook聽= !node.origin.isLook + iconVisibleArr.push(node.origin.Id) } - - //canvas涓婄殑绱犳潗鏄鹃殣 - let iconVisibleArr:any = [] - // if(node.origin.children聽&&聽node.origin.children.length聽!=聽0){//濡傛灉鏄ā鏉,鍒欏紑濮嬪悜涓嬫壘 - // node.origin.children.forEach(item => { - // if(item.children聽&&聽item.children.length聽!=聽0){//濡傛灉瀛愯妭鐐逛緷鏃ф槸妯℃澘,鍒欑户缁紑濮嬪悜涓嬫壘 - // item.children.forEach(i => { - // if(i.isLook == false){ - // iconVisibleArr.push(i.Id) - // } - // }) - // }else{ - // if(item.isLook == false){ - // iconVisibleArr.push(item.Id) - // } - - // } - // }) - // }else{ - // if(node.origin.isLook == false){ - // iconVisibleArr.push(node.origin.Id) - // } - // } - console.log(this.renderData) - this.renderData.forEach(item =>{ - if(item.Id && item.isLook == false){ - iconVisibleArr.push(item.Id) - }else{ - if(item.children && item.children.length != 0){ - item.children.forEach(i => { - if(i.Id && i.isLook == false){ - iconVisibleArr.push(i.Id) - }else{ - if(i.children && i.children.length != 0){ - i.children.forEach(element => { - if(element.Id && element.isLook == false){ - iconVisibleArr.push(element.Id) - } - }) - } - } - }) - } - } - }) - console.log(iconVisibleArr) - this.canvasData.originaleveryStoreyData = JSON.parse(JSON.stringify(this.originaleveryStoreyData)) - this.canvasData.originaleveryStoreyData.data? this.canvasData.originaleveryStoreyData.data = JSON.parse(this.canvasData.originaleveryStoreyData.data) : this.canvasData.originaleveryStoreyData.data = {} - this.canvasData.originaleveryStoreyData.version? null : this.canvasData.originaleveryStoreyData.version = "2.0" - this.canvasData.hiddenBasicInfoFacilities = iconVisibleArr - this.canvas.onExamineeClickFloor() - + console.log(node.origin.isLook) + this.canvas.setIconVisible(iconVisibleArr, node.origin.isLook) } //鎵撳紑娑堥槻璁炬柦鑰冮璁惧畾 @@ -576,7 +563,6 @@ export class CollectionToolsReadComponent implements OnInit { async renovateTreeData (isRefresh:boolean = true) { this.allFireElements[this.allFireElements.length-1].children = [] this.beforeOneCheckedBuildingIsShow = false - isRefresh? await this.canvas.refresh() : null isRefresh? this.canvasData.isChange = false : null //鏈嶅姟涓 鏁版嵁鏄惁鏀瑰姩 鏀逛负false isRefresh? this.isShowProperty = true : null isRefresh? this.isShowAttribute = true : null @@ -585,45 +571,7 @@ export class CollectionToolsReadComponent implements OnInit { let companyBuildingData = JSON.parse(JSON.stringify( this.canvasData.originalcompanyBuildingData || {} )) // 褰撳墠 鍗曚綅/寤虹瓚 鏁版嵁 let storeyData = JSON.parse(JSON.stringify( this.canvasData.originaleveryStoreyData || {} )) //褰撳墠 妤煎眰 鏁版嵁 console.log('this.Facilities',this.Facilities) - - //濡傛灉鏈夐渶瑕佹爣娉ㄧ殑骞抽潰鍥 - if(this.Facilities){ - this.Facilities.some((item,key)=>{ - if(item.key == this.selectingSitePlan.id){ - let arr = [] - item.children.forEach(i => { - arr.push(i.Id) - }) - this.hiddenBasicInfoFacilities = arr - this.canvasData.hiddenBasicInfoFacilities = JSON.parse(JSON.stringify(arr)) - console.log('杩欏眰鏈夐渶瑕佹爣娉ㄧ殑鍩烘湰淇℃伅绱犳潗',item) - let allFireElements = JSON.parse(JSON.stringify(this.allFireElements)) - this.renderData = [] - setTimeout(() => { - this.renderData = [...this.processingData(allFireElements,item.children)] - }, 0); - - if(this.clickedNodeType == 0){ - this.canvas.onExaminerClickFloor() - this.clickedNodeType = null - }else{ - this.canvas.onExamineeClickFloor() - this.clickedNodeType = null - } - - return true - } else{ - if(key == this.Facilities.length - 1){ - this.renderData = [] - this.canvas.onExaminerClickFloor() - return false - } - } - }) - }else{ - this.canvas.onExamineeClickFloor() - } for(let key in storeyData.data){ //绛涢夋暟鎹 storeyData.data[key].key = storeyData.data[key].Id let noMatch = this.allFireElements.find( every=> every.id===storeyData.data[key].FireElementId ) @@ -844,8 +792,39 @@ export class CollectionToolsReadComponent implements OnInit { this.canvasData.examOriginaleveryStoreyData.version? null : this.canvasData.examOriginaleveryStoreyData.version = "2.0" this.canvasData.examOriginaleveryStoreyData.buildingAreaId? null : this.canvasData.examOriginaleveryStoreyData.buildingAreaId = e.id || null this.renovateTreeData() + //濡傛灉鏈夐渶瑕佹爣娉ㄧ殑骞抽潰鍥 + if(this.Facilities){ + this.Facilities.some((item,key)=>{ + if(item.key == this.selectingSitePlan.id){ + let arr = [] + item.children.forEach(i => { + arr.push(i.Id) + }) + this.hiddenBasicInfoFacilities = arr + this.canvasData.hiddenBasicInfoFacilities = JSON.parse(JSON.stringify(arr)) + console.log('杩欏眰鏈夐渶瑕佹爣娉ㄧ殑鍩烘湰淇℃伅绱犳潗',item) + let allFireElements = JSON.parse(JSON.stringify(this.allFireElements)) + this.renderData = [] + setTimeout(() => { + this.renderData = [...this.processingData(allFireElements,item.children)] + }, 0); + this.canvas.onExamineeClickFloor() + this.clickedNodeType = null + return true + } else{ + if(key == this.Facilities.length - 1){ + this.renderData = [] + this.canvas.onExamineeClickFloor() + return false + } + } + }) + }else{ + this.canvas.onExamineeClickFloor() + } }) - + //濡傛灉鏈夐渶瑕佹爣娉ㄧ殑骞抽潰鍥 + }) @@ -870,6 +849,40 @@ export class CollectionToolsReadComponent implements OnInit { this.canvasData.examOriginaleveryStoreyData.version? null : this.canvasData.examOriginaleveryStoreyData.version = "2.0" this.canvasData.examOriginaleveryStoreyData.buildingAreaId? null : this.canvasData.examOriginaleveryStoreyData.buildingAreaId = e.id || null this.renovateTreeData() + //濡傛灉鏈夐渶瑕佹爣娉ㄧ殑骞抽潰鍥 + if(this.Facilities){ + this.Facilities.some((item,key)=>{ + if(item.key == this.selectingSitePlan.id){ + let arr = [] + item.children.forEach(i => { + arr.push(i.Id) + }) + this.hiddenBasicInfoFacilities = arr + this.canvasData.hiddenBasicInfoFacilities = JSON.parse(JSON.stringify(arr)) + console.log('杩欏眰鏈夐渶瑕佹爣娉ㄧ殑鍩烘湰淇℃伅绱犳潗',item) + let allFireElements = JSON.parse(JSON.stringify(this.allFireElements)) + this.renderData = [] + setTimeout(() => { + this.renderData = [...this.processingData(allFireElements,item.children)] + }, 0); + + + this.canvas.onExamineeClickFloor() + this.clickedNodeType = null + + return true + } else{ + if(key == this.Facilities.length - 1){ + this.renderData = [] + this.canvas.onExamineeClickFloor() + return false + } + } + }) + + }else{ + this.canvas.onExamineeClickFloor() + } }) }) } @@ -1115,14 +1128,20 @@ export class CollectionToolsReadComponent implements OnInit { if (this.canvasData.selectPanelPoint.DisposalNodeId != e.id) { //閫夋嫨鑺傜偣 涓嶆槸褰撳墠鑺傜偣鏃 let api - type == 0 ? api='/api/DisposalNodeData' : api='/api/ExamDisposalNodeData' + //濡傛灉鏄凡瀛樺湪棰勬 + if( this.examType == 1){ + type == 0 ? api='/api/DisposalNodeData' : api='/api/ExamDisposalNodeData' + }else{ //濡傛灉鏄嚜瀹氫箟棰勬 + api='/api/ExamDisposalNodeData' + } + let params = {nodeId: e.id} let parameter = { //鏌ヨ 鑺傜偣 瀵瑰簲 寤虹瓚/妤煎眰 index,id buildingIndex: e.sitePlanId? -1 : this.allBuildings.findIndex(item=>{ return item.id===e.buildingId }), //鎬诲钩闈㈠浘/寤虹瓚 index storeyId: e.sitePlanId? e.sitePlanId : e.buildingAreaId, //妤煎眰id } this.http.get(api,{params:params}).subscribe(data=>{ - + // console.log('xixixi',data) this.canvasData.selectPanelPoint = this.canvasData.deserialize(JSON.stringify(data || new DisposalNodeData())) //閫夋嫨 褰撳墠 鑺傜偣 this.canvasData.selectPanelPoint.Data = this.canvasData.deserialize(this.canvasData.selectPanelPoint.Data) @@ -1188,3 +1207,62 @@ export class CollectionToolsReadComponent implements OnInit { } + + + + +//鏌ョ湅闇瑕佹爣璁扮殑娑堥槻璁炬柦鎸夐挳 +@Component({ + selector: 'score', + templateUrl: './score.html', + styleUrls: ['./score.scss',] +}) +export class Score { + + constructor(private http:HttpClient, public dialog: MatDialog, public snackBar: MatSnackBar, public dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data) {} + + score:any + scoreNum:any = sessionStorage.getItem('scoreNum') || '' + ngOnInit(): void { + console.log(this.data) + this.score = '璇疯緭鍏ュ垎鏁 ( 姝よ瘯棰樻弧鍒嗕负' + this.data.score + '鍒 ) ' + } + + isSave:boolean = false + inputNum(){ + if(this.scoreNum > this.data.score){ + // this.scoreNum = this.data.score + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('瓒呭嚭鏈澶у垎鍊!','纭畾',config); + } + if(this.scoreNum < 0){ + // this.scoreNum = 0 + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('鍒嗘暟涓嶈兘涓鸿礋鏁!','纭畾',config); + } + } + ok(){ + if(this.scoreNum > this.data.score){ + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('瓒呭嚭鏈澶у垎鍊!','纭畾',config); + } + if(this.scoreNum < 0){ + // this.scoreNum = 0 + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('鍒嗘暟涓嶈兘涓鸿礋鏁!','纭畾',config); + } + if(this.scoreNum >= 0 && this.scoreNum < this.data.score){ + sessionStorage.setItem('scoreNum',this.scoreNum) + this.dialogRef.close() + } + } +} \ No newline at end of file diff --git a/src/app/ui/collection-tools-read/score.html b/src/app/ui/collection-tools-read/score.html new file mode 100644 index 0000000..c9873d0 --- /dev/null +++ b/src/app/ui/collection-tools-read/score.html @@ -0,0 +1,14 @@ +
+
璇蜂负姝ら妗堢瓟鍗疯瘎鍒
+
+
+ + + +
+
+
+ + +
+
\ No newline at end of file diff --git a/src/app/ui/collection-tools-read/score.scss b/src/app/ui/collection-tools-read/score.scss new file mode 100644 index 0000000..871a8e1 --- /dev/null +++ b/src/app/ui/collection-tools-read/score.scss @@ -0,0 +1,10 @@ +.btnbox{ + button{ + margin: 0 5px; + } +} +.contant{ + height: 60px; + width: 100%; + margin: 15px 0; +} \ No newline at end of file diff --git a/src/app/ui/collection-tools/collection-tools.component.ts b/src/app/ui/collection-tools/collection-tools.component.ts index 603d8a3..3e91076 100644 --- a/src/app/ui/collection-tools/collection-tools.component.ts +++ b/src/app/ui/collection-tools/collection-tools.component.ts @@ -802,38 +802,38 @@ export class CollectionToolsComponent implements OnInit { checkedBuilding(item,index){ if (this.checkedBuildingIndex!=index) { - if (this.canvasData.isChange) { //true 鏁版嵁琚敼鍔 - let isTrue = confirm('鏄惁淇濆瓨褰撳墠缂栬緫鏁版嵁') - if (isTrue) { //鍏堜繚瀛樻暟鎹 鍦ㄥ垏鎹 - let isSuccess = this.saveSite()//true鐨勬椂鍊 鍏堜繚瀛樻暟鎹 - if (isSuccess != false) { - this.beforeOneCheckedBuilding = item - this.checkedBuildingIndex = index - if (index==-1) { //鎬诲钩闈㈠浘鏁版嵁 - this.getSitePlan() - } else { //寤虹瓚妤煎眰/鍖哄煙鏁版嵁 - this.getBuildingSitePlan(item) - } - } - } else { - this.beforeOneCheckedBuilding = item - this.checkedBuildingIndex = index - if (index==-1) { //鎬诲钩闈㈠浘鏁版嵁 - this.getSitePlan() - } else { //寤虹瓚妤煎眰/鍖哄煙鏁版嵁 - this.getBuildingSitePlan(item) - } - } - } else { //flase 鏁版嵁鏈鏀瑰姩 - this.beforeOneCheckedBuilding = item - this.checkedBuildingIndex = index - if (index==-1) { //鎬诲钩闈㈠浘鏁版嵁 - this.getSitePlan() - } else { //寤虹瓚妤煎眰/鍖哄煙鏁版嵁 - this.getBuildingSitePlan(item) - } - } //if - + // if (this.canvasData.isChange) { //true 鏁版嵁琚敼鍔 + // let isTrue = confirm('鏄惁淇濆瓨褰撳墠缂栬緫鏁版嵁') + // if (isTrue) { //鍏堜繚瀛樻暟鎹 鍦ㄥ垏鎹 + // let isSuccess = this.saveSite()//true鐨勬椂鍊 鍏堜繚瀛樻暟鎹 + // if (isSuccess != false) { + // this.beforeOneCheckedBuilding = item + // this.checkedBuildingIndex = index + // if (index==-1) { //鎬诲钩闈㈠浘鏁版嵁 + // this.getSitePlan() + // } else { //寤虹瓚妤煎眰/鍖哄煙鏁版嵁 + // this.getBuildingSitePlan(item) + // } + // } + // } else { + // this.beforeOneCheckedBuilding = item + // this.checkedBuildingIndex = index + // if (index==-1) { //鎬诲钩闈㈠浘鏁版嵁 + // this.getSitePlan() + // } else { //寤虹瓚妤煎眰/鍖哄煙鏁版嵁 + // this.getBuildingSitePlan(item) + // } + // } + // } else { //flase 鏁版嵁鏈鏀瑰姩 + + // } //if + this.beforeOneCheckedBuilding = item + this.checkedBuildingIndex = index + if (index==-1) { //鎬诲钩闈㈠浘鏁版嵁 + this.getSitePlan() + } else { //寤虹瓚妤煎眰/鍖哄煙鏁版嵁 + this.getBuildingSitePlan(item) + } } //if } @@ -1106,11 +1106,9 @@ export class CollectionToolsComponent implements OnInit { //灏佽 鍒锋柊 tree 鏁版嵁 async renovateTreeData (isRefresh:boolean = true) { + this.allFireElements[this.allFireElements.length-1].children = [] this.beforeOneCheckedBuildingIsShow = false - isRefresh? await this.canvas.refresh() : null - this.canvas.setNameVisible(this.basicInfo,0) - this.canvas.setNameVisible(this.wantToWork,1) isRefresh? this.canvasData.isChange = false : null //鏈嶅姟涓 鏁版嵁鏄惁鏀瑰姩 鏀逛负false isRefresh? this.isShowProperty = true : null isRefresh? this.isShowAttribute = true : null @@ -1128,9 +1126,6 @@ export class CollectionToolsComponent implements OnInit { } } this.handleTreeData(storeyData) //澶勭悊tree鏁版嵁缁撴瀯 - this.canvas.onExaminerClickFloor() - // 闅愯棌鍩烘湰淇℃伅鍥惧舰 - this.canvas.setNameVisible(false, 0); } @@ -1255,6 +1250,12 @@ export class CollectionToolsComponent implements OnInit { this.canvasData.originaleveryStoreyData.version? null : this.canvasData.originaleveryStoreyData.version = "2.0" this.canvasData.originaleveryStoreyData.sitePlanId? null : this.canvasData.originaleveryStoreyData.sitePlanId = e.id || null this.renovateTreeData() + // this.canvas.onExaminerClickFloor() + this.canvas.createBackground(this.canvasData.selectStorey.imageUrl, this.canvasData.selectStorey.imageAngle); + this.canvas.createFloorShape(this.canvasData.originaleveryStoreyData.data); + this.canvas.createNodeShape(this.canvasData.selectPanelPoint.Data); + // 闅愯棌鍩烘湰淇℃伅鍥惧舰 + this.canvas.setNameVisible(false, 0); }) } @@ -1280,6 +1281,12 @@ export class CollectionToolsComponent implements OnInit { this.canvasData.originaleveryStoreyData.version? null : this.canvasData.originaleveryStoreyData.version = "2.0" this.canvasData.originaleveryStoreyData.buildingAreaId? null : this.canvasData.originaleveryStoreyData.buildingAreaId = e.id || null this.renovateTreeData() + // this.canvas.onExaminerClickFloor() + this.canvas.createBackground(this.canvasData.selectStorey.imageUrl, this.canvasData.selectStorey.imageAngle); + this.canvas.createFloorShape(this.canvasData.originaleveryStoreyData.data); + this.canvas.createNodeShape(this.canvasData.selectPanelPoint.Data); + // 闅愯棌鍩烘湰淇℃伅鍥惧舰 + this.canvas.setNameVisible(false, 0); }) } @@ -1288,45 +1295,45 @@ export class CollectionToolsComponent implements OnInit { if (this.selectSitePlanIndex != index) { this.canvasData.selectPanelPoint = new DisposalNodeData(); - if (this.canvasData.isChange) { //true 鏁版嵁琚敼鍔 - let isTrue = confirm('鏄惁淇濆瓨褰撳墠缂栬緫鏁版嵁') - if (isTrue) { //鍏堜繚瀛樻暟鎹 鍦ㄥ垏鎹 - let isSuccess = this.saveSite()//true鐨勬椂鍊 鍏堜繚瀛樻暟鎹 - if (isSuccess != false) { - this.selectingSitePlan = item - this.selectSitePlanIndex = index - this.canvasData.selectStorey = item //鏈嶅姟涓 瀛樹竴浠芥暟鎹 - if (this.checkedBuildingIndex==-1) { //鎬诲钩闈㈠浘鏃 - this.getSitePlanStorey(item) //鑾峰彇 骞抽潰鍥 妤煎眰鏁版嵁 - } else { //妤煎眰/鍖哄煙鏃 - this.getBuildingStorey(item) //鑾峰彇 寤虹瓚 妤煎眰鏁版嵁 - } - } - } else { //涓嶄繚瀛樻暟鎹 鐩存帴鍒囨崲 - this.selectingSitePlan = item - this.selectSitePlanIndex = index - this.canvasData.selectStorey = item //鏈嶅姟涓 瀛樹竴浠芥暟鎹 - if (this.checkedBuildingIndex==-1) { //鎬诲钩闈㈠浘鏃 - this.getSitePlanStorey(item) //鑾峰彇 骞抽潰鍥 妤煎眰鏁版嵁 - this.getSitePlanCompanyData() - } else { //妤煎眰/鍖哄煙鏃 - this.getBuildingStorey(item) //鑾峰彇 寤虹瓚 妤煎眰鏁版嵁 - let params = { buildingId: this.beforeOneCheckedBuilding.id } - this.getBuildingData(params) - } - } + // if (this.canvasData.isChange) { //true 鏁版嵁琚敼鍔 + // let isTrue = confirm('鏄惁淇濆瓨褰撳墠缂栬緫鏁版嵁') + // if (isTrue) { //鍏堜繚瀛樻暟鎹 鍦ㄥ垏鎹 + // let isSuccess = this.saveSite()//true鐨勬椂鍊 鍏堜繚瀛樻暟鎹 + // if (isSuccess != false) { + // this.selectingSitePlan = item + // this.selectSitePlanIndex = index + // this.canvasData.selectStorey = item //鏈嶅姟涓 瀛樹竴浠芥暟鎹 + // if (this.checkedBuildingIndex==-1) { //鎬诲钩闈㈠浘鏃 + // this.getSitePlanStorey(item) //鑾峰彇 骞抽潰鍥 妤煎眰鏁版嵁 + // } else { //妤煎眰/鍖哄煙鏃 + // this.getBuildingStorey(item) //鑾峰彇 寤虹瓚 妤煎眰鏁版嵁 + // } + // } + // } else { //涓嶄繚瀛樻暟鎹 鐩存帴鍒囨崲 + // this.selectingSitePlan = item + // this.selectSitePlanIndex = index + // this.canvasData.selectStorey = item //鏈嶅姟涓 瀛樹竴浠芥暟鎹 + // if (this.checkedBuildingIndex==-1) { //鎬诲钩闈㈠浘鏃 + // this.getSitePlanStorey(item) //鑾峰彇 骞抽潰鍥 妤煎眰鏁版嵁 + // this.getSitePlanCompanyData() + // } else { //妤煎眰/鍖哄煙鏃 + // this.getBuildingStorey(item) //鑾峰彇 寤虹瓚 妤煎眰鏁版嵁 + // let params = { buildingId: this.beforeOneCheckedBuilding.id } + // this.getBuildingData(params) + // } + // } - } else { //false 鏁版嵁娌¤鏀瑰姩 - this.selectingSitePlan = item - this.selectSitePlanIndex = index - this.canvasData.selectStorey = item //鏈嶅姟涓 瀛樹竴浠芥暟鎹 - if (this.checkedBuildingIndex==-1) { //鎬诲钩闈㈠浘鏃 - this.getSitePlanStorey(item) //鑾峰彇 骞抽潰鍥 妤煎眰鏁版嵁 - } else { //妤煎眰/鍖哄煙鏃 - this.getBuildingStorey(item) //鑾峰彇 寤虹瓚 妤煎眰鏁版嵁 - } - } //if - + // } else { //false 鏁版嵁娌¤鏀瑰姩 + + // } //if + this.selectingSitePlan = item + this.selectSitePlanIndex = index + this.canvasData.selectStorey = item //鏈嶅姟涓 瀛樹竴浠芥暟鎹 + if (this.checkedBuildingIndex==-1) { //鎬诲钩闈㈠浘鏃 + this.getSitePlanStorey(item) //鑾峰彇 骞抽潰鍥 妤煎眰鏁版嵁 + } else { //妤煎眰/鍖哄煙鏃 + this.getBuildingStorey(item) //鑾峰彇 寤虹瓚 妤煎眰鏁版嵁 + } } } diff --git a/src/app/ui/ui.module.ts b/src/app/ui/ui.module.ts index 6a528c3..a775a51 100644 --- a/src/app/ui/ui.module.ts +++ b/src/app/ui/ui.module.ts @@ -65,10 +65,10 @@ import {TeacherManagementComponent,editTeacher,seeTeacher} from './teacherManage import { CollectionToolsExamineeComponent } from './collection-tools-examinee/collection-tools.component'; import { examinationQuestionsExaminee, uploadDisposalNodesExaminee, uploadQuestionsExaminee } from './collection-tools-examinee/examinationQuestions'; import { saveOneDialogExaminee, saveTwoDialogExaminee } from './collection-tools-examinee/save'; -import { CollectionToolsReadComponent } from './collection-tools-read/collection-tools.component'; +import { CollectionToolsReadComponent, Score } from './collection-tools-read/collection-tools.component'; import { examinationQuestionsRead, uploadDisposalNodesRead, uploadQuestionsRead } from './collection-tools-read/examinationQuestions'; @NgModule({ - declarations: [ChangepasswordComponent,ConfirmpswDirective, ChangeuserdataComponent,testState,CollectionToolsComponent,CreateBuilding,EditBuilding,ViewDetailss,leftFunctionalDomainComponent,editPlaneFigureComponent,addDisposalNodeComponent,editDisposalNodeComponent,saveOneDialog,saveTwoDialog,WorkingAreaComponent,examinationQuestions,uploadQuestions,AddEnterpriserUser,EnterpriseuserComponent,editenterpriseuser,seeenterpriseuser,AddTeacher,TeacherManagementComponent,editTeacher,seeTeacher,uploadDisposalNodes,CollectionToolsExamineeComponent,examinationQuestionsExaminee,uploadQuestionsExaminee,uploadDisposalNodesExaminee,saveOneDialogExaminee,saveTwoDialogExaminee,CollectionToolsReadComponent,examinationQuestionsRead,uploadQuestionsRead,uploadDisposalNodesRead], + declarations: [ChangepasswordComponent,ConfirmpswDirective, ChangeuserdataComponent,testState,CollectionToolsComponent,CreateBuilding,EditBuilding,ViewDetailss,leftFunctionalDomainComponent,editPlaneFigureComponent,addDisposalNodeComponent,editDisposalNodeComponent,saveOneDialog,saveTwoDialog,WorkingAreaComponent,examinationQuestions,uploadQuestions,AddEnterpriserUser,EnterpriseuserComponent,editenterpriseuser,seeenterpriseuser,AddTeacher,TeacherManagementComponent,editTeacher,seeTeacher,uploadDisposalNodes,CollectionToolsExamineeComponent,examinationQuestionsExaminee,uploadQuestionsExaminee,uploadDisposalNodesExaminee,saveOneDialogExaminee,saveTwoDialogExaminee,CollectionToolsReadComponent,examinationQuestionsRead,uploadQuestionsRead,uploadDisposalNodesRead,Score], imports: [ NzDatePickerModule, CommonModule, diff --git a/src/app/working-area/model/arrows.ts b/src/app/working-area/model/arrows.ts deleted file mode 100644 index a553771..0000000 --- a/src/app/working-area/model/arrows.ts +++ /dev/null @@ -1,41 +0,0 @@ -import { WorkingAreaComponent } from '../working-area.component'; -import * as PIXI from 'pixi.js'; - -/** - * 绠ご - * 鍒涘缓涓涓彧鏈2涓偣缁勬垚鐨勭澶 - */ -export class Arrows extends PIXI.Container { - public line: PIXI.Graphics = new PIXI.Graphics(); - public ready = false; - constructor(public assetData: any, private workingArea: WorkingAreaComponent) { - super(); - this.workingArea.backgroundImage.addChild(this); - this.name = this.assetData.Id; - this.addChild(this.line); - this.refresh(); - this.interactive = true; - this.on('mousedown', event => { - if (!this.ready) { return; } - event.stopPropagation(); - this.workingArea.selection.selectOne(this); - }); - } - /** - * 鍒锋柊 - */ - public refresh() { - this.line.clear(); - this.line.lineStyle(5, 0xff0000, 1); - this.line.moveTo(this.assetData.pointA.x, this.assetData.pointA.y); - this.line.lineTo(this.assetData.pointB.x, this.assetData.pointB.y); - - const angle = Math.atan2((this.assetData.pointB.y - this.assetData.pointA.y), (this.assetData.pointB.x - this.assetData.pointA.x)) - * (180 / Math.PI) + 90; - - this.line.beginFill(0xff0000); - console.log(Math.PI / 180 / 1.6); - this.line.drawStar(this.assetData.pointB.x, this.assetData.pointB.y, 3, 10, 0, (Math.PI / 180 * angle)); - this.line.endFill(); - } -} diff --git a/src/app/working-area/model/axArrowConnector.ts b/src/app/working-area/model/axArrowConnector.ts index e334a69..68b2828 100644 --- a/src/app/working-area/model/axArrowConnector.ts +++ b/src/app/working-area/model/axArrowConnector.ts @@ -7,8 +7,6 @@ import { Sprite } from 'pixi.js'; * 杩炴帴绠ご */ export class AxArrowConnector extends AxShape { - - pointTexture: PIXI.Texture = PIXI.Texture.from('assets/images/handle-main.png') pointSprites: Array = new Array(); line: PIXI.Graphics; text: PIXI.Text; @@ -64,29 +62,30 @@ export class AxArrowConnector extends AxShape { }); this.pointSprites.forEach((value, index, array) => { value.interactive = true; - value.on('mousedown', event => { - event.stopPropagation(); - if (this.workingArea.allowEdit && this.assetData.GameMode === this.workingArea.canvasData.gameMode) { - event.currentTarget.data = event.data; - event.currentTarget.alpha = 0.5; - event.currentTarget.dragging = true; - } - }) - .on('mouseup', event => { + value + .on('pointerdown', event => { + event.stopPropagation(); + if (this.workingArea.allowEdit && this.assetData.GameMode === this.workingArea.canvasData.gameMode) { + event.currentTarget.data = event.data; + event.currentTarget.alpha = 0.5; + event.currentTarget.dragging = true; + } + }) + .on('pointerup', event => { if (event.currentTarget.dragging) { event.currentTarget.alpha = 1; event.currentTarget.dragging = false; event.currentTarget.data = null; } }) - .on('mouseupoutside', event => { + .on('pointerupoutside', event => { if (event.currentTarget.dragging) { event.currentTarget.alpha = 1; event.currentTarget.dragging = false; event.currentTarget.data = null; } }) - .on('mousemove', event => { + .on('pointermove', event => { if (event.currentTarget.dragging) { const newPosition = event.currentTarget.data.getLocalPosition(event.currentTarget.parent); event.currentTarget.x = newPosition.x; @@ -96,22 +95,30 @@ export class AxArrowConnector extends AxShape { this.assetData.MultiPoint[index].y = newPosition.y; this.workingArea.canvasData.isChange = true; this.refresh(); + this.drawBorder(1 / this.workingArea.backgroundImage.scale.x); } }) .on('rightclick', event => { }); }) - this.setPointsVisible(false); + this.setPointVisiable(false); } /** * 璁剧疆鐐规樉绀虹姸鎬 * @param b true/false */ - public setPointsVisible(b:boolean) { + public setPointVisiable(b:boolean) { this.pointSprites.forEach(item => { item.visible = b; }) + } + // 璁剧疆缂╂斁 + public setItemScale(scale: number) { + this.text.scale.set(scale); + this.pointSprites.forEach(point => { + point.scale.set(scale); + }); } /** * 鍒锋柊褰㈢姸 @@ -122,8 +129,8 @@ export class AxArrowConnector extends AxShape { if (pts.length < 2) { return; } - this.text.position = pts[0]; - this.text.anchor.set(0.5, 1); + this.text.position = this.getLineCenter(pts[0], pts[1]); + this.text.anchor.set(0.5); this.text.text = this.assetData.Name + '\r\n' + this.assetData.PropertyInfos?.find(item => item.PropertyName === '鍚嶇О/缂栧彿')?.PropertyValue; diff --git a/src/app/working-area/model/axImageShape.ts b/src/app/working-area/model/axImageShape.ts index 9654fca..bce7e50 100644 --- a/src/app/working-area/model/axImageShape.ts +++ b/src/app/working-area/model/axImageShape.ts @@ -13,6 +13,7 @@ import { AxArrowConnector } from './axArrowConnector'; * AxImageShape */ export class AxImageShape extends AxShape { + connectPointTexture = PIXI.Texture.from('assets/images/handle-secondary.png'); style = new PIXI.TextStyle({ fontFamily: 'Arial', fontSize: 18, @@ -34,26 +35,19 @@ export class AxImageShape extends AxShape { + '\r\n' + this.assetData.PropertyInfos?.find(item => item.PropertyName === '鍚嶇О/缂栧彿')?.PropertyValue, this.style); - /** - * 閫変腑鍦嗙偣 - */ - image: PIXI.Sprite; selectionBox = new PIXI.Graphics(); - connectPointTexture = PIXI.Texture.from('assets/images/handle-secondary.png'); - connectPoint: Sprite; - // 鍙Щ鍔ㄧ殑 - // 鍙変腑鐨 + connectPoint: Sprite; - // up: PIXI.Sprite; - // down: PIXI.Sprite; - // left: PIXI.Sprite; - // right: PIXI.Sprite; - // upLeft: PIXI.Sprite; - // upRight: PIXI.Sprite; - // downLeft: PIXI.Sprite; - // downRight: PIXI.Sprite; + up: PIXI.Sprite; + down: PIXI.Sprite; + left: PIXI.Sprite; + right: PIXI.Sprite; + upLeft: PIXI.Sprite; + upRight: PIXI.Sprite; + downLeft: PIXI.Sprite; + downRight: PIXI.Sprite; constructor(assetData: any, workingArea: WorkingAreaComponent) { super(assetData, workingArea); this.x = this.assetData.Point.x; @@ -68,74 +62,6 @@ export class AxImageShape extends AxShape { this.image.height = this.assetData.Height; this.image.alpha = 1; this.image.anchor.set(0.5); - // this.image.interactive = true; - // this.image.buttonMode = true; - // this.image - // .on('mousedown', event => { - // event.stopPropagation(); - // this.workingArea.selection.selectOne(this); - // // this.paintingPipeline(this.x, this.y); - // // 濡傛灉閾炬帴瀵硅薄涓嶄负绌,绂佹绉诲姩 - // if (this.workingArea.allowEdit && this.assetData.GameMode === this.workingArea.canvasData.gameMode) { - // event.currentTarget.parent.data = event.data; - // event.currentTarget.parent.alpha = 0.5; - // event.currentTarget.parent.dragging = true; - // } - // }) - // .on('mouseup', event => { - // if (event.currentTarget.parent.dragging) { - // event.currentTarget.parent.alpha = 1; - // event.currentTarget.parent.dragging = false; - // event.currentTarget.parent.data = null; - // } - // }) - // .on('mouseupoutside', event => { - // if (event.currentTarget.parent.dragging) { - // event.currentTarget.parent.alpha = 1; - // event.currentTarget.parent.dragging = false; - // event.currentTarget.parent.data = null; - // } - // }) - // .on('mousemove', event => { - // if (event.currentTarget.parent.dragging) { - // // // 濡傛灉鎷栧姩杩囩▼涓彂鐜扮埗瀵硅薄涓嶆槸鑳屾櫙鍥 - // // if (this.parent !== this.workingArea.backgroundImage) { - // // this.setParent(this.workingArea.backgroundImage); - // // if (this.assetData.FixedSize) { - // // const scale = 1 / this.workingArea.backgroundImage.scale.x; - // // this.scale.set(scale); - // // } - // // } - // const newPosition = event.currentTarget.parent.data.getLocalPosition(event.currentTarget.parent.parent); - // event.currentTarget.parent.x = newPosition.x; - // event.currentTarget.parent.y = newPosition.y; - // this.assetData.Point = new PIXI.Point(this.x, this.y); - // this.workingArea.canvasData.isChange = true; - // } - // }) - // .on('rightclick', event => { - - // }) - // .on('mouseover', event => { - // event.stopPropagation(); - // if (this.workingArea.previewImage !== null - // && this.workingArea.getPaintMode() === PaintMode.singlePointIcon) { - // this.workingArea.previewImage.visible = false; - // } - // // if (this.assetData.CanConnect) { - // // this.setSelectionBox(true, this.image); - // // } - // }) - // .on('mouseout', event => { - // event.stopPropagation(); - // if (this.workingArea.previewImage !== null - // && this.workingArea.getPaintMode() === PaintMode.singlePointIcon) { - // this.workingArea.previewImage.visible = true; - // } - // // if (this.assetData.CanConnect) { - // // this.setSelectionBox(false); - // // } - // }); this.text.x = this.image.x; this.text.y = this.image.y - this.image.height / 2; this.text.anchor.set(0.5, 1); @@ -144,6 +70,35 @@ export class AxImageShape extends AxShape { this.addChild(this.image); this.addChild(this.selectionBox); + //// + // up-left + this.upLeft = new PIXI.Sprite(this.pointTexture); + this.upLeft.anchor.set(0.5); + this.addChild(this.upLeft); + this.upLeft.interactive = true; + this.upLeft.visible = false; + // up-right + this.upRight = new PIXI.Sprite(this.pointTexture); + this.upRight.anchor.set(0.5); + this.addChild(this.upRight); + this.upRight.interactive = true; + this.upRight.visible = false; + // down-left + this.downLeft = new PIXI.Sprite(this.pointTexture); + this.downLeft.anchor.set(0.5); + this.addChild(this.downLeft); + this.downLeft.interactive = true; + this.downLeft.visible = false; + // down-right + this.downRight = new PIXI.Sprite(this.pointTexture); + this.downRight.anchor.set(0.5); + this.addChild(this.downRight); + this.downRight.interactive = true; + this.downRight.visible = false; + //// + + + if (this.assetData.CanConnect) { // connectPoint this.connectPoint = new PIXI.Sprite(this.connectPointTexture); @@ -153,178 +108,16 @@ export class AxImageShape extends AxShape { this.addChild(this.connectPoint); this.connectPoint.interactive = true; this.connectPoint - .on('mousedown', event => { + .on('pointerdown', event => { event.stopPropagation(); this.paintingPipeline(this.x, this.y); }) - .on('mouseover', event => { + .on('pointerover', event => { this.setSelectionBox(true, this.connectPoint); }) - .on('mouseout', event => { + .on('pointerout', event => { this.setSelectionBox(false); - }); - // // up - // this.up = new PIXI.Sprite(this.selectedPointTexture); - // this.up.anchor.set(0.5); - // this.up.x = this.image.x; - // this.up.y = this.image.y - (this.image.height / 2); - // this.addChild(this.up); - // this.up.interactive = true; - // this.up - // .on('mousedown', event => { - // event.stopPropagation(); - // const pt = this.toGlobal(new PIXI.Point(this.up.x, this.up.y)); - // const pt2 = this.workingArea.backgroundImage.toLocal(pt); - // this.paintingPipeline(pt2.x, pt2.y); - // }) - // .on('mouseover', event => { - // this.setSelectionBox(true, this.up); - // }) - // .on('mouseout', event => { - // this.setSelectionBox(false); - // }); - // // down - // this.down = new PIXI.Sprite(this.selectedPointTexture); - // this.down.anchor.set(0.5); - // this.down.x = this.image.x; - // this.down.y = this.image.y + (this.image.height / 2); - // this.addChild(this.down); - // this.down.interactive = true; - // this.down - // .on('mousedown', event => { - // event.stopPropagation(); - // const pt = this.toGlobal(new PIXI.Point(this.down.x, this.down.y)); - // const pt2 = this.workingArea.backgroundImage.toLocal(pt); - // this.paintingPipeline(pt2.x, pt2.y); - // }) - // .on('mouseover', event => { - // this.setSelectionBox(true, this.down); - // }) - // .on('mouseout', event => { - // this.setSelectionBox(false); - // }); - // // left - // this.left = new PIXI.Sprite(this.selectedPointTexture); - // this.left.anchor.set(0.5); - // this.left.x = this.image.x - (this.image.width / 2); - // this.left.y = this.image.y; - // this.addChild(this.left); - // this.left.interactive = true; - // this.left - // .on('mousedown', event => { - // event.stopPropagation(); - // const pt = this.toGlobal(new PIXI.Point(this.left.x, this.left.y)); - // const pt2 = this.workingArea.backgroundImage.toLocal(pt); - // this.paintingPipeline(pt2.x, pt2.y); - // }) - // .on('mouseover', event => { - // this.setSelectionBox(true, this.left); - // }) - // .on('mouseout', event => { - // this.setSelectionBox(false); - // }); - // // right - // this.right = new PIXI.Sprite(this.selectedPointTexture); - // this.right.anchor.set(0.5); - // this.right.x = this.image.x + (this.image.width / 2); - // this.right.y = this.image.y; - // this.addChild(this.right); - // this.right.interactive = true; - // this.right - // .on('mousedown', event => { - // event.stopPropagation(); - // const pt = this.toGlobal(new PIXI.Point(this.right.x, this.right.y)); - // const pt2 = this.workingArea.backgroundImage.toLocal(pt); - // this.paintingPipeline(pt2.x, pt2.y); - // }) - // .on('mouseover', event => { - // this.setSelectionBox(true, this.right); - // }) - // .on('mouseout', event => { - // this.setSelectionBox(false); - // }); - // // up-left - // this.upLeft = new PIXI.Sprite(this.selectedPointTexture); - // this.upLeft.anchor.set(0.5); - // this.upLeft.x = this.image.x - (this.image.width / 2); - // this.upLeft.y = this.image.y - (this.image.height / 2); - // this.addChild(this.upLeft); - // this.upLeft.interactive = true; - // this.upLeft - // .on('mousedown', event => { - // event.stopPropagation(); - // const pt = this.toGlobal(new PIXI.Point(this.upLeft.x, this.upLeft.y)); - // const pt2 = this.workingArea.backgroundImage.toLocal(pt); - // this.paintingPipeline(pt2.x, pt2.y); - // }) - // .on('mouseover', event => { - // this.setSelectionBox(true, this.upLeft); - // }) - // .on('mouseout', event => { - // this.setSelectionBox(false); - // }); - // // up-right - // this.upRight = new PIXI.Sprite(this.selectedPointTexture); - // this.upRight.anchor.set(0.5); - // this.upRight.x = this.image.x + (this.image.width / 2); - // this.upRight.y = this.image.y - (this.image.height / 2); - // this.addChild(this.upRight); - // this.upRight.interactive = true; - // this.upRight - // .on('mousedown', event => { - // event.stopPropagation(); - // const pt = this.toGlobal(new PIXI.Point(this.upRight.x, this.upRight.y)); - // const pt2 = this.workingArea.backgroundImage.toLocal(pt); - // this.paintingPipeline(pt2.x, pt2.y); - // }) - // .on('mouseover', event => { - // this.setSelectionBox(true, this.upRight); - // }) - // .on('mouseout', event => { - // this.setSelectionBox(false); - // }); - - // // down-left - // this.downLeft = new PIXI.Sprite(this.selectedPointTexture); - // this.downLeft.anchor.set(0.5); - // this.downLeft.x = this.image.x - (this.image.width / 2); - // this.downLeft.y = this.image.y + (this.image.height / 2); - // this.addChild(this.downLeft); - // this.downLeft.interactive = true; - // this.downLeft - // .on('mousedown', event => { - // event.stopPropagation(); - // const pt = this.toGlobal(new PIXI.Point(this.downLeft.x, this.downLeft.y)); - // const pt2 = this.workingArea.backgroundImage.toLocal(pt); - // this.paintingPipeline(pt2.x, pt2.y); - // }) - // .on('mouseover', event => { - // this.setSelectionBox(true, this.downLeft); - // }) - // .on('mouseout', event => { - // this.setSelectionBox(false); - // }); - // // down-right - // this.downRight = new PIXI.Sprite(this.selectedPointTexture); - // this.downRight.anchor.set(0.5); - // this.downRight.x = this.image.x + (this.image.width / 2); - // this.downRight.y = this.image.y + (this.image.height / 2); - // this.addChild(this.downRight); - // this.downRight.interactive = true; - // this.downRight - // .on('mousedown', event => { - // event.stopPropagation(); - // const pt = this.toGlobal(new PIXI.Point(this.downRight.x, this.downRight.y)); - // const pt2 = this.workingArea.backgroundImage.toLocal(pt); - // this.paintingPipeline(pt2.x, pt2.y); - // }) - // .on('mouseover', event => { - // this.setSelectionBox(true, this.downRight); - // }) - // .on('mouseout', event => { - // this.setSelectionBox(false); - // }); - + }); this.showConnectionPoint(false); } } @@ -334,14 +127,6 @@ export class AxImageShape extends AxShape { this.selectionBox.lineStyle(2, 0x00EB00, 1); this.selectionBox.position = sprite.position; this.selectionBox.drawRect(- sprite.width / 2, - sprite.height / 2, sprite.width, sprite.height); - // const p0 = new PIXI.Point(- sprite.width / 2, - sprite.height / 2); - // const pe = new PIXI.Point(sprite.width / 2, sprite.height / 2); - // const pw = new PIXI.Point(p0.x + sprite.width, p0.y); - // const ph = new PIXI.Point(p0.x, p0.y + sprite.height); - // this.drawDashedLine(this.selectionBox, p0, pw, 0x1234ff); - // this.drawDashedLine(this.selectionBox, p0, ph, 0x1234ff); - // this.drawDashedLine(this.selectionBox, pe, pw, 0x1234ff); - // this.drawDashedLine(this.selectionBox, pe, ph, 0x1234ff); } else { this.selectionBox.clear(); } @@ -355,14 +140,56 @@ export class AxImageShape extends AxShape { // 鏄剧ず杩炴帴鐐 public showConnectionPoint(b: boolean) { this.connectPoint.visible = b; - // this.up.visible = b; - // this.down.visible = b; - // this.left.visible = b; - // this.right.visible = b; - // this.upLeft.visible = b; - // this.downLeft.visible = b; - // this.upRight.visible = b; - // this.downRight.visible = b; + } + /** + * 璁剧疆鐐规樉绀虹姸鎬 + * @param value 鏄剧ず鐘舵 + */ + public setPointVisiable(value: boolean) { + let rect = this.getLocalBounds(); + this.upLeft.x = rect.left; + this.upLeft.y = rect.top; + this.upRight.x = rect.right; + this.upRight.y = rect.top; + this.downLeft.x = rect.left; + this.downLeft.y = rect.bottom; + this.downRight.x = rect.right; + this.downRight.y = rect.bottom; + this.upLeft.visible = value; + this.upRight.visible = value; + this.downLeft.visible = value; + this.downRight.visible = value; + } + /** + * + * @param scale 缁樺埗杈规 + */ + public drawBorder(scale: number) { + let visible = this.upLeft.visible; + this.setPointVisiable(false); + + super.drawBorder(scale); + let rect = this.getLocalBounds(); + this.upLeft.x = rect.left; + this.upLeft.y = rect.top; + this.upRight.x = rect.right; + this.upRight.y = rect.top; + this.downLeft.x = rect.left; + this.downLeft.y = rect.bottom; + this.downRight.x = rect.right; + this.downRight.y = rect.bottom; + this.setPointVisiable(visible); + } + public setItemScale(scale: number) { + if (this.assetData.FixedSize) { + this.scale.set(scale); + } else { + this.text.scale.set(scale); + this.upLeft.scale.set(scale); + this.upRight.scale.set(scale); + this.downLeft.scale.set(scale); + this.downRight.scale.set(scale); + } } paintingPipeline(x: number, y: number) { if (this.assetData.CanConnect) { diff --git a/src/app/working-area/model/axShape.ts b/src/app/working-area/model/axShape.ts index 3f8a59c..3023a7f 100644 --- a/src/app/working-area/model/axShape.ts +++ b/src/app/working-area/model/axShape.ts @@ -8,6 +8,7 @@ import { WorkingAreaComponent } from '../working-area.component'; */ export class AxShape extends Container { assetData: any; + pointTexture: PIXI.Texture = PIXI.Texture.from('assets/images/handle-main.png') workingArea: WorkingAreaComponent; // 鍙互琚Щ鍔ㄧ殑 moveable = true; @@ -19,6 +20,7 @@ export class AxShape extends Container { showName = true; // 杈规 border: PIXI.Graphics = new PIXI.Graphics(); + constructor(assetData: any, workingArea: WorkingAreaComponent) { super(); this.border.visible = false; @@ -118,19 +120,19 @@ export class AxShape extends Container { this.border.clear(); this.border.visible = false; } - /** + /** * 璁剧疆鐐规樉绀虹姸鎬 - * @param b true/false + * @param value 鏄剧ず鐘舵 */ - public setPointsVisible(b:boolean) { - + public setPointVisiable(value: boolean) { + } /** * * @param rect 鐢昏竟妗 */ public drawBorder(scale: number) { - if (this.visible === false) { return;} + scale = this.assetData.FixedSize ? 1 : scale; this.border.clear(); const rect = this.getLocalBounds(); const p1 = new PIXI.Point(rect.left, rect.top); @@ -186,5 +188,34 @@ export class AxShape extends Container { hyp -= spaceLength; } target.moveTo(x2, y2); - } + } + // 璁＄畻澶氳竟褰㈤噸蹇 + public calculatePolygonGravityCenter(points: PIXI.Point[]) { + let area = 0.0; // 澶氳竟褰㈤潰绉 + let gravityLat = 0.0; // 閲嶅績鐐 latitude + let gravityLng = 0.0; // 閲嶅績鐐 longitude + points.forEach((item, index) => { + // 1 + const lat = item.x; + const lng = item.y; + const nextLat = points[(index + 1) % points.length].x; + const nextLng = points[(index + 1) % points.length].y; + // 2 + const tempArea = (nextLat * lng - nextLng * lat) / 2.0; + // 3 + area += tempArea; + // 4 + gravityLat += tempArea * (lat + nextLat) / 3; + gravityLng += tempArea * (lng + nextLng) / 3; + }); + // 5 + gravityLat = gravityLat / area; + gravityLng = gravityLng / area; + + return new PIXI.Point(gravityLat, gravityLng); + } + // 璁＄畻绾挎涓偣鍧愭爣 + public getLineCenter(point1:PIXI.Point,point2:PIXI.Point) { + return new PIXI.Point((point1.x+point2.x)/2,(point1.y+point2.y)/2) + } } diff --git a/src/app/working-area/model/multipointIcon.ts b/src/app/working-area/model/multipointIcon.ts index 8be055f..2416956 100644 --- a/src/app/working-area/model/multipointIcon.ts +++ b/src/app/working-area/model/multipointIcon.ts @@ -8,7 +8,7 @@ import { AxShape } from './axShape'; */ export class MultipointIcon extends AxShape { public pointsData: PIXI.Point[]; - public pointsGraphics: PIXI.Graphics[] = []; + public pointsGraphics: PIXI.Sprite[] = []; public iconsTilingSprite: PIXI.TilingSprite[] = []; style = new PIXI.TextStyle({ fontFamily: 'Arial', @@ -42,6 +42,11 @@ export class MultipointIcon extends AxShape { this.x = this.assetData.Point.x; this.y = this.assetData.Point.y; this.workingArea.backgroundImage.addChild(this); + + this.text.anchor.set(0.5,0.5); + // this.text.position = this.getLineCenter(this.pointsData[0], this.pointsData[1]); + this.text.visible = this.showName; + this.addChild(this.text); // 鐢荤嚎鍥炬爣 for (let i = 0, count = this.pointsData.length - 1; i < count; i++) { const pointA = this.pointsData[i]; @@ -60,23 +65,16 @@ export class MultipointIcon extends AxShape { // icon.height = this.assetData.Thickness === 0 ? 32 : this.assetData.Thickness; this.iconsTilingSprite.push(icon); this.addChild(icon); - if (i === 0) { - this.text.anchor.set(0.5); - this.text.position = icon.position; - this.text.y -= this.assetData.Height; - this.text.visible = this.showName; - this.addChild(this.text); - } + this.text.position = this.getLineCenter(this.pointsData[0], this.pointsData[1]); } + this.sortableChildren = true; + this.text.zIndex = this.pointsData.length; // 鐢荤偣 this.pointsData.forEach((item, index, array) => { - const iconPoint = new PIXI.Graphics(); - iconPoint.lineStyle(1, 0xFFBD01, 1); - iconPoint.beginFill(0xFFFFFF, 1); - iconPoint.drawCircle(0, 0, 15); + const iconPoint = PIXI.Sprite.from(this.pointTexture); + iconPoint.anchor.set(0.5); iconPoint.x = item.x; iconPoint.y = item.y; - iconPoint.endFill(); iconPoint.visible = false; this.pointsGraphics.push(iconPoint); this.addChild(iconPoint); @@ -84,7 +82,7 @@ export class MultipointIcon extends AxShape { // 娣诲姞鍦嗙偣浜嬩欢 this.pointsGraphics.forEach((item, index, array) => { item.interactive = true; - item.on('mousedown', event => { + item.on('pointerdown', event => { event.stopPropagation(); if (this.workingArea.allowEdit && this.assetData.GameMode === this.workingArea.canvasData.gameMode) { event.currentTarget.data = event.data; @@ -92,21 +90,21 @@ export class MultipointIcon extends AxShape { event.currentTarget.dragging = true; } }) - .on('mouseup', event => { + .on('pointerup', event => { if (event.currentTarget.dragging) { event.currentTarget.alpha = 1; event.currentTarget.dragging = false; event.currentTarget.data = null; } }) - .on('mouseupoutside', event => { + .on('pointerupoutside', event => { if (event.currentTarget.dragging) { event.currentTarget.alpha = 1; event.currentTarget.dragging = false; event.currentTarget.data = null; } }) - .on('mousemove', event => { + .on('pointermove', event => { if (event.currentTarget.dragging) { const newPosition = event.currentTarget.data.getLocalPosition(event.currentTarget.parent); event.currentTarget.x = newPosition.x; @@ -129,9 +127,6 @@ export class MultipointIcon extends AxShape { const distance = Math.sqrt(a * a + b * b); this.iconsTilingSprite[index].angle = angle; this.iconsTilingSprite[index].width = distance; - - this.text.position = this.iconsTilingSprite[index].position; - this.text.y -= this.assetData.Height; } else if (index < array.length - 1) {// 涓嶆槸绗竴涓偣锛屼篃涓嶆槸鏈鍚庝竴涓偣 this.iconsTilingSprite[index].x = newPosition.x; this.iconsTilingSprite[index].y = newPosition.y; @@ -164,61 +159,13 @@ export class MultipointIcon extends AxShape { this.iconsTilingSprite[index - 1].angle = angleC; this.iconsTilingSprite[index - 1].width = distanceC; } + this.drawBorder(1 / this.workingArea.backgroundImage.scale.x); + this.text.position = this.getLineCenter(this.pointsData[0], this.pointsData[1]); } }) .on('rightclick', event => { }); }); - // // 缂╂斁 - // this.workingArea.on('backgroundScale', data => { - // const scale = 1 / data; - // this.text.scale.set(scale); - // }); - // 娣诲姞閫変腑浜嬩欢 - // this.iconsTilingSprite.forEach((item, index, array) => { - // item.interactive = true; - // item.buttonMode = true; - // item.on('mousedown', event => { - // event.stopPropagation(); - // this.workingArea.selection.selectOne(this); - // if (this.workingArea.allowEdit && this.assetData.GameMode === this.workingArea.canvasData.gameMode) { - // event.currentTarget.parent.data = event.data; - // event.currentTarget.parent.alpha = 0.5; - // event.currentTarget.parent.dragging = true; - - // event.currentTarget.parent.dragPoint = event.data.getLocalPosition(event.currentTarget.parent.parent); - // event.currentTarget.parent.dragPoint.x -= event.currentTarget.parent.x; - // event.currentTarget.parent.dragPoint.y -= event.currentTarget.parent.y; - // } - // }) - // .on('mouseup', event => { - // if (event.currentTarget.parent.dragging) { - // event.currentTarget.parent.alpha = 1; - // event.currentTarget.parent.dragging = false; - // event.currentTarget.parent.data = null; - // } - // }) - // .on('mouseupoutside', event => { - // if (event.currentTarget.parent.dragging) { - // event.currentTarget.parent.alpha = 1; - // event.currentTarget.parent.dragging = false; - // event.currentTarget.parent.data = null; - // } - // }) - // .on('mousemove', event => { - // if (event.currentTarget.parent.dragging) { - // const newPosition = event.currentTarget.parent.data.getLocalPosition(event.currentTarget.parent.parent); - // event.currentTarget.parent.x = newPosition.x - event.currentTarget.parent.dragPoint.x; - // event.currentTarget.parent.y = newPosition.y - event.currentTarget.parent.dragPoint.y; - - // this.assetData.Point = new PIXI.Point(this.x, this.y); - // this.workingArea.canvasData.isChange = true; - // } - // }) - // .on('rightclick', event => { - - // }); - // }); } /** * 璁剧疆鐐规樉绀虹姸鎬 @@ -235,6 +182,13 @@ export class MultipointIcon extends AxShape { this.text.visible = value; } } + // 璁剧疆缂╂斁 + public setItemScale(scale: number) { + this.text.scale.set(scale); + this.pointsGraphics.forEach((item, index, array) => { + item.scale.set(scale); + }); + } // 鍒锋柊鏁版嵁 public refresh() { // console.log(this.assetData); diff --git a/src/app/working-area/model/polygonIcon.ts b/src/app/working-area/model/polygonIcon.ts index 056cb42..1bf4f42 100644 --- a/src/app/working-area/model/polygonIcon.ts +++ b/src/app/working-area/model/polygonIcon.ts @@ -9,9 +9,9 @@ import { AxShape } from './axShape'; */ export class PolygonIcon extends AxShape { public pointsData: PIXI.Point[]; - public pointsGraphics: PIXI.Graphics[] = []; + public pointsGraphics: PIXI.Sprite[] = []; public polygonGraphics: PIXI.Graphics = new PIXI.Graphics(); - public polygonLineGraphics: PIXI.Graphics = new PIXI.Graphics(); + // public polygonLineGraphics: PIXI.Graphics = new PIXI.Graphics(); style = new PIXI.TextStyle({ fontFamily: 'Arial', fontSize: 18, @@ -46,13 +46,14 @@ export class PolygonIcon extends AxShape { this.sortableChildren = true; // 鐢荤偣 this.pointsData.forEach((item, index, array) => { - const iconPoint = new PIXI.Graphics(); - iconPoint.lineStyle(1, 0xFFBD01, 1); - iconPoint.beginFill(0xFFFFFF, 1); - iconPoint.drawCircle(0, 0, 15); + const iconPoint = PIXI.Sprite.from(this.pointTexture); + // iconPoint.lineStyle(1, 0xFFBD01, 1); + // iconPoint.beginFill(0xFFFFFF, 1); + // iconPoint.drawCircle(0, 0, 15); + iconPoint.anchor.set(0.5); iconPoint.x = item.x; iconPoint.y = item.y; - iconPoint.endFill(); + // iconPoint.endFill(); iconPoint.visible = false; this.pointsGraphics.push(iconPoint); this.addChild(iconPoint); @@ -66,10 +67,10 @@ export class PolygonIcon extends AxShape { this.polygonGraphics.endFill(); this.addChild(this.polygonGraphics); // 鐢诲杈瑰舰 - this.polygonLineGraphics.lineStyle(5, 0xFFBD01, 1); - this.polygonLineGraphics.drawPolygon(this.getPoints()); - this.polygonLineGraphics.closePath(); - this.addChild(this.polygonLineGraphics); + // this.polygonLineGraphics.lineStyle(5, 0xFFBD01, 1); + // this.polygonLineGraphics.drawPolygon(this.getPoints()); + // this.polygonLineGraphics.closePath(); + // this.addChild(this.polygonLineGraphics); this.text.anchor.set(0.5); this.text.position = this.calculatePolygonGravityCenter(this.pointsData); @@ -81,7 +82,7 @@ export class PolygonIcon extends AxShape { item.interactive = true; item.buttonMode = true; item.zIndex = 1; - item.on('mousedown', event => { + item.on('pointerdown', event => { event.stopPropagation(); if (this.workingArea.allowEdit && this.assetData.GameMode === this.workingArea.canvasData.gameMode) { event.currentTarget.data = event.data; @@ -89,21 +90,21 @@ export class PolygonIcon extends AxShape { event.currentTarget.dragging = true; } }) - .on('mouseup', event => { + .on('pointerup', event => { if (event.currentTarget.dragging) { event.currentTarget.alpha = 1; event.currentTarget.dragging = false; event.currentTarget.data = null; } }) - .on('mouseupoutside', event => { + .on('pointerupoutside', event => { if (event.currentTarget.dragging) { event.currentTarget.alpha = 1; event.currentTarget.dragging = false; event.currentTarget.data = null; } }) - .on('mousemove', event => { + .on('pointermove', event => { if (event.currentTarget.dragging) { const newPosition = event.currentTarget.data.getLocalPosition(event.currentTarget.parent); event.currentTarget.x = newPosition.x; @@ -117,13 +118,14 @@ export class PolygonIcon extends AxShape { this.polygonGraphics.beginFill(color, angle); this.polygonGraphics.drawPolygon(this.getPoints()); this.polygonGraphics.endFill(); - // 鐢诲杈瑰舰 - this.polygonLineGraphics.clear(); - this.polygonLineGraphics.lineStyle(5, 0xFFBD01, 1); - this.polygonLineGraphics.drawPolygon(this.getPoints()); - this.polygonLineGraphics.closePath(); + // // 鐢诲杈瑰舰 + // this.polygonLineGraphics.clear(); + // this.polygonLineGraphics.lineStyle(5, 0xFFBD01, 1); + // this.polygonLineGraphics.drawPolygon(this.getPoints()); + // this.polygonLineGraphics.closePath(); this.text.position = this.calculatePolygonGravityCenter(this.pointsData); + this.drawBorder(1 / this.workingArea.backgroundImage.scale.x); } }) .on('rightclick', event => { @@ -134,7 +136,7 @@ export class PolygonIcon extends AxShape { this.workingArea.previewImage.visible = false; } }) - .on('mouseout', event => { + .on('pointerout', event => { event.stopPropagation(); if (this.workingArea.previewImage !== null && this.workingArea.getPaintMode() === PaintMode.singlePointIcon) { @@ -142,64 +144,6 @@ export class PolygonIcon extends AxShape { } }); }); - // // 娣诲姞閫変腑浜嬩欢 - // this.polygonGraphics.interactive = true; - // this.polygonGraphics.buttonMode = true; - // this.polygonGraphics - // .on('mousedown', event => { - // event.stopPropagation(); - // this.workingArea.selection.selectOne(this); - // if (this.workingArea.allowEdit && this.assetData.GameMode === this.workingArea.canvasData.gameMode) { - // event.currentTarget.parent.data = event.data; - // event.currentTarget.parent.alpha = 0.5; - // event.currentTarget.parent.dragging = true; - - // event.currentTarget.parent.dragPoint = event.data.getLocalPosition(event.currentTarget.parent.parent); - // event.currentTarget.parent.dragPoint.x -= event.currentTarget.parent.x; - // event.currentTarget.parent.dragPoint.y -= event.currentTarget.parent.y; - // } - // }) - // .on('mouseup', event => { - // if (event.currentTarget.parent.dragging) { - // event.currentTarget.parent.alpha = 1; - // event.currentTarget.parent.dragging = false; - // event.currentTarget.parent.data = null; - // } - // }) - // .on('mouseupoutside', event => { - // if (event.currentTarget.parent.dragging) { - // event.currentTarget.parent.alpha = 1; - // event.currentTarget.parent.dragging = false; - // event.currentTarget.parent.data = null; - // } - // }) - // .on('mousemove', event => { - // if (event.currentTarget.parent.dragging) { - // const newPosition = event.currentTarget.parent.data.getLocalPosition(event.currentTarget.parent.parent); - // event.currentTarget.parent.x = newPosition.x - event.currentTarget.parent.dragPoint.x; - // event.currentTarget.parent.y = newPosition.y - event.currentTarget.parent.dragPoint.y; - - // this.assetData.Point = new PIXI.Point(this.x, this.y); - // this.workingArea.canvasData.isChange = true; - // } - // }) - // .on('rightclick', event => { - // // this.workingArea.selection.deselectAll(); - // }) - // .on('mouseover', event => { - // event.stopPropagation(); - // if (this.workingArea.previewImage !== null - // && this.workingArea.getPaintMode() === PaintMode.singlePointIcon) { - // this.workingArea.previewImage.visible = false; - // } - // }) - // .on('mouseout', event => { - // event.stopPropagation(); - // if (this.workingArea.previewImage !== null - // && this.workingArea.getPaintMode() === PaintMode.singlePointIcon) { - // this.workingArea.previewImage.visible = true; - // } - // }); } /** * 璁剧疆鐐规樉绀虹姸鎬 @@ -210,31 +154,14 @@ export class PolygonIcon extends AxShape { item.visible = value; }); } - - public calculatePolygonGravityCenter(points: PIXI.Point[]) { - let area = 0.0; // 澶氳竟褰㈤潰绉 - let gravityLat = 0.0; // 閲嶅績鐐 latitude - let gravityLng = 0.0; // 閲嶅績鐐 longitude - points.forEach((item, index) => { - // 1 - const lat = item.x; - const lng = item.y; - const nextLat = points[(index + 1) % points.length].x; - const nextLng = points[(index + 1) % points.length].y; - // 2 - const tempArea = (nextLat * lng - nextLng * lat) / 2.0; - // 3 - area += tempArea; - // 4 - gravityLat += tempArea * (lat + nextLat) / 3; - gravityLng += tempArea * (lng + nextLng) / 3; + // 璁剧疆缂╂斁 + public setItemScale(scale: number) { + this.text.scale.set(scale); + this.pointsGraphics.forEach(point => { + point.scale.set(scale); }); - // 5 - gravityLat = gravityLat / area; - gravityLng = gravityLng / area; - - return new PIXI.Point(gravityLat, gravityLng); } + /** * 鑾峰彇鐐归泦鍚 */ diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts index ba3c4d9..368101b 100644 --- a/src/app/working-area/working-area.component.ts +++ b/src/app/working-area/working-area.component.ts @@ -154,25 +154,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV this.selection.objects.forEach(item => { if (this.allowEdit && this.canvasData.gameMode === item.assetData.GameMode) { - switch (this.canvasData.gameMode) { - case 0: - // 鍒犻櫎妤煎眰鏁版嵁 - delete this.canvasData.originaleveryStoreyData.data[item.assetData.Id]; - // 鍒犻櫎寤虹瓚鏁版嵁 - delete this.canvasData.originalcompanyBuildingData.data[item.assetData.Id]; - // 鍙栨秷娓叉煋 - this.backgroundImage.removeChild(this.backgroundImage.getChildByName(item.assetData.Id)); - // 鏁版嵁鏇存敼 - this.canvasData.isChange = true; - break; - case 1: - delete this.canvasData.selectPanelPoint.Data.DefinedIncrement[item.assetData.Id]; - delete this.canvasData.selectPanelPoint.Data.Increment[item.assetData.Id]; - delete this.canvasData.selectPanelPoint.Data.Stock[item.assetData.Id]; - this.backgroundImage.removeChild(this.backgroundImage.getChildByName(item.assetData.Id)); - this.canvasData.isChange = true; - break; - } + this.backgroundImage.removeChild(this.backgroundImage.getChildByName(item.assetData.Id)); } }); this.selection.deselectAll(); @@ -280,6 +262,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV if (this.circleShadow !== null && this.backgroundImage !== null) { this.circleShadow.position = this.backgroundImage.toLocal(this.mousePosition); this.refreshPreviewLineSegment(this.currentClickPoint.position, this.circleShadow.position); + this.refreshPreviewPoint(); } /** * 鏄剧ず妗嗛 @@ -310,11 +293,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV this.on('select', shape => { if (shape instanceof AxShape) { shape.showBorder(); - if (this.allowEdit) { - - } else { - - } + shape.setPointVisiable(this.allowEdit); } }); /** @@ -323,65 +302,34 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV this.on('deselect', shape => { if (shape instanceof AxShape) { shape.hideBorder(); - if (this.allowEdit) { - - } else { - - } + shape.setPointVisiable(false); } - // if (this.allowEdit) { - // if (obj instanceof AxArrowConnector) { - // obj.setPointsVisible(false); - // } - // else if (obj instanceof MultipointIcon) { - // obj.setPointVisiable(false); - // } else if (obj instanceof PolygonIcon) { - // obj.filters = []; - // obj.setPointVisiable(false); - // } else { - // obj.filters = []; - // } - // } else { - // obj.filters = []; - // } }); /** * 鏍规嵁鑳屾櫙缂╂斁浜嬩欢 */ this.on('backgroundScale', scale => { + const data = 1 / scale; this.backgroundImage?.children.forEach(item => { if (item instanceof AxImageShape) { - if (item.assetData.FixedSize) { - const data = 1 / scale; - item.scale.set(data); - } else { - const data = 1 / scale; - item.text.scale.set(data); - } + item.setItemScale(data); + item.drawBorder(data); } else if (item instanceof MultipointIcon) { - const data = 1 / scale; - item.text.scale.set(data); + item.setItemScale(data); + item.drawBorder(data); } else if (item instanceof PolygonIcon) { - const data = 1 / scale; - item.text.scale.set(data); - item.pointsGraphics.forEach(point => { - point.scale.set(data); - }); + item.setItemScale(data); + item.drawBorder(data); } else if (item instanceof AxPreviewImageShape) { - const data = 1 / scale; item.scale.set(data); - }else if (item instanceof AxArrowConnector) { - const data = 1 / scale; - item.text.scale.set(data); - item.pointSprites.forEach(point => { - point.scale.set(data); - }); + } else if (item instanceof AxArrowConnector) { + item.setItemScale(data); + item.drawBorder(data); } }); - }); /** - * 鍒涘缓鍥炬爣浜嬩欢 + * 鍒涘缓鍥炬爣浜嬩欢锛堟暟鎹鐞嗭級 */ this.on('createIcon', obj => { if (obj.assetData.GameMode === GameMode.BasicInformation) { // 鍩烘湰淇℃伅 @@ -389,26 +337,50 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV this.canvasData.originaleveryStoreyData.data[obj.assetData.Id] = obj.assetData; // 娣诲姞寤虹瓚鏁版嵁 this.canvasData.originalcompanyBuildingData.data[obj.assetData.Id] = obj.assetData; - } else if(obj.assetData.GameMode === GameMode.Assignment){ // 澶勭疆棰勬 + } else if (obj.assetData.GameMode === GameMode.Assignment) { // 澶勭疆棰勬 if (this.canvasData.selectPanelPoint.Data === undefined - || this.canvasData.selectPanelPoint.Data === null) { + || this.canvasData.selectPanelPoint.Data === null) { this.canvasData.selectPanelPoint.Data = new FloorNodeData(); } this.canvasData.selectPanelPoint.Data.Stock[obj.assetData.Id] = obj.assetData; } else if (obj.assetData.GameMode === GameMode.Examinee) { // 鑰冪敓鑰冭瘯 - console.log(obj.assetData.Tag) if (obj.assetData.Tag === 1) { this.canvasData.examOriginaleveryStoreyData.data[obj.assetData.Id] = obj.assetData; } else { if (this.canvasData.selectPanelPoint.Data === undefined - || this.canvasData.selectPanelPoint.Data === null) { - this.canvasData.selectPanelPoint.Data = new FloorNodeData(); + || this.canvasData.selectPanelPoint.Data === null) { + this.canvasData.selectPanelPoint.Data = new FloorNodeData(); } this.canvasData.selectPanelPoint.Data.Stock[obj.assetData.Id] = obj.assetData; } } this.canvasData.isChange = true; }); + /** + * 鍒犻櫎鍥炬爣浜嬩欢(鏁版嵁澶勭悊) + */ + this.on('deleteIcon', obj => { + if (obj.assetData.GameMode === GameMode.BasicInformation) { // 鍩烘湰淇℃伅 + // 鍒犻櫎妤煎眰鏁版嵁 + delete this.canvasData.originaleveryStoreyData.data[obj.assetData.Id]; + // 鍒犻櫎寤虹瓚鏁版嵁 + delete this.canvasData.originalcompanyBuildingData.data[obj.assetData.Id]; + } else if (obj.assetData.GameMode === GameMode.Assignment) { // 澶勭疆棰勬 + delete this.canvasData.selectPanelPoint.Data.DefinedIncrement[obj.assetData.Id]; + delete this.canvasData.selectPanelPoint.Data.Increment[obj.assetData.Id]; + delete this.canvasData.selectPanelPoint.Data.Stock[obj.assetData.Id]; + } else if (obj.assetData.GameMode === GameMode.Examinee) { // 鑰冪敓鑰冭瘯 + if (obj.assetData.Tag === 1) { + // 鍒犻櫎妤煎眰鏁版嵁 + delete this.canvasData.examOriginaleveryStoreyData.data[obj.assetData.Id]; + } else { + delete this.canvasData.selectPanelPoint.Data.DefinedIncrement[obj.assetData.Id]; + delete this.canvasData.selectPanelPoint.Data.Increment[obj.assetData.Id]; + delete this.canvasData.selectPanelPoint.Data.Stock[obj.assetData.Id]; + } + this.canvasData.isChange = true; + } + }); } /** * 閲嶇疆鐢诲竷 @@ -478,25 +450,6 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV this.selection.select(obj); }); } - // /** - // * 鍒锋柊宸ヤ綔鍖 - // */ - public async refresh() { - //this.loadExamineeData(); - // this.setPaintMode(PaintMode.endPaint); - // this.resetCanvas(); - // this.destroyBackgroundImage(); - // if (!this.canvasData.selectStorey.imageUrl) { - - // return; - // } - - // await this.createBackgroundImage(this.canvasData.selectStorey.imageUrl); - // this.createFloorShape(this.canvasData.originaleveryStoreyData.data); - // if (this.canvasData.gameMode === GameMode.Assignment) { - // this.createNodeShape(this.canvasData.selectPanelPoint.Data); - // } - } /** * 鍒涘缓鑳屾櫙鍥 */ @@ -512,6 +465,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV * 鍒涘缓妤煎眰鍥惧舰 */ public createFloorShape(floorData: any) { + if (floorData === undefined || floorData === null) return; Object.keys(floorData).forEach((key) => { switch (floorData[key].InteractiveMode) { case 0: @@ -565,55 +519,6 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV } this.emit('backgroundScale', this.backgroundImage.scale.x); } - - /** - * - * @param id 鍥炬爣ID - * @param b 鏄剧ず/闅愯棌 - */ - public setIconVisible(ids: string[], b: boolean) { - ids.forEach(item => { - this.backgroundImage.getChildByName(item).visible = b; - }); - } - // /** - // * 鐗堟湰妫鏌 - // */ - // public versionChecking(): void { - // const floorData = this.canvasData.originaleveryStoreyData; - // const buildingData = this.canvasData.originalcompanyBuildingData; - // const nodeData = this.canvasData.selectPanelPoint; - // if (floorData.version && floorData.version === '1.0') { - // floorData.version = '2.0'; - // Object.keys(floorData.data).forEach(item => { - // floorData.data[item].Point.y *= -1; - // floorData.data[item].MultiPoint?.forEach(element => { - // element.y *= -1; - // }); - // }); - // } - // if (buildingData.version && buildingData.version === '1.0') { - // buildingData.version = '2.0'; - // Object.keys(buildingData.data).forEach(item => { - // buildingData.data[item].Point.y *= -1; - // buildingData.data[item].MultiPoint?.forEach(element => { - // element.y *= -1; - // }); - // }); - // } - // if (nodeData.Version && nodeData.Version === '1.0') { - // nodeData.Version = '2.0'; - // console.log(this.canvasData.selectPanelPoint.Version); - // Object.keys(nodeData.Data).forEach((key) => { - // Object.keys(nodeData.Data[key]).forEach((tempKey) => { - // nodeData.Data[key][tempKey].Point.y *= -1; - // nodeData.Data[key][tempKey].MultiPoint?.forEach(element => { - // element.y *= -1; - // }); - // }); - // }); - // } - // } /** * 鍒涘缓纭缁樺埗缁撴潫鎸夐挳 */ @@ -1016,7 +921,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV */ private refreshPreviewLineSegment(pointA: PIXI.Point, pointB: PIXI.Point) { this.previewLineSegment.clear(); - this.previewLineSegment.lineStyle(5, 0x00ff00, 1); + this.previewLineSegment.lineStyle(1/this.backgroundImage.scale.x, 0x00ff00, 1); this.previewLineSegment.moveTo(pointA.x, pointA.y); this.previewLineSegment.lineTo(pointB.x, pointB.y ); } @@ -1025,12 +930,21 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV * @param x 鍗婂緞 */ private createCircleShadow(): void { - this.circleShadow.beginFill(0xFFCC5A); - this.circleShadow.drawCircle(0, 0, 10); - this.circleShadow.endFill(); + // this.circleShadow.beginFill(0xFFCC5A); + // this.circleShadow.drawCircle(0, 0, 10); + // this.circleShadow.endFill(); this.circleShadow.visible = false; this.backgroundImage.addChild(this.circleShadow); } + /** + * 鍒锋柊棰勮鐐 + */ + private refreshPreviewPoint() { + this.circleShadow.clear(); + this.circleShadow.beginFill(0x00ff00); + this.circleShadow.drawCircle(0, 0, 5/this.backgroundImage.scale.x); + this.circleShadow.endFill(); + } showConnectionPoint(b: boolean) { this.backgroundImage?.children.forEach(item => { if (item instanceof AxImageShape) { @@ -1252,9 +1166,26 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV }); this.emit('backgroundScale', this.backgroundImage.scale.x); } + ////////////////////////////////////////////////////////////////////////閫氱敤///////////////////////////////////////////////////////////////////////////// + /** + * + * @param id 鍥炬爣ID + * @param b 鏄剧ず/闅愯棌 + */ + public setIconVisible(ids: string[], b: boolean) { + ids.forEach(item => { + this.backgroundImage.getChildByName(item).visible = b; + }); + } + ////////////////////////////////////////////////////////////////////////閲囬泦骞冲彴鍔犺浇閫昏緫/////////////////////////////////////////////////////////////////////// + public onBasicInformationClickFloor() { + + } - - + ////////////////////////////////////////////////////////////////////////缂栧埗骞冲彴鍔犺浇閫昏緫/////////////////////////////////////////////////////////////////////// + public onClickAssignmentFloor() { + + } ////////////////////////////////////////////////////////////////////////鑰冭瘯绯荤粺鍔犺浇閫昏緫/////////////////////////////////////////////////////////////////////// /** @@ -1272,20 +1203,33 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV * 鑰冪敓鐐瑰嚮妤煎眰 */ public onExamineeClickFloor() { + // // 鍒涘缓鑳屾櫙鍥 + // this.createBackground(this.canvasData.selectStorey.imageUrl, this.canvasData.selectStorey.imageAngle); + // // 鍒涘缓妤煎眰鍥惧舰 + // this.createFloorShape(this.canvasData.examOriginaleveryStoreyData.data); + // // 澶勭悊鍏变韩鏁版嵁涓冨畼闅愯棌鐨勬暟鎹 + // this.processinghiddenData(); + // // 寤烘ゼ灞傚浘褰 + // this.createFloorShape(this.canvasData.originaleveryStoreyData.data); + // // 鍒涘缓澶勭疆棰勬鍥惧舰 + // this.createNodeShape(this.canvasData.selectPanelPoint.Data); + // // 闅愯棌鍩烘湰淇℃伅鍥惧舰 + // this.setNameVisible(false, 0); + // // 闅愯棌鎯冲畾浣滀笟鍥惧舰 + // this.setNameVisible(false, 1); + // console.log("鑰冪敓鍔犺浇................................") // 鍒涘缓鑳屾櫙鍥 this.createBackground(this.canvasData.selectStorey.imageUrl, this.canvasData.selectStorey.imageAngle); // 鍒涘缓妤煎眰鍥惧舰 this.createFloorShape(this.canvasData.examOriginaleveryStoreyData.data); - // 澶勭悊鍏变韩鏁版嵁涓冨畼闅愯棌鐨勬暟鎹 - this.processinghiddenData(); - // 寤烘ゼ灞傚浘褰 + // 鍒涘缓妤煎眰鍥惧舰 this.createFloorShape(this.canvasData.originaleveryStoreyData.data); // 鍒涘缓澶勭疆棰勬鍥惧舰 this.createNodeShape(this.canvasData.selectPanelPoint.Data); + // 闅愯棌鍥炬爣 + this.setIconVisible(this.canvasData.hiddenBasicInfoFacilities, false); // 闅愯棌鍩烘湰淇℃伅鍥惧舰 this.setNameVisible(false, 0); - // 闅愯棌鎯冲畾浣滀笟鍥惧舰 - this.setNameVisible(false, 1); } /** @@ -1295,9 +1239,13 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV // 鍒涘缓鑳屾櫙鍥 this.createBackground(this.canvasData.selectStorey.imageUrl, this.canvasData.selectStorey.imageAngle); // 鍒涘缓妤煎眰鍥惧舰 + this.createFloorShape(this.canvasData.examOriginaleveryStoreyData.data); + // 鍒涘缓妤煎眰鍥惧舰 this.createFloorShape(this.canvasData.originaleveryStoreyData.data); // 鍒涘缓澶勭疆棰勬鍥惧舰 this.createNodeShape(this.canvasData.selectPanelPoint.Data); + // 闅愯棌鍥炬爣 + this.setIconVisible(this.canvasData.hiddenBasicInfoFacilities, false); } }