From f4a6f017afe415dd37edf22fdaa02dae6e7b4d3d Mon Sep 17 00:00:00 2001
From: cpf <1105965053@qq.com>
Date: Fri, 24 Dec 2021 12:24:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=BA=A2=E5=87=BA?=
 =?UTF-8?q?=E6=96=87=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/pages/left-domain/left-domain.component.html | 2 +-
 src/app/pages/left-domain/left-domain.component.scss | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/app/pages/left-domain/left-domain.component.html b/src/app/pages/left-domain/left-domain.component.html
index 7887279..7c94950 100644
--- a/src/app/pages/left-domain/left-domain.component.html
+++ b/src/app/pages/left-domain/left-domain.component.html
@@ -185,7 +185,7 @@
     <div class="publicBox disposalPlan" *ngIf="beforeFence === 7 && allMarkPlanData">
       <div class="interval" *ngFor="let item of allMarkPlanData.datas;let key = index;">
         <div class="publicDisposal disposalHeader">
-          {{item.name}}
+          <span>{{item.name}}</span>
           <label *ngIf="editMode">
             <i nz-icon nzType="plus-circle" nzTheme="outline" (click)="addNodePop = item.id;"></i>
             <i nz-icon nzType="edit" nzTheme="outline" (click)="openEditDisposal(item)"></i>
diff --git a/src/app/pages/left-domain/left-domain.component.scss b/src/app/pages/left-domain/left-domain.component.scss
index e4b8472..d40925d 100644
--- a/src/app/pages/left-domain/left-domain.component.scss
+++ b/src/app/pages/left-domain/left-domain.component.scss
@@ -90,14 +90,15 @@
   .interval{ margin-top: 10px; } //分隔div
   font-size: 15px;
   ul,li { width: 100%; }
-  li:before{ content: ""; width: 5px; height: 5px; border-radius: 50%; display: inline-block; vertical-align: 3px; background: #23D9FF; margin-right: 10px; }
+  li:before{ content: ""; width: 5px; height: 5px; border-radius: 50%; display: inline-block; background: #23D9FF; margin-top: 15px; }
   .publicDisposal{
     height: 35px;
     line-height: 35px;
     color: #23D9FF;
     padding-left: 20px;
-    label{ float: right; .anticon{ margin-right: 10px; font-size: 18px; cursor: pointer; } }
-    span{ cursor: pointer; }
+    display: flex;
+    label{ display: block; .anticon{ margin-right: 10px; font-size: 18px; cursor: pointer; } }
+    span{ display: block; cursor: pointer; flex: 1; padding: 0 5px; overflow: hidden; text-overflow:ellipsis; white-space: nowrap; }
   }
   .disposalContent { color: #fff; .anticon{ color: #23D9FF; } }
   .disposalHeader {

From 85c619a4160e35f6db680d612d3391ce47788b06 Mon Sep 17 00:00:00 2001
From: cpf <1105965053@qq.com>
Date: Fri, 24 Dec 2021 15:18:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=BF=E6=8D=A2UI=20=E5=8F=AF=E5=B1=95?=
 =?UTF-8?q?=E5=BC=80=E9=9D=A2=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../left-domain/left-domain.component.html    | 38 ++++++++++---------
 .../left-domain/left-domain.component.scss    |  8 +---
 .../left-domain/left-domain.component.ts      | 12 +++++-
 src/styles.scss                               | 16 ++++++++
 4 files changed, 48 insertions(+), 26 deletions(-)

diff --git a/src/app/pages/left-domain/left-domain.component.html b/src/app/pages/left-domain/left-domain.component.html
index 7c94950..ee0bfd5 100644
--- a/src/app/pages/left-domain/left-domain.component.html
+++ b/src/app/pages/left-domain/left-domain.component.html
@@ -182,23 +182,27 @@
     </div>
     <!-- 油气回收 -->
     <!-- 处置预案 -->
-    <div class="publicBox disposalPlan" *ngIf="beforeFence === 7 && allMarkPlanData">
-      <div class="interval" *ngFor="let item of allMarkPlanData.datas;let key = index;">
-        <div class="publicDisposal disposalHeader">
-          <span>{{item.name}}</span>
-          <label *ngIf="editMode">
-            <i nz-icon nzType="plus-circle" nzTheme="outline" (click)="addNodePop = item.id;"></i>
-            <i nz-icon nzType="edit" nzTheme="outline" (click)="openEditDisposal(item)"></i>
-            <i nz-icon nzType="delete" nzTheme="outline" (click)="deleteDisposal(item)"></i>
-          </label>
-        </div>
-        <ul>
-          <li class="publicDisposal disposalContent" *ngFor="let items of item.nodes;let keys = index;">
-            <span nz-popconfirm nzPopconfirmTitle="切换节点后,没保存的信息将会丢失!" [nzCondition]="!editMode" (nzOnConfirm)="selectNode(item,items,keys)" [ngClass]="{'selectNode': selectNodeId == items.id && selectPlanId == item.id}">{{items.name}}</span>
-            <label *ngIf="editMode"><i nz-icon nzType="save" nzTheme="outline" (click)="saveDisposal(item.id,items.id)"></i><i nz-icon nzType="delete" nzTheme="outline" (click)="deleteDisposal(item,items)"></i></label>
-          </li>
-        </ul>
-      </div>
+    <div class="publicBox disposalPlan" *ngIf="beforeFence === 7 && allMarkPlanData" id="disposalPlan">
+      <nz-collapse>
+        <nz-collapse-panel *ngFor="let item of allMarkPlanData.datas;let key = index;" [nzHeader]="extraTpl" nzActive="true" nzShowArrow="false">
+          <ng-template #extraTpl>
+            <div class="publicDisposal disposalHeader">
+              <span>{{item.name}}</span>
+              <label *ngIf="editMode">
+                <i nz-icon nzType="plus-circle" nzTheme="outline" (click)="openAddDisposal($event,item.id)"></i>
+                <i nz-icon nzType="edit" nzTheme="outline" (click)="openEditDisposal($event,item)"></i>
+                <i nz-icon nzType="delete" nzTheme="outline" (click)="deleteDisposal($event,item)"></i>
+              </label>
+            </div>
+          </ng-template>
+          <ul>
+            <li class="publicDisposal disposalContent" *ngFor="let items of item.nodes;let keys = index;">
+              <span nz-popconfirm nzPopconfirmTitle="切换节点后,没保存的信息将会丢失!" [nzCondition]="!editMode" (nzOnConfirm)="selectNode(item,items,keys)" [ngClass]="{'selectNode': selectNodeId == items.id && selectPlanId == item.id}">{{items.name}}</span>
+              <label *ngIf="editMode"><i nz-icon nzType="save" nzTheme="outline" (click)="saveDisposal(item.id,items.id)"></i><i nz-icon nzType="delete" nzTheme="outline" (click)="deleteDisposal($event,item,items)"></i></label>
+            </li>
+          </ul>
+        </nz-collapse-panel>
+      </nz-collapse>
     </div>
     <!-- 处置预案 -->
     <!-- 弹窗 -->
diff --git a/src/app/pages/left-domain/left-domain.component.scss b/src/app/pages/left-domain/left-domain.component.scss
index d40925d..125cabd 100644
--- a/src/app/pages/left-domain/left-domain.component.scss
+++ b/src/app/pages/left-domain/left-domain.component.scss
@@ -87,24 +87,18 @@
   .treeRow{ width: 100%; display: flex; height: 30px; line-height: 30px; p:first-child{ flex: 1; }; p{ margin: 0; padding: 0; .anticon{ margin-right: 5px; font-size: 16px; } } }
 }
 .disposalPlan{ //处置预案
-  .interval{ margin-top: 10px; } //分隔div
-  font-size: 15px;
   ul,li { width: 100%; }
   li:before{ content: ""; width: 5px; height: 5px; border-radius: 50%; display: inline-block; background: #23D9FF; margin-top: 15px; }
   .publicDisposal{
     height: 35px;
     line-height: 35px;
     color: #23D9FF;
-    padding-left: 20px;
+    padding-left: 15px;
     display: flex;
     label{ display: block; .anticon{ margin-right: 10px; font-size: 18px; cursor: pointer; } }
     span{ display: block; cursor: pointer; flex: 1; padding: 0 5px; overflow: hidden; text-overflow:ellipsis; white-space: nowrap; }
   }
   .disposalContent { color: #fff; .anticon{ color: #23D9FF; } }
-  .disposalHeader {
-    background: rgba(35, 153, 255, 0.41);
-    border: 1px solid rgba(35, 217, 255, 0.4);
-  }
   .selectNode{ color: red; } //选中节点样式
 }
 //弹窗
diff --git a/src/app/pages/left-domain/left-domain.component.ts b/src/app/pages/left-domain/left-domain.component.ts
index b503fc1..e2c8fe0 100644
--- a/src/app/pages/left-domain/left-domain.component.ts
+++ b/src/app/pages/left-domain/left-domain.component.ts
@@ -258,8 +258,15 @@ export class LeftDomainComponent implements OnInit {
   editSelectDisposal: MarkPlanData = null; //编辑预案名称 选中预案
   editDisposalName: string = null; //显示/隐藏 编辑预案名称 弹窗
 
+  //打开 创建预案弹窗
+  openAddDisposal(event, id: number) {
+    event.stopPropagation()
+    this.addNodePop = id
+  }
+
   //打开 编辑预案名称弹窗
-  openEditDisposal(item: MarkPlanData) {
+  openEditDisposal(event, item: MarkPlanData) {
+    event.stopPropagation()
     this.editSelectDisposal = item;
     this.editDisposalName = JSON.parse(JSON.stringify(item.name))
   }
@@ -271,7 +278,8 @@ export class LeftDomainComponent implements OnInit {
   }
 
   //删除预案/节点
-  deleteDisposal(item: MarkPlanData, e?: MarkNodeData) {
+  deleteDisposal(event, item: MarkPlanData, e?: MarkNodeData) {
+    event.stopPropagation()
     let isTrue = confirm('您确定要删除吗')
     if (isTrue) {
       if (!e) {
diff --git a/src/styles.scss b/src/styles.scss
index 877a497..44dae28 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -137,6 +137,22 @@ h1 {
   canvas{ width: 100%; height: 100%; border: none; outline: none; }
 }
 #threeDimensional {
+  //可展开面板
+  #disposalPlan{
+    font-size: 15px;
+    .ant-collapse-header{
+      width: 100%;
+      height: 35px;
+      line-height: 35px;
+      color: #23D9FF;
+      padding: 0px;
+      background: rgba(35, 153, 255, 0.41);
+      border: 1px solid rgba(35, 217, 255, 0.4);
+    }
+    .ant-collapse { background-color: transparent; }
+    .ant-collapse-content { background-color: transparent; width: 100% }
+  }
+
   .ant-tree{ color: #C4E2FC; } //tree
   .ant-tree,.ant-tree-node-content-wrapper:hover,.ant-tree-node-content-wrapper.ant-tree-node-selected { background-color: transparent; } //tree
   .ant-tree-node-content-wrapper { width: 100%; } //tree