From b3365f20bb97afe5398099f29a8b85f0be65a3d0 Mon Sep 17 00:00:00 2001
From: zhangdi <15053473693@163.com>
Date: Thu, 26 Feb 2026 15:17:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E4=BA=A7=E7=AE=A1=E7=90=86=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionSchedulingPlan/scheduling.js    |  48 ++
 .../components/indateDailog.vue               | 416 +++++++++---------
 .../components/processMainte/dsPartIndex.vue  |   2 +-
 .../components/processMainte/partDetails.vue  |   1 -
 .../processMainte/processPlanning.vue         |  45 +-
 .../processManagement/taskProcessing.vue      |   3 +-
 .../schedulingDashboard/container.vue         |   6 +-
 .../production/executionProcess.vue           | 131 +++---
 .../production/executionWorkorder.vue         | 119 ++---
 .../production/processDeatils.vue             | 128 ++++--
 .../production/workorderDetails.vue           | 123 ++++--
 .../productionAnalysis.vue                    |  14 +-
 .../qualificationAnalysis.vue                 |  71 ++-
 13 files changed, 681 insertions(+), 426 deletions(-)

diff --git a/src/api/productionSchedulingPlan/scheduling.js b/src/api/productionSchedulingPlan/scheduling.js
index 7952460..5c21aa2 100644
--- a/src/api/productionSchedulingPlan/scheduling.js
+++ b/src/api/productionSchedulingPlan/scheduling.js
@@ -72,3 +72,51 @@ export const getQualificationExecuteAnalysis = (current, size, params) => {
     },
   });
 };
+
+// 生产执行(作业中心)workOrder/selectCenterExecuteList
+export const getCenterExecuteList = params => {
+  return request({
+    url: '/blade-scheduling/workOrder/selectCenterExecuteList',
+    method: 'get',
+    params: params
+  });
+};
+
+// 订单执行明细/workOrder/selectOrderExecuteDetailPage
+export const getOrderExecuteDetailPage = (current, size, params) => {
+  return request({
+    url: '/blade-scheduling/workOrder/selectOrderExecuteDetailPage',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    },
+  });
+};
+
+//执行分析  工序
+export const getProcessExecutePage =  (current, size, params) => {
+  return request({
+    url: '/blade-scheduling/workOrder/selectProcessExecutePage',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    },
+  });
+};
+
+// 执行分析  工序执行明细 workOrder/selectProcessExecuteDetailPage
+export const getProcessExecuteDetailPage = (current, size, params) => {
+  return request({
+    url: '/blade-scheduling/workOrder/selectProcessExecuteDetailPage',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    },
+  });
+};
\ No newline at end of file
diff --git a/src/views/processManagement/components/indateDailog.vue b/src/views/processManagement/components/indateDailog.vue
index 3573a30..6f07aac 100644
--- a/src/views/processManagement/components/indateDailog.vue
+++ b/src/views/processManagement/components/indateDailog.vue
@@ -1,214 +1,228 @@
 <template>
-    <el-dialog v-model="setCrewShow" :before-close="cancel" :title="title" width="1040px">
-        <avue-form :option="optionForm" ref="ruleForm"></avue-form>
+  <el-dialog v-model="setCrewShow" :before-close="setIndateCancel" :title="title" width="1040px">
+    <avue-form :option="optionForm" ref="ruleForm"></avue-form>
 
-        <avue-crud :option="option" :table-loading="loading" :data="data" v-model="form" v-model:page="page" ref="crud"
-             @search-change="searchChange" @search-reset="searchReset"
-            @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
-            @refresh-change="refreshChange" @on-load="onLoad">
+    <avue-crud
+      :option="option"
+      :table-loading="loading"
+      :data="data"
+      v-model="form"
+      v-model:page="page"
+      ref="crud"
+      @search-change="searchChange"
+      @search-reset="searchReset"
+      @selection-change="selectionChange"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @refresh-change="refreshChange"
+      @on-load="onLoad"
+    >
+    </avue-crud>
 
-        </avue-crud>
-
-        <template #footer>
-            <span class="dialog-footer">
-                <el-button @click="setIndateCancel">取 消</el-button>
-                <el-button type="primary" @click="submit">确 定</el-button>
-            </span>
-        </template>
-    </el-dialog>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="setIndateCancel">取 消</el-button>
+        <el-button type="primary" @click="submit">确 定</el-button>
+      </span>
+    </template>
+  </el-dialog>
 </template>
 <script>
-import { periodOfValidity } from "@/api/processManagement/procepssPlanning";
+import { periodOfValidity } from '@/api/processManagement/procepssPlanning';
 
 export default {
-    name: 'SetPersonnel',
-    props: {
-        setCrewOpen: {
-            type: Boolean,
-            default: false
-        },
-        id: {
-            type: Number,
-            default: null
-        },
-        type: {
-            type: String,
-            default: ''
-        },
-        title: {
-            type: String,
-            default: '分派'
-        },
-        expireData:{
-            type:Array,
-            default:[]
-        }
+  name: 'SetPersonnel',
+  props: {
+    setCrewOpen: {
+      type: Boolean,
+      default: false,
     },
-    data() {
-        return {
-            url: '',
-            setCrewShow: false,
-            page: {
-                pageSize: 10,
-                currentPage: 1,
-                total: 0,
-            },
-            optionForm: {
-                submitBtn: false,
-                emptyBtn: false,
-                menuPosition: 'right',
-                menuSpan: 16,
-                column: [
-                    {
-                        label: '到期日期',
-                        prop: "nextDue",
-                        type: "date",
-                        span: 8,
-                        format: "YYYY-MM-DD",
-                        valueFormat: "YYYY-MM-DD",
-                        shortcuts: [
-                            {
-                                text: '今天',
-                                value: new Date(),
-                            },
-                            {
-                                text: '昨天',
-                                value: () => {
-                                    const date = new Date();
-                                    date.setTime(date.getTime() - 3600 * 1000 * 24);
-                                    return date;
-                                },
-                            },
-                            {
-                                text: '一周前',
-                                value: () => {
-                                    const date = new Date();
-                                    date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
-                                    return date;
-                                },
-                            },
-                        ],
-                        rules: [
-                            {
-                                required: true,
-                                message: '请选择',
-                                trigger: 'blur'
-                            }
-                        ]
-                    },
-
-                ]
-            },
-            option: {
-                columnSort: true,
-                tip: false,
-                // height: 'auto',
-                calcHeight: 32,
-                simplePage: false,
-                searchShow: true,
-                searchMenuSpan: 6,
-                dialogWidth: '60%',
-                border: true,
-                selection: false,
-                viewBtn: true,
-                menuWidth: 240,
-                dialogClickModal: false,
-                addBtn: false,
-                excelBtn: false,
-                viewBtn: false,
-                columnBtn: false,
-                editBtnText: '编辑',
-                refreshBtn: false,
-                searchShowBtn: false,
-                gridBtn: false,
-                searchIndex: 3,
-                searchIcon: true,
-                header: false,
-                menu: false,
-                searchLabelPosition:'left',
-                searchGutter:24,
-                searchSpan:6,
-                menuAlign: 'left',
-                gridBtn:false,
-                searchMenuPosition:'right',
-                addBtnIcon: ' ',
-                viewBtnIcon: ' ',
-                delBtnIcon: ' ',
-                editBtnIcon: ' ',
-                align: 'center',
-                column: [
-                    {
-                        label: '零件号',
-                        prop: 'partCode',
-                        search: false,
-                        sortable: true,
-                        overHidden: true,
-                        headerAlign: 'center',
-                        align: 'center',
-
-                    },
-                    {
-                        label: '零件名称',
-                        prop: 'partName',
-                        sortable: true,
-                        search: false,
-                        headerAlign: 'center',
-                        align: 'left',
-
-                    },
-                    {
-                        label: '零件类型',
-                        prop: 'sinTerType',
-                        sortable: true,
-                        search: false,
-                         headerAlign: 'center',
-                        align: 'center',
-
-                    },
-                    {
-                        label: '工艺路线',
-                        prop: 'craftWay',
-                        sortable: true,
-                        search: false,
-                         headerAlign: 'center',
-                        align: 'center',
-
-                    },
-                ],
-            },
-            data: [],
-        };
+    id: {
+      type: Number,
+      default: null,
     },
-    mounted() {
-        this.setCrewShow = this.setCrewOpen
-        this.data = this.expireData
+    type: {
+      type: String,
+      default: '',
     },
-    methods: {
-        
-        submit() {
-            this.$refs.ruleForm.validate((valid) => {
-                if (valid) {
-                    let arr=[]
-                    this.data.forEach((item,index) => {
-                        arr.push(item.id)
-                    });
-                    let query ={
-                        nextDue:this.$refs.ruleForm.form.nextDue,
-                        ids:arr.join(',')
-                    }
-                    periodOfValidity(query).then(res=>{
-                        this.setIndateCancel()
-                    })
-                    console.log(9999,query)
-
-                }
-            })
-        },
-
-        setIndateCancel(refresh) {
-            this.setCrewShow = false
-            this.$emit('setIndateCancel', typeof refresh === 'boolean' && refresh);
+    title: {
+      type: String,
+      default: '分派',
+    },
+    expireData: {
+      type: Array,
+      default: [],
+    },
+  },
+  data() {
+    return {
+      url: '',
+      setCrewShow: false,
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0,
+      },
+      optionForm: {
+        submitBtn: false,
+        emptyBtn: false,
+        menuPosition: 'right',
+        menuSpan: 16,
+        column: [
+          {
+            label: '到期日期',
+            prop: 'nextDue',
+            type: 'date',
+            span: 8,
+            format: 'YYYY-MM-DD',
+            valueFormat: 'YYYY-MM-DD',
+            shortcuts: [
+              {
+                text: '今天',
+                value: new Date(),
+              },
+              {
+                text: '昨天',
+                value: () => {
+                  const date = new Date();
+                  date.setTime(date.getTime() - 3600 * 1000 * 24);
+                  return date;
+                },
+              },
+              {
+                text: '一周前',
+                value: () => {
+                  const date = new Date();
+                  date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
+                  return date;
+                },
+              },
+            ],
+            rules: [
+              {
+                required: true,
+                message: '请选择',
+                trigger: 'blur',
+              },
+            ],
+          },
+        ],
+      },
+      option: {
+        columnSort: true,
+        tip: false,
+        // height: 'auto',
+        calcHeight: 32,
+        simplePage: false,
+        searchShow: true,
+        searchMenuSpan: 6,
+        dialogWidth: '60%',
+        border: true,
+        selection: false,
+        viewBtn: true,
+        menuWidth: 240,
+        dialogClickModal: false,
+        addBtn: false,
+        excelBtn: false,
+        viewBtn: false,
+        columnBtn: false,
+        editBtnText: '编辑',
+        refreshBtn: false,
+        searchShowBtn: false,
+        gridBtn: false,
+        searchIndex: 3,
+        searchIcon: true,
+        header: false,
+        menu: false,
+        searchLabelPosition: 'left',
+        searchGutter: 24,
+        searchSpan: 6,
+        menuAlign: 'left',
+        gridBtn: false,
+        searchMenuPosition: 'right',
+        addBtnIcon: ' ',
+        viewBtnIcon: ' ',
+        delBtnIcon: ' ',
+        editBtnIcon: ' ',
+        align: 'center',
+        column: [
+          {
+            label: '零件号',
+            prop: 'partCode',
+            search: false,
+            sortable: true,
+            overHidden: true,
+            headerAlign: 'center',
+            align: 'center',
+          },
+          {
+            label: '零件名称',
+            prop: 'partName',
+            sortable: true,
+            search: false,
+            headerAlign: 'center',
+            align: 'left',
+          },
+          {
+            label: '零件类型',
+            prop: 'sinTerType',
+            sortable: true,
+            search: false,
+            headerAlign: 'center',
+            align: 'center',
+            type: 'select',
+            dicData: [
+              {
+                label: '烧结零件',
+                value: '1',
+              },
+              {
+                label: '热表零件',
+                value: '2',
+              },
+            ],
+          },
+          {
+            label: '工艺路线',
+            prop: 'craftWay',
+            sortable: true,
+            search: false,
+            headerAlign: 'center',
+            align: 'center',
+          },
+        ],
+      },
+      data: [],
+    };
+  },
+  mounted() {
+    this.setCrewShow = this.setCrewOpen;
+    this.data = this.expireData;
+  },
+  methods: {
+    submit() {
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          let arr = [];
+          this.data.forEach((item, index) => {
+            arr.push(item.id);
+          });
+          let query = {
+            nextDue: this.$refs.ruleForm.form.nextDue,
+            ids: arr.join(','),
+          };
+          periodOfValidity(query).then(res => {
+            this.setIndateCancel();
+          });
+          console.log(9999, query);
         }
-    }
+      });
+    },
+
+    setIndateCancel(refresh) {
+      this.setCrewShow = false;
+      this.$emit('setIndateCancel', typeof refresh === 'boolean' && refresh);
+    },
+  },
 };
 </script>
diff --git a/src/views/processManagement/components/processMainte/dsPartIndex.vue b/src/views/processManagement/components/processMainte/dsPartIndex.vue
index c17abe3..5bc7f27 100644
--- a/src/views/processManagement/components/processMainte/dsPartIndex.vue
+++ b/src/views/processManagement/components/processMainte/dsPartIndex.vue
@@ -14,7 +14,7 @@
         </el-tab-pane>
       </el-tabs>
       <div class="content-right">
-        <p>工艺版本：{{partVersion}}</p>
+        <p>工艺版本：{{partVersion}}5555</p>
       </div>
     </div>
 
diff --git a/src/views/processManagement/components/processMainte/partDetails.vue b/src/views/processManagement/components/processMainte/partDetails.vue
index 68a3dfe..d581c1d 100644
--- a/src/views/processManagement/components/processMainte/partDetails.vue
+++ b/src/views/processManagement/components/processMainte/partDetails.vue
@@ -11,7 +11,6 @@
           工艺版本：<el-select
             v-model="version"
             placeholder="请输入"
-            clearable
             filterable
             @change="versionChange()"
           >
diff --git a/src/views/processManagement/components/processMainte/processPlanning.vue b/src/views/processManagement/components/processMainte/processPlanning.vue
index b804340..53a3d1b 100644
--- a/src/views/processManagement/components/processMainte/processPlanning.vue
+++ b/src/views/processManagement/components/processMainte/processPlanning.vue
@@ -22,8 +22,10 @@
       </div>
       <!-- style="width: 240px" -->
       <el-tree
+        ref="tree"
         :data="data"
         :props="defaultProps"
+        node-key="id"
         @node-click="handleNodeClick"
         @node-contextmenu="handleNodeRightClick"
         :default-expand-all="true"
@@ -836,6 +838,9 @@ export default {
       }).then(res => {
         this.data = this.transformCraftTree(res.data.data);
         this.partInfoData = res.data.data.partInfo;
+        this.$nextTick(() => {
+          this.autoSelectFirstProcess();
+        });
         if (this.partInfoData.partName == '石墨模') {
           let graphite = this.modelOption.find(item => item.name == '石墨模');
           this.modelLevel = graphite.id;
@@ -843,6 +848,21 @@ export default {
         }
       });
     },
+    autoSelectFirstProcess() {
+      if (!this.data?.[0]?.children?.length) return;
+
+      // 获取第一个二级节点（工艺节点）
+      const firstCraft = this.data[0].children[0];
+
+      // 手动触发点击事件
+      this.handleNodeClick(firstCraft, {
+        level: 2,
+        parent: {
+          data: this.data[0],
+          isRoot: false,
+        },
+      });
+    },
     // 组织树转换
     transformCraftTree(responseData) {
       const { partInfo, craftList } = responseData;
@@ -861,29 +881,22 @@ export default {
 
             return {
               ...craftInfo,
+              id: craftInfo.id || `craft_${craftInfo.craftNo}`, // 👈 确保有唯一 id
               label: craftLabel,
-              processList: processList.map(process => {
-                return process.processInfo;
-              }),
-              rawData: craftInfo, // 保存工艺原始数据
+              processList: processList.map(process => process.processInfo),
+              rawData: craftInfo,
               children: processList.map(process => {
                 const { processInfo, projectList, measuringToolList, moldToolList } = process;
-                // 三级节点：工序名称
-                const processLabel = processInfo.processName;
-
                 return {
                   ...processInfo,
-                  label: processLabel,
-                  rawData: {
-                    processInfo,
-                    projectList,
-                    measuringToolList,
-                    moldToolList,
-                  }, // 保存工序及关联数据
+                  id: processInfo.id || `process_${processInfo.processNo}`, // 👈 三级节点也需 id
+                  label: processInfo.processName,
+                  rawData: { processInfo, projectList, measuringToolList, moldToolList },
                   children: projectList.map(project => ({
-                    label: project.projectName, // 四级节点：项目名称
-                    rawData: project, // 保存项目原始数据
+                    label: project.projectName,
+                    rawData: project,
                     disabled: true,
+                    id: project.id || `project_${project.projectCode}`, // 👈 四级节点 id
                   })),
                 };
               }),
diff --git a/src/views/processManagement/taskProcessing.vue b/src/views/processManagement/taskProcessing.vue
index 3d94370..0a0b5e7 100644
--- a/src/views/processManagement/taskProcessing.vue
+++ b/src/views/processManagement/taskProcessing.vue
@@ -48,7 +48,8 @@
           v-if="scope.row.taskStatus == 2"
           >完成</el-button
         >
-        <el-button type="primary" link @click="setBathCrew(scope.row)" v-if="!scope.row.completed"
+        <el-button type="primary" link @click="setBathCrew(scope.row)" v-if="(scope.row.taskStatus == 1)&&
+            (!scope.row.completed )"
           >转派</el-button
         >
       </template>
diff --git a/src/views/productionSchedulingPlan/schedulingDashboard/container.vue b/src/views/productionSchedulingPlan/schedulingDashboard/container.vue
index 67d8da5..5bc6591 100644
--- a/src/views/productionSchedulingPlan/schedulingDashboard/container.vue
+++ b/src/views/productionSchedulingPlan/schedulingDashboard/container.vue
@@ -515,7 +515,7 @@ export default {
       currentViewEndTime: null, // 当前视图结束时间
 
       legendStatus: {
-        completed: false,
+        completed: true,
         processing: true,
         pending: true,
       },
@@ -951,7 +951,7 @@ export default {
       }
       // 如果是重置操作，也应触发图例状态同步
       if (type === 'reset') {
-        this.legendStatus.completed = false;
+        this.legendStatus.completed = true;
         this.legendStatus.processing = true;
         this.legendStatus.pending = true;
         this.handleLegendChange('reset');
@@ -1305,7 +1305,7 @@ export default {
         batchNo: '', //批次号
         planStatusList: ['1', '2', '3'],
       };
-      this.legendStatus.completed = false;
+      this.legendStatus.completed = true;
       this.legendStatus.processing = true;
       this.legendStatus.pending = true;
 
diff --git a/src/views/productionSchedulingPlan/statisticalAnalysis/production/executionProcess.vue b/src/views/productionSchedulingPlan/statisticalAnalysis/production/executionProcess.vue
index 87ac23e..b8edca9 100644
--- a/src/views/productionSchedulingPlan/statisticalAnalysis/production/executionProcess.vue
+++ b/src/views/productionSchedulingPlan/statisticalAnalysis/production/executionProcess.vue
@@ -15,41 +15,59 @@
       @current-change="currentChange"
       @size-change="sizeChange"
       @refresh-change="refreshChange"
-      @on-load="onLoad"
     >
       <template #menu-left> </template>
       <template #menu-right> </template>
       <template #menu="{ row }"> </template>
 
-       <template #tiqiankaigong="scope">
-        <el-button type="text" @click="toDetail(scope.row,'提前开工')">{{ scope.row.tiqiankaigong }}</el-button>
+      <template #earlyStartCount="scope">
+        <el-button type="text" @click="toDetail(scope.row, '提前开工')"
+          >{{ scope.row.earlyStartCount }}（{{
+            scope.row.earlyStartCountRate == '0' ? '0%' : scope.row.earlyStartCountRate
+          }}）</el-button
+        >
       </template>
-      <template #zhunshikaigong="scope">
-        <el-button type="text" @click="toDetail(scope.row,'准时开工')">{{ scope.row.zhunshikaigong }}</el-button>
+      <template #onTimeStartCount="scope">
+        <el-button type="text" @click="toDetail(scope.row, '准时开工')"
+          >{{ scope.row.onTimeStartCount }}（{{
+            scope.row.onTimeStartCountRate == '0' ? '0%' : scope.row.onTimeStartCountRate
+          }}）</el-button
+        >
       </template>
-      <template #yanchikaigong="scope">
-        <el-button type="text" @click="toDetail(scope.row,'延迟开工')">{{ scope.row.yanchikaigong }}</el-button>
+      <template #delayStartCount="scope">
+        <el-button type="text" @click="toDetail(scope.row, '延迟开工')"
+          >{{ scope.row.delayStartCount }}（{{
+            scope.row.delayStartCountRate == '0' ? '0%' : scope.row.delayStartCountRate
+          }}）</el-button
+        >
       </template>
-      <template #tiqianwangong="scope">
-        <el-button type="text" @click="toDetail(scope.row,'提前完工')">{{ scope.row.tiqianwangong }}</el-button>
+      <template #earlyFinishCount="scope">
+        <el-button type="text" @click="toDetail(scope.row, '提前完工')"
+          >{{ scope.row.earlyFinishCount }}（{{
+            scope.row.earlyFinishCountRate == '0' ? '0%' : scope.row.earlyFinishCountRate
+          }}）</el-button
+        >
       </template>
-      <template #zhunshiwangong="scope">
-        <el-button type="text" @click="toDetail(scope.row,'准时完工')">{{ scope.row.zhunshiwangong }}</el-button>
+      <template #onTimeFinishCount="scope">
+        <el-button type="text" @click="toDetail(scope.row, '准时完工')"
+          >{{ scope.row.onTimeFinishCount }}（{{
+            scope.row.onTimeFinishCountRate == '0' ? '0%' : scope.row.onTimeFinishCountRate
+          }}）</el-button
+        >
       </template>
-       <template #yanchiwangong="scope">
-        <el-button type="text" @click="toDetail(scope.row,'延迟完工')">{{ scope.row.yanchiwangong }}</el-button>
+      <template #delayFinishCount="scope">
+        <el-button type="text" @click="toDetail(scope.row, '延迟完工')"
+          >{{ scope.row.delayFinishCount }}（{{
+            scope.row.delayFinishCountRate == '0' ? '0%' : scope.row.delayFinishCountRate
+          }}）</el-button
+        >
       </template>
     </avue-crud>
   </div>
 </template>
 
 <script>
-// import {
-//   getListPersonAbility,
-//   removePersonAbility,
-//   addPersonAbility,
-//   updatePersonAbility,
-// } from '@/api/productionSchedulingPlan/scheduling';
+import { getProcessExecutePage } from '@/api/productionSchedulingPlan/scheduling';
 export default {
   components: {},
   data() {
@@ -146,13 +164,12 @@ export default {
             prop: 'craftName',
             search: false,
             sortable: true,
-            width: 150,
             span: 12,
             searchOrder: 17,
           },
           {
             label: '工艺能力',
-            prop: 'craftId',
+            prop: 'caId',
             hide: true,
             search: true,
             sortable: true,
@@ -182,13 +199,12 @@ export default {
             prop: 'processName',
             search: false,
             sortable: true,
-            width: 150,
             span: 12,
             searchOrder: 16,
           },
           {
             label: '工序',
-            prop: 'processId',
+            prop: 'ppsId',
             search: true,
             sortable: true,
             hide: true,
@@ -213,16 +229,16 @@ export default {
             },
           },
           {
-            label: '车间订单数量',
-            prop: 'partName',
+            label: '工序执行次数',
+            prop: 'totalCount',
             search: false,
             sortable: true,
             span: 12,
-            searchLabelWidth: 'auto',
+            width: 150,
           },
           {
             label: '准时偏差（±分钟）',
-            prop: 'zhunshipiancha',
+            prop: 'interval',
             search: true,
             sortable: true,
             span: 12,
@@ -233,42 +249,42 @@ export default {
 
           {
             label: '提前开工',
-            prop: 'tiqiankaigong',
+            prop: 'earlyStartCount',
             search: false,
             sortable: true,
             span: 12,
           },
           {
             label: '准时开工',
-            prop: 'zhunshikaigong',
+            prop: 'onTimeStartCount',
             search: false,
             sortable: true,
             span: 12,
           },
           {
             label: '延迟开工',
-            prop: 'yanchikaigong',
+            prop: 'delayStartCount',
             search: false,
             sortable: true,
             span: 12,
           },
           {
             label: '提前完工',
-            prop: 'tiqianwangong',
+            prop: 'earlyFinishCount',
             search: false,
             sortable: true,
             span: 12,
           },
           {
             label: '准时完工',
-            prop: 'zhunshiwangong',
+            prop: 'onTimeFinishCount',
             search: false,
             sortable: true,
             span: 12,
           },
           {
             label: '延迟完工',
-            prop: 'yanchiwangong',
+            prop: 'delayFinishCount',
             search: false,
             sortable: true,
             span: 12,
@@ -302,11 +318,13 @@ export default {
     threeDaysAgo.setDate(today.getDate() - 7);
 
     this.query.cycledate = [this.formatDate(threeDaysAgo), this.formatDate(today)];
+
+    this.onLoad(this.page, this.query);
   },
   methods: {
     onChangeData() {},
-    toDetail(row,type){
-      this.$emit('toDetail',row,type,'工序')
+    toDetail(row, type) {
+      this.$emit('toDetail', row, type, '工序');
     },
     formatDate(date) {
       const year = date.getFullYear();
@@ -384,9 +402,11 @@ export default {
 
     currentChange(currentPage) {
       this.page.currentPage = currentPage;
+      this.onLoad(this.page, this.query);
     },
     sizeChange(pageSize) {
       this.page.pageSize = pageSize;
+      this.onLoad(this.page, this.query);
     },
     refreshChange() {
       this.onLoad(this.page, this.query);
@@ -402,28 +422,29 @@ export default {
     },
 
     onLoad(page, params = {}) {
-      this.loading = false;
+      this.loading = true;
+      let query_ = {};
       if (!!params.cycledate) {
-        this.query.startTime = params.cycledate[0];
-        this.query.endTime = params.cycledate[1];
+        query_.startTime = params.cycledate[0];
+        query_.endTime = params.cycledate[1];
       }
-       this.data = [
-        {
-          id: '1',
-          zhunshikaigong: '20%',
-          zhunshiwangong: '30%',
-          tiqianwangong: '40%',
-          tiqiankaigong: '50%',
-          yanchikaigong: '60%',
-          yanchiwangong: '80%',
-        },
-      ];
-      // getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-      //   this.data = res.data.data.records;
-      //   this.loading = false;
-      //   this.page.total = res.data.data.total;
-      //   this.selectionClear();
-      // });
+      if (!!params.interval) {
+        query_.interval = params.interval;
+      }
+      if (!!params.workCenterId) {
+        query_.workCenterId = params.workCenterId;
+      }
+      if (!!params.caId) {
+        query_.caId = params.caId;
+      }
+      if (!!params.ppsId) {
+        query_.ppsId = params.ppsId;
+      }
+      getProcessExecutePage(page.currentPage, page.pageSize, query_).then(res => {
+        this.data = res.data.data.records;
+        this.loading = false;
+        this.page.total = res.data.data.total;
+      });
     },
   },
 };
diff --git a/src/views/productionSchedulingPlan/statisticalAnalysis/production/executionWorkorder.vue b/src/views/productionSchedulingPlan/statisticalAnalysis/production/executionWorkorder.vue
index 75f63f7..f31c961 100644
--- a/src/views/productionSchedulingPlan/statisticalAnalysis/production/executionWorkorder.vue
+++ b/src/views/productionSchedulingPlan/statisticalAnalysis/production/executionWorkorder.vue
@@ -20,35 +20,54 @@
       <template #menu-left> </template>
       <template #menu-right> </template>
       <template #menu="{ row }"> </template>
-      <template #tiqiankaigong="scope">
-        <el-button type="text" @click="toDetail(scope.row,'提前开工')">{{ scope.row.tiqiankaigong }}</el-button>
+      <template #earlyStartCount="scope">
+        <el-button type="text" @click="toDetail(scope.row, '提前开工')"
+          >{{ scope.row.earlyStartCount }}（{{
+            scope.row.earlyStartCountRate == '0' ? '0%' : scope.row.earlyStartCountRate
+          }}）</el-button
+        >
       </template>
-      <template #zhunshikaigong="scope">
-        <el-button type="text" @click="toDetail(scope.row,'准时开工')">{{ scope.row.zhunshikaigong }}</el-button>
+      <template #onTimeStartCount="scope">
+        <el-button type="text" @click="toDetail(scope.row, '准时开工')"
+          >{{ scope.row.onTimeStartCount }}（{{
+            scope.row.onTimeStartCountRate == '0' ? '0%' : scope.row.onTimeStartCountRate
+          }}）</el-button
+        >
       </template>
-      <template #yanchikaigong="scope">
-        <el-button type="text" @click="toDetail(scope.row,'延迟开工')">{{ scope.row.yanchikaigong }}</el-button>
+      <template #delayStartCount="scope">
+        <el-button type="text" @click="toDetail(scope.row, '延迟开工')"
+          >{{ scope.row.delayStartCount }}（{{
+            scope.row.delayStartCountRate == '0' ? '0%' : scope.row.delayStartCountRate
+          }}）</el-button
+        >
       </template>
-      <template #tiqianwangong="scope">
-        <el-button type="text" @click="toDetail(scope.row,'提前完工')">{{ scope.row.tiqianwangong }}</el-button>
+      <template #earlyFinishCount="scope">
+        <el-button type="text" @click="toDetail(scope.row, '提前完工')"
+          >{{ scope.row.earlyFinishCount }}（{{
+            scope.row.earlyFinishCountRate == '0' ? '0%' : scope.row.earlyFinishCountRate
+          }}）</el-button
+        >
       </template>
-      <template #zhunshiwangong="scope">
-        <el-button type="text" @click="toDetail(scope.row,'准时完工')">{{ scope.row.zhunshiwangong }}</el-button>
+      <template #onTimeFinishCount="scope">
+        <el-button type="text" @click="toDetail(scope.row, '准时完工')"
+          >{{ scope.row.onTimeFinishCount }}（{{
+            scope.row.onTimeFinishCountRate == '0' ? '0%' : scope.row.onTimeFinishCountRate
+          }}）</el-button
+        >
       </template>
-       <template #yanchiwangong="scope">
-        <el-button type="text" @click="toDetail(scope.row,'延迟完工')">{{ scope.row.yanchiwangong }}</el-button>
+      <template #delayFinishCount="scope">
+        <el-button type="text" @click="toDetail(scope.row, '延迟完工')"
+          >{{ scope.row.delayFinishCount }}（{{
+            scope.row.delayFinishCountRate == '0' ? '0%' : scope.row.delayFinishCountRate
+          }}）</el-button
+        >
       </template>
     </avue-crud>
   </div>
 </template>
 
 <script>
-// import {
-//   getListPersonAbility,
-//   removePersonAbility,
-//   addPersonAbility,
-//   updatePersonAbility,
-// } from '@/api/productionSchedulingPlan/scheduling';
+import { getCenterExecuteList } from '@/api/productionSchedulingPlan/scheduling';
 export default {
   components: {},
   data() {
@@ -142,7 +161,7 @@ export default {
           },
           {
             label: '准时偏差（±分钟）',
-            prop: 'zhunshipiancha',
+            prop: 'interval',
             search: true,
             sortable: true,
             span: 12,
@@ -153,7 +172,7 @@ export default {
 
           {
             label: '车间订单数量',
-            prop: 'partName',
+            prop: 'totalCount',
             search: false,
             sortable: true,
             span: 12,
@@ -161,42 +180,42 @@ export default {
           },
           {
             label: '提前开工',
-            prop: 'tiqiankaigong',
+            prop: 'earlyStartCount',
             search: false,
             sortable: true,
             span: 12,
           },
           {
             label: '准时开工',
-            prop: 'zhunshikaigong',
+            prop: 'onTimeStartCount',
             search: false,
             sortable: true,
             span: 12,
           },
           {
             label: '延迟开工',
-            prop: 'yanchikaigong',
+            prop: 'delayStartCount',
             search: false,
             sortable: true,
             span: 12,
           },
           {
             label: '提前完工',
-            prop: 'tiqianwangong',
+            prop: 'earlyFinishCount',
             search: false,
             sortable: true,
             span: 12,
           },
           {
             label: '准时完工',
-            prop: 'zhunshiwangong',
+            prop: 'onTimeFinishCount',
             search: false,
             sortable: true,
             span: 12,
           },
           {
             label: '延迟完工',
-            prop: 'yanchiwangong',
+            prop: 'delayFinishCount',
             search: false,
             sortable: true,
             span: 12,
@@ -230,11 +249,16 @@ export default {
     threeDaysAgo.setDate(today.getDate() - 7);
 
     this.query.cycledate = [this.formatDate(threeDaysAgo), this.formatDate(today)];
+    this.query.interval = 30
+    this.onLoad(this.page, this.query);
+    // this.$refs.crud.refreshTable();
   },
   methods: {
     onChangeData() {},
-    toDetail(row,type){
-      this.$emit('toDetail',row,type,'作业中心')
+    toDetail(row, type) {
+      console.log(909090,row, type);
+      row.interval = this.query.interval
+      this.$emit('toDetail', row, type, '作业中心');
     },
     formatDate(date) {
       const year = date.getFullYear();
@@ -299,7 +323,7 @@ export default {
     searchChange(params, done) {
       this.query = params;
       this.page.currentPage = 1;
-      this.onLoad(this.page, params);
+      this.onLoad(this.page, this.query);
       done();
     },
     selectionChange(list) {
@@ -312,9 +336,11 @@ export default {
 
     currentChange(currentPage) {
       this.page.currentPage = currentPage;
+      this.onLoad(this.page, this.query);
     },
     sizeChange(pageSize) {
       this.page.pageSize = pageSize;
+      this.onLoad(this.page, this.query);
     },
     refreshChange() {
       this.onLoad(this.page, this.query);
@@ -330,28 +356,23 @@ export default {
     },
 
     onLoad(page, params = {}) {
-      this.loading = false;
+      this.loading = true;
+      let query_ = {};
       if (!!params.cycledate) {
-        this.query.startTime = params.cycledate[0];
-        this.query.endTime = params.cycledate[1];
+        query_.startTime = params.cycledate[0];
+        query_.endTime = params.cycledate[1];
       }
-      this.data = [
-        {
-          id: '1',
-          zhunshikaigong: '20%',
-          zhunshiwangong: '30%',
-          tiqianwangong: '40%',
-          tiqiankaigong: '50%',
-          yanchikaigong: '60%',
-          yanchiwangong: '80%',
-        },
-      ];
-      // getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-      //   this.data = res.data.data.records;
-      //   this.loading = false;
-      //   this.page.total = res.data.data.total;
-      //   this.selectionClear();
-      // });
+      if (!!this.query.interval) {
+        query_.interval = this.query.interval;
+      }
+      if (!!this.query.workCenterId) {
+        query_.workCenterId = this.query.workCenterId;
+      }
+
+      getCenterExecuteList(query_).then(res => {
+        this.data = res.data.data;
+        this.loading = false;
+      });
     },
   },
 };
diff --git a/src/views/productionSchedulingPlan/statisticalAnalysis/production/processDeatils.vue b/src/views/productionSchedulingPlan/statisticalAnalysis/production/processDeatils.vue
index f092fda..ea33f29 100644
--- a/src/views/productionSchedulingPlan/statisticalAnalysis/production/processDeatils.vue
+++ b/src/views/productionSchedulingPlan/statisticalAnalysis/production/processDeatils.vue
@@ -27,12 +27,7 @@
 </template>
 
 <script>
-// import {
-//   getListPersonAbility,
-//   removePersonAbility,
-//   addPersonAbility,
-//   updatePersonAbility,
-// } from '@/api/productionSchedulingPlan/scheduling';
+import { getProcessExecuteDetailPage } from '@/api/productionSchedulingPlan/scheduling';
 export default {
   components: {},
   props: {
@@ -131,7 +126,7 @@ export default {
 
           {
             label: '车间订单号',
-            prop: 'partName',
+            prop: 'woCode',
             search: true,
             sortable: true,
             span: 12,
@@ -141,7 +136,7 @@ export default {
           },
           {
             label: '零件号',
-            prop: 'partName',
+            prop: 'partCode',
             search: true,
             sortable: true,
             span: 12,
@@ -160,7 +155,7 @@ export default {
           },
           {
             label: '批次号',
-            prop: 'partName',
+            prop: 'batchNo',
             search: true,
             sortable: true,
             span: 12,
@@ -170,7 +165,7 @@ export default {
           },
           {
             label: '流程卡号',
-            prop: 'partName',
+            prop: 'cardNo',
             search: true,
             sortable: true,
             span: 12,
@@ -188,7 +183,7 @@ export default {
           },
           {
             label: '工艺能力',
-            prop: 'craftId',
+            prop: 'caId',
             hide: true,
             search: true,
             sortable: true,
@@ -223,7 +218,7 @@ export default {
           },
           {
             label: '工序',
-            prop: 'processId',
+            prop: 'ppsId',
             search: true,
             sortable: true,
             hide: true,
@@ -250,7 +245,7 @@ export default {
           },
           {
             label: '加工班组',
-            prop: 'partName',
+            prop: 'teamName',
             search: false,
             sortable: true,
             span: 12,
@@ -260,7 +255,7 @@ export default {
           },
           {
             label: '班组',
-            prop: 'jiagongbanzuId',
+            prop: 'teamId',
             search: true,
             sortable: true,
             hide: true,
@@ -270,16 +265,15 @@ export default {
             searchOrder: 14,
             filterable: true,
             type: 'select',
-            dicUrl:'blade-scheduling/teamSet/findList',
+            dicUrl: 'blade-scheduling/teamSet/findList',
             props: {
               label: 'tsName',
               value: 'tsName',
             },
-
           },
           {
             label: '计划开始时间',
-            prop: 'partName',
+            prop: 'planStartTime',
             search: false,
             sortable: true,
             span: 12,
@@ -288,7 +282,7 @@ export default {
           },
           {
             label: '实际开始时间',
-            prop: 'partName',
+            prop: 'factStartTime',
             search: false,
             sortable: true,
             span: 12,
@@ -297,7 +291,7 @@ export default {
           },
           {
             label: '开工类型',
-            prop: 'partName',
+            prop: 'startType',
             search: true,
             sortable: true,
             span: 12,
@@ -308,21 +302,21 @@ export default {
             dicData: [
               {
                 label: '提前',
-                value: '1',
+                value: '提前',
               },
               {
                 label: '准时',
-                value: '2',
+                value: '准时',
               },
               {
                 label: '延迟',
-                value: '2',
+                value: '延迟',
               },
             ],
           },
           {
             label: '计划完成时间',
-            prop: 'partName',
+            prop: 'planEndTime',
             search: false,
             sortable: true,
             span: 12,
@@ -331,7 +325,7 @@ export default {
           },
           {
             label: '实际完成时间',
-            prop: 'partName',
+            prop: 'factEndTime',
             search: false,
             sortable: true,
             span: 12,
@@ -340,7 +334,7 @@ export default {
           },
           {
             label: '完工类型',
-            prop: 'partName',
+            prop: 'endType',
             search: true,
             sortable: true,
             span: 12,
@@ -351,21 +345,21 @@ export default {
             dicData: [
               {
                 label: '提前',
-                value: '1',
+                value: '提前',
               },
               {
                 label: '准时',
-                value: '2',
+                value: '准时',
               },
               {
                 label: '延迟',
-                value: '2',
+                value: '延迟',
               },
             ],
           },
           {
             label: '计划时长（分钟）',
-            prop: 'partName',
+            prop: 'planDurationMinute',
             search: false,
             sortable: true,
             span: 12,
@@ -374,7 +368,7 @@ export default {
           },
           {
             label: '实际时长（分钟）',
-            prop: 'partName',
+            prop: 'factDurationMinute',
             search: false,
             sortable: true,
             span: 12,
@@ -383,7 +377,7 @@ export default {
           },
           {
             label: '偏差时长（分钟）',
-            prop: 'partName',
+            prop: 'biasDurationMinute',
             search: false,
             sortable: true,
             span: 12,
@@ -409,7 +403,7 @@ export default {
           },
           {
             label: '准时偏差（±分钟）',
-            prop: 'zhunshipiancha',
+            prop: 'interval',
             search: true,
             sortable: true,
             span: 12,
@@ -431,6 +425,37 @@ export default {
     threeDaysAgo.setDate(today.getDate() - 7);
 
     this.query.cycledate = [this.formatDate(threeDaysAgo), this.formatDate(today)];
+
+    console.log(this.processItem, 'processItem');
+    if (this.processItem.workCenterId) {
+      this.query.workCenterId = this.processItem.workCenterId + '';
+    }
+    if (this.processItem.caId) {
+      this.query.caId = this.processItem.caId + '';
+    }
+    if (this.processItem.ppsId) {
+      this.query.ppsId = this.processItem.ppsId + '';
+    }
+    if (this.processItem.type) {
+      if (this.processItem.type == '提前开工') {
+        this.query.startType = '提前';
+      }
+      if (this.processItem.type == '准时开工') {
+        this.query.startType = '准时';
+      }
+      if (this.processItem.type == '延迟开工') {
+        this.query.startType = '延迟';
+      }
+      if (this.processItem.type == '提前完工') {
+        this.query.endType = '提前';
+      }
+      if (this.processItem.type == '准时完工') {
+        this.query.endType = '准时';
+      }
+      if (this.processItem.type == '延迟完工') {
+        this.query.endType = '延迟';
+      }
+    }
   },
   methods: {
     onChangeData() {},
@@ -510,9 +535,11 @@ export default {
 
     currentChange(currentPage) {
       this.page.currentPage = currentPage;
+      this.onLoad(this.page, this.query);
     },
     sizeChange(pageSize) {
       this.page.pageSize = pageSize;
+      this.onLoad(this.page, this.query);
     },
     refreshChange() {
       this.onLoad(this.page, this.query);
@@ -529,16 +556,37 @@ export default {
 
     onLoad(page, params = {}) {
       this.loading = false;
+      let query_ = {}
       if (!!params.cycledate) {
-        this.query.startTime = params.cycledate[0];
-        this.query.endTime = params.cycledate[1];
+        query_.startTime = params.cycledate[0];
+        query_.endTime = params.cycledate[1];
       }
-      // getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-      //   this.data = res.data.data.records;
-      //   this.loading = false;
-      //   this.page.total = res.data.data.total;
-      //   this.selectionClear();
-      // });
+      if (!!params.interval) {
+        query_.interval = params.interval;
+      }
+      if (!!params.workCenterId) {
+        query_.workCenterId = params.workCenterId;
+      }
+      if (!!params.cardNo) {
+        query_.cardNo = params.cardNo;
+      }
+      if (!!params.batchNo) {
+        query_.batchNo = params.batchNo;
+      }
+      if (!!params.woCode) {
+        query_.woCode = params.woCode;
+      }
+      if (!!params.startType) {
+        query_.startType = params.startType;
+      }
+      if (!!params.endType) {
+        query_.endType = params.endType;
+      }
+      getProcessExecuteDetailPage(page.currentPage, page.pageSize, query_).then(res => {
+        this.data = res.data.data.records;
+        this.loading = false;
+        this.page.total = res.data.data.total;
+      });
     },
   },
 };
diff --git a/src/views/productionSchedulingPlan/statisticalAnalysis/production/workorderDetails.vue b/src/views/productionSchedulingPlan/statisticalAnalysis/production/workorderDetails.vue
index ea8a5b9..8f49601 100644
--- a/src/views/productionSchedulingPlan/statisticalAnalysis/production/workorderDetails.vue
+++ b/src/views/productionSchedulingPlan/statisticalAnalysis/production/workorderDetails.vue
@@ -15,7 +15,6 @@
       @current-change="currentChange"
       @size-change="sizeChange"
       @refresh-change="refreshChange"
-      @on-load="onLoad"
     >
       <template #menu-left> </template>
       <template #menu-right> </template>
@@ -27,12 +26,7 @@
 </template>
 
 <script>
-// import {
-//   getListPersonAbility,
-//   removePersonAbility,
-//   addPersonAbility,
-//   updatePersonAbility,
-// } from '@/api/productionSchedulingPlan/scheduling';
+import { getOrderExecuteDetailPage } from '@/api/productionSchedulingPlan/scheduling';
 export default {
   components: {},
   props: {
@@ -112,7 +106,7 @@ export default {
             searchOrder: 17,
             type: 'select',
             filterable: true,
-            
+            searchOrder: 19,
             dicUrl: '/blade-scheduling/workCenter/findList',
             rules: [
               {
@@ -132,7 +126,7 @@ export default {
 
           {
             label: '车间订单号',
-            prop: 'partName',
+            prop: 'woCode',
             search: true,
             sortable: true,
             span: 12,
@@ -142,13 +136,14 @@ export default {
           },
           {
             label: '零件号',
-            prop: 'partName',
+            prop: 'partCode',
             search: true,
             sortable: true,
             span: 12,
             searchLabelWidth: 'auto',
             width: 150,
-            searchOrder: 19,
+
+            searchOrder: 17,
           },
           {
             label: '零件名称',
@@ -161,7 +156,7 @@ export default {
           },
           {
             label: '批次号',
-            prop: 'partName',
+            prop: 'batchNo',
             search: true,
             sortable: true,
             span: 12,
@@ -171,7 +166,7 @@ export default {
           },
           {
             label: '流程卡号',
-            prop: 'partName',
+            prop: 'cardNo',
             search: true,
             sortable: true,
             span: 12,
@@ -181,7 +176,7 @@ export default {
           },
           {
             label: '接收时间',
-            prop: 'partName',
+            prop: 'receiveTime',
             search: false,
             sortable: true,
             span: 12,
@@ -190,7 +185,7 @@ export default {
           },
           {
             label: '计划开始时间',
-            prop: 'partName',
+            prop: 'planStartTime',
             search: false,
             sortable: true,
             span: 12,
@@ -199,7 +194,7 @@ export default {
           },
           {
             label: '实际开始时间',
-            prop: 'partName',
+            prop: 'factStartTime',
             search: false,
             sortable: true,
             span: 12,
@@ -208,7 +203,7 @@ export default {
           },
           {
             label: '开工类型',
-            prop: 'partName',
+            prop: 'startType',
             search: true,
             sortable: true,
             span: 12,
@@ -219,21 +214,21 @@ export default {
             dicData: [
               {
                 label: '提前',
-                value: '1',
+                value: '提前',
               },
               {
                 label: '准时',
-                value: '2',
+                value: '准时',
               },
               {
                 label: '延迟',
-                value: '2',
+                value: '延迟',
               },
             ],
           },
           {
             label: '计划完成时间',
-            prop: 'partName',
+            prop: 'planEndTime',
             search: false,
             sortable: true,
             span: 12,
@@ -242,7 +237,7 @@ export default {
           },
           {
             label: '实际完成时间',
-            prop: 'partName',
+            prop: 'factEndTime',
             search: false,
             sortable: true,
             span: 12,
@@ -251,7 +246,7 @@ export default {
           },
           {
             label: '完工类型',
-            prop: 'partName',
+            prop: 'endType',
             search: true,
             sortable: true,
             span: 12,
@@ -262,21 +257,21 @@ export default {
             dicData: [
               {
                 label: '提前',
-                value: '1',
+                value: '提前',
               },
               {
                 label: '准时',
-                value: '2',
+                value: '准时',
               },
               {
                 label: '延迟',
-                value: '2',
+                value: '延迟',
               },
             ],
           },
           {
             label: '计划时长（分钟）',
-            prop: 'partName',
+            prop: 'planDurationMinute',
             search: false,
             sortable: true,
             span: 12,
@@ -285,7 +280,7 @@ export default {
           },
           {
             label: '实际时长（分钟）',
-            prop: 'partName',
+            prop: 'factDurationMinute',
             search: false,
             sortable: true,
             span: 12,
@@ -294,7 +289,7 @@ export default {
           },
           {
             label: '偏差时长（分钟）',
-            prop: 'partName',
+            prop: 'biasDurationMinute',
             search: false,
             sortable: true,
             span: 12,
@@ -320,7 +315,7 @@ export default {
           },
           {
             label: '准时偏差（±分钟）',
-            prop: 'zhunshipiancha',
+            prop: 'interval',
             search: true,
             sortable: true,
             span: 12,
@@ -341,7 +336,34 @@ export default {
     threeDaysAgo.setDate(today.getDate() - 7);
 
     this.query.cycledate = [this.formatDate(threeDaysAgo), this.formatDate(today)];
-    console.log(this.workorderItem,'workorderItem');
+    console.log(this.workorderItem, 'workorderItem');
+    if(this.workorderItem.interval){
+      this.query.interval = this.workorderItem.interval;
+    }
+    if (this.workorderItem.workCenterId) {
+      this.query.workCenterId = this.workorderItem.workCenterId + '';
+    }
+    if (this.workorderItem.type) {
+      if (this.workorderItem.type == '提前开工') {
+        this.query.startType = '提前';
+      }
+      if (this.workorderItem.type == '准时开工') {
+        this.query.startType = '准时';
+      }
+      if (this.workorderItem.type == '延迟开工') {
+        this.query.startType = '延迟';
+      }
+      if (this.workorderItem.type == '提前完工') {
+        this.query.endType = '提前';
+      }
+      if (this.workorderItem.type == '准时完工') {
+        this.query.endType = '准时';
+      }
+      if (this.workorderItem.type == '延迟完工') {
+        this.query.endType = '延迟';
+      }
+    }
+    this.onLoad(this.page, this.query);
   },
   methods: {
     onChangeData() {},
@@ -421,9 +443,11 @@ export default {
 
     currentChange(currentPage) {
       this.page.currentPage = currentPage;
+      this.onLoad(this.page, this.query);
     },
     sizeChange(pageSize) {
       this.page.pageSize = pageSize;
+      this.onLoad(this.page, this.query);
     },
     refreshChange() {
       this.onLoad(this.page, this.query);
@@ -439,17 +463,36 @@ export default {
     },
 
     onLoad(page, params = {}) {
-      this.loading = false;
+      this.loading = true;
+      let query_ = {};
       if (!!params.cycledate) {
-        this.query.startTime = params.cycledate[0];
-        this.query.endTime = params.cycledate[1];
+        query_.startTime = params.cycledate[0];
+        query_.endTime = params.cycledate[1];
       }
-      // getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-      //   this.data = res.data.data.records;
-      //   this.loading = false;
-      //   this.page.total = res.data.data.total;
-      //   this.selectionClear();
-      // });
+      if (!!params.cardNo) {
+        query_.cardNo = params.cardNo;
+      }
+      if (!!params.batchNo) {
+        query_.batchNo = params.batchNo;
+      }
+      if (!!params.workCenterId) {
+        query_.workCenterId = params.workCenterId;
+      }
+      if (!!params.woCode) {
+        query_.woCode = params.woCode;
+      }
+      if (!!params.startType) {
+        query_.startType = params.startType;
+      }
+      if (!!params.endType) {
+        query_.endType = params.endType;
+      }
+      
+      getOrderExecuteDetailPage(page.currentPage, page.pageSize, query_).then(res => {
+        this.data = res.data.data.records;
+        this.loading = false;
+        this.page.total = res.data.data.total;
+      });
     },
   },
 };
diff --git a/src/views/productionSchedulingPlan/statisticalAnalysis/productionAnalysis.vue b/src/views/productionSchedulingPlan/statisticalAnalysis/productionAnalysis.vue
index c3227ef..03d2b1d 100644
--- a/src/views/productionSchedulingPlan/statisticalAnalysis/productionAnalysis.vue
+++ b/src/views/productionSchedulingPlan/statisticalAnalysis/productionAnalysis.vue
@@ -7,12 +7,12 @@
       <el-tab-pane label="工序执行明细" name="fourth"></el-tab-pane>
     </el-tabs>
 
-    <executionWorkorder v-if="activeName == 'first'" @toDetail="toDetail"></executionWorkorder>
+    <executionWorkorder v-show="activeName == 'first'" @toDetail="toDetail"></executionWorkorder>
     <workorderDetails
       v-if="activeName == 'second'"
       :workorderItem="workorderItem"
     ></workorderDetails>
-    <executionProcess v-if="activeName == 'third'" @toDetail="toDetail"></executionProcess>
+    <executionProcess v-show="activeName == 'third'" @toDetail="toDetail"></executionProcess>
     <processDeatils v-if="activeName == 'fourth'" :processItem="processItem"></processDeatils>
   </basic-container>
 </template>
@@ -41,10 +41,16 @@ export default {
     toDetail(row, type, tabName) {
       if (tabName == '作业中心') {
         this.activeName = 'second';
-        this.workorderItem = JSON.parse(JSON.stringify(row));
+        this.workorderItem = {
+          ...JSON.parse(JSON.stringify(row)),
+          type: type,
+        };
       } else {
         this.activeName = 'fourth';
-        this.processItem = JSON.parse(JSON.stringify(row));
+        this.processItem = {
+          ...JSON.parse(JSON.stringify(row)),
+          type: type,
+        };
       }
     },
   },
diff --git a/src/views/productionSchedulingPlan/statisticalAnalysis/qualificationAnalysis.vue b/src/views/productionSchedulingPlan/statisticalAnalysis/qualificationAnalysis.vue
index a1b7685..f0ff504 100644
--- a/src/views/productionSchedulingPlan/statisticalAnalysis/qualificationAnalysis.vue
+++ b/src/views/productionSchedulingPlan/statisticalAnalysis/qualificationAnalysis.vue
@@ -1,5 +1,6 @@
 <template>
   <basic-container>
+      <!-- @on-load="onLoad" -->
     <avue-crud
       :option="option"
       :table-loading="loading"
@@ -15,13 +16,15 @@
       @current-change="currentChange"
       @size-change="sizeChange"
       @refresh-change="refreshChange"
-      @on-load="onLoad"
+     
     >
       <template #menu-left> </template>
       <template #menu-right> </template>
       <template #menu="{ row }"> </template>
 
-      <template #heatTreat="scope"> </template>
+      <template #factEndTime="scope">
+        {{ scope.row.factEndTime ? scope.row.factEndTime.substring(0, 10) : '' }}
+      </template>
     </avue-crud>
   </basic-container>
 </template>
@@ -89,7 +92,7 @@ export default {
             prop: 'woCode',
             search: true,
             sortable: true,
-            width: 150,
+            width: 180,
             span: 12,
             searchOrder: 18,
             searchLabelWidth: 'auto',
@@ -294,6 +297,15 @@ export default {
           {
             label: '工序完成时间',
             prop: 'factEndTime',
+            search: false,
+            sortable: true,
+            width: 150,
+            span: 12,
+          },
+          {
+            label: '工序完成时间',
+            prop: 'cycledate',
+            hide: true,
             search: true,
             sortable: true,
             width: 150,
@@ -319,7 +331,8 @@ export default {
     const threeDaysAgo = new Date(today);
     threeDaysAgo.setDate(today.getDate() - 7);
 
-    this.query.factEndTime = [this.formatDate(threeDaysAgo), this.formatDate(today)];
+    this.query.cycledate = [this.formatDate(threeDaysAgo), this.formatDate(today)];
+    this.onLoad(this.page, this.query);
   },
   methods: {
     onChangeData(val, type) {
@@ -406,9 +419,11 @@ export default {
 
     currentChange(currentPage) {
       this.page.currentPage = currentPage;
+      this.onLoad(this.page, this.query);
     },
     sizeChange(pageSize) {
       this.page.pageSize = pageSize;
+      this.onLoad(this.page, this.query);
     },
     refreshChange() {
       this.onLoad(this.page, this.query);
@@ -424,18 +439,44 @@ export default {
     },
 
     onLoad(page, params = {}) {
-      if (!!params.factEndTime) {
-        this.query.startTime = params.factEndTime[0];
-        this.query.endTime = params.factEndTime[1];
+      let query_ = {};
+      if (!!params.cycledate) {
+        query_.startTime = params.cycledate[0];
+        query_.endTime = params.cycledate[1];
+      } else {
+        query_.startTime = null;
+        query_.endTime = null;
       }
-      console.log(params, this.query);
-      //   this.loading = true;
-      // getQualificationExecuteAnalysis(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-      //   this.data = res.data.data.records;
-      //   this.loading = false;
-      //   this.page.total = res.data.data.total;
-      //   this.selectionClear();
-      // });
+      if(!!this.query.partCode){
+        query_.partCode = this.query.partCode;
+      }
+      if(!!this.query.woCode){
+        query_.woCode = this.query.woCode;
+      }
+      if(!!this.query.craftName){
+        query_.craftName = this.query.craftName;
+      }
+      if(!!this.query.processName){
+        query_.processName = this.query.processName;
+      }
+      if(!!this.query.certificateName){
+        query_.certificateName = this.query.certificateName;
+      }
+      if(!!this.query.productIdent){
+        query_.productIdent = this.query.productIdent;
+      }
+
+      this.loading = true;
+      getQualificationExecuteAnalysis(
+        page.currentPage,
+        page.pageSize,
+        query_
+      ).then(res => {
+        this.data = res.data.data.records;
+        this.loading = false;
+        this.page.total = res.data.data.total;
+        // this.selectionClear();
+      });
     },
   },
 };