Merge branch 'master' of http://49.232.154.205:10100/liujingchao/klp-mono

apps/l2/src/views/l2/pdo/components/line.vue

@@ -53,22 +53,13 @@ export default {
         { label: '带钢速度', value: 'stripSpeed' },
         { label: '1#开卷机张力', value: 'tensionPorBr1' },
         { label: '2#开卷机张力', value: 'tensionPorBr2' },
-        { label: '清洗电压', value: 'cleaningVoltage' },
-        { label: '清洗电流', value: 'cleaningCurrent' },
-        { label: '碱液浓度', value: 'alkaliConcentration' },
-        { label: '碱液温度', value: 'alkaliTemperature' },
-        { label: '预热段出口板温', value: 'phfExitStripTemp' },
-        { label: '加热段出口板温', value: 'rtfExitStripTemp' },
-        { label: '冷却段出口板温', value: 'jcsExitStripTemp' },
-        { label: '均热段出口板温', value: 'scsExitStripTemp' },
-        { label: '锌锅温度', value: 'potTemperature' },
-        { label: '锌锅功率', value: 'zincPotPower' },
-        { label: '燃气消耗量', value: 'gasConsumption' },
-        { label: '冷却塔带钢温度', value: 'coolingTowerStripTemp' },
-        { label: '光整机张力', value: 'tensionBr5Tm' },
-        { label: '光整机出口速度', value: 'stripSpeedTmExit' },
-        { label: '拉矫机延伸率', value: 'tlElongation' },
-        { label: '拉矫机张力', value: 'tensionTlBr7' }
+        { label: 'BR1-BR2张力', value: 'tensionBr1Br2' },
+        { label: 'BR2-BR3张力', value: 'tensionBr2Br3' },
+        { label: '入口活套套量', value: 'celCapacity' },
+        { label: '出口活套套量', value: 'cxlCapacity' },
+        { label: 'PH炉温度', value: 'phFurnaceTemperatureActual' },
+        { label: 'NOF1炉温度', value: 'nof1FurnaceTemperatureActual' },
+        { label: 'NOF1炉控制输出', value: 'nof1FurnaceTemperatureControlOutput' }
       ],
       treeProps: {
         children: 'children',

apps/l2/src/views/l2/pdo/index.vue

@@ -37,7 +37,7 @@
 
     <!-- 卡片网格布局 -->
     <div v-loading="tableLoading">
-      <el-table :data="tableData" style="width: 100%" border stripe @row-click="handleRowClick" highlight-current-row height="300px">
+      <el-table :data="tableData" style="width: 100%" border stripe @row-click="handleRowClick" highlight-current-row>
         <el-table-column prop="exitMatId" label="成品卷号"></el-table-column>
         <el-table-column prop="entryMatId" label="来料卷号"></el-table-column>
         <el-table-column prop="planNo" label="计划单号"></el-table-column>
@@ -74,6 +74,18 @@
       <div v-if="tableData.length === 0 && !tableLoading" class="empty-data">
         <el-empty description="暂无数据"></el-empty>
       </div>
+      <!-- 分页组件 -->
+      <el-pagination
+        v-if="total > 0"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="queryForm.pageNum"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="queryForm.pageSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+        style="margin-top: 15px; text-align: right;"
+      ></el-pagination>
     </div>
 
     <div>
@@ -143,10 +155,17 @@ export default {
   data() {
     return {
       activeTab: 'basicInfo',
-      queryForm: { coilid: '', startDate: '', endDate: '' },
+      queryForm: { 
+        coilid: '', 
+        startDate: '', 
+        endDate: '',
+        pageNum: 1,
+        pageSize: 20
+      },
       printOpen: false,
       certificateVisible: false, // 质保书对话框显示状态
       tableData: [],
+      total: 0, // 总记录数
       tableLoading: false,
       btnLoading: false,
       dialogVisible: false,
@@ -171,27 +190,51 @@ export default {
     this.getPdoList()
   },
   methods: {
-    // 获取列表数据（保持不变）
+    // 获取列表数据（支持分页）
     getPdoList() {
       this.tableLoading = true
       getPdoList(this.queryForm).then(res => {
-        this.tableData = res.data.map(item => ({ ...item, deleteLoading: false }))
+        if (res.code === 200) {
+          // 处理分页数据
+          this.tableData = (res.rows || res.data || []).map(item => ({ ...item, deleteLoading: false }))
+          this.total = res.total || 0
+        } else {
+          this.$message.error(res.msg || '获取数据失败')
+          this.tableData = []
+          this.total = 0
+        }
       }).catch(err => {
         console.error(err)
         this.$message.error('获取数据失败')
+        this.tableData = []
+        this.total = 0
       }).finally(() => {
         this.tableLoading = false
         this.btnLoading = false
       })
     },
+    // 分页大小改变
+    handleSizeChange(val) {
+      this.queryForm.pageSize = val
+      this.queryForm.pageNum = 1 // 重置到第一页
+      this.getPdoList()
+    },
+    // 当前页改变
+    handleCurrentChange(val) {
+      this.queryForm.pageNum = val
+      this.getPdoList()
+    },
     // 查询（保持不变）
     handleQuery() {
       this.btnLoading = true;
+      this.queryForm.pageNum = 1; // 重置到第一页
       this.getPdoList()
     },
     // 重置（保持不变）
     handleReset() {
       this.$refs.queryForm.resetFields();
+      this.queryForm.pageNum = 1;
+      this.queryForm.pageSize = 20;
       this.getPdoList()
     },
     // 行点击（保持不变）

apps/l2/src/views/l2/track/rect.vue

@@ -907,7 +907,7 @@ import { getDriveSetupValue, getFurnaceSetupValue } from '@/api/l2/setupValue'
         return this.buildSectionMetrics('COAT', [
           'stripSpeedTmExit', 'avrCoatingWeightTop', 'avrCoatingWeightBottom', 
           'tmElongation', 'tlElongation', 'tensionBr6toBr7Br8', 'tensionBr8Tm', 
-          'tensionTmBr9', 'tlElongation'])
+          'tensionTmBr9'])
       },
       exitSectionMetrics() {
         return this.buildSectionMetrics('EXIT', ['speedExitSection', 'coilLength', 'cxlLength', 'cxlCapacity', 'tensionBr9Tr'])
@@ -1310,14 +1310,14 @@ import { getDriveSetupValue, getFurnaceSetupValue } from '@/api/l2/setupValue'
             title: '甩尾操作提示',
             type: 'warning',
             duration: 5000,
-            needAlert: true
+            needAlert: false
           },
           THROW_TAIL: {
             icon: '⚠️',
             title: '甩尾操作提示',
             type: 'warning',
             duration: 5000,
-            needAlert: true
+            needAlert: false
           },
           ALL_RETURN: {
             icon: '↩️',