diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/millexecute/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/millexecute/index.vue
index 317fb35..e31fa7b 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/biz/millexecute/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/millexecute/index.vue
@@ -41,33 +41,6 @@
             />
           </el-select>
         </el-form-item>
-
-        <el-form-item>
-          <el-button type="primary" @click="handleQuery">
-            <Icon icon="ep:search" class="mr-5px"/>
-            查询
-          </el-button>
-          <el-button type="primary" @click="handleNew">
-            <Icon icon="ep:plus" class="mr-5px"/>
-            新建
-          </el-button>
-          <el-button type="primary" :disabled="!selectedRow" @click="handleExecute">
-            <Icon icon="ep:video-play" class="mr-5px"/>
-            执行
-          </el-button>
-          <el-button type="primary" :disabled="!canPause" @click="handlePause">
-            <Icon icon="ep:video-pause" class="mr-5px"/>
-            暂停
-          </el-button>
-          <el-button type="primary" :disabled="!canComplete" @click="handleComplete">
-            <Icon icon="ep:check" class="mr-5px"/>
-            完成
-          </el-button>
-          <el-button type="danger" :disabled="!selectedRow" @click="handleCancel">
-            <Icon icon="ep:close" class="mr-5px"/>
-            取消
-          </el-button>
-        </el-form-item>
       </el-form>
 
       <!-- 班次信息 - 右上角 -->
@@ -94,7 +67,31 @@
 
   <!-- 表1 - 生产计划 -->
   <ContentWrap>
-    <div style="font-weight: bold; margin-bottom: 10px; font-size: 14px;">生产计划</div>
+    <div style="display: flex; align-items: center; gap: 12px; margin-bottom: 10px;">
+      <span style="font-weight: bold; font-size: 14px;">生产计划</span>
+      <div>
+        <el-button type="primary" @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px"/>
+          查询
+        </el-button>
+        <el-button type="primary" :disabled="!selectedRow" @click="handleExecute">
+          <Icon icon="ep:video-play" class="mr-5px"/>
+          执行
+        </el-button>
+        <el-button type="primary" :disabled="!canPause" @click="handlePause">
+          <Icon icon="ep:video-pause" class="mr-5px"/>
+          暂停
+        </el-button>
+        <el-button type="primary" :disabled="!canComplete" @click="handleComplete">
+          <Icon icon="ep:check" class="mr-5px"/>
+          完成
+        </el-button>
+        <el-button type="danger" :disabled="!selectedRow" @click="handleCancel">
+          <Icon icon="ep:close" class="mr-5px"/>
+          取消
+        </el-button>
+      </div>
+    </div>
     <el-table
       v-loading="loading"
       :data="planList"
@@ -103,7 +100,7 @@
       border
       highlight-current-row
       height="300px"
-      @current-change="handleCurrentChange"
+      @row-click="handleRowClick"
       :cell-style="getCellStyle"
     >
       <el-table-column label="序号" align="center" type="index" width="60" fixed="left"/>
@@ -159,15 +156,35 @@
           @current-change="handleOutputCurrentChange"
         >
           <el-table-column label="序号" align="center" type="index" width="60"/>
-          <el-table-column label="物料名称" align="center" prop="mtrlName" width="140"/>
-          <el-table-column label="物料类型" align="center" prop="mtrlTypeName" width="90"/>
-          <el-table-column label="产出数量" align="center" prop="outputQty" width="100"/>
-          <el-table-column label="单位" align="center" prop="unit" width="70"/>
-          <el-table-column label="备注" align="center" prop="remark" min-width="120"/>
+          <el-table-column label="物料名称" align="center" prop="materialName" width="140"/>
+          <el-table-column label="采集数量" align="center" prop="atoQty" width="100"/>
+          <el-table-column prop="outQty" align="center" width="150">
+            <template #header>
+              <span>产出数量(<span style="color: red">*</span>)</span>
+            </template>
+            <template #default="scope">
+              <el-input
+                clearable
+                v-model="scope.row.outQty"
+                type="text"
+                inputmode="decimal"
+                min="0"
+                oninput="this.value=this.value.replace(/[^0-9.]/g,'').replace(/\.{2,}/g,'.').replace(/^(\d+)\.(\d{2}).*$/,'$1.$2')"
+                class="!w-240px"
+                placeholder="请输入产出数量"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column label="物料类型" align="center" prop="matType" width="90"/>
+          <el-table-column label="批次号" align="center" prop="lotNo" width="90"/>
+          <el-table-column label="物料编码" align="center" prop="materialCode" width="120"/>
+          <el-table-column label="仓库" align="center" prop="storeHouseName" min-width="120"/>
+          <el-table-column label="库区" align="center" prop="storeAreaName" min-width="120"/>
+          <el-table-column label="计划号" align="center" prop="planNo" min-width="120"/>
         </el-table>
       </el-col>
 
-      <!-- 表2 - 工艺参数 -->
+      <!-- 表2 - 工艺参数（固定列：行=采集记录，列=固定参数字段） -->
       <el-col :span="10">
         <div style="display: flex; align-items: center; margin-bottom: 10px;">
           <span style="font-weight: bold; font-size: 14px; margin-right: 15px;">工艺参数</span>
@@ -175,23 +192,35 @@
         </div>
         <el-table
           v-loading="paramLoading"
-          :data="paramList"
+          :data="techParamData?.actDataRows || []"
           :stripe="true"
           :show-overflow-tooltip="true"
           height="280px"
           border
-          :cell-style="paramCellStyle"
         >
           <el-table-column label="序号" align="center" type="index" width="60"/>
-          <el-table-column label="参数名称" align="center" prop="paramName" width="100"/>
-          <el-table-column label="单位" align="center" prop="unit" width="60"/>
-          <el-table-column label="标准值" align="center" prop="stdValue" width="70"/>
-          <el-table-column label="下限" align="center" prop="lowerLimit" width="60"/>
-          <el-table-column label="上限" align="center" prop="upperLimit" width="60"/>
-          <el-table-column label="最新值" align="center" width="80">
+          <el-table-column label="采集时间" align="center" width="150">
             <template #default="scope">
-              <span :style="scope.row.outOfRange ? { color: 'red', fontWeight: 'bold' } : {}">
-                {{ scope.row.actValue1 || '-' }}
+              {{ formatDateTime(scope.row.collectTime) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="班次" align="center" prop="shiftCd" width="80">
+            <template #default="scope">
+              <dict-tag :type="DICT_TYPE.SHIFT_SCHEDULE" :value="scope.row.shiftCd"/>
+            </template>
+          </el-table-column>
+
+            <!-- 固定参数列：磨机电流、磨机转速、出粉温度、进风温度、磨机出口负压 -->
+          <el-table-column
+            v-for="param in fixedParamColumns"
+            :key="param.fieldKey"
+            :label="param.label"
+            align="center"
+            width="150"
+          >
+            <template #default="scope">
+              <span :style="getFixedParamCellTextStyle(scope.row, param.fieldKey, param.paramName)">
+                {{ scope.row.values?.[param.fieldKey] ?? '-' }}
               </span>
             </template>
           </el-table-column>
@@ -202,8 +231,8 @@
 
   <!-- 班次更新弹窗 -->
   <el-dialog v-model="shiftDialogVisible" title="班次更新" width="400px" :close-on-click-modal="false">
-    <el-form :model="shiftForm" label-width="100px" ref="shiftFormRef">
-      <el-form-item label="生产日期" prop="proDate" required>
+    <el-form :model="shiftForm" :rules="shiftFormRules" label-width="100px" ref="shiftFormRef">
+      <el-form-item label="生产日期" prop="proDate">
         <el-date-picker
           v-model="shiftForm.proDate"
           value-format="YYYY-MM-DD"
@@ -212,8 +241,8 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="班次" prop="shiftCd" required>
-        <el-select v-model="shiftForm.shiftCd" placeholder="请选择班次" class="!w-240px">
+      <el-form-item label="班次" prop="shiftCd">
+        <el-select v-model="shiftForm.shiftCd" placeholder="请选择班次" class="!w-240px"  clearable>
           <el-option
             v-for="dict in getStrDictOptions(DICT_TYPE.SHIFT_SCHEDULE)"
             :key="dict.value"
@@ -222,8 +251,8 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="班组" prop="teamName" required>
-        <el-select v-model="shiftForm.teamName" placeholder="请选择班组" class="!w-240px">
+      <el-form-item label="班组" prop="teamName">
+        <el-select v-model="shiftForm.teamName" placeholder="请选择班组" class="!w-240px" clearable>
           <el-option
             v-for="dict in getStrDictOptions(DICT_TYPE.TEAM_OR_GROUP)"
             :key="dict.value"
@@ -239,124 +268,97 @@
     </template>
   </el-dialog>
 
-  <!-- 工艺参数详情弹窗 -->
-  <el-dialog v-model="paramDialogVisible" title="工艺参数详情" width="1200px" :close-on-click-modal="false">
+  <!-- 工艺参数详情弹窗（工艺参数-1.1 非全屏） -->
+  <el-dialog v-model="paramDialogVisible" title="工艺参数-1.1" width="1200px" :close-on-click-modal="false">
+    <!-- 搜索区域 -->
+    <div style="display: flex; align-items: center; gap: 12px; margin-bottom: 16px;">
+      <el-form-item label="采集日期" style="margin-bottom: 0;">
+        <el-date-picker
+          v-model="paramDetailForm.dateRange"
+          type="daterange"
+          value-format="YYYY-MM-DD"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          class="!w-280px"
+        />
+      </el-form-item>
+      <el-form-item label="机台名称" style="margin-bottom: 0;">
+        <el-input v-model="paramDetailForm.machineName" placeholder="请输入机台名称" class="!w-180px" disabled />
+      </el-form-item>
+      <el-button type="primary" @click="handleParamDetailQuery">
+        <Icon icon="ep:search" class="mr-5px"/>
+        查询
+      </el-button>
+      <el-button @click="paramDialogVisible = false">
+        取消
+      </el-button>
+    </div>
+
+    <!-- 数据表格：行=采集记录(tpo_mill_param_act)，列=参数字段 -->
     <el-table
       v-loading="paramDialogLoading"
-      :data="paramDialogList"
+      :data="paramDetailData.rows"
       :stripe="true"
       :show-overflow-tooltip="true"
-      height="400px"
+      height="420px"
       border
-      :cell-style="paramDialogCellStyle"
     >
-      <el-table-column label="参数名称" align="center" prop="paramName" width="100" fixed/>
-      <el-table-column label="单位" align="center" prop="unit" width="70" fixed/>
-      <el-table-column label="标准值" align="center" prop="stdValue" width="80" fixed/>
-      <el-table-column label="下限" align="center" prop="lowerLimit" width="70" fixed/>
-      <el-table-column label="上限" align="center" prop="upperLimit" width="70" fixed/>
-      <el-table-column
-        v-for="(col, index) in paramColumns"
-        :key="index"
-        :label="col.label"
-        align="center"
-        width="100"
-      >
-        <el-table-column :label="col.timeLabel" align="center" width="100">
-          <template #default="scope">
-            <span :style="getCellStyle1(scope.row, index, 'actValue')">
-              {{ scope.row[`actValue${index + 1}`] || '-' }}
-            </span>
-          </template>
-        </el-table-column>
-        <el-table-column label="时间" align="center" width="100">
-          <template #default="scope">
-            {{ scope.row[`collectTime${index + 1}`] || '-' }}
-          </template>
-        </el-table-column>
+      <el-table-column label="序号" align="center" type="index" width="60" fixed/>
+      <el-table-column label="机台名称" align="center" prop="machineName" width="120"/>
+      <el-table-column label="采集时间" align="center" width="160">
+        <template #default="scope">
+          {{ formatDateTime(scope.row.collectTime) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="生产计划号" align="center" prop="planNo" width="140"/>
+      <el-table-column label="磨机电流" align="center" prop="grndMacCurr" width="110">
+        <template #default="scope">
+          <span :style="getParamDetailCellStyle(scope.row, 'grndMacCurr')">
+            {{ scope.row.grndMacCurr ?? '-' }}
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column label="磨机速度" align="center" prop="grndMacSpeed" width="110">
+        <template #default="scope">
+          <span :style="getParamDetailCellStyle(scope.row, 'grndMacSpeed')">
+            {{ scope.row.grndMacSpeed ?? '-' }}
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column label="出粉温度" align="center" prop="outPowTemp" width="110">
+        <template #default="scope">
+          <span :style="getParamDetailCellStyle(scope.row, 'outPowTemp')">
+            {{ scope.row.outPowTemp ?? '-' }}
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column label="进风温度" align="center" prop="inAirTemp" width="110">
+        <template #default="scope">
+          <span :style="getParamDetailCellStyle(scope.row, 'inAirTemp')">
+            {{ scope.row.inAirTemp ?? '-' }}
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column label="磨机出口负压" align="center" prop="grndOutPress" width="130">
+        <template #default="scope">
+          <span :style="getParamDetailCellStyle(scope.row, 'grndOutPress')">
+            {{ scope.row.grndOutPress ?? '-' }}
+          </span>
+        </template>
       </el-table-column>
     </el-table>
   </el-dialog>
 
-  <!-- 新建弹窗 -->
-  <el-dialog v-model="saveDialogVisible" title="新建磨机执行" width="600px" :close-on-click-modal="false">
-    <el-form :model="saveForm" label-width="100px" ref="saveFormRef">
-      <el-form-item label="机台" prop="machineId" required>
-        <el-select v-model="saveForm.machineId" placeholder="请选择机台" class="!w-480px" @change="handleSaveMachineChange">
-          <el-option
-            v-for="item in allMachineOptions"
-            :key="item.machineId"
-            :label="item.machineName"
-            :value="item.machineId"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="生产日期" prop="proDate" required>
-        <el-date-picker
-          v-model="saveForm.proDate"
-          value-format="YYYY-MM-DD"
-          type="date"
-          placeholder="选择生产日期"
-          class="!w-480px"
-        />
-      </el-form-item>
-      <el-form-item label="班次" prop="shiftCd" required>
-        <el-select v-model="saveForm.shiftCd" placeholder="请选择班次" class="!w-480px">
-          <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.SHIFT_SCHEDULE)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="班组" prop="teamId" required>
-        <el-select v-model="saveForm.teamId" placeholder="请选择班组" class="!w-480px">
-          <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.TEAM_OR_GROUP)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="生产计划" prop="planNo">
-        <el-select v-model="saveForm.planNo" placeholder="请选择生产计划（可选）" clearable class="!w-480px">
-          <el-option
-            v-for="item in planOptions"
-            :key="item.planNo"
-            :label="item.planNo"
-            :value="item.planNo"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="执行抬头单" prop="headNo">
-        <el-input v-model="saveForm.headNo" placeholder="请输入执行抬头单" class="!w-480px"/>
-      </el-form-item>
-      <el-divider content-position="left">产出信息</el-divider>
-      <el-form-item v-for="(item, index) in saveForm.outputList" :key="index">
-        <div style="display: flex; align-items: center; gap: 10px; width: 100%;">
-          <el-input v-model="item.mtrlName" placeholder="物料名称" style="width: 150px;" disabled/>
-          <el-input-number v-model="item.outputQty" :min="0" placeholder="产出数量" style="width: 120px;"/>
-          <el-input v-model="item.remark" placeholder="备注" style="width: 150px;"/>
-          <el-button type="danger" @click="removeOutputItem(index)">删除</el-button>
-        </div>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" plain @click="addOutputItem">添加产出</el-button>
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <el-button @click="saveDialogVisible = false">取消</el-button>
-      <el-button type="primary" @click="handleSave">保存</el-button>
-    </template>
-  </el-dialog>
+
 </template>
 
 <script setup lang="tsx">
 import * as MillExecuteApi from '@/api/biz/millexecute'
+import * as MachineParamApi from '@/api/biz/machineparam'
 import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 import {dateFormatter2, formatDate} from '@/utils/formatTime'
+import { onBeforeUnmount, nextTick } from 'vue'
 
 const message = useMessage()
 defineOptions({ name: 'MillExecute' })
@@ -367,11 +369,43 @@ const outputLoading = ref(false)
 const paramLoading = ref(false)
 const paramDialogLoading = ref(false)
 
+// 工艺参数自动刷新定时器
+const techParamTimer = ref<ReturnType<typeof setInterval> | null>(null)
+const startTechParamRefresh = async () => {
+  // 停止之前的定时器
+  stopTechParamRefresh()
+  if (!queryParams.machineId) return
+  try {
+    const machineParam = await MachineParamApi.getMachineParamByMachineId(queryParams.machineId)
+    const cycle = machineParam?.collectCycle
+    if (cycle && cycle > 0) {
+      techParamTimer.value = setInterval(() => {
+        loadTechParam()
+      }, cycle *  60 * 1000)
+    }
+  } catch {
+    // 获取采集周期失败，不做自动刷新
+  }
+}
+const stopTechParamRefresh = () => {
+  if (techParamTimer.value) {
+    clearInterval(techParamTimer.value)
+    techParamTimer.value = null
+  }
+}
+
 // 列表数据
 const planList = ref<MillExecuteApi.MillExecutePlanVO[]>([])
 const outputList = ref<MillExecuteApi.MillExecuteOutputVO[]>([])
-const paramList = ref<MillExecuteApi.MillExecuteTechParamVO[]>([])
-const paramDialogList = ref<MillExecuteApi.MillExecuteTechParamVO[]>([])
+const paramList = ref<MillExecuteApi.TechParamConfigVO[]>([])
+
+// 工艺参数完整数据（包含 paramConfigs + actDataRows + machineInfo）
+const techParamData = ref<MillExecuteApi.MillExecuteTechParamDataVO | null>(null)
+const paramDialogData = ref<MillExecuteApi.MillExecuteTechParamDataVO>({
+  machineInfo: null,
+  paramConfigs: [],
+  actDataRows: []
+})
 
 // 下拉选项
 const lineOptions = ref<MillExecuteApi.LineOption[]>([])
@@ -397,7 +431,7 @@ const queryParams = reactive({
 // 根据产线过滤机台
 const filteredMachineOptions = computed(() => {
   if (!queryParams.lineId) {
-    return machineOptions.value
+    return []
   }
   return machineOptions.value.filter(item => item.lineId === queryParams.lineId)
 })
@@ -405,33 +439,45 @@ const filteredMachineOptions = computed(() => {
 // 所有机台选项（用于新建）
 const allMachineOptions = computed(() => machineOptions.value)
 
-// 动态生成表2列
-const paramColumns = computed(() => {
-  if (paramDialogList.value.length === 0) return []
-  const firstRow = paramDialogList.value[0]
-  const columns = []
-  for (let i = 1; i <= 10; i++) {
-    const actValue = firstRow[`actValue${i}`]
-    if (actValue !== null && actValue !== undefined && actValue !== '') {
-      columns.push({
-        label: `值${i}`,
-        timeLabel: `采集时间${i}`,
-        valueKey: `actValue${i}`,
-        timeKey: `collectTime${i}`
-      })
-    }
-  }
-  return columns
+/**
+ * 表2固定参数列定义（与后端 PARAM_NAME_FIELD_MAP 对应）
+ * 扩展新参数只需在此数组中增加一项
+ */
+const fixedParamColumns = [
+  { label: '磨机电流', fieldKey: 'grndMacCurr', paramName: '磨机电流' },
+  { label: '磨机转速', fieldKey: 'grndMacSpeed', paramName: '磨机速度' },
+  { label: '出粉温度', fieldKey: 'outPowTemp', paramName: '出粉温度' },
+  { label: '进风温度', fieldKey: 'inAirTemp', paramName: '进风温度' },
+  { label: '磨机出口负压', fieldKey: 'grndOutPress', paramName: '磨机出口负压' }
+]
+
+/**
+ * 动态生成表2的值列头（基于采集数据条数）- 已弃用，保留供弹窗参考
+ * 返回 [{ label: '值1' }, { label: '值2' }, ...]
+ */
+const paramActColumns = computed(() => {
+  const data = techParamData.value
+  if (!data || !data.actDataRows) return []
+  return data.actDataRows.map((_, idx) => ({
+    label: `值${idx + 1}`,
+    collectTime: data.actDataRows[idx]?.collectTime
+  }))
 })
 
 // 是否可以暂停（执行中才能暂停）
 const canPause = computed(() => {
-  return selectedRow.value && selectedRow.value.machineProStatus === '2'
+  return selectedRow.value && (selectedRow.value.machineProStatus === '执行中'
+    || selectedRow.value.machineProStatus === '2')
 })
 
 // 是否可以完成（执行中或暂停才能完成）
 const canComplete = computed(() => {
-  return selectedRow.value && (selectedRow.value.machineProStatus === '2' || selectedRow.value.machineProStatus === '4')
+  return selectedRow.value && (
+    selectedRow.value.machineProStatus === '执行中'
+    || selectedRow.value.machineProStatus === '2'
+    || selectedRow.value.machineProStatus === '暂停'
+    || selectedRow.value.machineProStatus === '4'
+  )
 })
 
 // 单元格样式（执行中浅蓝底色）
@@ -442,55 +488,83 @@ const getCellStyle = ({ row }) => {
   return {}
 }
 
-// 获取单元格样式（超范围标红）
-const getCellStyle1 = (row: any, index: number, valueKey: string) => {
-  const val = row[`${valueKey}${index + 1}`]
-  if (!val) return {}
-  const numVal = parseFloat(val)
-  if (isNaN(numVal)) return {}
-  const upper = parseFloat(row.upperLimit)
-  const lower = parseFloat(row.lowerLimit)
-  if (!isNaN(upper) && !isNaN(lower) && (numVal > upper || numVal < lower)) {
-    return { color: 'red', fontWeight: 'bold' }
-  }
-  return {}
-}
-
-// 工艺参数单元格样式
-const paramCellStyle = ({ column, row }) => {
-  const field = column.property
-  if (!field || field === 'paramName' || field === 'unit' || field === 'stdValue' ||
-      field === 'lowerLimit' || field === 'upperLimit') {
+/**
+ * 获取表2/弹窗参数单元格文本样式（超范围标红）
+ * @param row 参数行配置（TechParamConfigVO）
+ * @param colIdx 列索引（对应 actDataRows 的位置）
+ */
+const getParamCellTextStyle = (row: MillExecuteApi.TechParamConfigVO, colIdx: number) => {
+  if (!row || !row.outOfRangeFlags || colIdx >= row.outOfRangeFlags.length) {
     return {}
   }
-  if (row.outOfRange) {
-    return { color: 'red', fontWeight: 'bold' }
+  if (row.outOfRangeFlags[colIdx]) {
+    return { color: 'red', fontWeight: 'bold', backgroundColor: '#ffcccc' }
   }
   return {}
 }
 
-// 工艺参数详情弹窗单元格样式
-const paramDialogCellStyle = ({ column, row }) => {
-  // 检查是否是数值列
+/**
+ * 获取表2固定列单元格文本样式（超范围标红）
+ * 通过 actDataRows 行索引 + fieldKey 反查 paramConfigs 中对应的超范围标志
+ * @param actRow 采集数据行（TechParamActDataVO）
+ * @param fieldKey 字段名（如 'grndMacCurr'）
+ * @param paramName 参数中文名（用于匹配 paramConfigs）
+ */
+const getFixedParamCellTextStyle = (
+  actRow: MillExecuteApi.TechParamActDataVO,
+  fieldKey: string,
+  paramName: string
+) => {
+  const data = techParamData.value
+  if (!data?.paramConfigs || !data.actDataRows) return {}
+  // 找到当前行在 actDataRows 中的索引
+  const rowIndex = data.actDataRows.findIndex(r => r.id === actRow.id)
+  if (rowIndex < 0) return {}
+  // 在 paramConfigs 中找到该参数的配置行
+  const configRow = data.paramConfigs.find(p =>
+    p.fieldKey === fieldKey || p.paramName === paramName
+  )
+  if (!configRow?.outOfRangeFlags || rowIndex >= configRow.outOfRangeFlags.length) {
+    return {}
+  }
+  if (configRow.outOfRangeFlags[rowIndex]) {
+    return { color: '#fff', fontWeight: 600, backgroundColor: '#ef4444' }
+  }
+  return {}
+}
+
+/** 格式化日期时间字符串 */
+const formatDateTime = (val?: string) => {
+  if (!val) return '-'
+  try {
+    // 处理后端 LocalDateTime 格式
+    const d = new Date(val)
+    if (isNaN(d.getTime())) return val
+    const pad = (n: number) => String(n).padStart(2, '0')
+    return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}:${pad(d.getSeconds())}`
+  } catch {
+    return val
+  }
+}
+
+/**
+ * 工艺参数详情弹窗单元格样式
+ * @param mode 'rowMode'=行是参数配置(表2展开), 'colMode'=行是采集记录(弹窗模式2)
+ */
+const paramDialogCellStyle = ({ column, row }: any, mode?: string) => {
+  // 只对数值列做超范围判断
   const label = column.label || ''
-  if (label.startsWith('值')) {
-    const val = row[column.property]
-    if (!val) return {}
-    const numVal = parseFloat(val)
-    if (isNaN(numVal)) return {}
-    const upper = parseFloat(row.upperLimit)
-    const lower = parseFloat(row.lowerLimit)
-    if (!isNaN(upper) && !isNaN(lower) && (numVal > upper || numVal < lower)) {
-      return { color: 'red', fontWeight: 'bold', backgroundColor: '#ffcccc' }
-    }
+  if (mode === 'rowMode' && label === '值') {
+    // 从column的父级获取索引比较麻烦，这里通过 property 判断
+    // 由于使用了动态列，直接返回即可，颜色由 template 内的 getParamCellTextStyle 控制
   }
   return {}
 }
 
 /** 查询生产计划列表 */
 const getPlanList = async () => {
-  if (!queryParams.machineId) {
-    message.warning('机台不能为空，请确认！')
+  if (!queryParams.machineId || !queryParams.lineId) {
+    message.warning('产线、机台不能为空，请确认')
     return
   }
   if (!defaultDate.value) {
@@ -506,12 +580,22 @@ const getPlanList = async () => {
     planList.value = await MillExecuteApi.getPlanList({
       machineId: queryParams.machineId,
       proDate: defaultDate.value,
-      shiftCd: defaultShiftCd.value
+      shiftCd: defaultShiftCd.value,
     })
-    // 清空选中及子表
-    selectedRow.value = null
-    outputList.value = []
-    selectedOutputRow.value = null
+    // 查找列表中是否有执行中的计划，有则自动选中
+    const executingPlan = planList.value.find(item =>
+      item.machineProStatus === '执行中' || item.machineProStatus === '2'
+    )
+    if (executingPlan) {
+      handleRowClick(executingPlan!)
+    } else {
+      // 无执行中的计划，清空选中及子表
+      selectedRow.value = null
+      outputList.value = []
+      paramList.value = []
+      techParamData.value = null
+      selectedOutputRow.value = null
+    }
   } finally {
     loading.value = false
   }
@@ -520,30 +604,45 @@ const getPlanList = async () => {
 /** 产线变化 */
 const handleLineChange = () => {
   queryParams.machineId = undefined
+  stopTechParamRefresh()
 }
 
-/** 选中生产计划行 */
-const handleCurrentChange = (row: MillExecuteApi.MillExecutePlanVO | null) => {
+/** 点击生产计划行（支持重复点击刷新） */
+const handleRowClick = (row: MillExecuteApi.MillExecutePlanVO) => {
   selectedRow.value = row
   outputList.value = []
   paramList.value = []
+  techParamData.value = null
   selectedOutputRow.value = null
-  if (row?.machineName) {
-    loadOutputInfo(row)
-    loadTechParam(row)
-  }
+  if (!queryParams.machineId) return
+  loadOutputInfo(row)
+  loadTechParam(row)
 }
 
 /** 加载产出信息 */
 const loadOutputInfo = async (row: MillExecuteApi.MillExecutePlanVO) => {
-  if (!queryParams.machineId && !row.machineName) return
+  if (!queryParams.machineId) {
+    message.warning('机台不能为空，请确认')
+    return
+  }
+  if (!defaultDate.value) {
+    message.warning('生产日期不能为空，请确认！')
+    return
+  }
+  if (!defaultShiftCd.value) {
+    message.warning('班次不能为空，请确认！')
+    return
+  }
   outputLoading.value = true
   try {
     const machineId = queryParams.machineId || 0
-    const planNo = row.planNo || ''
+    const localDefaultDate = defaultDate.value
+    const localDefaultShiftCd = defaultShiftCd.value
     outputList.value = await MillExecuteApi.getOutputInfo({
       machineId,
-      planNo
+      planNo: row.planNo || '',
+      proDate: localDefaultDate,
+      shiftCd: localDefaultShiftCd
     })
   } catch {
     outputList.value = []
@@ -552,19 +651,38 @@ const loadOutputInfo = async (row: MillExecuteApi.MillExecutePlanVO) => {
   }
 }
 
-/** 加载工艺参数 */
-const loadTechParam = async (row: MillExecuteApi.MillExecutePlanVO) => {
-  if (!queryParams.machineId && !row.machineName) return
+/** 加载工艺参数 - 使用新的通用接口 */
+const loadTechParam = async (_row?: MillExecuteApi.MillExecutePlanVO) => {
+  if (!queryParams.machineId) {
+    message.warning('机台不能为空，请确认')
+    return
+  }
+  if (!defaultDate.value) {
+    message.warning('生产日期不能为空，请确认！')
+    return
+  }
+  if (!defaultShiftCd.value) {
+    message.warning('班次不能为空，请确认！')
+    return
+  }
   paramLoading.value = true
   try {
     const machineId = queryParams.machineId || 0
-    const planNo = row.planNo || ''
-    paramList.value = await MillExecuteApi.getTechParam({
+    const localDefaultDate = defaultDate.value
+    const localDefaultShiftCd = defaultShiftCd.value
+    const data = await MillExecuteApi.getTechParam({
       machineId,
-      planNo
+      proDate: localDefaultDate,
+      shiftCd: localDefaultShiftCd
     })
+    techParamData.value = data
+    // paramList 直接使用 paramConfigs（每行一个参数）
+    paramList.value = data.paramConfigs || []
+    // 数据加载成功后，根据机台采集周期启动自动刷新
+    startTechParamRefresh()
   } catch {
     paramList.value = []
+    techParamData.value = null
   } finally {
     paramLoading.value = false
   }
@@ -586,13 +704,36 @@ const handleExecute = async () => {
     message.warning('请选择需要执行的机台计划')
     return
   }
+  if (!queryParams.lineId || !queryParams.machineId) {
+    message.warning('产线、机台不能为空，请确认！')
+    return
+  }
+  if (!defaultDate.value || !defaultShiftCd.value) {
+    message.warning('生产日期或班次不能为空，请确认！')
+    return
+  }
   try {
     await message.confirm('确定要执行当前选择的生产计划吗？')
-    await MillExecuteApi.executePlanMachine(0) // TODO: 需要机台计划ID
+    await MillExecuteApi.executePlanMachine({
+      planNo: selectedRow.value.planNo,
+      machineId: queryParams.machineId!,
+      lineId: queryParams.lineId,
+      machineCd: selectedRow.value.machineCd,
+      machineName: selectedRow.value.machineName,
+      lineCd: '',
+      lineName: selectedRow.value.lineName,
+      proDate: defaultDate.value,
+      shiftCd: defaultShiftCd.value,
+      groupCd: defaultTeamName.value
+    })
     message.success('执行成功')
-    await getPlanList()
-  } catch {
-  }
+    // 自动选中当前计划并刷新子表
+    if (selectedRow.value) {
+      handleRowClick(selectedRow.value)
+    } else {
+      await getPlanList()
+    }
+  } catch {}
 }
 
 /** 暂停 */
@@ -601,13 +742,32 @@ const handlePause = async () => {
     message.warning('请选择需要暂停的机台计划')
     return
   }
+  if (!queryParams.lineId || !queryParams.machineId) {
+    message.warning('产线、机台不能为空，请确认！')
+    return
+  }
+  if (!defaultDate.value || !defaultShiftCd.value) {
+    message.warning('生产日期或班次不能为空，请确认！')
+    return
+  }
   try {
     await message.confirm('确定要暂停当前选择的生产计划吗？')
-    await MillExecuteApi.pausePlanMachine(0) // TODO: 需要机台计划ID
+    await MillExecuteApi.pausePlanMachine({
+      planNo: selectedRow.value.planNo,
+      machineId: queryParams.machineId!,
+      lineId: queryParams.lineId,
+      proDate: defaultDate.value,
+      shiftCd: defaultShiftCd.value,
+      groupCd: defaultTeamName.value
+    })
     message.success('暂停成功')
-    await getPlanList()
-  } catch {
-  }
+    // 自动选中当前计划并刷新子表
+    if (selectedRow.value) {
+      handleRowClick(selectedRow.value)
+    } else {
+      await getPlanList()
+    }
+  } catch {}
 }
 
 /** 完成 */
@@ -616,13 +776,32 @@ const handleComplete = async () => {
     message.warning('请选择需要完成的机台计划')
     return
   }
+  if (!queryParams.lineId || !queryParams.machineId) {
+    message.warning('产线、机台不能为空，请确认！')
+    return
+  }
+  if (!defaultDate.value || !defaultShiftCd.value) {
+    message.warning('生产日期或班次不能为空，请确认！')
+    return
+  }
   try {
     await message.confirm('确定要完成当前选择的生产计划吗？')
-    await MillExecuteApi.completePlanMachine(0) // TODO: 需要机台计划ID
+    await MillExecuteApi.completePlanMachine({
+      planNo: selectedRow.value.planNo,
+      machineId: queryParams.machineId!,
+      lineId: queryParams.lineId,
+      proDate: defaultDate.value,
+      shiftCd: defaultShiftCd.value,
+      groupCd: defaultTeamName.value
+    })
     message.success('完成成功')
-    await getPlanList()
-  } catch {
-  }
+    // 自动选中当前计划并刷新子表
+    if (selectedRow.value) {
+      handleRowClick(selectedRow.value)
+    } else {
+      await getPlanList()
+    }
+  } catch {}
 }
 
 /** 取消 */
@@ -631,17 +810,48 @@ const handleCancel = async () => {
     message.warning('请选择需要取消的机台计划')
     return
   }
+  if (!queryParams.lineId || !queryParams.machineId) {
+    message.warning('产线、机台不能为空，请确认！')
+    return
+  }
+  if (!defaultDate.value || !defaultShiftCd.value) {
+    message.warning('生产日期或班次不能为空，请确认！')
+    return
+  }
   try {
     await message.confirm('确定要取消执行当前选择的生产计划吗？')
-    await MillExecuteApi.cancelPlanMachine(0) // TODO: 需要机台计划ID
+    await MillExecuteApi.cancelPlanMachine({
+      planNo: selectedRow.value.planNo,
+      machineId: queryParams.machineId!,
+      lineId: queryParams.lineId,
+      proDate: defaultDate.value,
+      shiftCd: defaultShiftCd.value,
+      groupCd: defaultTeamName.value
+    })
     message.success('取消成功')
-    await getPlanList()
-  } catch {
-  }
+    // 自动选中当前计划并刷新子表
+    if (selectedRow.value) {
+      handleRowClick(selectedRow.value)
+    } else {
+      await getPlanList()
+    }
+  } catch {}
 }
 
 /** 自动采集 */
 const handleAutoCollect = async () => {
+  if (!queryParams.lineId || !queryParams.machineId) {
+    message.warning('产线、机台不能为空，请确认！')
+    return
+  }
+  if (!defaultDate.value || !defaultShiftCd.value) {
+    message.warning('生产日期或班次不能为空，请确认！')
+    return
+  }
+  if (!outputList.value || outputList.value.length === 0) {
+    message.warning('产出信息列表为空，请刷新数据！')
+    return
+  }
   if (!selectedRow.value) {
     message.warning('请先选择生产计划')
     return
@@ -651,12 +861,115 @@ const handleAutoCollect = async () => {
 
 /** 产出确认 */
 const handleOutputConfirm = async () => {
-  message.info('产出确认功能开发中')
+  if (!selectedRow.value) {
+    message.warning('请先选择生产计划')
+    return
+  }
+  // (1) 校验产线/机台
+  if (!queryParams.lineId || !queryParams.machineId) {
+    message.warning('产线、机台不能为空，请确认！')
+    return
+  }
+  // (2) 校验日期/班次
+  if (!defaultDate.value || !defaultShiftCd.value) {
+    message.warning('生产日期或班次不能为空，请确认！')
+    return
+  }
+  // (3) 校验产出列表不为空
+  if (!outputList.value || outputList.value.length === 0) {
+    message.warning('产出信息列表为空，请刷新数据！')
+    return
+  }
+  // (4) 循环管控：产出数量不能为空或0
+  for (const item of outputList.value) {
+    const qty = Number(item.outQty)
+    if (item.outQty === null || item.outQty === '' || isNaN(qty) || qty <= 0) {
+      message.warning(`该物料(${item.materialName})产出数量等于0，请确认！`)
+      return
+    }
+  }
+  try {
+    await message.confirm('确定要确认当前产出信息吗？')
+    // 构建请求参数：表3所有行作为outputItems
+    const outputItems = outputList.value.map(item => ({
+      id: item.id,
+      matType: item.matTypeRaw,
+      materialName: item.materialName,
+      materialCode: item.materialCode,
+      spec: (item as any).spec,
+      unit: (item as any).unit,
+      outQty: item.outQty,
+      atoQty: item.atoQty,
+      dataSource: item.dataSource
+    }))
+    await MillExecuteApi.confirmOutput({
+      lineId: queryParams.lineId!,
+      lineName: selectedRow.value.lineName,
+      lineCd: '',
+      machineId: queryParams.machineId!,
+      machineName: selectedRow.value.machineName,
+      machineCd: selectedRow.value.machineCd,
+      proDate: defaultDate.value,
+      shiftCd: defaultShiftCd.value,
+      groupCd: defaultTeamName.value,
+      planNo: selectedRow.value.planNo,
+      planId: selectedRow.value.id,
+      outputItems
+    })
+    message.success('产出确认成功')
+    // 刷新产出信息和计划列表
+    if (selectedRow.value) {
+      handleRowClick(selectedRow.value)
+    } else {
+      await getPlanList()
+    }
+  } catch {}
 }
 
 /** 产出取消 */
 const handleOutputCancel = async () => {
-  message.info('产出取消功能开发中')
+  if (!selectedRow.value) {
+    message.warning('请先选择生产计划')
+    return
+  }
+  // (1) 校验产线/机台
+  if (!queryParams.lineId || !queryParams.machineId) {
+    message.warning('产线、机台不能为空，请确认！')
+    return
+  }
+  // (2) 校验日期/班次
+  if (!defaultDate.value || !defaultShiftCd.value) {
+    message.warning('生产日期或班次不能为空，请确认！')
+    return
+  }
+  // (3) 校验planNo不为空
+  if (!selectedRow.value.planNo) {
+    message.warning('选择执行计划为空，请选择！')
+    return
+  }
+  try {
+    await message.confirm('确定要取消当前产出信息吗？')
+    await MillExecuteApi.cancelOutput({
+      lineId: queryParams.lineId!,
+      lineName: selectedRow.value.lineName,
+      lineCd: '',
+      machineId: queryParams.machineId!,
+      machineName: selectedRow.value.machineName,
+      machineCd: selectedRow.value.machineCd,
+      proDate: defaultDate.value,
+      shiftCd: defaultShiftCd.value,
+      groupCd: defaultTeamName.value,
+      planNo: selectedRow.value.planNo,
+      planId: selectedRow.value.id
+    })
+    message.success('产出取消成功')
+    // 刷新产出信息和计划列表
+    if (selectedRow.value) {
+      handleRowClick(selectedRow.value)
+    } else {
+      await getPlanList()
+    }
+  } catch {}
 }
 
 // ================== 班次更新弹窗 ==================
@@ -668,11 +981,21 @@ const shiftForm = reactive({
   teamName: ''
 })
 
+// 班次更新弹窗校验规则
+const shiftFormRules = {
+  proDate: [{ required: true, message: '生产日期不能为空', trigger: 'change' }],
+  shiftCd: [{ required: true, message: '班次不能为空', trigger: 'change' }],
+  teamName: [{ required: true, message: '班组不能为空', trigger: 'change' }]
+}
+
 const openShiftDialog = () => {
   shiftForm.proDate = defaultDate.value || formatDate(new Date(), 'YYYY-MM-DD')
   shiftForm.shiftCd = defaultShiftCd.value || ''
   shiftForm.teamName = defaultTeamName.value || ''
   shiftDialogVisible.value = true
+  nextTick(() => {
+    shiftFormRef.value?.clearValidate()
+  })
 }
 
 const handleSaveShift = () => {
@@ -698,29 +1021,82 @@ const handleSaveShift = () => {
 // ================== 工艺参数详情弹窗 ==================
 const paramDialogVisible = ref(false)
 
-const openParamDialog = async () => {
-  if (!selectedRow.value) {
-    message.warning('请先选择生产计划')
+/** 参数详情查询表单 */
+const paramDetailForm = reactive({
+  dateRange: [] as string[],
+  machineName: ''
+})
+
+/** 参数详情数据 */
+const paramDetailData = ref<MillExecuteApi.MillExecuteParamDetailVO>({
+  machineName: '',
+  paramConfigs: [],
+  rows: []
+})
+
+/**
+ * 打开参数详情弹窗
+ * 管控：如果界面.机台=null 则提示"必须输入机台信息，请确认！"
+ */
+const openParamDialog = () => {
+  // (1) 校验机台是否已选择
+  if (!queryParams.machineId) {
+    message.warning('必须输入机台信息，请确认！')
     return
   }
+  // (2) 初始化表单：采集日期自动加载系统日期，机台名称从主界面带入
+  const today = formatDate(new Date(), 'YYYY-MM-DD')
+  paramDetailForm.dateRange = [today, today]
+  const selectedMachine = filteredMachineOptions.value.find(m => m.machineId === queryParams.machineId)
+  paramDetailForm.machineName = selectedMachine?.machineName || ''
+  // (3) 打开弹窗并立即查询
   paramDialogVisible.value = true
+  handleParamDetailQuery()
+}
+
+/**
+ * 查询按钮 - 根据采集日期、机台名称查询 tpo_mill_param_act
+ * 按采集时间降序排列，超范围单元格标红
+ */
+const handleParamDetailQuery = async () => {
+  if (!queryParams.machineId) {
+    message.warning('必须输入机台信息，请确认！')
+    return
+  }
+  if (!paramDetailForm.dateRange || paramDetailForm.dateRange.length !== 2) {
+    message.warning('请选择采集日期范围')
+    return
+  }
   paramDialogLoading.value = true
   try {
-    const machineId = queryParams.machineId || 0
-    const planNo = selectedRow.value.planNo || ''
-    paramDialogList.value = await MillExecuteApi.getTechParam({
-      machineId,
-      planNo
+    paramDetailData.value = await MillExecuteApi.getParamDetail({
+      machineId: queryParams.machineId,
+      startDate: paramDetailForm.dateRange[0],
+      endDate: paramDetailForm.dateRange[1]
     })
   } catch {
-    paramDialogList.value = []
+    paramDetailData.value = { machineName: '', paramConfigs: [], rows: [] }
   } finally {
     paramDialogLoading.value = false
   }
 }
 
+/**
+ * 获取参数详情表格单元格样式（超范围标红）
+ * @param row 采集数据行（ParamDetailRowVO）
+ * @param fieldKey 字段名（如 'grndMacCurr'）
+ */
+const getParamDetailCellStyle = (
+  row: MillExecuteApi.ParamDetailRowVO,
+  fieldKey: string
+) => {
+  if (!row?.outOfRangeMap || row.outOfRangeMap[fieldKey]) {
+    return { color: 'red', fontWeight: 'bold', backgroundColor: '#ffcccc' }
+  }
+  return {}
+}
+
 // ================== 新建弹窗 ==================
-const saveDialogVisible = ref(false)
 const saveFormRef = ref()
 const saveForm = reactive({
   machineId: undefined as number | undefined,
@@ -732,18 +1108,7 @@ const saveForm = reactive({
   outputList: [] as MillExecuteApi.OutputItem[]
 })
 
-const handleNew = () => {
-  saveForm.machineId = undefined
-  saveForm.proDate = defaultDate.value || formatDate(new Date(), 'YYYY-MM-DD')
-  saveForm.shiftCd = defaultShiftCd.value || ''
-  saveForm.teamId = ''
-  saveForm.planNo = ''
-  saveForm.headNo = ''
-  saveForm.outputList = []
-  // 加载可选的生产计划
-  loadPlanOptions()
-  saveDialogVisible.value = true
-}
+
 
 const loadPlanOptions = async () => {
   try {
@@ -800,8 +1165,7 @@ const handleSave = async () => {
     message.success('保存成功')
     saveDialogVisible.value = false
     await getPlanList()
-  } catch {
-  }
+  } catch {}
 }
 
 onMounted(async () => {
@@ -829,8 +1193,12 @@ onMounted(async () => {
     if (queryParams.machineId && defaultDate.value && defaultShiftCd.value) {
       await getPlanList()
     }
-  } catch {
-  }
+  } catch {}
+})
+
+// 组件卸载时清除定时器
+onBeforeUnmount(() => {
+  stopTechParamRefresh()
 })
 </script>