[完善]完善合并错误

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;">
-                        <div *ngFor="let itemunit of planTemplateData[1].building;let uniti=index"> <!-- style="border-bottom: 3px solid #999;" -->
+                        <div *ngFor="let itemunit of item.building;let uniti=index"> <!-- style="border-bottom: 3px solid #999;" -->
                             <div *ngIf="itemunit.completed">
                                 <div class="unithead" style=" height: 40px;
                                 width: 100%;

src/app/plan-management/create-plan-online-five/create-plan-online-five.component.scss

@@ -1213,3 +1213,27 @@
     }
 }
 
+.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);
+}