From 79163ab0c63da477c6849bb74c9e3605c6f1d991 Mon Sep 17 00:00:00 2001 From: 86156 <823267011@qq.com> Date: Wed, 7 Jan 2026 17:56:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/l2/package.json | 2 +- .../api/business/annealingFurnaceTension.js | 47 ++ apps/l2/src/api/business/fullLineTension.js | 46 ++ apps/l2/src/api/business/levelerTension.js | 47 ++ apps/l2/src/api/business/setup.js | 18 +- .../src/api/business/straightenerTension.js | 47 ++ apps/l2/src/api/business/tension.js | 21 +- .../views/l2/plan/components/setupForm.vue | 425 ++++++------- .../views/l2/plan/components/setupPane.vue | 94 +-- .../components/setupRecommendationConfig.js | 44 +- apps/l2/src/views/l2/setup/fur.vue | 7 - apps/l2/src/views/l2/setup/index.vue | 178 ++++-- apps/l2/src/views/l2/setup/panels/T.vue | 592 ------------------ apps/l2/src/views/l2/setup/panels/T1.vue | 54 -- apps/l2/src/views/l2/setup/panels/T2.vue | 74 --- apps/l2/src/views/l2/setup/panels/T3.vue | 45 -- apps/l2/src/views/l2/setup/panels/T4.vue | 72 --- apps/l2/src/views/l2/setup/panels/T5.vue | 73 --- apps/l2/src/views/l2/setup/panels/T6.vue | 396 ------------ .../views/l2/setup/panels/TensionTable.vue | 236 +++++++ apps/l2/src/views/l2/setup/pdi.vue | 194 +++--- pnpm-lock.yaml | 2 +- 22 files changed, 879 insertions(+), 1835 deletions(-) create mode 100644 apps/l2/src/api/business/annealingFurnaceTension.js create mode 100644 apps/l2/src/api/business/fullLineTension.js create mode 100644 apps/l2/src/api/business/levelerTension.js create mode 100644 apps/l2/src/api/business/straightenerTension.js delete mode 100644 apps/l2/src/views/l2/setup/fur.vue delete mode 100644 apps/l2/src/views/l2/setup/panels/T.vue delete mode 100644 apps/l2/src/views/l2/setup/panels/T1.vue delete mode 100644 apps/l2/src/views/l2/setup/panels/T2.vue delete mode 100644 apps/l2/src/views/l2/setup/panels/T3.vue delete mode 100644 apps/l2/src/views/l2/setup/panels/T4.vue delete mode 100644 apps/l2/src/views/l2/setup/panels/T5.vue delete mode 100644 apps/l2/src/views/l2/setup/panels/T6.vue create mode 100644 apps/l2/src/views/l2/setup/panels/TensionTable.vue diff --git a/apps/l2/package.json b/apps/l2/package.json index 9f568e2..70ec1d2 100644 --- a/apps/l2/package.json +++ b/apps/l2/package.json @@ -57,7 +57,7 @@ "vue": "2.6.12", "vue-count-to": "1.0.13", "vue-cropper": "0.5.5", - "vue-i18n": "8.x", + "vue-i18n": "~8.28.2", "vue-konva": "^2.1.7", "vue-router": "3.4.9", "vuedraggable": "2.24.3", diff --git a/apps/l2/src/api/business/annealingFurnaceTension.js b/apps/l2/src/api/business/annealingFurnaceTension.js new file mode 100644 index 0000000..05ef164 --- /dev/null +++ b/apps/l2/src/api/business/annealingFurnaceTension.js @@ -0,0 +1,47 @@ +import request from '@/utils/request' + +// 查询退火炉张力列表 +export function listTensionAnnealingFurnace(query) { + return request({ + url: '/business/tension/annealing-furnace/list', + method: 'get', + params: query + }) +} + +// 查询退火炉张力详细 +export function getTensionAnnealingFurnace(steelGrade, thick, yieldStren) { + return request({ + url: '/business/tension/annealing-furnace', + method: 'get', + params: { steelGrade, thick, yieldStren } + }) +} + +// 新增退火炉张力 +export function addTensionAnnealingFurnace(data) { + return request({ + url: '/business/tension/annealing-furnace', + method: 'post', + data: data + }) +} + +// 修改退火炉张力 +export function updateTensionAnnealingFurnace(data) { + return request({ + url: '/business/tension/annealing-furnace', + method: 'put', + data: data + }) +} + +// 删除退火炉张力 +export function delTensionAnnealingFurnace(steelGrade, thick, yieldStren) { + return request({ + url: '/business/tension/annealing-furnace', + method: 'delete', + params: { steelGrade, thick, yieldStren } + }) +} + diff --git a/apps/l2/src/api/business/fullLineTension.js b/apps/l2/src/api/business/fullLineTension.js new file mode 100644 index 0000000..6696c2c --- /dev/null +++ b/apps/l2/src/api/business/fullLineTension.js @@ -0,0 +1,46 @@ +import request from '@/utils/request' + +// 查询全线张力列表 +export function listTensionAllLine(query) { + return request({ + url: '/business/tension/all-line/list', + method: 'get', + params: query + }) +} + +// 查询全线张力详细 +export function getTensionAllLine(steelGrade, thick, yieldStren) { + return request({ + url: '/business/tension/all-line', + method: 'get', + params: { steelGrade, thick, yieldStren } + }) +} + +// 新增全线张力 +export function addTensionAllLine(data) { + return request({ + url: '/business/tension/all-line', + method: 'post', + data: data + }) +} + +// 修改全线张力 +export function updateTensionAllLine(data) { + return request({ + url: '/business/tension/all-line', + method: 'put', + data: data + }) +} + +// 删除全线张力 +export function delTensionAllLine(steelGrade, thick, yieldStren) { + return request({ + url: '/business/tension/all-line', + method: 'delete', + params: { steelGrade, thick, yieldStren } + }) +} diff --git a/apps/l2/src/api/business/levelerTension.js b/apps/l2/src/api/business/levelerTension.js new file mode 100644 index 0000000..bdf4c60 --- /dev/null +++ b/apps/l2/src/api/business/levelerTension.js @@ -0,0 +1,47 @@ +import request from '@/utils/request' + +// 查询平整机张力列表 +export function listTensionLeveler(query) { + return request({ + url: '/business/tension/leveler/list', + method: 'get', + params: query + }) +} + +// 查询平整机张力详细 +export function getTensionLeveler(steelGrade, thick, yieldStren) { + return request({ + url: '/business/tension/leveler', + method: 'get', + params: { steelGrade, thick, yieldStren } + }) +} + +// 新增平整机张力 +export function addTensionLeveler(data) { + return request({ + url: '/business/tension/leveler', + method: 'post', + data: data + }) +} + +// 修改平整机张力 +export function updateTensionLeveler(data) { + return request({ + url: '/business/tension/leveler', + method: 'put', + data: data + }) +} + +// 删除平整机张力 +export function delTensionLeveler(steelGrade, thick, yieldStren) { + return request({ + url: '/business/tension/leveler', + method: 'delete', + params: { steelGrade, thick, yieldStren } + }) +} + diff --git a/apps/l2/src/api/business/setup.js b/apps/l2/src/api/business/setup.js index fb49502..686e15d 100644 --- a/apps/l2/src/api/business/setup.js +++ b/apps/l2/src/api/business/setup.js @@ -1,6 +1,6 @@ import request from '@/utils/request' -// 查询【请填写功能名称】列表 +// 查询张力参数列表 export function listSetup(query) { return request({ url: '/business/setup/list', @@ -9,15 +9,15 @@ export function listSetup(query) { }) } -// 查询【请填写功能名称】详细 -export function getSetup(ID) { +// 查询张力参数详细 +export function getSetup(id) { return request({ - url: '/business/setup/' + ID, + url: '/business/setup/' + id, method: 'get' }) } -// 新增【请填写功能名称】 +// 新增张力参数 export function addSetup(data) { return request({ url: '/business/setup', @@ -26,7 +26,7 @@ export function addSetup(data) { }) } -// 修改【请填写功能名称】 +// 修改张力参数 export function updateSetup(data) { return request({ url: '/business/setup', @@ -35,10 +35,10 @@ export function updateSetup(data) { }) } -// 删除【请填写功能名称】 -export function delSetup(ID) { +// 删除张力参数 +export function delSetup(id) { return request({ - url: '/business/setup/' + ID, + url: '/business/setup/' + id, method: 'delete' }) } diff --git a/apps/l2/src/api/business/straightenerTension.js b/apps/l2/src/api/business/straightenerTension.js new file mode 100644 index 0000000..685d4cc --- /dev/null +++ b/apps/l2/src/api/business/straightenerTension.js @@ -0,0 +1,47 @@ +import request from '@/utils/request' + +// 查询矫直机张力列表 +export function listTensionStraightener(query) { + return request({ + url: '/business/tension/straightener/list', + method: 'get', + params: query + }) +} + +// 查询矫直机张力详细 +export function getTensionStraightener(steelGrade, thick, yieldStren) { + return request({ + url: '/business/tension/straightener', + method: 'get', + params: { steelGrade, thick, yieldStren } + }) +} + +// 新增矫直机张力 +export function addTensionStraightener(data) { + return request({ + url: '/business/tension/straightener', + method: 'post', + data: data + }) +} + +// 修改矫直机张力 +export function updateTensionStraightener(data) { + return request({ + url: '/business/tension/straightener', + method: 'put', + data: data + }) +} + +// 删除矫直机张力 +export function delTensionStraightener(steelGrade, thick, yieldStren) { + return request({ + url: '/business/tension/straightener', + method: 'delete', + params: { steelGrade, thick, yieldStren } + }) +} + diff --git a/apps/l2/src/api/business/tension.js b/apps/l2/src/api/business/tension.js index 3a72e7c..4e49914 100644 --- a/apps/l2/src/api/business/tension.js +++ b/apps/l2/src/api/business/tension.js @@ -1,18 +1,21 @@ import request from '@/utils/request' +// 兼容旧接口(如果后端仍保留旧路由,可以继续使用) +// 注意:现在全线张力推荐使用 /business/tension/all-line 这套接口(按三主键) + // 查询全线张力列表 export function listTension(query) { return request({ - url: '/business/tension/list', + url: '/business/tension/all-line/list', method: 'get', params: query }) } -// 查询全线张力详细 +// 查询全线张力详细(按三主键) export function getTension(query) { return request({ - url: '/business/tension', + url: '/business/tension/all-line', method: 'get', params: query }) @@ -21,7 +24,7 @@ export function getTension(query) { // 新增全线张力 export function addTension(data) { return request({ - url: '/business/tension', + url: '/business/tension/all-line', method: 'post', data: data }) @@ -30,17 +33,17 @@ export function addTension(data) { // 修改全线张力 export function updateTension(data) { return request({ - url: '/business/tension', + url: '/business/tension/all-line', method: 'put', data: data }) } -// 删除全线张力 +// 删除全线张力(按三主键) export function delTension(query) { return request({ - url: '/business/tension/tension', - data: query, - method: 'delete' + url: '/business/tension/all-line', + method: 'delete', + params: query }) } diff --git a/apps/l2/src/views/l2/plan/components/setupForm.vue b/apps/l2/src/views/l2/plan/components/setupForm.vue index d18f351..e2aa51b 100644 --- a/apps/l2/src/views/l2/plan/components/setupForm.vue +++ b/apps/l2/src/views/l2/plan/components/setupForm.vue @@ -1,142 +1,86 @@ \ No newline at end of file diff --git a/apps/l2/src/views/l2/plan/components/setupRecommendationConfig.js b/apps/l2/src/views/l2/plan/components/setupRecommendationConfig.js index d4a40d7..5100139 100644 --- a/apps/l2/src/views/l2/plan/components/setupRecommendationConfig.js +++ b/apps/l2/src/views/l2/plan/components/setupRecommendationConfig.js @@ -1,47 +1,33 @@ export const PARAMETER_GROUPS = [ { - title: 'Full Line Tension', // 全线张力 + title: '全线张力', items: [ - { label: 'Pay-off Reel Tension', key: 'porTension' }, // 开卷机张力 - { label: 'Entry Loop Tension', key: 'celTension' }, // 入口活套张力 - { label: 'Cleaning Section Tension', key: 'cleanTension' }, // 清洗段张力 - { label: 'Furnace Zone Tension', key: 'furTension' }, // 炉区张力 - { label: 'Cooling Tower Tension', key: 'towerTension' }, // 冷却塔张力 - { label: 'TM No Tension', key: 'tmNoneTension' }, // 光整机不投张力 - { label: 'TM Entry Tension', key: 'tmEntryTension' }, // 光整机入口张力 - { label: 'TM Exit Tension', key: 'tmExitTension' }, // 光整机出口张力 - { label: 'TL No Tension', key: 'tlNoneTension' }, // 拉矫机不投张力 - { label: 'TL Exit Tension', key: 'tlExitTension' }, // 拉矫机出口张力 - { label: 'Post-treatment Tension', key: 'coatTension' }, // 后处理张力 - { label: 'Exit Loop Tension', key: 'cxlTension' }, // 出口活套张力 - { label: 'Take-up Reel Tension', key: 'trTension' } // 卷取机张力 + { label: '开卷机张力', key: 'porTension' }, + { label: '入口活套张力', key: 'celTension' }, + { label: '清洗段张力', key: 'cleanTension' }, + { label: '钝化段张力', key: 'passivationTension' }, + { label: '出口活套张力', key: 'cxlTension' }, + { label: '卷取机张力', key: 'trTension' } ] }, { - title: 'TM Parameters', // 光整机参数 + title: '平整机张力', items: [ - { label: 'TM Roll Force', key: 'tmRollforce' }, // 光整机轧制力 - { label: 'TM Bending Force', key: 'tmBendforce' }, // 光整机弯辊力 - { label: 'TM Anti-crimping Roll Mesh', key: 'tmAcrMesh' }, // 光整机防皱辊插入量 - { label: 'TM Anti-tremor Roll Mesh', key: 'tmBrMesh' } // 光整机防颤辊插入量 + { label: '平整机入口张力', key: 'levelerEntryTension' }, + { label: '平整机出口张力', key: 'levelerExitTension' } ] }, { - title: 'TL Parameters', // 拉矫机参数 + title: '矫直机张力', items: [ - { label: 'TL Elongation', key: 'tlElong' }, // 拉矫机延伸率 - { label: 'Leveling Roll Mesh 1', key: 'tlLvlMesh1' }, // 矫直辊插入量1 - { label: 'Leveling Roll Mesh 2', key: 'tlLvlMesh2' }, // 矫直辊插入量2 - { label: 'Anti-crossbow Mesh', key: 'tlAcbMesh' } // 防横弓插入量 + { label: '矫直机出口张力', key: 'straightenerExitTension' } ] }, { - title: 'Furnace Section Parameters', // 炉火段参数 + title: '退火炉张力', items: [ - { label: 'Preheating Section Exit Strip Temp', key: 'preheatingSection' }, // 预热段出口板温 - { label: 'Heating Section Exit Strip Temp', key: 'heatingSection' }, // 加热段出口板温 - { label: 'Cooling Section Exit Strip Temp', key: 'coolingSection' } // 冷却段出口板温 + { label: '炉区张力', key: 'furTension' }, + { label: '冷却塔张力', key: 'towerTension' } ] } ] - diff --git a/apps/l2/src/views/l2/setup/fur.vue b/apps/l2/src/views/l2/setup/fur.vue deleted file mode 100644 index a9caa2a..0000000 --- a/apps/l2/src/views/l2/setup/fur.vue +++ /dev/null @@ -1,7 +0,0 @@ - - - \ No newline at end of file diff --git a/apps/l2/src/views/l2/setup/index.vue b/apps/l2/src/views/l2/setup/index.vue index edbfa7d..dfe2652 100644 --- a/apps/l2/src/views/l2/setup/index.vue +++ b/apps/l2/src/views/l2/setup/index.vue @@ -1,60 +1,64 @@ - - \ No newline at end of file diff --git a/apps/l2/src/views/l2/setup/panels/T1.vue b/apps/l2/src/views/l2/setup/panels/T1.vue deleted file mode 100644 index c591f35..0000000 --- a/apps/l2/src/views/l2/setup/panels/T1.vue +++ /dev/null @@ -1,54 +0,0 @@ - - - \ No newline at end of file diff --git a/apps/l2/src/views/l2/setup/panels/T2.vue b/apps/l2/src/views/l2/setup/panels/T2.vue deleted file mode 100644 index d4c5315..0000000 --- a/apps/l2/src/views/l2/setup/panels/T2.vue +++ /dev/null @@ -1,74 +0,0 @@ - - - \ No newline at end of file diff --git a/apps/l2/src/views/l2/setup/panels/T3.vue b/apps/l2/src/views/l2/setup/panels/T3.vue deleted file mode 100644 index de28e2c..0000000 --- a/apps/l2/src/views/l2/setup/panels/T3.vue +++ /dev/null @@ -1,45 +0,0 @@ - - - \ No newline at end of file diff --git a/apps/l2/src/views/l2/setup/panels/T4.vue b/apps/l2/src/views/l2/setup/panels/T4.vue deleted file mode 100644 index 67636ca..0000000 --- a/apps/l2/src/views/l2/setup/panels/T4.vue +++ /dev/null @@ -1,72 +0,0 @@ - - - \ No newline at end of file diff --git a/apps/l2/src/views/l2/setup/panels/T5.vue b/apps/l2/src/views/l2/setup/panels/T5.vue deleted file mode 100644 index a68736f..0000000 --- a/apps/l2/src/views/l2/setup/panels/T5.vue +++ /dev/null @@ -1,73 +0,0 @@ - - - \ No newline at end of file diff --git a/apps/l2/src/views/l2/setup/panels/T6.vue b/apps/l2/src/views/l2/setup/panels/T6.vue deleted file mode 100644 index e7c8f65..0000000 --- a/apps/l2/src/views/l2/setup/panels/T6.vue +++ /dev/null @@ -1,396 +0,0 @@ - - - - - diff --git a/apps/l2/src/views/l2/setup/panels/TensionTable.vue b/apps/l2/src/views/l2/setup/panels/TensionTable.vue new file mode 100644 index 0000000..5600097 --- /dev/null +++ b/apps/l2/src/views/l2/setup/panels/TensionTable.vue @@ -0,0 +1,236 @@ + + + + + + diff --git a/apps/l2/src/views/l2/setup/pdi.vue b/apps/l2/src/views/l2/setup/pdi.vue index c45b853..f4dce32 100644 --- a/apps/l2/src/views/l2/setup/pdi.vue +++ b/apps/l2/src/views/l2/setup/pdi.vue @@ -15,6 +15,18 @@ + + + + + + + + + 搜索 重置 @@ -34,7 +46,8 @@
钢卷号: {{ item.coilid || '-' }}
-
计划号: {{ item.planid || '-' }} | 更改次数: {{ item.type || '-' }}
+
计划号: {{ item.planid || '-' }}
+
钢种: {{ item.steelGrade || '-' }}
@@ -203,6 +166,7 @@ 已选中: 钢卷 {{ currentRow.coilid }} 计划号: {{ currentRow.planid }} + 钢种: {{ currentRow.steelGrade || '-' }} | 厚度: {{ currentRow.thick || '-' }} | 屈服强度: {{ currentRow.yieldStren || '-' }}
@@ -249,8 +213,11 @@ export default { queryParams: { pageNum: 1, pageSize: 10, - COILID: null, - PLANID: null, + coilid: null, + planid: null, + steelGrade: null, + thick: null, + yieldStren: null, porTension: null, celTension: null, cleanTension: null, @@ -303,9 +270,12 @@ export default { // 表单重置 reset() { this.form = { - ID: null, - COILID: null, - PLANID: null, + id: null, + coilid: null, + planid: null, + steelGrade: null, + thick: null, + yieldStren: null, porTension: null, celTension: null, cleanTension: null, @@ -346,7 +316,7 @@ export default { }, // 多选框选中数据 handleSelectionChange(selection) { - this.ids = selection.map(item => item.ID) + this.ids = selection.map(item => item.id) this.single = selection.length !== 1 this.multiple = !selection.length }, @@ -355,7 +325,7 @@ export default { return this.ids.includes(this.getItemKey(item)) }, getItemKey(item) { - return item.id ?? item.ID + return item.id }, // 切换选中状态 toggleSelection(item, checked) { @@ -379,8 +349,8 @@ export default { /** 编辑按钮操作 */ handleUpdate(row) { this.reset(); - const ID = row.ID || this.ids - getSetup(ID).then(response => { + const id = row.id || this.ids + getSetup(id).then(response => { this.form = response.data; this.open = true; this.title = "编辑工艺参数配置"; @@ -395,7 +365,7 @@ export default { submitForm() { this.$refs["form"].validate(valid => { if (valid) { - if (this.form.ID != null) { + if (this.form.id != null) { updateSetup(this.form).then(response => { this.$modal.msgSuccess("编辑成功"); this.open = false; @@ -413,11 +383,11 @@ export default { }, /** 删除按钮操作 */ handleDelete(row) { - const IDs = row.id || this.ids; - this.$modal.confirm(`确定要删除编号为"${IDs}"的工艺参数配置记录吗?`, '确认删除', { + const ids = row.id || this.ids; + this.$modal.confirm(`确定要删除编号为"${ids}"的张力参数记录吗?`, '确认删除', { type: 'warning' }).then(function () { - return delSetup(IDs); + return delSetup(ids); }).then(() => { this.getList(); this.$modal.msgSuccess("删除成功"); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9e34d0a..cd8391c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -93,7 +93,7 @@ importers: specifier: 0.5.5 version: 0.5.5 vue-i18n: - specifier: 8.x + specifier: ~8.28.2 version: 8.28.2(vue@2.6.12) vue-konva: specifier: ^2.1.7