shaojiahao
/
examSystem-Anxin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/examSystem-Anxin

master
chenjingyu 4 years ago
parent
5b0e87c371 d2a6373a0f
commit
1ddb7276db
10 changed files with 313 additions and 244 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/app/canvas-share-data.service.ts
  2. 5
      src/app/examiner/create-test-score/addPlanTwo.html
  3. 7
      src/app/examiner/create-test-score/create-test-score.component.scss
  4. 531
      src/app/examiner/create-test-score/create-test-score.component.ts
  5. 2
      src/app/examiner/create-test-score/finishDialog.html
  6. 2
      src/app/examiner/examiner-index/examiner-index.component.html
  7. 1
      src/app/pages/lockscreen/lockscreen.component.ts
  8. 1
      src/app/pages/login/login.component.ts
  9. 2
      src/app/ui/collection-tools/collection-tools.component.ts
  10. 4
      src/styles.scss

2
src/app/canvas-share-data.service.ts
Unescape View File

@ -29,7 +29,7 @@ export class CanvasShareDataService {
/** /**
* 游戏模式 * 游戏模式
*/ */
gameMode: GameMode = GameMode.BasicInformation; gameMode: GameMode = GameMode.Assignment;
facilityAssetsName = new Map<string, string>([ facilityAssetsName = new Map<string, string>([
[ '消防水池', '消防水池'], [ '消防水池', '消防水池'],

5
src/app/examiner/create-test-score/addPlanTwo.html
Unescape View File

@ -5,7 +5,6 @@
</div> </div>
<div class="tablebox"> <div class="tablebox">
<table mat-table [dataSource]="dataSource" class="mat-elevation-z8"> <table mat-table [dataSource]="dataSource" class="mat-elevation-z8">
<!-- <mat-radio-group class="example-radio-group" [(ngModel)]="selectedradio"> -->
<!-- Checkbox Column --> <!-- Checkbox Column -->
<ng-container matColumnDef="select"> <ng-container matColumnDef="select">
@ -45,8 +44,6 @@
<tr mat-row *matRowDef="let row; columns: displayedColumns;" <tr mat-row *matRowDef="let row; columns: displayedColumns;"
> >
</tr> </tr>
<!-- </mat-radio-group> -->
</table> </table>
</div> </div>
@ -60,7 +57,7 @@
预案名称 预案名称
</p> </p>
<div class="input"> <div class="input">
<input type="text" placeholder="请输入自定义名称"> <input type="text" placeholder="请输入自定义名称" [(ngModel)]="customPlanName">
</div> </div>
</div> </div>
</div> </div>

7
src/app/examiner/create-test-score/create-test-score.component.scss
Unescape View File

@ -8,10 +8,11 @@ table { text-align: center; border-collapse: collapse; padding:2px;}
-ms-user-select: none; -ms-user-select: none;
user-select: none; user-select: none;
scrollbar-width: none; /* Firefox */ scrollbar-width: none; /* Firefox */
scrollbar-face-color: #fcfcfc;
} }
::-webkit-scrollbar { // ::-webkit-scrollbar {
display: none; /* Chrome Safari */ // display: none; /* Chrome Safari */
} // }
.box{ .box{
width: 100%; width: 100%;

531
src/app/examiner/create-test-score/create-test-score.component.ts
Unescape View File

@ -23,16 +23,18 @@ export class CreateTestScoreComponent implements OnInit {
this.selectedTab = index this.selectedTab = index
} }
ngOnInit(): void { ngOnInit(): void {
// this.getUnitData() this.getUnitData().then(()=>{
// .then(()=>{ this.getAround().then(()=>{
// this.getAround() this.getKeySite().then(()=>{
this.getFunDiv().then(()=>{
this.getFireFac()
})
})
})
})
// Promise.all([this.getUnitData(),this.getAround(),this.getKeySite(),this.getFunDiv()]).then(()=>{
// this.getFireFac()
// }) // })
this.getUnitData()
this.getAround()
this.getKeySite()
this.getFunDiv()
this.getFireFac()
} }
//当前选中的单位 //当前选中的单位
selectedUnitIndex = 0 selectedUnitIndex = 0
@ -48,18 +50,19 @@ export class CreateTestScoreComponent implements OnInit {
unitId:any = JSON.parse(sessionStorage.getItem('checkedWork')) unitId:any = JSON.parse(sessionStorage.getItem('checkedWork'))
//获取单位基本信息 //获取单位基本信息
getUnitData(){ async getUnitData(){
let that = this
this.unitId.forEach((element,index) => { for (let y = 0, length = this.unitId.length; y < length; y++){
element.score = 0 let element = this.unitId[y]
element.basicInfoScore = 0 element.score = 0
element.basicInfoItemScore = 0 element.basicInfoScore = 0
element.basicInfoItemScore = 0
let result1 = await new Promise((resolve, reject) => {
this.http.get(`/api/Companies/${element.id}`).subscribe((data:any)=>{ this.http.get(`/api/Companies/${element.id}`).subscribe((data:any)=>{
let unitData = { let unitData = {
name: '单位信息', name: '单位信息',
type:'基本信息', type:'基本信息',
expanded: false, expanded: true,
key:(Math.random()*10000000).toString(16).substr(0,4)+(new Date()).getTime()+Math.random().toString().substr(2,5), key:(Math.random()*10000000).toString(16).substr(0,4)+(new Date()).getTime()+Math.random().toString().substr(2,5),
children:[] children:[]
} }
@ -84,113 +87,117 @@ export class CreateTestScoreComponent implements OnInit {
element.basicInfoNodes = [] element.basicInfoNodes = []
element.basicInfoNodes.push(unitData) element.basicInfoNodes.push(unitData)
resolve(1)
})
}).then(async ()=>{
let result2 = await new Promise((resolve, reject) => {
var buildingsData:any var buildingsData:any
this.http.get("/api/Buildings",{ this.http.get("/api/Buildings",{
params:{ params:{
companyId:element.id companyId:element.id
} }
}).subscribe(async (data:any)=>{ }).subscribe(async (data:any)=>{
buildingsData = data await getAllBuildingData(data)
for (let i = 0, length = data.length; i < length; i++){ resolve(2)
const result = await new Promise((resolve) =>{ })
this.http.get("/api/BuildingBasicInfos",{ // 循环请求当前单位建筑每一个建筑的信息保存到数组中 })
params:{ })
companyId :element.id, async function getAllBuildingData(data){
buildingId:data[i].id, for (let i = 0, length = data.length; i < length; i++){
buildingType:data[i].buildingTypes[0].id const result = await new Promise((resolve) =>{
} that.http.get("/api/BuildingBasicInfos",{ // 循环请求当前单位建筑每一个建筑的信息保存到数组中
}).subscribe((buildingsData:any)=>{ params:{
buildingsData.name = data[i].name companyId :element.id,
buildingsData.buildingType = data[i].buildingTypes[0].name buildingId:data[i].id,
buildingsData[0].buildingBasicGroups.forEach((y,m) => { buildingType:data[i].buildingTypes[0].id
let propertyInfosArr = [] }
let tabledata }).subscribe((buildingsData:any)=>{
if(y.type == 1){//如果是表格类 buildingsData.name = data[i].name
var map = {}, buildingsData.buildingType = data[i].buildingTypes[0].name
dest:any = []; buildingsData[0].buildingBasicGroups.forEach((y,m) => {
for(var i = 0; i < y.propertyInfos.length; i++){ let propertyInfosArr = []
var ai = y.propertyInfos[i]; let tabledata
if(!map[ai.propertyName]){ if(y.type == 1){//如果是表格类
dest.push({ var map = {},
propertyName: ai.propertyName, dest:any = [];
data: [ai] for(var i = 0; i < y.propertyInfos.length; i++){
}); var ai = y.propertyInfos[i];
map[ai.propertyName] = ai; if(!map[ai.propertyName]){
}else{ dest.push({
for(var j = 0; j < dest.length; j++){ propertyName: ai.propertyName,
var dj = dest[j]; data: [ai]
if(dj.propertyName == ai.propertyName){ });
dj.data.push(ai); map[ai.propertyName] = ai;
break; }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 => { //根据行数确定在循环数组中的index
item.data.sort(function(a,b){ dest.forEach(item => {
return Number(a.tag) - Number(b.tag) item.data.sort(function(a,b){
}) return Number(a.tag) - Number(b.tag)
}) })
y.tabledata = dest })
tabledata = dest y.tabledata = dest
y.tabledata[0].data.forEach((x,key) => { tabledata = dest
if(x.propertyValue){ y.tabledata[0].data.forEach((x,key) => {
x.key = (Math.random()*10000000).toString(16).substr(0,4)+(new Date()).getTime()+Math.random().toString().substr(2,5) if(x.propertyValue){
x.isLeaf = true x.key = (Math.random()*10000000).toString(16).substr(0,4)+(new Date()).getTime()+Math.random().toString().substr(2,5)
x.name = x.propertyValue x.isLeaf = true
propertyInfosArr.push(x) 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)
}
})
} }
if(propertyInfosArr.length != 0){ })
element.basicInfoNodes.push({ }else{
name:y.name != '基本信息' ? buildingsData.name + '-' + y.name : buildingsData.name , y.propertyInfos.forEach((x,key) => {
type:'基本信息', if(x.propertyValue){
expanded: false, x.key = (Math.random()*10000000).toString(16).substr(0,4)+(new Date()).getTime()+Math.random().toString().substr(2,5)
key:(Math.random()*10000000).toString(16).substr(0,4)+(new Date()).getTime()+Math.random().toString().substr(2,5), x.isLeaf = true
children:propertyInfosArr, x.name = x.propertyName
tabledata:tabledata ? tabledata : null propertyInfosArr.push(x)
})
element.basicInfoNodes = [...element.basicInfoNodes]
} }
}) })
}
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(){ async getAround(){
let that = this
this.unitId.forEach((element,index) => { for (let y = 0, length = this.unitId.length; y < length; y++){
element.aroundScore = 0 let element = this.unitId[y]
element.aroundItemScore = 0 element.aroundScore = 0
element.aroundNodes = [] element.aroundItemScore = 0
//获得当前单位的单位毗邻 element.aroundNodes = []
let id = {companyId:element.id} //获得当前单位的单位毗邻
let id = {companyId:element.id}
let result1 = await new Promise((resolve, reject) => {
this.http.get('/api/CompanyAdjoins',{params:id}).subscribe((data:any)=>{ this.http.get('/api/CompanyAdjoins',{params:id}).subscribe((data:any)=>{
// console.log(index+'四周毗邻',data)
data.forEach(item => { data.forEach(item => {
item.direction == 0 ? item.title = '东方向' : null item.direction == 0 ? item.title = '东方向' : null
item.direction == 1 ? item.title = '西方向' : null item.direction == 1 ? item.title = '西方向' : null
@ -205,95 +212,113 @@ export class CreateTestScoreComponent implements OnInit {
}) })
//如果存在单位毗邻 //如果存在单位毗邻
if(data.length != 0){ if(data.length != 0){
this.unitId[index].aroundNodes.push({ this.unitId[y].aroundNodes.push({
name: '单位毗邻', name: '单位毗邻',
key: (Math.random()*10000000).toString(16).substr(0,4)+(new Date()).getTime()+Math.random().toString().substr(2,5), key: (Math.random()*10000000).toString(16).substr(0,4)+(new Date()).getTime()+Math.random().toString().substr(2,5),
expanded: false, expanded: true,
type:'四周毗邻', type:'四周毗邻',
children: data children: data
}) })
element.aroundNodes = [...element.aroundNodes] element.aroundNodes = [...element.aroundNodes]
} }
resolve(1)
}) })
}).then(async ()=>{
//获得当前单位的建筑毗邻 //获得当前单位的建筑毗邻
this.http.get('/api/Buildings',{params:id}).subscribe((data:any)=>{ let result2 = await new Promise((resolve, reject) => {
if (data.length) { this.http.get('/api/Buildings',{params:id}).subscribe(async (data:any)=>{
getAllArchitecture(data) if (data.length) {
} await getAllArchitecture(data)
resolve(2)
}
})
}) })
let that = this })
async function getAllArchitecture(buildingsdata){ async function getAllArchitecture(buildingsdata){
for (let i = 0, length = buildingsdata.length; i < length; i++){ for (let i = 0, length = buildingsdata.length; i < length; i++){
let id = {buildingId:buildingsdata[i].id} let id = {buildingId:buildingsdata[i].id}
let result = await new Promise((resolve, reject) => { let result = await new Promise((resolve, reject) => {
that.http.get('/api/BuildingAdjoins',{params:id}).subscribe((data:any)=>{ that.http.get('/api/BuildingAdjoins',{params:id}).subscribe((data:any)=>{
data.forEach(item => { data.forEach(item => {
item.direction == 0 ? item.title = '东方向' : null item.direction == 0 ? item.title = '东方向' : null
item.direction == 1 ? item.title = '西方向' : null item.direction == 1 ? item.title = '西方向' : null
item.direction == 2 ? item.title = '南方向' : null item.direction == 2 ? item.title = '南方向' : null
item.direction == 3 ? item.title = '北方向' : null item.direction == 3 ? item.title = '北方向' : null
item.direction == 4 ? item.title = '东南方向' : null item.direction == 4 ? item.title = '东南方向' : null
item.direction == 5 ? item.title = '西南方向' : null item.direction == 5 ? item.title = '西南方向' : null
item.direction == 6 ? item.title = '东北方向' : null item.direction == 6 ? item.title = '东北方向' : null
item.direction == 7 ? item.title = '西北方向' : null item.direction == 7 ? item.title = '西北方向' : null
item.isLeaf = true item.isLeaf = true
item.key = item.id 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')
}) })
}) 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 let that = this
this.unitId.forEach((element,index) =>{ for (let y = 0, length = this.unitId.length; y < length; y++){
console.log("xiba")
let element = this.unitId[y]
element.keySiteScore = 0 element.keySiteScore = 0
element.keySiteItemScore = 0 element.keySiteItemScore = 0
element.keySiteNodes = [] element.keySiteNodes = []
//获得单位重点部位 //获得单位重点部位
let id = {companyId:element.id} let id = {companyId:element.id}
this.http.get('/api/CompanyImportantLocations',{params:id}).subscribe((data:any)=>{
//如果存在单位毗邻 let result1 = await new Promise((resolve, reject) => {
let newData = [] this.http.get('/api/CompanyImportantLocations',{params:id}).subscribe((data:any)=>{
data.forEach(item => { //如果存在单位毗邻
item.isLeaf = true let newData = []
item.key = item.id data.forEach(item => {
item.name ? newData.push(item) : null 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){ }).then(async ()=>{
this.unitId[index].keySiteNodes.push({ //获得建筑重点部位
name: '单位重点部位', let result2 = await new Promise((resolve, reject) => {
key: (Math.random()*10000000).toString(16).substr(0,4)+(new Date()).getTime()+Math.random().toString().substr(2,5), this.http.get('/api/Buildings',{params:id}).subscribe(async (data:any)=>{
expanded: false, if (data.length) {
type:'重点部位', await getAllBuildingPositon(data)
children: newData 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) { async function getAllBuildingPositon (buildingsdata) {
for (let i = 0, length = buildingsdata.length; i < length; i++){ for (let i = 0, length = buildingsdata.length; i < length; i++){
@ -307,10 +332,10 @@ export class CreateTestScoreComponent implements OnInit {
item.name ? newData.push(item) : null item.name ? newData.push(item) : null
}) })
if(newData.length != 0){ if(newData.length != 0){
that.unitId[index].keySiteNodes.push({ that.unitId[y].keySiteNodes.push({
name: buildingsdata[i].name, name: buildingsdata[i].name,
key: (Math.random()*10000000).toString(16).substr(0,4)+(new Date()).getTime()+Math.random().toString().substr(2,5), key: (Math.random()*10000000).toString(16).substr(0,4)+(new Date()).getTime()+Math.random().toString().substr(2,5),
expanded: false, expanded: true,
type:'重点部位', type:'重点部位',
children: newData children: newData
}) })
@ -322,46 +347,54 @@ export class CreateTestScoreComponent implements OnInit {
} }
} }
}) }
//获取单位重点部位
} }
//获取功能分区 //获取功能分区
getFunDiv(){ async getFunDiv(){
let that = this 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.funDivScore = 0
element.funDivItemScore = 0 element.funDivItemScore = 0
element.funDivNodes = [] element.funDivNodes = []
let id = {companyId:element.id} let id = {companyId:element.id}
//单位功能分区 //单位功能分区
this.http.get('/api/CompanyFunctionalDivisions',{params:id}).subscribe((data:any)=>{ let result1 = await new Promise((resolve, reject) => {
//如果存在单位的单位功能分区 this.http.get('/api/CompanyFunctionalDivisions',{params:id}).subscribe((data:any)=>{
let newData = [] //如果存在单位的单位功能分区
data.forEach(item => { let newData = []
item.isLeaf = true data.forEach(item => {
item.key = item.id item.isLeaf = true
item.region ? newData.push(item) : null 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){ }).then(async ()=>{
this.unitId[index].funDivNodes.push({ //建筑功能分区
name: '单位功能分区', let result2 = await new Promise((resolve, reject) => {
key: (Math.random()*10000000).toString(16).substr(0,4)+(new Date()).getTime()+Math.random().toString().substr(2,5), this.http.get('/api/Buildings',{params:id}).subscribe(async (data:any)=>{
expanded: false, if (data.length) {
type:'功能分区', await getAllBuildingFunDiv(data)
children: newData 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) { async function getAllBuildingFunDiv (buildingsdata) {
for (let i = 0, length = buildingsdata.length; i < length; i++){ for (let i = 0, length = buildingsdata.length; i < length; i++){
@ -377,10 +410,10 @@ export class CreateTestScoreComponent implements OnInit {
}) })
if(newData.length != 0){ if(newData.length != 0){
that.unitId[index].funDivNodes.push({ that.unitId[y].funDivNodes.push({
name: buildingsdata[i].name, name: buildingsdata[i].name,
key: (Math.random()*10000000).toString(16).substr(0,4)+(new Date()).getTime()+Math.random().toString().substr(2,5), key: (Math.random()*10000000).toString(16).substr(0,4)+(new Date()).getTime()+Math.random().toString().substr(2,5),
expanded: false, expanded: true,
type:'功能分区', type:'功能分区',
children: newData children: newData
}) })
@ -393,7 +426,7 @@ export class CreateTestScoreComponent implements OnInit {
} }
} }
}) }
} }
//获取消防设施 //获取消防设施
getFireFac(){ getFireFac(){
@ -426,7 +459,7 @@ export class CreateTestScoreComponent implements OnInit {
this.unitId[index].fireFacNodes.push({ this.unitId[index].fireFacNodes.push({
name: '单位消防设施', name: '单位消防设施',
key: (Math.random()*10000000).toString(16).substr(0,4)+(new Date()).getTime()+Math.random().toString().substr(2,5), key: (Math.random()*10000000).toString(16).substr(0,4)+(new Date()).getTime()+Math.random().toString().substr(2,5),
expanded: false, expanded: true,
type:'消防设施', type:'消防设施',
children: newData children: newData
}) })
@ -442,6 +475,7 @@ export class CreateTestScoreComponent implements OnInit {
}}).subscribe((data:any)=>{ }}).subscribe((data:any)=>{
if (data.length != 0) { getAllBuildingFireFac(data) } if (data.length != 0) { getAllBuildingFireFac(data) }
}) })
async function getAllBuildingFireFac (buildingsdata) { async function getAllBuildingFireFac (buildingsdata) {
// console.log('建筑'+index,buildingsdata) // console.log('建筑'+index,buildingsdata)
for (let i = 0, length = buildingsdata.length; i < length; i++){ for (let i = 0, length = buildingsdata.length; i < length; i++){
@ -467,7 +501,7 @@ export class CreateTestScoreComponent implements OnInit {
that.unitId[index].fireFacNodes.push({ that.unitId[index].fireFacNodes.push({
name: buildingsdata[i].name, name: buildingsdata[i].name,
key: buildingsdata[i].id, key: buildingsdata[i].id,
expanded: false, expanded: true,
type:'消防设施', type:'消防设施',
children: newData children: newData
}) })
@ -677,13 +711,13 @@ export class CreateTestScoreComponent implements OnInit {
//添加预案 //添加预案
addPlan(){ addPlan(){
let companyId = { let companyData = {
companyId : this.unitId[this.selectedUnitIndex].id companyData : this.unitId[this.selectedUnitIndex]
} }
const dialogRef = this.dialog.open(AddPlanDialog, { const dialogRef = this.dialog.open(AddPlanDialog, {
width: '380px', width: '380px',
height: '136px', height: '136px',
data: companyId data: companyData
}); });
dialogRef.afterClosed().subscribe(result => { dialogRef.afterClosed().subscribe(result => {
@ -803,8 +837,9 @@ export class CreateTestScoreComponent implements OnInit {
i.children = newChildren i.children = newChildren
delete i.selected 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 i.selected ? i.selected = null : null
//如果顶级节点未选中则需要筛除没有选中的数据 //如果顶级节点未选中则需要筛除没有选中的数据
if(!i.checked){ if(!i.checked){
@ -878,9 +913,9 @@ export class CreateTestScoreComponent implements OnInit {
delete i.selected delete i.selected
}) }) : null
//建筑的功能分区模块处理 //建筑的功能分区模块处理
item.funDivNodes.forEach((i,key) => { item.funDivNodes ? item.funDivNodes.forEach((i,key) => {
//如果顶级节点未选中则需要筛除没有选中的数据 //如果顶级节点未选中则需要筛除没有选中的数据
if(!i.checked){ if(!i.checked){
@ -935,9 +970,9 @@ export class CreateTestScoreComponent implements OnInit {
}) })
i.children = newChildren i.children = newChildren
delete i.selected delete i.selected
}) }) : null
//建筑的数据核验模块处理 //建筑的数据核验模块处理
item.fireFacNodes.forEach((i,key) => { item.fireFacNodes ? item.fireFacNodes.forEach((i,key) => {
i.selected ? i.selected = null : null i.selected ? i.selected = null : null
//如果顶级节点未选中则需要筛除没有选中的数据 //如果顶级节点未选中则需要筛除没有选中的数据
if(!i.checked){ if(!i.checked){
@ -962,7 +997,7 @@ export class CreateTestScoreComponent implements OnInit {
}) })
i.children = newChildren i.children = newChildren
delete i.selected delete i.selected
}) }) : null
}) })
//循环每个建筑处理数据 //循环每个建筑处理数据
@ -974,15 +1009,15 @@ export class CreateTestScoreComponent implements OnInit {
paperDataInfo[key].id = null paperDataInfo[key].id = null
paperDataInfo[key].paperId = null paperDataInfo[key].paperId = null
paperDataInfo[key].companyId = item.id 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].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].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].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].functionalDivisionScore = item.funDivScore
paperDataInfo[key].facilityData = JSON.stringify(item.fireFacNodes) paperDataInfo[key].facilityData = item.fireFacNodes ? JSON.stringify(item.fireFacNodes) : '[]'
paperDataInfo[key].facilityScore = item.fireFacScore paperDataInfo[key].facilityScore = item.fireFacScore
}) })
@ -1026,7 +1061,7 @@ export class AddPlanDialog {
selectType(type){ selectType(type){
let obj = { let obj = {
type:type, type:type,
companyId:this.data.companyId companyData:this.data
} }
const dialogRef = this.dialog.open(AddPlanTwoDialog, { const dialogRef = this.dialog.open(AddPlanTwoDialog, {
id:'addPlanTwo', id:'addPlanTwo',
@ -1034,7 +1069,7 @@ export class AddPlanDialog {
}); });
dialogRef.afterClosed().subscribe(result => { dialogRef.afterClosed().subscribe(result => {
console.log('The dialog was closed'); this.dialogRef.close();
}); });
} }
} }
@ -1048,27 +1083,27 @@ export class AddPlanDialog {
}) })
export class AddPlanTwoDialog { 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//显示的预案类型 planType:any = this.data.type == 1 ? true : false//显示的预案类型
displayedColumns: string[] = ['select', 'name', 'people', 'time', 'level']; displayedColumns: string[] = ['select', 'name', 'people', 'time', 'level'];
dataSource : any //列表数据 dataSource : any //列表数据
selectedradio selectedRadioData:any//当前选择的二维预案
customPlanName:any//自定义预案名称
radioChange(e){ radioChange(e){
console.log(e) this.selectedRadioData = e
} }
ngOnInit(): void { ngOnInit(): void {
// console.log(this.data.companyId)
this.get2DPlan() this.get2DPlan()
console.log(this.data)
} }
//获取当前公司的二维预案 //获取当前公司的二维预案
get2DPlan(){ get2DPlan(){
let planArr = [] let planArr = []
this.http.get('/api/PlanComponents',{params:{ this.http.get('/api/PlanComponents',{params:{
companyId:this.data.companyId companyId:this.data.companyData.companyData.id
}}).subscribe((data:any) => { }}).subscribe((data:any) => {
console.log(123,data)
data.items.forEach(item => { data.items.forEach(item => {
item.planType == 1 ? planArr.push(item) : null item.planType == 1 ? planArr.push(item) : null
}) })
@ -1081,10 +1116,44 @@ export class AddPlanTwoDialog {
} }
//确定 //确定
confirm(){ confirm(){
if(this.planType == 1){ if(this.planType){//如果选择的是已存在预案
if(this.selectedRadioData){
}else{ 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)
window.open('/canvasTool')
}else{
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.snackBar.open('请选择要添加的预案','确定',config);
}
}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')
})
} }
} }
//取消 //取消

2
src/app/examiner/create-test-score/finishDialog.html
Unescape View File

@ -8,7 +8,7 @@
--> -->
<div class="box"> <div class="box">
<div class="diaone"> <div class="diaone">
<div style="margin-bottom: 5px;"><label>请填写试卷类型:</label></div> <div style="margin-bottom: 5px;"><label>请填写试卷名称:</label></div>
<div><input placeholder="请填写" [(ngModel)]="examName"></div> <div><input placeholder="请填写" [(ngModel)]="examName"></div>
</div> </div>
<div class="diatwo"> <div class="diatwo">

2
src/app/examiner/examiner-index/examiner-index.component.html
Unescape View File

@ -4,7 +4,7 @@
* @Author: sueRimn * @Author: sueRimn
* @Date: 2020-12-11 09:06:03 * @Date: 2020-12-11 09:06:03
* @LastEditors: sueRimn * @LastEditors: sueRimn
* @LastEditTime: 2020-12-15 14:08:57 * @LastEditTime: 2020-12-15 14:40:26
--> -->
<div class="content"> <div class="content">
<div class="header"> <div class="header">

1
src/app/pages/lockscreen/lockscreen.component.ts
Unescape View File

@ -33,6 +33,7 @@ export class LockscreenComponent implements OnInit {
sessionStorage.setItem("roleType",data.roleType); sessionStorage.setItem("roleType",data.roleType);
sessionStorage.setItem("token",data.token); sessionStorage.setItem("token",data.token);
sessionStorage.setItem("refreshToken",data.refreshToken); sessionStorage.setItem("refreshToken",data.refreshToken);
sessionStorage.setItem("level",data.level);
this.token.startUp(); //登陆成功启动定时器刷新token this.token.startUp(); //登陆成功启动定时器刷新token
this.router.navigate(['/home/createexam-index']) //登陆成功跳转页面 this.router.navigate(['/home/createexam-index']) //登陆成功跳转页面
},(err) => {this.errmsg = err}) },(err) => {this.errmsg = err})

1
src/app/pages/login/login.component.ts
Unescape View File

@ -33,6 +33,7 @@ export class LoginComponent implements OnInit {
sessionStorage.setItem("roleType",data.roleType); sessionStorage.setItem("roleType",data.roleType);
sessionStorage.setItem("token",data.token); sessionStorage.setItem("token",data.token);
sessionStorage.setItem("refreshToken",data.refreshToken); sessionStorage.setItem("refreshToken",data.refreshToken);
sessionStorage.setItem("level",data.level);
this.token.startUp(); //登陆成功启动定时器刷新token this.token.startUp(); //登陆成功启动定时器刷新token
this.router.navigate(['/home/teachear']) //登陆成功跳转页面 this.router.navigate(['/home/teachear']) //登陆成功跳转页面
},(err) => {this.errmsg = err}) },(err) => {this.errmsg = err})

2
src/app/ui/collection-tools/collection-tools.component.ts
Unescape View File

@ -629,7 +629,7 @@ export class CollectionToolsComponent implements OnInit {
isSixbtn = true //控制想定作业编辑按钮 isSixbtn = true //控制想定作业编辑按钮
isxxx = true //控制查看编辑模式的编辑模式按钮 isxxx = true //控制查看编辑模式的编辑模式按钮
examMsg = { //单位,考试信息 examMsg = { //单位,考试信息
conpanyName: '富丽华大酒店', //单位名称 conpanyName: sessionStorage.getItem('companyName'), //单位名称
keynote: '', //考试要点 keynote: '', //考试要点
grade: '', //分数 grade: '', //分数
} }

4
src/styles.scss
Unescape View File

@ -67,11 +67,11 @@ table td.mat-footer-cell:last-of-type{
//滚动条样式 //滚动条样式
::-webkit-scrollbar{ ::-webkit-scrollbar{
width: 5px; width: 6px;
background-color: white; background-color: white;
} }
::-webkit-scrollbar-thumb{ ::-webkit-scrollbar-thumb{
background-color: #999; background-color: #07CDCF;
} }
//x轴滚动条隐藏 //x轴滚动条隐藏

Write Preview
Loading…
Cancel
Save