日程删除&新增日程bug修复

d71989c3 · sunchao · 5c307df8 · d71989c3 · d71989c3 · d71989c3
Commit d71989c3 authored Sep 18, 2020 by sunchao
9 changed files
--- a/src/app/my/add-task/add-task.component.html
+++ b/src/app/my/add-task/add-task.component.html
@@ -4,7 +4,8 @@
    <div class="head">
      <h3 (click)="goBack()">&lt;</h3>
      <h3>新建日程</h3>
-      <div id="add_calendar_wrapper">
+      <div></div>
+      <!-- <div id="add_calendar_wrapper">
        <List className="calendar-list" style="backgroundColor: 'white'">
          <ListItem (onClick)="clickCalendar()">
            {{this.state.en ? '日历' : '日历'}}
@@ -24,7 +25,7 @@
                  (onCancel)="triggerCancel()"
                  (onConfirm)="triggerConfirm($event)"
        ></Calendar>
-      </div>
+      </div> -->
    </div>
    <ul class="nav">
      <li *ngFor="let tabItem of tabList;index as i;"  [ngClass]="{'selected':tabItem.code === tabType}" (click)="selectTab(tabItem.code,tabItem.taskType)">
@@ -49,11 +50,11 @@
      <div style="font-size: 18px;">选择任务需要的时间</div>
      <div class="timeContent">
        <div class="picker_list">
-          <PickerView [data]="seasons" [cols]='3' [cascade]="false" [ngModel]="addTrack.taskTimeFrom" (ngModelChange)="onChange($event,1)"></PickerView>
+          <PickerView [data]="seasons" [cols]='3' [cascade]="false" [ngModel]="addTrack.taskTimeFrom" [indicatorStyle]="{'background':'#f6f6f6','border-radius':'50px','z-index':'0'}" (ngModelChange)="onChange($event,1)"></PickerView>
        </div>
        <div style="color: #d9dadc;width: 10%;text-align: center;">到</div>
        <div class="picker_list">
-          <PickerView [data]="seasons" [cascade]="false" [cols]='3' [ngModel]="addTrack.taskTimeEnd" (ngModelChange)="onChange($event,2)"></PickerView>
+          <PickerView [data]="seasons" [cascade]="false" [cols]='3' [ngModel]="addTrack.taskTimeEnd" [indicatorStyle]="{'background':'#f6f6f6','border-radius':'50px','z-index':'0'}" (ngModelChange)="onChange($event,2)"></PickerView>
        </div>
      </div>
    </div>

--- a/src/app/my/add-task/add-task.component.scss
+++ b/src/app/my/add-task/add-task.component.scss
@@ -8,11 +8,10 @@ ul,ol{
    .top{
        .head{
            display: flex;
-            height: 50px;
+            height: 45px;
            justify-content: space-between;
            align-items: center;
            padding: 0 8px;
-            margin-bottom: 8px;
        }
        .nav{
@@ -43,7 +42,7 @@ ul,ol{
    }
    .task_content_wrapper{
        .part_wrapper{
-            margin-top: 20px;
+            margin-top: 10px;
            position: relative;
            padding: 0 4%;
            ul{

--- a/src/app/my/add-task/add-task.component.ts
+++ b/src/app/my/add-task/add-task.component.ts
@@ -38,35 +38,21 @@ export class AddTaskComponent implements OnInit {
  constructor(private myService:MyService,private router: Router,private _modal: ModalService, private _toast: ToastService,
   public lifeCommonService:LifeCommonService,private activateRoute:ActivatedRoute) {
    this.seasons = [
-      {label: '8:00',id:1},
+      {label: '8:00',value:1},{label: '8:30',value:2},
-      {label: '8:30',id:2},
+      {label: '9:00',value:3},{label: '9:30', value:4},
-      {label: '9:00',id:3},
+      {label: '10:00',value:5},{label: '10:30',value:6},
-      {label: '9:30', id:4},
+      {label: '11:00',value:7},{label: '11:30',value:8},
-      {label: '10:00',id:5},
+      {label: '12:00',value:9},{label: '12:30',value:10},
-      {label: '10:30',id:6},
+      {label: '13:00',value:11},{label: '13:30',value:12},
-      {label: '11:00',id:7},
+      {label: '14:00',value:13},{label: '14:30',value:14},
-      {label: '11:30',id:8},
+      {label: '15:00',value:15},{label: '15:30',value:16},
-      {label: '12:00',id:9},
+      {label: '16:00',value:17},{label: '16:30',value:18},
-      {label: '12:30',id:10},
+      {label: '17:00',value:19},{label: '17:30',value:20},
-      {label: '13:00',id:11},
+      {label: '18:00',value:21},{label: '18:30',value:22},
-      {label: '13:30',id:12},
+      {label: '19:00',value:23},{label: '19:30',value:24},
-      {label: '14:00',id:13},
+      {label: '20:00',value:25},{label: '20:30',value:26},
-      {label: '14:30',id:14},
+      {label: '21:00',value:27},{label: '21:30',value:28},
-      {label: '15:00',id:15},
+      {label: '22:00',value:29},{label: '22:30',value:30}
-      {label: '15:30',id:16},
-      {label: '16:00',id:17},
-      {label: '16:30',id:18},
-      {label: '17:00',id:19},
-      {label: '17:30',id:20},
-      {label: '18:00',id:21},
-      {label: '18:30',id:22},
-      {label: '19:00',id:23},
-      {label: '19:30',id:24},
-      {label: '20:00',id:25},
-      {label: '20:30',id:26},
-      {label: '21:00',id:27},
-      {label: '21:30',id:28},
-      {label: '22:00',id:29},
    ];
    // console.log(this.router.getCurrentNavigation().extras.state)
   }
@@ -172,7 +158,7 @@ export class AddTaskComponent implements OnInit {
    if(type===2){
      this.addTrack.taskTimeEnd = result;
    }
-    console.log(this.addTrack.taskTimeFrom,this.addTrack.taskTimeEnd)
+    console.log(this.addTrack.taskTimeFrom,this.addTrack.taskTimeEnd);
  }
  selectTask(id){
@@ -303,14 +289,14 @@ export class AddTaskComponent implements OnInit {
      }, 3000);
      return;
    }
-    this.addTrack = {
+    const  trackAdded = {
        ...this.addTrack,
        taskImportantTag:this.addTrack.taskImportantTag?1:0,
        isActive:1,
        taskTimeFrom:this.addTrack.taskTimeFrom[0]['label'],
        taskTimeEnd:this.addTrack.taskTimeEnd[0]['label']
-    }
+      }
-    this.myService.addScheduleTrack(this.addTrack).subscribe((res)=>{
+    this.myService.addScheduleTrack(trackAdded).subscribe((res)=>{
      const toast = ToastService.show(`${res['message']}`, 0);
      setTimeout(() => {
        ToastService.hide();

--- a/src/app/my/my.service.ts
+++ b/src/app/my/my.service.ts
@@ -366,4 +366,11 @@ export class MyService {
    return this.http
      .post(url, JSON.stringify(param));
  }
+  //删除日程
+  deleteScheduleTrackById(param){
+    const url = this.ydapi + '/practitioner/deleteScheduleTrackById';
+    return this.http
+      .post(url, JSON.stringify(param));
+  }
 }
--- a/src/app/my/score-details/score-details.component.ts
+++ b/src/app/my/score-details/score-details.component.ts
@@ -50,7 +50,7 @@ export class ScoreDetailsComponent implements OnInit {
                name: 'PEP得分',
                type: 'pie',
                radius: ['20%', '40%'],
-                avoidLabelOverlap: false,
+                avoidLabelOverlap: true,
                label: {
                  show: true,
                  position: 'outside',

--- a/src/app/my/todo-list/todo-list.component.html
+++ b/src/app/my/todo-list/todo-list.component.html
@@ -6,6 +6,7 @@
      <div id="add_calendar_wrapper">
        <List className="calendar-list" style="backgroundColor: 'white'">
          <ListItem (onClick)="clickCalendar()">
+            <img src="assets/images/date_icon.png" />
            {{this.state.en ? '日历' : '日历'}}
          </ListItem>
        </List>
@@ -26,15 +27,15 @@
      </div>
    </div>
    <ul class="week">
-      <li *ngFor="let weekItem of weekArr;index as i;"  [ngClass]="{'selected':weekItem.date == trackTime}" (click)="selectDay(weekItem)">
+      <li *ngFor="let weekItem of weekArr;index as i;" [ngClass]="{'selected':weekItem.date == trackTime}" (click)="selectDay(weekItem)">
        <div>{{weekItem.day}}</div>
        <span>{{lifeCommonService.getWeek(weekItem.week)}}</span>
      </li>
    </ul>
  </div>
  <div class="task_wrapper">
-    <div class="noTask" >
+    <div class="noTask" *ngIf="!taskList?.length">
-      <img src="assets/images/noListBg.png" *ngIf="!taskList?.length">
+      <img src="assets/images/noListBg.png">
    </div>
    <div class="taskList" *ngIf="taskList?.length>0">
      <div class="taskTime">
@@ -46,7 +47,7 @@
      <div class="taskContent">
        <div class="title">任务数量（{{taskList?.length}}）</div>
        <ul>
-          <li *ngFor="let taskItem of taskList">
+          <li *ngFor="let taskItem of taskList" (click)="deleteScheduleTrackById(taskItem.id)">
            <div class="content_wrapper">
              <div class="content_card">
                <span>{{taskItem.taskTimeFrom}} - {{taskItem.taskTimeEnd}}</span>
@@ -62,7 +63,7 @@
        </ul>
      </div>
    </div>
-    <div class="addBtn" [ngStyle]="{'background':taskList?.length? '#ff002b' : '#eb6100','bottom':taskList?.length?'4%':'-15%'}" [routerLink]="['/addtask']">
+    <div class="addBtn" [ngStyle]="{'background':taskList?.length? '#ff002b' : '#eb6100'}" [routerLink]="['/addtask']">
      <i class="iconfont icon-jiahao" ></i>
    </div>
  </div>

--- a/src/app/my/todo-list/todo-list.component.scss
+++ b/src/app/my/todo-list/todo-list.component.scss
@@ -129,14 +129,14 @@ ul,ol{
           }
        }
        .addBtn{
-            position: absolute;
+            position: fixed;
            width: 50px;
            height: 50px;
            border-radius: 50%;
            color: #fff;
            text-align: center;
            line-height: 50px;
-            bottom: -15%;
+            bottom: 4%;
            right: 8%;
            z-index: 100;
            .iconfont{

--- a/src/app/my/todo-list/todo-list.component.ts
+++ b/src/app/my/todo-list/todo-list.component.ts
@@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { LifeCommonService } from '../../common/life-common.service';
 import {MyService} from '../my.service';
 import * as dayjs from 'dayjs';
+import { ModalService, ToastService } from 'ng-zorro-antd-mobile';
 @Component({
  selector: 'ydlife-todo-list',
@@ -30,7 +31,7 @@ export class TodoListComponent implements OnInit {
    onSelect: undefined,
  }
  practitionerId:number;
-  constructor(public lifeCommonService: LifeCommonService,private myService:MyService) {
+  constructor(public lifeCommonService: LifeCommonService,private myService:MyService,private _modal: ModalService, private _toast: ToastService) {
    this.taskTimeList = [
      {id:1,time:'8:00'},
      {id:2,time:'9:00'},
@@ -44,6 +45,10 @@ export class TodoListComponent implements OnInit {
      {id:10,time:'17:00'},
      {id:11,time:'18:00'},
      {id:12,time:'19:00'},
+      {id:13,time:'20:00'},
+      {id:14,time:'21:00'},
+      {id:15,time:'22:00'},
+      {id:16,time:'23:00'}
    ]
   }
@@ -122,4 +127,23 @@ export class TodoListComponent implements OnInit {
      }
    })
  }
+  //删除日程
+  deleteScheduleTrackById(scheduleTrackId){
+      ModalService.alert('删除该项日程', '', [
+        { text: '取消', onPress: () => console.log('取消') },
+        { text: '确定', onPress: () => 
+          this.myService.deleteScheduleTrackById({scheduleTrackId:scheduleTrackId}).subscribe((res)=>{
+            if(res['success']){
+              this.queryScheduleTrackList();
+            }else{
+              const toast = ToastService.show(`${res['message']}`, 0);
+              setTimeout(() => {
+                ToastService.hide();
+              }, 3000);
+            }
+          })  
+        }
+      ]);
+  }
 }
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -114,9 +114,9 @@ input::placeholder {
    //       background-size: 100% 34px!important;
    //     }
    .am-picker-col-indicator {
-        background: #f6f6f6;
+        // background: #f6f6f6;
-        border-radius: 50px;
+        // border-radius: 50px;
-        z-index: 0;
+        // z-index: 0;
      }
      .am-picker-col-indicator::before,.am-picker-col-indicator::after{
        background-color: transparent;