调整

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

@@ -1,5 +1,6 @@
 <div class="alain-default__header-logo">
-  <a [routerLink]="['/']" class="alain-default__header-logo-link">
+  <!-- <a [routerLink]="['/']" class="alain-default__header-logo-link"> -->
+  <a [routerLink]="['']" class="alain-default__header-logo-link">
     <!-- <img class="alain-default__header-logo-expanded" src="./assets/fangda_logo.png" alt="{{settings.app.name}}"
       style="max-height:40px;" />
     <img class="alain-default__header-logo-collapsed" src="./assets/fangda_logo_b.png" alt="{{settings.app.name}}"

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

@@ -71,26 +71,27 @@
         <tr>
           <th nzWidth="60px"><strong>序号</strong></th>
           <th nzWidth="100px"><strong>生产线</strong></th>
-          <th nzWidth="100px"><strong>生产订单号</strong></th>
-          <th nzWidth="110px"><strong>物料编码</strong></th>
+          <th nzWidth="110px"><strong>生产订单号</strong></th>
+          <th nzWidth="120px"><strong>物料编码</strong></th>
           <th nzWidth="100px"><strong>物料名称</strong></th>
-          <th nzWidth="60px"><strong>月度计划</strong></th>
-          <th nzWidth="60px"><strong>标准工时（H）</strong></th>
-          <th nzWidth="60px"><strong>累计完成数量</strong></th>
-          <th nzWidth="60px"><strong>累计完成工时</strong></th>
+          <th nzWidth="80px"><strong>月度计划</strong></th>
+          <th nzWidth="80px"><strong>标准工时</strong></th>
+          <th nzWidth="110px"><strong>累计完成数量</strong></th>
+          <th nzWidth="110px"><strong>累计完成工时</strong></th>
           <ng-container *ngFor="let date of dateList">
-            <th nzWidth="100px"><strong>当日计算数量</strong></th>
-            <th nzWidth="100px"><strong>当日完成数量</strong></th>
-            <th nzWidth="100px"><strong>当日完成工时 </strong></th>
-            <th nzWidth="100px"><strong>当日标准工时</strong></th>
-            <th nzWidth="100px"><strong>当日生产效率</strong></th>
+            <th nzWidth="120px"><strong>当日计算数量</strong></th>
+            <th nzWidth="120px"><strong>当日完成数量</strong></th>
+            <th nzWidth="120px"><strong>当日完成工时 </strong></th>
+            <th nzWidth="120px"><strong>当日标准工时</strong></th>
+            <th nzWidth="120px"><strong>当日生产效率</strong></th>
             <th nzWidth="100px"><strong>当日达成率</strong></th>
           </ng-container>
         </tr>
         <tr>
           <th colspan="9"></th>
-          <ng-container *ngFor="let date of dateList">
-            <th colspan="6" style="background-color:cyan"><strong>{{date.finalTime|date:'y-MM-dd'}}</strong></th>
+          <ng-container *ngFor="let date of dateList;let i=index">
+            <th colspan="6" *ngIf="i%2===0" style="background-color:rgb(223, 223, 219)"><strong>{{date.finalTime|date:'y-MM-dd'}}</strong></th>
+            <th colspan="6" *ngIf="i%2!==0" ><strong>{{date.finalTime|date:'y-MM-dd'}}</strong></th>
           </ng-container>
         </tr>
       </thead>
@@ -124,11 +125,11 @@
         </ng-container>
         </tr >
         <!-- 统计 -->
-        <tr style="background-color:chocolate" *ngFor="let data of columnTable.data;let i = index">
+        <tr style="background-color:rgb(223, 223, 219)" *ngFor="let data of columnTable.data;let i = index">
           <ng-container *ngIf="data.productionLineName==='统计'">
-          <td style="background-color:chocolate"></td>
-          <td style="background-color:chocolate">统计</td>
-          <td style="background-color:chocolate"></td>
+          <td style="background-color:rgb(223, 223, 219)"></td>
+          <td style="background-color:rgb(223, 223, 219)">统计</td>
+          <td style="background-color:rgb(223, 223, 219)"></td>
           <td></td>
           <td></td>
           <td>{{data.numberOfTasksTotal}}</td>
@@ -157,10 +158,14 @@
       <tbody>
         <tr>
           <td></td>
-          <td>月计划达成率</td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <!-- <td>月计划达成率</td>
           <td>1.95%</td>
           <td>月生产效率</td>
-          <td>根据生产计划进度。实时变化</td>
+          <td>根据生产计划进度。实时变化</td> -->
           <td colSpan="4">出勤情况</td>
           <ng-container *ngFor="let abnormalWorkingHours of abnormalWorkingHoursList">
             <td>应到人数</td>

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

@@ -292,7 +292,7 @@ export class DashboardAnalysisComponent implements OnInit {
   getDateList(){
     if(this.listOfData&&this.listOfData.length>0){
       this.dateList=this.listOfData[0].fbsWorkshopDispatchListList
-      this.widthLength=(this.listOfData[0].fbsWorkshopDispatchListList.length*600)+710;
+      this.widthLength=(this.listOfData[0].fbsWorkshopDispatchListList.length*700)+870;
     }
   }
 

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

@@ -68,7 +68,7 @@ export class FbsWorkshopDispatchListAddComponent implements OnInit {
   /**
    * 人员下拉款选择事件
    */
-  personnelChange(personnelIdU8,data){
+  personnelChange(personnelIdU8,data?:any){
     //获取名称
     this.properList.forEach(element => {
       if(personnelIdU8===element.personnelCode){
@@ -120,7 +120,7 @@ export class FbsWorkshopDispatchListAddComponent implements OnInit {
    * 根据生产id查询产品
    */
   productList=[];//产品集合
-  getProductList(moId,data){
+  getProductList(moId,data?:any){
     this.fbsWorkshopDispatchListService.getInventoryGetByOrderId(moId).then((response)=>{
       // this.productList=response.result;
       data.productList=response.result;
@@ -130,7 +130,7 @@ export class FbsWorkshopDispatchListAddComponent implements OnInit {
   /**
    * 产品选中事件 获取产品名称
    */
-  productChange(event,data){
+  productChange(event,data?:any){
     if(event){
       data.productList.forEach(element => {
         if(element.cinvcode===event){

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

@@ -64,7 +64,7 @@ export class FbsWorkshopDispatchListUpdateComponent implements OnInit {
   /**
    * 人员下拉款选择事件
    */
-  personnelChange(personnelIdU8,data){
+  personnelChange(personnelIdU8,data?:any){
     //获取名称
     this.properList.forEach(element => {
       if(personnelIdU8===element.personnelCode){

src/styles/index.less

@@ -152,3 +152,6 @@ pre {
 .nz-form-item{
   margin-bottom: 2px;
 }
+td{
+  word-break:break-all;
+}