From 53507ee395778f3842553a828f539ceadcfd7f66 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Tue, 15 Dec 2020 09:43:37 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=88=9B=E5=BB=BA?=
=?UTF-8?q?=E8=80=83=E9=A2=98=E5=87=BD=E6=95=B0=E4=BF=AE=E6=94=B9=E4=B8=BA?=
=?UTF-8?q?=E4=B8=B2=E8=A1=8C=E8=BF=90=E8=A1=8C=EF=BC=8C=E5=AE=8C=E5=96=84?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A2=84=E6=A1=88=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../create-test-score/addPlanTwo.html | 3 -
.../create-test-score.component.scss | 7 +-
.../create-test-score.component.ts | 480 ++++++++++--------
.../examiner-index.component.html | 6 +-
src/styles.scss | 4 +-
5 files changed, 270 insertions(+), 230 deletions(-)
diff --git a/src/app/examiner/create-test-score/addPlanTwo.html b/src/app/examiner/create-test-score/addPlanTwo.html
index a9476d1..cdbfab8 100644
--- a/src/app/examiner/create-test-score/addPlanTwo.html
+++ b/src/app/examiner/create-test-score/addPlanTwo.html
@@ -5,7 +5,6 @@
</div>
<div class="tablebox">
<table mat-table [dataSource]="dataSource" class="mat-elevation-z8">
- <!-- <mat-radio-group class="example-radio-group" [(ngModel)]="selectedradio"> -->
<!-- Checkbox Column -->
<ng-container matColumnDef="select">
@@ -45,8 +44,6 @@
<tr mat-row *matRowDef="let row; columns: displayedColumns;"
>
</tr>
- <!-- </mat-radio-group> -->
-
</table>
</div>
diff --git a/src/app/examiner/create-test-score/create-test-score.component.scss b/src/app/examiner/create-test-score/create-test-score.component.scss
index a4422c6..4389242 100644
--- a/src/app/examiner/create-test-score/create-test-score.component.scss
+++ b/src/app/examiner/create-test-score/create-test-score.component.scss
@@ -8,10 +8,11 @@ table { text-align: center; border-collapse: collapse; padding:2px;}
-ms-user-select: none;
user-select: none;
scrollbar-width: none; /* Firefox */
+ scrollbar-face-color: #fcfcfc;
}
-::-webkit-scrollbar {
- display: none; /* Chrome Safari */
-}
+// ::-webkit-scrollbar {
+// display: none; /* Chrome Safari */
+// }
.box{
width: 100%;
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 819556a..3491d70 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
@@ -23,16 +23,15 @@ export class CreateTestScoreComponent implements OnInit {
this.selectedTab = index
}
ngOnInit(): void {
- // this.getUnitData()
- // .then(()=>{
- // this.getAround()
- // })
-
- this.getUnitData()
- this.getAround()
- this.getKeySite()
- this.getFunDiv()
- this.getFireFac()
+ this.getUnitData().then(()=>{
+ this.getAround().then(()=>{
+ this.getKeySite().then(()=>{
+ this.getFunDiv().then(()=>{
+ this.getFireFac()
+ })
+ })
+ })
+ })
}
//当前选中的单位
selectedUnitIndex = 0
@@ -48,18 +47,19 @@ export class CreateTestScoreComponent implements OnInit {
unitId:any = JSON.parse(localStorage.getItem('checkedWork'))
//获取单位基本信息
- getUnitData(){
-
- this.unitId.forEach((element,index) => {
- element.score = 0
- element.basicInfoScore = 0
- element.basicInfoItemScore = 0
-
+ async getUnitData(){
+ 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 = {
name: '单位信息',
type:'基本信息',
- expanded: false,
+ expanded: true,
key:(Math.random()*10000000).toString(16).substr(0,4)+(new Date()).getTime()+Math.random().toString().substr(2,5),
children:[]
}
@@ -84,113 +84,117 @@ export class CreateTestScoreComponent implements OnInit {
element.basicInfoNodes = []
element.basicInfoNodes.push(unitData)
-
+
+ resolve(1)
+ })
+ }).then(async ()=>{
+ let result2 = await new Promise((resolve, reject) => {
var buildingsData:any
this.http.get("/api/Buildings",{
params:{
companyId:element.id
}
}).subscribe(async (data:any)=>{
- buildingsData = data
- for (let i = 0, length = data.length; i < length; i++){
- const result = await new Promise((resolve) =>{
- this.http.get("/api/BuildingBasicInfos",{ // 循环请求当前单位建筑每一个建筑的信息保存到数组中
- params:{
- companyId :element.id,
- buildingId:data[i].id,
- buildingType:data[i].buildingTypes[0].id
- }
- }).subscribe((buildingsData:any)=>{
- 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){//如果是表格类
- var map = {},
- dest:any = [];
- for(var i = 0; i < y.propertyInfos.length; i++){
- var ai = y.propertyInfos[i];
- if(!map[ai.propertyName]){
- dest.push({
- propertyName: ai.propertyName,
- data: [ai]
- });
- map[ai.propertyName] = ai;
- }else{
- for(var j = 0; j < dest.length; j++){
- var dj = dest[j];
- if(dj.propertyName == ai.propertyName){
- dj.data.push(ai);
- break;
- }
+ await getAllBuildingData(data)
+ resolve(2)
+ })
+ })
+ })
+ async function getAllBuildingData(data){
+ for (let i = 0, length = data.length; i < length; i++){
+ const result = await new Promise((resolve) =>{
+ that.http.get("/api/BuildingBasicInfos",{ // 循环请求当前单位建筑每一个建筑的信息保存到数组中
+ params:{
+ companyId :element.id,
+ buildingId:data[i].id,
+ buildingType:data[i].buildingTypes[0].id
+ }
+ }).subscribe((buildingsData:any)=>{
+ 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){//如果是表格类
+ var map = {},
+ dest:any = [];
+ for(var i = 0; i < y.propertyInfos.length; i++){
+ var ai = y.propertyInfos[i];
+ if(!map[ai.propertyName]){
+ dest.push({
+ propertyName: ai.propertyName,
+ data: [ai]
+ });
+ map[ai.propertyName] = ai;
+ }else{
+ for(var j = 0; j < dest.length; j++){
+ var dj = dest[j];
+ if(dj.propertyName == ai.propertyName){
+ dj.data.push(ai);
+ break;
}
}
}
- //根据行数确定在循环数组中的index
- dest.forEach(item => {
- item.data.sort(function(a,b){
- return Number(a.tag) - Number(b.tag)
- })
- })
- 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)
- }
- })
- }else{
- y.propertyInfos.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.propertyName
- propertyInfosArr.push(x)
- }
- })
+ }
+ //根据行数确定在循环数组中的index
+ dest.forEach(item => {
+ item.data.sort(function(a,b){
+ return Number(a.tag) - Number(b.tag)
+ })
+ })
+ 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(propertyInfosArr.length != 0){
- element.basicInfoNodes.push({
- name:y.name != '基本信息' ? buildingsData.name + '-' + y.name : buildingsData.name ,
- type:'基本信息',
- expanded: false,
- key:(Math.random()*10000000).toString(16).substr(0,4)+(new Date()).getTime()+Math.random().toString().substr(2,5),
- children:propertyInfosArr,
- tabledata:tabledata ? tabledata : null
- })
- element.basicInfoNodes = [...element.basicInfoNodes]
+ })
+ }else{
+ y.propertyInfos.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.propertyName
+ propertyInfosArr.push(x)
}
-
})
-
- resolve(i)
- })
+ }
+ if(propertyInfosArr.length != 0){
+ element.basicInfoNodes.push({
+ name:y.name != '基本信息' ? buildingsData.name + '-' + y.name : buildingsData.name ,
+ type:'基本信息',
+ expanded: true,
+ key:(Math.random()*10000000).toString(16).substr(0,4)+(new Date()).getTime()+Math.random().toString().substr(2,5),
+ children:propertyInfosArr,
+ tabledata:tabledata ? tabledata : null
+ })
+ element.basicInfoNodes = [...element.basicInfoNodes]
+ }
+
})
- }
+ resolve(i)
+ })
})
-
- })
-
- })
-
+ }
+ }
-
+ }
}
//获取四周毗邻数据
- getAround(){
-
- this.unitId.forEach((element,index) => {
- element.aroundScore = 0
- element.aroundItemScore = 0
- element.aroundNodes = []
- //获得当前单位的单位毗邻
- let id = {companyId:element.id}
+ async getAround(){
+ 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) => {
this.http.get('/api/CompanyAdjoins',{params:id}).subscribe((data:any)=>{
- // console.log(index+'四周毗邻',data)
data.forEach(item => {
item.direction == 0 ? item.title = '东方向' : null
item.direction == 1 ? item.title = '西方向' : null
@@ -205,95 +209,113 @@ export class CreateTestScoreComponent implements OnInit {
})
//如果存在单位毗邻
if(data.length != 0){
- this.unitId[index].aroundNodes.push({
+ this.unitId[y].aroundNodes.push({
name: '单位毗邻',
key: (Math.random()*10000000).toString(16).substr(0,4)+(new Date()).getTime()+Math.random().toString().substr(2,5),
- expanded: false,
+ expanded: true,
type:'四周毗邻',
children: data
})
element.aroundNodes = [...element.aroundNodes]
}
-
+ resolve(1)
})
-
+ }).then(async ()=>{
//获得当前单位的建筑毗邻
- this.http.get('/api/Buildings',{params:id}).subscribe((data:any)=>{
- if (data.length) {
- getAllArchitecture(data)
- }
+ let result2 = await new Promise((resolve, reject) => {
+ this.http.get('/api/Buildings',{params:id}).subscribe(async (data:any)=>{
+ if (data.length) {
+ await getAllArchitecture(data)
+ resolve(2)
+ }
+ })
})
- let that = this
- async function getAllArchitecture(buildingsdata){
- for (let i = 0, length = buildingsdata.length; i < length; i++){
- let id = {buildingId:buildingsdata[i].id}
- let result = await new Promise((resolve, reject) => {
- that.http.get('/api/BuildingAdjoins',{params:id}).subscribe((data:any)=>{
- data.forEach(item => {
- item.direction == 0 ? item.title = '东方向' : null
- item.direction == 1 ? item.title = '西方向' : null
- item.direction == 2 ? item.title = '南方向' : null
- item.direction == 3 ? item.title = '北方向' : null
- item.direction == 4 ? item.title = '东南方向' : null
- item.direction == 5 ? item.title = '西南方向' : null
- item.direction == 6 ? item.title = '东北方向' : null
- item.direction == 7 ? item.title = '西北方向' : null
- item.isLeaf = true
- item.key = item.id
- })
- if(data.length != 0){
- that.unitId[index].aroundNodes.push({
- name: buildingsdata[i].name,
- key: (Math.random()*10000000).toString(16).substr(0,4)+(new Date()).getTime()+Math.random().toString().substr(2,5),
- expanded: false,
- type:'四周毗邻',
- children: data
- })
- element.aroundNodes = [...element.aroundNodes]
- }
- resolve('1')
- })
- })
- }
+ })
+ async function getAllArchitecture(buildingsdata){
+ for (let i = 0, length = buildingsdata.length; i < length; i++){
+ let id = {buildingId:buildingsdata[i].id}
+ let result = await new Promise((resolve, reject) => {
+ that.http.get('/api/BuildingAdjoins',{params:id}).subscribe((data:any)=>{
+ data.forEach(item => {
+ item.direction == 0 ? item.title = '东方向' : null
+ item.direction == 1 ? item.title = '西方向' : null
+ item.direction == 2 ? item.title = '南方向' : null
+ item.direction == 3 ? item.title = '北方向' : null
+ item.direction == 4 ? item.title = '东南方向' : null
+ item.direction == 5 ? item.title = '西南方向' : null
+ item.direction == 6 ? item.title = '东北方向' : null
+ item.direction == 7 ? item.title = '西北方向' : null
+ item.isLeaf = true
+ item.key = item.id
+ })
+ if(data.length != 0){
+ that.unitId[y].aroundNodes.push({
+ name: buildingsdata[i].name,
+ key: (Math.random()*10000000).toString(16).substr(0,4)+(new Date()).getTime()+Math.random().toString().substr(2,5),
+ expanded: true,
+ type:'四周毗邻',
+ children: data
+ })
+ element.aroundNodes = [...element.aroundNodes]
+ }
+ resolve('1')
+ })
+ })
}
- })
+ }
+ }
}
//获取重点部位
- getKeySite(){
+ async getKeySite(){
let that = this
- this.unitId.forEach((element,index) =>{
+ for (let y = 0, length = this.unitId.length; y < length; y++){
+ let element = this.unitId[y]
element.keySiteScore = 0
element.keySiteItemScore = 0
element.keySiteNodes = []
//获得单位重点部位
let id = {companyId:element.id}
- this.http.get('/api/CompanyImportantLocations',{params:id}).subscribe((data:any)=>{
- //如果存在单位毗邻
- let newData = []
- data.forEach(item => {
- item.isLeaf = true
- item.key = item.id
- item.name ? newData.push(item) : null
+
+ let result1 = await new Promise((resolve, reject) => {
+ this.http.get('/api/CompanyImportantLocations',{params:id}).subscribe((data:any)=>{
+ //如果存在单位毗邻
+ let newData = []
+ data.forEach(item => {
+ item.isLeaf = true
+ item.key = item.id
+ item.name ? newData.push(item) : null
+ })
+ if(data.length != 0){
+ this.unitId[y].keySiteNodes.push({
+ name: '单位重点部位',
+ key: (Math.random()*10000000).toString(16).substr(0,4)+(new Date()).getTime()+Math.random().toString().substr(2,5),
+ expanded: true,
+ type:'重点部位',
+ children: newData
+ })
+ element.keySiteNodes = [...element.keySiteNodes]
+ }
+ resolve(1)
})
- if(data.length != 0){
- this.unitId[index].keySiteNodes.push({
- name: '单位重点部位',
- key: (Math.random()*10000000).toString(16).substr(0,4)+(new Date()).getTime()+Math.random().toString().substr(2,5),
- expanded: false,
- type:'重点部位',
- children: newData
+ }).then(async ()=>{
+ //获得建筑重点部位
+ let result2 = await new Promise((resolve, reject) => {
+ this.http.get('/api/Buildings',{params:id}).subscribe(async (data:any)=>{
+ if (data.length) {
+ await getAllBuildingPositon(data)
+ resolve(2)
+ }
})
- element.keySiteNodes = [...element.keySiteNodes]
- }})
-
- //获得建筑重点部位
- this.http.get('/api/Buildings',{params:id}).subscribe((data:any)=>{
- if (data.length) {
- getAllBuildingPositon(data)
- }
+ })
+
})
+
+
+
+
+
//获取当前单位所有建筑重点部位
async function getAllBuildingPositon (buildingsdata) {
for (let i = 0, length = buildingsdata.length; i < length; i++){
@@ -307,10 +329,10 @@ export class CreateTestScoreComponent implements OnInit {
item.name ? newData.push(item) : null
})
if(newData.length != 0){
- that.unitId[index].keySiteNodes.push({
+ that.unitId[y].keySiteNodes.push({
name: buildingsdata[i].name,
key: (Math.random()*10000000).toString(16).substr(0,4)+(new Date()).getTime()+Math.random().toString().substr(2,5),
- expanded: false,
+ expanded: true,
type:'重点部位',
children: newData
})
@@ -322,46 +344,54 @@ export class CreateTestScoreComponent implements OnInit {
}
}
- })
- //获取单位重点部位
-
-
+ }
}
//获取功能分区
- getFunDiv(){
+ async getFunDiv(){
let that = this
- this.unitId.forEach((element,index) =>{
+ 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}
//单位功能分区
- this.http.get('/api/CompanyFunctionalDivisions',{params:id}).subscribe((data:any)=>{
- //如果存在单位的单位功能分区
- let newData = []
- data.forEach(item => {
- item.isLeaf = true
- item.key = item.id
- item.region ? newData.push(item) : null
+ let result1 = await new Promise((resolve, reject) => {
+ this.http.get('/api/CompanyFunctionalDivisions',{params:id}).subscribe((data:any)=>{
+ //如果存在单位的单位功能分区
+ let newData = []
+ data.forEach(item => {
+ item.isLeaf = true
+ item.key = item.id
+ item.region ? newData.push(item) : null
+ })
+ if(data.length != 0){
+ this.unitId[y].funDivNodes.push({
+ name: '单位功能分区',
+ key: (Math.random()*10000000).toString(16).substr(0,4)+(new Date()).getTime()+Math.random().toString().substr(2,5),
+ expanded: true,
+ type:'功能分区',
+ children: newData
+ })
+ element.funDivNodes = [...element.funDivNodes]
+ }
+ resolve(1)
})
- if(data.length != 0){
- this.unitId[index].funDivNodes.push({
- name: '单位功能分区',
- key: (Math.random()*10000000).toString(16).substr(0,4)+(new Date()).getTime()+Math.random().toString().substr(2,5),
- expanded: false,
- type:'功能分区',
- children: newData
+ }).then(async ()=>{
+ //建筑功能分区
+ let result2 = await new Promise((resolve, reject) => {
+ this.http.get('/api/Buildings',{params:id}).subscribe(async (data:any)=>{
+ if (data.length) {
+ await getAllBuildingFunDiv(data)
+ resolve(2)
+ }
})
- element.funDivNodes = [...element.funDivNodes]
- }
+ })
})
- //建筑功能分区
- this.http.get('/api/Buildings',{params:id}).subscribe((data:any)=>{
- if (data.length) {
- getAllBuildingFunDiv(data)
- }
- })
+
+
+
//获取当前单位所有建筑功能分区
async function getAllBuildingFunDiv (buildingsdata) {
for (let i = 0, length = buildingsdata.length; i < length; i++){
@@ -377,10 +407,10 @@ export class CreateTestScoreComponent implements OnInit {
})
if(newData.length != 0){
- that.unitId[index].funDivNodes.push({
+ that.unitId[y].funDivNodes.push({
name: buildingsdata[i].name,
key: (Math.random()*10000000).toString(16).substr(0,4)+(new Date()).getTime()+Math.random().toString().substr(2,5),
- expanded: false,
+ expanded: true,
type:'功能分区',
children: newData
})
@@ -393,7 +423,7 @@ export class CreateTestScoreComponent implements OnInit {
}
}
- })
+ }
}
//获取消防设施
getFireFac(){
@@ -426,7 +456,7 @@ export class CreateTestScoreComponent implements OnInit {
this.unitId[index].fireFacNodes.push({
name: '单位消防设施',
key: (Math.random()*10000000).toString(16).substr(0,4)+(new Date()).getTime()+Math.random().toString().substr(2,5),
- expanded: false,
+ expanded: true,
type:'消防设施',
children: newData
})
@@ -442,6 +472,7 @@ export class CreateTestScoreComponent implements OnInit {
}}).subscribe((data:any)=>{
if (data.length != 0) { getAllBuildingFireFac(data) }
})
+
async function getAllBuildingFireFac (buildingsdata) {
// console.log('建筑'+index,buildingsdata)
for (let i = 0, length = buildingsdata.length; i < length; i++){
@@ -467,7 +498,7 @@ export class CreateTestScoreComponent implements OnInit {
that.unitId[index].fireFacNodes.push({
name: buildingsdata[i].name,
key: buildingsdata[i].id,
- expanded: false,
+ expanded: true,
type:'消防设施',
children: newData
})
@@ -677,13 +708,13 @@ export class CreateTestScoreComponent implements OnInit {
//添加预案
addPlan(){
- let companyId = {
- companyId : this.unitId[this.selectedUnitIndex].id
+ let companyData = {
+ companyData : this.unitId[this.selectedUnitIndex]
}
const dialogRef = this.dialog.open(AddPlanDialog, {
width: '380px',
height: '136px',
- data: companyId
+ data: companyData
});
dialogRef.afterClosed().subscribe(result => {
@@ -1026,7 +1057,7 @@ export class AddPlanDialog {
selectType(type){
let obj = {
type:type,
- companyId:this.data.companyId
+ companyData:this.data
}
const dialogRef = this.dialog.open(AddPlanTwoDialog, {
id:'addPlanTwo',
@@ -1048,27 +1079,26 @@ export class AddPlanDialog {
})
export class AddPlanTwoDialog {
- constructor(private http: HttpClient,public dialog: MatDialog,public dialogRef: MatDialogRef<AddPlanTwoDialog>,@Inject(MAT_DIALOG_DATA) public data: any) {}
+ constructor(public snackBar: MatSnackBar,private http: HttpClient,public dialog: MatDialog,public dialogRef: MatDialogRef<AddPlanTwoDialog>,@Inject(MAT_DIALOG_DATA) public data: any) {}
planType:any = this.data.type == 1 ? true : false//显示的预案类型
displayedColumns: string[] = ['select', 'name', 'people', 'time', 'level'];
dataSource : any //列表数据
- selectedradio
+ selectedRadioData:any//当前选择的二维预案
radioChange(e){
- console.log(e)
+ this.selectedRadioData = e
}
ngOnInit(): void {
- // console.log(this.data.companyId)
this.get2DPlan()
+ console.log(this.data)
}
//获取当前公司的二维预案
get2DPlan(){
let planArr = []
this.http.get('/api/PlanComponents',{params:{
- companyId:this.data.companyId
+ companyId:this.data.companyData.companyData.id
}}).subscribe((data:any) => {
- console.log(123,data)
data.items.forEach(item => {
item.planType == 1 ? planArr.push(item) : null
})
@@ -1081,8 +1111,20 @@ export class AddPlanTwoDialog {
}
//确定
confirm(){
- if(this.planType == 1){
-
+ if(this.planType){//如果选择的是已存在预案
+ if(this.selectedRadioData){
+ // console.log(this.selectedRadioData)
+ // console.log(this.data.companyData)
+ 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')
+ }else{
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('请选择要添加的预案','确定',config);
+ }
}else{
}
diff --git a/src/app/examiner/examiner-index/examiner-index.component.html b/src/app/examiner/examiner-index/examiner-index.component.html
index 44cf7b5..074f5b9 100644
--- a/src/app/examiner/examiner-index/examiner-index.component.html
+++ b/src/app/examiner/examiner-index/examiner-index.component.html
@@ -11,12 +11,12 @@
<div class="queryBox">
<div class="queryField">
<label style="margin-right: 10px;font-size: 18px;">消防救援站:</label>
- <input list="cars" placeholder="请输入用户账号" [(ngModel)]="accound" />
- <datalist id="cars">
+ <input placeholder="请输入用户账号" [(ngModel)]="accound" />
+ <!-- <datalist id="cars">
<option value="admin">
<option value="surper">
<option value="ceshi">
- </datalist>
+ </datalist> -->
</div>
<div class="queryField">
<button style="background-color: #07CDCF;" (click)="findClick()">查询</button>
diff --git a/src/styles.scss b/src/styles.scss
index 0febfb6..20e211e 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -67,11 +67,11 @@ table td.mat-footer-cell:last-of-type{
//滚动条样式
::-webkit-scrollbar{
- width: 5px;
+ width: 6px;
background-color: white;
}
::-webkit-scrollbar-thumb{
- background-color: #999;
+ background-color: #07CDCF;
}
//x轴滚动条隐藏
From 889a66018ee668445aaf544bd5e53f22d90dae39 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Tue, 15 Dec 2020 12:41:29 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=AE=8C=E5=96=84?=
=?UTF-8?q?=E8=BF=9B=E5=85=A5=E7=BC=96=E5=88=B6=E5=B7=A5=E5=85=B7=E9=80=BB?=
=?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/app/canvas-share-data.service.ts | 2 +-
.../create-test-score/addPlanTwo.html | 2 +-
.../create-test-score.component.ts | 61 +++++++++++++------
.../pages/lockscreen/lockscreen.component.ts | 1 +
src/app/pages/login/login.component.ts | 1 +
.../collection-tools.component.ts | 2 +-
6 files changed, 49 insertions(+), 20 deletions(-)
diff --git a/src/app/canvas-share-data.service.ts b/src/app/canvas-share-data.service.ts
index 6c915cf..15b4de8 100644
--- a/src/app/canvas-share-data.service.ts
+++ b/src/app/canvas-share-data.service.ts
@@ -29,7 +29,7 @@ export class CanvasShareDataService {
/**
* 游戏模式
*/
- gameMode: GameMode = GameMode.BasicInformation;
+ gameMode: GameMode = GameMode.Assignment;
facilityAssetsName = new Map<string, string>([
[ '消防水池', '消防水池'],
diff --git a/src/app/examiner/create-test-score/addPlanTwo.html b/src/app/examiner/create-test-score/addPlanTwo.html
index cdbfab8..63fdd29 100644
--- a/src/app/examiner/create-test-score/addPlanTwo.html
+++ b/src/app/examiner/create-test-score/addPlanTwo.html
@@ -57,7 +57,7 @@
预案名称
</p>
<div class="input">
- <input type="text" placeholder="请输入自定义名称">
+ <input type="text" placeholder="请输入自定义名称" [(ngModel)]="customPlanName">
</div>
</div>
</div>
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 3491d70..b8ec060 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
@@ -32,6 +32,9 @@ export class CreateTestScoreComponent implements OnInit {
})
})
})
+ // Promise.all([this.getUnitData(),this.getAround(),this.getKeySite(),this.getFunDiv()]).then(()=>{
+ // this.getFireFac()
+ // })
}
//当前选中的单位
selectedUnitIndex = 0
@@ -231,7 +234,6 @@ export class CreateTestScoreComponent implements OnInit {
})
})
})
-
async function getAllArchitecture(buildingsdata){
for (let i = 0, length = buildingsdata.length; i < length; i++){
let id = {buildingId:buildingsdata[i].id}
@@ -259,7 +261,7 @@ export class CreateTestScoreComponent implements OnInit {
})
element.aroundNodes = [...element.aroundNodes]
}
- resolve('1')
+ resolve(1)
})
})
}
@@ -271,6 +273,7 @@ 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
@@ -834,8 +837,9 @@ export class CreateTestScoreComponent implements OnInit {
i.children = newChildren
delete i.selected
})
+ console.log(111,item)
//建筑的重点部位模块处理
- item.keySiteNodes.forEach((i,key) => {
+ item.keySiteNodes ? item.keySiteNodes.forEach((i,key) => {
i.selected ? i.selected = null : null
//如果顶级节点未选中则需要筛除没有选中的数据
if(!i.checked){
@@ -909,9 +913,9 @@ export class CreateTestScoreComponent implements OnInit {
delete i.selected
- })
+ }) : null
//建筑的功能分区模块处理
- item.funDivNodes.forEach((i,key) => {
+ item.funDivNodes ? item.funDivNodes.forEach((i,key) => {
//如果顶级节点未选中则需要筛除没有选中的数据
if(!i.checked){
@@ -966,9 +970,9 @@ export class CreateTestScoreComponent implements OnInit {
})
i.children = newChildren
delete i.selected
- })
+ }) : null
//建筑的数据核验模块处理
- item.fireFacNodes.forEach((i,key) => {
+ item.fireFacNodes ? item.fireFacNodes.forEach((i,key) => {
i.selected ? i.selected = null : null
//如果顶级节点未选中则需要筛除没有选中的数据
if(!i.checked){
@@ -993,7 +997,7 @@ export class CreateTestScoreComponent implements OnInit {
})
i.children = newChildren
delete i.selected
- })
+ }) : null
})
//循环每个建筑处理数据
@@ -1005,15 +1009,15 @@ export class CreateTestScoreComponent implements OnInit {
paperDataInfo[key].id = null
paperDataInfo[key].paperId = null
paperDataInfo[key].companyId = item.id
- paperDataInfo[key].basicInfoData = JSON.stringify(item.basicInfoNodes)
+ paperDataInfo[key].basicInfoData = item.basicInfoNodes ? JSON.stringify(item.basicInfoNodes) : '[]'
paperDataInfo[key].basicInfoScore = item.basicInfoScore
- paperDataInfo[key].adjoinData = JSON.stringify(item.aroundNodes)
+ paperDataInfo[key].adjoinData = item.aroundNodes ? JSON.stringify(item.aroundNodes) : '[]'
paperDataInfo[key].adjoinScore = item.aroundScore
- paperDataInfo[key].importLocationData = JSON.stringify(item.keySiteNodes)
+ paperDataInfo[key].importLocationData = item.keySiteNodes ? JSON.stringify(item.keySiteNodes) : '[]'
paperDataInfo[key].importLocationScore = item.keySiteScore
- paperDataInfo[key].functionalDivisionData = JSON.stringify(item.funDivNodes)
+ paperDataInfo[key].functionalDivisionData = item.funDivNodes ? JSON.stringify(item.funDivNodes) : '[]'
paperDataInfo[key].functionalDivisionScore = item.funDivScore
- paperDataInfo[key].facilityData = JSON.stringify(item.fireFacNodes)
+ paperDataInfo[key].facilityData = item.fireFacNodes ? JSON.stringify(item.fireFacNodes) : '[]'
paperDataInfo[key].facilityScore = item.fireFacScore
})
@@ -1065,7 +1069,7 @@ export class AddPlanDialog {
});
dialogRef.afterClosed().subscribe(result => {
- console.log('The dialog was closed');
+ this.dialogRef.close();
});
}
}
@@ -1085,6 +1089,7 @@ export class AddPlanTwoDialog {
displayedColumns: string[] = ['select', 'name', 'people', 'time', 'level'];
dataSource : any //列表数据
selectedRadioData:any//当前选择的二维预案
+ customPlanName:any//自定义预案名称
radioChange(e){
this.selectedRadioData = e
}
@@ -1113,8 +1118,8 @@ export class AddPlanTwoDialog {
confirm(){
if(this.planType){//如果选择的是已存在预案
if(this.selectedRadioData){
- // console.log(this.selectedRadioData)
- // console.log(this.data.companyData)
+ this.dialogRef.close();
+ 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)
@@ -1125,8 +1130,30 @@ export class AddPlanTwoDialog {
config.duration = 3000
this.snackBar.open('请选择要添加的预案','确定',config);
}
- }else{
+ }else{//如果选择的是自定义预案
+
+ let level = sessionStorage.getItem('level')
+ let body = {
+ id: "",
+ name: this.customPlanName,
+ planType:1,
+ planMode: 2,
+ planLevel:Number(level),
+ url: "",
+ attachmentUrls: null
+ }
+ this.http.post("/api/PlanComponents2D",body,{params:{
+ companyId : this.data.companyData.companyData.id
+ }}).subscribe((data:any)=>{
+ // console.log("创建成功")
+ this.dialogRef.close(data);
+ sessionStorage.setItem("planId",data.id);
+ 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')
+ })
}
}
//取消
diff --git a/src/app/pages/lockscreen/lockscreen.component.ts b/src/app/pages/lockscreen/lockscreen.component.ts
index 53a6b47..ec4d81f 100644
--- a/src/app/pages/lockscreen/lockscreen.component.ts
+++ b/src/app/pages/lockscreen/lockscreen.component.ts
@@ -33,6 +33,7 @@ export class LockscreenComponent implements OnInit {
sessionStorage.setItem("roleType",data.roleType);
sessionStorage.setItem("token",data.token);
sessionStorage.setItem("refreshToken",data.refreshToken);
+ sessionStorage.setItem("level",data.level);
this.token.startUp(); //登陆成功启动定时器刷新token
this.router.navigate(['/home/createexam-index']) //登陆成功跳转页面
},(err) => {this.errmsg = err})
diff --git a/src/app/pages/login/login.component.ts b/src/app/pages/login/login.component.ts
index 1e88131..d7df934 100644
--- a/src/app/pages/login/login.component.ts
+++ b/src/app/pages/login/login.component.ts
@@ -33,6 +33,7 @@ export class LoginComponent implements OnInit {
sessionStorage.setItem("roleType",data.roleType);
sessionStorage.setItem("token",data.token);
sessionStorage.setItem("refreshToken",data.refreshToken);
+ sessionStorage.setItem("level",data.level);
this.token.startUp(); //登陆成功启动定时器刷新token
this.router.navigate(['/home/teachear']) //登陆成功跳转页面
},(err) => {this.errmsg = err})
diff --git a/src/app/ui/collection-tools/collection-tools.component.ts b/src/app/ui/collection-tools/collection-tools.component.ts
index 6532736..758ee55 100644
--- a/src/app/ui/collection-tools/collection-tools.component.ts
+++ b/src/app/ui/collection-tools/collection-tools.component.ts
@@ -629,7 +629,7 @@ export class CollectionToolsComponent implements OnInit {
isSixbtn = true //控制想定作业编辑按钮
isxxx = true //控制查看编辑模式的编辑模式按钮
examMsg = { //单位,考试信息
- conpanyName: '富丽华大酒店', //单位名称
+ conpanyName: sessionStorage.getItem('companyName'), //单位名称
keynote: '', //考试要点
grade: '', //分数
}