diff --git a/angular.json b/angular.json index b7c2067..07cf0ab 100644 --- a/angular.json +++ b/angular.json @@ -29,7 +29,8 @@ "src/assets" ], "styles": [ - "src/styles.scss" + "src/styles.scss", + "node_modules/viewerjs/dist/viewer.css" ], "scripts": [ "node_modules/echarts/dist/echarts.js", diff --git a/package.json b/package.json index 42dfacc..1716269 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "rxjs": "~6.5.4", "swiper": "^5.3.7", "tslib": "^1.10.0", - "viewerjs": "^1.6.2", + "viewerjs": "^1.9.0", "zone.js": "~0.10.2" }, "devDependencies": { diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 8dd5e69..bd6ecc8 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -21,7 +21,7 @@ const routes: Routes = [ ] }, { path:'examiner/create-test-score', component:CreateTestScoreComponent,canActivate: [AuthGuard],}, //创建试卷具体分数页面 - { path: 'canvasTool', component:CollectionToolsComponent,canActivate: [AuthGuard], }, //编制工具 + { path:'canvasTool', component:CollectionToolsComponent,canActivate: [AuthGuard], }, //编制工具 { path:'adminLogin', component:LoginComponent}, //管理员登录路由 { path:'login', component:LockscreenComponent}, //教员学员登录路由 diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 0a77d73..388e788 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -28,6 +28,7 @@ export class AppComponent { sessionStorage.setItem("roleType",data.roleType); sessionStorage.setItem("token",data.token); sessionStorage.setItem("refreshToken",data.refreshToken); + sessionStorage.setItem("level",data.level); this.token.startUp() }) } else { diff --git a/src/app/canvas-share-data.service.ts b/src/app/canvas-share-data.service.ts index 15b4de8..8c42d46 100644 --- a/src/app/canvas-share-data.service.ts +++ b/src/app/canvas-share-data.service.ts @@ -8,7 +8,6 @@ import { GameMode } from './working-area/model/gameMode'; export class CanvasShareDataService { constructor() { } private _sendMessage: ReplaySubject = new ReplaySubject(1); - GameMode: any; isChange = false; // 数据 是否改动 @@ -82,6 +81,23 @@ export class CanvasShareDataService { return returnData; } } + /** + * 更新建筑数据 + */ + public updateBuildingData() { + Object.keys(this.originaleveryStoreyData.data).forEach((key) => { + this.originalcompanyBuildingData.data[key] = this.originaleveryStoreyData.data[key]; + }); + } + /** + * 删除建筑数据中当前楼层的数据 + */ + public deleteBuildingDataByCurrentFloorData():void { + Object.keys(this.originaleveryStoreyData.data).forEach((key) => { + // 删除建筑数据 + delete this.originalcompanyBuildingData.data[key]; + }); + } /** * 获取单位毗邻信息 */ @@ -666,7 +682,7 @@ export class AssetData { /// /// 是否来自建筑 /// - public IsFromBuilding: boolean; + public IsFromBuilding: boolean; /// /// 渲染方式。 /// diff --git a/src/app/examiner/create-test-score/addPlanTwo.html b/src/app/examiner/create-test-score/addPlanTwo.html index 63fdd29..e509b01 100644 --- a/src/app/examiner/create-test-score/addPlanTwo.html +++ b/src/app/examiner/create-test-score/addPlanTwo.html @@ -3,7 +3,7 @@
添加预案
-
+
@@ -47,6 +47,9 @@
+
+ 该单位暂无审核通过的二维预案 +
diff --git a/src/app/examiner/create-test-score/create-test-score.component.html b/src/app/examiner/create-test-score/create-test-score.component.html index 03965ee..a87ec3d 100644 --- a/src/app/examiner/create-test-score/create-test-score.component.html +++ b/src/app/examiner/create-test-score/create-test-score.component.html @@ -36,7 +36,7 @@
-
+
@@ -49,12 +49,14 @@ 基本信息 - 总分值: 分, 单项 {{unit.basicInfoItemScore ? unit.basicInfoItemScore : 0}} 分 + + (已选择 {{unit.basicInfoSelectedNum}} 项) @@ -97,6 +99,7 @@ 单项 {{unit.aroundItemScore ? unit.aroundItemScore : 0}} 分 + (已选择 {{unit.aroundSelectedNum}} 项) @@ -139,6 +142,7 @@ 单项 {{unit.keySiteItemScore ? unit.keySiteItemScore : 0}} 分 + (已选择 {{unit.keySiteSelectedNum}} 项) @@ -181,6 +185,7 @@ 单项 {{unit.funDivItemScore ? unit.funDivItemScore : 0}} 分 + (已选择 {{unit.funDivSelectedNum}} 项) @@ -223,6 +228,7 @@ 单项 {{unit.fireFacItemScore ? unit.fireFacItemScore : 0}} 分 + (已选择 {{unit.fireFacSelectedNum}} 项) @@ -257,7 +263,7 @@
-
+
add_circle_outline添加预案
@@ -272,18 +278,18 @@ 设置分数 操作 - + {{item.name}} - {{item.or}} - {{item.time}} - {{item.isOpen}} - {{item.level}} + {{item.creatorName}} + {{item.modifiedTime | date:'yyyy-MM-dd'}} + {{item.openRange}} + {{item.planLevel | planlevel}} - 编辑 - 删除 + 编辑 + 删除 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 f8af142..f3c270e 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 @@ -20,9 +20,31 @@ export class CreateTestScoreComponent implements OnInit { constructor(private router:Router,public dialog: MatDialog,private http: HttpClient,public snackBar: MatSnackBar) { } selectedTab:number = 1 //选中的选项卡 selectTab(index){ - this.selectedTab = index + setTimeout(() => { + this.selectedTab = index + }, 0); + } ngOnInit(): void { + for (let y = 0, length = this.unitId.length; y < length; y++){ + let element = this.unitId[y] + element.score = 0 + element.basicInfoScore = 0 + element.basicInfoItemScore = 0 + element.basicInfoNodes = [] + element.aroundScore = 0 + element.aroundItemScore = 0 + element.aroundNodes = [] + element.keySiteScore = 0 + element.keySiteItemScore = 0 + element.keySiteNodes = [] + element.funDivScore = 0 + element.funDivItemScore = 0 + element.funDivNodes = [] + element.fireFacScore = 0 + element.fireFacItemScore = 0 + element.fireFacNodes = [] + } this.getUnitData().then(()=>{ this.getAround().then(()=>{ this.getKeySite().then(()=>{ @@ -32,21 +54,12 @@ export class CreateTestScoreComponent implements OnInit { }) }) }) - // Promise.all([this.getUnitData(),this.getAround(),this.getKeySite(),this.getFunDiv()]).then(()=>{ - // this.getFireFac() - // }) } //当前选中的单位 selectedUnitIndex = 0 clickUnitName(key){ this.selectedUnitIndex = key } - - //上个页面传过来的单位数据 - // unitId:any = [{name:'最最最最最',id:'5fb76c42919f2b44e464016f'}, - // {name:'华南城集团有限公司',id:'5ee19fe06f91049f5e23e937'}, - // {name:'贵港油库',id:'5fa35d68f8eb762cb03c662e'} - // ] unitId:any = JSON.parse(sessionStorage.getItem('checkedWork')) //获取单位基本信息 @@ -54,9 +67,7 @@ export class CreateTestScoreComponent implements OnInit { let that = this for (let y = 0, length = this.unitId.length; y < length; y++){ let element = this.unitId[y] - element.score = 0 - element.basicInfoScore = 0 - element.basicInfoItemScore = 0 + let result1 = await new Promise((resolve, reject) => { this.http.get(`/api/Companies/${element.id}`).subscribe((data:any)=>{ let unitData = { @@ -85,7 +96,7 @@ export class CreateTestScoreComponent implements OnInit { name: '单位地址',key: element.id+'单位地址',isLeaf:true,value:data.address }) : null - element.basicInfoNodes = [] + element.basicInfoNodes.push(unitData) resolve(1) @@ -116,6 +127,7 @@ export class CreateTestScoreComponent implements OnInit { buildingsData.name = data[i].name buildingsData.buildingType = data[i].buildingTypes[0].name buildingsData[0].buildingBasicGroups.forEach((y,m) => { + let propertyInfosArr = [] let tabledata if(y.type == 1){//如果是表格类 @@ -147,14 +159,38 @@ export class CreateTestScoreComponent implements OnInit { }) y.tabledata = dest tabledata = dest - y.tabledata[0].data.forEach((x,key) => { - if(x.propertyValue){ - x.key = (Math.random()*10000000).toString(16).substr(0,4)+(new Date()).getTime()+Math.random().toString().substr(2,5) - x.isLeaf = true - x.name = x.propertyValue - propertyInfosArr.push(x) + if(y.tabledata[0].propertyName == '罐区'){ + + if(y.tabledata[1].propertyName != '储罐编号'){ + let index + y.tabledata.forEach((element,key) => { + if(element.propertyName == '储罐编号'){ + index = key + } + }) + y.tabledata[1] = y.tabledata.splice(index, 1, y.tabledata[1])[0]; } - }) + + y.tabledata[0].data.forEach((x,key) => { + + if(x.propertyValue){ + x.key = (Math.random()*10000000).toString(16).substr(0,4)+(new Date()).getTime()+Math.random().toString().substr(2,5) + x.isLeaf = true + x.name = x.propertyValue + '-' + y.tabledata[1].data[key].propertyValue + propertyInfosArr.push(x) + } + }) + }else{ + y.tabledata[0].data.forEach((x,key) => { + if(x.propertyValue){ + x.key = (Math.random()*10000000).toString(16).substr(0,4)+(new Date()).getTime()+Math.random().toString().substr(2,5) + x.isLeaf = true + x.name = x.propertyValue + propertyInfosArr.push(x) + } + }) + } + }else{ y.propertyInfos.forEach((x,key) => { if(x.propertyValue){ @@ -191,9 +227,7 @@ export class CreateTestScoreComponent implements OnInit { let that = this for (let y = 0, length = this.unitId.length; y < length; y++){ let element = this.unitId[y] - element.aroundScore = 0 - element.aroundItemScore = 0 - element.aroundNodes = [] + //获得当前单位的单位毗邻 let id = {companyId:element.id} let result1 = await new Promise((resolve, reject) => { @@ -273,11 +307,8 @@ export class CreateTestScoreComponent implements OnInit { async getKeySite(){ let that = this for (let y = 0, length = this.unitId.length; y < length; y++){ - console.log("xiba") let element = this.unitId[y] - element.keySiteScore = 0 - element.keySiteItemScore = 0 - element.keySiteNodes = [] + //获得单位重点部位 let id = {companyId:element.id} @@ -354,9 +385,7 @@ export class CreateTestScoreComponent implements OnInit { let that = this for (let y = 0, length = this.unitId.length; y < length; y++){ let element = this.unitId[y] - element.funDivScore = 0 - element.funDivItemScore = 0 - element.funDivNodes = [] + let id = {companyId:element.id} //单位功能分区 let result1 = await new Promise((resolve, reject) => { @@ -432,9 +461,7 @@ export class CreateTestScoreComponent implements OnInit { getFireFac(){ let that = this this.unitId.forEach((element,index) =>{ - element.fireFacScore = 0 - element.fireFacItemScore = 0 - element.fireFacNodes = [] + let companyId = element.id //获取单位级别消防设施 this.http.get(`/api/Companies/${companyId}`).subscribe((data:any)=>{ @@ -531,13 +558,6 @@ export class CreateTestScoreComponent implements OnInit { stopPropagation($event){ $event.stopPropagation() } - //模拟预案数据 - planDatas:any = [ - {name:'5楼电路故障灾情扑救',or:'上海总队',time:'2020-09-24',isOpen:'未公开',level:'总队',score:0}, - {name:'6楼电路故障灾情扑救',or:'上海总队',time:'2020-09-24',isOpen:'未公开',level:'总队',score:0}, - {name:'7楼电路故障灾情扑救',or:'上海总队',time:'2020-09-24',isOpen:'未公开',level:'总队',score:0} - ] - defaultCheckedKeys = []; //指定选中复选框的树节点 key值 defaultExpandedKeys = []; //展开指定的树节点 key值 defaultSelectedKeys = []; //指定选中的树节点 key值 @@ -550,20 +570,24 @@ export class CreateTestScoreComponent implements OnInit { calculateScore(key){ //key代表第几个建筑 //计算整个单位的总分 - this.unitId[key].score = this.unitId[key].basicInfoScore + this.unitId[key].aroundScore + this.unitId[key].keySiteScore + this.unitId[key].funDivScore + this.unitId[key].fireFacScore - - //计算整个试卷的总分 + //计算整个试卷的总分 - let examScore = 0 - this.unitId.forEach(element => { - examScore += element.score - }) - let examScore2 = 0 - this.planDatas.forEach(element => { - examScore2 += Number(element.score) - }) - this.examScore = examScore + examScore2 + let examScore = 0 + this.unitId.forEach(element => { + examScore += element.score + }) + let examScore2 = 0 + this.unitId.forEach(element => { + let x = 0 + if(element.planList){ + element.planList.forEach(i => { + x += i.score + }) + } + examScore2 += Number(x) + }) + this.examScore = examScore + examScore2 } //tree的选择事件 @@ -582,6 +606,7 @@ export class CreateTestScoreComponent implements OnInit { }else{ this.unitId[key].basicInfoItemScore = 0 } + this.unitId[key].basicInfoSelectedNum = selectedNum.length } if(event.node.origin.type == '四周毗邻' || (event.node.parentNode && event.node.parentNode.origin.type == '四周毗邻')){ let selectedNum = [] @@ -595,6 +620,7 @@ export class CreateTestScoreComponent implements OnInit { }else{ this.unitId[key].aroundItemScore = 0 } + this.unitId[key].aroundSelectedNum = selectedNum.length } if(event.node.origin.type == '重点部位' || (event.node.parentNode && event.node.parentNode.origin.type == '重点部位')){ let selectedNum = [] @@ -608,6 +634,7 @@ export class CreateTestScoreComponent implements OnInit { }else{ this.unitId[key].keySiteItemScore = 0 } + this.unitId[key].keySiteSelectedNum = selectedNum.length } if(event.node.origin.type == '功能分区' || (event.node.parentNode && event.node.parentNode.origin.type == '功能分区')){ let selectedNum = [] @@ -621,6 +648,7 @@ export class CreateTestScoreComponent implements OnInit { }else{ this.unitId[key].funDivItemScore = 0 } + this.unitId[key].funDivSelectedNum = selectedNum.length } if(event.node.origin.type == '消防设施' || (event.node.parentNode && event.node.parentNode.origin.type == '消防设施')){ let selectedNum = [] @@ -634,6 +662,7 @@ export class CreateTestScoreComponent implements OnInit { }else{ this.unitId[key].fireFacItemScore = 0 } + this.unitId[key].fireFacSelectedNum = selectedNum.length } } @@ -721,290 +750,322 @@ export class CreateTestScoreComponent implements OnInit { }); dialogRef.afterClosed().subscribe(result => { - console.log('The dialog was closed'); + if(result){ + if(this.unitId[this.selectedUnitIndex].planList){ + this.unitId[this.selectedUnitIndex].planList.push(result) + }else{ + this.unitId[this.selectedUnitIndex].planList = [] + this.unitId[this.selectedUnitIndex].planList.push(result) + } + } }); } + //每条预案分数增加在试卷分数 planItemScore(item){ //计算整个试卷的总分 + console.log(item) let examScore = 0 this.unitId.forEach(element => { examScore += element.score }) let examScore2 = 0 - this.planDatas.forEach(element => { - examScore2 += Number(element.score) + this.unitId.forEach(element => { + let x = 0 + if(element.planList){ + element.planList.forEach(i => { + x += i.score + }) + } + examScore2 += Number(x) }) this.examScore = examScore + examScore2 } + //编辑每条预案试卷 + edit(item){ + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('暂不能编辑','确定',config); + } + + //删除每条预案试卷 + deletePlan(item){ + this.unitId[this.selectedUnitIndex].planList.forEach((element,key)=>{ + if(item == element){ + this.unitId[this.selectedUnitIndex].planList.splice(key,1) + } + }) + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('删除成功','确定',config); + } //保存 save(){ - let copyDatas = JSON.parse(JSON.stringify(this.unitId)) - - //循环每个建筑处理数据筛选出选中数据 - copyDatas.forEach(item => { - //建筑的基本信息模块处理 - item.basicInfoNodes.forEach((i,key) => { - //如果顶级节点未选中则需要筛除没有选中的数据 - if(!i.checked){ - // console.log(i) - let newArr = [] - i.children.forEach(element => { - element.checked ? newArr.push(element) : null - }) - let discard = []//即将废弃的数组 - // newArr.length == 0 ? item.basicInfoNodes.splice(key,1) : i.children = newArr - newArr.length == 0 ? discard.push(i) : i.children = newArr - item.basicInfoNodes = item.basicInfoNodes.filter(items => { - if (!discard.includes(items)) return items; - }) - } - //将children处理成指定形式 - if(i.name =='单位信息'){ - let newChildren = [] - i.children.forEach((element,index) => { - let newChildrenItem:any= {} - newChildrenItem.name = element.name//题目名称 - newChildrenItem.result = element.value//题目答案 - newChildrenItem.physicalUnit = element.physicalUnit || ''//计量单位 - newChildrenItem.propertyType = 0//输入框类型 - newChildren.push(newChildrenItem) - }) - i.children = newChildren - }else if(!i.tabledata){ - let newChildren = [] - i.children.forEach((element,index) => { - let newChildrenItem:any= {} - newChildrenItem.name = element.propertyName//题目名称 - newChildrenItem.result = element.propertyValue//题目答案 - newChildrenItem.physicalUnit = element.physicalUnit || ''//计量单位 - newChildrenItem.propertyType = element.propertyType//输入框类型 - newChildren.push(newChildrenItem) - }) - i.children = newChildren - }else if(i.tabledata){//如果是表格类 - let newChildren = [] - i.children.forEach((element,index) => { - let newChildrenItem:any= {} - newChildrenItem.name = element.propertyValue//题目名称 - newChildrenItem.result = element.tag//代表第几行 - newChildrenItem.physicalUnit = ''//计量单位 - newChildrenItem.propertyType = ''//输入框类型 - newChildren.push(newChildrenItem) - }) - i.children = newChildren - i.tabledata.forEach(element => { - let newData = [] - element.data.forEach(ele => { - let newObj:any = {} - newObj.name = ele.propertyName//题目名称 - newObj.result = ele.propertyValue//代表第几行 - newObj.physicalUnit = ele.physicalUnit//计量单位 - newObj.propertyType = ele.propertyType//输入框类型 - newObj.tag = ele.tag//第几行 - newData.push(newObj) - }) - element.data = newData - }) - } - delete i.selected - - }) - //建筑的四周毗邻模块处理 - item.aroundNodes.forEach((i,key) => { - //如果顶级节点未选中则需要筛除没有选中的数据 - if(!i.checked){ - let newArr = [] - i.children.forEach(element => { - element.checked ? newArr.push(element) : null - }) - let discard = []//即将废弃的数组 - newArr.length == 0 ? discard.push(i) : i.children = newArr - item.aroundNodes = item.aroundNodes.filter(items => { - if (!discard.includes(items)) return items; - }) - } - let newChildren = [] - i.children.forEach((element,index) => { - let newChildrenItem:any= {} - newChildrenItem.name = element.title//题目名称 - newChildrenItem.result = element.name//题目答案 - newChildrenItem.physicalUnit = ''//计量单位 - newChildrenItem.propertyType = 0//输入框类型 - newChildren.push(newChildrenItem) - }) - i.children = newChildren - delete i.selected - }) - console.log(111,item) - //建筑的重点部位模块处理 - item.keySiteNodes ? item.keySiteNodes.forEach((i,key) => { - i.selected ? i.selected = null : null - //如果顶级节点未选中则需要筛除没有选中的数据 - if(!i.checked){ - let newArr = [] - i.children.forEach(element => { - element.checked ? newArr.push(element) : null - }) - let discard = []//即将废弃的数组 - newArr.length == 0 ? discard.push(i) : i.children = newArr - item.keySiteNodes = item.keySiteNodes.filter(items => { - if (!discard.includes(items)) return items; - }) - } - i.tabledata = [{propertyName: "重点部位名称",data:[]}, - {propertyName: "重点部位所在位置",data:[]}, - {propertyName: "建筑结构",data:[]}, - {propertyName: "使用性质",data:[]}, - {propertyName: "主要危险性",data:[]}] + let copyDatas = JSON.parse(JSON.stringify(this.unitId)) + //循环每个建筑处理数据筛选出选中数据 + copyDatas.forEach(item => { + //建筑的基本信息模块处理 + item.basicInfoNodes.forEach((i,key) => { + //如果顶级节点未选中则需要筛除没有选中的数据 + if(!i.checked){ + // console.log(i) + let newArr = [] i.children.forEach(element => { - i.tabledata[0].data.push({ - name: "重点部位名称", - physicalUnit: '', - propertyType: 0, - result: element.name, - tag: "" - }) - i.tabledata[1].data.push({ - name: "重点部位所在位置", - physicalUnit: '', - propertyType: 0, - result: element.position, - tag: "" - }) - i.tabledata[2].data.push({ - name: "建筑结构", - physicalUnit: '', - propertyType: 0, - result: element.structure, - tag: "" - }) - i.tabledata[3].data.push({ - name: "使用性质", - physicalUnit: '', - propertyType: 0, - result: element.nature, - tag: "" - }) - i.tabledata[4].data.push({ - name: "主要危险性", - physicalUnit: '', - propertyType: 0, - result: element.hazards, - tag: "" - }) + element.checked ? newArr.push(element) : null + }) + let discard = []//即将废弃的数组 + // newArr.length == 0 ? item.basicInfoNodes.splice(key,1) : i.children = newArr + newArr.length == 0 ? discard.push(i) : i.children = newArr + item.basicInfoNodes = item.basicInfoNodes.filter(items => { + if (!discard.includes(items)) return items; }) + } + //将children处理成指定形式 + if(i.name =='单位信息'){ let newChildren = [] i.children.forEach((element,index) => { let newChildrenItem:any= {} - // newChildrenItem.name = element.name//重点部位题目名称 - // newChildrenItem.position = element.position//重点部位所在位置 - // newChildrenItem.structure = element.structure//重点部位建筑结构 - // newChildrenItem.nature = element.nature//重点部位使用性质 - // newChildrenItem.hazards = element.hazards//重点部位主要危险性 newChildrenItem.name = element.name//题目名称 - newChildrenItem.result = element.position + element.structure + element.nature + element.hazards//题目答案 + newChildrenItem.result = element.value//题目答案 newChildrenItem.physicalUnit = element.physicalUnit || ''//计量单位 newChildrenItem.propertyType = 0//输入框类型 newChildren.push(newChildrenItem) }) i.children = newChildren - delete i.selected - - - }) : null - //建筑的功能分区模块处理 - item.funDivNodes ? item.funDivNodes.forEach((i,key) => { - - //如果顶级节点未选中则需要筛除没有选中的数据 - if(!i.checked){ - let newArr = [] - i.children.forEach(element => { - element.checked ? newArr.push(element) : null - }) - let discard = []//即将废弃的数组 - newArr.length == 0 ? discard.push(i) : i.children = newArr - item.funDivNodes = item.funDivNodes.filter(items => { - if (!discard.includes(items)) return items; - }) - } - - i.tabledata = [{propertyName: "区域",data:[]}, - {propertyName: "面积",data:[]}, - {propertyName: "基本情况",data:[]}] - i.children.forEach(element => { - i.tabledata[0].data.push({ - name: "区域", - physicalUnit: '', - propertyType: 0, - result: element.region, - tag: "" - }) - i.tabledata[1].data.push({ - name: "面积", - physicalUnit: '', - propertyType: 0, - result: element.area, - tag: "" - }) - i.tabledata[2].data.push({ - name: "基本情况", - physicalUnit: '', - propertyType: 0, - result: element.details, - tag: "" - }) - }) + }else if(!i.tabledata){ let newChildren = [] i.children.forEach((element,index) => { let newChildrenItem:any= {} - // newChildrenItem.name = element.region//功能分区题目名称 - // newChildrenItem.area = element.area//功能分区面积 - // newChildrenItem.details = element.details//功能分区基本情况 - newChildrenItem.name = element.region//题目名称 - newChildrenItem.result = element.area + element.details//题目答案 + newChildrenItem.name = element.propertyName//题目名称 + newChildrenItem.result = element.propertyValue//题目答案 newChildrenItem.physicalUnit = element.physicalUnit || ''//计量单位 - newChildrenItem.propertyType = 0//输入框类型 + newChildrenItem.propertyType = element.propertyType//输入框类型 newChildren.push(newChildrenItem) }) i.children = newChildren - delete i.selected - }) : null - //建筑的数据核验模块处理 - item.fireFacNodes ? item.fireFacNodes.forEach((i,key) => { - i.selected ? i.selected = null : null - //如果顶级节点未选中则需要筛除没有选中的数据 - if(!i.checked){ - let newArr = [] - i.children.forEach(element => { - element.checked ? newArr.push(element) : null - }) - let discard = []//即将废弃的数组 - newArr.length == 0 ? discard.push(i) : i.children = newArr - item.fireFacNodes = item.fireFacNodes.filter(items => { - if (!discard.includes(items)) return items; - }) - } + }else if(i.tabledata){//如果是表格类 let newChildren = [] i.children.forEach((element,index) => { let newChildrenItem:any= {} - newChildrenItem.name = element.name//题目名称 - newChildrenItem.result = element.total//题目答案 + newChildrenItem.name = element.propertyValue//题目名称 + newChildrenItem.result = element.tag//代表第几行 newChildrenItem.physicalUnit = ''//计量单位 - newChildrenItem.propertyType = 0//输入框类型 + newChildrenItem.propertyType = ''//输入框类型 newChildren.push(newChildrenItem) }) i.children = newChildren - delete i.selected - }) : null - }) + i.tabledata.forEach(element => { + let newData = [] + element.data.forEach(ele => { + let newObj:any = {} + newObj.name = ele.propertyName//题目名称 + newObj.result = ele.propertyValue//代表第几行 + newObj.physicalUnit = ele.physicalUnit//计量单位 + newObj.propertyType = ele.propertyType//输入框类型 + newObj.tag = ele.tag//第几行 + newData.push(newObj) + }) + element.data = newData + }) + } + delete i.selected - //循环每个建筑处理数据 - console.log(copyDatas) - - let paperDataInfo = [] - copyDatas.forEach((item,key) =>{ + }) + //建筑的四周毗邻模块处理 + item.aroundNodes.forEach((i,key) => { + //如果顶级节点未选中则需要筛除没有选中的数据 + if(!i.checked){ + let newArr = [] + i.children.forEach(element => { + element.checked ? newArr.push(element) : null + }) + let discard = []//即将废弃的数组 + newArr.length == 0 ? discard.push(i) : i.children = newArr + item.aroundNodes = item.aroundNodes.filter(items => { + if (!discard.includes(items)) return items; + }) + } + let newChildren = [] + i.children.forEach((element,index) => { + let newChildrenItem:any= {} + newChildrenItem.name = element.title//题目名称 + newChildrenItem.result = element.name//题目答案 + newChildrenItem.physicalUnit = ''//计量单位 + newChildrenItem.propertyType = 0//输入框类型 + newChildren.push(newChildrenItem) + }) + i.children = newChildren + delete i.selected + }) + console.log(111,item) + //建筑的重点部位模块处理 + item.keySiteNodes ? item.keySiteNodes.forEach((i,key) => { + i.selected ? i.selected = null : null + //如果顶级节点未选中则需要筛除没有选中的数据 + if(!i.checked){ + let newArr = [] + i.children.forEach(element => { + element.checked ? newArr.push(element) : null + }) + let discard = []//即将废弃的数组 + newArr.length == 0 ? discard.push(i) : i.children = newArr + item.keySiteNodes = item.keySiteNodes.filter(items => { + if (!discard.includes(items)) return items; + }) + } + i.tabledata = [{propertyName: "重点部位名称",data:[]}, + {propertyName: "重点部位所在位置",data:[]}, + {propertyName: "建筑结构",data:[]}, + {propertyName: "使用性质",data:[]}, + {propertyName: "主要危险性",data:[]}] + i.children.forEach(element => { + i.tabledata[0].data.push({ + name: "重点部位名称", + physicalUnit: '', + propertyType: 0, + result: element.name, + tag: "" + }) + i.tabledata[1].data.push({ + name: "重点部位所在位置", + physicalUnit: '', + propertyType: 0, + result: element.position, + tag: "" + }) + i.tabledata[2].data.push({ + name: "建筑结构", + physicalUnit: '', + propertyType: 0, + result: element.structure, + tag: "" + }) + i.tabledata[3].data.push({ + name: "使用性质", + physicalUnit: '', + propertyType: 0, + result: element.nature, + tag: "" + }) + i.tabledata[4].data.push({ + name: "主要危险性", + physicalUnit: '', + propertyType: 0, + result: element.hazards, + tag: "" + }) + }) + let newChildren = [] + i.children.forEach((element,index) => { + let newChildrenItem:any= {} + // newChildrenItem.name = element.name//重点部位题目名称 + // newChildrenItem.position = element.position//重点部位所在位置 + // newChildrenItem.structure = element.structure//重点部位建筑结构 + // newChildrenItem.nature = element.nature//重点部位使用性质 + // newChildrenItem.hazards = element.hazards//重点部位主要危险性 + newChildrenItem.name = element.name//题目名称 + newChildrenItem.result = element.position + element.structure + element.nature + element.hazards//题目答案 + newChildrenItem.physicalUnit = element.physicalUnit || ''//计量单位 + newChildrenItem.propertyType = 0//输入框类型 + newChildren.push(newChildrenItem) + }) + i.children = newChildren + delete i.selected + + + }) : null + //建筑的功能分区模块处理 + item.funDivNodes ? item.funDivNodes.forEach((i,key) => { + + //如果顶级节点未选中则需要筛除没有选中的数据 + if(!i.checked){ + let newArr = [] + i.children.forEach(element => { + element.checked ? newArr.push(element) : null + }) + let discard = []//即将废弃的数组 + newArr.length == 0 ? discard.push(i) : i.children = newArr + item.funDivNodes = item.funDivNodes.filter(items => { + if (!discard.includes(items)) return items; + }) + } + + i.tabledata = [{propertyName: "区域",data:[]}, + {propertyName: "面积",data:[]}, + {propertyName: "基本情况",data:[]}] + i.children.forEach(element => { + i.tabledata[0].data.push({ + name: "区域", + physicalUnit: '', + propertyType: 0, + result: element.region, + tag: "" + }) + i.tabledata[1].data.push({ + name: "面积", + physicalUnit: '', + propertyType: 0, + result: element.area, + tag: "" + }) + i.tabledata[2].data.push({ + name: "基本情况", + physicalUnit: '', + propertyType: 0, + result: element.details, + tag: "" + }) + }) + let newChildren = [] + i.children.forEach((element,index) => { + let newChildrenItem:any= {} + // newChildrenItem.name = element.region//功能分区题目名称 + // newChildrenItem.area = element.area//功能分区面积 + // newChildrenItem.details = element.details//功能分区基本情况 + newChildrenItem.name = element.region//题目名称 + newChildrenItem.result = element.area + element.details//题目答案 + newChildrenItem.physicalUnit = element.physicalUnit || ''//计量单位 + newChildrenItem.propertyType = 0//输入框类型 + newChildren.push(newChildrenItem) + }) + i.children = newChildren + delete i.selected + }) : null + //建筑的数据核验模块处理 + item.fireFacNodes ? item.fireFacNodes.forEach((i,key) => { + i.selected ? i.selected = null : null + //如果顶级节点未选中则需要筛除没有选中的数据 + if(!i.checked){ + let newArr = [] + i.children.forEach(element => { + element.checked ? newArr.push(element) : null + }) + let discard = []//即将废弃的数组 + newArr.length == 0 ? discard.push(i) : i.children = newArr + item.fireFacNodes = item.fireFacNodes.filter(items => { + if (!discard.includes(items)) return items; + }) + } + let newChildren = [] + i.children.forEach((element,index) => { + let newChildrenItem:any= {} + newChildrenItem.name = element.name//题目名称 + newChildrenItem.result = element.total//题目答案 + newChildrenItem.physicalUnit = ''//计量单位 + newChildrenItem.propertyType = 0//输入框类型 + newChildren.push(newChildrenItem) + }) + i.children = newChildren + delete i.selected + }) : null + }) + + //将筛选出来的数据变为服务器提交数据 + let paperDataInfo = [] + copyDatas.forEach((item,key) =>{ paperDataInfo[key] = {} paperDataInfo[key].id = null paperDataInfo[key].paperId = null @@ -1019,19 +1080,48 @@ export class CreateTestScoreComponent implements OnInit { paperDataInfo[key].functionalDivisionScore = item.funDivScore paperDataInfo[key].facilityData = item.fireFacNodes ? JSON.stringify(item.fireFacNodes) : '[]' paperDataInfo[key].facilityScore = item.fireFacScore - }) - - console.log(paperDataInfo) - - const dialogRef = this.dialog.open(FinishDialog, { - width: '650px', - data: paperDataInfo - }); + }) - dialogRef.afterClosed().subscribe(result => { - console.log('The dialog was closed'); + // console.log(123456,paperDataInfo) + //判断是否存在总分填写后没有勾选 或者勾选了没有填写总分的情况 + paperDataInfo.forEach(element => { + //判断存在总分填写后没有勾选题目 + if( (element.basicInfoScore != 0 && JSON.parse(element.basicInfoData).length == 0) || + (element.adjoinScore != 0 && JSON.parse(element.adjoinData).length == 0) || + (element.importLocationScore != 0 && JSON.parse(element.importLocationData).length == 0) || + (element.functionalDivisionScore != 0 && JSON.parse(element.functionalDivisionData).length == 0) || + (element.facilityScore != 0 && JSON.parse(element.facilityData).length == 0) ){ + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('存在填写过总分,但未勾选题目的分组','确定',config); + return + }else + //勾选了题目存在没有填写总分 + if( + (element.basicInfoScore == 0 && JSON.parse(element.basicInfoData).length != 0) || + (element.adjoinScore == 0 && JSON.parse(element.adjoinData).length != 0) || + (element.importLocationScore == 0 && JSON.parse(element.importLocationData).length != 0) || + (element.functionalDivisionScore == 0 && JSON.parse(element.functionalDivisionData).length != 0) || + (element.facilityScore == 0 && JSON.parse(element.facilityData).length != 0) ){ + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('存在勾选过题目,但未填写总分的分组','确定',config); + return + }else{ + const dialogRef = this.dialog.open(FinishDialog, { + width: '650px', + data: paperDataInfo + }); + dialogRef.afterClosed().subscribe(result => { + + }); + } - }); + + }) + } //上一步 goBack(){ @@ -1069,7 +1159,13 @@ export class AddPlanDialog { }); dialogRef.afterClosed().subscribe(result => { - this.dialogRef.close(); + if(result){ + console.log(1111111,result) + this.dialogRef.close(result); + }else{ + this.dialogRef.close(); + } + }); } } @@ -1105,7 +1201,8 @@ export class AddPlanTwoDialog { companyId:this.data.companyData.companyData.id }}).subscribe((data:any) => { data.items.forEach(item => { - item.planType == 1 ? planArr.push(item) : null + //二维预案并且审核通过 + (item.planType == 1 && item.auditStatus == 2) ? planArr.push(item) : null }) this.dataSource = planArr }) @@ -1118,32 +1215,37 @@ export class AddPlanTwoDialog { confirm(){ if(this.planType){//如果选择的是已存在预案 if(this.selectedRadioData){ - this.dialogRef.close(); + this.dialogRef.close(this.selectedRadioData); sessionStorage.setItem('companyName',this.data.companyData.companyData.name) sessionStorage.setItem('planId',this.selectedRadioData.id) sessionStorage.setItem('buildingTypeId',this.data.companyData.companyData.buildingTypes[0].id) sessionStorage.setItem('companyId',this.data.companyData.companyData.id) - window.open('/canvasTool') + window.open('/canvasTool?openType=1') }else{ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('请选择要添加的预案','确定',config); + if(this.dataSource.length == 0){ + this.dialogRef.close(); + }else{ + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('请选择要添加的预案','确定',config); + } + } }else{//如果选择的是自定义预案 let level = sessionStorage.getItem('level') let body = { - id: "", + id: null, name: this.customPlanName, planType:1, planMode: 2, planLevel:Number(level), - url: "", + url: null, attachmentUrls: null } - this.http.post("/api/PlanComponents2D",body,{params:{ + this.http.post("/api/ExamPlanComponents2D",body,{params:{ companyId : this.data.companyData.companyData.id }}).subscribe((data:any)=>{ // console.log("创建成功") @@ -1152,7 +1254,7 @@ export class AddPlanTwoDialog { sessionStorage.setItem("companyId",this.data.companyData.companyData.id) sessionStorage.setItem("buildingTypeId",this.data.companyData.companyData.buildingTypes[0].id) sessionStorage.setItem("editable","1") - window.open('/canvasTool') + window.open('/canvasTool?openType=2') }) } } diff --git a/src/app/examiner/create-test-score/lookTreeNode.html b/src/app/examiner/create-test-score/lookTreeNode.html index f05b3eb..fb85e7e 100644 --- a/src/app/examiner/create-test-score/lookTreeNode.html +++ b/src/app/examiner/create-test-score/lookTreeNode.html @@ -14,7 +14,7 @@ {{item.propertyName}} - {{i.data[key]. propertyValue}} + {{i.data[key]. propertyValue ? i.data[key]. propertyValue : '无'}} diff --git a/src/app/examiner/examiner-index/examiner-index.component.ts b/src/app/examiner/examiner-index/examiner-index.component.ts index 771db9c..8ba78a1 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-20 10:28:13 + * @LastEditTime: 2020-12-20 10:31:09 */ import { Component, OnInit, ViewChild, Inject,Input } from '@angular/core'; import {HttpClient} from '@angular/common/http' @@ -167,9 +167,7 @@ export class ExaminerIndexComponent implements OnInit { this.http.get("/api/Papers",{params:paramsdata}).subscribe((data:any)=>{ this.tabledataSource=data.items this.length=data.totalCount - console.log(this.tabledataSource) }) - //console.log(this.tabledataSource) } //获取消防救援对信息 getHelp(){ @@ -186,7 +184,6 @@ export class ExaminerIndexComponent implements OnInit { SortType:'' } this.http.get("/api/ExamUsers",{params:paramsdata}).subscribe((data:any)=>{ - console.log(data) this.helpName=data.items }) } @@ -240,7 +237,7 @@ export class ExaminerIndexComponent implements OnInit { } //新增考题跳转 newExamination(){ - this.router.navigate(['/home/examiner-new-one']) + this.router.navigate(['/home/createexam-index/examiner-new-one']) } //辖区中队div是否显示 isorganizationbox:boolean = false diff --git a/src/app/examiner/examiner-routing.ts b/src/app/examiner/examiner-routing.ts index e3b9aef..5b3cda2 100644 --- a/src/app/examiner/examiner-routing.ts +++ b/src/app/examiner/examiner-routing.ts @@ -15,14 +15,11 @@ import { MarkPapersTwoComponent } from './mark-papers-two/mark-papers-two.compon import { StatisticAnalysisComponent } from './statistic-analysis/statistic-analysis.component' const routes: Routes = [ - // { path: '', component:CreateExamComponent } { path: 'createexam-index', component:ExaminerIndexComponent }, - { path: 'examiner-new-one', component:ExaminerNewOneComponent }, + { path: 'createexam-index/examiner-new-one', component:ExaminerNewOneComponent }, { path: 'mark-papers-index',component:MarkPapersIndexComponent}, - { path: 'mark-papers-two',component:MarkPapersTwoComponent}, + { path: 'mark-papers-index/mark-papers-two',component:MarkPapersTwoComponent}, { path: 'statistic-anaily',component:StatisticAnalysisComponent} - - //{ path: 'createexam-index', component:ExaminerIndexComponent }, ] @NgModule({ imports: [RouterModule.forChild(routes)], 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 18a21ac..c734389 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 @@ -48,7 +48,7 @@ export class MarkPapersIndexComponent implements OnInit { //点击阅卷跳转 markTwo(e){ console.log(e) - this.router.navigate(['/home/mark-papers-two'],{queryParams:{'level':e}}) + this.router.navigate(['/home/mark-papers-index/mark-papers-two'],{queryParams:{'level':e}}) } } diff --git a/src/app/http-interceptors/base-interceptor.ts b/src/app/http-interceptors/base-interceptor.ts index 4f22d6a..4cabcd7 100644 --- a/src/app/http-interceptors/base-interceptor.ts +++ b/src/app/http-interceptors/base-interceptor.ts @@ -46,6 +46,7 @@ export class BaseInterceptor implements HttpInterceptor { // 用户认证失败返回登录页 if (error.status === 401||error.status === 614) { sessionStorage.clear() + localStorage.clear() this.router.navigate(['/login']) const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; diff --git a/src/app/http-interceptors/cache-token.service.ts b/src/app/http-interceptors/cache-token.service.ts index c5a8399..917bbd1 100644 --- a/src/app/http-interceptors/cache-token.service.ts +++ b/src/app/http-interceptors/cache-token.service.ts @@ -25,6 +25,7 @@ export class CacheTokenService { sessionStorage.setItem("roleType",data.roleType); sessionStorage.setItem("token",data.token); sessionStorage.setItem("refreshToken",data.refreshToken); + sessionStorage.setItem("level",data.level); }) } else { this.delete() } },18*60*1000) diff --git a/src/app/navigation/adddatabank.html b/src/app/navigation/adddatabank.html deleted file mode 100644 index defbcba..0000000 --- a/src/app/navigation/adddatabank.html +++ /dev/null @@ -1,14 +0,0 @@ -
- - - - - -
- - -
- -
diff --git a/src/app/navigation/editdatabankname.html b/src/app/navigation/editdatabankname.html deleted file mode 100644 index 80aaf2a..0000000 --- a/src/app/navigation/editdatabankname.html +++ /dev/null @@ -1,14 +0,0 @@ -
- - - - - -
- - -
- -
diff --git a/src/app/navigation/navigation.component.html b/src/app/navigation/navigation.component.html index 2dff347..f389b85 100644 --- a/src/app/navigation/navigation.component.html +++ b/src/app/navigation/navigation.component.html @@ -7,7 +7,7 @@ * @LastEditTime: 2020-12-15 14:32:13 --> - +
@@ -22,7 +22,7 @@
-
    +
      • @@ -33,6 +33,14 @@
    +
      +
    • + +
      • +
    • + +
      • +
@@ -40,7 +48,7 @@
- +
diff --git a/src/app/navigation/navigation.component.ts b/src/app/navigation/navigation.component.ts index ead61d3..99c7683 100644 --- a/src/app/navigation/navigation.component.ts +++ b/src/app/navigation/navigation.component.ts @@ -5,7 +5,6 @@ import { FormControl } from '@angular/forms'; import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; import { IsLoginService } from '../is-login.service' -import { AllFileComponent } from '../ui/all-file/all-file.component'; import { ComponentServiceService } from '../component-service.service'; import { Router,ActivatedRoute } from '@angular/router' @Component({ @@ -17,72 +16,7 @@ export class NavigationComponent implements OnInit { constructor(private router:Router,public emitService: ComponentServiceService,public navmenus:CacheTokenService,private http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,public islogin:IsLoginService) { } - isAdmin:boolean = false - ngOnInit() { - // if(sessionStorage.getItem("roleType") == "0"){ - // this.isAdmin = true - // } - } - - darktheme = false;//黑夜主题 - switchTheme (dark) { this.darktheme = dark; } - defaulttheme () { this.darktheme = false } - redtheme () { this.darktheme = true} - -} - -//新增资料库 -@Component({ - selector: 'adddatabank', - templateUrl: './adddatabank.html', - styleUrls: ['./navigation.component.scss'] -}) -export class AddDataBank { - myControl = new FormControl(); - constructor(private http: HttpClient,public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data,public snackBar: MatSnackBar) {} - - onNoClick(): void { - this.dialogRef.close(); - } - - onSubmit(value){ - if ( value.name.includes('/') ) { - let config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('名称不允许有特殊字符','确定',config); - } else { - this.dialogRef.close(value); - } - } + roleType = sessionStorage.getItem('roleType') + ngOnInit() {} } - -//更改资料库名称 -@Component({ - selector: 'editdatabankname', - templateUrl: './editdatabankname.html', - styleUrls: ['./navigation.component.scss'] -}) -export class EditDataBankName { - myControl = new FormControl(); - constructor(private http: HttpClient,public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data,public snackBar: MatSnackBar) {} - - dataBankName:any = this.data.name//要修改的资料库原名称 - - onNoClick(): void { - this.dialogRef.close(); - } - - onSubmit(value){ - if ( value.name.includes('/') ) { - let config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('名称不允许有特殊字符','确定',config); - } else { - this.dialogRef.close(value); - } - } - -} \ No newline at end of file diff --git a/src/app/navigation/navigation.module.ts b/src/app/navigation/navigation.module.ts index a127fcb..9b99dd6 100644 --- a/src/app/navigation/navigation.module.ts +++ b/src/app/navigation/navigation.module.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { NavigationComponent, AddDataBank, EditDataBankName } from './navigation.component'; +import { NavigationComponent } from './navigation.component'; import { MatIconModule } from '@angular/material/icon'; import { MatSidenavModule } from '@angular/material/sidenav'; import { RouterModule } from '@angular/router'; @@ -54,9 +54,7 @@ import {MatTreeModule} from '@angular/material/tree'; @NgModule({ declarations: [ NavigationComponent, - TabbarComponent, - AddDataBank, - EditDataBankName + TabbarComponent ], imports: [ CommonModule, diff --git a/src/app/pipes/size.pipe.ts b/src/app/pipes/size.pipe.ts index 5a58dcc..7ce6619 100644 --- a/src/app/pipes/size.pipe.ts +++ b/src/app/pipes/size.pipe.ts @@ -1,49 +1,4 @@ import { Pipe, PipeTransform } from '@angular/core'; -@Pipe({name: 'size'}) -export class SizePipe implements PipeTransform { - transform(byte: number): string { - if(byte < 1048576 && byte != 0){//如果小于1M - let size = byte / 1024 - return size.toFixed(1) + 'KB' - } - if(byte >= 1048576 && byte < 1073741824){//如果大于1M 小于1G - let size = byte / 1048576 - return size.toFixed(1) + 'MB' - } - if(byte >= 1073741824){//如果大于1G - let size = byte / 1073741824 - return size.toFixed(1) + 'GB' - } - if(byte < 1048576 && byte == 0){//如果是文件夹 - return '--' - } - } -} -@Pipe({name: 'name'}) -export class NamePipe implements PipeTransform { - transform(name: string): string { - let nameArr = name.split("/") - return nameArr[nameArr.length - 1] - } -} -@Pipe({name: 'name2'}) -export class NamePipe2 implements PipeTransform { - transform(name: string): string { - let nameArr = name.split("/") - return nameArr[nameArr.length - 2] - } -} -@Pipe({name: 'name3'}) -export class NamePipe3 implements PipeTransform { - transform(name: string): string { - if(name.charAt(name.length-1) == "/"){ - return name.substr(0, name.length - 1).replace(/\//g,'>').substring(9,name.length) - }else{ - return name.replace(/\//g,'>').substring(9,name.length) - } - } -} - @Pipe({name: 'testState'}) export class testState implements PipeTransform { transform(name: string): string { diff --git a/src/app/tabbar/tabbar.component.ts b/src/app/tabbar/tabbar.component.ts index 633536e..4f187d3 100644 --- a/src/app/tabbar/tabbar.component.ts +++ b/src/app/tabbar/tabbar.component.ts @@ -25,16 +25,6 @@ import { MatSnackBarConfig, MatSnackBar } from '@angular/material/snack-bar'; }) export class TabbarComponent implements OnInit { - theme: boolean = true; - @Output() - toggle = new EventEmitter(); - @Output() - toggleDarkTheme = new EventEmitter(); - @Output() - defaulttheme = new EventEmitter(); - @Output() - redtheme = new EventEmitter(); - constructor(private http:HttpClient,private router:Router,private route:ActivatedRoute,public token:CacheTokenService,public dialog: MatDialog,public isLogin:IsLoginService,public snackBar: MatSnackBar,) { } ngOnInit() { @@ -50,6 +40,7 @@ export class TabbarComponent implements OnInit { if(out) { this.http.post('/api/ExamAccounts/SignOut',{}).subscribe(data=>{ sessionStorage.clear() + localStorage.clear() this.token.delete() this.router.navigate(['/login']) const config = new MatSnackBarConfig(); @@ -57,7 +48,6 @@ export class TabbarComponent implements OnInit { config.duration = 3000 this.snackBar.open('退出成功','确定',config); }) - localStorage.removeItem("checkedWork") } //if } diff --git a/src/app/ui/all-file/all-file.component.html b/src/app/ui/all-file/all-file.component.html deleted file mode 100644 index 346fb37..0000000 --- a/src/app/ui/all-file/all-file.component.html +++ /dev/null @@ -1,159 +0,0 @@ - -
-
-
-
- backup 上传 - -
-
-
- 上传文件 - -
-
- 上传文件夹 - -
-
-
-
- create_new_folder 新建文件夹 -
- -
- save_alt 下载 -
- -
- delete 删除 -
- -
- - 上传中... - -
- - - -
- - 下载中... - -
-
- -
-
-
- 返回根目录 -   - 返回上一级 - | - 全部文件 - → - {{selectedDataBank}} -
- -
- 已全部加载，共 {{fileNum}} 个 -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - 文件名 - - - - - - - - - - - - - - - - - - {{element.key | name}} - - - {{element.key | name2}} - - -   3D   - - 大小 {{element.size | size}} 修改日期 {{element.lastModified | date:'yyyy-MM-dd HH:mm:ss'}}
- -
- 您还没上传过文件哦～ -
-
- -
- account_balance 战术授课进入 -
- -
- account_balance 战术学习进入 -
- -
- -
- -
    -
  • {{item.key}}
    • -
- diff --git a/src/app/ui/all-file/all-file.component.scss b/src/app/ui/all-file/all-file.component.scss deleted file mode 100644 index 04d8486..0000000 --- a/src/app/ui/all-file/all-file.component.scss +++ /dev/null @@ -1,265 +0,0 @@ -// @import "//at.alicdn.com/t/font_1863119_sy1f800ck9h.css"; -.topbox{ - height: 33px; - position: relative; - padding: 11px 10px; - .leftbox{ - float: left; - display: flex; - .upload{ - margin-left:16px; - background-color: #09AAFF; - border-radius: 4px; - cursor: pointer; - .btn{ - position: relative; - color: white; - font-size: 13px; - mat-icon{ - position: absolute; - top: 5px; - left: 10px; - } - span{ - position: absolute; - left: 41px; - top: 9px; - } - input{ - width: 88px; - height: 33px; - opacity: 0; - } - } - .openbtn{ - background-color: white; - width: 86px; - text-align: center; - font-size: 12px; - border-radius: 0px 0px 4px 4px; - border: 1px solid #09AAFF; - div{ - position: relative; - height: 30px; - line-height: 30px; - color: #09AAFF; - input{ - width: 86px; - height: 30px; - opacity: 0; - position: absolute; - left: 0; - top: 0; - } - } - div:hover{ - background-color: whitesmoke; - } - } - } - .newFile{ - cursor: pointer; - background-color: #fff; - color: #09AAFF; - border: 1px solid #C3EAFF; - border-radius: 4px; - margin-left: 12px; - height: 33px; - line-height: 33px; - font-size: 13px; - position: relative; - width: 130px; - height: 33px; - float: left; - mat-icon{ - position: absolute; - top: 5px; - left: 10px; - } - span{ - position: absolute; - left: 41px; - } - } - .delete{ - color: rgba(245, 59, 59); - border: 0.5px solid rgba(245, 59, 59); - // background-color: red; - // color: white; - } - } - .rightbox{ - float: right; - width: 21%; - .inputbox{ - float: right; - width: 21%; - min-width: 165px; - max-width: 315px; - height: 30px; - // margin: 12px 8px 12px 0; - position: relative; - right: 100px; - border-radius: 33px; - padding-left: 15px; - padding-right: 54px; - background: #f1f2f4; - border-radius: 33px; - input{ - width: 100%; - height: 30px; - background: 0 0; - border: 0; - outline: 0; - line-height: 29px!important; - position: relative; - font-size: 12px; - } - .search{ - cursor: pointer; - position: absolute; - right: 5px; - top: 3px; - color: grey; - } - .cancel{ - cursor: pointer; - position: absolute; - right: 22px; - top: 5px; - color: #808080; - } - .cancel:hover{ - mat-icon{ - color: #808090; -; - } - - } - } - } - //进度条 - .progressBox{ - position: absolute; - display: inline-block; - width: 550px; - left: 480px; - } - .progress{ - position: absolute; - width: 350px; - top: 18px; - left: 160px; - } -} - - - - -.titlebox{ - height: 30px; - line-height: 30px; - padding-left: 18px; - padding-right: 18px; - span{ - font-size: 12px; - } - .titleleft{ - float: left; - .goBack{ - color: #09aaff; - } - .goBack:hover{ - cursor: pointer; - text-decoration: underline; - } - } - .titleright{ - float: right; - } -} -.mainbox{ -// overflow-y: auto; - table{ - td{ - img{ - position: relative; - width: 26px; - height: 26px; - top: 6px; - margin-right: 3px; - } - .filename:hover{ - cursor: pointer; - color: #09aaff; - } - } - } -} - -.btn{ - width: 100%; - text-align: center; - button{ - margin: 0 5px; - } -} -.font3d{ - font-size: 13px; - background-color: #2cbe4e; - display: inline-block; - font-weight: 600; - line-height: 20px; - color: #fff; - text-align: center; - white-space: nowrap; - border-radius: 3px; - box-sizing: border-box; -} - -//上传文件夹弹窗 -.fixedBox { - position: fixed; - bottom: 3%; - right: 3%; - width: 500px; -} -.nofiles{ - background: url("../../../assets/images/nofiles.png") no-repeat scroll center 0 transparent; - padding-top: 150px; - width: 488px; - position: absolute; - left: 50%; - top: 50%; - text-align: center; - margin: -78px 0 0 -244px; -} -.openSystem{ - position: relative; - a{ - color: rgba(0, 0, 0, 0.87); - font-size: 14px; - display: block; - width: 100%; - height: 48px; - line-height: 48px; - border-bottom: 1px solid rgba(0, 0, 0, 0.12); - padding-left: 4%; - background-color: white; - img{ - position: relative; - width: 26px; - height: 26px; - top: 6px; - margin-right: 8px; - } - span{ - position: absolute; - right: 31.3%; - line-height: 48px; - font-size: 14px; - } - } - - -} \ No newline at end of file diff --git a/src/app/ui/all-file/all-file.component.spec.ts b/src/app/ui/all-file/all-file.component.spec.ts deleted file mode 100644 index b688763..0000000 --- a/src/app/ui/all-file/all-file.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { AllFileComponent } from './all-file.component'; - -describe('AllFileComponent', () => { - let component: AllFileComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ AllFileComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(AllFileComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/ui/all-file/all-file.component.ts b/src/app/ui/all-file/all-file.component.ts deleted file mode 100644 index de666fd..0000000 --- a/src/app/ui/all-file/all-file.component.ts +++ /dev/null @@ -1,918 +0,0 @@ -import { Component, OnInit,ViewChild ,Inject,NgZone } from '@angular/core'; -import { SelectionModel } from '@angular/cdk/collections'; -import {MatSort} from '@angular/material/sort'; -import {MatTableDataSource} from '@angular/material/table'; -import { HttpClient,HttpHeaders } from '@angular/common/http'; -import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; -import { IsLoginService } from '../../is-login.service'; -import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; -import {UploadFilesComponent} from '../upload-files/upload-files.component'; -import { ComponentServiceService } from '../../component-service.service'; -import { DomSanitizer } from "@angular/platform-browser"; -@Component({ - selector: 'app-all-file', - templateUrl: './all-file.component.html', - styleUrls: ['./all-file.component.scss'], -}) -export class AllFileComponent { - displayedColumns: string[] = ['select', 'name', 'weight', 'time']; - dataSource:any = new MatTableDataSource; - - constructor(private sanitizer: DomSanitizer,public emitService: ComponentServiceService,private http: HttpClient,public snackBar: MatSnackBar,public downloadFile:IsLoginService,public dialog: MatDialog,private zone: NgZone) { } - isCancel:boolean = false //搜索框的X是否显示 - searchData:any = "搜索您的文件" //搜索框内容 - isClickFile:boolean = false //是否点击过文件 - isOpenUpload:boolean = false //是否移入上传按钮 - isDelete:boolean = false //是否删除按钮 - isNoFileTitle:boolean = false //无文件时提示 - - - isAdmin:boolean = false //是否是管理员 - - selectedDataBank:string = '' //当前需要显示的资料库 - fileNum:any = 0 //当前资料库文件数量 - - selection = new SelectionModel(true, []); - @ViewChild(MatSort) sort: MatSort; - @ViewChild( 'child',{static: false} ) child:UploadFilesComponent //上传文件夹子组件 - - oldDataSource:any; //原始表格数据 - //表头排序 - sortData (e) { - let data = this.oldDataSource.concat(); - data.forEach(element => { - if(element.key.indexOf(".") != -1){ - let typeArr = element.key.split('.') - element.type = typeArr[typeArr.length - 1] - element.newTime = new Date(element.lastModified).getTime() - } - - }); - - if( e.direction=='asc' ) { //从小到大排序 - data.sort( function(a,b) { - return a.newTime - b.newTime - } ) - this.dataSource = new MatTableDataSource(data); - } else if ( e.direction=='desc' ) {//从大到小排序 - data.sort( function(a,b) { - return b.newTime - a.newTime - } ) - this.dataSource = new MatTableDataSource(data); - } else { //原始数据 - this.dataSource = new MatTableDataSource(this.oldDataSource); - } - } - - - roleType:any - aHrefUnsafe:any //战术授课a标签 去除unsafe标志 - ngOnInit(): void { - this.roleType = sessionStorage.getItem('roleType') - this.dataSource.sort = this.sort; - this.getALLFileList("支队级-主官") - - // 接收发射过来的数据 - this.emitService.eventEmit.subscribe((value: any) => { - this.getALLFileList(value) - this.selection.clear(); - }); - - if(sessionStorage.getItem("roleType") == "0"){ - this.isAdmin = true - } - } - aHrefUnsafeLearnFun(){ - this.roleType = sessionStorage.getItem('roleType') - let username = sessionStorage.getItem('username') - let expires = sessionStorage.getItem('expires') - let realName = sessionStorage.getItem('realName') - let roleType = sessionStorage.getItem('roleType') - let token = sessionStorage.getItem('token') - let refreshToken = sessionStorage.getItem('refreshToken') - let aHref = `ax://startup?username=${username}&token=${token}&refreshToken=${refreshToken}&expires=${expires}&realname=${realName}&roleType=${roleType}` - this.aHrefUnsafe = this.sanitizer.bypassSecurityTrustUrl(aHref); - return this.aHrefUnsafe - } - - //获得当前资料库的文件列表 - getALLFileList(name){ - this.selectedDataBank = name - let paramsdata = { - prefix : "allFiles/" + this.selectedDataBank + "/", - delimiter : "/" - } - this.http.get(`/api/Objects/drives`,{ - params:paramsdata - }).subscribe((data:any) => { - this.selection.clear() - data.contents.forEach((item)=>{ - let typeArr = item.key.split('.') - item.type = typeArr[typeArr.length - 1] - }) - if(name.split('/')[1] == "装备"){ - data.contents.unshift( - { key: "装备车辆/高喷车", - lastModified: null, - eTag: null, - size: 0, - isDir: false, - type: "gaopenche" - }, - { key: "装备车辆/登高平台车", - lastModified: null, - eTag: null, - size: 0, - isDir: false, - type: "denggao" - }, - { key: "装备车辆/机器人", - lastModified: null, - eTag: null, - size: 0, - isDir: false, - type: "jiqiren" - }, - { key: "装备车辆/空气呼吸器", - lastModified: null, - eTag: null, - size: 0, - isDir: false, - type: "konghuqi" - } - ) - } - if(name.split('/')[1] == "消防设施"){ - data.contents.unshift( - { key: "设备设施/外浮顶罐", - lastModified: null, - eTag: null, - size: 0, - isDir: false, - type: "waifu" - }, - { key: "设备设施/内浮顶罐", - lastModified: null, - eTag: null, - size: 0, - isDir: false, - type: "neifu" - }, - { key: "设备设施/拱顶罐", - lastModified: null, - eTag: null, - size: 0, - isDir: false, - type: "gong" - }, - { key: "设备设施/球罐", - lastModified: null, - eTag: null, - size: 0, - isDir: false, - type: "qiu" - } - ) - } - this.oldDataSource = data.contents //保存表格数据 - - this.dataSource = new MatTableDataSource(data.contents); - - this.fileNum = data.contents.length - if(data.contents.length == 0){ - this.isNoFileTitle = true - }else{ - this.isNoFileTitle = false - } - }) - } - - //判断是否全部选中 - isAllSelected() { - const numSelected = this.selection.selected.length; - const numRows = this.dataSource.data.length; - return numSelected === numRows; - } - - //控制全选按钮 - masterToggle() { - this.isAllSelected() ? this.selection.clear() : this.dataSource.data.forEach(row => this.selection.select(row)); - this.isAllSelected() ? this.isDelete = true : this.isDelete = false; - } - - //搜索框获得焦点事件 - searchfocus(e){ - this.isCancel = true - if(e.target.value == "搜索您的文件"){ - e.target.value = "" - } - } - - //搜索框失去焦点事件 - searchblur(e){ - if(e.target.value == ""){ - e.target.value = "搜索您的文件" - this.isCancel = false - } - } - - //搜索框点击X事件 - cancelbtn(){ - this.getALLFileList(this.selectedDataBank) - this.searchData = "搜索您的文件" - this.isCancel = false - } - - allFiles:any //搜索出来的全部文件 - checkedAllFiles:any = [] - //点击搜索 - search(){ - if(this.searchData != "搜索您的文件"){ - this.http.get("/api/Objects/drives",{ - params:{ - prefix : "allFiles", - delimiter : "" - } - }).subscribe((data:any)=>{ - this.allFiles = data.contents - this.allFiles.forEach(item=>{ - if(item.key.indexOf(this.searchData) != -1){ - this.checkedAllFiles.push(item) - } - }) - // console.log(888888,data.contents) - }, - err=>{ - - }) - } - } - - goback:any //记录上一级目录 - //点击列表每一条的名字 - clickName(e,item){ - e.stopPropagation() - if(item.type == "jpg" || item.type == "png" || item.type == "bmp"|| item.type == "gif" || item.type == "jpeg"&& !item.isDir){ - const dialogRef = this.dialog.open(ViewDetails, {//调用open方法打开对话框并且携带参数过去 - data: {url:item.key,type:"img"} - }); - - this.downloadFile.handleData(item.key,"查看") - }else if(item.type == "mp4" || item.type == "MP4" && !item.isDir){ - const dialogRef = this.dialog.open(ViewDetails, {//调用open方法打开对话框并且携带参数过去 - width: '1400px', - height:'800px', - data: {url:item.key,type:"video"} - }); - dialogRef.afterClosed().subscribe(); - this.downloadFile.handleData(item.key,"查看") - }else if(item.type == "mp3" || item.type == "MP3"&& !item.isDir){ - const dialogRef = this.dialog.open(ViewDetails, {//调用open方法打开对话框并且携带参数过去 - width: '400px', - height:'108px', - data: {url:item.key,type:"mp3"} - }); - dialogRef.afterClosed().subscribe(); - this.downloadFile.handleData(item.key,"查看") - }else if(item.type == "pdf" && item.size < 20971520){ - window.open("/api/Objects/drives/" + item.key) - this.downloadFile.handleData(item.key,"查看") - }else if(item.type == "pdf" && item.size > 20971520){ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('暂不支持在线预览大于20M的pdf文件，请下载查看','确定',config) - }else if(item.type == "gaopenche"){ - - window.open("3dWidgets/GaoPenChe") - - }else if(item.type == "denggao"){ - - window.open("3dWidgets/denggaoche") - - }else if(item.type == "jiqiren"){ - - window.open("3dWidgets/jiqiren") - - }else if(item.type == "konghuqi"){ - - window.open("3dWidgets/konghuqi") - - }else if(item.type == "waifu"){ - - window.open("3dWidgets/waifudingguan") - - }else if(item.type == "neifu"){ - - window.open("3dWidgets/neifudingguan") - - }else if(item.type == "gong"){ - - window.open("3dWidgets/gongdingguan") - - }else if(item.type == "qiu"){ - - window.open("3dWidgets/qiuguan") - - }else if (item.isDir) { - //将allFiles后面的内容截取出来 - this.selectedDataBank = item.key.substring(9, item.key.length - 1) - this.getALLFileList(this.selectedDataBank) - }else{ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('该文件类型暂不支持在线查看，请下载查看','确定',config) - } - } - - //记录战术授课 - openteacher(){ - let key = `allFiles/${this.selectedDataBank}/战术授课/` - this.downloadFile.handleData(key,"进入") - } - //记录战术学习 - openlearn(){ - let key = `allFiles/${this.selectedDataBank}/战术学习/` - this.downloadFile.handleData(key,"进入") - } - //返回上一级目录 - backTominTop(){ - let topnum = this.gettoplist(this.selectedDataBank) - this.getALLFileList(topnum) - } - - //上级目录产生函数 - gettoplist(item){ - let list = item - let listArr = list.split("/") - let listresult = "" - for(let i = 0;i < listArr.length - 1;i++){ - listresult += listArr[i] + "/" - } - let listresult2 = listresult.substring(0, listresult.length - 1) - return listresult2 - } - - - //上传按钮鼠标移入 - uploadBtnEnter(){ - this.isOpenUpload = true - } - - //上传按钮鼠标移出 - uploadBtnLeave(){ - this.isOpenUpload = false - } - - //点击每条的checkbox - clickCheckBox(e){ - e.stopPropagation(); - setTimeout(() => { - if(this.selection.selected.length != 0){ - this.isDelete = true - } else{ - this.isDelete = false - } - }, 0); - } - - //点击每条的li - clickCheckBoxLi(e,row){ - this.selection.toggle(row) - setTimeout(() => { - if(this.selection.selected.length != 0){ - this.isDelete = true - } else{ - this.isDelete = false - } - }, 0); - } - - file:any //需要上传的文件 - //input file 选择文件 - selectFile (e) { - this.file = e.target.files[0] || null //上传的文件 - this.http.get(`/api/ObjectMetadata/drives/${this.selectedDataBank}/${this.file.name}`).subscribe( - data=>{ - var r = confirm(`已有同名文件，继续将替换该文件，是否替换？`); - if (r == true) { - this.startUploading() - } - }, - err => { - this.startUploading() - } - ) - } - - fileArr:any - //上传文件夹 - async selectFiles (e) { - this.fileArr = e.target.files || null //上传的文件 - this.uploadisLoading2 = true - this.child.handleData() //子组件处理数据格式 - let _this = this - for (var i = 0;i < this.fileArr.length; i++) { - let f = this.fileArr[i]; - let lastIndex = f.webkitRelativePath.lastIndexOf("/") - let url = f.webkitRelativePath.substring(0, lastIndex) - let adddress = this.selectedDataBank + "/" + url - let filesnum = _this.fileArr.length - - let result = await new Promise ((result,reject)=>{ - this.startUploading2(f,adddress,result,reject,filesnum,this.selectedDataBank) - }) - } - } - - //上传文件 - objectName2:any //上传对象名 - uploadisLoading2:boolean = false //上传进度条显示 - uploadProgress2:any - uploadId2:any; //上传分块上传事件编号 - filesTag2:any = [] //每上传成功一个文件就往里面加一个标识 - //e是上传的文件 selectedDataBank是需要上传的地址 包括 XXX资料库 + 文件夹路径 - startUploading2 (e,selectedDataBank,result,reject,filesnum,selectedDataBank2) { - let file = e || null //获取上传的文件 - let fileSize = file.size || null //上传文件的总大小 - let shardSize = 5 * 1024 * 1024 //5MB一个分片 - this.uploadisLoading2 = true - this.uploadProgress2 = 0 + "/" + filesnum - this.child.uploading(file) //子组件 当前文件正在上传 - - if (file && fileSize<=shardSize) { //上传文件<=5MB时 - - let formData = new FormData() - formData.append("file",file) - this.http.post(`/api/Objects/drives/allFiles/${selectedDataBank2}`,formData).subscribe((data:any)=>{ - this.objectName2 = data.objectName - this.filesTag2.push("data") - - this.zone.run(() => { - 　　setTimeout(() => this.uploadProgress2 = this.filesTag2.length + "/" + filesnum, 0); - }); - - result("成功了") - this.child.endUpload(file) //子组件 当前文件上传成功 - - if(this.filesTag2.length == filesnum){ - this.filesTag2 = [] //清空计数文件夹 - this.uploadProgress2 = filesnum + "/" + filesnum - this.uploadisLoading2 = false - this.child.delete() //清空上传文件夹子组件数据 - - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('文件夹全部上传完毕','确定',config) - // 当全部循环完毕重新加载列表 - this.getALLFileList(selectedDataBank2) - } - }) - } else if (file && fileSize>shardSize) { //上传文件>5MB时,分块上传 - let data = {fileName: file.name} - this.uploadisLoading2 = true - - this.http.post(`/api/NewMultipartUpload/drives/allFiles/${selectedDataBank}`,{},{params:data}).subscribe((data:any)=>{ //初始化分段上传 - this.objectName2 = data.objectName - this.uploadId2 = data.uploadId - this.subsectionUploading2(e,result,reject,filesnum,selectedDataBank2) - }) - } - - } - - PartNumberETag2:any=[]; //每次返回需要保存的信息 - //开始分段上传 - async subsectionUploading2 (e,result,reject,filesnum,selectedDataBank2) { - let file = e || null //获取上传的文件 - let fileSize = file.size || null //上传文件的总大小 - let shardSize = 5 * 1024 * 1024 //5MB一个分片 - let allSlice = Math.ceil(fileSize / shardSize) //总文件/5MB===共分多少段 - let _result = result - for (let i = 0;i < allSlice;i++) { //循环分段上传 - let start = i * shardSize //切割文件开始位置 - let end = Math.min(fileSize, start + shardSize); //切割文件结束位置 - let formData = new FormData() - formData.append("file",file.slice(start, end)) - - //同步写法实现异步调用 - let result = await new Promise((resolve, reject) => { - // await 需要后面返回一个 promise 对象 - this.http.post(`/api/MultipartUpload/drives/${this.objectName2}?uploadId=${this.uploadId2}&partNumber=${i+1}`,formData).subscribe((data:any)=>{ - let msg = { - "partNumber":data.partNumber || null, - "eTag": data.eTag || null} - resolve(msg) // 调用 promise 内置方法处理成功 - }) - }); - this.PartNumberETag2.push(result) - if (this.PartNumberETag2.length === allSlice) { - this.endUploading2(e,_result,reject,filesnum,selectedDataBank2) - } - }//for循环 - } - - //完成分块上传 - endUploading2 (e,result,reject,filesnum,selectedDataBank2) { - let data = this.PartNumberETag2 - let paramsData = {uploadId:this.uploadId2} - - this.http.post(`/api/CompleteMultipartUpload/drives/${this.objectName2}`,data,{params:paramsData}).subscribe(data=>{ - - this.filesTag2.push("data") - this.zone.run(() => { - 　　setTimeout(() => this.uploadProgress2 = this.filesTag2.length + "/" + filesnum, 0); - }); - - result("成功了") - this.child.endUpload(e) //子组件 当前文件上传成功 - - if(this.filesTag2.length == filesnum){ - - this.uploadProgress2 = filesnum + "/" + filesnum - this.uploadisLoading2 = false - - this.filesTag2 = [] //清空计数文件夹 - this.child.delete() //清空上传文件夹子组件数据 - this.getALLFileList(selectedDataBank2) - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('文件夹全部上传完毕','确定',config) - - } - - this.PartNumberETag2 =[] //清空保存返回的信息 - }) - } - - //取消分块上传 - cancel2 () { - this.http.delete(`/api/MultipartUpload/drives/${this.objectName2}?uploadId=${this.uploadId2}`).subscribe(data=>{ - this.uploadisLoading2= false - this.fileArr = {} - this.PartNumberETag2 =[] //清空保存返回的信息 - this.filesTag2 = [] //清空计数文件夹 - this.child.delete() //清空上传文件夹子组件数据 - this.getALLFileList(this.selectedDataBank) - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('取消上传成功!','确定',config); - }) - } - - //新建文件夹 - createFolder(){ - const dialogRef = this.dialog.open(FolderDialog); - dialogRef.afterClosed().subscribe((data)=>{ - if(data){ - //创建空文件夹 - this.http.post(`/api/Objects/drives/allFiles/${this.selectedDataBank}/${data.name}/`,{}).subscribe(data=>{ - this.getALLFileList(this.selectedDataBank) - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('新建文件夹成功','确定',config) - }) - } - }); - } - - //返回顶级目录 - backToTop () { - if (this.selectedDataBank.includes('/')) { - let arr = this.selectedDataBank.split('/') - this.selectedDataBank = arr[0] - this.getALLFileList(arr[0]) - } else { - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('目前已是一级目录','确定',config) - } - } - - //上传文件 - objectName:any //上传对象名 - uploadisLoading:boolean = false //上传进度条显示 - uploadProgress:any = 0 - uploadId:any; //上传分块上传事件编号 - startUploading () { - let file = this.file || null //获取上传的文件 - let fileSize = file.size || null //上传文件的总大小 - let shardSize = 5 * 1024 * 1024 //5MB一个分片 - - if (file && fileSize<=shardSize) { //上传文件<=5MB时 - let formData = new FormData() - formData.append("file",file) - this.http.post(`/api/Objects/drives/allFiles/${this.selectedDataBank}`,formData).subscribe((data:any)=>{ - this.objectName = data.objectName - this.getALLFileList(this.selectedDataBank) - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('上传成功','确定',config) - }) - } else if (file && fileSize>shardSize) { //上传文件>5MB时,分块上传 - let data = {fileName: file.name} - this.uploadisLoading = true - this.http.post(`/api/NewMultipartUpload/drives/allFiles/${this.selectedDataBank}`,{},{params:data}).subscribe((data:any)=>{ //初始化分段上传 - this.objectName = data.objectName - this.uploadId = data.uploadId - this.subsectionUploading() - }) - } - - } - - PartNumberETag:any=[]; //每次返回需要保存的信息 - //开始分段上传 - async subsectionUploading () { - let file = this.file || null //获取上传的文件 - let fileSize = file.size || null //上传文件的总大小 - let shardSize = 5 * 1024 * 1024 //5MB一个分片 - let allSlice = Math.ceil(fileSize / shardSize) //总文件/5MB===共分多少段 - - for (let i = 0;i < allSlice;i++) { //循环分段上传 - let start = i * shardSize //切割文件开始位置 - let end = Math.min(fileSize, start + shardSize); //切割文件结束位置 - let formData = new FormData() - formData.append("file",file.slice(start, end)) - - //同步写法实现异步调用 - let result = await new Promise((resolve, reject) => { - // await 需要后面返回一个 promise 对象 - this.http.post(`/api/MultipartUpload/drives/${this.objectName}?uploadId=${this.uploadId}&partNumber=${i+1}`,formData).subscribe((data:any)=>{ - let msg = { - "partNumber":data.partNumber || null, - "eTag": data.eTag || null} - resolve(msg) // 调用 promise 内置方法处理成功 - // console.log(2) - }) - }); - this.PartNumberETag.push(result) - this.uploadProgress = Number((i/allSlice).toFixed(2))*100 - - if (this.PartNumberETag.length === allSlice) { - this.uploadProgress = 100 - this.endUploading()} - }//for循环 - - } - - //完成分块上传 - endUploading () { - let data = this.PartNumberETag; - let paramsData = {uploadId:this.uploadId}; - this.http.post(`/api/CompleteMultipartUpload/drives/${this.objectName}`,data,{params:paramsData}).subscribe(data=>{ - // console.log(3) - this.getALLFileList(this.selectedDataBank); - this.uploadProgress = 0; - this.uploadisLoading = false; - this.PartNumberETag =[]; //清空保存返回的信息 - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000; - this.snackBar.open('上传成功','确定',config); - }) - } - - //取消分块上传 - cancel () { - this.http.delete(`/api/MultipartUpload/drives/${this.objectName}?uploadId=${this.uploadId}`).subscribe(data=>{ - this.uploadProgress = 0; - this.uploadisLoading = false; - this.PartNumberETag = []; //清空保存返回的信息 - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000; - this.snackBar.open('取消上传成功!','确定',config); - }) - } - - isTrueDelete:any = ['基础知识','装备','技战术','消防设施','资料库']; //匹配内置一级目录 是否被选择删除 - // 删除文件 - deleteFiles(){ - if (this.selection.selected.length != 0) { - let isDelete = confirm('您确定要删除选中文件吗') - let arr = [] - if (isDelete) { - let arrList = [] //匹配到 禁止删除的 目录 - this.selection.selected.forEach((element)=>{ - let data = element.key.split("/"); - - this.isTrueDelete.forEach(elements => { - if (elements==data[data.length-2] && data.length-2==2 && !data[data.length-1]) { - arrList.push('true') - } - }); - }) - if (arrList.length) { - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('内置文件夹不允许删除','确定',config); - } else { - this.selection.selected.forEach( async (element,index) => { - - let result = await new Promise((result,reject)=>{ - if(element.isDir){ //如果是文件夹 - let paramsdata:any = { - prefix : element.key, - recursive : true - } - this.http.delete(`/api/Objects/drives`,{ - params:paramsdata - }).subscribe(data=>{ - arr.push("删除成功了") - if (arr.length == this.selection.selected.length) { - this.getALLFileList(this.selectedDataBank) - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('删除文件成功','确定',config); - this.selection.clear() - this.isDelete = false - } - result(data) - }) - }else{ - this.http.delete(`/api/Objects/drives/${element.key}`).subscribe(data=>{ - arr.push("删除成功了") - if (arr.length == this.selection.selected.length) { - this.getALLFileList(this.selectedDataBank) - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('删除文件成功','确定',config); - this.selection.clear() - this.isDelete = false - } - result(data) - }) - } - - }) - - }); - - } // if arrList - - } - } else { - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('请选择要删除的文件','确定',config); - } - } - - - // deleteFiles(){ - // if (this.selection.selected.length == 1) { - // let isDelete = confirm('您确定要删除吗') - // let arr = [] - // if (isDelete) { - // let item = this.selection.selected[0] - // if(item.isDir){//如果是文件夹 - // let paramsdata:any = { - // prefix : item.key, - // recursive : true - // } - // this.http.delete(`/api/Objects/drives`,{ - // params:paramsdata - // }).subscribe(data=>{ - // this.getALLFileList(this.selectedDataBank) - // const config = new MatSnackBarConfig(); - // config.verticalPosition = 'top'; - // config.duration = 3000 - // this.snackBar.open('删除文件夹成功','确定',config); - // this.selection.clear() - // this.isDelete = false - // }) - // } - // else{ - // this.http.delete(`/api/Objects/drives/${item.key}`).subscribe(data=>{ - // this.getALLFileList(this.selectedDataBank) - // const config = new MatSnackBarConfig(); - // config.verticalPosition = 'top'; - // config.duration = 3000 - // this.snackBar.open('删除文件成功','确定',config); - // this.selection.clear() - // this.isDelete = false - // }) - // } - // } - // } - // if (this.selection.selected.length == 0) { - // const config = new MatSnackBarConfig(); - // config.verticalPosition = 'top'; - // config.duration = 3000 - // this.snackBar.open('请选择要删除的文件','确定',config); - // } - // if (this.selection.selected.length > 1) { - // const config = new MatSnackBarConfig(); - // config.verticalPosition = 'top'; - // config.duration = 3000 - // this.snackBar.open('暂不支持批量删除','确定',config); - // } - // } - - //下载↓ - selectDownloadFile:any; //选择下载的文件 - download:any; //下载文件元数据 - downloadisLoading:boolean = false; //进度条loading加载 - downloadProgress:number = 0; //进度条进度 - downLoadFile(){ - if (this.selection.selected.length === 1) { - this.selectDownloadFile = this.selection.selected[0] - if(this.selectDownloadFile.isDir){ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('文件夹不支持下载','确定',config) - }else{ - this.http.get('/api/ObjectMetadata/drives/' + this.selectDownloadFile.key).subscribe(data=>{ - // console.log(123,data) - this.download = data - this.downloadFile.download(this.download) - }) - } - - } else if (this.selection.selected.length>1) { - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('暂时不支持批量下载','确定',config) - } else if (this.selection.selected.length == 0) { - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('请选择要下载的文件','确定',config) - } - - } -} - - -//查看图片大图和视频 -@Component({ - selector: 'viewdetails', - templateUrl: './viewdetails.html', - styleUrls: ['./all-file.component.scss'] -}) -export class ViewDetails { - // myControl = new FormControl(); - //注入MatDialogRef，可以用来关闭对话框 - //要访问对话框组件中的数据，必须使用MAT_DIALOG_DATA注入令牌 - constructor(private http: HttpClient,public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data) {} - Url:string - onNoClick(): void { - this.dialogRef.close(); - } - ngOnInit(): void { - this.Url = "/api/Objects/drives/" + this.data.url - } - closeDialog(){ - this.dialogRef.close(); - } - -} - - - -@Component({ - selector: 'folderdalog', - templateUrl: './folderdalog.html', - styleUrls: ['./all-file.component.scss'] -}) -export class FolderDialog { - - constructor(private http: HttpClient,public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data) {} - - newFolderName:string - - onNoClick(): void { - this.dialogRef.close(); - } - - ngOnInit(): void { - var myDate = new Date(); - var year = myDate.getFullYear(); - var month = myDate.getMonth(); - var day = myDate.getDate(); - var hour = myDate.getHours(); //获取当前小时数(0-23) - var minutes = myDate.getMinutes(); //获取当前分钟数(0-59) - var seconds = myDate.getSeconds(); //获取当前秒数(0-59) - var data = year + '' + month + day + hour + minutes + seconds - this.newFolderName = "新建文件夹_" + data; - } - - onSubmit(value){ - this.dialogRef.close(value); - } - -} \ No newline at end of file diff --git a/src/app/ui/all-file/folderdalog.html b/src/app/ui/all-file/folderdalog.html deleted file mode 100644 index 0716920..0000000 --- a/src/app/ui/all-file/folderdalog.html +++ /dev/null @@ -1,14 +0,0 @@ -
- - - - -
- - -
-
\ No newline at end of file diff --git a/src/app/ui/all-file/viewdetails.html b/src/app/ui/all-file/viewdetails.html deleted file mode 100644 index 5c25b7f..0000000 --- a/src/app/ui/all-file/viewdetails.html +++ /dev/null @@ -1,12 +0,0 @@ -
-
- clear -
-
- - - - - -
-
\ No newline at end of file diff --git a/src/app/ui/collection-tools/collection-tools.component.html b/src/app/ui/collection-tools/collection-tools.component.html index 32493aa..60d854c 100644 --- a/src/app/ui/collection-tools/collection-tools.component.html +++ b/src/app/ui/collection-tools/collection-tools.component.html @@ -4,9 +4,8 @@
{{examMsg.conpanyName}}
- - +
@@ -19,16 +18,19 @@
-
open_with建筑总平面图
-
总平面图
-
+
+ open_with + +
+
{{item.name}}
-
-
-
+
+
+
总平面图
+
{{item.name}}
@@ -41,14 +43,13 @@ keyboard_arrow_up keyboard_arrow_down - +
- - + +
@@ -66,7 +67,7 @@ -
+
keyboard_arrow_up keyboard_arrow_down @@ -101,19 +102,20 @@
+ - + - + {{node.name}} ({{node.children.length}}) - check_circle_outline + visibility - + - - {{node.name}} - - ({{node.children.length}}) - - - - - - - {{node.name}} - - ({{node.children.length}}) - - - - + + + +
+ +
+
-
+
+ + +
\ No newline at end of file diff --git a/src/app/ui/collection-tools/examinationQuestions.ts b/src/app/ui/collection-tools/examinationQuestions.ts index d441b0b..ce064fc 100644 --- a/src/app/ui/collection-tools/examinationQuestions.ts +++ b/src/app/ui/collection-tools/examinationQuestions.ts @@ -1,10 +1,11 @@ -import { Component, OnInit, Inject } from '@angular/core'; +import { Component, OnInit, Inject, ViewChild } from '@angular/core'; import { HttpClient, HttpHeaders } from '@angular/common/http'; import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; import {CanvasShareDataService,DisposalNodeData} from '../../canvas-share-data.service' //引入服务 import { FlatTreeControl } from '@angular/cdk/tree'; import { MatTreeFlatDataSource, MatTreeFlattener } from '@angular/material/tree'; +import { NzFormatBeforeDropEvent, NzFormatEmitEvent,NzTreeComponent } from 'ng-zorro-antd/tree'; @Component({ selector: 'dialog-examination-questions', @@ -15,28 +16,118 @@ export class examinationQuestions { constructor(private http:HttpClient, public dialog: MatDialog, public snackBar: MatSnackBar, public dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data) {} - // tree配置 - private _transformer = (node, level: number) => {//要给渲染节点传那些属性参数 - return { - expandable: !!node.children && node.children.length > 0, - name: node.name || node.Name, - level: level, - id: node.id || node.Id, - children:node.children, - isTemplate:node.isTemplate, - isNewElement:node.isNewElement, - isLook:node.isLook, - isLookPattern:node.isLookPattern || null - }; - } - treeControl = new FlatTreeControl(node => node.level, node => node.expandable); - treeFlattener = new MatTreeFlattener(this._transformer, node => node.level, node => node.expandable, node => node.children); - dataSource = new MatTreeFlatDataSource(this.treeControl, this.treeFlattener); - hasChild = (_: number, node: any) => node.expandable; + @ViewChild('nzTreeComponent', { static: false }) nzTreeComponent!: NzTreeComponent; + + defaultCheckedKeys = []; //指定选中复选框的树节点 key值 + defaultExpandedKeys = []; //展开指定的树节点 key值 + defaultSelectedKeys = []; //指定选中的树节点 key值 + renderData:any ngOnInit(): void { - this.dataSource.data = this.data.treeData - this.treeControl.expandAll() + this.renderData = this.data.treeData + if(JSON.parse(sessionStorage.getItem('tree型数据')) && JSON.parse(sessionStorage.getItem('tree型数据'))[this.data.buildFloorData.floorData.id]){ + // console.log(123,JSON.parse(sessionStorage.getItem('tree型数据'))[this.data.buildFloorData.floorData.id]) + this.defaultCheckedKeys = JSON.parse(sessionStorage.getItem('tree型数据'))[this.data.buildFloorData.floorData.id] + } + this.data.treeData.forEach(element => { + if(element.isTemplate){ + element.isLeaf = false + }else{ + element.isLeaf = true + } + if(element.children && element.children.length != 0){ + element.children.forEach(ele => { + if(ele.isTemplate){ + ele.isLeaf = false + }else{ + ele.isLeaf = true + } + if(ele.children && ele.children.length != 0){ + ele.children.forEach(item => { + if(item.isTemplate){ + item.isLeaf = false + }else{ + item.isLeaf = true + } + + }); + }}) + } + }) + } + nzEvent($event){ + console.log($event) + } + //提交 + submit () { + + let oldTreeData = this.nzTreeComponent.getCheckedNodeList() + + let alltreedata = JSON.parse(sessionStorage.getItem("tree型数据")) + let keyArr = [] + oldTreeData.forEach(element => { + keyArr.push(element.origin.key) + }) + if(alltreedata){ + //如果已经保存过当前楼层则替换 + alltreedata[this.data.buildFloorData.floorData.id] = keyArr + sessionStorage.setItem('tree型数据',JSON.stringify(alltreedata)) + }else{ + alltreedata = {} + alltreedata[this.data.buildFloorData.floorData.id] = keyArr + sessionStorage.setItem('tree型数据',JSON.stringify(alltreedata)) + } + + + let checkList = [] //只存真实素材 + for (const key in this.data.oldRealData.data) { + let element = this.data.oldRealData.data[key] + let isChecked = (this.nzTreeComponent.getTreeNodeByKey(key)).isChecked + isChecked? checkList.push(element) : null + } + //存储真实素材数据 + + let obj = { + name:this.data.buildFloorData.buildingData.name + '-' + this.data.buildFloorData.floorData.name, + key:this.data.buildFloorData.floorData.id, + children:checkList + } + + let data = JSON.parse(sessionStorage.getItem("试卷id")) + + if(data && data.length != 0){ + console.log(1) + let ind = null + data.forEach((item,index) => { + if(item.key == obj.key){ + ind = index + 1 + } + }) + if(ind){ + if(checkList.length != 0){ + data[ind - 1].children = checkList + }else{ + data.splice(ind - 1,1) + } + + }else{ + data.push(obj) + } + sessionStorage.setItem("试卷id",JSON.stringify(data)) + + }else{ + console.log(2) + data = [] + data[0] = obj + sessionStorage.setItem("试卷id",JSON.stringify(data)) + } + + + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('当层消防设施考题设置完成','确定',config); + // this.dialogRef.close() } } @@ -50,44 +141,61 @@ export class uploadQuestions { constructor(private http:HttpClient, public dialog: MatDialog, public snackBar: MatSnackBar, public dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data) {} - // tree配置 - private _transformer = (node, level: number) => {//要给渲染节点传那些属性参数 - return { - expandable: !!node.children && node.children.length > 0, - name: node.name || node.Name, - level: level, - id: node.id || node.Id, - children:node.children, - isTemplate:node.isTemplate, - isNewElement:node.isNewElement, - isLook:node.isLook, - isLookPattern:node.isLookPattern || null - }; - } - treeControl = new FlatTreeControl(node => node.level, node => node.expandable); - treeFlattener = new MatTreeFlattener(this._transformer, node => node.level, node => node.expandable, node => node.children); - dataSource = new MatTreeFlatDataSource(this.treeControl, this.treeFlattener); - hasChild = (_: number, node: any) => node.expandable; - + + defaultCheckedKeys = []; //指定选中复选框的树节点 key值 + defaultExpandedKeys = []; //展开指定的树节点 key值 + defaultSelectedKeys = []; //指定选中的树节点 key值 + renderData:any ngOnInit(): void { - this.dataSource.data = this.data.treeData - this.treeControl.expandAll() + let data = JSON.parse(sessionStorage.getItem("试卷id")) + data.forEach(item => { + item.children.forEach(i => { + i.isLeaf = true + }) + }) + this.renderData = data + } + nzEvent($event){ + console.log($event) } - //上传 submit () { - if (this.data.question.grade && this.data.question.keynote) { - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('上传成功','确定',config); - this.dialogRef.close() - } else { - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('请填写必填项','确定',config); - } + console.log(this.data.question) + } + +} + +@Component({ + selector: 'dialog-disposal-nodes', + templateUrl: './uploadDisposalNodes.html', + styleUrls: ['./collection-tools.component.scss',] +}) +export class uploadDisposalNodes { + + constructor(private http:HttpClient, public dialog: MatDialog, public snackBar: MatSnackBar, public dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data) {} + @ViewChild('nzTreeComponent', { static: false }) nzTreeComponent!: NzTreeComponent; + + ngOnInit(): void { + this.treeData = [...this.data.treeData] + } + treeData:any = []; //tree + + //提交 保存考试节点 + submit () { + let checkList = [] + this.data.oldTreeData.forEach(element => { + let isChecked = (this.nzTreeComponent.getTreeNodeByKey(element.id)).isChecked + isChecked? checkList.push(element) : null + }); + if (checkList.length) { + this.dialogRef.close(checkList); + } else { + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('请选择节点','确定',config); } + } } \ No newline at end of file diff --git a/src/app/ui/collection-tools/panel.scss b/src/app/ui/collection-tools/panel.scss index 2e03c82..245e998 100644 --- a/src/app/ui/collection-tools/panel.scss +++ b/src/app/ui/collection-tools/panel.scss @@ -13,7 +13,7 @@ flex-direction: row; align-items: center; padding: 0 24px; - border-radius: 5px; + // border-radius: 5px; font-family: Roboto, "Helvetica Neue", sans-serif; font-size: 15px; font-weight: 400; diff --git a/src/app/ui/collection-tools/save.ts b/src/app/ui/collection-tools/save.ts index 5dc3b6b..413870a 100644 --- a/src/app/ui/collection-tools/save.ts +++ b/src/app/ui/collection-tools/save.ts @@ -82,7 +82,7 @@ export class saveOneDialog { } }) }) - // console.log(this.nodeItem.id) + } onNoClick(): void { this.dialogRef.close(); @@ -139,15 +139,15 @@ export class saveOneDialog { if(istrue){//如果该处置节点下已有同名数据节点 则只修改 2个接口 new Promise((resolve,reject)=>{ - this.http.put(`/api/DisposalNodes/${value.nodeId}`,putdata).subscribe(data => { + // this.http.put(`/api/DisposalNodes/${value.nodeId}`,putdata).subscribe(data => { resolve("更新处置节点成功,将天气 节点详情等信息保存到点击的节点") - }) + // }) }).then((values)=>{ - this.canvasData.sendMessage('send a message');//发布一条消息 + this.canvasData.sendMessage('send a message');//发布一条消息 // 保存平面图数据到当前节点 let postdata =JSON.parse(JSON.stringify(this.canvasData.selectPanelPoint)) postdata.Data = JSON.stringify(postdata.Data) - this.http.post(`/api/DisposalNodeData`,postdata).subscribe(data => { + this.http.post(`/api/ExamDisposalNodeData`,postdata).subscribe(data => { const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 @@ -164,14 +164,14 @@ export class saveOneDialog { }else{//需要3个接口 new Promise((resolve,reject)=>{ - this.http.put(`/api/DisposalNodes/${value.nodeId}`,putdata).subscribe(data => { + // this.http.put(`/api/DisposalNodes/${value.nodeId}`,putdata).subscribe(data => { resolve("更新处置节点成功,将天气 节点详情等信息保存到点击的节点") - }) + // }) }).then((values)=>{ console.log(values) postdata.level = putdata.level + 1 new Promise((resolve,reject) => { - this.http.post(`/api/DisposalNodes`,postdata).subscribe(data => { + this.http.post(`/api/ExamDisposalNodes`,postdata).subscribe(data => { resolve(data) }) }).then((data:any)=>{ @@ -183,7 +183,7 @@ export class saveOneDialog { disposalNodeId: data.id, planComponentId: sessionStorage.getItem("planId"), } - this.http.post(`/api/DisposalNodeData`,objData).subscribe(data => { + this.http.post(`/api/ExamDisposalNodeData`,objData).subscribe(data => { const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 @@ -255,7 +255,7 @@ export class saveOneDialog { dispositionNodeData.notes = this.canvasData.selectPanelPointBaseData.notes //1.先创建一个处置节点 然后 .then 2.创建数据节点到刚创建的处置节点 3.然后拿着创建好的数据节点的id 将平面图data保存 new Promise((resolve,reject) => { - this.http.post("/api/DisposalNodes",dispositionNodeData).subscribe((data:any) => { + this.http.post("/api/ExamDisposalNodes",dispositionNodeData).subscribe((data:any) => { resolve(data.id) }) }).then((id) => { @@ -264,7 +264,7 @@ export class saveOneDialog { new Promise((resolve,reject) => { postdata.parentId = id postdata.level = dispositionNodeData.level + 1 - this.http.post("/api/DisposalNodes",postdata).subscribe((data:any) => { + this.http.post("/api/ExamDisposalNodes",postdata).subscribe((data:any) => { resolve(data) }) }).then((data:any) => { @@ -280,7 +280,7 @@ export class saveOneDialog { planComponentId: sessionStorage.getItem("planId"), } - this.http.post(`/api/DisposalNodeData`,objData).subscribe(data => { + this.http.post(`/api/ExamDisposalNodeData`,objData).subscribe(data => { const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 diff --git a/src/app/ui/collection-tools/uploadDisposalNodes.html b/src/app/ui/collection-tools/uploadDisposalNodes.html new file mode 100644 index 0000000..f20c4e1 --- /dev/null +++ b/src/app/ui/collection-tools/uploadDisposalNodes.html @@ -0,0 +1,14 @@ +
+
+ + +
+ +
+ +
+
+ + +
+
\ No newline at end of file diff --git a/src/app/ui/collection-tools/uploadQuestions.html b/src/app/ui/collection-tools/uploadQuestions.html index 6e0988b..a8d57c7 100644 --- a/src/app/ui/collection-tools/uploadQuestions.html +++ b/src/app/ui/collection-tools/uploadQuestions.html @@ -1,41 +1,30 @@ -
+
上传
-
设置分数
-
- -
考试要点
考核消防设施
-
+
- - - - - - {{node.name}} - - ({{node.children.length}}) - - - - - - - {{node.name}} - - ({{node.children.length}}) - - - - + + + +
+ +
+
diff --git a/src/app/ui/create-exam/create-exam.component.html b/src/app/ui/create-exam/create-exam.component.html deleted file mode 100644 index a1b23b5..0000000 --- a/src/app/ui/create-exam/create-exam.component.html +++ /dev/null @@ -1,54 +0,0 @@ -
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
试卷名称{{element.name}}考核中队{{element.organization}}开考时间{{element.startTime}}结束时间{{element.overTime}}考试状态 - - {{element.testState | testState}} - - 操作 - 编辑 - 详情 - 删除 -
- -
-
\ No newline at end of file diff --git a/src/app/ui/create-exam/create-exam.component.scss b/src/app/ui/create-exam/create-exam.component.scss deleted file mode 100644 index 41f3368..0000000 --- a/src/app/ui/create-exam/create-exam.component.scss +++ /dev/null @@ -1,52 +0,0 @@ -.box{ - width:100%; - height: 100%; - margin: 0 auto; - .createBtn{ - height: 60px; - line-height: 60px; - margin-bottom: 6px; - margin-left: 20px; - } - .tablebox{ - table{ - width: 100%; - } - - } -} -.mat-header-cell{ - text-align: center; -} -.mat-cell{ - text-align: center; - span{ - color: #0000BF; - margin: 0 3px; - cursor: pointer; - } - span:hover{ - text-decoration:underline - } - .grey{ - color: grey; - pointer-events: none; - } - .green{ - color: #70b603; - } - .red{ - color: #d9001b; - } -} - -.dialog{ - .title{ - h1{ - font-size: 25px; - font-weight: 900; - text-align: center; - } - - } -} \ No newline at end of file diff --git a/src/app/ui/create-exam/create-exam.component.spec.ts b/src/app/ui/create-exam/create-exam.component.spec.ts deleted file mode 100644 index ee0505e..0000000 --- a/src/app/ui/create-exam/create-exam.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { CreateExamComponent } from './create-exam.component'; - -describe('CreateExamComponent', () => { - let component: CreateExamComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ CreateExamComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(CreateExamComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/ui/create-exam/create-exam.component.ts b/src/app/ui/create-exam/create-exam.component.ts deleted file mode 100644 index 388b4d2..0000000 --- a/src/app/ui/create-exam/create-exam.component.ts +++ /dev/null @@ -1,76 +0,0 @@ -import { Component, OnInit,Inject } from '@angular/core'; -import {MatDialog, MatDialogRef, MAT_DIALOG_DATA} from '@angular/material/dialog'; -import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; -import {FormControl} from '@angular/forms'; -const ELEMENT_DATA: any[] = [ - {name: "富华酒店", organization: '浦东支队', startTime: "2020-09-19 10:00", overTime: '2020-09-19 12:00',testState:'1'}, - {name: "富华酒店", organization: '浦东支队', startTime: "2020-09-19 10:00", overTime: '2020-09-19 12:00',testState:'1'}, - {name: "富华酒店", organization: '浦东支队', startTime: "2020-09-19 10:00", overTime: '2020-09-19 12:00',testState:'2'}, - {name: "富华酒店", organization: '浦东支队', startTime: "2020-09-19 10:00", overTime: '2020-09-19 12:00',testState:'2'}, - {name: "富华酒店", organization: '浦东支队', startTime: "2020-09-19 10:00", overTime: '2020-09-19 12:00',testState:'2'}, - {name: "富华酒店", organization: '浦东支队', startTime: "2020-09-19 10:00", overTime: '2020-09-19 12:00',testState:'2'}, - {name: "富华酒店", organization: '浦东支队', startTime: "2020-09-19 10:00", overTime: '2020-09-19 12:00',testState:'2'}, - {name: "富华酒店", organization: '浦东支队', startTime: "2020-09-19 10:00", overTime: '2020-09-19 12:00',testState:'3'}, - {name: "富华酒店", organization: '浦东支队', startTime: "2020-09-19 10:00", overTime: '2020-09-19 12:00',testState:'3'}, - {name: "富华酒店", organization: '浦东支队', startTime: "2020-09-19 10:00", overTime: '2020-09-19 12:00',testState:'3'}, -]; -@Component({ - selector: 'app-create-exam', - templateUrl: './create-exam.component.html', - styleUrls: ['./create-exam.component.scss'] -}) -export class CreateExamComponent implements OnInit { - - constructor(public dialog: MatDialog,public snackBar: MatSnackBar) { } - displayedColumns: string[] = ['name', 'organization', 'startTime', 'overTime', 'testState', 'operation']; - dataSource = ELEMENT_DATA; - ngOnInit(): void { - } - //新增考题弹出框 - createTest(){ - const dialogRef = this.dialog.open(CreateDialog, { - data: {} - }); - dialogRef.afterClosed().subscribe( - data=>{ - if(data){ - - } - } - ); - } -} - -// import getISOWeek from 'date-fns/getISOWeek'; -//创建组织 -@Component({ - selector: 'CreateDialog', - templateUrl: './createDialog.html', - styleUrls: ['./create-exam.component.scss'] -}) -export class CreateDialog { - myControl = new FormControl(); - constructor( - public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data, - public snackBar: MatSnackBar) {} - - onNoClick(): void { - this.dialogRef.close(); - } - - onSubmit(value){ - } - date = null; - - onChange(result: Date[]): void { - console.log('onChange: ', result); - } - // getWeek(result: Date[]): void { - // console.log('week: ', result.map(getISOWeek)); - // } -} - - - - diff --git a/src/app/ui/create-exam/createDialog.html b/src/app/ui/create-exam/createDialog.html deleted file mode 100644 index e62e969..0000000 --- a/src/app/ui/create-exam/createDialog.html +++ /dev/null @@ -1,34 +0,0 @@ -
-
-

试卷新增

-
-
- -
- 试卷名称 - -
- - -
- 考核中队 - -
-
- 考试时间 - -
- - -
- - -
- -
-
- diff --git a/src/app/ui/eharts-statistics/eharts-statistics.component.html b/src/app/ui/eharts-statistics/eharts-statistics.component.html deleted file mode 100644 index e2d13d1..0000000 --- a/src/app/ui/eharts-statistics/eharts-statistics.component.html +++ /dev/null @@ -1,40 +0,0 @@ -
- -
-
-
- -
- - -
- - - - -
- - -
-
- -
-
- -
-
- 暂无学习记录～ -
-
diff --git a/src/app/ui/eharts-statistics/eharts-statistics.component.scss b/src/app/ui/eharts-statistics/eharts-statistics.component.scss deleted file mode 100644 index b87f2e0..0000000 --- a/src/app/ui/eharts-statistics/eharts-statistics.component.scss +++ /dev/null @@ -1,50 +0,0 @@ -.content{ - width: 100%; - height: 93%; - display: flex; - flex-direction: column; -} - -.header { - padding: 10px; - box-sizing: border-box; - border-bottom: 1px solid #999; - .queryBox { - box-sizing: border-box; - padding: 5px 15px; - display: flex; - flex-direction: row; - flex-wrap: wrap; - align-items:center; - justify-content:center; - .queryField { - margin: 0 15px; - font-size: 14px; - input { - width: 180px; - height: 22px; - line-height: 22px; - } - } - .btnbox{ - float: right; - } - - } //queryBox -} - -.center { - flex: 1; - box-sizing: border-box; - padding: 10px; -} -.nofiles{ - background: url("../../../assets/images/nofiles.png") no-repeat scroll center 0 transparent; - padding-top: 150px; - width: 488px; - position: absolute; - left: 50%; - top: 50%; - text-align: center; - margin: -96px 0 0 -244px; -} \ No newline at end of file diff --git a/src/app/ui/eharts-statistics/eharts-statistics.component.spec.ts b/src/app/ui/eharts-statistics/eharts-statistics.component.spec.ts deleted file mode 100644 index 31a3d7a..0000000 --- a/src/app/ui/eharts-statistics/eharts-statistics.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { EhartsStatisticsComponent } from './eharts-statistics.component'; - -describe('EhartsStatisticsComponent', () => { - let component: EhartsStatisticsComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ EhartsStatisticsComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(EhartsStatisticsComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/ui/eharts-statistics/eharts-statistics.component.ts b/src/app/ui/eharts-statistics/eharts-statistics.component.ts deleted file mode 100644 index 1c67a6c..0000000 --- a/src/app/ui/eharts-statistics/eharts-statistics.component.ts +++ /dev/null @@ -1,228 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import {DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE} from '@angular/material/core'; -import {MatDatepickerInputEvent} from '@angular/material/datepicker'; -import { HttpClient } from '@angular/common/http'; -import { FormControl } from '@angular/forms'; -import { MatSnackBarConfig, MatSnackBar } from '@angular/material/snack-bar'; -import { ActivatedRoute, Router } from '@angular/router'; -declare var echarts : any; - -@Component({ - selector: 'app-eharts-statistics', - templateUrl: './eharts-statistics.component.html', - styleUrls: ['./eharts-statistics.component.scss'], -}) -export class EhartsStatisticsComponent implements OnInit { - - constructor(private adapter: DateAdapter,private http:HttpClient,public snackBar: MatSnackBar,private route:ActivatedRoute,private router:Router) { } - - ngOnInit(): void { - this.idCard = this.route.snapshot.queryParams.id || '' - this.idName = this.route.snapshot.queryParams.name || '' - this.adapter.setLocale('CH') - this.getList() - } - - ngAfterViewInit(): void { - - } - - startTime:any; //查询开始时间 - endTime:any; //查询结束时间 - oneMonthDate:number = 30*24*60*60*1000; //一个月的时间戳 - - echartsData:any = []; //图表数据 - - idCard:string; //用户身份证 - idName:string; //用户姓名 - - //初始化 + 重置 - getList () { - this.startTime = new FormControl( new Date((new Date(new Date().getTime()-this.oneMonthDate)).toLocaleDateString()) ) - this.endTime = new FormControl( new Date() ) - let msg = { - Name: this.idCard, - // StartTime: new Date(new Date().getTime()-this.oneMonthDate).toLocaleDateString(), - // EndTime: new Date().toLocaleDateString(), - } - this.http.get('/api/StudyRecords/Statistics',{params:msg}).subscribe((data:any)=>{ - this.echartsData = data - if (data.length) { - this.handleData(data) - } else { //数据为空时销毁图表 - let chartHynyxf = echarts.init(document.getElementById('center'), 'skinUpp'); - chartHynyxf.dispose(); - } - }) - } - - //查询 - query () { - let msg = { - Name: this.idCard, - StartTime: this.getTime(this.startTime.value), //开始时间 - EndTime: this.getTime(this.endTime.value), //结束时间 - } - this.http.get('/api/StudyRecords/Statistics',{params:msg}).subscribe((data:any)=>{ - this.echartsData = data - if (data.length) { - this.handleData(data) - } else { //数据为空时销毁图表 - let chartHynyxf = echarts.init(document.getElementById('center'), 'skinUpp'); - chartHynyxf.dispose(); - } - }) - } - - //查询全部详情 - queryAll () { - this.router.navigate(['/home/learningrecorddetails'],{queryParams:{'Catalog': '','id':this.idCard}}); - } - - //返回上一页 - goBack () { - history.go(-1) - } - - //处理时间 传入 new Date()格式 - getTime(date){ - let year = date.getFullYear(); //年 - let month = date.getMonth() + 1; //月 - let day = date.getDate(); //日 - let hour = date.getHours() //时 - let min = date.getMinutes(); //分 - let seconds = date.getSeconds(); //秒 - return year+'-'+month+'-'+ day + " "+ hour +':'+ min +':'+ seconds; - } - - //选择开始时间 - startEvent (e: MatDatepickerInputEvent) { - let nowTime = new Date() - if (nowTime < e.value) { - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('选择时间不能大于现在时间段','确定',config); - this.startTime = new FormControl( new Date(new Date().toLocaleDateString()) ) - } else { - this.startTime = new FormControl(e.value) - } - } - - //选择结束时间 - endEvent (e: MatDatepickerInputEvent) { - let oneDay:number = 86399000; //一天的毫秒数 - let selectDay = (e.value).toLocaleDateString() //选择的年月日 - let newDay = (new Date()).toLocaleDateString() //现在的年月日 - let nowTime = new Date() //现在的时间 - - if (nowTime < e.value && selectDay!=newDay) { //选择时间段大于现在时间段时 - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('选择时间不能大于现在时间段','确定',config); - this.endTime = new FormControl( new Date() ) - } else if (nowTime > e.value && selectDay!=newDay) { //正常情况下 时间+1天 - this.endTime = new FormControl( new Date(e.value.getTime()+oneDay) ) - } else if ( selectDay == newDay ) { //选择时间段是今天时 - this.endTime = new FormControl( new Date() ) - } - } - - //处理图表数据 - handleData (data) { - let postNames = [] //y轴坐标 - let catalogs = [] //学习目标 - let counts = [] //统计次数 - let newData = data.sort( function (a,b) { - return b.count - a.count - } ) - newData.forEach(element => { - postNames.push(element.postName ? element.postName : '暂无数据') - catalogs.push(element.catalog ? element.catalog : '暂无数据') - counts.push(element.count ? element.count : 0) - }); - this.echartsInit(postNames,catalogs,counts) - } - - //图表初始化 - echartsInit (postNames,catalogs,counts) { - let that = this - let chartHynyxf = echarts.init(document.getElementById('center'), 'skinUpp'); - let option = { - title: { - text: that.idName, - left:45, - top:20 - }, - tooltip: { - trigger: 'axis', - axisPointer: {type: 'shadow'} - }, - grid: { - left: '3%', - right: '4%', - bottom: '3%', - containLabel: true - }, - xAxis: { - show: false, - type: 'value', - boundaryGap: [0, 0.01] - }, - yAxis: { - inverse: true, - "axisLine":{ //y轴 - "show":false - }, - "axisTick":{ //y轴刻度线 - "show":false, - }, - "splitLine": { //网格线 - "show": false - }, - type: 'category', - data: postNames, - max: 15 - }, - series: [ - { - type: 'bar', - data: counts, - barMinWidth: 10, // 最小宽度 - barMaxWidth: 30, // 最大宽度 - barCategoryGap: 5, - itemStyle:{ - normal:{ - color:'#40B4E8', - barBorderRadius:[10, 10, 10, 10], - label: { - formatter: function (e) { - return `${catalogs[e.dataIndex]}`+` (统计次数: ${e.value})` - }, - show: true, - position: 'insideLeft', - textStyle: { color: '#555'}, - fontSize: 14, - fontWeight: 550 - }, - }, - } //itemStyle - }, - - ] //series - - }; - - chartHynyxf.setOption(option); - - //柱状图点击事件 - chartHynyxf.on('click', function(e) { - that.router.navigate(['/home/learningrecorddetails'],{queryParams:{'Catalog':catalogs[e.dataIndex],'id':that.idCard,'PostName':e.name}}); - }); - - } - - - -} diff --git a/src/app/ui/join-exam/join-exam.component.html b/src/app/ui/join-exam/join-exam.component.html deleted file mode 100644 index cea0332..0000000 --- a/src/app/ui/join-exam/join-exam.component.html +++ /dev/null @@ -1 +0,0 @@ -

参加考试!

diff --git a/src/app/ui/join-exam/join-exam.component.scss b/src/app/ui/join-exam/join-exam.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/ui/join-exam/join-exam.component.spec.ts b/src/app/ui/join-exam/join-exam.component.spec.ts deleted file mode 100644 index 2251bd3..0000000 --- a/src/app/ui/join-exam/join-exam.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { JoinExamComponent } from './join-exam.component'; - -describe('JoinExamComponent', () => { - let component: JoinExamComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ JoinExamComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(JoinExamComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/ui/join-exam/join-exam.component.ts b/src/app/ui/join-exam/join-exam.component.ts deleted file mode 100644 index c810b48..0000000 --- a/src/app/ui/join-exam/join-exam.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-join-exam', - templateUrl: './join-exam.component.html', - styleUrls: ['./join-exam.component.scss'] -}) -export class JoinExamComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/src/app/ui/learning-record-details/learning-record-details.component.html b/src/app/ui/learning-record-details/learning-record-details.component.html deleted file mode 100644 index a45b7b6..0000000 --- a/src/app/ui/learning-record-details/learning-record-details.component.html +++ /dev/null @@ -1,49 +0,0 @@ - -
-
-
- -
-
- -
-
- - -
-
- -
-
    -
  • -

    {{item.time}}

    - - {{item.time2}} - {{item.operation}} : {{item.target | name3}} - - -
    • -
- - -
-
- 该时间段未查询到学习记录～ -
-
diff --git a/src/app/ui/learning-record-details/learning-record-details.component.scss b/src/app/ui/learning-record-details/learning-record-details.component.scss deleted file mode 100644 index e2cb681..0000000 --- a/src/app/ui/learning-record-details/learning-record-details.component.scss +++ /dev/null @@ -1,57 +0,0 @@ -.topbox{ - display: flex; - width: 100%; - height:7%; - line-height: 66px; - // border-bottom: 1px solid gray; - justify-content: space-around; - .datasearch{ - display: flex; - div{ - margin: 0 10px; - span{ - margin-right: 5px; - } - mat-form-field{ - input{ - padding-left: 3px; - } - } - - } - } - .btnbox{ - button{ - margin: 0 10px; - } - } -} -.listbox{ - margin-top: 18px; - margin-left: 26%; - height: 84%; - overflow-y: auto; - .timeTitle{ - font-weight: 800; - font-size: 18px; - } - .listitem{ - margin-left: 80px; - font-size: 16px; - line-height: 30px; - } -} -.mat-paginator { - background-color: hsla(0,0%,100%,0); - padding-right: 10%; -} -.nofiles{ - background: url("../../../assets/images/nofiles.png") no-repeat scroll center 0 transparent; - padding-top: 150px; - width: 488px; - position: absolute; - left: 50%; - top: 50%; - text-align: center; - margin: -88px 0 0 -244px; -} \ No newline at end of file diff --git a/src/app/ui/learning-record-details/learning-record-details.component.ts b/src/app/ui/learning-record-details/learning-record-details.component.ts deleted file mode 100644 index f7673c6..0000000 --- a/src/app/ui/learning-record-details/learning-record-details.component.ts +++ /dev/null @@ -1,188 +0,0 @@ -import { Component, OnInit ,ViewChild} from '@angular/core'; -import {DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE} from '@angular/material/core'; -import {MatDatepicker} from '@angular/material/datepicker'; -import {FormControl} from '@angular/forms'; -import {HttpClient} from '@angular/common/http'; -import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; -import { MatPaginator } from '@angular/material/paginator'; -import { PageEvent } from '@angular/material/paginator'; -import { Router,ActivatedRoute } from '@angular/router' -@Component({ - selector: 'app-learning-record-details', - templateUrl: './learning-record-details.component.html', - styleUrls: ['./learning-record-details.component.scss'] -}) -export class LearningRecordDetailsComponent implements OnInit { - startdate:any //开始时间 - enddate:any //结束时间 - constructor(private adapter: DateAdapter,private http:HttpClient,public snackBar: MatSnackBar,private router:Router,private route:ActivatedRoute) { } - - lastdate:any //上个月日期 - - startTime:any //开始时间查询条件 - endTime:any //结束时间查询条件 - - Catalog:any = this.route.snapshot.queryParams.Catalog || "" //目录 - - PageNumber:any = 1//当前页数 - id:any = this.route.snapshot.queryParams.id//身份证 - PostName:any = this.route.snapshot.queryParams.PostName || "" //传过来的职务名称 - - recordList:any = false//渲染的100条列表 - oneMonthDate:number = 30*24*60*60*1000; //一个月的时间戳 - - - noRecord:boolean - //分页 - @ViewChild(MatPaginator, {static: true}) - pageEvent: PageEvent; - paginator: MatPaginator; - length:any; //共多少条数据 - pageSize:any; //每页条数 - // pageSizeOptions: number[] = [10] //设置每页条数 - pageNumber:number = 1; //第几页 - - ngOnInit(): void { - this.adapter.setLocale('CH'); - - let nowdate = new Date().toLocaleDateString() //本月日期 2020/07/11 形式 - this.lastdate = new Date(new Date().getTime()-this.oneMonthDate).toLocaleDateString() //上个月日期 2020/06/11 形式 - - this.startdate = new FormControl(new Date(this.lastdate)); //日历开始时间显示 - this.enddate = new FormControl(new Date()); //日历结束时间显示 - - this.startTime = this.getTIme(new Date(this.lastdate)) - this.endTime = this.getTIme(new Date()) - - this.getAllStudyRecords() - } - - - //分页切换 - chagePage (e) { - this.pageNumber = e.pageIndex+1 - let date:any = new Date() - let data = { - Name : this.id, - StartTime : this.startTime, - EndTime : this.endTime, - Catalog : this.Catalog, - PageNumber : String(this.pageNumber), - PageSize:"100", - PostName : this.PostName - } - this.http.get("/api/StudyRecords",{params:data}).subscribe((data:any) => { - this.recordList = data.items - if(data.items.length == 0){ - this.noRecord = true - }else{ - this.noRecord = false - } - this.recordList.forEach((item) => { - item.time = item.creationTime.substring(0,10) - item.time2 = item.creationTime.substring(11,16) - }) - this.length = data.totalCount - this.pageSize = data.pageSize - }) - } - - //传入 new Date()格式 将日期变为 年月日时分秒 - getTIme(date){ - let year = date.getFullYear(); //年 - let month = date.getMonth() + 1; //月 - let day = date.getDate(); //日 - let hour = date.getHours() //时 - let min = date.getMinutes(); //分 - let seconds = date.getSeconds(); //秒 - return year+'-'+month+'-'+ day + " "+ hour +':'+ min +':'+ seconds; - } - - //初始获得所有学习记录 - getAllStudyRecords(){ - let date:any = new Date() - let data = { - Name : this.id, - Catalog : this.Catalog || "", - PageNumber : this.PageNumber, - PageSize:"100", - PostName:this.PostName - } - this.http.get("/api/StudyRecords",{params:data}).subscribe((data:any) => { - this.recordList = data.items - if(data.items.length == 0){ - this.noRecord = true - }else{ - this.noRecord = false - } - this.recordList.forEach((item) => { - item.time = item.creationTime.substring(0,10) - item.time2 = item.creationTime.substring(11,16) - }) - this.length = data.totalCount - this.pageSize = data.pageSize - this.pageEvent.pageIndex = 0 - }) - } - - //返回上一页 - backtop(){ - history.go(-1) - } - //带查询时间获得所有学习记录 - getAllStudyRecords2(){ - let date:any = new Date() - let data = { - Name : this.id, - StartTime : this.startTime, - EndTime : this.endTime, - Catalog : this.Catalog || "", - PageNumber : this.PageNumber, - PageSize:"100", - PostName:this.PostName - } - this.http.get("/api/StudyRecords",{params:data}).subscribe((data:any) => { - this.recordList = data.items - if(data.items.length == 0){ - this.noRecord = true - }else{ - this.noRecord = false - } - this.recordList.forEach((item) => { - item.time = item.creationTime.substring(0,10) - item.time2 = item.creationTime.substring(11,16) - }) - this.length = data.totalCount - this.pageSize = data.pageSize - this.pageEvent.pageIndex = 0 - }) - } - - // - //查询 - onSubmit(){ - if(this.startdate.value > this.enddate.value){ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('起始时间大于结束时间','确定',config); - } - if(this.enddate.value.toLocaleDateString() == new Date().toLocaleDateString() || this.enddate.value > new Date()){ - this.enddate.value = new Date() - } - if(this.enddate.value < new Date() && this.enddate.value.toLocaleDateString() != new Date().toLocaleDateString()){ - this.enddate.value = new Date(this.enddate.value.getTime() + 24*60*60*1000) - } - this.startTime = this.getTIme(this.startdate.value) - this.endTime = this.getTIme(this.enddate.value) - this.getAllStudyRecords2() - } - //重置 - reset(){ - this.startdate = new FormControl(new Date(this.lastdate)); //日历开始时间显示 - this.enddate = new FormControl(new Date()); //日历结束时间显示 - this.startTime = this.getTIme(this.startdate.value) - this.endTime = this.getTIme(this.enddate.value) - this.getAllStudyRecords() - } -} diff --git a/src/app/ui/look-over-test/look-over-test.component.html b/src/app/ui/look-over-test/look-over-test.component.html deleted file mode 100644 index 005547d..0000000 --- a/src/app/ui/look-over-test/look-over-test.component.html +++ /dev/null @@ -1 +0,0 @@ -

阅卷

diff --git a/src/app/ui/look-over-test/look-over-test.component.scss b/src/app/ui/look-over-test/look-over-test.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/ui/look-over-test/look-over-test.component.spec.ts b/src/app/ui/look-over-test/look-over-test.component.spec.ts deleted file mode 100644 index 4f8e6f1..0000000 --- a/src/app/ui/look-over-test/look-over-test.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { LookOverTestComponent } from './look-over-test.component'; - -describe('LookOverTestComponent', () => { - let component: LookOverTestComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ LookOverTestComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(LookOverTestComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/ui/look-over-test/look-over-test.component.ts b/src/app/ui/look-over-test/look-over-test.component.ts deleted file mode 100644 index c8f533d..0000000 --- a/src/app/ui/look-over-test/look-over-test.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-look-over-test', - templateUrl: './look-over-test.component.html', - styleUrls: ['./look-over-test.component.scss'] -}) -export class LookOverTestComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/src/app/ui/statistic-analysis/statistic-analysis.component.html b/src/app/ui/statistic-analysis/statistic-analysis.component.html deleted file mode 100644 index a7d82c5..0000000 --- a/src/app/ui/statistic-analysis/statistic-analysis.component.html +++ /dev/null @@ -1 +0,0 @@ -

统计分析

diff --git a/src/app/ui/statistic-analysis/statistic-analysis.component.scss b/src/app/ui/statistic-analysis/statistic-analysis.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/ui/statistic-analysis/statistic-analysis.component.spec.ts b/src/app/ui/statistic-analysis/statistic-analysis.component.spec.ts deleted file mode 100644 index d6c86c5..0000000 --- a/src/app/ui/statistic-analysis/statistic-analysis.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { StatisticAnalysisComponent } from './statistic-analysis.component'; - -describe('StatisticAnalysisComponent', () => { - let component: StatisticAnalysisComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ StatisticAnalysisComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(StatisticAnalysisComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/ui/statistic-analysis/statistic-analysis.component.ts b/src/app/ui/statistic-analysis/statistic-analysis.component.ts deleted file mode 100644 index c17eb42..0000000 --- a/src/app/ui/statistic-analysis/statistic-analysis.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-statistic-analysis', - templateUrl: './statistic-analysis.component.html', - styleUrls: ['./statistic-analysis.component.scss'] -}) -export class StatisticAnalysisComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/src/app/ui/test-records/test-records.component.html b/src/app/ui/test-records/test-records.component.html deleted file mode 100644 index 3d127cf..0000000 --- a/src/app/ui/test-records/test-records.component.html +++ /dev/null @@ -1 +0,0 @@ -

考试记录!

diff --git a/src/app/ui/test-records/test-records.component.scss b/src/app/ui/test-records/test-records.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/ui/test-records/test-records.component.spec.ts b/src/app/ui/test-records/test-records.component.spec.ts deleted file mode 100644 index 9402a33..0000000 --- a/src/app/ui/test-records/test-records.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { TestRecordsComponent } from './test-records.component'; - -describe('TestRecordsComponent', () => { - let component: TestRecordsComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ TestRecordsComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(TestRecordsComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/ui/test-records/test-records.component.ts b/src/app/ui/test-records/test-records.component.ts deleted file mode 100644 index 42d5a50..0000000 --- a/src/app/ui/test-records/test-records.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-test-records', - templateUrl: './test-records.component.html', - styleUrls: ['./test-records.component.scss'] -}) -export class TestRecordsComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/src/app/ui/ui-routing.module.ts b/src/app/ui/ui-routing.module.ts index 003f889..d2cefd8 100644 --- a/src/app/ui/ui-routing.module.ts +++ b/src/app/ui/ui-routing.module.ts @@ -1,25 +1,11 @@ import { Routes, RouterModule } from '@angular/router'; import { NgModule } from '@angular/core'; -import { AllFileComponent } from './all-file/all-file.component'; -import { EnterpriseuserComponent } from './enterpriseuser/enterpriseuser.component'; import { TeacherManagementComponent } from './teacherManagement/enterpriseuser.component'; -import {EhartsStatisticsComponent} from './eharts-statistics/eharts-statistics.component' -import { LearningRecordDetailsComponent } from './learning-record-details/learning-record-details.component'; -import { CreateExamComponent } from './create-exam/create-exam.component'; -import { LookOverTestComponent } from './look-over-test/look-over-test.component'; -import { StatisticAnalysisComponent } from './statistic-analysis/statistic-analysis.component'; -import { JoinExamComponent } from './join-exam/join-exam.component'; -import { TestRecordsComponent } from './test-records/test-records.component'; +import { EnterpriseuserComponent } from './enterpriseuser/enterpriseuser.component'; const routes: Routes = [ - { path: '', component:CreateExamComponent }, - { path: 'createexam', component:CreateExamComponent }, - { path: 'looktest', component:LookOverTestComponent }, - { path: 'statisticAnalysis', component:StatisticAnalysisComponent }, - { path: 'joinExam', component:JoinExamComponent }, - { path: 'testRecords', component:TestRecordsComponent }, - { path: 'teachear', component:TeacherManagementComponent }, //管理员 教员页面 - { path: 'examinee', component:EnterpriseuserComponent }, //管理员 考生页面 + { path: 'teachear', component:TeacherManagementComponent }, //管理员 教员页面 + { path: 'examinee', component:EnterpriseuserComponent }, //管理员 考生页面 ] @NgModule({ imports: [RouterModule.forChild(routes)], diff --git a/src/app/ui/ui.module.ts b/src/app/ui/ui.module.ts index c2d4739..e2a3352 100644 --- a/src/app/ui/ui.module.ts +++ b/src/app/ui/ui.module.ts @@ -45,35 +45,25 @@ import { ReactiveFormsModule, FormsModule } from '@angular/forms'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatPaginatorIntl } from '@angular/material/paginator'; import { ChangepasswordComponent } from './changepassword/changepassword.component'; -import { SizePipe , NamePipe,NamePipe2, NamePipe3, testState} from '../pipes/size.pipe'; +import { testState} from '../pipes/size.pipe'; import {ConfirmpswDirective} from './changepassword/equal-validator.directive'; import { FileUploadModule } from 'ng2-file-upload' -import { AllFileComponent, ViewDetails, FolderDialog } from './all-file/all-file.component'; import { ChangeuserdataComponent } from './changeuserdata/changeuserdata.component'; import { IsLoginService } from '../is-login.service'; -import { UploadFilesComponent } from './upload-files/upload-files.component'; -import {AddEnterpriserUser} from './enterpriseuser/addenterpriseuser.component'; -import {EnterpriseuserComponent,editenterpriseuser,seeenterpriseuser} from './enterpriseuser/enterpriseuser.component' import { myPaginator } from "./my-paginator" -import { TeacherManagementComponent, editTeacher, seeTeacher } from './teacherManagement/enterpriseuser.component'; -import { AddTeacher } from './teacherManagement/addenterpriseuser.component'; -import { LearningRecordDetailsComponent } from './learning-record-details/learning-record-details.component'; -import {EhartsStatisticsComponent} from './eharts-statistics/eharts-statistics.component'; -import { CreateExamComponent, CreateDialog } from './create-exam/create-exam.component'; -import { LookOverTestComponent } from './look-over-test/look-over-test.component'; -import { StatisticAnalysisComponent } from './statistic-analysis/statistic-analysis.component'; -import { JoinExamComponent } from './join-exam/join-exam.component'; -import { TestRecordsComponent } from './test-records/test-records.component' import { NzDatePickerModule } from 'ng-zorro-antd/date-picker'; import {CollectionToolsComponent,CreateBuilding,EditBuilding,ViewDetailss,} from './collection-tools/collection-tools.component' import {leftFunctionalDomainComponent,editPlaneFigureComponent,addDisposalNodeComponent,editDisposalNodeComponent} from './collection-tools/leftFunctionalDomain' import {saveOneDialog,saveTwoDialog} from './collection-tools/save' import {WorkingAreaComponent} from '../working-area/working-area.component' import { NzTreeModule } from 'ng-zorro-antd/tree'; -import { examinationQuestions,uploadQuestions } from './collection-tools/examinationQuestions' +import { examinationQuestions,uploadQuestions,uploadDisposalNodes } from './collection-tools/examinationQuestions' +import {AddEnterpriserUser} from './enterpriseuser/addenterpriseuser.component' +import {EnterpriseuserComponent,editenterpriseuser,seeenterpriseuser} from './enterpriseuser/enterpriseuser.component' +import {AddTeacher} from './teacherManagement/addenterpriseuser.component' +import {TeacherManagementComponent,editTeacher,seeTeacher} from './teacherManagement/enterpriseuser.component' @NgModule({ - declarations: [FolderDialog,ViewDetails,ChangepasswordComponent,SizePipe,NamePipe,NamePipe2,NamePipe3,ConfirmpswDirective, AllFileComponent, ChangeuserdataComponent, UploadFilesComponent,AddEnterpriserUser,EnterpriseuserComponent,editenterpriseuser,seeenterpriseuser,TeacherManagementComponent,editTeacher,AddTeacher,seeTeacher, LearningRecordDetailsComponent, EhartsStatisticsComponent, CreateExamComponent, LookOverTestComponent, StatisticAnalysisComponent, JoinExamComponent, TestRecordsComponent,testState,CreateDialog,CollectionToolsComponent,CreateBuilding,EditBuilding,ViewDetailss,leftFunctionalDomainComponent,editPlaneFigureComponent,addDisposalNodeComponent,editDisposalNodeComponent,saveOneDialog,saveTwoDialog,WorkingAreaComponent,examinationQuestions,uploadQuestions], - + 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], imports: [ NzDatePickerModule, CommonModule, @@ -124,9 +114,6 @@ import { examinationQuestions,uploadQuestions } from './collection-tools/examina FileUploadModule, NzTreeModule ], - exports: [ - AllFileComponent - ], providers: [ { provide: MatPaginatorIntl, useValue: myPaginator() } ] }) diff --git a/src/app/ui/upload-files/upload-files.component.html b/src/app/ui/upload-files/upload-files.component.html deleted file mode 100644 index 7d66aa2..0000000 --- a/src/app/ui/upload-files/upload-files.component.html +++ /dev/null @@ -1,23 +0,0 @@ -
-
- - - -
- -
- -

- {{item.name}} - {{item.size | size}} - - - - - - × -

- -
- -
diff --git a/src/app/ui/upload-files/upload-files.component.scss b/src/app/ui/upload-files/upload-files.component.scss deleted file mode 100644 index 72df1fe..0000000 --- a/src/app/ui/upload-files/upload-files.component.scss +++ /dev/null @@ -1,72 +0,0 @@ -.content { - width: 100%; - max-height: 250px; - overflow-y: auto; - overflow-x: hidden; - background-color: #fff; - border: 1px solid #e2e2e2; - box-shadow: 0 0 10px #ccc; - border-radius: 10px; - box-sizing: border-box; - padding: 10px; -} -.header { - box-sizing: border-box; - height: 30px; - line-height: 30px; - button { - height: 30px; - line-height: 30px; - } -} - -//每一行数据 -.dataStyle { - height: 30px; - line-height: 30px; - margin: 5px 0; - box-sizing: border-box; - padding: 0 3px; - span{ - display: inline-block; - font-size: 12px; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - line-height: 30px; - } - .dataName { - width: 40%; - margin-right: 10px; - } - .dataSize { - width: 20%; - } - .dataState { - width: 15%; - } -} -.dataStyle:hover { - background-color: #e2e2e2; -} - - - -//滚动条样式 -.content::-webkit-scrollbar { - /*滚动条整体样式*/ - width : 6px; /*高宽分别对应横竖滚动条的尺寸*/ - height: 1px; -} -.content::-webkit-scrollbar-thumb { - /*滚动条里面小方块*/ - border-radius: 10px; - box-shadow : inset 0 0 5px #999; - background : #535353; -} -.content::-webkit-scrollbar-track { - /*滚动条里面轨道*/ - box-shadow : inset 0 0 5px #999; - border-radius: 10px; - background : #ededed; -} \ No newline at end of file diff --git a/src/app/ui/upload-files/upload-files.component.spec.ts b/src/app/ui/upload-files/upload-files.component.spec.ts deleted file mode 100644 index 0d7bb87..0000000 --- a/src/app/ui/upload-files/upload-files.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { UploadFilesComponent } from './upload-files.component'; - -describe('UploadFilesComponent', () => { - let component: UploadFilesComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ UploadFilesComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(UploadFilesComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/ui/upload-files/upload-files.component.ts b/src/app/ui/upload-files/upload-files.component.ts deleted file mode 100644 index a707dec..0000000 --- a/src/app/ui/upload-files/upload-files.component.ts +++ /dev/null @@ -1,67 +0,0 @@ -import { Component, OnInit,Input } from '@angular/core'; - -@Component({ - selector: 'app-upload-files', - templateUrl: './upload-files.component.html', - styleUrls: ['./upload-files.component.scss'] -}) -export class UploadFilesComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - - } - - @Input( ) thatFile:any //父组件 - - isShow:boolean = true; //弹出框最大/化最小化 - filesData:any = []; //上传文件夹数据 - - //上传文件夹弹窗显隐 - toggle () { - this.isShow = !this.isShow - } - - //处理数据格式 - handleData () { - this.filesData = [] - for (let i=0; i { - if (element.name == e.name) { - element.state = 1 - return - } - }); - } - - //当前上传文件上传成功 - endUpload (e) { - this.filesData.forEach(element => { - if (element.name == e.name) { - element.state = 2 - return - } - }); - } - - //清空数据 - delete () { - this.filesData = [] - } - - //取消上传 - cancel () { - this.thatFile.cancel2() - } - - - -} diff --git a/src/app/working-area/model/wallSpace.ts b/src/app/working-area/model/axArrowConnector.ts similarity index 83% rename from src/app/working-area/model/wallSpace.ts rename to src/app/working-area/model/axArrowConnector.ts index 8cb8f1a..f6e1c17 100644 --- a/src/app/working-area/model/wallSpace.ts +++ b/src/app/working-area/model/axArrowConnector.ts @@ -1,10 +1,11 @@ import { WorkingAreaComponent } from '../working-area.component'; import * as PIXI from 'pixi.js'; +import { AxShape } from './axShape'; /** * 墙面 */ -export class WallSpace extends PIXI.Container { +export class AxArrowConnector extends AxShape { line: PIXI.Graphics; text: PIXI.Text; @@ -26,8 +27,9 @@ export class WallSpace extends PIXI.Container { }); pts: PIXI.Point[]; - constructor(public assetData: any, private workingArea: WorkingAreaComponent) { - super(); + constructor(assetData: any, workingArea: WorkingAreaComponent) { + super(assetData, workingArea); + this.name = assetData.Id; this.text = new PIXI.Text(this.assetData.Name + '\r\n' + this.assetData.PropertyInfos?.find((item: { PropertyName: string; }) => @@ -44,22 +46,26 @@ export class WallSpace extends PIXI.Container { * 刷新形状 */ public refresh(c: PIXI.Graphics, pts: PIXI.Point[]): void { + if (pts.length < 2) { + return; + } + this.text.position = pts[0]; const strokeWidth = 1; const startWidth = 30 + strokeWidth; const endWidth = 30 + strokeWidth; - const edgeWidth = 10; + const edgeWidth = this.assetData.Thickness === 0?10:this.assetData.Thickness; // 宽度 const openEnded = false; - const markerStart = false; - const markerEnd = true; + const markerStart = false;// 起始箭头 + const markerEnd = false;// 结束箭头 const spacing = (openEnded) ? 0 : 0 + strokeWidth / 2; const startSize = 30 + strokeWidth; const endSize = 30 + strokeWidth; const isRounded = true; + const lineColor = 0x000000; + const fillColor: number = this.assetData.Color.substring(0, 7).replace('#', '0x');; - // Base vector (between first points) const pe = pts[pts.length - 1]; - // Finds first non-overlapping point let i0 = 1; while (i0 < pts.length - 1 && pts[i0].x === pts[0].x && pts[i0].y === pts[0].y) { @@ -73,8 +79,6 @@ export class WallSpace extends PIXI.Container { if (dist === 0) { return; } - - // Computes the norm and the inverse norm let nx = dx / dist; let nx1 = nx; let nx2 = nx; @@ -84,7 +88,6 @@ export class WallSpace extends PIXI.Container { let orthx = edgeWidth * ny; let orthy = -edgeWidth * nx; - // Stores the inbound function calls in reverse order in fns const fns = []; // if (isRounded) { @@ -96,9 +99,9 @@ export class WallSpace extends PIXI.Container { // c.lineTextureStyle({ miterLimit: 1.42 }); // } // c.lineStyle(1, 0x000000, 1); - c.lineTextureStyle({ width: 1, color: 0x00000, join: PIXI.LINE_JOIN.ROUND }); - // c.begin(); - c.beginFill(0xffffff); + c.clear(); + c.lineTextureStyle({ width: 1, color: lineColor, join: PIXI.LINE_JOIN.ROUND }); + c.beginFill(fillColor); const startNx = nx; const startNy = ny; @@ -125,7 +128,6 @@ export class WallSpace extends PIXI.Container { let dist1 = 0; for (let i = 0; i < pts.length - 2; i++) { - // Work out in which direction the line is bending const pos = this.relativeCcw(pts[i].x, pts[i].y, pts[i + 1].x, pts[i + 1].y, pts[i + 2].x, pts[i + 2].y); dx1 = pts[i + 2].x - pts[i + 1].x; @@ -140,7 +142,6 @@ export class WallSpace extends PIXI.Container { const tmp1 = nx * nx1 + ny * ny1; const tmp = Math.max(Math.sqrt((tmp1 + 1) / 2), 0.04); - // Work out the normal orthogonal to the line through the control point and the edge sides intersection nx2 = (nx + nx1); ny2 = (ny + ny1); @@ -150,7 +151,6 @@ export class WallSpace extends PIXI.Container { nx2 = nx2 / dist2; ny2 = ny2 / dist2; - // Higher strokewidths require a larger minimum bend, 0.35 covers all but the most extreme cases const strokeWidthFactor = Math.max(tmp, Math.min(1 / 200 + 0.04, 0.35)); const angleFactor = (pos !== 0 && isRounded) ? Math.max(0.1, strokeWidthFactor) : Math.max(tmp, 0.06); @@ -160,8 +160,6 @@ export class WallSpace extends PIXI.Container { const inY = pts[i + 1].y + nx2 * edgeWidth / 2 / angleFactor; if (pos === 0 || !isRounded) { - // If the two segments are aligned, or if we're not drawing curved sections between segments - // just draw straight to the intersection point c.lineTo(outX, outY); ((x, y) => { @@ -250,10 +248,8 @@ export class WallSpace extends PIXI.Container { // c.fillAndStroke(); // } - // Workaround for shadow on top of base arrow // c.setShadow(false); - // Need to redraw the markers without the low miter limit // c.setMiterLimit(4); // if (isRounded) @@ -263,8 +259,6 @@ export class WallSpace extends PIXI.Container { // if (pts.length > 2) // { - // // Only to repaint markers if no waypoints - // // Need to redraw the markers without the low miter limit // c.setMiterLimit(4); // if (markerStart && !openEnded) // { @@ -283,11 +277,6 @@ export class WallSpace extends PIXI.Container { // } // } } - /** - * Function: paintMarker - * - * Paints the marker. - */ paintMarker(c: PIXI.Graphics, ptX: number, ptY: number, nx: number, ny: number, size: number, arrowWidth: number, edgeWidth: number, spacing: number, initialMove: boolean) { const widthArrowRatio = edgeWidth / arrowWidth; @@ -307,21 +296,6 @@ export class WallSpace extends PIXI.Container { c.lineTo(ptX + orthx / widthArrowRatio + spaceX, ptY + orthy / widthArrowRatio + spaceY); c.lineTo(ptX + orthx + spaceX, ptY + orthy + spaceY); } - /** - * Function: relativeCcw - * - * Returns 1 if the given point on the right side of the segment, 0 if its - * on the segment, and -1 if the point is on the left side of the segment. - * - * Parameters: - * - * x1 - X-coordinate of the startpoint of the segment. - * y1 - Y-coordinate of the startpoint of the segment. - * x2 - X-coordinate of the endpoint of the segment. - * y2 - Y-coordinate of the endpoint of the segment. - * px - X-coordinate of the point. - * py - Y-coordinate of the point. - */ relativeCcw(x1: number, y1: number, x2: number, y2: number, px: number, py: number) { x2 -= x1; y2 -= y1; @@ -344,4 +318,8 @@ export class WallSpace extends PIXI.Container { } return (ccw < 0.0) ? -1 : ((ccw > 0.0) ? 1 : 0); } + + redraw(): void{ + this.refresh(this.line, this.assetData.MultiPoint); + } } diff --git a/src/app/working-area/model/axImageShape.ts b/src/app/working-area/model/axImageShape.ts index 99fca6c..e76728e 100644 --- a/src/app/working-area/model/axImageShape.ts +++ b/src/app/working-area/model/axImageShape.ts @@ -1,24 +1,443 @@ +import { WorkingAreaComponent } from '../working-area.component'; +import * as ObjectID from 'bson-objectid'; +import { GameMode } from './gameMode'; +import { Pipeline } from './pipeline'; +import { PaintMode } from './paintModel'; import * as PIXI from 'pixi.js'; - +import { PropertyInfo } from './PropertyInfo'; +import { AxShape } from './axShape'; +import { Sprite } from 'pixi.js'; /** - * 安信形状 + * 安信图片形状 + * AxImageShape */ -export class AxImageShape extends PIXI.Container { +export class AxImageShape extends AxShape { + style = new PIXI.TextStyle({ + fontFamily: 'Arial', + fontSize: 18, + fontStyle: 'normal', + fontWeight: 'bold', + fill: ['#000000'], + stroke: '#ffffff', + strokeThickness: 3, + dropShadow: true, + dropShadowColor: '#000000', + dropShadowBlur: 3, + dropShadowAngle: Math.PI / 6, + dropShadowDistance: 1, + wordWrap: false, + wordWrapWidth: 100, + }); + + text = new PIXI.Text(this.assetData.Name + + '\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; + // 可移动的 - constructor() { - super(); + // 可选中的 - } + // 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; + this.y = this.assetData.Point.y; + this.name = this.assetData.Id; + this.image = PIXI.Sprite.from(this.assetData.ImageUrl); + this.image.angle = this.assetData.Angle; + this.image.x = 0; + this.image.y = 0; + this.image.width = this.assetData.Width; + 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 => { - paintVertexShape(rect: PIXI.Rectangle) { + // }) + // .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); - } - paintBackground(rect: PIXI.Rectangle) { } + if (this.assetData.GameMode === 2) { + this.text.visible = false; + } + this.addChild(this.text); + this.addChild(this.image); + this.addChild(this.selectionBox); + + if (this.assetData.CanConnect) { + // connectPoint + this.connectPoint = new PIXI.Sprite(this.connectPointTexture); + this.connectPoint.anchor.set(0.5); + this.connectPoint.x = this.image.x; + this.connectPoint.y = this.image.y; + this.addChild(this.connectPoint); + this.connectPoint.interactive = true; + this.connectPoint + .on('mousedown', event => { + event.stopPropagation(); + this.paintingPipeline(this.x, this.y); + }) + .on('mouseover', event => { + this.setSelectionBox(true, this.connectPoint); + }) + .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); + // }); - paintForeground(rect: PIXI.Rectangle) { } + // // 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); + // }); - paintEdgeShape(pts: Array) { } + this.showConnectionPoint(false); + } + } + // 设置选择框 + public setSelectionBox(b: boolean, sprite?: PIXI.Sprite) { + if (b) { + 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(); + } + } + // 设置名称 + public setNameVisible(value: boolean, mode: GameMode) { + if (this.assetData.GameMode === mode) { + this.text.visible = value; + } + } + // 显示连接点 + 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; + } + paintingPipeline(x: number, y: number) { + if (this.assetData.CanConnect) { + if (this.workingArea.getPaintMode() === PaintMode.Pipeline) { + if (this.workingArea.paintingPipeline === null) { + this.workingArea.previewLineSegment.visible = true; + this.workingArea.currentClickPoint.position = + new PIXI.Point(this.workingArea.circleShadow.x, this.workingArea.circleShadow.y); + this.workingArea.paintPoints.push(new PIXI.Point(x, y)); + const json = JSON.parse(JSON.stringify(this.workingArea.canvasData.selectTemplateData.propertyInfos)); + const list = []; + json.forEach(element => { + const property = new PropertyInfo(element); + list.push(property); + }); + const tempData = { + TemplateId: this.workingArea.canvasData.selectTemplateData.id, + CanConnect: this.workingArea.canvasData.selectTemplateData.canConnect, + Pipelines: new Array(), + FloorId: this.workingArea.canvasData.selectStorey.id, + Angle: this.workingArea.canvasData.selectTemplateData.angle, + Color: this.workingArea.canvasData.selectTemplateData.color, + Enabled: this.workingArea.canvasData.selectTemplateData.enabled, + FillMode: this.workingArea.canvasData.selectTemplateData.fillMode, + FireElementId: this.workingArea.canvasData.selectTemplateData.fireElementId, + FixedSize: this.workingArea.canvasData.selectTemplateData.fixedSize, + Height : 32, + Width : 32, + Id: ObjectID.default.generate(), + ImageUrl: this.workingArea.canvasData.selectTemplateData.imageUrl, + InteractiveMode: this.workingArea.canvasData.selectTemplateData.interactiveMode, + MultiPoint : JSON.parse(JSON.stringify(this.workingArea.paintPoints)), + Point: new PIXI.Point(0, 0), + Name : this.workingArea.canvasData.selectTemplateData.name, + PropertyInfos: list, + Border : this.workingArea.canvasData.selectTemplateData.border, + DrawMode : this.workingArea.canvasData.selectTemplateData.drawMode, + Thickness : this.workingArea.canvasData.selectTemplateData.thickness, + IsFromBuilding : this.workingArea.canvasData.selectTemplateData.isFromBuilding, + GameMode: this.workingArea.canvasData.gameMode, + LinkedObjects: new Array(this.assetData.Id), + }; + this.workingArea.paintingPipeline = new Pipeline(tempData, this.workingArea); + this.assetData.Pipelines.push(this.workingArea.paintingPipeline.assetData.Id); + this.workingArea.emit('createIcon', this.workingArea.paintingPipeline); + } else { + this.workingArea.previewLineSegment.visible = false; + this.workingArea.currentClickPoint.position = + new PIXI.Point(this.workingArea.circleShadow.x, this.workingArea.circleShadow.y); + this.workingArea.paintPoints.push(new PIXI.Point(x, y)); + this.workingArea.paintingPipeline.assetData.MultiPoint = + JSON.parse(JSON.stringify(this.workingArea.paintPoints)); + this.workingArea.paintingPipeline.assetData.LinkedObjects.push(this.assetData.Id); + this.assetData.Pipelines.push(this.workingArea.paintingPipeline.assetData.Id); + this.workingArea.paintingPipeline.refresh(); + this.workingArea.initPipelineData(); + } + } + } + } + // 刷新 + public refresh() { + if (this.assetData.CanConnect) { + + } + this.image.width = this.assetData.Width; + this.image.height = this.assetData.Height; + this.image.angle = this.assetData.Angle; + this.text.text = this.assetData.Name + + '\r\n' + + this.assetData.PropertyInfos?.find(item => item.PropertyName === '名称/编号')?.PropertyValue; + this.text.x = this.image.x; + this.text.y = this.image.y - this.image.height / 2; + } } diff --git a/src/app/working-area/model/axPreviewImageShape.ts b/src/app/working-area/model/axPreviewImageShape.ts new file mode 100644 index 0000000..623b2d7 --- /dev/null +++ b/src/app/working-area/model/axPreviewImageShape.ts @@ -0,0 +1,27 @@ +import { Sprite, Texture } from 'pixi.js'; +import { WorkingAreaComponent } from '../working-area.component'; +import { AxShape } from './axShape'; + +export class AxPreviewImageShape extends AxShape { + image: Sprite = null; + /** + * + */ + constructor(workingArea: WorkingAreaComponent) { + super(null, workingArea); + this.image = new Sprite(); + this.image.width = 32; + this.image.height = 32; + this.image.anchor.set(0.5); + this.interactive = false; + this.scale.set(1 / this.workingArea.backgroundImage.scale.x); + this.addChild(this.image); + } + /** + * 重新设置图片地址 + * @param url 图片路径 + */ + setImageUrl(url: string) { + this.image.texture = Texture.from(url); + } +} diff --git a/src/app/working-area/model/axShape.ts b/src/app/working-area/model/axShape.ts index f285c24..bd82842 100644 --- a/src/app/working-area/model/axShape.ts +++ b/src/app/working-area/model/axShape.ts @@ -1,56 +1,76 @@ +import { Constructor } from '@angular/material/core/common-behaviors/constructor'; import * as PIXI from 'pixi.js'; -// import { Point, Rectangle, Graphics } from 'pixi.js'; +import { Point, Rectangle, Graphics, Container } from 'pixi.js'; +import { WorkingAreaComponent } from '../working-area.component'; /** * 安信形状 */ -export class AxShape extends PIXI.Container { +export class AxShape extends Container { + assetData: any; + workingArea: WorkingAreaComponent; + // 可以被移动的 + moveable = true; + // 可以被选中的 + selectable = true; - points: Array = []; - title: string; - titleVisible: boolean; - g: PIXI.Graphics = new PIXI.Graphics(); - - constructor() { + constructor(assetData: any, workingArea: WorkingAreaComponent) { super(); - this.addChild(this.g); - // this.drawDashedLine(this.g, new Point(0, 0), new Point(0, 200), 0xff0000); - } - // /** - // * 绘制虚线 - // * @param g - // * @param p0 - // * @param pe - // * @param color - // * @param width - // * @param dashLen - // */ - // drawDashedLine(g: Graphics, p0: Point, pe: Point, color: number, width: number = 1, dashLen: number = 5) { - // g.lineStyle(width, color); - // const len = Math.sqrt(Math.pow(pe.x - p0.x, 2) + Math.pow(pe.y - p0.y, 2)); - // // tslint:disable-next-line: no-bitwise - // const num = ~~(len / dashLen); - // for (let i = 0; i < num; i++) { - // const x = p0.x + (pe.x - p0.x) / num * i; - // const y = p0.y + (pe.y - p0.y) / num * i; - // // tslint:disable-next-line: no-bitwise - // i & 1 ? g.lineTo(x, y) : g.moveTo(x, y); - // } - // } + this.assetData = assetData; + this.workingArea = workingArea; + this.workingArea.backgroundImage.addChild(this); + this.interactive = true; + this.buttonMode = true; + this.on('mousedown', event => { + console.log(this.assetData); + event.stopPropagation(); + if (this.selectable) { + this.workingArea.selection.selectOne(this); + } + if (this.moveable) { + event.currentTarget.data = event.data; + event.currentTarget.alpha = 0.5; + event.currentTarget.dragging = true; - paintVertexShape(rect: PIXI.Rectangle) { - // this.paintBackground(c, x, y, w, h); + event.currentTarget.dragPoint = event.data.getLocalPosition(event.currentTarget.parent); + event.currentTarget.dragPoint.x -= event.currentTarget.x; + event.currentTarget.dragPoint.y -= event.currentTarget.y; + } + }) + .on('mouseup', event => { + if (event.currentTarget.dragging) { + event.currentTarget.alpha = 1; + event.currentTarget.dragging = false; + event.currentTarget.data = null; + } + }) + .on('mouseupoutside', event => { + if (event.currentTarget.dragging) { + event.currentTarget.alpha = 1; + event.currentTarget.dragging = false; + event.currentTarget.data = null; + } + }) + .on('mousemove', event => { + if (event.currentTarget.dragging) { + const newPosition = event.currentTarget.data.getLocalPosition(event.currentTarget.parent); + event.currentTarget.x = newPosition.x - event.currentTarget.dragPoint.x; + event.currentTarget.y = newPosition.y - event.currentTarget.dragPoint.y; + this.assetData.Point = new PIXI.Point(this.x, this.y); + this.workingArea.canvasData.isChange = true; + } + }) + .on('rightclick', event => { - // if (!this.outline || this.style == null || mxUtils.getValue( - // this.style, mxConstants.STYLE_BACKGROUND_OUTLINE, 0) == 0) - // { - // c.setShadow(false); - // this.paintForeground(c, x, y, w, h); - // } + }) + .on('mouseover', event => { + event.stopPropagation(); + }) + .on('mouseout', event => { + event.stopPropagation(); + }); + } + redraw(): void { + } - paintBackground(rect: PIXI.Rectangle) { } - - paintForeground(rect: PIXI.Rectangle) { } - - paintEdgeShape(pts: Array) { } } diff --git a/src/app/working-area/model/multipointIcon.ts b/src/app/working-area/model/multipointIcon.ts index d5467a7..df2da6f 100644 --- a/src/app/working-area/model/multipointIcon.ts +++ b/src/app/working-area/model/multipointIcon.ts @@ -165,9 +165,6 @@ export class MultipointIcon extends PIXI.Container { } }) .on('rightclick', event => { - }) - .on('mouseover', event => { - }); }); // // 缩放 @@ -178,6 +175,7 @@ export class MultipointIcon extends PIXI.Container { // 添加选中事件 this.iconsTilingSprite.forEach((item, index, array) => { item.interactive = true; + item.buttonMode = true; item.on('mousedown', event => { event.stopPropagation(); this.workingArea.selection.selectOne(this); @@ -245,4 +243,4 @@ export class MultipointIcon extends PIXI.Container { + '\r\n' + this.assetData.PropertyInfos.find(item => item.PropertyName === '名称/编号')?.PropertyValue; } -} \ No newline at end of file +} diff --git a/src/app/working-area/model/paintModel.ts b/src/app/working-area/model/paintModel.ts index dc0b031..39a06ce 100644 --- a/src/app/working-area/model/paintModel.ts +++ b/src/app/working-area/model/paintModel.ts @@ -18,6 +18,10 @@ export enum PaintMode { * 水带多边形 */ Pipeline, + /** + * 结束绘制 + */ + endPaint, /** * 暂无 */ @@ -26,8 +30,4 @@ export enum PaintMode { * 暂无 */ Car, - /** - * 结束绘制 - */ - endPaint, } diff --git a/src/app/working-area/model/pipeline.ts b/src/app/working-area/model/pipeline.ts index 904732a..74045ad 100644 --- a/src/app/working-area/model/pipeline.ts +++ b/src/app/working-area/model/pipeline.ts @@ -1,14 +1,16 @@ import { WorkingAreaComponent } from '../working-area.component'; import * as PIXI from 'pixi.js'; +import { AxShape } from './axShape'; /** * 管线 */ -export class Pipeline extends PIXI.Container { +export class Pipeline extends AxShape { public line: PIXI.Graphics = new PIXI.Graphics(); - constructor(public assetData: any, private workingArea: WorkingAreaComponent) { - super(); + constructor(assetData: any, workingArea: WorkingAreaComponent) { + super(assetData, workingArea); this.name = this.assetData.Id; + this.moveable = false; this.x = this.assetData.Point.x; this.y = this.assetData.Point.y; this.workingArea.backgroundImage.addChild(this); @@ -269,9 +271,17 @@ export class Pipeline extends PIXI.Container { // } } /** - * Function: paintMarker - * - * Paints the marker. + * 画箭头 + * @param c + * @param ptX + * @param ptY + * @param nx + * @param ny + * @param size + * @param arrowWidth + * @param edgeWidth + * @param spacing + * @param initialMove */ paintMarker(c: PIXI.Graphics, ptX: number, ptY: number, nx: number, ny: number, size: number, arrowWidth: number, edgeWidth: number, spacing: number, initialMove: boolean) { @@ -292,21 +302,7 @@ export class Pipeline extends PIXI.Container { c.lineTo(ptX + orthx / widthArrowRatio + spaceX, ptY + orthy / widthArrowRatio + spaceY); c.lineTo(ptX + orthx + spaceX, ptY + orthy + spaceY); } - /** - * Function: relativeCcw - * - * Returns 1 if the given point on the right side of the segment, 0 if its - * on the segment, and -1 if the point is on the left side of the segment. - * - * Parameters: - * - * x1 - X-coordinate of the startpoint of the segment. - * y1 - Y-coordinate of the startpoint of the segment. - * x2 - X-coordinate of the endpoint of the segment. - * y2 - Y-coordinate of the endpoint of the segment. - * px - X-coordinate of the point. - * py - Y-coordinate of the point. - */ + relativeCcw(x1: number, y1: number, x2: number, y2: number, px: number, py: number) { x2 -= x1; y2 -= y1; diff --git a/src/app/working-area/model/polygonIcon.ts b/src/app/working-area/model/polygonIcon.ts index 3c604df..a7d0eb9 100644 --- a/src/app/working-area/model/polygonIcon.ts +++ b/src/app/working-area/model/polygonIcon.ts @@ -1,6 +1,7 @@ import { WorkingAreaComponent } from '../working-area.component'; import { GameMode } from './gameMode'; import * as PIXI from 'pixi.js'; +import { PaintMode } from './paintModel'; /** * 多边形 @@ -76,6 +77,7 @@ export class PolygonIcon extends PIXI.Container { // 添加圆点事件 this.pointsGraphics.forEach((item, index, array) => { item.interactive = true; + item.buttonMode = true; item.zIndex = 1; item.on('mousedown', event => { event.stopPropagation(); @@ -123,10 +125,24 @@ export class PolygonIcon extends PIXI.Container { } }) .on('rightclick', event => { - }); + }) .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; + } + }); }); // 添加选中事件 this.polygonGraphics.interactive = true; + this.polygonGraphics.buttonMode = true; this.polygonGraphics .on('mousedown', event => { event.stopPropagation(); @@ -167,12 +183,21 @@ export class PolygonIcon extends PIXI.Container { }) .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; + } }); - // // 缩放 - // this.workingArea.on('backgroundScale', data => { - // const scale = 1 / data; - // this.text.scale.set(scale); - // }); } /** * 设置点显示状态 @@ -241,4 +266,4 @@ export class PolygonIcon extends PIXI.Container { this.polygonGraphics.drawPolygon(this.getPoints()); this.polygonGraphics.endFill(); } -} \ No newline at end of file +} diff --git a/src/app/working-area/model/putCarArea.ts b/src/app/working-area/model/putCarArea.ts index 7544d04..25480b2 100644 --- a/src/app/working-area/model/putCarArea.ts +++ b/src/app/working-area/model/putCarArea.ts @@ -1,59 +1,59 @@ -import { OldFilmFilter } from 'pixi-filters'; -import { WorkingAreaComponent } from '../working-area.component'; -import { PaintMode } from './paintModel'; -import { SinglePointIcon } from './singlePointIcon'; -import * as PIXI from 'pixi.js'; +// import { OldFilmFilter } from 'pixi-filters'; +// import { WorkingAreaComponent } from '../working-area.component'; +// import { PaintMode } from './paintModel'; +// import { SinglePointIcon } from './axImageShape'; +// import * as PIXI from 'pixi.js'; -/** - * 汽车放置区域 - */ -export class PutCarArea extends PIXI.Container { - public polygonGraphics: PIXI.Graphics = new PIXI.Graphics(); - constructor(public assetData: any, private workingArea: WorkingAreaComponent) { - super(); - this.name = this.assetData.Id; - this.x = this.assetData.Point.x; - this.y = this.assetData.Point.y; - this.workingArea.backgroundImage.addChild(this); - this.sortableChildren = true; +// /** +// * 汽车放置区域 +// */ +// export class PutCarArea extends PIXI.Container { +// public polygonGraphics: PIXI.Graphics = new PIXI.Graphics(); +// constructor(public assetData: any, private workingArea: WorkingAreaComponent) { +// super(); +// this.name = this.assetData.Id; +// this.x = this.assetData.Point.x; +// this.y = this.assetData.Point.y; +// this.workingArea.backgroundImage.addChild(this); +// this.sortableChildren = true; - // 填充多边形 +// // 填充多边形 - const color: number = this.assetData.Color.substring(0, 7).replace('#', '0x'); - const angle: number = parseInt(this.assetData.Color.substring(7), 16) / 255; - this.polygonGraphics.beginFill(color, angle); - this.polygonGraphics.drawPolygon(this.assetData.MultiPoint); - this.polygonGraphics.endFill(); - this.addChild(this.polygonGraphics); - // 添加选中事件 - this.polygonGraphics.interactive = true; - this.polygonGraphics - .on('pointerdown', (event) => { - if (this.workingArea.getPaintMode() === PaintMode.Car) { - this.workingArea.selectCar.Point = - new PIXI.Point(this.workingArea.previewSinglePointIcon.x, this.workingArea.previewSinglePointIcon.y); - this.workingArea.selectCar.Angle = this.assetData.Direction; - const car = new SinglePointIcon(this.workingArea.selectCar, this.workingArea); - this.workingArea.setPaintMode(PaintMode.endPaint); - } - }) - .on('pointerup', (event) => { +// const color: number = this.assetData.Color.substring(0, 7).replace('#', '0x'); +// const angle: number = parseInt(this.assetData.Color.substring(7), 16) / 255; +// this.polygonGraphics.beginFill(color, angle); +// this.polygonGraphics.drawPolygon(this.assetData.MultiPoint); +// this.polygonGraphics.endFill(); +// this.addChild(this.polygonGraphics); +// // 添加选中事件 +// this.polygonGraphics.interactive = true; +// this.polygonGraphics +// .on('pointerdown', (event) => { +// if (this.workingArea.getPaintMode() === PaintMode.Car) { +// this.workingArea.selectCar.Point = +// new PIXI.Point(this.workingArea.previewSinglePointIcon.x, this.workingArea.previewSinglePointIcon.y); +// this.workingArea.selectCar.Angle = this.assetData.Direction; +// const car = new SinglePointIcon(this.workingArea.selectCar, this.workingArea); +// this.workingArea.setPaintMode(PaintMode.endPaint); +// } +// }) +// .on('pointerup', (event) => { - }) - .on('pointerupoutside', (event) => { +// }) +// .on('pointerupoutside', (event) => { - }) - .on('pointerover', (event) => { - this.workingArea.previewSinglePointIcon.filters = null; - this.workingArea.previewSinglePointIcon.zIndex = this.zIndex + 1; - // 设置车辆方向 - this.workingArea.previewSinglePointIcon.angle = this.assetData.Direction; - console.log(this.assetData.Name); - }) - .on('pointerout', (event) => { - this.workingArea.previewSinglePointIcon.filters = [ - new OldFilmFilter() - ]; - }); - } -} \ No newline at end of file +// }) +// .on('pointerover', (event) => { +// this.workingArea.previewSinglePointIcon.filters = null; +// this.workingArea.previewSinglePointIcon.zIndex = this.zIndex + 1; +// // 设置车辆方向 +// this.workingArea.previewSinglePointIcon.angle = this.assetData.Direction; +// console.log(this.assetData.Name); +// }) +// .on('pointerout', (event) => { +// this.workingArea.previewSinglePointIcon.filters = [ +// new OldFilmFilter() +// ]; +// }); +// } +// } diff --git a/src/app/working-area/model/singlePointIcon.ts b/src/app/working-area/model/singlePointIcon.ts deleted file mode 100644 index 8574b9e..0000000 --- a/src/app/working-area/model/singlePointIcon.ts +++ /dev/null @@ -1,373 +0,0 @@ -import { WorkingAreaComponent } from '../working-area.component'; -import * as ObjectID from 'bson-objectid'; -import { GameMode } from './gameMode'; -import { Pipeline } from './pipeline'; -import { PaintMode } from './paintModel'; -import * as PIXI from 'pixi.js'; -import { PropertyInfo } from './PropertyInfo'; -import { AxShape } from './axShape'; - -/** - * 单点图标 - */ -export class SinglePointIcon extends AxShape { - style = new PIXI.TextStyle({ - fontFamily: 'Arial', - fontSize: 18, - fontStyle: 'normal', - fontWeight: 'bold', - fill: ['#000000'], - stroke: '#ffffff', - strokeThickness: 3, - dropShadow: true, - dropShadowColor: '#000000', - dropShadowBlur: 3, - dropShadowAngle: Math.PI / 6, - dropShadowDistance: 1, - wordWrap: false, - wordWrapWidth: 100, - }); - - text = new PIXI.Text(this.assetData.Name - + '\r\n' - + this.assetData.PropertyInfos?.find(item => item.PropertyName === '名称/编号')?.PropertyValue, this.style); - - /** - * 选中圆点 - */ - selectedPointTexture = PIXI.Texture.from('assets/images/handle-secondary.png'); - image = PIXI.Sprite.from(this.assetData.ImageUrl); - selectionBox = new PIXI.Graphics(); - 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(public assetData: any, private workingArea: WorkingAreaComponent) { - super(); - this.workingArea.backgroundImage.addChild(this); - this.x = this.assetData.Point.x; - this.y = this.assetData.Point.y; - this.name = this.assetData.Id; - - this.image.angle = this.assetData.Angle; - - this.image.x = 0; - this.image.y = 0; - this.image.width = this.assetData.Width; - this.image.height = this.assetData.Height; - console.log(this.getBounds()); - this.image.alpha = 1; - this.image.anchor.set(0.5); - this.image.interactive = 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 => { - // if (this.assetData.CanConnect) { - // this.setSelectionBox(true, this.image); - // } - }) - .on('mouseout', event => { - // 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); - - if (this.assetData.GameMode === 2) { - this.text.visible = false; - } - this.addChild(this.text); - this.addChild(this.image); - this.addChild(this.selectionBox); - - if (this.assetData.CanConnect) { - // 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('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('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('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('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('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('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('mouseover', event => { - this.setSelectionBox(true, this.downRight); - }) - .on('mouseout', event => { - this.setSelectionBox(false); - }); - - this.showConnectionPoint(false); - } - } - // 设置选择框 - public setSelectionBox(b: boolean, sprite?: PIXI.Sprite) { - if (b) { - 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(); - } - } - // 设置名称 - public setNameVisible(value: boolean, mode: GameMode) { - if (this.assetData.GameMode === mode) { - this.text.visible = value; - } - } - // 显示连接点 - public showConnectionPoint(b: boolean) { - 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; - } - paintingPipeline(x: number, y: number) { - if (this.assetData.CanConnect) { - if (this.workingArea.getPaintMode() === PaintMode.Pipeline) { - if (this.workingArea.paintingPipeline === null) { - this.workingArea.previewLineSegment.visible = true; - this.workingArea.currentClickPoint.position = - new PIXI.Point(this.workingArea.circleShadow.x, this.workingArea.circleShadow.y); - this.workingArea.paintPoints.push(new PIXI.Point(x, y)); - // const tempData = { - // Id: ObjectID.default.generate(), - // MultiPoint: JSON.parse(JSON.stringify(this.workingArea.paintPoints)), - // Point: new PIXI.Point(0, 0), - // Name: '管线', - // LinkedObjects: new Array(), - // }; - const json = JSON.parse(JSON.stringify(this.workingArea.canvasData.selectTemplateData.propertyInfos)); - const list = []; - json.forEach(element => { - const property = new PropertyInfo(element); - list.push(property); - }); - const tempData = { - TemplateId: this.workingArea.canvasData.selectTemplateData.id, - CanConnect: this.workingArea.canvasData.selectTemplateData.canConnect, - Pipelines: new Array(), - FloorId: this.workingArea.canvasData.selectStorey.id, - Angle: this.workingArea.canvasData.selectTemplateData.angle, - Color: this.workingArea.canvasData.selectTemplateData.color, - Enabled: this.workingArea.canvasData.selectTemplateData.enabled, - FillMode: this.workingArea.canvasData.selectTemplateData.fillMode, - FireElementId: this.workingArea.canvasData.selectTemplateData.fireElementId, - FixedSize: this.workingArea.canvasData.selectTemplateData.fixedSize, - Height : 32, - Width : 32, - Id: ObjectID.default.generate(), - ImageUrl: this.workingArea.canvasData.selectTemplateData.imageUrl, - InteractiveMode: this.workingArea.canvasData.selectTemplateData.interactiveMode, - MultiPoint : JSON.parse(JSON.stringify(this.workingArea.paintPoints)), - Point: new PIXI.Point(0, 0), - Name : this.workingArea.canvasData.selectTemplateData.name, - PropertyInfos: list, - Border : this.workingArea.canvasData.selectTemplateData.border, - DrawMode : this.workingArea.canvasData.selectTemplateData.drawMode, - Thickness : this.workingArea.canvasData.selectTemplateData.thickness, - IsFromBuilding : this.workingArea.canvasData.selectTemplateData.isFromBuilding, - GameMode: this.workingArea.canvasData.gameMode, - LinkedObjects: new Array(), - }; - this.workingArea.paintingPipeline = new Pipeline(tempData, this.workingArea); - // this.workingArea.paintingPipeline.assetData.LinkedObjects.push(this); - // this.assetData.Pipelines.push(this.workingArea.paintingPipeline.Id); - this.workingArea.emit('createIcon', this.workingArea.paintingPipeline); - } else { - this.workingArea.previewLineSegment.visible = false; - this.workingArea.currentClickPoint.position = - new PIXI.Point(this.workingArea.circleShadow.x, this.workingArea.circleShadow.y); - this.workingArea.paintPoints.push(new PIXI.Point(x, y)); - this.workingArea.paintingPipeline.assetData.MultiPoint = - JSON.parse(JSON.stringify(this.workingArea.paintPoints)); - // this.workingArea.paintingPipeline.assetData.LinkedObjects.push(this); - // this.assetData.Pipelines.push(this.workingArea.paintingPipeline); - this.workingArea.paintingPipeline.refresh(); - this.workingArea.initPipelineData(); - } - } - } - } - // 刷新 - public refresh() { - if (this.assetData.CanConnect) { - - } - this.image.width = this.assetData.Width; - this.image.height = this.assetData.Height; - this.image.angle = this.assetData.Angle; - this.text.text = this.assetData.Name - + '\r\n' - + this.assetData.PropertyInfos?.find(item => item.PropertyName === '名称/编号')?.PropertyValue; - this.text.x = this.image.x; - this.text.y = this.image.y - this.image.height / 2; - } -} diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts index de84fbb..6fcb652 100644 --- a/src/app/working-area/working-area.component.ts +++ b/src/app/working-area/working-area.component.ts @@ -2,21 +2,20 @@ import { Component, OnInit, ElementRef, ViewChild, AfterViewInit, Input } from ' import * as PIXI from 'pixi.js'; import { EventEmitter } from 'events'; import { EventManager } from '@angular/platform-browser'; -import { OutlineFilter, OldFilmFilter } from 'pixi-filters'; +import { OutlineFilter } from 'pixi-filters'; import { AssetData, CanvasShareDataService, DisposalNodeData, FloorNodeData } from '../canvas-share-data.service'; import * as ObjectID from 'bson-objectid'; import { Charm } from './charm'; -import { SinglePointIcon } from './model/singlePointIcon'; +import { AxImageShape } from './model/axImageShape'; import { GameMode } from './model/gameMode'; import { MultipointIcon } from './model/multipointIcon'; import { PolygonIcon } from './model/polygonIcon'; -import { PutCarArea } from './model/putCarArea'; -import { Arrows } from './model/arrows'; import { Pipeline } from './model/pipeline'; import { PaintMode } from './model/paintModel'; -import { WallSpace } from './model/wallSpace'; import { AxShape } from './model/axShape'; import { PropertyInfo } from './model/PropertyInfo'; +import { AxPreviewImageShape } from './model/axPreviewImageShape'; +import { AxArrowConnector } from './model/axArrowConnector'; @Component({ @@ -50,11 +49,11 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV /** * 背景图 */ - public backgroundImage: PIXI.Sprite; + public backgroundImage: PIXI.Sprite = null; /** - * 预览单点图标 + * 绘制图片形状时预览状态的图片 */ - public previewSinglePointIcon = new PIXI.Sprite(); + public previewImage: AxPreviewImageShape = null; /** * 预览线段 */ @@ -70,7 +69,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV /** * 绘画模式 */ - private paintMode: PaintMode; + private paintMode: PaintMode = PaintMode.endPaint; /** * 选择器 */ @@ -82,20 +81,19 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV /** * 绘制点集合 */ - public paintPoints: PIXI.Point[]; + public paintPoints: PIXI.Point[] = []; /** * 绘制中的管线 */ - public paintingPipeline: Pipeline; - /** - * 绘制中的箭头 - */ - public paintingArrows: Arrows = null; + public paintingPipeline: Pipeline = null; /** * 绘制中的多点图标 */ public paintingIcon: MultipointIcon; - public paintingWall: AxShape; + /** + * 绘制中的图形 + */ + public paintingShape: AxShape = null; /** * 绘制中的连线 */ @@ -159,52 +157,33 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV // 按Del键删除选中的图标 if (event.keyCode === 46) { this.selection.objects.forEach(item => { - delete this.canvasData.originaleveryStoreyData.data[item.assetData.Id]; - this.backgroundImage.removeChild(this.backgroundImage.getChildByName(item.assetData.Id)); - this.canvasData.isChange = true; + 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.selection.deselectAll(); this.emit('deleteIcon'); } }); - // 打印当前工作区信息 - this.eventManager.addGlobalEventListener('window', 'keypress', (event: any) => { - // console.log(event.keyCode); - if (event.keyCode === 32) { - switch (this.paintMode) { - case 0: - console.log(`当前的绘制模式是：单点图标`); - break; - case 1: - console.log(`当前的绘制模式是：线段图标`); - break; - case 2: - console.log(`当前的绘制模式是：自定义多边形`); - break; - case 3: - console.log(`当前的绘制模式是：水带多边形`); - break; - case 4: - console.log(`当前的绘制模式是：暂无`); - break; - case 5: - console.log(`当前的绘制模式是：暂无`); - break; - case 6: - console.log(`当前的绘制模式是：结束绘制`); - break; - default: - break; - } - console.log('当前楼层的数据：'); - console.log(this.canvasData.originaleveryStoreyData.data); - - console.log('绘制中的管线：'); - console.log(this.paintingPipeline); - - console.log('处置预案数据：'); - console.log(this.canvasData.selectPanelPoint.Data); - } - }); } /** * 页面初始化 @@ -298,11 +277,18 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV this.app.ticker.add((delta) => { this.animator.update(); this.mousePosition = this.app.renderer.plugins.interaction.mouse.global; - if (this.backgroundImage !== undefined) { - this.previewSinglePointIcon.position = this.backgroundImage.toLocal(this.mousePosition); + // 预览图片 + if (this.previewImage !== null) { + this.previewImage.position = this.backgroundImage.toLocal(this.mousePosition); + } + + if (this.backgroundImage !== null) { this.circleShadow.position = this.backgroundImage.toLocal(this.mousePosition); this.refreshPreviewLineSegment(this.currentClickPoint.position, this.circleShadow.position); } + /** + * 显示框选 + */ if (this.rectToolGraphics.visible === true) { const init = this.initialScreenMousePos; @@ -311,20 +297,22 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV this.rectToolGraphics.clear(); this.rectToolGraphics.lineStyle(2, 0x00ff00, 1); this.rectToolGraphics.beginFill(0xccccf2, 0.25); - this.rectToolGraphics.drawRect(init.x, init.y, final.x - init.x, final.y - init.y); + if (final.x > init.x && final.y > init.y) { + this.rectToolGraphics.drawRect(init.x, init.y, final.x - init.x, final.y - init.y); + } else if (final.x > init.x && final.y < init.y) { + this.rectToolGraphics.drawRect(init.x, final.y, final.x - init.x, init.y - final.y); + } else if (final.x < init.x && final.y > init.y) { + this.rectToolGraphics.drawRect(final.x, init.y, init.x - final.x, final.y - init.y); + } else if (final.x < init.x && final.y < init.y) { + this.rectToolGraphics.drawRect(final.x, final.y, init.x - final.x, init.y - final.y); + } this.rectToolGraphics.endFill(); - this.rectToolGraphics.closePath(); - } - if (this.paintingArrows !== null) { - this.paintingArrows.assetData.pointB = new PIXI.Point(this.circleShadow.position.x, this.circleShadow.position.y); - this.paintingArrows.refresh(); } }); /** * 选中事件 */ this.on('select', obj => { - // this.moveIconToScreenCenter(obj); if (this.allowEdit) { if (obj instanceof MultipointIcon) { if (obj.assetData.GameMode === this.canvasData.gameMode) { @@ -353,6 +341,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV if (obj instanceof MultipointIcon) { obj.setPointVisiable(false); } else if (obj instanceof PolygonIcon) { + obj.filters = []; obj.setPointVisiable(false); } else { obj.filters = []; @@ -361,10 +350,12 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV obj.filters = []; } }); + /** + * 根据背景缩放事件 + */ this.on('backgroundScale', scale => { - this.previewSinglePointIcon.scale.set((0.5 / scale)); - this.backgroundImage.children.forEach(item => { - if (item instanceof SinglePointIcon) { + this.backgroundImage?.children.forEach(item => { + if (item instanceof AxImageShape) { if (item.assetData.FixedSize) { const data = 1 / scale; item.scale.set(data); @@ -378,19 +369,26 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV } else if (item instanceof PolygonIcon) { const data = 1 / scale; item.text.scale.set(data); + item.pointsGraphics.forEach(point => { + point.scale.set(data); + }); + } else if (item instanceof AxPreviewImageShape) { + const data = 1 / scale; + item.scale.set(data); } }); }); + /** + * 创建图标事件 + */ this.on('createIcon', obj => { if (obj.assetData.GameMode === GameMode.BasicInformation) { - // if (obj.assetData.IsFromBuilding) { - // this.canvasData.originalcompanyBuildingData.data[obj.assetData.Id] = obj.assetData; - // } else { - this.canvasData.originaleveryStoreyData.data[obj.assetData.Id] = obj.assetData; - // } + // 添加楼层数据 + this.canvasData.originaleveryStoreyData.data[obj.assetData.Id] = obj.assetData; + // 添加建筑数据 + this.canvasData.originalcompanyBuildingData.data[obj.assetData.Id] = obj.assetData; } else { - // console.log(); if (this.canvasData.selectPanelPoint.Data === undefined || this.canvasData.selectPanelPoint.Data === null) { this.canvasData.selectPanelPoint.Data = new FloorNodeData(); @@ -399,6 +397,15 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV } this.canvasData.isChange = true; }); + + // todo 创建一个无限大的grid + const cell = new PIXI.Graphics(); + cell.lineStyle(1, 0xff0000); + cell.beginFill(0x0000ff); + cell.drawRect(0, 0, 500, 500); + + cell.endFill(); + this.app.stage.addChild(cell); } /** * 重置画布 @@ -413,7 +420,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV */ public setNameVisible(value: boolean, mode: GameMode): void { this.backgroundImage?.children.forEach(item => { - if (item instanceof SinglePointIcon) { + if (item instanceof AxImageShape) { item.setNameVisible(value, mode); } else if (item instanceof MultipointIcon) { item.setNameVisible(value, mode); @@ -428,12 +435,15 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV */ public refreshIcon(id: string): void { const icon = this.backgroundImage.children.find(item => item.name === id); - if (icon instanceof SinglePointIcon) { + console.log(icon); + if (icon instanceof AxImageShape) { icon.refresh(); } else if (icon instanceof MultipointIcon) { icon.refresh(); } else if (icon instanceof PolygonIcon) { icon.refresh(); + } else if (icon instanceof AxArrowConnector) { + icon.redraw(); } } /** @@ -442,8 +452,9 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV */ public setIconScale(value: number): void { this.backgroundImage.children.forEach(item => { - if (item instanceof SinglePointIcon) { - item.scale.set(value); + if (item instanceof AxImageShape) { + console.log(item.image.scale); + item.image.scale.set(value); } else if (item instanceof MultipointIcon) { } else if (item instanceof PolygonIcon) { @@ -471,46 +482,46 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV this.setPaintMode(PaintMode.endPaint); this.resetCanvas(); this.destroyBackgroundImage(); - await this.createBackgroundImage(this.canvasData.selectStorey.imageUrl); - - // this.refreshBackgroundImage(); - // this.versionChecking(); - + if (!this.canvasData.selectStorey.imageUrl) { + return; + } + await this.createBackgroundImage(this.canvasData.selectStorey.imageUrl); + this.createFloorShape(); + if (this.canvasData.gameMode === GameMode.Assignment) { + this.createWorkNode(); + } + this.emit('backgroundScale', this.backgroundImage.scale.x); + } + /** + * 创建楼层图形 + */ + private createFloorShape() { const floorData = this.canvasData.originaleveryStoreyData.data; - // const buildingData = this.canvasData.originalcompanyBuildingData.data; - // const floor = this.canvasData.selectStorey; - // // key=>属性名 data[key]=>属性值 Object.keys(floorData).forEach((key) => { - console.log(floorData[key]); switch (floorData[key].InteractiveMode) { case 0: - const singleIcon = new SinglePointIcon(floorData[key], this); + const singleIcon = new AxImageShape(floorData[key], this); + singleIcon.moveable = this.allowEdit && this.canvasData.gameMode === singleIcon.assetData.GameMode; break; - case 1: + case 1: const icon = new MultipointIcon(floorData[key], this); break; - case 2: + case 2: const polygonIcon = new PolygonIcon(floorData[key], this); break; + case 3: + if (floorData[key].Name === '水带') { + const pipeline = new Pipeline(floorData[key], this); + } else { + const wall = new AxArrowConnector(floorData[key], this); + } + break; } }); - // Object.keys(buildingData).forEach((key) => { - // if (buildingData[key].FloorId === floor.id) { - // switch (buildingData[key].InteractiveMode) { - // case 0: - // const singleIcon = new SinglePointIcon(buildingData[key], this); - // break; - // case 1: - // const icon = new MultipointIcon(buildingData[key], this); - // break; - // case 2: - // const polygonIcon = new PolygonIcon(buildingData[key], this); - // break; - // } - // } - // }); + } + private createWorkNode() { // 加载处置节点数据 const nodeData = this.canvasData.selectPanelPoint.Data; if (nodeData !== undefined && nodeData !== null) { @@ -518,23 +529,22 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV Object.keys(nodeData[key]).forEach((tempKey) => { switch (nodeData[key][tempKey].InteractiveMode) { case 0: - const singleIcon = new SinglePointIcon(nodeData[key][tempKey], this); + const singleIcon = new AxImageShape(nodeData[key][tempKey], this); + singleIcon.moveable = this.allowEdit && this.canvasData.gameMode === singleIcon.assetData.GameMode; break; case 1: - if (nodeData[key][tempKey].Name === '水带') { - const pipeline = new Pipeline(nodeData[key][tempKey], this); - } else { const icon = new MultipointIcon(nodeData[key][tempKey], this); - } - break; - case 2: + break; + case 2: const polygonIcon = new PolygonIcon(nodeData[key][tempKey], this); break; + case 3: + const pipeline = new Pipeline(nodeData[key][tempKey], this); + break; } }); }); } - this.emit('backgroundScale', this.backgroundImage.scale.x); } /** * @@ -614,7 +624,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV this.backgroundImage.y = this.app.view.height / 2; this.backgroundImage.interactive = true; this.backgroundImage.name = 'background'; - + this.backgroundImage.angle = this.canvasData.selectStorey.imageAngle; // const left = this.init.element.nativeElement.querySelector('.functionalDomainLeft').clientWidth; // const right = this.init.element.nativeElement.querySelector('.functionalDomainRight').clientWidth; const imageWidth = this.backgroundImage.texture.width; @@ -667,7 +677,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV ImageUrl: this.canvasData.selectTemplateData.imageUrl, InteractiveMode: this.canvasData.selectTemplateData.interactiveMode, MultiPoint : null, - Point: new PIXI.Point(this.previewSinglePointIcon.x, this.previewSinglePointIcon.y), + Point: new PIXI.Point(this.previewImage.x, this.previewImage.y), Name : this.canvasData.selectTemplateData.name, PropertyInfos: list, Border : this.canvasData.selectTemplateData.border, @@ -676,7 +686,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV IsFromBuilding : this.canvasData.selectTemplateData.isFromBuilding, GameMode : this.canvasData.gameMode }; - const singleIcon = new SinglePointIcon(assetData, this); + const singleIcon = new AxImageShape(assetData, this); this.emit('createIcon', singleIcon); this.emit('backgroundScale', this.backgroundImage.scale.x); break; @@ -761,78 +771,60 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV // this.paintingIcon = new PolygonIcon(this.paintPoints, this); break; case PaintMode.Pipeline: - - if (this.paintingPipeline !== null) { + if (this.canvasData.selectTemplateData.name === '水带') { + if (this.paintingPipeline !== null) { + this.currentClickPoint.position = new PIXI.Point(this.circleShadow.x, this.circleShadow.y); + this.paintPoints.push(new PIXI.Point(this.circleShadow.x, this.circleShadow.y)); + this.paintingPipeline.assetData.MultiPoint = JSON.parse(JSON.stringify(this.paintPoints)); + this.paintingPipeline.refresh(); + } + } else { + this.previewLineSegment.visible = true; this.currentClickPoint.position = new PIXI.Point(this.circleShadow.x, this.circleShadow.y); this.paintPoints.push(new PIXI.Point(this.circleShadow.x, this.circleShadow.y)); - this.paintingPipeline.assetData.MultiPoint = JSON.parse(JSON.stringify(this.paintPoints)); - this.paintingPipeline.refresh(); - } - // this.emit('backgroundScale', this.backgroundImage.scale.x); - break; - case PaintMode.Arrows: - if (this.paintingArrows === null) { - const data = { - Id: ObjectID.default.generate(), - name: 'string', - point: new PIXI.Point(this.circleShadow.x, this.circleShadow.y), - pointA: new PIXI.Point(this.circleShadow.x, this.circleShadow.y), - pointB: new PIXI.Point(this.circleShadow.x, this.circleShadow.y), - source: 'assets/images/进攻方向.png', - }; - this.paintingArrows = new Arrows(data, this); - } else { - this.paintingArrows.ready = true; - this.paintingArrows = null; - this.paintMode = PaintMode.endPaint; - } - break; - case PaintMode.Car: - // this.previewLineSegment.visible = true; - // this.currentClickPoint.position = new PIXI.Point(this.circleShadow.x, this.circleShadow.y); - // this.paintPoints.push(new PIXI.Point(this.circleShadow.x, this.circleShadow.y)); - - // if (this.paintPoints.length >= 2) { - // this.enterPaintEndButton.position = this.circleShadow.position; - // this.enterPaintEndButton.visible = true; - // } - - // if (this.paintingWall !== null) { - // this.backgroundImage.removeChild(this.paintingWall); - // } - // const jsonObject1 = JSON.parse(JSON.stringify(this.canvasData.selectTemplateData.propertyInfos)); - // const propertyList1 = []; - // jsonObject1.forEach(element => { - // const property = new PropertyInfo(element); - // propertyList1.push(property); - // }); - // const assetData11 = { - // TemplateId: this.canvasData.selectTemplateData.id, - // FloorId: this.canvasData.selectStorey.id, - // Angle: this.canvasData.selectTemplateData.angle, - // Color: this.canvasData.selectTemplateData.color, - // Enabled: this.canvasData.selectTemplateData.enabled, - // FillMode: this.canvasData.selectTemplateData.fillMode, - // FireElementId: this.canvasData.selectTemplateData.fireElementId, - // FixedSize: this.canvasData.selectTemplateData.fixedSize, - // Height: 32, - // Width: 32, - // Id: ObjectID.default.generate(), - // ImageUrl: this.canvasData.selectTemplateData.imageUrl, - // InteractiveMode: this.canvasData.selectTemplateData.interactiveMode, - // MultiPoint: JSON.parse(JSON.stringify(this.paintPoints)), - // Point: new PIXI.Point(0, 0), - // Name: this.canvasData.selectTemplateData.name, - // PropertyInfos: propertyList1, - // Border: this.canvasData.selectTemplateData.border, - // DrawMode: this.canvasData.selectTemplateData.drawMode, - // Thickness: this.canvasData.selectTemplateData.thickness, - // IsFromBuilding: this.canvasData.selectTemplateData.isFromBuilding, - // GameMode: this.canvasData.gameMode - // }; - // this.paintingWall = new WallSpace(assetData11, this); - // this.emit('backgroundScale', this.backgroundImage.scale.x); + if (this.paintPoints.length >= 2) { + this.enterPaintEndButton.position = this.circleShadow.position; + this.enterPaintEndButton.visible = true; + } + if (this.paintingShape === null) { + const jsonObject = JSON.parse(JSON.stringify(this.canvasData.selectTemplateData.propertyInfos)); + const propertyList = []; + jsonObject.forEach(element => { + const property = new PropertyInfo(element); + propertyList.push(property); + }); + const assetData2 = { + TemplateId: this.canvasData.selectTemplateData.id, + FloorId: this.canvasData.selectStorey.id, + Angle: this.canvasData.selectTemplateData.angle, + Color: this.canvasData.selectTemplateData.color, + Enabled: this.canvasData.selectTemplateData.enabled, + FillMode: this.canvasData.selectTemplateData.fillMode, + FireElementId: this.canvasData.selectTemplateData.fireElementId, + FixedSize: this.canvasData.selectTemplateData.fixedSize, + Height: 32, + Width: 32, + Id: ObjectID.default.generate(), + ImageUrl: this.canvasData.selectTemplateData.imageUrl, + InteractiveMode: this.canvasData.selectTemplateData.interactiveMode, + MultiPoint: JSON.parse(JSON.stringify(this.paintPoints)), + Point: new PIXI.Point(0, 0), + Name: this.canvasData.selectTemplateData.name, + PropertyInfos: propertyList, + Border: this.canvasData.selectTemplateData.border, + DrawMode: this.canvasData.selectTemplateData.drawMode, + Thickness: this.canvasData.selectTemplateData.thickness, + IsFromBuilding: this.canvasData.selectTemplateData.isFromBuilding, + GameMode: this.canvasData.gameMode + }; + this.paintingShape = new AxArrowConnector(assetData2, this); + } else { + this.paintingShape.assetData.MultiPoint = JSON.parse(JSON.stringify(this.paintPoints)); + this.paintingShape.redraw(); + } + } + this.emit('backgroundScale', this.backgroundImage.scale.x); break; } } else if (!event.currentTarget.dragging && this.selection.isMultiselection === true) { @@ -849,11 +841,15 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV } if (this.rectToolGraphics.visible === true) { this.backgroundImage.children.forEach(item => { - if (item instanceof SinglePointIcon + if ( item instanceof AxImageShape || item instanceof MultipointIcon - || item instanceof PolygonIcon) { - if (this.rectToolGraphics.getLocalBounds().contains(item.x, item.y)) { - this.selection.select(item); + || item instanceof PolygonIcon + || item instanceof AxArrowConnector) { + // 判断2个矩形是否相交 + const rect1 = this.rectToolGraphics.getBounds(); + const rect2 = item.getBounds(); + if (this.isOverlap(rect1, rect2)) { + this.selection.select(item); } } }); @@ -884,19 +880,38 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV this.setPaintMode(PaintMode.endPaint); }) .on('pointerover', (event) => { - this.previewSinglePointIcon.filters = null; + if (this.previewImage !== null + && this.paintMode === PaintMode.singlePointIcon) { + this.previewImage.visible = true; + } }) .on('pointerout', (event) => { - this.previewSinglePointIcon.filters = null; + if (this.previewImage !== null + && this.paintMode === PaintMode.singlePointIcon) { + this.previewImage.visible = false; + } }); this.app.stage.addChild(this.backgroundImage); - this.createPreviewSinglePointIcon(); + this.createPreviewImage(); this.createPreviewLineSegment(); this.createCircleShadow(); this.createEnterPaintEndButton(); this.backgroundImage.addChild(this.paintingLine); } + public isOverlap(rect1, rect2):boolean { + const l1 = { x: rect1.x, y: rect1.y } + const r1 = { x: rect1.x + rect1.width, y: rect1.y + rect1.height } + const l2 = { x: rect2.x, y: rect2.y } + const r2 = { x: rect2.x + rect2.width, y: rect2.y + rect2.height } + if ( + l1.x > r2.x || + l2.x > r1.x || + l1.y > r2.y || + l2.y > r1.y + ) return false + return true + } /** * 刷新背景图 @@ -905,9 +920,10 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV if (!this.canvasData.selectStorey.imageUrl) { this.backgroundImage.visible = false; } else { - this.backgroundImage.texture = PIXI.Texture.from(this.canvasData.selectStorey.imageUrl); - this.backgroundImage.angle = this.canvasData.selectStorey.imageAngle; - this.backgroundImage.visible = true; + // this.backgroundImage.texture = PIXI.Texture.from(this.canvasData.selectStorey.imageUrl); + // this.backgroundImage.angle = this.canvasData.selectStorey.imageAngle; + // this.backgroundImage.visible = true; + this.refresh(); } } /** @@ -921,8 +937,8 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV * @param scale 缩放系数 */ public setBackgroundScale(scale: number): void { - this.backgroundImage.scale.set(scale); - this.emit('backgroundScale', this.backgroundImage.scale.x); + this.backgroundImage?.scale.set(scale); + this.emit('backgroundScale', this.backgroundImage?.scale.x); } /** * 设置背景图角度 @@ -934,22 +950,18 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV /** * 创建预览单点图标 */ - private createPreviewSinglePointIcon(): void { - this.previewSinglePointIcon = PIXI.Sprite.from('assets/images/noImg.png'); - this.previewSinglePointIcon.width = 32; - this.previewSinglePointIcon.height = 32; - this.previewSinglePointIcon.alpha = 1; - this.previewSinglePointIcon.anchor.set(0.5); - this.previewSinglePointIcon.visible = false; - this.backgroundImage.addChild(this.previewSinglePointIcon); - } - /** - * 改变预览单点图标 - * @param uri 图片地址 - */ - private changePreviewSinglePointIcon(uri: string): void { - this.previewSinglePointIcon.texture = PIXI.Texture.from(uri); - this.previewSinglePointIcon.visible = true; + private createPreviewImage(): void { + // if (this.previewSinglePointIcon === null) { + // this.previewSinglePointIcon = PIXI.Sprite.from(this.canvasData.selectTemplateData.imageUrl); + // this.previewSinglePointIcon.width = this.canvasData.selectTemplateData.width; + // this.previewSinglePointIcon.height = this.canvasData.selectTemplateData.height; + // this.previewSinglePointIcon.anchor.set(0.5); + // this.previewSinglePointIcon.interactive = false; + // this.backgroundImage.addChild(this.previewSinglePointIcon); + // this.previewSinglePointIcon.scale.set(1 / this.backgroundImage.scale.x); + // } + this.previewImage = new AxPreviewImageShape(this); + this.previewImage.visible = false; } /** * 创建预览线段 @@ -969,7 +981,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV */ private refreshPreviewLineSegment(pointA: PIXI.Point, pointB: PIXI.Point) { this.previewLineSegment.clear(); - this.previewLineSegment.lineStyle(1, 0xffd900, 1); + this.previewLineSegment.lineStyle(5, 0x00ff00, 1); this.previewLineSegment.moveTo(pointA.x, pointA.y); this.previewLineSegment.lineTo(pointB.x, pointB.y ); } @@ -986,7 +998,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV } showConnectionPoint(b: boolean) { this.backgroundImage?.children.forEach(item => { - if (item instanceof SinglePointIcon) { + if (item instanceof AxImageShape) { if (item.assetData.CanConnect) { item.showConnectionPoint(b); } @@ -997,27 +1009,9 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV * 开始绘制 */ public beginPaint() { - if (this.canvasData.selectTemplateData.name === '水带') { - this.showConnectionPoint(true); - this.setPaintMode(PaintMode.Pipeline); - return; - } - switch (this.canvasData.selectTemplateData.interactiveMode) { - case 0: - this.setPaintMode(PaintMode.singlePointIcon); - break; - case 1: - this.setPaintMode(PaintMode.lineIcon); - break; - case 2: - this.setPaintMode(PaintMode.polygonIcon); - break; - case 3: - if (this.canvasData.selectTemplateData.name) { - this.setPaintMode(PaintMode.Pipeline); - } - break; - } + this.selection.deselectAll(); + this.setPaintMode(PaintMode.endPaint); + this.setPaintMode(this.canvasData.selectTemplateData.interactiveMode); } /** * 初始化管线数据 @@ -1034,18 +1028,14 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV * @param mode 状态 */ public setPaintMode(mode: PaintMode) { - if (this.paintMode === mode) { return; } - this.paintMode = mode; - if (this.paintMode !== PaintMode.Pipeline) { - this.showConnectionPoint(false); + if (this.paintMode === mode) { + return; } + this.paintMode = mode; switch (this.paintMode) { - case PaintMode.Pipeline: - - break; case PaintMode.singlePointIcon: - this.previewSinglePointIcon.visible = false; - this.changePreviewSinglePointIcon(this.canvasData.selectTemplateData.imageUrl); + this.previewImage.visible = true; + this.previewImage.setImageUrl(this.canvasData.selectTemplateData.imageUrl); break; case PaintMode.lineIcon: this.circleShadow.visible = false; @@ -1054,7 +1044,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV if (this.paintingIcon !== null) { this.backgroundImage.removeChild(this.paintingIcon); } - this.previewSinglePointIcon.texture = PIXI.Texture.from(this.canvasData.selectTemplateData.imageUrl); + this.previewImage.setImageUrl(this.canvasData.selectTemplateData.imageUrl); this.circleShadow.visible = true; break; case PaintMode.polygonIcon: @@ -1065,7 +1055,18 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV this.paintingLine.clear(); this.circleShadow.visible = true; break; + case PaintMode.Pipeline: + if (this.canvasData.selectTemplateData.name==='水带') { + this.showConnectionPoint(true); + } else { + + } + break; case PaintMode.endPaint: + this.showConnectionPoint(false); + if (this.previewImage !== null) { + this.previewImage.visible = false; + } // 重置组件状态 if ( this.paintingIcon !== undefined && this.paintingIcon !== null) { @@ -1076,6 +1077,11 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV && this.paintingPipeline !== null) { this.backgroundImage.removeChild(this.paintingPipeline); } + if (this.paintingShape !== null) { + this.backgroundImage.removeChild(this.paintingShape); + this.paintingShape = null; + } + this.enterPaintEndButton.visible = false; this.paintingLine.clear(); this.resetData(); break; @@ -1093,10 +1099,6 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV * 重置 */ public resetData() { - this.previewSinglePointIcon.filters = null; - this.previewSinglePointIcon.visible = false; - this.previewSinglePointIcon.angle = 0; - this.initPipelineData(); // this.circleShadow.visible = false; @@ -1108,7 +1110,10 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV private enterPaint(): void { this.previewLineSegment.visible = false; this.enterPaintEndButton.visible = false; + console.log(this.paintMode); switch (this.paintMode) { + case PaintMode.singlePointIcon: + break; case PaintMode.lineIcon: if (this.paintPoints.length >= 2) { this.emit('createIcon', this.paintingIcon); @@ -1152,6 +1157,12 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV this.emit('createIcon', polygonIcon); } break; + case PaintMode.Pipeline: + if (this.canvasData.selectTemplateData.name !== '水带') { + this.emit('createIcon', this.paintingShape); + this.paintingShape = null; + } + break; } this.paintPoints.splice(0, this.paintPoints.length); this.emit('backgroundScale', this.backgroundImage.scale.x); @@ -1185,7 +1196,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV // } switch (item.InteractiveMode) { case PaintMode.singlePointIcon: - const singleIcon = new SinglePointIcon(newData, this); + const singleIcon = new AxImageShape(newData, this); break; case PaintMode.lineIcon: const lineIcon = new MultipointIcon(newData, this); @@ -1193,9 +1204,15 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV case PaintMode.polygonIcon: const polygonIcon = new PolygonIcon(newData, this); break; + case PaintMode.Pipeline: + if (item.Name !== '水带') { + const wall = new AxArrowConnector(newData, this); + } + break; } this.selection.select(this.backgroundImage.getChildByName(newData.Id)); }); + this.emit('backgroundScale', this.backgroundImage.scale.x); } } diff --git a/src/assets/css/ngZorroTree.css b/src/assets/css/ngZorroTree.css index 8f8eecf..2386294 100644 --- a/src/assets/css/ngZorroTree.css +++ b/src/assets/css/ngZorroTree.css @@ -344,9 +344,15 @@ text-align: center; cursor: pointer } -#createtestscore .ant-tree .ant-tree-switcher { +#createtestscore,#nodeTree .ant-tree .ant-tree-switcher { line-height: 22px; } +#uploadfiretree .ant-tree .ant-tree-switcher { + line-height: 20px; +} +#disposalNodeTree .ant-tree-checkbox { + margin-top: 10px; +} .ant-tree .ant-tree-switcher .ant-select-tree-switcher-icon, .ant-tree .ant-tree-switcher .ant-tree-switcher-icon { diff --git a/src/styles.scss b/src/styles.scss index 20e211e..16022e1 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -98,11 +98,17 @@ table td.mat-footer-cell:last-of-type{ } //可展开面板按钮颜色 -#createtestscore{ +#createtestscore,#materialBank{ .mat-expansion-indicator::after { color: #333333; } } +#materialBank{ + .mat-expansion-panel-header{ + background-color: #d6f4f5 + } +} + //弹出框样式取消padding #addPlanTwo,#lookTreeNode{ padding: 0;