From e07387132bc16f75225e49a6ce330da75518299a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <2178503051@qq.com>
Date: Tue, 9 Jun 2026 16:48:26 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E6=8C=82=E6=8E=A5=E6=97=A5=E5=BF=97=E9=A1=B5=E9=9D=A2=EF=BC=8C?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A4=9A=E4=B8=AA=E9=A1=B5=E9=9D=A2UI?=
 =?UTF-8?q?=E5=92=8C=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1.  新增mill/abnormal/log.vue页面，实现钢卷异常挂接日志的查询、导出功能
2.  调整成本项目页面查询表单label宽度为80px
3.  移除异常性能页面的导出按钮
4.  重构轧辊计划页面的操作按钮布局，新增分组样式
5.  注释并停用工作辊页面的实时性能数据加载和展示
---
 ruoyi-ui/src/views/cost/item.vue              |   2 +-
 ruoyi-ui/src/views/mill/abnormal/log.vue      | 155 ++++++++++++++++++
 .../src/views/mill/abnormal/performance.vue   |   1 -
 ruoyi-ui/src/views/mill/plan.vue              |  46 +++++-
 .../src/views/mill/roll/working/index.vue     |  34 ++--
 5 files changed, 210 insertions(+), 28 deletions(-)

diff --git a/ruoyi-ui/src/views/cost/item.vue b/ruoyi-ui/src/views/cost/item.vue
index 4584f529..008505a5 100644
--- a/ruoyi-ui/src/views/cost/item.vue
+++ b/ruoyi-ui/src/views/cost/item.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
       <el-form-item label="成本项目编码" prop="itemCode">
         <el-input
           v-model="queryParams.itemCode"
diff --git a/ruoyi-ui/src/views/mill/abnormal/log.vue b/ruoyi-ui/src/views/mill/abnormal/log.vue
index e69de29b..b029d403 100644
--- a/ruoyi-ui/src/views/mill/abnormal/log.vue
+++ b/ruoyi-ui/src/views/mill/abnormal/log.vue
@@ -0,0 +1,155 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
+      <el-form-item label="钢卷号" prop="currentCoilNo">
+        <el-input
+          v-model="queryParams.currentCoilNo"
+          placeholder="请输入钢卷号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="挂接状态" prop="bindStatus">
+        <el-select v-model="queryParams.bindStatus" placeholder="请选择挂接状态" clearable>
+          <el-option label="已挂接" :value="1" />
+          <el-option label="已撤回" :value="2" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="操作人" prop="operateUser">
+        <el-input
+          v-model="queryParams.operateUser"
+          placeholder="请输入操作人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间">
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          value-format="yyyy-MM-dd"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['mill:relation:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="relationList">
+      <el-table-column label="关系ID" align="center" prop="relationId" />
+      <el-table-column label="钢卷号" align="center" prop="currentCoilNo" />
+      <el-table-column label="二级异常ID" align="center" prop="secondAbnormalId" />
+      <el-table-column label="三级钢卷ID" align="center" prop="thirdCoilId" />
+      <el-table-column label="三级异常ID" align="center" prop="thirdAbnormalId" />
+      <el-table-column label="挂接状态" align="center" prop="bindStatus">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.bindStatus === 1" type="success">已挂接</el-tag>
+          <el-tag v-else-if="scope.row.bindStatus === 2" type="info">已撤回</el-tag>
+          <el-tag v-else type="warning">未知</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="挂接时间" align="center" prop="bindTime" width="160">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.bindTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="撤回时间" align="center" prop="withdrawTime" width="160">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.withdrawTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作人" align="center" prop="operateUser" />
+      <el-table-column label="操作备注" align="center" prop="operateRemark" show-overflow-tooltip />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="160">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </div>
+</template>
+
+<script>
+import { listRelation } from "@/api/mill/coilAbnormalRelation";
+
+export default {
+  name: "RelationLog",
+  data() {
+    return {
+      loading: true,
+      showSearch: true,
+      total: 0,
+      relationList: [],
+      dateRange: [],
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        currentCoilNo: null,
+        bindStatus: null,
+        operateUser: null,
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    getList() {
+      this.loading = true;
+      const params = { ...this.queryParams };
+      if (this.dateRange && this.dateRange.length === 2) {
+        params.beginTime = this.dateRange[0];
+        params.endTime = this.dateRange[1];
+      }
+      listRelation(params).then(response => {
+        this.relationList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.dateRange = [];
+      this.handleQuery();
+    },
+    handleExport() {
+      const params = { ...this.queryParams };
+      if (this.dateRange && this.dateRange.length === 2) {
+        params.beginTime = this.dateRange[0];
+        params.endTime = this.dateRange[1];
+      }
+      this.download('mill/relation/export', params, `relation_log_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/mill/abnormal/performance.vue b/ruoyi-ui/src/views/mill/abnormal/performance.vue
index d7bea593..59f64dd3 100644
--- a/ruoyi-ui/src/views/mill/abnormal/performance.vue
+++ b/ruoyi-ui/src/views/mill/abnormal/performance.vue
@@ -160,7 +160,6 @@
             <span style="font-size: 16px; font-weight: bold;">异常记录</span>
             <div style="float: right;">
               <el-button type="success" plain icon="el-icon-plus" size="mini" @click="handleAbnormalAdd">添加异常</el-button>
-              <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleAbnormalExport">导出</el-button>
             </div>
           </div>
           <AbnormalTable
diff --git a/ruoyi-ui/src/views/mill/plan.vue b/ruoyi-ui/src/views/mill/plan.vue
index aa98baef..936aa796 100644
--- a/ruoyi-ui/src/views/mill/plan.vue
+++ b/ruoyi-ui/src/views/mill/plan.vue
@@ -170,13 +170,17 @@
 
         <div class="section-header" style="margin-top:8px"><span>队列操作</span></div>
         <div class="op-buttons">
-          <el-button size="mini" type="primary" icon="el-icon-plus"   @click="handleAdd">钢卷增加</el-button>
-          <el-button size="mini" icon="el-icon-edit"   :disabled="!selectedPlan" @click="handleEdit">修改</el-button>
-          <!-- <el-button size="mini" icon="el-icon-edit"   :disabled="!selectedPlan" @click="handleFinish"></el-button> -->
-          <el-button size="mini" icon="el-icon-document"   :disabled="!selectedPlan" @click="handleFinish">完成</el-button>
-          <el-button size="mini" type="danger" icon="el-icon-delete"  :disabled="!selectedPlan" @click="handleDelete">删除</el-button>
-          <el-button size="mini" icon="el-icon-top"    :disabled="!selectedPlan" @click="handleMoveUp">Up 上移</el-button>
-          <el-button size="mini" icon="el-icon-bottom" :disabled="!selectedPlan" @click="handleMoveDown">Down 下移</el-button>
+          <div class="op-btn-group">
+            <el-button size="mini" type="primary" icon="el-icon-plus" @click="handleAdd">钢卷增加</el-button>
+            <el-button size="mini" icon="el-icon-edit" :disabled="!selectedPlan" @click="handleEdit">修改</el-button>
+            <el-button size="mini" icon="el-icon-document" :disabled="!selectedPlan" @click="handleFinish">完成</el-button>
+            <el-button size="mini" type="danger" icon="el-icon-delete" :disabled="!selectedPlan" @click="handleDelete">删除</el-button>
+          </div>
+          <div class="op-btn-sep"></div>
+          <div class="op-btn-group">
+            <el-button size="mini" icon="el-icon-top" :disabled="!selectedPlan" @click="handleMoveUp">上移</el-button>
+            <el-button size="mini" icon="el-icon-bottom" :disabled="!selectedPlan" @click="handleMoveDown">下移</el-button>
+          </div>
         </div>
       </div>
     </div>
@@ -775,9 +779,33 @@ export default {
   padding: 8px 12px;
   display: flex;
   flex-direction: column;
-  gap: 6px;
+  gap: 2px;
   border-bottom: 1px solid #e4e7ed;
-  .el-button { width: 100%; justify-content: flex-start; }
+
+  .op-btn-group {
+    display: flex;
+    flex-direction: column;
+    gap: 2px;
+  }
+
+  .op-btn-sep {
+    height: 1px;
+    background: #e4e7ed;
+    margin: 5px 0;
+  }
+
+  .el-button {
+    width: 100%;
+    justify-content: flex-start;
+    border-radius: 2px;
+    padding-left: 10px;
+    margin-left: 0 !important;
+    i { margin-right: 4px; }
+    &:not(.el-button--primary):not(.el-button--danger) {
+      border-color: #dcdfe6;
+      &:hover { color: #409eff; border-color: #c6e2ff; background: #ecf5ff; }
+    }
+  }
 }
 
 /* 底部状态栏 */
diff --git a/ruoyi-ui/src/views/mill/roll/working/index.vue b/ruoyi-ui/src/views/mill/roll/working/index.vue
index 24785505..6beea54b 100644
--- a/ruoyi-ui/src/views/mill/roll/working/index.vue
+++ b/ruoyi-ui/src/views/mill/roll/working/index.vue
@@ -109,7 +109,7 @@
         </el-card>
 
         <!-- 工作绩效 -->
-        <el-card shadow="never" class="roll-table-card aside-panel">
+        <!-- <el-card shadow="never" class="roll-table-card aside-panel">
           <div slot="header" class="card-header">
             <span class="card-title"><i class="el-icon-data-analysis" /> 工作绩效（实时）</span>
             <el-button size="mini" icon="el-icon-refresh" style="margin-left:auto" @click="loadRollPerformance">刷新</el-button>
@@ -127,7 +127,7 @@
               </template>
             </el-table-column>
           </el-table>
-        </el-card>
+        </el-card> -->
 
       </div>
 
@@ -157,7 +157,7 @@
           </el-form-item>
         </el-form>
       </div>
-      <KLPTable v-loading="historyLoading" :data="historyList">
+      <el-table v-loading="historyLoading" :data="historyList">
         <el-table-column label="换辊编号"  align="center" prop="changeNo"   width="130" />
         <el-table-column label="机架"      align="center" prop="standNo"    width="80" />
         <el-table-column label="换辊时间"  align="center" prop="changeTime" width="160" />
@@ -178,13 +178,13 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="工作长度(m)" align="center" prop="workLength" width="96">
+        <!-- <el-table-column label="工作长度(m)" align="center" prop="workLength" width="96">
           <template slot-scope="scope">
             <span v-if="scope.row.workLength != null">{{ scope.row.workLength }}</span>
             <span v-else style="color:#c0c4cc">—</span>
           </template>
-        </el-table-column>
-        <el-table-column label="过卷数" align="center" prop="coilCount" width="72">
+        </el-table-column> -->
+        <!-- <el-table-column label="过卷数" align="center" prop="coilCount" width="72">
           <template slot-scope="scope">
             <span v-if="scope.row.coilCount != null">{{ scope.row.coilCount }}</span>
             <span v-else style="color:#c0c4cc">—</span>
@@ -195,7 +195,7 @@
             <span v-if="scope.row.totalWeight != null">{{ scope.row.totalWeight }}</span>
             <span v-else style="color:#c0c4cc">—</span>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="备注" align="left" prop="remark" min-width="100" show-overflow-tooltip />
         <el-table-column label="操作" align="center" width="110" fixed="right">
           <template slot-scope="scope">
@@ -204,7 +204,7 @@
               @click="handleDeleteHistory(scope.row)">删除</el-button>
           </template>
         </el-table-column>
-      </KLPTable>
+      </el-table>
       <pagination
         v-show="historyTotal > 0"
         :total="historyTotal"
@@ -378,7 +378,7 @@
 </template>
 
 <script>
-import { getCurrentRolls, listRollChange, addRollChange, updateRollChange, delRollChange, getRollPerformance } from '@/api/mill/rollChange'
+import { getCurrentRolls, listRollChange, addRollChange, updateRollChange, delRollChange } from '@/api/mill/rollChange'
 import { listRollStandby, addRollStandby, delRollStandby, clearRollStandby } from '@/api/mill/rollStandby'
 import { listRollOptions, listRollInfo } from '@/api/mill/rollInfo'
 import rollLineMixin from '../rollLineMixin'
@@ -630,15 +630,15 @@ export default {
       })
       this.loadHistory()
       this.loadOfflineRolls()
-      this.loadRollPerformance()
+      // this.loadRollPerformance()
     },
 
-    loadRollPerformance() {
-      this.perfLoading = true
-      getRollPerformance(this.lineId).then(res => {
-        this.perfData = res.data || {}
-      }).finally(() => { this.perfLoading = false })
-    },
+    // loadRollPerformance() {
+    //   this.perfLoading = true
+    //   getRollPerformance(this.lineId).then(res => {
+    //     this.perfData = res.data || {}
+    //   }).finally(() => { this.perfLoading = false })
+    // },
 
     loadCurrent(standNo) {
       this.$set(this.loadingCurrent, standNo, true)
@@ -732,7 +732,7 @@ export default {
           this.loadStandby(standNo)
           this.loadHistory()
           this.loadOfflineRolls()
-          this.loadRollPerformance()
+          // this.loadRollPerformance()
         })
       }).finally(() => {
         this.changeSubmitting = false