Просмотр исходного кода

fix:联调安全责任变更功能

sunqijun 1 месяц назад
Родитель
Сommit
62f270e04c

+ 11 - 1
src/api/equipment-high-alert-List/index.ts

@@ -2,7 +2,7 @@
  * @Author: liuJie
  * @Date: 2026-03-12 16:06:18
  * @LastEditors: liuJie
- * @LastEditTime: 2026-03-12 16:11:25
+ * @LastEditTime: 2026-03-19 17:19:27
  * @Describe: 告警列表
  */
 import { http } from '@/utils/http/axios';
@@ -35,6 +35,15 @@ export const equipmentHighAlertList = (query: QueryParamType)=>{
     data: query,
   });
 }
+  // 设备类型
+export const DeviceTypeList = ()=>{
+  return http.request({
+    url: '/prodAlarm/queryAllDeviceType',
+    method: 'get',
+  });
+}
+
+
   // 所属部门
 export const deptList = ()=>{
   return http.request({
@@ -42,6 +51,7 @@ export const deptList = ()=>{
     method: 'post',
   });
 }
+
 // 导出接口
 export const exportTableData = (params)=>{
     return http.request({

+ 14 - 0
src/api/production-safety/responsibility-implementation/index.ts

@@ -253,6 +253,20 @@ export function areaCheckListQueryPage(params) {
   });
 }
 
+/**
+ * 查询变更记录
+ * @param params - 查询参数,通常包含 id
+ * @returns
+ */
+export function queryChangedList(params) {
+  return http.request({
+    url: '/areaCheckList/queryChangedList',
+    method: 'get',
+    params
+  });
+}
+
+
 /**
  * 查询区域检查清单详情
  * @param params - 查询参数,通常包含 id

+ 66 - 4
src/views/production-safety/implement-safety-duty/non-public-area-responsibilities/list.vue

@@ -44,17 +44,18 @@
       <div class="table-content">
         <el-table :data="tableData.data">
           <el-table-column type="index" label="序号" width="80" />
-          <el-table-column label="楼号" prop="buildingNo" width="80" />
+          <el-table-column label="楼号" prop="buildingNo" width="100" />
           <el-table-column label="楼层" prop="buildingArea" width="100" />
           <el-table-column label="房间/区域" prop="floorRoomNo" width="180" />
-          <el-table-column label="功能名称" prop="nameFunction" width="120" />
+          <el-table-column label="功能名称" prop="nameFunction" width="160" />
           <el-table-column label="安全责任所/中心" prop="safetyResponsibleCenter" width="200" />
           <el-table-column label="安全责任所/中心负责人" prop="safetyCenterManagerName" width="200" />
           <el-table-column label="安全责任部门" prop="safetyResponsibleDepartment" width="180" />
           <el-table-column label="安全责任部门负责人" prop="safetyDepartmentManagerName" width="180" />
           <el-table-column label="安全具体责任人" prop="safetySpecificPersonName" width="180" />
           <el-table-column label="安全具体责任人联系方式" prop="safetyPersonContact" width="230" />
-          <el-table-column label="变更原因" prop="changeReason" width="170" />
+          <el-table-column label="是否进行过责任人变更" prop="changed" width="220" />
+          <el-table-column label="变更原因" show-overflow-tooltip prop="changeReason" width="170" />
           <el-table-column label="状态" prop="statusName" width="100" />
           <el-table-column fixed="right" min-width="240" label="操作">
             <template #default="scope">
@@ -120,6 +121,9 @@
               >
                 撤回
               </el-button>
+              <template v-if="scope.row.changed === '是'">
+                <el-button type="primary" link @click="changedList(scope.row)">变更记录</el-button>
+              </template>
             </template>
           </el-table-column>
         </el-table>
@@ -137,6 +141,47 @@
         />
       </div>
     </main>
+    <!-- 变更记录 -->
+    <el-dialog width="70%" v-model="changedVisible" title="公共区域变更记录">
+        <div class="table-content">
+            <h4>当前信息(变更后)</h4>
+            <el-table :data="changedListData.currentRecord">
+                <el-table-column type="index" label="编号" width="80" />
+                <el-table-column label="楼号" prop="buildingNo" width="100" />
+                <el-table-column label="楼层" prop="buildingArea" width="100" />
+                <el-table-column label="房间/区域" prop="floorRoomNo" width="180" />
+                <el-table-column label="功能名称" prop="nameFunction" width="160" />
+                <el-table-column label="安全责任所/中心" prop="safetyResponsibleCenter" width="200" />
+                <el-table-column label="安全责任所/中心负责人" prop="safetyCenterManagerName" width="200" />
+                <el-table-column label="安全责任部门" prop="safetyResponsibleDepartment" width="180" />
+                <el-table-column label="安全责任部门负责人" prop="safetyDepartmentManagerName" width="180" />
+                <el-table-column label="安全具体责任人" prop="safetySpecificPersonName" width="180" />
+                <el-table-column label="安全具体责任人联系方式" prop="safetyPersonContact" width="230" />
+                <el-table-column label="变更原因" show-overflow-tooltip prop="changeReason" width="170" />
+                <el-table-column label="状态" prop="statusName" width="100" />
+            </el-table>
+        </div>
+        <div class="table-content">
+            <h4>历史记录(变更前)</h4>
+            <el-table :data="changedListData.historiesRecords">
+                <el-table-column type="index" label="编号" width="80" />
+                <el-table-column label="变更时间" prop="createdAt" width="180" />
+                <el-table-column label="变更人" prop="safetySpecificPersonName" width="180" />
+                <el-table-column label="楼号" prop="buildingNo" width="100" />
+                <el-table-column label="楼层" prop="buildingArea" width="100" />
+                <el-table-column label="房间/区域" prop="floorRoomNo" width="180" />
+                <el-table-column label="功能名称" prop="nameFunction" width="160" />
+                <el-table-column label="安全责任所/中心" prop="safetyResponsibleCenter" width="200" />
+                <el-table-column label="安全责任所/中心负责人" prop="safetyCenterManagerName" width="200" />
+                <el-table-column label="安全责任部门" prop="safetyResponsibleDepartment" width="180" />
+                <el-table-column label="安全责任部门负责人" prop="safetyDepartmentManagerName" width="180" />
+                <el-table-column label="安全具体责任人" prop="safetySpecificPersonName" width="180" />
+                <el-table-column label="安全具体责任人联系方式" prop="safetyPersonContact" width="230" />
+                <el-table-column label="变更原因" show-overflow-tooltip prop="changeReason" width="170" />
+                <el-table-column label="状态" prop="statusName" width="100" />
+            </el-table>
+        </div>
+    </el-dialog>
   </div>
   <BatchImport
     :visible="batchImportVisible"
@@ -157,6 +202,7 @@
     areaCheckListApprove,
     areaCheckListDelete,
     areaCheckListExportArea,
+    queryChangedList,
   } from '@/api/production-safety/responsibility-implementation';
   import urlJoin from 'url-join';
   import { BatchImport } from '@/components/batch-import';
@@ -192,7 +238,23 @@
     batchImportVisible.value = false;
     queryTableList();
   };
-
+  const changedVisible = ref(false)
+  const changedListData = reactive({
+  currentRecord:[],
+  historiesRecords:[]
+})
+  const changedList = async(item)=>{
+    await fetchTableList(item.id)
+    changedVisible.value = true
+  }
+  const fetchTableList = async (id)=>{
+    let res = await queryChangedList({id})
+    if(!res){ return }
+    Object.assign(changedListData, {
+        currentRecord: res.currentRecord || [],
+        historiesRecords: res.historiesRecords || []
+    })
+  }
   const tableData = reactive({
     data: [],
     total: 0,

+ 68 - 1
src/views/production-safety/implement-safety-duty/non-public-list-responsibilities/list.vue

@@ -71,13 +71,14 @@
           <el-table-column label="楼号" prop="buildingNo" width="80" />
           <el-table-column label="楼层" prop="buildingArea" width="100" />
           <el-table-column label="房间/区域" prop="floorRoomNo" width="180" />
-          <el-table-column label="功能名称" prop="nameFunction" width="120" />
+          <el-table-column label="功能名称" prop="nameFunction" width="180" />
           <el-table-column label="安全责任所/中心" prop="safetyResponsibleCenter" width="200" />
           <el-table-column label="安全责任所/中心负责人" prop="safetyCenterManagerName" width="200" />
           <el-table-column label="安全责任部门" prop="safetyResponsibleDepartment" width="180" />
           <el-table-column label="安全责任部门负责人" prop="safetyDepartmentManagerName" width="180" />
           <el-table-column label="安全具体责任人" prop="safetySpecificPersonName" width="180" />
           <el-table-column label="安全具体责任人联系方式" prop="safetyPersonContact" width="230" />
+          <el-table-column label="是否进行过责任人变更" prop="changed" width="220" />
           <el-table-column label="变更原因" prop="changeReason" width="170" />
           <el-table-column label="状态" prop="statusName" width="100" />
           <el-table-column fixed="right" min-width="240" label="操作">
@@ -144,6 +145,9 @@
               >
                 撤回
               </el-button>
+              <template v-if="scope.row.changed === '是'">
+                <el-button type="primary" link @click="changedList(scope.row)">变更记录</el-button>
+              </template>
             </template>
           </el-table-column>
         </el-table>
@@ -161,6 +165,47 @@
         />
       </div>
     </main>
+    <!-- 变更记录 -->
+    <el-dialog width="70%" v-model="changedVisible" title="非公共区域变更记录">
+        <div class="table-content">
+            <h4>当前信息(变更后)</h4>
+            <el-table :data="changedListData.currentRecord">
+                <el-table-column type="index" label="序号" width="80" />
+                <el-table-column label="楼号" prop="buildingNo" width="80" />
+                <el-table-column label="楼层" prop="buildingArea" width="100" />
+                <el-table-column label="房间/区域" prop="floorRoomNo" width="180" />
+                <el-table-column label="功能名称" prop="nameFunction" width="180" />
+                <el-table-column label="安全责任所/中心" prop="safetyResponsibleCenter" width="200" />
+                <el-table-column label="安全责任所/中心负责人" prop="safetyCenterManagerName" width="200" />
+                <el-table-column label="安全责任部门" prop="safetyResponsibleDepartment" width="180" />
+                <el-table-column label="安全责任部门负责人" prop="safetyDepartmentManagerName" width="180" />
+                <el-table-column label="安全具体责任人" prop="safetySpecificPersonName" width="180" />
+                <el-table-column label="安全具体责任人联系方式" prop="safetyPersonContact" width="230" />
+                <el-table-column label="变更原因" show-overflow-tooltip prop="changeReason" width="170" />
+                <el-table-column label="状态" prop="statusName" width="100" />
+            </el-table>
+        </div>
+        <div class="table-content">
+            <h4>历史记录(变更前)</h4>
+            <el-table :data="changedListData.historiesRecords">
+                <el-table-column type="index" label="序号" width="80" />
+                <el-table-column label="变更时间" prop="createdAt" width="180" />
+                <el-table-column label="变更人" prop="safetySpecificPersonName" width="180" />
+                <el-table-column label="楼号" prop="buildingNo" width="80" />
+                <el-table-column label="楼层" prop="buildingArea" width="100" />
+                <el-table-column label="房间/区域" prop="floorRoomNo" width="180" />
+                <el-table-column label="功能名称" prop="nameFunction" width="180" />
+                <el-table-column label="安全责任所/中心" prop="safetyResponsibleCenter" width="200" />
+                <el-table-column label="安全责任所/中心负责人" prop="safetyCenterManagerName" width="200" />
+                <el-table-column label="安全责任部门" prop="safetyResponsibleDepartment" width="180" />
+                <el-table-column label="安全责任部门负责人" prop="safetyDepartmentManagerName" width="180" />
+                <el-table-column label="安全具体责任人" prop="safetySpecificPersonName" width="180" />
+                <el-table-column label="安全具体责任人联系方式" prop="safetyPersonContact" width="230" />
+                <el-table-column label="变更原因" show-overflow-tooltip prop="changeReason" width="170" />
+                <el-table-column label="状态" prop="statusName" width="100" />
+            </el-table>
+        </div>
+    </el-dialog>
   </div>
   <BatchImport
     :visible="batchImportVisible"
@@ -181,6 +226,7 @@
     areaCheckListDelete,
     areaCheckListExportArea,
     queryAvailableUserList,
+    queryChangedList,
   } from '@/api/production-safety/responsibility-implementation';
   import urlJoin from 'url-join';
   import { BatchImport } from '@/components/batch-import';
@@ -253,7 +299,24 @@
       });
     }
   };
+  const changedVisible = ref(false)
 
+  const changedListData = reactive({
+  currentRecord:[],
+  historiesRecords:[]
+})
+  const changedList = async(item)=>{
+    await fetchTableList(item.id)
+    changedVisible.value = true
+  }
+  const fetchTableList = async (id)=>{
+    let res = await queryChangedList({id})
+    if(!res){ return }
+    Object.assign(changedListData, {
+        currentRecord: res.currentRecord || [],
+        historiesRecords: res.historiesRecords || []
+    })
+  }
   const getDeptData = () => {
     getAllDepartments().then((res) => {
       firstLevelDepts.value = formatDeptTree(res);
@@ -413,4 +476,8 @@
     display: flex;
     justify-content: flex-end;
   }
+  .table-content h4 {
+    margin: 18px 0 12px 0;
+    color: #409eff;
+  }
 </style>

+ 66 - 2
src/views/production-safety/implement-safety-duty/public-area-responsibilities/list.vue

@@ -60,7 +60,8 @@
           <el-table-column label="安全责任部门负责人" prop="safetyDepartmentManagerName" width="180" />
           <el-table-column label="安全具体责任人" prop="safetySpecificPersonName" width="180" />
           <el-table-column label="安全具体责任人联系方式" prop="safetyPersonContact" width="230" />
-          <el-table-column label="变更原因" prop="changeReason" width="170" />
+          <el-table-column label="是否进行过责任人变更" prop="changed" width="220" />
+          <el-table-column label="变更原因" show-overflow-tooltip prop="changeReason" width="170" />
           <el-table-column label="状态" prop="statusName" width="100" />
           <el-table-column fixed="right" min-width="240" label="操作">
             <template #default="scope">
@@ -124,6 +125,9 @@
               >
                 撤回
               </el-button>
+              <template v-if="scope.row.changed === '是'">
+                <el-button type="primary" link @click="changedList(scope.row)">变更记录</el-button>
+              </template>
             </template>
           </el-table-column>
         </el-table>
@@ -141,6 +145,45 @@
         />
       </div>
     </main>
+    <!-- 变更记录 -->
+    <el-dialog width="70%" v-model="changedVisible" title="公共区域变更记录">
+        <div class="table-content">
+            <h4>当前信息(变更后)</h4>
+            <el-table :data="changedListData.currentRecord">
+                <el-table-column type="index" label="编号" width="80" />
+                <el-table-column label="楼宇/区域" prop="buildingArea" width="160" />
+                <el-table-column label="楼层/房号" prop="floorRoomNo" width="180" />
+                <el-table-column label="功能名称" prop="nameFunction" width="160" />
+                <el-table-column label="安全责任所/中心" prop="safetyResponsibleCenter" width="200" />
+                <el-table-column label="安全责任所/中心负责人" prop="safetyCenterManagerName" width="200" />
+                <el-table-column label="安全责任部门" prop="safetyResponsibleDepartment" width="180" />
+                <el-table-column label="安全责任部门负责人" prop="safetyDepartmentManagerName" width="180" />
+                <el-table-column label="安全具体责任人" prop="safetySpecificPersonName" width="180" />
+                <el-table-column label="安全具体责任人联系方式" prop="safetyPersonContact" width="230" />
+                <el-table-column label="变更原因" show-overflow-tooltip prop="changeReason" width="170" />
+                <el-table-column label="状态" prop="statusName" width="100" />
+            </el-table>
+        </div>
+        <div class="table-content">
+            <h4>历史记录(变更前)</h4>
+            <el-table :data="changedListData.historiesRecords">
+                <el-table-column type="index" label="编号" width="80" />
+                <el-table-column label="变更时间" prop="createdAt" width="180" />
+                <el-table-column label="变更人" prop="safetySpecificPersonName" width="180" />
+                <el-table-column label="楼宇/区域" prop="buildingArea" width="160" />
+                <el-table-column label="楼层/房号" prop="floorRoomNo" width="180" />
+                <el-table-column label="功能名称" prop="nameFunction" width="160" />
+                <el-table-column label="安全责任所/中心" prop="safetyResponsibleCenter" width="200" />
+                <el-table-column label="安全责任所/中心负责人" prop="safetyCenterManagerName" width="200" />
+                <el-table-column label="安全责任部门" prop="safetyResponsibleDepartment" width="180" />
+                <el-table-column label="安全责任部门负责人" prop="safetyDepartmentManagerName" width="180" />
+                <el-table-column label="安全具体责任人" prop="safetySpecificPersonName" width="180" />
+                <el-table-column label="安全具体责任人联系方式" prop="safetyPersonContact" width="230" />
+                <el-table-column label="变更原因" show-overflow-tooltip prop="changeReason" width="170" />
+                <el-table-column label="状态" prop="statusName" width="100" />
+            </el-table>
+        </div>
+    </el-dialog>
   </div>
   <BatchImport
     :visible="batchImportVisible"
@@ -161,6 +204,7 @@
     areaCheckListApprove,
     areaCheckListDelete,
     areaCheckListExportArea,
+    queryChangedList,
   } from '@/api/production-safety/responsibility-implementation';
   import urlJoin from 'url-join';
   import { BatchImport } from '@/components/batch-import';
@@ -196,7 +240,23 @@
     batchImportVisible.value = false;
     queryTableList();
   };
-
+  const changedVisible = ref(false)
+  const changedListData = reactive({
+  currentRecord:[],
+  historiesRecords:[]
+})
+  const changedList = async(item)=>{
+    await fetchTableList(item.id)
+    changedVisible.value = true
+  }
+  const fetchTableList = async (id)=>{
+    let res = await queryChangedList({id})
+    if(!res){ return }
+    Object.assign(changedListData, {
+        currentRecord: res.currentRecord || [],
+        historiesRecords: res.historiesRecords || []
+    })
+  }
   const tableData = reactive({
     data: [],
     total: 0,
@@ -347,4 +407,8 @@
     display: flex;
     justify-content: flex-end;
   }
+  .table-content h4 {
+    margin: 18px 0 12px 0;
+    color: #409eff;
+  }
 </style>

+ 67 - 7
src/views/production-safety/implement-safety-duty/public-list-responsibilities/list.vue

@@ -67,7 +67,6 @@
       <div class="table-content">
         <el-table :data="tableData.data">
           <el-table-column type="index" label="序号" width="80" />
-          <!-- <el-table-column label="楼号" prop="buildingNo" width="80" /> -->
           <el-table-column label="楼宇/区域" prop="buildingArea" width="120" />
           <el-table-column label="楼层/房号" prop="floorRoomNo" width="180" />
           <el-table-column label="名称/功能" prop="nameFunction" width="120" />
@@ -78,7 +77,7 @@
           <el-table-column label="安全具体责任人" prop="safetySpecificPersonName" width="180" />
           <el-table-column label="安全具体责任人联系方式" prop="safetyPersonContact" width="230" />
           <el-table-column label="是否进行过责任人变更" prop="changed" width="220" />
-          <el-table-column label="变更原因" prop="changeReason" width="170" />
+          <el-table-column label="变更原因" show-overflow-tooltip prop="changeReason" width="170" />
           <el-table-column label="状态" prop="statusName" width="100" />
           <el-table-column fixed="right" min-width="240" label="操作">
             <template #default="scope">
@@ -120,10 +119,6 @@
                 <el-button type="primary" link @click="handleAreaCheckListApprove(scope, 1)">确认</el-button>
                 <el-button type="primary" link @click="handleAreaCheckListApprove(scope, 0)">拒绝</el-button>
               </template>
-              <!-- <template> -->
-                <!-- v-if="scope.row.changed === '是'" -->
-                <el-button type="primary" link>变更记录</el-button>
-             <!-- </template> -->
               <el-button
                 type="primary"
                 link
@@ -145,6 +140,9 @@
               >
                 撤回
               </el-button>
+              <template v-if="scope.row.changed === '是'">
+                <el-button type="primary" link @click="changedList(scope.row)">变更记录</el-button>
+              </template>
             </template>
           </el-table-column>
         </el-table>
@@ -162,6 +160,47 @@
         />
       </div>
     </main>
+    <!-- 变更记录 -->
+    <el-dialog width="70%" v-model="changedVisible" title="公共区域变更记录">
+        <div class="table-content">
+            <h4>当前信息(变更后)</h4>
+            <el-table :data="changedListData.currentRecord">
+                <el-table-column type="index" label="编号" width="80" />
+                <el-table-column label="楼宇/区域" prop="buildingArea" width="180" />
+                <el-table-column label="楼层/房号" prop="floorRoomNo" width="180" />
+                <el-table-column label="名称/功能" prop="nameFunction" width="180" />
+                <el-table-column label="安全责任所/中心" prop="safetyResponsibleCenter" width="210" />
+                <el-table-column label="安全责任所/中心负责人" prop="safetyCenterManagerName" width="200" />
+                <el-table-column label="安全责任部门" prop="safetyResponsibleDepartment" width="210" />
+                <el-table-column label="安全责任部门负责人" prop="safetyDepartmentManagerName" width="180" />
+                <el-table-column label="安全具体责任人" prop="safetySpecificPersonName" width="180" />
+                <el-table-column label="安全具体责任人联系方式" prop="safetyPersonContact" width="230" />
+                <el-table-column label="是否进行过责任人变更" prop="changed" width="220" />
+                <el-table-column label="变更原因" show-overflow-tooltip prop="changeReason" width="170" />
+                <el-table-column label="状态" prop="statusName" width="100" />
+            </el-table>
+        </div>
+        <div class="table-content">
+            <h4>历史记录(变更前)</h4>
+            <el-table :data="changedListData.historiesRecords">
+                <el-table-column type="index" label="编号" width="80" />
+                <el-table-column label="变更时间" prop="createdAt" width="180" />
+                <el-table-column label="变更人" prop="safetySpecificPersonName" width="180" />
+                <el-table-column label="楼宇/区域" prop="buildingArea" width="180" />
+                <el-table-column label="楼层/房号" prop="floorRoomNo" width="180" />
+                <el-table-column label="名称/功能" prop="nameFunction" width="180" />
+                <el-table-column label="安全责任所/中心" prop="safetyResponsibleCenter" width="210" />
+                <el-table-column label="安全责任所/中心负责人" prop="safetyCenterManagerName" width="200" />
+                <el-table-column label="安全责任部门" prop="safetyResponsibleDepartment" width="210" />
+                <el-table-column label="安全责任部门负责人" prop="safetyDepartmentManagerName" width="180" />
+                <el-table-column label="安全具体责任人" prop="safetySpecificPersonName" width="180" />
+                <el-table-column label="安全具体责任人联系方式" prop="safetyPersonContact" width="230" />
+                <el-table-column label="是否进行过责任人变更" prop="changed" width="220" />
+                <el-table-column label="变更原因" show-overflow-tooltip prop="changeReason" width="170" />
+                <el-table-column label="状态" prop="statusName" width="100" />
+            </el-table>
+        </div>
+    </el-dialog>
   </div>
   <BatchImport
     :visible="batchImportVisible"
@@ -182,6 +221,7 @@
     areaCheckListDelete,
     areaCheckListExportArea,
     queryAvailableUserList,
+    queryChangedList,
   } from '@/api/production-safety/responsibility-implementation';
   import urlJoin from 'url-join';
   import { BatchImport } from '@/components/batch-import';
@@ -208,7 +248,7 @@
       safetySpecificPerson: '',
     },
   });
-
+  const changedVisible = ref(false)
   const cascaderRef = ref<any>(null);
   const firstLevelDepts = ref<any[]>([]);
   const cascaderProp = {
@@ -244,6 +284,22 @@
     }
   };
 
+  const changedListData = reactive({
+  currentRecord:[],
+  historiesRecords:[]
+})
+  const changedList = async(item)=>{
+    await fetchTableList(item.id)
+    changedVisible.value = true
+  }
+  const fetchTableList = async (id)=>{
+    let res = await queryChangedList({id})
+    if(!res){ return }
+    Object.assign(changedListData, {
+        currentRecord: res.currentRecord || [],
+        historiesRecords: res.historiesRecords || []
+    })
+  }
   const handleTabChange = (tab) => {
     if (tab === 1) {
       router.push({
@@ -424,4 +480,8 @@
     display: flex;
     justify-content: flex-end;
   }
+  .table-content h4 {
+    margin: 18px 0 12px 0;
+    color: #409eff;
+  }
 </style>

+ 8 - 8
src/views/production-safety/implement-safety-duty/responsibility-agree-manage-dept.vue

@@ -238,9 +238,9 @@
     pageNumber: 1,
     pageSize: 10,
     queryParam: {
-      responsibilityName: '',
-      departmentName: '',
-      status: '',
+      responsibilityName: undefined,
+      departmentName: undefined,
+      status: undefined,
       date: '',
       responsibilityPersonId: userId,
     },
@@ -416,11 +416,11 @@
       pageNumber: 1,
       pageSize: 10,
       queryParam: {
-        responsibilityName: '',
-        departmentName: '',
-        status: '',
-        date: '',
-        responsibilityPersonId: '',
+       responsibilityName: undefined,
+       departmentName: undefined,
+       status: undefined,
+       date: '',
+       responsibilityPersonId: userId,
       },
     });
     queryTableList();

+ 9 - 3
src/views/production-safety/risk-identification-and-control/equipment-high-alert/list.vue

@@ -191,7 +191,7 @@
   import ActionButton from '@/components/ActionButton.vue';
   import { TABLE_OPTIONS, SPECIAL_EQUIPMENT_TABLE_COLUMNS } from './configs/tables';
   import { DEVICE_CATEGORY_OPTIONS, Alarm_TYPE_OPTIONS, DEVICE_TYPE, ALARM_TYPE, type DETAIL_DATA_TYPE, ALARM_STATUS, HANDLE_STATUS} from './configs/form';
-  import {type QueryParamType, equipmentHighAlertList, deptList, exportTableData} from '@/api/equipment-high-alert-List'
+  import {type QueryParamType, equipmentHighAlertList, deptList, exportTableData, DeviceTypeList} from '@/api/equipment-high-alert-List'
   import { downloadByData } from '@/utils/file/download';
 
   import dayjs from 'dayjs';
@@ -199,7 +199,7 @@
   const dateRange = ref<[string, string] | null>(null);
   const DetailDialog = ref<boolean>(false)
   const detail = reactive({}) as DETAIL_DATA_TYPE
-
+  const alarmTypeData = ref([])
   // BasicTable
   const basicTableRef = ref<InstanceType<typeof BasicTable>>();
   const { tableConfig, pagination } = useTableConfig(SPECIAL_EQUIPMENT_TABLE_COLUMNS, TABLE_OPTIONS);
@@ -260,7 +260,12 @@
     }
     
   };
-
+  const loadDeviceTypeList = async ()=> {
+    let res = await DeviceTypeList()
+    if(res){
+        alarmTypeData.value = res
+    }
+  }
   const loadDeptTree = async () => {
     try {
       const res = await getAllDepartments();
@@ -347,6 +352,7 @@
   };
 
   onMounted(() => {
+    loadDeviceTypeList()
     getDeptList()
     loadDeptTree();
     queryTableList();