From 139c3ffc7b86041109a5e9526f91a5afcb894eac Mon Sep 17 00:00:00 2001
From: 17630416519 <qazwsx123>
Date: Sat, 20 Dec 2025 09:34:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=AD=A6=E6=93=8D=E4=BD=9C=E5=8F=B0?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AndonAlarmTypeDict/index.vue              |  1 -
 .../humanComputerInteraction/index.vue        | 48 ++++++++++++-------
 2 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/src/views/andonManagement/AndonAlarmTypeDict/index.vue b/src/views/andonManagement/AndonAlarmTypeDict/index.vue
index 410c75e..43b6376 100644
--- a/src/views/andonManagement/AndonAlarmTypeDict/index.vue
+++ b/src/views/andonManagement/AndonAlarmTypeDict/index.vue
@@ -134,7 +134,6 @@ export default {
       // 表单参数
       form: {
         responseTime: 0
-
       },
       columns: [
         { index: 0, key: 'id', label: `主键`, checked: true },
diff --git a/src/views/andonManagement/humanComputerInteraction/index.vue b/src/views/andonManagement/humanComputerInteraction/index.vue
index c7affff..faf2121 100644
--- a/src/views/andonManagement/humanComputerInteraction/index.vue
+++ b/src/views/andonManagement/humanComputerInteraction/index.vue
@@ -19,7 +19,7 @@
                 <pagination class="mt10" background :total="total" :page.sync="queryParams.pageNum"
                     :limit.sync="queryParams.pageSize" @pagination="getLeftList" />
             </el-col>
-            <el-col :span="8">
+            <el-col :span="18">
                 <div style="width: 100%; height: 50px;">
                     <el-button type="primary" @click="handleAdd">新增</el-button>
                     <el-button type="primary" @click="handleQuery">查询</el-button>
@@ -29,72 +29,86 @@
                         <el-col :span="24">
                             <el-form ref="form" :model="form" label-width="100" label-position="left">
                                 <el-row>
-                                    <el-col :lg="12">
+                                    <el-col :lg="6">
                                         <el-form-item label="报警记录编码">
                                             <el-input disabled v-model="form.alarmCode" placeholder="请输入报警记录编码" />
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :lg="12">
+                                    <el-col :lg="6">
                                         <el-form-item label="产线">
                                             <el-input disabled v-model="form.lineCode" placeholder="请输入产线" />
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :lg="12">
+                                    <el-col :lg="6">
                                         <el-form-item label="产线名称">
                                             <el-input disabled v-model="form.lineName" placeholder="请输入产线名称" />
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :lg="12">
+                                    <el-col :lg="6">
                                         <el-form-item label="报警类型">
                                             <el-input disabled v-model="form.alarmType" placeholder="请输入报警类型" />
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :lg="12">
+                                    <el-col :lg="6">
                                         <el-form-item label="报警级别">
                                             <el-input disabled v-model="form.alarmLevel" placeholder="请输入报警级别" />
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :lg="12">
+                                    <el-col :lg="6">
                                         <el-form-item label="报警信息">
                                             <el-input disabled v-model="form.alarmInfo" placeholder="请输入报警信息" />
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :lg="12">
+                                    <el-col :lg="6">
                                         <el-form-item label="接收方">
                                             <el-input disabled v-model="form.receiver" placeholder="请输入接收方" />
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :lg="12">
+                                    <el-col :lg="6">
                                         <el-form-item label="接收方名称">
                                             <el-input disabled v-model="form.receiverName" placeholder="请输入接收方名称" />
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :lg="12">
+                                    <el-col :lg="6">
                                         <el-form-item label="状态">
                                             <el-input disabled v-model="form.status" placeholder="请输入状态" />
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :lg="12">
+                                    <el-col :lg="6">
                                         <el-form-item label="处理结果">
                                             <el-input v-model="form.handleResult" placeholder="请输入处理结果" />
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :lg="12">
+                                    <el-col :lg="6">
                                         <el-form-item label="备注">
                                             <el-input v-model="form.remark" placeholder="请输入备注" />
                                         </el-form-item>
                                     </el-col>
+                                    <el-col :lg="6">
+                                        <el-button type="primary" @click="handleResponse">响应</el-button>
+                                        <el-button type="success" @click="hanleCompleted">处理完毕</el-button>
+                                        <el-button type="warning" @click="hanleReportToSuperiors">报告上级</el-button>
+                                    </el-col>
                                 </el-row>
                             </el-form>
-                            <el-button type="primary" @click="handleResponse">响应</el-button>
-                            <el-button type="success" @click="hanleCompleted">处理完毕</el-button>
-                            <el-button type="warning" @click="hanleReportToSuperiors">报告上级</el-button>
+
                         </el-col>
 
                     </el-row>
+                    <el-table :stripe="true" :data="processingData" v-loading="loading" ref="table" border
+                        highlight-current-row>
+
+                        <el-table-column prop="alarmCode" label="报警记录编码" align="center" :show-overflow-tooltip="true" />
+                        <el-table-column prop="operator" label="操作员" align="center" :show-overflow-tooltip="true" />
+                        <el-table-column prop="operatorName" label="操作员名称" align="center"
+                            :show-overflow-tooltip="true" />
+                        <el-table-column prop="operatorTime" label="操作时间" align="center"
+                            :show-overflow-tooltip="true" />
+                        <el-table-column prop="remarks" label="备注" align="center" :show-overflow-tooltip="true" />
+                    </el-table>
                 </div>
             </el-col>
-            <el-col :span="10">
+            <!-- <el-col :span="10">
                 <el-table :stripe="true" :data="processingData" v-loading="loading" ref="table" border
                     highlight-current-row>
 
@@ -104,7 +118,7 @@
                     <el-table-column prop="operatorTime" label="操作时间" align="center" :show-overflow-tooltip="true" />
                     <el-table-column prop="remarks" label="备注" align="center" :show-overflow-tooltip="true" />
                 </el-table>
-            </el-col>
+            </el-col> -->
 
         </el-row>
         <!-- 查询弹窗 -->