调整

src/app/core/startup/startup.service.ts

@@ -154,6 +154,7 @@ export class StartupService {
         // this.titleService.suffix = "方达项目管理系统";
         // this.titleService.suffix=this.i18NService.fanyi("app.login.title");
         this.titleService.suffix="福玻斯";
+        // this.titleService.suffix="上海萃颠信息科技有限公司";
       },
         () => { },
         () => {

src/app/layout/default/header/header.component.html

@@ -5,7 +5,11 @@
       style="max-height:40px;" />
     <img class="alain-default__header-logo-collapsed" src="./assets/fangda_logo_b.png" alt="{{settings.app.name}}"
       style="max-height:30px;" /> -->
-
+      <!-- <img class="alain-default__header-logo-expanded" src="./assets/cuidian2.png" alt="{{settings.app.name}}"
+      style="max-height:40px;" />
+      <img class="alain-default__header-logo-collapsed" src="./assets/cuidian.png" alt="{{settings.app.name}}"
+      style="max-height:30px;" /> -->
+      <!-- 福波斯 -->
       <img class="alain-default__header-logo-expanded" src="./assets/logo_fbs_left.png" alt="{{settings.app.name}}"
       style="max-height:40px;" />
     <img class="alain-default__header-logo-collapsed" src="./assets/logo_fbs_left2.png" alt="{{settings.app.name}}"

src/app/layout/passport/passport.component.html

@@ -7,10 +7,11 @@
         <!-- <span class="title">{{'app.login.title' | translate}}</span><span
           style="margin-left: 10px;"><strong>(v20.0924)</strong></span> -->
           
-          <!-- <img class="logo" src="./assets/logo_fbs_b.png">
-          <span class="title">福玻斯</span>
-          <span
+          <!-- <img class="logo" src="./assets/cuidian.png">
+          <span class="title">上海萃颠信息科技有限公司</span> -->
+          <!-- <span
           style="margin-left: 10px;"><strong>(v20.1013)</strong></span> -->
+          <!-- 福波斯 -->
           <span class="title" ><img class="logo" style="width: 300px;height: 200px;" src="./assets/logo_fbs_login.jpg"></span>
         <!-- 测试包才有 -->
         <!-- <span class="title" >(<span style="color: red;">测试</span>)</span> -->

src/app/routes/dashboard/analysis/analysis.component.ts

@@ -329,7 +329,7 @@ export class DashboardAnalysisComponent implements OnInit {
       let manHoursCompletedTotal=element.manHoursCompletedTotal;//完成工时
       if(element.projectName==="统计"){
         this.achievementRateTotal=((Number(quantityCompletedTotal)/Number(numberOfTasksTotal))*100).toFixed(1);
-        console.log(standardWorkingHoursActualTotal)
+        console.log("标准工时",standardWorkingHoursActualTotal)
         this.productivityTotal=((Number(standardWorkingHoursActualTotal)/Number(manHoursCompletedTotal))*100).toFixed(1)
       }
     });

src/app/routes/fbs-scan-code/list/list.component.ts

@@ -83,7 +83,7 @@ export class FbsScanCodeListComponent implements OnInit {
     this.fbsWorkingStatistics.start = this.datePipe.transform(this.fbsWorkingStatistics.start, 'yyyy-MM-dd');
     this.fbsWorkingStatistics.end = this.datePipe.transform(this.fbsWorkingStatistics.end, 'yyyy-MM-dd');
     let fbsWorkingStatistics = JSON.parse(JSON.stringify(this.fbsWorkingStatistics));
-    fbsWorkingStatistics.pageSize = 10000;
+    fbsWorkingStatistics.pageSize = -1;
     this.fbsWorkingStatisticsService.list(fbsWorkingStatistics).then(response => {
       if (response.success) {
         //查询成功

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

@@ -147,6 +147,8 @@ export class FbsWorkshopDispatchListListComponent implements OnInit {
       this.totalList.standardWorkingHours = this.totalList.standardWorkingHours.toFixed(1);
       this.totalList.manHoursCompleted = this.totalList.manHoursCompleted.toFixed(1);
       this.totalList.numberEfficiency=((this.totalList.latestCompletedQuantity/this.totalList.numberOfTasks)*100).toFixed(1);
+      console.log(completeStandardWorkingHours)
+      console.log(manHoursCompletedHide)
       this.totalList.workingHoursEfficiency=((completeStandardWorkingHours/manHoursCompletedHide)*100).toFixed(1);
       this.totalList.plannedQuantity = this.getPlannedQuantityTotal(dataList);
     }

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

@@ -145,6 +145,7 @@ export class UserLoginComponent implements OnDestroy {
             this.router.navigateByUrl('/fbs-quality-qualification-rate/list');
           }else{
             this.router.navigateByUrl('/dashboard/analysis');
+            // this.router.navigateByUrl('/dashboard/home-page');
           }
           
         });

src/index.html

@@ -6,6 +6,7 @@
   <!-- <title>方达医药平台系统</title> -->
   
   <title>福玻斯</title>
+  <!-- <title>上海萃颠信息科技有限公司</title> -->
   <base href="/">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <meta http-equiv="x-ua-compatible" content="ie=edge">