diff --git a/src/api/l2/pdo.js b/src/api/l2/pdo.js
index f639514..69bc0f2 100644
--- a/src/api/l2/pdo.js
+++ b/src/api/l2/pdo.js
@@ -48,10 +48,10 @@ export function addPdo(data) {
* @param {number} operid 工序ID
* @returns {Promise}
*/
-export function getPdo(excoilid, operid) {
+export function getPdo(excoilid) {
return l2Request({
method: 'get',
- url: `/l2-api/api/pdo/get/${excoilid}/${operid}`
+ url: `/api/pdo/get/${excoilid}`
})
}
@@ -64,7 +64,7 @@ export function getPdo(excoilid, operid) {
export function deletePdo(excoilid, planId) {
return l2Request({
method: 'delete',
- url: `/l2-api/api/pdo/delete/${excoilid}/${planId}`
+ url: `/api/pdo/delete/${excoilid}/${planId}`
})
}
diff --git a/src/views/l2/log/index.vue b/src/views/l2/log/index.vue
index 6555f27..4650c58 100644
--- a/src/views/l2/log/index.vue
+++ b/src/views/l2/log/index.vue
@@ -37,15 +37,17 @@
-
+
-
+
-
+
-
+
-
+
+
+
diff --git a/src/views/l2/pdo/components/line.vue b/src/views/l2/pdo/components/line.vue
index 8f4e4b0..0715d78 100644
--- a/src/views/l2/pdo/components/line.vue
+++ b/src/views/l2/pdo/components/line.vue
@@ -45,7 +45,8 @@ export default {
props: {
enCoilID: {
type: String,
- required: true,
+ required: false,
+ default: ''
}
},
data() {
diff --git a/src/views/l2/pdo/index.vue b/src/views/l2/pdo/index.vue
index bbd9f1a..4c878a1 100644
--- a/src/views/l2/pdo/index.vue
+++ b/src/views/l2/pdo/index.vue
@@ -50,22 +50,16 @@
-
+
-
-
-
-
-
-
@@ -105,6 +99,14 @@
+
+
@@ -178,7 +180,8 @@ export default {
data() {
return {
activeTab: 'basicInfo',
- queryForm: { coilid: '', startDate: '', endDate: '' },
+ queryForm: { coilid: '', startDate: '', endDate: '', pageNum: 1, pageSize: 30 },
+ total: 0,
printOpen: false,
certificateVisible: false, // 质保书对话框显示状态 Quality certificate dialog visibility state
tableData: [],
@@ -210,7 +213,9 @@ export default {
getPdoList() {
this.tableLoading = true
getPdoList(this.queryForm).then(res => {
- this.tableData = res.data.map(item => ({ ...item, deleteLoading: false }))
+ const list = Array.isArray(res?.rows) ? res.rows : []
+ this.tableData = list.map(item => ({ ...item, deleteLoading: false }))
+ this.total = typeof res?.total === 'number' ? res.total : 0
}).catch(err => {
console.error(err)
this.$message.error('Failed to get data') // 获取数据失败
@@ -222,11 +227,14 @@ export default {
// 查询（保持不变） Query (unchanged)
handleQuery() {
this.btnLoading = true;
+ this.queryForm.pageNum = 1;
this.getPdoList()
},
// 重置（保持不变） Reset (unchanged)
handleReset() {
this.$refs.queryForm.resetFields();
+ this.queryForm.pageNum = 1;
+ this.queryForm.pageSize = 30;
this.getPdoList()
},
// 行点击（保持不变） Row click (unchanged)
diff --git a/src/views/l2/track/index.vue b/src/views/l2/track/index.vue
index a514e02..75c45d9 100644
--- a/src/views/l2/track/index.vue
+++ b/src/views/l2/track/index.vue
@@ -307,7 +307,7 @@ export default {
tensionCel: [], // Available in rect.vue / 在 rect.vue 中可用
celLengthMax: [], // Available in rect.vue / 在 rect.vue 中可用
celLengthMin: [], // Available in rect.vue / 在 rect.vue 中可用
- bR4or5toBR6Tension: [], // Available in rect.vue / 在 rect.vue 中可用
+ tensionBr45Br6: [], // Available in rect.vue / 在 rect.vue 中可用
// Additional entry fields / 其他入口段字段
tensionBr1Br2: [], // Displayed / 已显示
tensionBr2Br3: [] // Displayed / 已显示
@@ -832,7 +832,7 @@ export default {
tensionPorBr1: [], tensionPorBr2: [], stripSpeed: [],
weldStatus: [],
celLength: [], celCapacity: [], tensionCel: [],
- celLengthMax: [], celLengthMin: [], bR4or5toBR6Tension: [],
+ celLengthMax: [], celLengthMin: [], tensionBr45Br6: [],
tensionBr1Br2: [], tensionBr2Br3: [],
cleaningVoltage: [], cleaningCurrent: [], alkaliConcentration: [], alkaliTemperature: []
},
@@ -896,7 +896,7 @@ export default {
tensionCel: data.appMeasureEntryMessage.tensionCel,
celLengthMax: data.appMeasureEntryMessage.celLengthMax,
celLengthMin: data.appMeasureEntryMessage.celLengthMin,
- bR4or5toBR6Tension: data.appMeasureEntryMessage.bR4or5toBR6Tension,
+ tensionBr45Br6: data.appMeasureEntryMessage.tensionBr45Br6,
// Additional entry fields / 其他入口段字段
tensionBr1Br2: data.appMeasureEntryMessage.tensionBr1Br2,
tensionBr2Br3: data.appMeasureEntryMessage.tensionBr2Br3,
diff --git a/src/views/l2/track/rect.vue b/src/views/l2/track/rect.vue
index 134151d..743ef43 100644
--- a/src/views/l2/track/rect.vue
+++ b/src/views/l2/track/rect.vue
@@ -384,15 +384,15 @@
-
-
-
-
-
{
- // bR4or5toBR6Tension 在 entry 测量对象里，但需要展示在退火炉段
- const source = f === 'bR4or5toBR6Tension' ? this.realtimeData.entry : sectionSource
+ // tensionBr45Br6 在 entry 测量对象里，但需要展示在退火炉段
+ const source = f === 'tensionBr45Br6' ? this.realtimeData.entry : sectionSource
const raw = source ? this.getFieldValueWithAlias(source, f) : null
const unit = this.getFieldUnit(f)
return {