From ef212f45c7d0e85787589befba3a21845364a2e5 Mon Sep 17 00:00:00 2001
From: 17630416519 <qazwsx123>
Date: Sat, 20 Dec 2025 16:46:19 +0800
Subject: [PATCH] =?UTF-8?q?andon=E6=8A=A5=E8=AD=A6=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/andonManagement/policeRecord/index.js |  8 +++
 .../andonManagement/policeRecord/index.vue    | 69 ++++++++++++-------
 2 files changed, 52 insertions(+), 25 deletions(-)

diff --git a/src/api/andonManagement/policeRecord/index.js b/src/api/andonManagement/policeRecord/index.js
index 0946749..73d7b51 100644
--- a/src/api/andonManagement/policeRecord/index.js
+++ b/src/api/andonManagement/policeRecord/index.js
@@ -78,4 +78,12 @@ export function getAndonAlarmContactDictList() {
     url: 'system/user/getAlarmPullDown',
     method: 'get'
   })
+}
+
+//区域下拉
+export function getAndonAreaDictList() {
+  return request({
+    url: 'mes/AndonAlarmArea/getPullDown',
+    method: 'get'
+  })
 }
\ No newline at end of file
diff --git a/src/views/andonManagement/policeRecord/index.vue b/src/views/andonManagement/policeRecord/index.vue
index 96cc27e..fc45440 100644
--- a/src/views/andonManagement/policeRecord/index.vue
+++ b/src/views/andonManagement/policeRecord/index.vue
@@ -37,21 +37,24 @@
             @sort-change="sortChange" @selection-change="handleSelectionChange">
             <el-table-column type="selection" width="50" align="center" />
             <el-table-column prop="alarmCode" label="报警编码" align="center" :show-overflow-tooltip="true" />
-            <el-table-column prop="lineCode" label="产线" align="center" :show-overflow-tooltip="true" />
-            <el-table-column prop="lineName" label="产线名称" align="center" :show-overflow-tooltip="true" />
+            <el-table-column prop="area1" label="区域" align="center" :show-overflow-tooltip="true" />
+            <el-table-column prop="area2" label="区域下设备" min-width="120" align="center" :show-overflow-tooltip="true" />
             <el-table-column prop="alarmType" label="报警类型" align="center">
             </el-table-column>
-            <el-table-column prop="alarmLevel" label="报警级别" align="center" :show-overflow-tooltip="true" />
             <el-table-column prop="alarmInfo" label="报警信息" align="center" :show-overflow-tooltip="true" />
-            <el-table-column prop="receiver1" label="报警联系人1" align="center" :show-overflow-tooltip="true" />
-            <el-table-column prop="receiver2" label="报警联系人2" align="center" :show-overflow-tooltip="true" />
-            <el-table-column prop="receiver3" label="报警联系人3" align="center" :show-overflow-tooltip="true" />
-            <el-table-column prop="receiver4" label="报警联系人4" align="center" :show-overflow-tooltip="true" />
+            <el-table-column prop="receiver1Name" label="报警联系人1" align="center" min-width="110"
+                :show-overflow-tooltip="true" />
+            <el-table-column prop="receiver2Name" label="报警联系人2" align="center" min-width="110"
+                :show-overflow-tooltip="true" />
+            <el-table-column prop="receiver3Name" label="报警联系人3" align="center" min-width="110"
+                :show-overflow-tooltip="true" />
+            <el-table-column prop="receiver4Name" label="报警联系人4" align="center" min-width="110"
+                :show-overflow-tooltip="true" />
             <el-table-column prop="durationTime" label="持续时间" align="center" />
             <el-table-column prop="status" label="状态" align="center">
-                <template slot-scope="scope">
+                <!-- <template slot-scope="scope">
                     <dict-tag :options="statusOptions" :value="scope.row.status" />
-                </template>
+                </template> -->
             </el-table-column>
             <el-table-column prop="createdBy" label="创建人" align="center"></el-table-column>
             <el-table-column prop="updatedTime" label="创建时间" align="center" min-width="120"></el-table-column>
@@ -86,12 +89,10 @@
                     </el-col>
 
                     <el-col :lg="12">
-                        <el-form-item label="报警级别" prop="alarmLevel">
-                            <!-- <el-input v-model="form.alarmLevel" placeholder="请输入报警级别" /> -->
-                            <el-select v-model="form.alarmLevel" placeholder="请选择报警级别">
-                                <el-option v-for="item in alarmLevelOptions" :key="item.value" :label="item.label"
-                                    :value="item.value"></el-option>
-                            </el-select>
+                        <el-form-item label="区域" prop="area">
+                            <el-cascader v-model="form.area" :options="areaOptions"
+                                :props="{ expandTrigger: 'hover', value: 'label', label: 'label' }"
+                                @change="handleAreaChange" placeholder="请选择区域" clearable></el-cascader>
                         </el-form-item>
                     </el-col>
 
@@ -126,7 +127,8 @@ import {
     getAndonAlarmRecord,
     getAndonAlarmTypeDictList,
     getAndonAlarmLevelDictList,
-    getAndonAlarmContactDictList
+    getAndonAlarmContactDictList,
+    getAndonAreaDictList
 } from '@/api/andonManagement/policeRecord/index.js';
 
 export default {
@@ -199,6 +201,8 @@ export default {
                 { dictLabel: '已处理', dictValue: '已处理' },
                 { dictLabel: '已申报', dictValue: '已申报' },
             ],
+            // 区域选项
+            areaOptions: [],
             // 数据列表
             dataList: [],
             // 总记录数
@@ -221,17 +225,23 @@ export default {
                 })
             }
         })
-        //报警级别下拉
-        getAndonAlarmLevelDictList().then(res => {
+
+        getAndonAreaDictList().then(res => {
             if (res && res.code == 200) {
-                this.alarmLevelOptions = res.data.map(item => {
-                    return {
-                        label: item.label,
-                        value: item.value
-                    }
-                })
+                this.areaOptions = res.data;
             }
         })
+        //报警级别下拉
+        // getAndonAlarmLevelDictList().then(res => {
+        //     if (res && res.code == 200) {
+        //         this.alarmLevelOptions = res.data.map(item => {
+        //             return {
+        //                 label: item.label,
+        //                 value: item.value
+        //             }
+        //         })
+        //     }
+        // })
         //报警联系人
         // getAndonAlarmContactDictList().then(res => {
         //     if (res && res.code == 200) {
@@ -288,6 +298,7 @@ export default {
                 updatedBy: undefined,
                 updatedTime: undefined,
                 responseTime: undefined,
+                area: [] // 重置区域选择
             };
             this.resetForm("form");
         },
@@ -400,7 +411,15 @@ export default {
                 this.$set(this.form, 'responseTime', undefined);
             }
         },
-        /** 提交按钮 */
+        // 区域选择变化时
+        handleAreaChange(value) {
+            // if (value && value.length > 0) {
+            //     this.$set(this.form, 'area1', value.join(','));
+            // } else {
+            //     this.$set(this.form, 'area1', '');
+            // }
+        },
+        // 提交按钮 
         submitForm: function () {
             this.$refs["form"].validate((valid) => {
                 if (valid) {