From fb30efc2fb73a6fc6acae15d55fc8b45b2a1a857 Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Mon, 4 Jan 2021 15:34:51 +0800 Subject: [PATCH 01/11] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=B0=83=E7=94=A8canvas=E6=96=B9=E6=B3=95=E6=97=B6=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collection-tools.component.ts | 74 ++++----- src/app/ui/collection-tools-examinee/save.ts | 24 +-- .../collection-tools.component.ts | 137 ++++++++-------- .../collection-tools.component.ts | 152 +++++++++--------- 4 files changed, 199 insertions(+), 188 deletions(-) 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..374d6a3 100644 --- a/src/app/ui/collection-tools-examinee/collection-tools.component.ts +++ b/src/app/ui/collection-tools-examinee/collection-tools.component.ts @@ -882,45 +882,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 +1043,23 @@ 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) + this.Facilities.forEach(item => { + if(item.key == this.selectingSitePlan.id){ + console.log(333) + //如果当层有需要标记的基本信息素材 + this.getAllAssetLibraries(item) + }else{ + console.log(444) + this.canvas.onExamineeClickFloor() + } + }) + }else{ + console.log(2222) + this.canvas.onExamineeClickFloor(); + this.allLibrary = this.originalallLibrary + } }) }) } @@ -1104,6 +1083,17 @@ 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){ + this.Facilities.forEach(item => { + if(item.key == this.selectingSitePlan.id){ + this.getAllAssetLibraries(item) + }else{ + this.canvas.onExamineeClickFloor() + } + }) + }else{ + this.canvas.onExamineeClickFloor();this.allLibrary = this.originalallLibrary + } }) }) } @@ -1694,7 +1684,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.然后拿着创建好的数据节点的id 将平面图data保存 new Promise((resolve,reject) => { console.log(1,dispositionNodeData) 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..83570bb 100644 --- a/src/app/ui/collection-tools-read/collection-tools.component.ts +++ b/src/app/ui/collection-tools-read/collection-tools.component.ts @@ -397,8 +397,6 @@ export class CollectionToolsReadComponent implements OnInit { //点击树节点的显示隐藏icon clickLookItem(node){ - - // console.log(this.allFireElements) //子节点跟随父节点的islook变化   if(node.origin.children && node.origin.children.length != 0){ node.origin.isLook = !node.origin.isLook @@ -416,26 +414,6 @@ export class CollectionToolsReadComponent implements OnInit { //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){ @@ -585,45 +563,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 +784,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 +841,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 +1120,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) diff --git a/src/app/ui/collection-tools/collection-tools.component.ts b/src/app/ui/collection-tools/collection-tools.component.ts index 603d8a3..582c13a 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,9 +1106,10 @@ 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 + // 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 @@ -1128,9 +1129,6 @@ export class CollectionToolsComponent implements OnInit { } } this.handleTreeData(storeyData) //处理tree数据结构 - this.canvas.onExaminerClickFloor() - // 隐藏基本信息图形 - this.canvas.setNameVisible(false, 0); } @@ -1255,6 +1253,9 @@ 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.setNameVisible(false, 0); }) } @@ -1280,6 +1281,9 @@ 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.setNameVisible(false, 0); }) } @@ -1288,45 +1292,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) //获取 建筑 楼层数据 + } } } From cab0a77c96a996ae1fc29d74e671572e4bd212b7 Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Mon, 4 Jan 2021 16:00:10 +0800 Subject: [PATCH 02/11] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E5=9B=BE=E6=A0=87=E5=90=8D=E7=A7=B0=E6=98=BE=E7=A4=BA=E9=9A=90?= =?UTF-8?q?=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collection-tools.component.ts | 18 ++++++++++++------ .../collection-tools.component.ts | 4 ++-- 2 files changed, 14 insertions(+), 8 deletions(-) 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 374d6a3..3961814 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=>{ @@ -873,8 +873,6 @@ export class CollectionToolsExamineeComponent implements OnInit { 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 @@ -1045,17 +1043,23 @@ export class CollectionToolsExamineeComponent implements OnInit { this.renovateTreeData() if(this.Facilities){ console.log(1111) - this.Facilities.forEach(item => { + console.log('走这里了') + this.Facilities.forEach((item,key) => { if(item.key == this.selectingSitePlan.id){ console.log(333) //如果当层有需要标记的基本信息素材 this.getAllAssetLibraries(item) }else{ - console.log(444) - this.canvas.onExamineeClickFloor() + + 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 @@ -1084,6 +1088,7 @@ export class CollectionToolsExamineeComponent implements OnInit { 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) @@ -1092,6 +1097,7 @@ export class CollectionToolsExamineeComponent implements OnInit { } }) }else{ + console.log('走这里了') this.canvas.onExamineeClickFloor();this.allLibrary = this.originalallLibrary } }) diff --git a/src/app/ui/collection-tools/collection-tools.component.ts b/src/app/ui/collection-tools/collection-tools.component.ts index 582c13a..7ecb766 100644 --- a/src/app/ui/collection-tools/collection-tools.component.ts +++ b/src/app/ui/collection-tools/collection-tools.component.ts @@ -1110,8 +1110,8 @@ export class CollectionToolsComponent implements OnInit { 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) + // 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 From a1f8d1802aa788e52eea6eda38f4bc1b6a15b6d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E6=8C=AF=E5=8D=87?= <359059686@qq.com> Date: Mon, 4 Jan 2021 16:01:31 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E7=9B=91=E5=90=AC=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=EF=BC=8C=E5=88=A0=E9=99=A4=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/working-area/model/arrows.ts | 41 --- src/app/working-area/model/axImageShape.ts | 294 +++--------------- src/app/working-area/model/axShape.ts | 9 +- src/app/working-area/model/multipointIcon.ts | 1 + .../working-area/working-area.component.ts | 151 +++------ 5 files changed, 86 insertions(+), 410 deletions(-) delete mode 100644 src/app/working-area/model/arrows.ts 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/axImageShape.ts b/src/app/working-area/model/axImageShape.ts index 9654fca..fbe1c71 100644 --- a/src/app/working-area/model/axImageShape.ts +++ b/src/app/working-area/model/axImageShape.ts @@ -13,6 +13,8 @@ import { AxArrowConnector } from './axArrowConnector'; * AxImageShape */ export class AxImageShape extends AxShape { + pointTexture: PIXI.Texture = PIXI.Texture.from('assets/images/handle-main.png') + connectPointTexture = PIXI.Texture.from('assets/images/handle-secondary.png'); style = new PIXI.TextStyle({ fontFamily: 'Arial', fontSize: 18, @@ -34,26 +36,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 +63,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 +71,32 @@ export class AxImageShape extends AxShape { this.addChild(this.image); this.addChild(this.selectionBox); + //// + let rect = this.getLocalBounds(); + // up-left + this.upLeft = new PIXI.Sprite(this.pointTexture); + this.upLeft.anchor.set(0.5); + this.addChild(this.upLeft); + this.upLeft.interactive = true; + // up-right + this.upRight = new PIXI.Sprite(this.pointTexture); + this.upRight.anchor.set(0.5); + this.addChild(this.upRight); + this.upRight.interactive = true; + // down-left + this.downLeft = new PIXI.Sprite(this.pointTexture); + this.downLeft.anchor.set(0.5); + this.addChild(this.downLeft); + this.downLeft.interactive = true; + // down-right + this.downRight = new PIXI.Sprite(this.pointTexture); + this.downRight.anchor.set(0.5); + this.addChild(this.downRight); + this.downRight.interactive = true; + //// + + + if (this.assetData.CanConnect) { // connectPoint this.connectPoint = new PIXI.Sprite(this.connectPointTexture); @@ -162,170 +115,7 @@ export class AxImageShape extends AxShape { }) .on('mouseout', 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 +124,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(); } diff --git a/src/app/working-area/model/axShape.ts b/src/app/working-area/model/axShape.ts index 3f8a59c..f3e64e0 100644 --- a/src/app/working-area/model/axShape.ts +++ b/src/app/working-area/model/axShape.ts @@ -19,6 +19,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,12 +119,12 @@ 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) { + } /** * diff --git a/src/app/working-area/model/multipointIcon.ts b/src/app/working-area/model/multipointIcon.ts index 8be055f..6d3b6fe 100644 --- a/src/app/working-area/model/multipointIcon.ts +++ b/src/app/working-area/model/multipointIcon.ts @@ -164,6 +164,7 @@ 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); } }) .on('rightclick', event => { diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts index ba3c4d9..f915aca 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(); @@ -310,11 +292,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,27 +301,8 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV this.on('deselect', shape => { if (shape instanceof AxShape) { shape.hideBorder(); - if (this.allowEdit) { - - } else { - - } + shape.setPointVisiable(this.allowEdit); } - // 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 = []; - // } }); /** * 根据背景缩放事件 @@ -370,7 +329,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV } else if (item instanceof AxPreviewImageShape) { const data = 1 / scale; item.scale.set(data); - }else if (item instanceof AxArrowConnector) { + } else if (item instanceof AxArrowConnector) { const data = 1 / scale; item.text.scale.set(data); item.pointSprites.forEach(point => { @@ -381,7 +340,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV }); /** - * 创建图标事件 + * 创建图标事件（数据处理） */ this.on('createIcon', obj => { if (obj.assetData.GameMode === GameMode.BasicInformation) { // 基本信息 @@ -389,26 +348,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 +461,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); - // } - } /** * 创建背景图 */ @@ -576,44 +540,6 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV 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; - // }); - // }); - // }); - // } - // } /** * 创建确认绘制结束按钮 */ @@ -1253,8 +1179,15 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV this.emit('backgroundScale', this.backgroundImage.scale.x); } + ////////////////////////////////////////////////////////////////////////采集平台加载逻辑/////////////////////////////////////////////////////////////////////// + public onBasicInformationClickFloor() { + + } - + ////////////////////////////////////////////////////////////////////////编制平台加载逻辑/////////////////////////////////////////////////////////////////////// + public onClickAssignmentFloor() { + + } ////////////////////////////////////////////////////////////////////////考试系统加载逻辑/////////////////////////////////////////////////////////////////////// /** From a8e960a9eed653167d18183220502c1106df927c Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Mon, 4 Jan 2021 16:03:54 +0800 Subject: [PATCH 04/11] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=A4=9A=E4=BD=99=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/ui/collection-tools-read/collection-tools.component.ts | 1 - 1 file changed, 1 deletion(-) 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 83570bb..0a27984 100644 --- a/src/app/ui/collection-tools-read/collection-tools.component.ts +++ b/src/app/ui/collection-tools-read/collection-tools.component.ts @@ -554,7 +554,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 From bcb295f46e71ad87a181686f5ebb3b54fbe0f030 Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Mon, 4 Jan 2021 16:05:17 +0800 Subject: [PATCH 05/11] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=A4=9A=E5=9F=9F=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/collection-tools-examinee/collection-tools.component.ts | 1 - src/app/ui/collection-tools/collection-tools.component.ts | 3 --- 2 files changed, 4 deletions(-) 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 3961814..2f8eab2 100644 --- a/src/app/ui/collection-tools-examinee/collection-tools.component.ts +++ b/src/app/ui/collection-tools-examinee/collection-tools.component.ts @@ -872,7 +872,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 isRefresh? this.canvasData.isChange = false : null //服务中 数据是否改动 改为false isRefresh? this.isShowProperty = true : null isRefresh? this.isShowAttribute = true : null diff --git a/src/app/ui/collection-tools/collection-tools.component.ts b/src/app/ui/collection-tools/collection-tools.component.ts index 7ecb766..9e485db 100644 --- a/src/app/ui/collection-tools/collection-tools.component.ts +++ b/src/app/ui/collection-tools/collection-tools.component.ts @@ -1109,9 +1109,6 @@ export class CollectionToolsComponent implements OnInit { 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 From 7c9056729f55473f03c60702e59845403567fa4e Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Mon, 4 Jan 2021 16:33:47 +0800 Subject: [PATCH 06/11] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E8=B0=83=E7=94=A8set?= =?UTF-8?q?IconVisible=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collection-tools.component.ts | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) 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 0a27984..d789f44 100644 --- a/src/app/ui/collection-tools-read/collection-tools.component.ts +++ b/src/app/ui/collection-tools-read/collection-tools.component.ts @@ -416,17 +416,17 @@ export class CollectionToolsReadComponent implements OnInit { let iconVisibleArr:any = [] console.log(this.renderData) this.renderData.forEach(item =>{ - if(item.Id && item.isLook == false){ + if(item.Id && item.isLook == true){ iconVisibleArr.push(item.Id) }else{ if(item.children && item.children.length != 0){ item.children.forEach(i => { - if(i.Id && i.isLook == false){ + if(i.Id && i.isLook == true){ iconVisibleArr.push(i.Id) }else{ if(i.children && i.children.length != 0){ i.children.forEach(element => { - if(element.Id && element.isLook == false){ + if(element.Id && element.isLook == true){ iconVisibleArr.push(element.Id) } }) @@ -438,12 +438,12 @@ export class CollectionToolsReadComponent implements OnInit { }) 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() - + // 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() + this.canvas.setIconVisible(iconVisibleArr,true) } //打开消防设施考题设定 From f56747bc3692cd591892f836eafa5a6b848e5c6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E6=8C=AF=E5=8D=87?= <359059686@qq.com> Date: Mon, 4 Jan 2021 17:00:11 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../working-area/working-area.component.ts | 52 ++++++++++++------- 1 file changed, 33 insertions(+), 19 deletions(-) diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts index f915aca..8808298 100644 --- a/src/app/working-area/working-area.component.ts +++ b/src/app/working-area/working-area.component.ts @@ -529,17 +529,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; - }); - } /** * 创建确认绘制结束按钮 */ @@ -1178,7 +1167,17 @@ 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() { @@ -1205,20 +1204,31 @@ 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.setNameVisible(false, 0); - // 隐藏想定作业图形 - this.setNameVisible(false, 1); + // 隐藏图标 + this.setIconVisible(this.canvasData.hiddenBasicInfoFacilities, false); } /** @@ -1228,9 +1238,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); } } From c4aae4ba98e66fbff70129e54fc6d2a50530871d Mon Sep 17 00:00:00 2001 From: chenjingyu Date: Mon, 4 Jan 2021 17:07:04 +0800 Subject: [PATCH 08/11] =?UTF-8?q?[=E6=96=B0=E5=BB=BA]=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E8=80=83=E8=AF=95=E5=92=8C=E9=98=85=E5=8D=B7=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../examiner-index.component.ts | 20 ++++++++++----- .../mark-papers-index.component.html | 4 +-- .../mark-papers-index.component.ts | 25 ++++++++++++++++--- 3 files changed, 38 insertions(+), 11 deletions(-) diff --git a/src/app/examiner/examiner-index/examiner-index.component.ts b/src/app/examiner/examiner-index/examiner-index.component.ts index c213bb4..d60878d 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' @@ -215,19 +215,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){ From 7d0cdf6b379b2900be3726844397e87cebb56317 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E6=8C=AF=E5=8D=87?= <359059686@qq.com> Date: Tue, 5 Jan 2021 11:21:24 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E6=96=B0=E7=9A=84=E9=80=89=E4=B8=AD?= =?UTF-8?q?=E6=95=88=E6=9E=9C=E5=92=8C=E7=BC=96=E8=BE=91=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debug.log | 1 + .../working-area/model/axArrowConnector.ts | 41 +++--- src/app/working-area/model/axImageShape.ts | 73 ++++++++-- src/app/working-area/model/axShape.ts | 34 ++++- src/app/working-area/model/multipointIcon.ts | 93 +++---------- src/app/working-area/model/polygonIcon.ts | 131 ++++-------------- .../working-area/working-area.component.ts | 53 ++++--- 7 files changed, 194 insertions(+), 232 deletions(-) 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/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 fbe1c71..bce7e50 100644 --- a/src/app/working-area/model/axImageShape.ts +++ b/src/app/working-area/model/axImageShape.ts @@ -13,7 +13,6 @@ import { AxArrowConnector } from './axArrowConnector'; * AxImageShape */ export class AxImageShape extends AxShape { - pointTexture: PIXI.Texture = PIXI.Texture.from('assets/images/handle-main.png') connectPointTexture = PIXI.Texture.from('assets/images/handle-secondary.png'); style = new PIXI.TextStyle({ fontFamily: 'Arial', @@ -72,27 +71,30 @@ export class AxImageShape extends AxShape { this.addChild(this.selectionBox); //// - let rect = this.getLocalBounds(); // 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; //// @@ -106,16 +108,17 @@ 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); - }); + }); + this.showConnectionPoint(false); } } // 设置选择框 @@ -137,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 f3e64e0..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; @@ -131,7 +132,7 @@ export class AxShape extends Container { * @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); @@ -187,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 6d3b6fe..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; @@ -165,61 +160,12 @@ export class MultipointIcon extends AxShape { 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 => { - - // }); - // }); } /** * 设置点显示状态 @@ -236,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 8808298..19d830e 100644 --- a/src/app/working-area/working-area.component.ts +++ b/src/app/working-area/working-area.component.ts @@ -262,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(); } /** * 显示框选 @@ -301,43 +302,31 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV this.on('deselect', shape => { if (shape instanceof AxShape) { shape.hideBorder(); - shape.setPointVisiable(this.allowEdit); + shape.setPointVisiable(false); } }); /** * 根据背景缩放事件 */ 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); - }); + item.setItemScale(data); + item.drawBorder(data); } }); - }); /** * 创建图标事件（数据处理） @@ -476,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: @@ -931,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 ); } @@ -940,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) { @@ -1167,7 +1166,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV }); this.emit('backgroundScale', this.backgroundImage.scale.x); } - ////////////////////////////////////////////////////////////////////////通过///////////////////////////////////////////////////////////////////////////// + ////////////////////////////////////////////////////////////////////////通用///////////////////////////////////////////////////////////////////////////// /** * * @param id 图标ID From dce1328e924b9b21ac1bc5dad65ff57b95fa1b1d Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Tue, 5 Jan 2021 16:20:34 +0800 Subject: [PATCH 10/11] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E9=98=85=E5=8D=B7?= =?UTF-8?q?=E9=A2=84=E6=A1=88=E5=8A=9F=E8=83=BD=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../create-test-score.component.ts | 12 +- .../examiner-index.component.ts | 11 +- .../review-files/review-files.component.html | 16 +- .../review-files/review-files.component.scss | 9 ++ .../review-files/review-files.component.ts | 22 ++- .../collection-tools.component.ts | 8 + .../collection-tools.component.html | 4 +- .../collection-tools.component.ts | 142 +++++++++++++----- src/app/ui/collection-tools-read/score.html | 14 ++ src/app/ui/collection-tools-read/score.scss | 10 ++ .../collection-tools.component.ts | 10 +- src/app/ui/ui.module.ts | 4 +- .../working-area/working-area.component.ts | 2 + 13 files changed, 199 insertions(+), 65 deletions(-) create mode 100644 src/app/ui/collection-tools-read/score.html create mode 100644 src/app/ui/collection-tools-read/score.scss 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..2629cdd 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 @@ -1251,11 +1251,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 +1271,6 @@ export class CreateTestScoreComponent implements OnInit { } setPlansScore().then(()=>{ - console.log('修改分数成功2222') - let body = { id:sessionStorage.getItem('paperId'), valid: true, @@ -1287,7 +1280,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..992f07b 100644 --- a/src/app/examiner/examiner-index/examiner-index.component.ts +++ b/src/app/examiner/examiner-index/examiner-index.component.ts @@ -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) diff --git a/src/app/examiner/review-files/review-files.component.html b/src/app/examiner/review-files/review-files.component.html index e60587b..3ba3b77 100644 --- a/src/app/examiner/review-files/review-files.component.html +++ b/src/app/examiner/review-files/review-files.component.html @@ -149,18 +149,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 52c9245..f56619b 100644 --- a/src/app/examiner/review-files/review-files.component.scss +++ b/src/app/examiner/review-files/review-files.component.scss @@ -12,4 +12,13 @@ border-radius: 5px; border: none; outline: none; +} + +.refresh{ + width: 100%; + text-align: center; + margin-top: 12px; + mat-icon{ + cursor: pointer; + } } \ 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 615fff3..b1f1996 100644 --- a/src/app/examiner/review-files/review-files.component.ts +++ b/src/app/examiner/review-files/review-files.component.ts @@ -48,24 +48,34 @@ 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]; 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 => { console.log(111,data) item.planList = [] item.planList = data + if(type == false){ + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 5000 + this.snackBar.open('刷新成功','确定',config); + } resolve(1) }) }) } // this.calculateScore() } + //刷新预案设定表格 + refreshTable(){ + this.getUnitPlans(false) + } //基本信息表格 是否展示当前行 rowIsShow (children,tag) { let isShow:boolean = false @@ -99,14 +109,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 2f8eab2..e3244a8 100644 --- a/src/app/ui/collection-tools-examinee/collection-tools.component.ts +++ b/src/app/ui/collection-tools-examinee/collection-tools.component.ts @@ -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('保存基本素材失败') 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 d789f44..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",{ @@ -398,6 +428,7 @@ export class CollectionToolsReadComponent implements OnInit { //点击树节点的显示隐藏icon clickLookItem(node){ //子节点跟随父节点的islook变化 + let iconVisibleArr:any = []   if(node.origin.children && node.origin.children.length != 0){ node.origin.isLook = !node.origin.isLook       node.origin.children.forEach(item=>{ @@ -405,45 +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 = [] - console.log(this.renderData) - this.renderData.forEach(item =>{ - if(item.Id && item.isLook == true){ - iconVisibleArr.push(item.Id) - }else{ - if(item.children && item.children.length != 0){ - item.children.forEach(i => { - if(i.Id && i.isLook == true){ - iconVisibleArr.push(i.Id) - }else{ - if(i.children && i.children.length != 0){ - i.children.forEach(element => { - if(element.Id && element.isLook == true){ - 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() - this.canvas.setIconVisible(iconVisibleArr,true) + console.log(node.origin.isLook) + this.canvas.setIconVisible(iconVisibleArr, node.origin.isLook) } //打开消防设施考题设定 @@ -1198,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 9e485db..3e91076 100644 --- a/src/app/ui/collection-tools/collection-tools.component.ts +++ b/src/app/ui/collection-tools/collection-tools.component.ts @@ -1250,7 +1250,10 @@ 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.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); }) @@ -1278,7 +1281,10 @@ 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.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); }) 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/working-area.component.ts b/src/app/working-area/working-area.component.ts index 8808298..a439d1d 100644 --- a/src/app/working-area/working-area.component.ts +++ b/src/app/working-area/working-area.component.ts @@ -1229,6 +1229,8 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV this.createNodeShape(this.canvasData.selectPanelPoint.Data); // 隐藏图标 this.setIconVisible(this.canvasData.hiddenBasicInfoFacilities, false); + // 隐藏基本信息图形 + this.setNameVisible(false, 0); } /** From d8be26a4dd978a747d515759a58c2ee0864a4706 Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Thu, 7 Jan 2021 11:03:53 +0800 Subject: [PATCH 11/11] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E8=AF=95=E5=8D=B7=E5=A2=9E=E5=8A=A0=E5=8D=95=E9=A1=B9=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../create-test-score/create-test-score.component.ts | 7 +++++++ 1 file changed, 7 insertions(+) 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 2629cdd..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 }) //判断是否存在总分填写后没有勾选 或者勾选了没有填写总分的情况