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 37c2507..f9d4167 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 @@ -681,7 +681,7 @@ display: flex; flex-direction: column; overflow-y: auto;"> -
+
- -
{{parts.body[4].name}} 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 18a47bb..2e93ec6 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 @@ -64,7 +64,7 @@ } } } - + .contentbox { height: 100%; box-sizing: border-box; @@ -218,7 +218,7 @@ } } } - .leftnew { + .leftnew{ position: fixed; width: 14%; height: 90%; @@ -228,40 +228,40 @@ overflow-y: auto; display: flex; flex-direction: column; - .newHead { + .newHead{ width: 100%; height: 40px; text-align: center; background-color: #e1f1ff; - span { - text-align: center; - font-size: 16px; - color: #2196f3; - height: 40px; - line-height: 40px; - } + span{ + text-align: center; + font-size: 16px; + color: #2196F3; + height: 40px; + line-height: 40px; } - .newBody { + } + .newBody{ width: 100%; height: 100%; display: flex; flex-direction: column; - .search { + .search{ margin: 10px; width: 280px; height: 32px; - background-color: #e8e9e9; + background-color: #E8E9E9; border-radius: 20px; display: flex; - .searchChoose { + .searchChoose{ width: 30%; height: 70%; margin-top: 2%; - border-right: 1px solid #9eaab4; + border-right: 1px solid #9EAAB4; //text-align: center; - select { + select{ background-color: transparent; - border: 0; + border: 0; outline: none; margin-left: 5px; //height: 22px; @@ -271,7 +271,7 @@ bottom: 3px; } } - .searchText { + .searchText{ width: 65%; height: 100%; input { @@ -280,18 +280,19 @@ height: 100%; border: none; outline: none; - background-color: #e8e9e9; + background-color: #E8E9E9; //line-height: 32px; //border-radius: 3px; } .queryField { height: 32px; //margin: 0 10px; - } - .ordiv { + + } + .ordiv{ position: relative; - .organizationbox { - width: 280px; + .organizationbox{ + width:280px; height: 600px; background: white; position: absolute; @@ -300,19 +301,19 @@ z-index: 999; border: 1px solid grey; overflow-y: auto; - li { + li{ overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } - mat-tree-node { + mat-tree-node{ cursor: pointer; - white-space: pre; + white-space:pre; } - mat-tree-node:hover { - background: rgba(225, 225, 225, 0.8); + mat-tree-node:hover{ + background: rgba(225, 225, 225, 0.8); } - .closediv { + .closediv{ z-index: 100; position: absolute; right: 0; @@ -323,28 +324,29 @@ line-height: 30px; text-align: center; } - .closediv:hover { - background: rgba(225, 225, 225, 0.8); + .closediv:hover{ + background:rgba(225, 225, 225, 0.8); } } + } - .zdy { + .zdy{ width: 100%; height: 100%; } } - .searImg { + .searImg{ width: 15%; height: 100%; cursor: pointer; - img { + img{ position: relative; top: 20%; left: 10%; } } } - .newBodycenter { + .newBodycenter{ height: 86%; width: 100%; display: flex; @@ -352,33 +354,33 @@ align-content: flex-start; overflow-y: auto; //flex-direction: column; - .centerfen { + .centerfen{ //width: 50%; margin: 15px 0 12px 24px; //height: 150px; display: flex; flex-direction: column; - .tu { + .tu{ height: 100px; width: 110px; cursor: pointer; - img { + img{ width: 110px; height: 100px; } } - .org { + .org{ width: 110px; } - .lry { + .lry{ width: 110px; } - span { + span{ display: inline-block; } } } - .fenye { + .fenye{ width: 100%; } } @@ -400,7 +402,7 @@ height: 28px; line-height: 28px; } - input { + input{ width: 140px; } p { @@ -788,41 +790,43 @@ } } } - .building { + .building{ height: 100%; width: 100%; display: flex; flex-direction: column; + + } - .onetext { + .onetext{ height: 40px; width: 100%; - border-bottom: 1px solid #f2f4f5; - span { + border-bottom: 1px solid #F2F4F5; + span{ height: 40px; width: 40%; font-size: 16px; - background-color: #f2f4f5; + background-color: #F2F4F5; } - input { + input{ height: 40px; //width: 60%; font-size: 16px; border: none; outline: none; - border-bottom: 1px solid #f2f4f5; + border-bottom: 1px solid #F2F4F5; } - img { + img{ height: 20px; width: 20px; position: relative; top: 10px; } } - .file { + .file{ width: 100%; height: 100%; - .fileHead { + .fileHead{ height: 40px; width: 100%; background-color: #ffd91d; @@ -835,61 +839,62 @@ color: #b99a00; } } - .fileBody { + .fileBody{ height: 100%; width: 100%; display: flex; flex-direction: column; } } - .fouradj { + .fouradj{ width: 100%; height: 100%; display: flex; justify-content: space-between; flex-wrap: wrap; //flex-direction: column; - .adjtop, - .adjbottom { + .adjtop,.adjbottom{ width: 100%; height: 50%; display: flex; - .adjbody { + .adjbody{ height: 100%; width: 50%; - input { + input{ height: 40px; //width: 60%; font-size: 16px; border: none; outline: none; + } } } - .fourTexttwo { + .fourTexttwo{ height: 40px; width: 50%; - border-bottom: 1px solid #f2f4f5; - input { - height: 40px; - //width: 60%; - font-size: 16px; - border: none; - outline: none; + border-bottom: 1px solid #F2F4F5; + input{ + height: 40px; + //width: 60%; + font-size: 16px; + border: none; + outline: none; + } } } - .parts { + .parts{ height: 100%; width: 100%; display: flex; flex-direction: column; - .partsHead { + .partsHead{ width: 100%; height: 40px; background-color: #ffd91d; text-align: center; - input { + input{ height: 40px; font-size: 16px; border: none; @@ -906,21 +911,21 @@ margin-right: 10px; } } - .partsBody { + .partsBody{ width: 100%; height: 100%; display: flex; flex-direction: column; - .duohang { + .duohang{ width: 100%; height: 40px; display: flex; - border-bottom: 1px solid #ffffff; - .duohangHalf { + //border-bottom: 1px solid #FFFFFF; + .duohangHalf{ height: 40px; width: 50%; - - input { + + input{ height: 40px; //width: 60%; font-size: 16px; @@ -929,11 +934,11 @@ } } } - .danhang { + .danhang{ width: 100%; height: 40px; //border-top: 1px solid #FFFFFF; - input { + input{ height: 40px; //width: 60%; font-size: 16px; @@ -994,42 +999,42 @@ margin: 10px 0; } } - .titleItem { + .titleItem{ width: 100%; height: 36px; line-height: 36px; - background-color: #2196f3; + background-color: #2196F3; text-align: center; color: white; } } - .toolDiv { + .toolDiv{ position: fixed; right: 20%; bottom: 20px; display: flex; flex-direction: column; - button { + button{ margin: 5px 0; } } - .oldData { + .oldData{ width: 100px; height: 36px; - background-color: #ffffff; + background-color: #FFFFFF; border-radius: 0px 60px 60px 0px; position: fixed; right: 25.3%; top: 120px; display: flex; cursor: pointer; - span { + span{ color: #2196f3; font-size: 16px; line-height: 36px; margin-left: 5px; } - img { + img{ width: 18px; height: 15px; position: relative; @@ -1038,31 +1043,31 @@ } } } - .noPadding { + .noPadding{ padding-top: 10px; } - .quitPreview { + .quitPreview{ position: fixed; top: 10px; right: 15px; } } -.yinrubox { +.yinrubox{ width: 100%; height: 100%; display: flex; flex-direction: column; - .yinruboxHead { + .yinruboxHead{ width: 100%; - height: 7%; - border-bottom: 1px solid #8b8c8c; - span { + height:7%; + border-bottom:1px solid #8b8c8c; + span{ font-size: 18px; color: #2196f3; line-height: 40px; } - button { + button{ float: right; } } @@ -1208,27 +1213,3 @@ } } -.cdk-drag-preview { - height: 36px; - line-height: 36px; - background: white; - color: #8b8c8c; - margin: 0 3px; - text-align: center; - box-sizing: border-box; - padding: 0 10px; - font-size: 14px; - overflow: hidden; /*超出部分隐藏*/ - white-space: nowrap; /*不换行*/ - text-overflow: ellipsis; /*超出部分文字以...显示*/ - box-sizing: border-box; - border-radius: 40px; - box-shadow: 0 5px 5px -3px rgba(0, 0, 0, 0.2), 0 8px 10px 1px rgba(0, 0, 0, 0.14), - 0 3px 14px 2px rgba(0, 0, 0, 0.12); -} -.cdk-drag-placeholder { - opacity: 0; -} -.cdk-drag-animating { - transition: transform 250ms cubic-bezier(0, 0, 0.2, 1); -} diff --git a/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts b/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts index db3f0ef..5b41a30 100644 --- a/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts +++ b/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts @@ -862,7 +862,7 @@ export class AddPlanone { this.onlineedit = false this.website = false } - if (formdata.value.firstCtrltwo == '16' && formdata.value.firstCtrlthree != '4') { + if (formdata.value.firstCtrltwo == '16' ) {//&& formdata.value.firstCtrlthree != '4' this.localup = true this.inputword = true this.onlineedit = false diff --git a/src/app/ui/plan-template/addKeyname.html b/src/app/ui/plan-template/addKeyname.html index 4257d6d..1d79ae7 100644 --- a/src/app/ui/plan-template/addKeyname.html +++ b/src/app/ui/plan-template/addKeyname.html @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2021-05-20 16:11:57 * @LastEditors: sueRimn - * @LastEditTime: 2021-06-15 09:56:11 + * @LastEditTime: 2021-09-02 13:58:13 -->
@@ -23,7 +23,7 @@ Ⅲ级 - + Ⅳ级 Ⅴ级 diff --git a/src/app/ui/plan-template/plan-template.component.ts b/src/app/ui/plan-template/plan-template.component.ts index a3a02ac..8946103 100644 --- a/src/app/ui/plan-template/plan-template.component.ts +++ b/src/app/ui/plan-template/plan-template.component.ts @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2021-05-31 10:40:01 * @LastEditors: sueRimn - * @LastEditTime: 2021-08-07 15:21:06 + * @LastEditTime: 2021-09-02 14:06:11 */ import { Component, Inject, OnInit,ViewEncapsulation } from '@angular/core'; @@ -177,8 +177,9 @@ export class PlanTemplateComponent implements OnInit { data:null } let aaa = await new Promise((resolve, reject)=>{ - delete this.newleftTabledata[this.leftclicki].data[0].attribute[1].attinf - delete this.newleftTabledata[this.leftclicki].data[0].attribute[3].attinf + console.log(this.newleftTabledata) + //delete this.newleftTabledata[this.leftclicki].data + //delete this.newleftTabledata[this.leftclicki].data[0].attribute[3].attinf this.http.post("/api/PlanTemplate",savaData).subscribe((data:any)=>{ this.newleftTabledata[this.newleftTabledata.length-1].id='' this.newleftTabledata[this.newleftTabledata.length-1].id=data.id diff --git a/src/app/ui/plan-template/upPlan.html b/src/app/ui/plan-template/upPlan.html index 18c27bc..9b6bb51 100644 --- a/src/app/ui/plan-template/upPlan.html +++ b/src/app/ui/plan-template/upPlan.html @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2021-05-21 10:43:28 * @LastEditors: sueRimn - * @LastEditTime: 2021-08-07 15:04:56 + * @LastEditTime: 2021-09-02 13:58:57 --> + Ⅳ级 Ⅴ级