diff --git a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html index 9e7edc0..1fe1d83 100644 --- a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html +++ b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html @@ -88,14 +88,14 @@
{{item.name}}
-
+
查看图片
-
+
增加分组
@@ -223,47 +223,55 @@
{{element.headName}} - - + +
- - - - - - - - - + + + +
- -
+ +
- +
-
-
- - +
+
+ + +
+
+
+ +
+
-
-
- -
- -
diff --git a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.scss b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.scss index 9e6d5b9..3ff13c2 100644 --- a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.scss +++ b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.scss @@ -1,5 +1,4 @@ - -*{ +* { -webkit-touch-callout: none; -webkit-user-select: none; -khtml-user-select: none; @@ -7,7 +6,7 @@ -ms-user-select: none; user-select: none; scrollbar-width: none; /* Firefox */ -} +} ::-webkit-scrollbar { display: none; /* Chrome Safari */ } @@ -81,34 +80,34 @@ top: 66px; min-width: 268px; overflow-y: auto; - .leftKeyImg{ - .keyImgTitle{ + .leftKeyImg { + .keyImgTitle { width: 100%; height: 33px; line-height: 33px; text-align: center; font-size: 15px; - color: #2196F3; + color: #2196f3; background: #e8f4fe; } - .planlist{ + .planlist { width: 100%; height: 100%; overflow-y: auto; } - .content{ + .content { box-sizing: border-box; padding: 15px; display: flex; flex-wrap: wrap; justify-content: flex-start; - .realPictureItem{ + .realPictureItem { width: 100%; display: flex; flex-wrap: wrap; justify-content: flex-start; } - .realPictureTitle{ + .realPictureTitle { width: 100%; font-size: 14px; height: 33px; @@ -116,33 +115,33 @@ text-align: center; margin-bottom: 5px; } - .contentitem{ + .contentitem { margin-right: 15px; - div{ + div { width: 100px; height: 100px; - border-radius: 10px; - border: 1px solid #2196F3; + border-radius: 10px; + border: 1px solid #2196f3; overflow: hidden; - img{ + img { width: 100%; height: 100%; cursor: pointer; } } - p{ + p { text-align: center; font-size: 13px; margin: 5px 0; width: 100px; } } - .realPictureImgItem{ + .realPictureImgItem { position: relative; - img{ - cursor: default!important; + img { + cursor: default !important; } - .realPictureImgItemBtn{ + .realPictureImgItemBtn { position: absolute; left: 50%; transform: translateX(-50%); @@ -157,22 +156,21 @@ cursor: pointer; font-size: 12px; } - .realPictureImgItemBtn1{ + .realPictureImgItemBtn1 { top: 15px; } - .realPictureImgItemBtn2{ + .realPictureImgItemBtn2 { top: 55px; } } - .realPictureImgItem:hover{ + .realPictureImgItem:hover { // background: rgba(0,0,0,0.2); - .realPictureImgItemBtn{ + .realPictureImgItemBtn { display: block; } } } } - } .mainbox { background-color: white; @@ -231,38 +229,38 @@ display: flex; flex-direction: column; overflow-y: auto; - .boxHead{ + .boxHead { height: 40px; width: 100%; background-color: #e8f4fe; //opacity: 0.1; - span{ + span { margin-left: 20px; font-size: 16px; - color: #2196F3 ; - opacity:1; + color: #2196f3; + opacity: 1; height: 40px; line-height: 40px; } } - .boxBody{ + .boxBody { height: 100%; width: 100%; display: flex; flex-direction: column; - .boxBodyHead{ + .boxBodyHead { width: 100%; height: 40px; - background-color: #FFD91D; + background-color: #ffd91d; text-align: center; - span{ + span { font-size: 16px; text-align: center; height: 40px; line-height: 40px; - color: #B99A00; + color: #b99a00; } - img{ + img { cursor: pointer; width: 20px; height: 20px; @@ -271,16 +269,16 @@ margin-right: 10px; } } - .body{ + .body { width: 100%; height: 100%; - thead{ + thead { width: 100%; - background-color: #E8E9E9; + background-color: #e8e9e9; } table { width: 100%; - border-collapse:collapse; + border-collapse: collapse; //background-color: #E8E9E9; } th { @@ -290,7 +288,7 @@ font-size: 16px; text-align: center; input { - background-color: #E8E9E9; + background-color: #e8e9e9; text-align: center; height: 100%; width: 100%; @@ -299,13 +297,13 @@ outline: none; } } - td{ + td { border: 1px solid #999; height: 40px; font-size: 16px; text-align: center; input { - background-color: #FFFFFF; + background-color: #ffffff; text-align: center; height: 100%; width: 100%; @@ -343,7 +341,7 @@ border: 1px solid #e8e9e9; .keyImgTitle { height: 30px; - border-left: 1px solid #2196F3; + border-left: 1px solid #2196f3; position: relative; input { width: 100%; @@ -354,28 +352,28 @@ box-sizing: border-box; padding: 0 5px; } - .deleteItem{ + .deleteItem { position: absolute; right: 5px; top: 3px; cursor: pointer; color: #292c2c; } - .deleteItem:hover{ + .deleteItem:hover { color: red; } } .keyImgImg { - .imgbox{ + .imgbox { margin-top: 10px; text-align: center; position: relative; - img{ + img { max-width: 100%; width: auto; height: auto; } - .deleteImg{ + .deleteImg { display: none; cursor: pointer; position: absolute; @@ -383,30 +381,30 @@ top: 0px; } } - .imgbox:hover{ - .deleteImg{ + .imgbox:hover { + .deleteImg { display: block; } } - .uploadBtn{ + .uploadBtn { display: flex; justify-content: center; margin: 50px 0; position: relative; - input{ + input { width: 112px; height: 36px; position: absolute; left: 50%; top: 50%; - transform: translate(-50%,-50%); + transform: translate(-50%, -50%); opacity: 0; cursor: pointer; } } } } - .addkeyImgItem{ + .addkeyImgItem { display: flex; justify-content: center; margin: 10px 0; diff --git a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts index 5dac629..4b8eadd 100644 --- a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts +++ b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts @@ -31,27 +31,27 @@ export class CreatePlanOnlineFiveComponent implements OnInit { this.getTemplateData() this.getUnitData() this.tree = { - json:this.treedate, + json: this.treedate, config: this.treeConfig - }; - } -//树形结构数据 -treedate=[ - { - "guid": "bc4c7a02-5379-4046-92be-12c67af4295a", - "displayName": "Elentrix", - "children": [ - /* "85d412c2-ebc1-4d56-96c9-7da433ac9bb2", - "28aac445-83b1-464d-9695-a4157dab6eac" */ - ] + }; } - -] -tree -treeConfig = { - nodeWidth: 90, - nodeHeight: 60 -}; + //树形结构数据 + treedate = [ + { + "guid": "bc4c7a02-5379-4046-92be-12c67af4295a", + "displayName": "Elentrix", + "children": [ + /* "85d412c2-ebc1-4d56-96c9-7da433ac9bb2", + "28aac445-83b1-464d-9695-a4157dab6eac" */ + ] + } + + ] + tree + treeConfig = { + nodeWidth: 90, + nodeHeight: 60 + }; //获得单位信息 unitData: any @@ -71,7 +71,7 @@ treeConfig = { selectedItem: string = '封面' clickTitleItem(item) { - this.addNumber=-1 + this.addNumber = -1 item == '封面' ? this.selectedItem = '封面' : this.selectedItem = item.groupName if (this.selectedItem == '重点图示') { this.getAllBuildings() @@ -90,7 +90,7 @@ treeConfig = { } }).subscribe((data: any) => { this.allRealPicture = data - this.getAllRealPicture().then(()=>{ + this.getAllRealPicture().then(() => { console.log('实景图', this.allRealPicture) }) }) @@ -143,7 +143,7 @@ treeConfig = { item.attribute.push({ name: '', imgArr: [] }) } //通过左侧实景图增加分组 - addkeyImgItemLeft(i){ + addkeyImgItemLeft(i) { console.log(i) } //重点图示删除指定分组 @@ -234,43 +234,43 @@ treeConfig = { }) } //input key值，一个字符焦点消失问题 - trackByFn(index){ + trackByFn(index) { return index } //表格增加一行 - addNumber=-1 - addTd(key,i){ + addNumber = -1 + addTd(key, i) { this.addNumber++ //this.planTemplateData[key].attribute[i].push({tabletr:[]}) - if(this.planTemplateData[key].attribute[i].tabletr==undefined){ - this.planTemplateData[key].attribute[i].tabletr=[] + if (this.planTemplateData[key].attribute[i].tabletr == undefined) { + this.planTemplateData[key].attribute[i].tabletr = [] } - this.planTemplateData[key].attribute[i].tabletr.push({tabletd:[]}) - for(var j=0;j { this.dialogRef.close("success"); diff --git a/src/app/plan-management/plan-management.module.ts b/src/app/plan-management/plan-management.module.ts index 86ea283..5030a40 100644 --- a/src/app/plan-management/plan-management.module.ts +++ b/src/app/plan-management/plan-management.module.ts @@ -72,7 +72,7 @@ import { TreeDiagramModule } from '../ui/ng-tree-diagram/src/ng-tree-diagram'; @NgModule({ declarations: [EntryPlanComponent, PassPlanComponent, OpenPlanComponent, EntryPlanLookComponent, AddPlanone, PlanType, AuditSatus, PlanLevel, DownloadFile, AuditResult, ChangeName, 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], imports: [ CommonModule, PlanManagementRoutingModule,