首页

src/app/entity/fbs/fbs-workshop-dispatch-list.ts

@@ -72,4 +72,6 @@ export class FbsWorkshopDispatchList extends Page{
 	isColor?:any[];
 	//显示每天
 	dayList?:any[];
+	firstTime?:string;
+	finalTime?:string;
 }

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

@@ -138,26 +138,28 @@
               <strong>序号</strong></th>
             <th nzLeft="29px" rowSpan="2" nzWidth="80px" nzAlign="center" style="background-color:rgb(223, 223, 219)">
               <strong>项目名称</strong></th>
-            <th nzLeft="109px" rowSpan="2" nzWidth="110px" nzAlign="center" style="background-color:rgb(223, 223, 219)">
+            <th nzLeft="108px" rowSpan="2" nzWidth="110px" nzAlign="center" style="background-color:rgb(223, 223, 219)">
               <strong>生产订单号</strong></th>
-            <th nzLeft="218px" rowSpan="2" nzWidth="120px" nzAlign="center" style="background-color:rgb(223, 223, 219)">
+            <th nzLeft="217px" rowSpan="2" nzWidth="120px" nzAlign="center" style="background-color:rgb(223, 223, 219)">
               <strong>物料编码</strong></th>
-            <th nzLeft="337px" rowSpan="2" nzWidth="100px" nzAlign="center" style="background-color:rgb(223, 223, 219)">
+            <th nzLeft="336px" rowSpan="2" nzWidth="100px" nzAlign="center" style="background-color:rgb(223, 223, 219)">
               <strong>物料名称</strong></th>
-            <th nzLeft="437px" rowSpan="2" nzWidth="50px" nzAlign="center" style="background-color:rgb(223, 223, 219)">
+            <th nzLeft="436px" rowSpan="2" nzWidth="70px" nzAlign="center" style="background-color:rgb(223, 223, 219)">
               <strong>计划数量</strong></th>
-            <th nzLeft="486px" rowSpan="2" nzWidth="50px" nzAlign="center" style="background-color:rgb(223, 223, 219)">
+            <th nzLeft="506px" rowSpan="2" nzWidth="70px" nzAlign="center" style="background-color:rgb(223, 223, 219)">
               <strong>标准工时</strong></th>
-            <th nzLeft="536px" rowSpan="2" nzWidth="50px" nzAlign="center" style="background-color:rgb(223, 223, 219)">
+            <th nzLeft="576px" rowSpan="2" nzWidth="70px" nzAlign="center" style="background-color:rgb(223, 223, 219)">
               <strong>完成数量</strong></th>
-            <th nzLeft="586px" rowSpan="2" nzWidth="50px" nzAlign="center" style="background-color:rgb(223, 223, 219)">
+            <th nzLeft="645px" rowSpan="2" nzWidth="70px" nzAlign="center" style="background-color:rgb(223, 223, 219)">
               <strong>实际工时</strong></th>
-              <th nzLeft="636px" rowSpan="2" nzWidth="100px" nzAlign="center" style="background-color:rgb(223, 223, 219)">
+              <th nzLeft="714px" rowSpan="2" nzWidth="80px" nzAlign="center" style="background-color:rgb(223, 223, 219)">
                 <strong>计划达成率</strong></th>
-                <th nzLeft="736px" rowSpan="2" nzWidth="100px" nzAlign="center" style="background-color:rgb(223, 223, 219)">
-                  <strong>计划生产效率</strong></th>
-                  <!-- <th nzLeft="836px" rowSpan="2" nzWidth="70px" nzAlign="center" style="background-color:rgb(223, 223, 219)">
-                    <strong>状态</strong></th> -->
+                <th nzLeft="794px" rowSpan="2" nzWidth="70px" nzAlign="center" style="background-color:rgb(223, 223, 219)">
+                  <strong>生产效率</strong></th>
+                  <th nzLeft="864px" rowSpan="2" nzWidth="100px" nzAlign="center" style="background-color:rgb(223, 223, 219)">
+                    <strong>预计开工时间</strong></th>
+                  <th nzLeft="964px" rowSpan="2" nzWidth="50px" nzAlign="center" style="background-color:rgb(223, 223, 219)">
+                    <strong>状态</strong></th>
             <ng-container *ngFor="let date of dateList">
               <th nzWidth="100px" nzAlign="center"><strong>当日计划数量</strong></th>
               <th nzWidth="100px" nzAlign="center"><strong>当日完成数量</strong></th>
@@ -185,16 +187,24 @@
               <td nzLeft="0px" nzAlign="center" *ngIf="data.mergeLines!=0" [attr.rowSpan]="data.mergeLines">
                 {{ data.sort }}</td>
               <td nzLeft="29px" *ngIf="data.mergeLines!=0" [attr.rowSpan]="data.mergeLines">{{ data.projectName }}</td>
-              <td nzLeft="109px">{{ data.productionOrderNumberName }}</td>
-              <td nzLeft="218px">{{data.productId}}</td>
-              <td nzLeft="337px">{{data.product}}</td>
-              <td nzLeft="437px" nzAlign="center">{{data.surplusNumberOfTasksTotal}}</td>
-              <td nzLeft="486px" nzAlign="center">{{data.surplusStandardWorkingHoursTotal}}</td>
-              <td nzLeft="536px" nzAlign="center">{{data.quantityCompletedTotal}}</td>
-              <td nzLeft="586px" nzAlign="center">{{data.manHoursCompletedTotal}}</td>
-              <td nzLeft="636px" nzAlign="center">{{data.achievementRate}}</td>
-              <td nzLeft="736px" nzAlign="center">{{data.productionEfficiency}}</td>
-              <!-- <td nzLeft="836px" nzAlign="center"></td> -->
+              <td nzLeft="108px">{{ data.productionOrderNumberName }}</td>
+              <td nzLeft="217px">{{data.productId}}</td>
+              <td nzLeft="336px">{{data.product}}</td>
+              <td nzLeft="436px" nzAlign="center">{{data.surplusNumberOfTasksTotal}}</td>
+              <td nzLeft="506px" nzAlign="center">{{data.surplusStandardWorkingHoursTotal}}</td>
+              <td nzLeft="576px" nzAlign="center">{{data.quantityCompletedTotal}}</td>
+              <td nzLeft="645px" nzAlign="center">{{data.manHoursCompletedTotal}}</td>
+              <td nzLeft="714px" nzAlign="center">{{data.achievementRate}}</td>
+              <td nzLeft="794px" nzAlign="center">{{data.productionEfficiency}}</td>
+              <td nzLeft="864px" nzAlign="center">{{data.startDate}}至{{data.dueDate}}</td>
+              <td nzLeft="964px" nzAlign="center">
+                <ng-container *ngIf="data.lackOfMaterialState=='正常'">
+                  {{data.lackOfMaterialState}}
+                </ng-container>
+                <ng-container *ngIf="data.lackOfMaterialState=='待料'">
+                  <span style="color: red;">{{data.lackOfMaterialState}}</span>
+                </ng-container>
+              </td>
               <ng-container *ngFor="let dateChild of data.fbsWorkshopDispatchListList">
                 <td nzAlign="center">{{dateChild.numberOfTasks}}</td>
                 <td nzAlign="center">{{dateChild.qualifiedNumber}}</td>
@@ -219,17 +229,17 @@
               <td nzLeft="29px" style="background-color:rgb(223, 223, 219);font-weight:bolder" nzAlign="center">
                 <!-- 剩余工时 -->标准总工时
               </td>
-              <td nzLeft="109px" style="background-color:rgb(223, 223, 219)" nzAlign="center">
+              <td nzLeft="108px" style="background-color:rgb(223, 223, 219)" nzAlign="center">
                 <!-- {{data.remainingWorkTotal}} -->{{data.standardWorkingHoursTotal}}
               </td>
-              <td nzLeft="218px" style="background-color:rgb(223, 223, 219);font-weight:bolder" nzAlign="center"></td>
-              <td nzLeft="337px" style="background-color:rgb(223, 223, 219);font-weight:bolder">统计</td>
-              <td nzLeft="437px" nzAlign="center">{{data.surplusNumberOfTasksTotal}}</td>
-              <td nzLeft="486px" nzAlign="center">{{data.surplusStandardWorkingHoursTotal}}</td>
-              <td nzLeft="536px" nzAlign="center">{{data.quantityCompletedTotal}}</td>
-              <td nzLeft="586px" nzAlign="center">{{data.manHoursCompletedTotal}}</td>
-              <td nzLeft="636px" nzAlign="center"></td>
-              <td nzLeft="736px" nzAlign="center"></td>
+              <td nzLeft="217px" style="background-color:rgb(223, 223, 219);font-weight:bolder" nzAlign="center"></td>
+              <td nzLeft="336px" style="background-color:rgb(223, 223, 219);font-weight:bolder">统计</td>
+              <td nzLeft="436px" nzAlign="center">{{data.surplusNumberOfTasksTotal}}</td>
+              <td nzLeft="506px" nzAlign="center">{{data.surplusStandardWorkingHoursTotal}}</td>
+              <td nzLeft="576px" nzAlign="center">{{data.quantityCompletedTotal}}</td>
+              <td nzLeft="645px" nzAlign="center">{{data.manHoursCompletedTotal}}</td>
+              <td nzLeft="714px" nzAlign="center"></td>
+              <td nzLeft="794px" nzAlign="center" colSpan="3"></td>
               <!-- <td nzLeft="836px" nzAlign="center"></td> -->
               <ng-container *ngFor="let dateChild of data.fbsWorkshopDispatchListList">
                 <td nzAlign="center">{{dateChild.numberOfTasks}}</td>
@@ -254,24 +264,24 @@
         <tbody>
           <tr>
             <td  nzLeft="0px"></td>
-            <td  nzLeft="29px" nzAlign="center" style="font-weight:bolder">总达成率</td>
-            <td  nzLeft="109px" nzAlign="center">{{achievementRateTotal}}%</td>
-            <td  nzLeft="218px" nzAlign="center" style="font-weight:bolder">总生产效率</td>
-            <td  nzLeft="337px" nzAlign="center">{{productivityTotal}}%</td>
-            <td  nzLeft="437px" colSpan="6"></td>
+            <td  nzLeft="29px" nzAlign="center" style="font-weight:bolder">月计划达成率</td>
+            <td  nzLeft="108px" nzAlign="center">{{achievementRateTotal}}%</td>
+            <td  nzLeft="217px" nzAlign="center" style="font-weight:bolder">月生产效率</td>
+            <td  nzLeft="336px" nzAlign="center">{{productivityTotal}}%</td>
+            <td  nzLeft="436px" colSpan="8"></td>
           </tr>
           <tr>
             <td  nzLeft="0px"></td>
-            <td  nzLeft="29px" nzAlign="center" style="font-weight:bolder">出勤总工时</td>
-            <td  nzLeft="109px" nzAlign="center">{{abnormalWorkingHours.attendanceHours}}</td>
-            <td  nzLeft="218px" nzAlign="center" style="font-weight:bolder">加班总工时</td>
-            <td  nzLeft="337px" nzAlign="center">{{abnormalWorkingHours.overtimeHours}}</td>
-            <td  nzLeft="437px" nzAlign="center" style="font-weight:bolder">其他总工时</td>
-            <td  nzLeft="486px" nzAlign="center">{{abnormalWorkingHours.other}}</td>
-            <td  nzLeft="536px" nzAlign="center" style="font-weight:bolder">异常总工时</td>
-            <td  nzLeft="586px" nzAlign="center">{{abnormalWorkingHours.quality}}</td>
-            <td  nzLeft="636px" nzAlign="center" style="font-weight:bolder">仓库总工时</td>
-            <td  nzLeft="736px" nzAlign="center">{{abnormalWorkingHours.plan}}</td>
+            <td  nzLeft="29px" nzAlign="center" style="font-weight:bolder">月出勤工时</td>
+            <td  nzLeft="108px" nzAlign="center">{{abnormalWorkingHours.attendanceHours}}</td>
+            <td  nzLeft="217px" nzAlign="center" style="font-weight:bolder">月加班工时</td>
+            <td  nzLeft="336px" nzAlign="center">{{abnormalWorkingHours.overtimeHours}}</td>
+            <td  nzLeft="436px" nzAlign="center" style="font-weight:bolder" colSpan="2">月其他工时</td>
+            <td  nzLeft="576px" nzAlign="center">{{abnormalWorkingHours.other}}</td>
+            <td  nzLeft="645px" nzAlign="center" style="font-weight:bolder" colSpan="2">月异常工时</td>
+            <td  nzLeft="794px" nzAlign="center">{{abnormalWorkingHours.quality}}</td>
+            <td  nzLeft="864px" nzAlign="center" style="font-weight:bolder">月仓库工时</td>
+            <td  nzLeft="964px" nzAlign="center" >{{abnormalWorkingHours.plan}}</td>
           </tr>
           <!-- <tr>
             <td  nzLeft="0px"></td>

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

@@ -354,7 +354,7 @@ export class DashboardAnalysisComponent implements OnInit {
     if(this.listOfData&&this.listOfData.length>0){
       this.dateList=this.listOfData[0].fbsWorkshopDispatchListList
       // this.widthLength=(this.listOfData[0].fbsWorkshopDispatchListList.length*700)+890;
-      this.widthLength=(this.listOfData[0].fbsWorkshopDispatchListList.length*600)+840;
+      this.widthLength=(this.listOfData[0].fbsWorkshopDispatchListList.length*600)+1020;
     }
   }
 
@@ -460,8 +460,15 @@ export class DashboardAnalysisComponent implements OnInit {
     data.push(title);
     this.listOfData.forEach(element => {
       let row=[];
-      row.push(element.projectName)
-      row.push(element.productionOrderNumberName)
+      if(element.projectName=="统计"){
+        row.push("标准总工时")
+        row.push(element.standardWorkingHoursTotal)
+        element.product="统计";
+      }else{
+        row.push(element.projectName)
+        row.push(element.productionOrderNumberName)
+      }
+      
       row.push(element.productId)
       row.push(element.product)
       row.push(convertingNumbers(element.surplusNumberOfTasksTotal))//numberOfTasksTotal
@@ -476,10 +483,12 @@ export class DashboardAnalysisComponent implements OnInit {
           row.push("0.0%")
         }
       }
+
       
       
       data.push(row);
     });
+    
     let efficiencyTotal=[
       ['总达成率'],
       [this.achievementRateTotal+'%'],

src/app/routes/fbs-abnormal-working-hours/add/add.component.html

@@ -6,7 +6,7 @@
       <tr>
         <!-- 异常工时信息统计单 -->
         <th colspan="13">
-          <h2><strong>生产报表</strong></h2>
+          <h2><strong>生产日报表</strong></h2>
         </th>
       </tr>
     </thead>

src/app/routes/fbs-abnormal-working-hours/list/list.component.html

@@ -55,15 +55,16 @@
         <th nzAlign="center">加班工时</th>
         <th nzAlign="center">培训</th>
         <th nzAlign="center">会议</th>
-        <th nzAlign="center">5S</th>
         <th nzAlign="center">研发</th>
-        <th nzAlign="center">质量</th>
-        <th nzAlign="center">设计</th>
+        <th nzAlign="center">5S</th>
+        <th nzAlign="center">打包</th>
         <!-- <th nzAlign="center">返工</th> -->
-        <th nzAlign="center">物料</th>
-        <th nzAlign="center">能源</th>
         <th nzAlign="center">其他</th>
+        <th nzAlign="center">质量</th>
+        <th nzAlign="center">物料</th>
         <th nzAlign="center">设备</th>
+        <th nzAlign="center">设计</th>
+        <th nzAlign="center">能源</th>
         <th nzAlign="center">计划</th>
         <!-- <th nzAlign="center">配料</th>
         <th nzAlign="center">入库</th>
@@ -79,15 +80,16 @@
         <td nzAlign="center">{{item.overtimeHours}}</td>
         <td nzAlign="center">{{item.train}}</td>
         <td nzAlign="center">{{item.meeting}}</td>
-        <td nzAlign="center">{{item.fiveS}}</td>
         <td nzAlign="center">{{item.researchAndDevelopment}}</td>
-        <td nzAlign="center">{{item.quality}}</td>
-        <td nzAlign="center">{{item.design}}</td>
+        <td nzAlign="center">{{item.fiveS}}</td>
+        <td nzAlign="center">{{item.pack}}</td>
         <!-- <td nzAlign="center">{{item.rework}}</td> -->
-        <td nzAlign="center">{{item.materiel}}</td>
-        <td nzAlign="center">{{item.energy}}</td>
         <td nzAlign="center">{{item.other}}</td>
+        <td nzAlign="center">{{item.quality}}</td>
+        <td nzAlign="center">{{item.materiel}}</td>
         <td nzAlign="center">{{item.equipment}}</td>
+        <td nzAlign="center">{{item.design}}</td>
+        <td nzAlign="center">{{item.energy}}</td>
         <td nzAlign="center">{{item.plan}}</td>
         <!-- <td nzAlign="center">{{item.mixedIngredients}}</td>
         <td nzAlign="center">{{item.warehousing}}</td>
@@ -110,15 +112,15 @@
         <td>{{totalList.overtimeHours}}</td>
         <td>{{totalList.train}}</td>
         <td>{{totalList.meeting}}</td>
-        <td>{{totalList.fiveS}}</td>
         <td>{{totalList.researchAndDevelopment}}</td>
+        <td>{{totalList.fiveS}}</td>
+        <td>{{totalList.pack}}</td>
+        <td>{{totalList.other}}</td>
         <td>{{totalList.quality}}</td>
-        <td>{{totalList.design}}</td>
-        <td>{{totalList.rework}}</td>
         <td>{{totalList.materiel}}</td>
-        <td>{{totalList.energy}}</td>
-        <td>{{totalList.other}}</td>
         <td>{{totalList.equipment}}</td>
+        <td>{{totalList.design}}</td>
+        <td>{{totalList.energy}}</td>
         <td>{{totalList.plan}}</td>
         <!-- <td>{{totalList.mixedIngredients}}</td>
         <td>{{totalList.warehousing}}</td>

src/app/routes/fbs-abnormal-working-hours/list/list.component.ts

@@ -207,19 +207,16 @@ export class FbsAbnormalWorkingHoursListComponent implements OnInit {
         this.totalList.overtimeHours = (Number(this.totalList.overtimeHours) + Number(element.overtimeHours)).toFixed(1);
         this.totalList.train = (Number(this.totalList.train) + Number(element.train)).toFixed(1);
         this.totalList.meeting = (Number(this.totalList.meeting) + Number(element.meeting)).toFixed(1);
-        this.totalList.fiveS = (Number(this.totalList.fiveS) + Number(element.fiveS)).toFixed(1);
         this.totalList.researchAndDevelopment = (Number(this.totalList.researchAndDevelopment) + Number(element.researchAndDevelopment)).toFixed(1);
+        this.totalList.fiveS = (Number(this.totalList.fiveS) + Number(element.fiveS)).toFixed(1);
+        this.totalList.pack = (Number(this.totalList.pack) + Number(element.pack)).toFixed(1);
+        this.totalList.other = (Number(this.totalList.other) + Number(element.other)).toFixed(1);
         this.totalList.quality = (Number(this.totalList.quality) + Number(element.quality)).toFixed(1);
-        this.totalList.design = (Number(this.totalList.design) + Number(element.design)).toFixed(1);
-        this.totalList.rework = (Number(this.totalList.rework) + Number(element.rework)).toFixed(1);
         this.totalList.materiel = (Number(this.totalList.materiel) + Number(element.materiel)).toFixed(1);
-        this.totalList.energy = (Number(this.totalList.energy) + Number(element.energy)).toFixed(1);
-        this.totalList.other = (Number(this.totalList.other) + Number(element.other)).toFixed(1);
         this.totalList.equipment = (Number(this.totalList.equipment) + Number(element.equipment)).toFixed(1);
+        this.totalList.design = (Number(this.totalList.design) + Number(element.design)).toFixed(1);
+        this.totalList.energy = (Number(this.totalList.energy) + Number(element.energy)).toFixed(1);
         this.totalList.plan = (Number(this.totalList.plan) + Number(element.plan)).toFixed(1);
-        this.totalList.mixedIngredients = (Number(this.totalList.mixedIngredients) + Number(element.mixedIngredients)).toFixed(1);
-        this.totalList.warehousing = (Number(this.totalList.warehousing) + Number(element.warehousing)).toFixed(1);
-        this.totalList.pack = (Number(this.totalList.pack) + Number(element.pack)).toFixed(1);
       });
     }
   }

src/app/routes/fbs-abnormal-working-hours/update/update.component.html

@@ -5,7 +5,7 @@
       <tr>
         <!-- 异常工时信息统计单 -->
         <th colspan="13">
-          <h2><strong>生产报表</strong></h2>
+          <h2><strong>生产日报表</strong></h2>
         </th>
       </tr>
     </thead>

src/app/routes/fbs-abnormal-working-hours/view/view.component.html

@@ -5,7 +5,7 @@
       <tr>
         <!-- 异常工时信息统计单 -->
         <th colspan="13">
-          <h2><strong>生产报表</strong></h2>
+          <h2><strong>生产日报表</strong></h2>
         </th>
       </tr>
     </thead>

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

@@ -83,7 +83,7 @@
           生产订单号</th>
         <th>物料编码</th>
         <th>物料名称</th>
-        <th>上岗日期</th>
+        <th>上岗时间</th>
         <th>下岗时间</th>
         <th>扫码信息</th>
         <th nzAlign="center">工时</th>

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

@@ -85,6 +85,18 @@
         </nz-form-item>
       </div>
     </div>
+    <div nz-row [nzGutter]="{xs:12,sm:15,md:29,lg: 36, xl: 40}">
+       <!-- 生产订单号 -->
+       <div nz-col nzXs="24" nzSm="4" nzLg="8">
+        <nz-form-item class="nz-form-item">
+          <nz-form-label [nzSpan]="8">项目名称</nz-form-label>
+          <nz-form-control [nzSpan]="16">
+            <input [(ngModel)]="fbsWorkshopDispatchList.projectName" name="productionOrderNumberName" nz-input
+              placeholder="请输入" />
+          </nz-form-control>
+        </nz-form-item>
+      </div>
+    </div>
     <div nz-row [nzGutter]="{xs:12,sm:15,md:29,lg: 36, xl: 40}">
       <!-- 按钮 -->
       <div nz-col nzXs="24" nzSm="4" nzLg="24">
@@ -105,6 +117,7 @@
     <thead>
       <tr>
         <th  style="width:10%">姓名</th>
+        <th>项目名称</th>
         <th>生产订单号</th>
         <th>物料名称</th>
         <th nzAlign="center">计划数量</th>
@@ -117,7 +130,7 @@
         <th nzAlign="center">是否可扫码</th>
         <th nzAlign="center">工艺流程</th>
         <th>状态</th>
-        <th>日期</th>
+        <th>实际完成时间</th>
         <!-- <th>计划开工时间</th>
         <th>计划完工时间</th> -->
         <th style="width:10%">{{ 'table.operation' | translate }}</th>
@@ -127,7 +140,7 @@
       <tr *ngFor="let item of  borderedTable.data">
         <!-- <td >{{item.milestoneCode}}</td> -->
         <td>{{item.name}}</td>
-        
+        <td>{{item.projectName}}</td>
         <td>{{item.productionOrderNumberName}}</td>
         <td style="width: 15%;">{{item.product}}</td>
         <td  nzAlign="center" >{{item.plannedQuantity}}</td>

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

@@ -219,7 +219,7 @@ export class FbsWorkshopDispatchListListComponent implements OnInit {
         let data = [];
         let title = [
           ['姓名'], // 姓名
-          ['日期'], // 日期
+          ['项目名称'], // 日期
           ['生产订单号'], // 生产订单号
           ['物料编码'], // 物料
           ['物料名称'], // 物料名称
@@ -230,12 +230,13 @@ export class FbsWorkshopDispatchListListComponent implements OnInit {
           ['完成工时'], // 完成工时
           ['达成率'], // 达成率
           ['生产效率'], // 生产效率
+          ['实际完成时间'], // 日期
         ];
         data.push(title);
         dataList.forEach(element => {
           let row = [];
           row.push(element.name);
-          row.push(element.date);
+          row.push(element.projectName);
           row.push(element.productionOrderNumberName);
           row.push(element.productId);
           row.push(element.product);
@@ -246,6 +247,7 @@ export class FbsWorkshopDispatchListListComponent implements OnInit {
           row.push(element.manHoursCompleted);
           row.push(element.numberEfficiency + '%');
           row.push(element.workingHoursEfficiency + '%');
+          row.push(element.firstTime+"至"+element.finalTime);
           data.push(row);
         });
         // 导出