From c819024e241b9f7c54cc3786373ad0d2998f2190 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期五, 05 五月 2023 08:55:46 +0800
Subject: [PATCH] 修改

---
 src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/report/index.vue |   24 +++++++++++++++++++-----
 1 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/report/index.vue b/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/report/index.vue
index ed85ce3..5042094 100644
--- a/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/report/index.vue
+++ b/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/report/index.vue
@@ -25,13 +25,23 @@
                     <el-option v-for="item in dangerTypeList" :key="item.id" :label="item.name" :value="item.id"></el-option>
                 </el-select>
             </div>
+            <div class="basic_search">
+                <span>上报部门:</span>
+                <el-select v-model="filter.depId"  clearable filterable class="analyseUnit_box">
+                    <el-option
+                        v-for="item in departmentList"
+                        :key="item.id"
+                        :label="item.department"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>            </div>
 
+            <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-search"
+                       @click="queryHandle"/>
 
             <el-button class="filter-item" style="margin-left: 10px;" type="primary"
                        icon="el-icon-plus" @click="showCreateHandle('新增', '')">新增
             </el-button>
-            <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-search"
-                       @click="queryHandle"/>
         </div>
         <div class="table_content">
             <el-table
@@ -74,7 +84,7 @@
                 <el-table-column prop="gmtCreate" label="创建时间" show-overflow-tooltip min-width="200px"></el-table-column>
                 <el-table-column prop="lastEditUserName" label="最后修改人" show-overflow-tooltip min-width="150px"></el-table-column>
                 <el-table-column prop="gmtModitify" label="最后修改时间" show-overflow-tooltip min-width="200px"></el-table-column>
-                <el-table-column label="操作" align="center" width="240" class-name="small-padding fixed-width">
+                <el-table-column label="操作" align="center" width="240" class-name="small-padding fixed-width" fixed="right">
                     <template slot-scope="scope">
                         <el-button type="text" @click="showCreateHandle('修改', scope.row)">修改</el-button>
                         <el-button type="text" style="color: red" @click="deleteById(scope.row)">删除</el-button>
@@ -163,7 +173,9 @@
                     { id: 1, name: '无' },
                     { id: 2, name: '轻伤' },
                     { id: 3, name: '重伤' },
-                    { id: 4, name: '死亡' }
+                    { id: 4, name: '死亡' },
+                    { id: 5, name: '设备损坏' },
+                    { id: 6, name: '系统停车' },
                 ],
                 allProduceDeviceData: [],
                 allSafetyRiskUnitData: [],
@@ -173,7 +185,8 @@
                     rectifier:'',
                     rectifierid:'',
                     note: '',
-                    level:''
+                    level:'',
+
                 },
                 isSupervision: '',
                 filter:{
@@ -182,6 +195,7 @@
                     dangerLevel: null,
                     dangerSource: null,
                     dangerStatus: null,
+                    depId:null,
                     dangerType: null
                 },
 

--
Gitblit v1.9.2