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
5b4a9d6b00 e61910ed25
commit
09d850345e
6 changed files with 851 additions and 18 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. 30
      src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html
  2. 200
      src/app/plan-management/create-plan-online-five/create-plan-online-five.component.scss
  3. 561
      src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts
  4. 75
      src/app/plan-management/create-plan-online-five/yinyong.html
  5. 3
      src/app/plan-management/plan-management.module.ts
  6. BIN
      src/assets/images/yr.png

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

@ -188,7 +188,7 @@
<div class="newBody"> <div class="newBody">
<div class="search"> <div class="search">
<div class="searchChoose"> <div class="searchChoose">
<select [(ngModel)]="searchType"> <select [(ngModel)]="searchType" (change)='clearSearch()'>
<option value="0">自定义</option> <option value="0">自定义</option>
<option value="1">按机构</option> <option value="1">按机构</option>
</select> </select>
@ -223,10 +223,32 @@
<input type="text" placeholder="请输入关键字" [(ngModel)]="zdysearch"> <input type="text" placeholder="请输入关键字" [(ngModel)]="zdysearch">
</div> </div>
</div> </div>
<div class="searImg"> <div class="searImg" (click)="searchYuan()">
<img src="../../../assets/images/search.png" > <img src="../../../assets/images/search.png">
</div> </div>
</div> </div>
<div class="newBodycenter">
<div class="centerfen" *ngFor="let item of yinruData.items;let clicki=index">
<div class="tu" (click)='clickYinru(clicki)'>
<img src="../../../assets/images/yr.png">
</div>
<div class="org">
<span style="font-size: 15px;">{{item.organizationName}}</span>
</div>
<div class="lry">
<span style="color:#9EAAB4;font-size:14px">录入员:{{item.creatorName}}</span>
</div>
</div>
</div>
<div class="fenye">
<mat-paginator pageEvent [length]="length"
[pageSize]="pageSize"
[pageSizeOptions]="pageSizeOptions"
(page)="changePage($event)">
</mat-paginator>
</div>
</div> </div>
</div> </div>
@ -415,7 +437,7 @@
flex-direction: column;"> flex-direction: column;">
<div class="boxBodyHead" style="width: 100%; <div class="boxBodyHead" style="width: 100%;
height: 40pt; height: 40pt;
background-color: #ffd91d; background-color: #FFD91D;
text-align: center;"> text-align: center;">
<span style="font-size: 16px; <span style="font-size: 16px;
text-align: center; text-align: center;

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

@ -223,7 +223,7 @@
.leftnew{ .leftnew{
position: fixed; position: fixed;
width: 14%; width: 14%;
height: 85%; height: 90%;
background-color: white; background-color: white;
top: 66px; top: 66px;
min-width: 300px; min-width: 300px;
@ -340,6 +340,7 @@
.searImg{ .searImg{
width: 15%; width: 15%;
height: 100%; height: 100%;
cursor: pointer;
img{ img{
position: relative; position: relative;
top: 20%; top: 20%;
@ -347,6 +348,43 @@
} }
} }
} }
.newBodycenter{
height: 86%;
width: 100%;
display: flex;
flex-wrap: wrap;
align-content: flex-start;
overflow-y: auto;
//flex-direction: column;
.centerfen{
//width: 50%;
margin: 15px 0 12px 24px;
//height: 150px;
display: flex;
flex-direction: column;
.tu{
height: 100px;
width: 110px;
cursor: pointer;
img{
width: 110px;
height: 100px;
}
}
.org{
width: 110px;
}
.lry{
width: 110px;
}
span{
display: inline-block;
}
}
}
.fenye{
width: 100%;
}
} }
} }
.mainbox { .mainbox {
@ -1017,3 +1055,163 @@
} }
} }
.yinrubox{
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
.yinruboxHead{
width: 100%;
height:7%;
border-bottom:1px solid #8b8c8c;
span{
font-size: 18px;
color: #2196f3;
line-height: 40px;
}
button{
float: right;
}
}
.boxBody {
//height: 100%;
width: 100%;
overflow-y: auto;
display: flex;
flex-direction: column;
.boxBodyHead {
width: 100%;
height: 40px;
margin-top: 3%;
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;
}
}
.body {
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;
}
}
.inputtext {
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
input {
//width: 100%;
height: 40px;
font-size: 16px;
border: none;
outline: none;
}
.inputj {
width: 100%;
//height: 100%;
display: flex;
}
}
.keyImg {
width: 100%;
height: 100%;
.keyImgImg {
.imgbox {
margin-top: 10px;
text-align: center;
position: relative;
img {
max-width: 100%;
width: auto;
height: auto;
}
.deleteImg {
display: none;
cursor: pointer;
position: absolute;
right: 0px;
top: 0px;
}
}
.imgbox:hover {
.deleteImg {
display: block;
}
}
.uploadBtn {
display: flex;
justify-content: center;
margin: 50px 0;
position: relative;
input {
width: 112px;
height: 36px;
position: absolute;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
opacity: 0;
cursor: pointer;
}
}
}
.addkeyImgItem {
display: flex;
justify-content: center;
margin: 10px 0;
}
}
}
}
}

561
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-08-07 14:29:01 * @LastEditTime: 2021-08-12 14:14:20
*/ */
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';
@ -50,7 +50,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
paginator: MatPaginator; paginator: MatPaginator;
length: any; //共多少条数据 length: any; //共多少条数据
pageSize: any; //每页条数 pageSize: any; //每页条数
pageSizeOptions: number[] = [10] //设置每页条数 pageSizeOptions: number[] = [6] //设置每页条数
PageNumber: any; //第几页 PageNumber: any; //第几页
planLevel: string//预案级别 planLevel: string//预案级别
@ -67,7 +67,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
this.getOrganizations(); this.getOrganizations();
//this.getAllBuildings() //this.getAllBuildings()
} }
zdysearch zdysearch=''
organizationName: any //当前单位组织机构名称 organizationName: any //当前单位组织机构名称
treedata: any //组织机构树型数据 treedata: any //组织机构树型数据
newArr: any = [] newArr: any = []
@ -112,7 +112,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
} }
}); });
}); });
this.http.get("/api/Account/Profiles").subscribe( /* this.http.get("/api/Account/Profiles").subscribe(
(data: any) => { (data: any) => {
this.organizationName = data.organizationName this.organizationName = data.organizationName
if (this.organizationName) { if (this.organizationName) {
@ -125,7 +125,8 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
this.dataSource.data = this.tree.toTree(this.treedata); this.dataSource.data = this.tree.toTree(this.treedata);
} }
} }
) ) */
this.dataSource.data = this.tree.toTree(this.treedata);
} }
//获得所有组织机构 //获得所有组织机构
@ -138,7 +139,11 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
} }
) )
} }
//清空查询条件数据
clearSearch(){
this.zdysearch=''
this.js=''
}
//获得单位信息 //获得单位信息
@ -151,7 +156,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
data.items.forEach(element => { data.items.forEach(element => {
if (element.id == this.route.snapshot.queryParams.companyId) { if (element.id == this.route.snapshot.queryParams.companyId) {
this.unitData = element this.unitData = element
console.log('单位列表信息', this.unitData) //console.log('单位列表信息', this.unitData)
this.getTemplateData() this.getTemplateData()
} }
}); });
@ -161,6 +166,89 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
selectedItem: string = '封面' selectedItem: string = '封面'
async clickTitleItem(item) { async clickTitleItem(item) {
this.addNumber = -1 this.addNumber = -1
this.yinruData={
items:[]
}
this.yinJson={
//组织指挥
organizationCommands:{
tableCount: {
totalCount: 0,
tables: [
]
},
inputCount: {
totalCount: 0,
inputs: [
]
},
textAreaCount: {
totalCount: 0
},
treeCount: {
totalCount: 0
}
},
//社会联动
socialLinkages:{
tableCount: {
totalCount: 0,
tables: [
]
},
inputCount: {
totalCount: 0,
inputs: [
]
},
textAreaCount: {
totalCount: 0
},
treeCount: {
totalCount: 0
}
},
//勤务保障
serviceSupports:{
tableCount: {
totalCount: 0,
tables: [
]
},
inputCount: {
totalCount: 0,
inputs: [
]
},
textAreaCount: {
totalCount: 0
},
treeCount: {
totalCount: 0
}
},
//辅助决策
decisionSupports:{
tableCount: {
totalCount: 0,
tables: [
]
},
inputCount: {
totalCount: 0,
inputs: [
]
},
textAreaCount: {
totalCount: 0
},
treeCount: {
totalCount: 0
}
},
}
this.js=''
this.zdysearch=''
this.selectedItem = item.groupName this.selectedItem = item.groupName
if (this.selectedItem == '重点图示') { if (this.selectedItem == '重点图示') {
this.getAllBuildings() this.getAllBuildings()
@ -320,7 +408,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
//获得模板信息 //获得模板信息
getTemplateData() { getTemplateData() {
this.http.get(`/api/PlanComponents/${this.route.snapshot.queryParams.planId}/WebText`).subscribe((data: any) => { this.http.get(`/api/PlanComponents/${this.route.snapshot.queryParams.planId}/WebText`).subscribe((data: any) => {
console.log('预案内容', data) //console.log('预案内容', data)
this.planTemplateData = JSON.parse(data.webTextData).filter(item => this.planTemplateData = JSON.parse(data.webTextData).filter(item =>
item.completed == true item.completed == true
) )
@ -385,7 +473,408 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
}) })
} }
//引入数据json
yinJson={
//组织指挥
organizationCommands:{
tableCount: {
totalCount: 0,
tables: [
]
},
inputCount: {
totalCount: 0,
inputs: [
]
},
textAreaCount: {
totalCount: 0
},
treeCount: {
totalCount: 0
}
},
//社会联动
socialLinkages:{
tableCount: {
totalCount: 0,
tables: [
]
},
inputCount: {
totalCount: 0,
inputs: [
]
},
textAreaCount: {
totalCount: 0
},
treeCount: {
totalCount: 0
}
},
//勤务保障
serviceSupports:{
tableCount: {
totalCount: 0,
tables: [
]
},
inputCount: {
totalCount: 0,
inputs: [
]
},
textAreaCount: {
totalCount: 0
},
treeCount: {
totalCount: 0
}
},
//辅助决策
decisionSupports:{
tableCount: {
totalCount: 0,
tables: [
]
},
inputCount: {
totalCount: 0,
inputs: [
]
},
textAreaCount: {
totalCount: 0
},
treeCount: {
totalCount: 0
}
},
}
async yinRu(type){
if(type==0){
this.yinJson={
//组织指挥
organizationCommands:{
tableCount: {
totalCount: 0,
tables: [
]
},
inputCount: {
totalCount: 0,
inputs: [
]
},
textAreaCount: {
totalCount: 0
},
treeCount: {
totalCount: 0
}
},
//社会联动
socialLinkages:{
tableCount: {
totalCount: 0,
tables: [
]
},
inputCount: {
totalCount: 0,
inputs: [
]
},
textAreaCount: {
totalCount: 0
},
treeCount: {
totalCount: 0
}
},
//勤务保障
serviceSupports:{
tableCount: {
totalCount: 0,
tables: [
]
},
inputCount: {
totalCount: 0,
inputs: [
]
},
textAreaCount: {
totalCount: 0
},
treeCount: {
totalCount: 0
}
},
//辅助决策
decisionSupports:{
tableCount: {
totalCount: 0,
tables: [
]
},
inputCount: {
totalCount: 0,
inputs: [
]
},
textAreaCount: {
totalCount: 0
},
treeCount: {
totalCount: 0
}
},
}
var orgtableCount=0
var orginputCount=0
var orgtextAreaCount=0
var orgtreeCount=0
this.planTemplateData[4].attribute.forEach((orgvalue,orgi,orgArr) => {
if(orgArr[orgi].level=='1'){
orgtableCount++
this.yinJson.organizationCommands.tableCount.tables.push({itemCount:orgArr[orgi].tableth.length})
}else if(orgArr[orgi].level=='2'){
orginputCount++
this.yinJson.organizationCommands.inputCount.inputs.push({colCount:orgArr[orgi].lieNumber,rowCount:orgArr[orgi].hNumber})
}else if(orgArr[orgi].level=='3'){
orgtextAreaCount++
}else if(orgArr[orgi].level=='4'){
orgtreeCount++
}
});
this.yinJson.organizationCommands.tableCount.totalCount=orgtableCount
this.yinJson.organizationCommands.inputCount.totalCount=orginputCount
this.yinJson.organizationCommands.textAreaCount.totalCount=orgtextAreaCount
this.yinJson.organizationCommands.treeCount.totalCount=orgtreeCount
var shetableCount=0
var sheinputCount=0
var shetextAreaCount=0
var shetreeCount=0
this.planTemplateData[6].attribute.forEach((orgvalue,orgi,orgArr) => {
if(orgArr[orgi].level=='1'){
shetableCount++
//this.yinJson.organizationCommands.tableCount.tables.push({itemCount:orgtableCount})
}else if(orgArr[orgi].level=='2'){
sheinputCount++
this.yinJson.socialLinkages.inputCount.inputs.push({colCount:orgArr[orgi].lieNumber,rowCount:orgArr[orgi].hNumber})
}else if(orgArr[orgi].level=='3'){
shetextAreaCount++
}else if(orgArr[orgi].level=='4'){
shetreeCount++
}
});
this.yinJson.socialLinkages.tableCount.totalCount=shetableCount
this.yinJson.socialLinkages.inputCount.totalCount=sheinputCount
this.yinJson.socialLinkages.textAreaCount.totalCount=shetextAreaCount
this.yinJson.socialLinkages.treeCount.totalCount=shetreeCount
var qintableCount=0
var qininputCount=0
var qintextAreaCount=0
var qintreeCount=0
this.planTemplateData[7].attribute.forEach((orgvalue,orgi,orgArr) => {
if(orgArr[orgi].level=='1'){
qintableCount++
//this.yinJson.organizationCommands.tableCount.tables.push({itemCount:orgtableCount})
}else if(orgArr[orgi].level=='2'){
qininputCount++
this.yinJson.serviceSupports.inputCount.inputs.push({colCount:orgArr[orgi].lieNumber,rowCount:orgArr[orgi].hNumber})
}else if(orgArr[orgi].level=='3'){
qintextAreaCount++
}else if(orgArr[orgi].level=='4'){
qintreeCount++
}
});
this.yinJson.serviceSupports.tableCount.totalCount=qintableCount
this.yinJson.serviceSupports.inputCount.totalCount=qininputCount
this.yinJson.serviceSupports.textAreaCount.totalCount=qintextAreaCount
this.yinJson.serviceSupports.treeCount.totalCount=qintreeCount
var futableCount=0
var fuinputCount=0
var futextAreaCount=0
var futreeCount=0
this.planTemplateData[9].attribute.forEach((orgvalue,orgi,orgArr) => {
if(orgArr[orgi].level=='1'){
futableCount++
//this.yinJson.organizationCommands.tableCount.tables.push({itemCount:orgtableCount})
}else if(orgArr[orgi].level=='2'){
fuinputCount++
this.yinJson.decisionSupports.inputCount.inputs.push({colCount:orgArr[orgi].lieNumber,rowCount:orgArr[orgi].hNumber})
}else if(orgArr[orgi].level=='3'){
futextAreaCount++
}else if(orgArr[orgi].level=='4'){
futreeCount++
}
});
this.yinJson.decisionSupports.tableCount.totalCount=futableCount
this.yinJson.decisionSupports.inputCount.totalCount=fuinputCount
this.yinJson.decisionSupports.textAreaCount.totalCount=futextAreaCount
this.yinJson.decisionSupports.treeCount.totalCount=futreeCount
}
if(type==5){
var orgtableCount=0
var orginputCount=0
var orgtextAreaCount=0
var orgtreeCount=0
this.planTemplateData[4].attribute.forEach((orgvalue,orgi,orgArr) => {
if(orgArr[orgi].level=='1'){
orgtableCount++
this.yinJson.organizationCommands.tableCount.tables.push({itemCount:orgArr[orgi].tableth.length})
}else if(orgArr[orgi].level=='2'){
orginputCount++
this.yinJson.organizationCommands.inputCount.inputs.push({colCount:orgArr[orgi].lieNumber,rowCount:orgArr[orgi].hNumber})
}else if(orgArr[orgi].level=='3'){
orgtextAreaCount++
}else if(orgArr[orgi].level=='4'){
orgtreeCount++
}
});
this.yinJson.organizationCommands.tableCount.totalCount=orgtableCount
this.yinJson.organizationCommands.inputCount.totalCount=orginputCount
this.yinJson.organizationCommands.textAreaCount.totalCount=orgtextAreaCount
this.yinJson.organizationCommands.treeCount.totalCount=orgtreeCount
this.yinJson.decisionSupports=null
this.yinJson.serviceSupports=null
this.yinJson.socialLinkages=null
}if(type==7){
var orgtableCount=0
var orginputCount=0
var orgtextAreaCount=0
var orgtreeCount=0
this.planTemplateData[6].attribute.forEach((orgvalue,orgi,orgArr) => {
if(orgArr[orgi].level=='1'){
orgtableCount++
//this.yinJson.organizationCommands.tableCount.tables.push({itemCount:orgtableCount})
}else if(orgArr[orgi].level=='2'){
orginputCount++
this.yinJson.socialLinkages.inputCount.inputs.push({colCount:orgArr[orgi].lieNumber,rowCount:orgArr[orgi].hNumber})
}else if(orgArr[orgi].level=='3'){
orgtextAreaCount++
}else if(orgArr[orgi].level=='4'){
orgtreeCount++
}
});
this.yinJson.socialLinkages.tableCount.totalCount=orgtableCount
this.yinJson.socialLinkages.inputCount.totalCount=orginputCount
this.yinJson.socialLinkages.textAreaCount.totalCount=orgtextAreaCount
this.yinJson.socialLinkages.treeCount.totalCount=orgtreeCount
this.yinJson.serviceSupports=null
this.yinJson.organizationCommands=null
this.yinJson.decisionSupports=null
}if(type==8){
var orgtableCount=0
var orginputCount=0
var orgtextAreaCount=0
var orgtreeCount=0
this.planTemplateData[7].attribute.forEach((orgvalue,orgi,orgArr) => {
if(orgArr[orgi].level=='1'){
orgtableCount++
//this.yinJson.organizationCommands.tableCount.tables.push({itemCount:orgtableCount})
}else if(orgArr[orgi].level=='2'){
orginputCount++
this.yinJson.serviceSupports.inputCount.inputs.push({colCount:orgArr[orgi].lieNumber,rowCount:orgArr[orgi].hNumber})
}else if(orgArr[orgi].level=='3'){
orgtextAreaCount++
}else if(orgArr[orgi].level=='4'){
orgtreeCount++
}
});
this.yinJson.serviceSupports.tableCount.totalCount=orgtableCount
this.yinJson.serviceSupports.inputCount.totalCount=orginputCount
this.yinJson.serviceSupports.textAreaCount.totalCount=orgtextAreaCount
this.yinJson.serviceSupports.treeCount.totalCount=orgtreeCount
this.yinJson.decisionSupports=null
this.yinJson.organizationCommands=null
this.yinJson.socialLinkages=null
}if(type==10){
var orgtableCount=0
var orginputCount=0
var orgtextAreaCount=0
var orgtreeCount=0
this.planTemplateData[9].attribute.forEach((orgvalue,orgi,orgArr) => {
if(orgArr[orgi].level=='1'){
orgtableCount++
//this.yinJson.organizationCommands.tableCount.tables.push({itemCount:orgtableCount})
}else if(orgArr[orgi].level=='2'){
orginputCount++
this.yinJson.decisionSupports.inputCount.inputs.push({colCount:orgArr[orgi].lieNumber,rowCount:orgArr[orgi].hNumber})
}else if(orgArr[orgi].level=='3'){
orgtextAreaCount++
}else if(orgArr[orgi].level=='4'){
orgtreeCount++
}
});
this.yinJson.decisionSupports.tableCount.totalCount=orgtableCount
this.yinJson.decisionSupports.inputCount.totalCount=orginputCount
this.yinJson.decisionSupports.textAreaCount.totalCount=orgtextAreaCount
this.yinJson.decisionSupports.treeCount.totalCount=orgtreeCount
this.yinJson.organizationCommands=null
this.yinJson.serviceSupports=null
this.yinJson.socialLinkages=null
}
console.log(this.yinJson)
}
//查询能引入的预案
yinruData={
items:[]
}
searchYuan(){
this.yinRu(this.selectedItem=='组织指挥'?5:this.selectedItem=='社会联动'?7:this.selectedItem=='勤务保障'?8:10)
//console.log(JSON.stringify(this.yinJson))
var urlbm=encodeURI(JSON.stringify(this.yinJson))
let paramsdata:any={
planCategory:this.planLevel,
buildingTypeId :this.route.snapshot.queryParams.unitTypeId,
OrganizationId:this.searchType=='0'?'':this.jsId,
CustomKeyword:this.searchType=='0'?this.zdysearch:'',
webTextStatistics:urlbm,
PageNumber: this.PageNumber || '1',
PageSize: this.pageSizeOptions[0],
}
this.http.get("/api/PlanComponents/WebText",{params:paramsdata}).subscribe((data:any)=>{
this.yinruData=null
this.yinruData=data
if(this.yinruData.items.length==0){
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.snackBar.open('暂无数据', '确定', config);
}
//console.log(this.yinruData)
})
}
//可引入预案点击事件
clickYinru(clicki){
const dialogRef = this.dialog.open(yinYong, {
width: '750px',
height: '700px',
//disableClose: true
data: {selectedItem:this.selectedItem,yinruData:this.yinruData.items[clicki].webTextData}
});
dialogRef.afterClosed().subscribe(result => {
console.log(result)
if(result!=undefined){
this.planTemplateData.forEach(element => {
if(element.groupName==this.selectedItem){
element.attribute=result
}
});
}
}
);
}
//分页事件
changePage(e) {
this.PageNumber = e.pageIndex + 1
this.searchYuan()
}
//重点图示增加分组 //重点图示增加分组
addkeyImgItem(item) { addkeyImgItem(item) {
@ -707,10 +1196,12 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
this.pattern = 'edit' this.pattern = 'edit'
} }
//提交 //提交
submit() { async submit() {
console.log('提交信息', this.planTemplateData) await this.yinRu(0)
//console.log('提交信息', this.planTemplateData)
let body = { let body = {
webTextData: JSON.stringify(this.planTemplateData) webTextData: JSON.stringify(this.planTemplateData),
webTextStatistics:this.yinJson
} }
this.http.put(`/api/PlanComponents/${this.route.snapshot.queryParams.planId}`, body).subscribe(data => { this.http.put(`/api/PlanComponents/${this.route.snapshot.queryParams.planId}`, body).subscribe(data => {
// console.log('提交成功',data) // console.log('提交成功',data)
@ -813,4 +1304,50 @@ export class OpenPlanToolDialog {
this.dialogRef.close() this.dialogRef.close()
} }
}
//查看引用
@Component({
selector: 'yinYong',
templateUrl: './yinyong.html',
styleUrls: ['./create-plan-online-five.component.scss']
})
export class yinYong{
constructor(public http: HttpClient, public snackBar: MatSnackBar, public dialogRef: MatDialogRef<yinYong>,
@Inject(MAT_DIALOG_DATA) public data, public dialog: MatDialog) { }
ngOnInit(){
this.selectedItem=this.data.selectedItem
this.planTemplateData=JSON.parse(this.data.yinruData)
this.yinData()
console.log(this.planTemplateData)
}
selectedItem//传来的组织指挥或者。。。
planTemplateData//传来的数据
selectData
xuanze:boolean
//imgUrl
//看看查的是哪个标题下的内容
yinData(){
this.planTemplateData.forEach((pvale,pi,parr) => {
if(pvale.groupName==this.selectedItem){
this.selectData=pvale.attribute
}
});
}
trackByFn(index) {
return index
}
//关闭弹窗
closeDiv() {
let isTrue = confirm('您确定要引用该条预案吗')
if(isTrue){
this.xuanze=true
this.dialogRef.close(this.selectData)
}
else{
this.xuanze=false
this.dialogRef.close()
}
}
} }

75
src/app/plan-management/create-plan-online-five/yinyong.html
Unescape View File

@ -0,0 +1,75 @@
<!--
* @Descripttion:
* @version:
* @Author: sueRimn
* @Date: 2021-08-10 14:15:43
* @LastEditors: sueRimn
* @LastEditTime: 2021-08-11 14:31:15
-->
<div class="yinrubox">
<div class="yinruboxHead">
<span>{{selectedItem}}</span>
<button mat-raised-button color="primary" (click)='closeDiv()'>引入</button>
</div>
<div class="boxBody" *ngFor="let element of selectData;let i=index" >
<div class="boxBodyHead" >
<span style="font-size: 16px;
text-align: center;
color: #b99a00;">{{element.headName}}</span>
</div>
<div class="body">
<table *ngIf="element.level==1" style="width: 100%;border-collapse: collapse;">
<thead>
<th *ngFor="let itemth of element.tableth;let tablethi=index;TrackBy:trackByFn" style="border: 1px solid #999;
height: 40px;
font-size: 16px;
text-align: center;">
{{element.tableth[tablethi]}}
</th>
</thead>
<tbody>
<tr *ngFor="let itemtr of element.tabletr">
<td
*ngFor="let itemtd of itemtr.tabletd;let tabletdi=index;TrackBy:trackByFn">
{{itemtr.tabletd[tabletdi]}}
</td>
</tr>
</tbody>
</table>
<textarea style="width: 99%;height: 100px;" *ngIf="element.level==3"
[value]="element.tableth" disabled></textarea>
<div class="inputtext" *ngIf="element.level==2">
<div class="inputj"
*ngFor="let itemth of element.tableth;let tablethi=index;TrackBy:trackByFn">
<div
*ngFor="let itemthj of element.tableth[tablethi];let tablethj=index;TrackBy:trackByFn">
<input type="text" placeholder="请输入内容"
style="background-color: #E8E9E9;width: 40%;"
[(ngModel)]="itemthj.head" disabled>
<input type="text" placeholder="请输入内容" style="width: 60%;"
[(ngModel)]="itemthj.body" disabled>
</div>
</div>
</div>
<div class="keyImg" *ngIf="element.level==4">
<div class="keyImgImg">
<div style="margin-top: 10px;
text-align: center;
position: relative;" class="imgbox" *ngFor="let imgUrl of element.tableth.json;let imgkey = index">
<img style="max-width: 100%;
width: auto;
height: auto;" [src]="imgUrl" alt="">
</div>
</div>
</div>
</div>
</div>
</div>

3
src/app/plan-management/plan-management.module.ts
Unescape View File

@ -69,11 +69,12 @@ import { CreatePlanOnlineThreeComponent } from './create-plan-online-three/creat
import { UiModule } from '../ui/ui.module'; import { UiModule } from '../ui/ui.module';
import { TreeDiagramModule } from '../ui/ng-tree-diagram/src/ng-tree-diagram'; import { TreeDiagramModule } from '../ui/ng-tree-diagram/src/ng-tree-diagram';
import { KeyUnitModule } from '../key-unit/key-unit.module'; import { KeyUnitModule } from '../key-unit/key-unit.module';
import { yinYong } from './create-plan-online-five/create-plan-online-five.component'
@NgModule({ @NgModule({
declarations: [EntryPlanComponent, PassPlanComponent, OpenPlanComponent, EntryPlanLookComponent, AddPlanone, PlanType, AuditSatus, PlanLevel, DownloadFile, AuditResult, ChangeName, declarations: [EntryPlanComponent, PassPlanComponent, OpenPlanComponent, EntryPlanLookComponent, AddPlanone, PlanType, AuditSatus, PlanLevel, DownloadFile, AuditResult, ChangeName,
WebLookComponent, OnetwoEntryPlanComponent, newunitComponent, MeetPlanComponent, newunitMeet, TypePlanComponent, newunitType, PsViewer, onetwoAuditResult, meetAuditResult, WebLookComponent, OnetwoEntryPlanComponent, newunitComponent, MeetPlanComponent, newunitMeet, TypePlanComponent, newunitType, PsViewer, onetwoAuditResult, meetAuditResult,
typeAuditResult, MaintainUpComponent, GkPsViewer, GkhtmlPsViewer, UnitInfo, ReinforcePlanComponent, state, ImgDetails, CreatePlanOnlineFiveComponent, CreatePlanOnlineThreeComponent, OpenPlanToolDialog], typeAuditResult, MaintainUpComponent, GkPsViewer, GkhtmlPsViewer, UnitInfo, ReinforcePlanComponent, state, ImgDetails, CreatePlanOnlineFiveComponent, CreatePlanOnlineThreeComponent, OpenPlanToolDialog,yinYong],
imports: [ imports: [
CommonModule, CommonModule,
PlanManagementRoutingModule, PlanManagementRoutingModule,

BIN
src/assets/images/yr.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 85 KiB

Write Preview
Loading…
Cancel
Save