Merge branch 'master' of http://121.36.37.70:3000/shaojiahao/Jinan_project

src/app/home/home.module.ts

@@ -59,7 +59,8 @@ import { ChangePasswordComponent } from './change-password/change-password.compo
 import { NzUploadModule } from 'ng-zorro-antd/upload';
 import { NzCardModule } from 'ng-zorro-antd/card';
 import { PlanAdjustmentComponent } from './task/da-oneself-plan/plan-adjustment/plan-adjustment.component';
-import { NzToolTipModule } from 'ng-zorro-antd/tooltip';
+import { NzToolTipModule } from 'ng-zorro-antd/tooltip';
+import { TaskDetailsComponent } from './task/station-weekly-plan/task-details/task-details.component';
 @NgModule({
   declarations: [
     NavComponent,
@@ -93,7 +94,8 @@ import { NzToolTipModule } from 'ng-zorro-antd/tooltip';
     UnitEditComponent,
     AllotPersonComponent,
     ChangePasswordComponent,
-    PlanAdjustmentComponent
+    PlanAdjustmentComponent,
+    TaskDetailsComponent
   ],
   imports: [
     CommonModule,

src/app/home/task/station-weekly-plan/station-weekly-plan.component.html

@@ -77,8 +77,15 @@
                     <div class="itemtwo" *ngIf="item.isDetails">
                         <p class="itemtwotitle">
                             <span>{{item.name}}</span>
-                            <span class="back" (click)="openDetails(item,false)"><i nz-icon nzType="rollback"
-                                    nzTheme="outline"></i>返回</span>
+                            
+                            <span class="back">
+                                <i nz-icon nzType="fullscreen" nzTheme="outline" (click)="taskDetails()"></i>
+                                <span (click)="openDetails(item,false)">
+                                    <i nz-icon nzType="rollback" nzTheme="outline"></i>
+                                    返回
+                                </span>
+                               
+                            </span>
                         </p>
                         <div class="itemtwocontent">
                             <div class="itemtwocontentitem" *ngFor="let i of item.data">

src/app/home/task/station-weekly-plan/task-details/task-details.component.html

@@ -0,0 +1,13 @@
+<div>
+    <div class="list">
+        <div class="item">
+            <div class="text">
+                想吃啥吃啥有限公司
+            </div>
+            <div class="state">
+                已派发
+            </div>
+        </div>
+        
+    </div>
+</div>

src/app/home/task/station-weekly-plan/task-details/task-details.component.scss

@@ -0,0 +1,15 @@
+.list{
+    margin-top: -10px;
+    max-height: 600px;
+    padding: 0 5px;
+    overflow: auto;
+    .item{
+        display: flex;
+        border-bottom: 1px dotted #C7CAD0;
+        height: 60px;
+        line-height: 60px;
+        .text{
+            flex: 1;
+        }
+    }
+}

src/app/home/task/station-weekly-plan/task-details/task-details.component.spec.ts

@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { TaskDetailsComponent } from './task-details.component';
+
+describe('TaskDetailsComponent', () => {
+  let component: TaskDetailsComponent;
+  let fixture: ComponentFixture<TaskDetailsComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ TaskDetailsComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(TaskDetailsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/home/task/station-weekly-plan/task-details/task-details.component.ts

@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-task-details',
+  templateUrl: './task-details.component.html',
+  styleUrls: ['./task-details.component.scss']
+})
+export class TaskDetailsComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit(): void {
+  }
+
+}