平直近六个月百分比

src/app/routes/fbs-quality-qualification-rate/fbs-quality-qualification-rate-routing.module.ts

@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { FbsQualityQualificationRateListComponent } from './list/list.component';
+
+const routes: Routes = [
+
+  { path: 'list', component: FbsQualityQualificationRateListComponent }];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class FbsQualityQualificationRateRoutingModule { }

src/app/routes/fbs-quality-qualification-rate/fbs-quality-qualification-rate.module.ts

@@ -0,0 +1,21 @@
+import { NgModule } from '@angular/core';
+import { SharedModule } from '@shared';
+import { FbsQualityQualificationRateRoutingModule } from './fbs-quality-qualification-rate-routing.module';
+import { FbsQualityQualificationRateListComponent } from './list/list.component';
+
+const COMPONENTS = [
+  FbsQualityQualificationRateListComponent];
+const COMPONENTS_NOROUNT = [];
+
+@NgModule({
+  imports: [
+    SharedModule,
+    FbsQualityQualificationRateRoutingModule
+  ],
+  declarations: [
+    ...COMPONENTS,
+    ...COMPONENTS_NOROUNT
+  ],
+  entryComponents: COMPONENTS_NOROUNT
+})
+export class FbsQualityQualificationRateModule { }

src/app/routes/fbs-quality-qualification-rate/list/list.component.html

@@ -0,0 +1,56 @@
+<page-header [action]="phActionTpl">
+  <ng-template #phActionTpl>
+    <!-- <button (click)="add()" nz-button nzType="primary">新建</button> -->
+  </ng-template>
+</page-header>
+<nz-card>
+  <nz-spin [nzSpinning]="saveLoading">
+  <form nz-form>
+    <nz-form-item>
+      <nz-form-label [nzSpan]="2" >刻度线百分比</nz-form-label>
+      <nz-form-control [nzSpan]="5">
+        <nz-input-number name="fbsQualityQualificationRate.scaleMark" [(ngModel)]="fbsQualityQualificationRate.scaleMark" [nzMin]="1" [nzMax]="100" [nzStep]="1" [nzFormatter]="formatterPercent"
+          [nzParser]="parserPercent"></nz-input-number>
+      </nz-form-control>
+    </nz-form-item>
+    <nz-form-item>
+      <nz-form-label [nzSpan]="2" >第一个月</nz-form-label>
+      <nz-form-control [nzSpan]="2">
+        <nz-input-number name="fbsQualityQualificationRate.oneMonth" [(ngModel)]="fbsQualityQualificationRate.oneMonth" [nzMin]="1" [nzMax]="100" [nzStep]="1" [nzFormatter]="formatterPercent"
+          [nzParser]="parserPercent"></nz-input-number>
+      </nz-form-control>
+      <nz-form-label [nzSpan]="2" >第二个月</nz-form-label>
+      <nz-form-control [nzSpan]="2">
+        <nz-input-number name="fbsQualityQualificationRate.twoMonth" [(ngModel)]="fbsQualityQualificationRate.twoMonth" [nzMin]="1" [nzMax]="100" [nzStep]="1" [nzFormatter]="formatterPercent"
+          [nzParser]="parserPercent"></nz-input-number>
+      </nz-form-control>
+      <nz-form-label [nzSpan]="2" >第三个月</nz-form-label>
+      <nz-form-control [nzSpan]="2">
+        <nz-input-number name="fbsQualityQualificationRate.threeMonth" [(ngModel)]="fbsQualityQualificationRate.threeMonth" [nzMin]="1" [nzMax]="100" [nzStep]="1" [nzFormatter]="formatterPercent"
+          [nzParser]="parserPercent"></nz-input-number>
+      </nz-form-control>
+      <nz-form-label [nzSpan]="2" >第四个月</nz-form-label>
+      <nz-form-control [nzSpan]="2">
+        <nz-input-number name="fbsQualityQualificationRate.fourMonth" [(ngModel)]="fbsQualityQualificationRate.fourMonth" [nzMin]="1" [nzMax]="100" [nzStep]="1" [nzFormatter]="formatterPercent"
+          [nzParser]="parserPercent"></nz-input-number>
+      </nz-form-control>
+      <nz-form-label [nzSpan]="2" >第五个月</nz-form-label>
+      <nz-form-control [nzSpan]="2">
+        <nz-input-number name="fbsQualityQualificationRate.fiveMonth" [(ngModel)]="fbsQualityQualificationRate.fiveMonth" [nzMin]="1" [nzMax]="100" [nzStep]="1" [nzFormatter]="formatterPercent"
+          [nzParser]="parserPercent"></nz-input-number>
+      </nz-form-control>
+      <nz-form-label [nzSpan]="2" >第六个月</nz-form-label>
+      <nz-form-control [nzSpan]="2">
+        <nz-input-number name="fbsQualityQualificationRate.sixMonth" [(ngModel)]="fbsQualityQualificationRate.sixMonth" [nzMin]="1" [nzMax]="100" [nzStep]="1" [nzFormatter]="formatterPercent"
+          [nzParser]="parserPercent"></nz-input-number>
+      </nz-form-control>
+    </nz-form-item>
+    <nz-form-item>
+      <nz-form-label [nzSpan]="2" [nzNoColon]="true"></nz-form-label>
+      <nz-form-control [nzSpan]="2">
+        <button (click)="add()" [nzLoading]="saveLoading" nz-button nzType="primary">保存</button>
+      </nz-form-control>
+    </nz-form-item>
+  </form>
+  </nz-spin>
+</nz-card>

src/app/routes/fbs-quality-qualification-rate/list/list.component.spec.ts

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

src/app/routes/fbs-quality-qualification-rate/list/list.component.ts

@@ -0,0 +1,74 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { _HttpClient, ModalHelper } from '@delon/theme';
+import { STColumn, STComponent } from '@delon/abc';
+import { SFSchema } from '@delon/form';
+import { FbsQualityQualificationRate } from 'app/entity/fbs/fbs-quality-qualification-rate';
+import { FbsQualityQualificationRateService } from 'app/services/fbs/fbs-quality-qualification-rate.service';
+import { NzNotificationService } from 'ng-zorro-antd';
+
+@Component({
+  selector: 'app-fbs-quality-qualification-rate-list',
+  templateUrl: './list.component.html',
+})
+export class FbsQualityQualificationRateListComponent implements OnInit {
+  
+
+  constructor(
+    private fbsQualityQualificationRateService:FbsQualityQualificationRateService,
+    private nzNotificationService: NzNotificationService
+  ) { }
+
+  ngOnInit() {
+    this.getDataByDeflag();
+   }
+
+  fbsQualityQualificationRate:FbsQualityQualificationRate={
+  /**刻度线*/
+	scaleMark:'0',
+	/**第一个月*/
+	oneMonth:'0',
+	/**第二个月*/
+	twoMonth:'0',
+	/**第三个月*/
+	threeMonth:'0',
+	/**第四个月*/
+	fourMonth:'0',
+	/**第五个月*/
+	fiveMonth:'0',
+	/**第六个月*/
+	sixMonth:'0'
+  }
+  formatterPercent = (value: number) => `${value} %`;
+  parserPercent = (value: string) => value.replace(' %', '');
+  saveLoading=false;
+
+  /**
+   * 查询上一次保存的数据
+   */
+  getDataByDeflag(){
+    this.saveLoading=true;
+    this.fbsQualityQualificationRateService.getDataByDeflag().then((response)=>{
+      if(response.result){
+        this.fbsQualityQualificationRate=response.result;
+      }
+      this.saveLoading=false;
+    })
+  }
+
+  /**
+   * 保存
+   */
+  add() {
+    this.saveLoading=true;
+    this.fbsQualityQualificationRateService.addData(this.fbsQualityQualificationRate).then((response)=>{
+      if(response.success){//保存成功
+        this.nzNotificationService.success("保存成功","");
+        this.saveLoading=false;//加载效果关闭
+      }else{//保存失败
+        this.nzNotificationService.error("保存失败",response.message);
+        this.saveLoading=false;//加载效果关闭
+      }
+    })
+  }
+
+}

src/app/routes/fbs-workshop-dispatch-list/add/add.component.ts

@@ -102,6 +102,7 @@ export class FbsWorkshopDispatchListAddComponent implements OnInit {
       this.productionOrderNumberList.forEach(element => {
         if(productionOrderNumberId===element.moid){
           data.productionOrderNumberName=element.mocode
+          data.projectName=element.define12;
         }
       });
       //获取产品集合
@@ -129,7 +130,7 @@ export class FbsWorkshopDispatchListAddComponent implements OnInit {
       data.productList.forEach(element => {
         if(element.cinvcode===event){
           data.product=element.cinvname;
-          data.projectName=element.CostItemName;
+          
           data.rowNumber=element.sortSeq;
         }
       });

src/app/routes/passport/login/login.component.ts

@@ -141,7 +141,12 @@ export class UserLoginComponent implements OnDestroy {
           this.router.navigateByUrl(url);
           this.notification.remove();
           this.notification.success("欢迎 "+res.result.userInfo.username,res.result.timeTag+"好！欢迎回来");*/
-          this.router.navigateByUrl('/dashboard/analysis');
+          if(this.settingsService.user.name==="quality"){
+            this.router.navigateByUrl('/fbs-quality-qualification-rate/list');
+          }else{
+            this.router.navigateByUrl('/dashboard/analysis');
+          }
+          
         });
       });
   }

src/app/routes/routes-routing.module.ts

@@ -58,6 +58,8 @@ const routes: Routes = [
       { path: 'WorkshopDispatchList', loadChildren: './fbs-workshop-dispatch-list/fbs-workshop-dispatch-list.module#FbsWorkshopDispatchListModule' },
       //生产异常信息统计单
       { path: 'FbsAbnormalWorkingHours', loadChildren: './fbs-abnormal-working-hours/fbs-abnormal-working-hours.module#FbsAbnormalWorkingHoursModule' },
+      //质量近六个月统计
+      { path: 'fbs-quality-qualification-rate', loadChildren: './fbs-quality-qualification-rate/fbs-quality-qualification-rate.module#FbsQualityQualificationRateModule' },
     ],
   },
   // 全屏布局

src/app/services/fbs/fbs-quality-qualification-rate.service.ts

@@ -21,4 +21,14 @@ export class FbsQualityQualificationRateService {
     return await this.http.post<BaseResponse<FbsQualityQualificationRate>>('/fbsQualityQualificationRate/fbsQualityQualificationRate/add', body).toPromise();
   }
 
+  // 保存
+  async addData(body: FbsQualityQualificationRate): Promise<BaseResponse<FbsQualityQualificationRate>> {
+    return await this.http.post<BaseResponse<FbsQualityQualificationRate>>('/fbsQualityQualificationRate/fbsQualityQualificationRate/addData', body).toPromise();
+  }
+
+  // 查询上次保存的数据
+  async getDataByDeflag(): Promise<BaseResponse<FbsQualityQualificationRate>> {
+    return await this.http.get<BaseResponse<FbsQualityQualificationRate>>('/fbsQualityQualificationRate/fbsQualityQualificationRate/getDataByDeflag').toPromise();
+  }
+
 }