shaojiahao
/
ShangHaiYuan-AnXin
2
0
Fork 0
Code Issues 11 Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin

tangshan
邵佳豪 4 years ago
parent
51bd2e9e54 f823d7774f
commit
f57a5450de
3 changed files with 238 additions and 6 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. 54
      src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html
  2. 166
      src/app/plan-management/create-plan-online-five/create-plan-online-five.component.scss
  3. 24
      src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts

54
src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html
Unescape View File

@ -112,6 +112,17 @@
</div> </div>
</div> </div>
</div> </div>
<div class="leftBuilding" *ngIf="selectedItem == '单位概况'">
<div class="buildingHead" >
<span>建筑列表</span>
</div>
<div class="buildingBody">
<div class="buildName" *ngFor="let item of allBuildings;let i=index" [ngClass]="{'selectedTr': i == clicki}" (click)='clickBuilding(item,i)'>
<mat-checkbox class="example-margin" color='primary'></mat-checkbox>
<span>{{item.name}}</span>
</div>
</div>
</div>
</div> </div>
<div class="mainbox"> <div class="mainbox">
<!-- 封面 --> <!-- 封面 -->
@ -240,11 +251,6 @@
</th> </th>
</thead> </thead>
<tbody> <tbody>
<!-- <tr>
<td><input type="text"placeholder="请输入内容" ></td>
<td><input type="text"placeholder="请输入内容" ></td>
<td><input type="text"placeholder="请输入内容" ></td>
</tr> -->
<tr *ngFor="let itemtr of element.tabletr"> <tr *ngFor="let itemtr of element.tabletr">
<td <td
*ngFor="let itemtd of itemtr.tabletd;let tabletdi=index;TrackBy:trackByFn"> *ngFor="let itemtd of itemtr.tabletd;let tabletdi=index;TrackBy:trackByFn">
@ -324,6 +330,44 @@
</button> </button>
</div> </div>
</div> </div>
<div class="unit" *ngIf="item.groupName == '单位概况'">
<div class="unithead">
<span>{{buildingName}}</span>
</div>
<div class="unitbody" *ngFor="let element of item.building[clicki].body;let i=index">
<div *ngIf="element.completed">
<div class="unitbodyHead">
<span>{{element.surveyName}}</span>
</div>
<div class="body">
<!-- 进攻通道 -->
<div class="attack" *ngIf="element.surveyName=='进攻通道'">
<div *ngFor="let attack of element.attinf">
<div class="attackhead">
<span>{{attack.head}}</span>
<img src="../../../assets/images/deleteblue.png" >
<img src="../../../assets/images/add.png" >
</div>
<div class="attackbody">
<table>
<thead>
<th *ngFor="let itemth of attack.tableth;let tablethi=index;TrackBy:trackByFn">
<input type="text" placeholder="请输入内容"
[(ngModel)]="attack.tableth[tablethi]">
</th>
</thead>
<tbody></tbody>
</table>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>

166
src/app/plan-management/create-plan-online-five/create-plan-online-five.component.scss
Unescape View File

@ -171,6 +171,51 @@
} }
} }
} }
.leftBuilding{
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
}
.buildingHead{
height: 40px;
width: 100%;
background-color: #e8f4fe;
text-align: center;
span{
line-height: 40px;
color: #2196f3;
font-size: 16px;
}
}
.buildingBody{
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
.selectedTr {
background-color: #b3d3ee;
}
.buildName{
cursor: pointer;
height: 40px;
width: 100%;
border-bottom: 1px solid #F2F4F5;
.example-margin {
width: 14px;
height: 14px;
margin-left: 30px;
margin-bottom: 7px;
position: relative;
bottom: 1px;
}
span{
line-height: 40px;
font-size: 16px;
margin-left: 5px;
}
}
}
} }
.mainbox { .mainbox {
background-color: white; background-color: white;
@ -410,6 +455,126 @@
margin: 10px 0; margin: 10px 0;
} }
} }
.unit{
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
overflow-y: auto;
.unithead{
height: 40px;
width: 100%;
background-color: #e8f4fe;
//opacity: 0.1;
span {
margin-left: 20px;
font-size: 16px;
color: #2196f3;
opacity: 1;
height: 40px;
line-height: 40px;
}
}
.unitbody{
height: 100%;
width: 100%;
display: flex;
flex-direction: column;
.unitbodyHead{
width: 100%;
height: 40px;
background-color: #2196F3;
text-align: center;
span {
font-size: 16px;
text-align: center;
height: 40px;
line-height: 40px;
color: #FFFFFF;
}
img {
cursor: pointer;
width: 20px;
height: 20px;
float: right;
margin-top: 10px;
margin-right: 10px;
}
}
.body{
width: 100%;
height: 100%;
.attack{
width: 100%;
height: 100%;
.attackhead{
width: 100%;
height: 40px;
background-color: #ffd91d;
text-align: center;
span {
font-size: 16px;
text-align: center;
height: 40px;
line-height: 40px;
color: #b99a00;
}
img {
cursor: pointer;
width: 20px;
height: 20px;
float: right;
margin-top: 10px;
margin-right: 10px;
}
}
.attackbody{
width: 100%;
height: 100%;
thead {
width: 100%;
background-color: #e8e9e9;
}
table {
width: 100%;
border-collapse: collapse;
//background-color: #E8E9E9;
}
th {
//background-color: #E8E9E9;
border: 1px solid #999;
height: 40px;
font-size: 16px;
text-align: center;
input {
background-color: #e8e9e9;
text-align: center;
height: 100%;
width: 100%;
font-size: 16px;
border: none;
outline: none;
}
}
td {
border: 1px solid #999;
height: 40px;
font-size: 16px;
text-align: center;
input {
background-color: #ffffff;
text-align: center;
height: 100%;
width: 100%;
font-size: 16px;
border: none;
outline: none;
}
}
}
}
}
}
.disposalPoint { .disposalPoint {
div { div {
width: 100%; width: 100%;
@ -461,3 +626,4 @@
} }
} }
} }
}

24
src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts
Unescape View File

@ -4,7 +4,7 @@
* @Author: sueRimn * @Author: sueRimn
* @Date: 2021-06-16 13:56:54 * @Date: 2021-06-16 13:56:54
* @LastEditors: sueRimn * @LastEditors: sueRimn
* @LastEditTime: 2021-06-17 17:05:09 * @LastEditTime: 2021-06-22 17:16:01
*/ */
import { HttpClient } from '@angular/common/http'; import { HttpClient } from '@angular/common/http';
import { Component, Inject, OnInit, Renderer2, ViewChild, Input } from '@angular/core'; import { Component, Inject, OnInit, Renderer2, ViewChild, Input } from '@angular/core';
@ -30,6 +30,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
console.log('级别', this.planLevel) console.log('级别', this.planLevel)
this.getTemplateData() this.getTemplateData()
this.getUnitData() this.getUnitData()
this.getAllBuildings()
this.tree = { this.tree = {
json: this.treedate, json: this.treedate,
config: this.treeConfig config: this.treeConfig
@ -77,6 +78,8 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
this.getAllBuildings() this.getAllBuildings()
this.getSitePlan() this.getSitePlan()
this.getRealPicture() this.getRealPicture()
}else if(this.selectedItem == '单位概况'){
//this.getAllBuildings()
} }
} }
@ -230,6 +233,12 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
}) })
}) })
this.allBuildings = data this.allBuildings = data
this.planTemplateData[0].building=[]
for(var i=0;i<this.allBuildings.length;i++){
this.planTemplateData[0].building.push({name:this.allBuildings[i].name,body:this.planTemplateData[0].attribute})
}
this.buildingName=this.allBuildings[0].name
console.log(this.planTemplateData)
}) })
} }
//获取总平面图 //获取总平面图
@ -307,6 +316,19 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
} }
} }
//单位概况左侧建筑点击事件
buildingName
clicki=0
clickBuilding(item,i){
this.buildingName=item.name
this.clicki=i
}
//单位概况增加一行
unitadd(groupName){
if(groupName=='进攻通道'){
}
}
//分段上传 //分段上传
sectionUpload(companyId: string, planId: string, file) { sectionUpload(companyId: string, planId: string, file) {

Write Preview
Loading…
Cancel
Save