团队业绩修改

daa066f6 · Sweet Zhang · 4118f8c1 · daa066f6 · daa066f6 · daa066f6
Commit daa066f6 authored Mar 29, 2022 by Sweet Zhang
14 changed files
--- a/src/app/common/video/video.component.html
+++ b/src/app/common/video/video.component.html
-<video [src]="videoSrc" controls="controls">
+<video [src]="videoSrc" controls="controls" width="100%">
  您的浏览器不支持 video 标签。
  </video>
\ No newline at end of file
--- a/src/app/my/file-upload/file-upload.component.ts
+++ b/src/app/my/file-upload/file-upload.component.ts
@@ -43,7 +43,7 @@ export class FileUploadComponent implements OnInit {
    let index2 = filename.length;
    let postf = filename.substring(index1, index2); //获取文bai件后缀名duzhi
    //判断文件后缀名是否等于视频文件的后缀名
-    if (postf===".avi"||postf===".mp4"||postf===".rmvb") {
+    if (postf===".avi"||postf===".mp4"||postf===".rmvb"||postf===".mov") {
      return true
    }else{
      return false

--- a/src/app/my/member-list/member-list.component.html
+++ b/src/app/my/member-list/member-list.component.html
@@ -7,7 +7,7 @@
  </div>
  <div class="rankInfoWrapper">
    <div class="rankContent">
-        <div style="font-size: 18px;margin: 5px auto;text-align: center;">战队成员</div>
+        <div style="font-size: 18px;margin: 5px auto;text-align: center;">团队成员</div>
        <div class="content_wrapper memberList">
          <ul style="border: none;background: #e7eef5;border-radius: 5px;">
            <li style="padding-left: 5px;">姓名/团队</li>
@@ -18,7 +18,7 @@
          </ul>
          <div style="width: 100%;text-align: center;float: left;height: 35px;"
            *ngIf="teamMemberList?.length <=0">
-            暂无战队成员，努力去增员吧
+            暂无团队成员，努力去增员吧
          </div>
          <ul *ngFor="let teamMemberItem of teamList;index as i;" (click)="goToList(teamMemberItem)">
            <li>

--- a/src/app/my/member-list/member-list.component.ts
+++ b/src/app/my/member-list/member-list.component.ts
@@ -25,7 +25,7 @@ export class MemberListComponent implements OnInit {
    this.queryTeamMemberDetail()
  }
-  //下级列表和战队成员列表
+  //下级列表和团队成员列表
  queryTeamMemberDetail(){
    this.myService.queryTeamMemberDetail({systemType:this.systemType,sid:this.sid}).subscribe((res)=>{
      if(res['success']){

--- a/src/app/my/my.service.ts
+++ b/src/app/my/my.service.ts
@@ -295,7 +295,7 @@ export class MyService {
      .post(url, JSON.stringify(param));
  }
-  //战队成员销售业绩预测
+  //团队成员销售业绩预测
  salesPerformanceForecastListQuery(param) {
    const url = this.ydapi + '/practitioner/salesPerformanceForecastListQuery';
    return this.http
@@ -504,7 +504,7 @@ export class MyService {
      .post(url, JSON.stringify(param));
  }
-  //战队成员详情
+  //团队成员详情
  queryTeamMemberDetail(param){
    const url = this.ydapi + '/practitioner/queryTeamMemberDetail';
    return this.http
@@ -586,7 +586,7 @@ export class MyService {
      });
    }
-    //区域负责人查询战队PEP得分
+    //区域负责人查询团队PEP得分
    pepForAreaManagerQuery(param){
      const url = this.ydapi + "/practitioner/pepForAreaManagerQuery";
      return this.http.post(url, JSON.stringify(param)).pipe(res => {

--- a/src/app/my/team-area-panel/team-area-panel.component.html
+++ b/src/app/my/team-area-panel/team-area-panel.component.html
 <div class="taem_panel_wrapper">
  <div class="teamInfo">
      <img src="assets/images/cup_icon.png" >
-      <div style="float: left;letter-spacing: 5px;margin-left: 5%;">我的战队</div>
+      <div style="float: left;letter-spacing: 5px;margin-left: 5%;">我的团队</div>
  </div>
  <div class="team_wrapper">
    <div class="item" *ngFor="let branchIntem of branchDataInfos" [routerLink]="['/teamPanel']">

--- a/src/app/my/team-area-panel/team-area-panel.component.ts
+++ b/src/app/my/team-area-panel/team-area-panel.component.ts
@@ -16,7 +16,7 @@ export class TeamAreaPanelComponent implements OnInit {
    this.queryPEPScore();
  }
-  //获取区域管理人所有战队
+  //获取区域管理人所有团队
  queryPEPScore(){
    // this.myService.employeePerformanceForAreaManagerQuery({ areaManagerPractitionerId: this.practitionerId }).subscribe((res)=>{
    //   if(res['success']){ 

--- a/src/app/my/team-panel/team-panel.component.html
+++ b/src/app/my/team-panel/team-panel.component.html
@@ -13,7 +13,7 @@
  <div class="taem_panel_item_wrapper" style="margin-top: -15px;">
    <div class="taem_panel_item_top">
      <div class="item_title">
-        <div>战队PEP活动量</div>
+        <div>团队PEP活动量</div>
        <span class="iconfont icon-ar-r" routerLink="teamSalesScore"></span>
      </div>
    </div>
@@ -59,11 +59,12 @@
  </div> -->
  <div class="taem_panel_item_wrapper">
    <div class="taem_panel_item_top">
-      <div class="item_title">战队业绩(￥)</div>
+      <div class="item_title">团队业绩(￥)</div>
      <ul class="tab">
        <li [ngClass]="{selected:selectedRecruitingItem===1}" (click)="subordinateSystemMemberQuery(1)">本月</li>
        <li [ngClass]="{selected:selectedRecruitingItem===3}" (click)="subordinateSystemMemberQuery(3)">本季</li>
        <li [ngClass]="{selected:selectedRecruitingItem===2}" (click)="subordinateSystemMemberQuery(2)">本年</li>
+        <li [ngClass]="{selected:selectedRecruitingItem===4}" (click)="subordinateSystemMemberQuery(4)">去年</li>
      </ul>
      <span class="iconfont icon-ar-r" routerLink="/teamRank"></span>
    </div>
@@ -87,7 +88,7 @@
  <div class="taem_panel_item_wrapper">
    <div class="taem_panel_item_top">
      <div class="item_title">
-        战队销售业绩预测(￥)
+        团队商机预测(￥)
      </div>
      <ul class="tab">
        <li [ngClass]="{selected:selectedSalseItem==='month'}" (click)="selectSales('month')">本月</li>

--- a/src/app/my/team-panel/team-panel.component.ts
+++ b/src/app/my/team-panel/team-panel.component.ts
@@ -7,7 +7,7 @@ import { LifeCommonService } from '../../common/life-common.service';
  styleUrls: ['./team-panel.component.scss']
 })
 export class TeamPanelComponent implements OnInit {
-  //战队名称
+  //团队名称
  subordinateSystemName: any;
  teamActionsData: any;
  //保费
@@ -67,6 +67,13 @@ export class TeamPanelComponent implements OnInit {
      this.count = this.teamActionsData.piecesYear;
      this.completionRates = this.teamActionsData.achievementRateYear;
    }
+    if (type === 'lastYear') {
+      this.selectedSalseItemName = '去年';
+      this.premiums = this.teamActionsData.premiumYear;
+      this.commission = this.teamActionsData.commissionYear;
+      this.count = this.teamActionsData.piecesYear;
+      this.completionRates = this.teamActionsData.achievementRateYear;
+    }
  }
  subordinateSystemMemberQuery(type) {

--- a/src/app/my/team-rank/team-rank.component.html
+++ b/src/app/my/team-rank/team-rank.component.html
@@ -7,7 +7,7 @@
    </div>
    <div class="teamItem totalSales">
      <div class="teamTotal">
-        <div style="padding-left: 5px;color: #fff;"> 战队业绩</div>
+        <div style="padding-left: 5px;color: #fff;"> 团队业绩</div>
        <div class="title">
          <ul class="tab">
            <li *ngFor="let item of performanceList" (click)="subordinateSystemMemberQuery(item.time, online)"
@@ -18,29 +18,48 @@
        </div>
      </div>
      <div class="salseContent">
-        <div class="num">￥{{statisticInfo?.fyp | number: "1.2-2"}}</div>
+        <div>
-        <div class="num">￥{{statisticInfo?.fyc | number: "1.2-2"}}</div>
+          <div class="num">￥{{statisticInfo?.fyp | number: "1.2-2"}}</div>
-        <div class="num count">{{statisticInfo?.count}}</div>
+          <div>首年保费</div>
+        </div>
+        <div>
+          <div class="num">￥{{statisticInfo?.fyc | number: "1.2-2"}}</div>
+          <div>首年佣金</div>
+        </div>
+        <div>
+          <div class="num count">{{statisticInfo?.count}}</div>
+          <div class="count">件数</div>
+        </div>
      </div>
      <div class="salseContent">
-        <div>首年保费</div>
+        <div>
-        <div>首年佣金</div>
+          <div class="num">￥{{statisticInfo?.targetFyp | number: "1.2-2"}}</div>
-        <div class="count">件数</div>
+          <div>目标FYP</div>
+        </div>
+        <div>
+          <div class="num">￥{{statisticInfo?.targetFyc | number: "1.2-2"}}</div>
+          <div>目标FYC</div>
+        </div>
+        <div>
+          <div class="num count">{{statisticInfo?.completionRate}}%</div>
+          <div>完成率</div>
+        </div>
      </div>
    </div>
  </div>
  <div class="rankInfoWrapper">
    <div class="rankContent">
-      <div style="font-size: 18px;margin-bottom: 10px;">战队排名</div>
+      <div style="font-size: 18px;margin-bottom: 10px;">团队排名</div>
      <ul>
        <li class="rank">排名</li>
        <li class="name">姓名</li>
        <li class="fyp">首年保费</li>
        <li class="fyc">首年佣金</li>
        <li class="count">件数</li>
+        <li class="fyc">目标FYC</li>
      </ul>
      <div style="width: 100%;text-align: center;float: left;height: 35px;" *ngIf="performanceListShow?.length <=0">
-        暂无战队成员，努力去增员吧
+        暂无团队成员，努力去增员吧
      </div>
      <ul *ngFor="let performanceItem of performanceListShow;index as i;">
        <li class="rank">
@@ -50,6 +69,7 @@
        <li class="fyp remark">￥{{performanceItem.fyp | number: "1.2-2"}}</li>
        <li class="fyc remark">￥{{performanceItem.fyc | number: "1.2-2"}}</li>
        <li class="count remark">{{performanceItem.count}}</li>
+        <li class="fyc remark">￥{{performanceItem.targetFyc | number: "1.2-2"}}</li>
      </ul>
    </div>
  </div>

--- a/src/app/my/team-rank/team-rank.component.scss
+++ b/src/app/my/team-rank/team-rank.component.scss
@@ -41,7 +41,7 @@
                width: 60%;
                ul.tab{
                    float: right;
-                    width: 70%;
+                    width:100%;
                    font-size: 16px;
                    color: #fff;
                    li{
@@ -57,7 +57,7 @@
                        font-weight: bold;
                        border-bottom: 2px #ff002a solid;
                    }
-                    li:nth-child(3){
+                    li:nth-child(4){
                        margin-right: 0;
                    }
                }
@@ -74,11 +74,11 @@
            .salseContent{
                width: 100%;
-                float: left;
                padding: 5px 2.5%;
+                display: flex;
                div{
-                    float: left;
+                    flex: 1;
-                    width: 40%;
                    text-align: center;
                    color: #dcdcdc;
                    font-size: 12px;
@@ -88,9 +88,6 @@
                    font-size: 18px;
                    color: #fff;
                }
-                div.count{
-                    width: 18%;
-                }
            }
        }
    }
@@ -110,7 +107,7 @@
                width: 100%;
                li{
                    float: left;
-                    width: 24%;
+                    width: 23%;
                    text-align: right;
                    margin-right: 1%;
                    position: relative;
@@ -123,11 +120,11 @@
                    }
                }
                li.rank{
-                    width: 10%;
+                    width: 8%;
                    text-align: center;
                }
                li.name,li.count{
-                    width: 18%;
+                    width: 8%;
                }
                li.name{
                    text-align: center;

--- a/src/app/my/team-rank/team-rank.component.ts
+++ b/src/app/my/team-rank/team-rank.component.ts
@@ -18,7 +18,8 @@ export class TeamRankComponent implements OnInit {
    this.performanceList = [
      { time: 1, name: '本月' },
      { time: 3, name: '本季' },
-      { time: 2, name: '本年' }
+      { time: 2, name: '本年' },
+      { time: 4, name: '去年' }
    ]
    this.list = [
      { type: 'online', name: '线上' },

--- a/src/app/my/team-sales-score/team-sales-score.component.html
+++ b/src/app/my/team-sales-score/team-sales-score.component.html
@@ -10,7 +10,7 @@
  <div *ngIf="showType==='teamSalesScore'">
    <div class="rankInfoWrapper">
      <div class="rankContent">
-        <div style="font-size: 18px;margin: 5px auto;text-align: center;">战队成员活动量得分</div>
+        <div style="font-size: 18px;margin: 5px auto;text-align: center;">团队成员活动量得分</div>
        <div class="content_wrapper">
          <ul style="border: none;">
            <li class="name">姓名</li>
@@ -22,7 +22,7 @@
          </ul>
          <div style="width: 100%;text-align: center;float: left;height: 35px;"
            *ngIf="personalList?.length <=0">
-            暂无战队成员，努力去增员吧
+            暂无团队成员，努力去增员吧
          </div>
          <ul *ngFor="let personalItem of personalList;index as i;" [routerLink]="['/scoreDeatil',personalItem.practitionerId]">
            <li>
@@ -44,7 +44,7 @@
    <div class="rankInfoWrapper">
      <div class="rankContent">
        <div class="tab">
-          <div style="font-size: 18px;">战队销售业绩预测(预计)</div>
+          <div style="font-size: 18px;">团队销售业绩预测(预计)</div>
          <ul>
            <li [ngClass]="{selected:selectedSalseItem==='m'}" (click)="salesPerformanceForecastListQuery('m')">本月</li>
            <li [ngClass]="{selected:selectedSalseItem==='q'}" (click)="salesPerformanceForecastListQuery('q')">本季</li>
@@ -61,7 +61,7 @@
          </ul>
          <div style="width: 100%;text-align: center;float: left;height: 35px;"
            *ngIf="salesPerformanceForecastInfos?.length <=0">
-            暂无战队成员，努力去增员吧
+            暂无团队成员，努力去增员吧
          </div>
          <ul *ngFor="let forecastItem of salesPerformanceForecastInfos;index as i;">
            <li class="name">
@@ -82,7 +82,7 @@
  <div *ngIf="showType === 'memberList'">
    <div class="rankInfoWrapper">
      <div class="rankContent">
-        <div style="font-size: 18px;margin: 5px auto;text-align: center;">战队成员</div>
+        <div style="font-size: 18px;margin: 5px auto;text-align: center;">团队成员</div>
        <div class="content_wrapper memberList">
          <ul style="border: none;background: #e7eef5;border-radius: 5px;">
            <li style="padding-left: 5px;">姓名/团队</li>
@@ -93,7 +93,7 @@
          </ul>
          <div style="width: 100%;text-align: center;float: left;height: 35px;"
            *ngIf="teamMemberList?.length <=0">
-            暂无战队成员，努力去增员吧
+            暂无团队成员，努力去增员吧
          </div>
          <ul *ngFor="let teamMemberItem of teamList;index as i;" (click)="goToList(teamMemberItem)">
            <li>

--- a/src/app/my/team-sales-score/team-sales-score.component.ts
+++ b/src/app/my/team-sales-score/team-sales-score.component.ts
@@ -69,7 +69,7 @@ export class TeamSalesScoreComponent implements OnInit {
    })
  }
-  //战队成员列表
+  //团队成员列表
  queryTeamMemberDetail(){
    this.myService.queryTeamMemberDetail({practitionerId:this.practitionerId}).subscribe((res)=>{
      if(res['success']){