From f1a1be33aa9569529913e7c34110c6057e6807b3 Mon Sep 17 00:00:00 2001
From: huangchengfa <171504222@qq.com>
Date: Fri, 12 Dec 2025 19:37:21 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8E=A5=E5=8F=A3=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/localWarning.vue               | 22 ++++++++++++-------
 .../warningList/portraitWarning/index.vue     | 15 +++++--------
 .../components/localWarning.vue               |  1 +
 .../warningList/vehicleWarning/index.vue      | 20 +++++------------
 4 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/src/views/backOfficeSystem/fourColorManage/warningList/portraitWarning/components/localWarning.vue b/src/views/backOfficeSystem/fourColorManage/warningList/portraitWarning/components/localWarning.vue
index 95aac4a..252af60 100644
--- a/src/views/backOfficeSystem/fourColorManage/warningList/portraitWarning/components/localWarning.vue
+++ b/src/views/backOfficeSystem/fourColorManage/warningList/portraitWarning/components/localWarning.vue
@@ -1,13 +1,13 @@
 <template>
   <div>
     <!-- 表格 -->
-    <div class="tabBox" :style="{height:!search?maxHeight+200+'px':(maxHeight+150)+'px'}">
-      <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="maxHeight+'px'"
+    <div class="tabBox" :style="{ height: !search ? maxHeight + 200 + 'px' : (maxHeight + 150) + 'px' }">
+      <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="maxHeight + 'px'"
         :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth"
-        :expand="true" >
+        :expand="true">
         <template #expand="{ props }">
           <div class="expand-content" style="max-width: 100%">
-           <Items :data="props" :dict="dict" />
+            <Items :data="props" :dict="dict" />
           </div>
         </template>
         <template #yjTp="{ row }">
@@ -54,7 +54,7 @@
       <el-button type="success" @click="showFeedback(item, '反馈')" v-if="item.czzt == '02'">反馈</el-button>
       <el-button type="success" @click="showFeedback(item, '查看反馈')" v-if="item.czzt == '03'">查看反馈</el-button> -->
       </MyTable>
-      <Pages @changeNo="changeNo" @changeSize="changeSize" :tableHeight="maxHeight+100" :pageConfiger="{
+      <Pages @changeNo="changeNo" @changeSize="changeSize" :tableHeight="maxHeight + 100" :pageConfiger="{
         ...pageData.pageConfiger,
         total: pageData.total
       }"></Pages>
@@ -116,13 +116,13 @@ const pageData = reactive({
   }, //分页
   controlsWidth: 300, //操作栏宽度
   tableColumn: [
-    { label: "预警图片", prop: "yjTp", showSolt: true,width: 100 },
+    { label: "预警图片", prop: "yjTp", showSolt: true, width: 100 },
     { label: "处置状态", prop: "czzt", showSolt: true },
     { label: "预警时间", prop: "yjSj", showOverflowTooltip: true },
     { label: "姓名", prop: "yjRyxm" },
-    { label: "年龄", prop: "nl", showSolt: true,width: 80 },
+    { label: "年龄", prop: "nl", showSolt: true, width: 80 },
     { label: "数据来源", prop: "yjLylx", showOverflowTooltip: true },
-   { label: "身份证", prop: "yjRysfzh", showOverflowTooltip: true },
+    { label: "身份证", prop: "yjRysfzh", showOverflowTooltip: true },
     // { label: "预警级别", prop: "yjJb", showSolt: true },
     // { label: "相似度", prop: "xsd", showSolt: true },
     { label: "布控车牌号", prop: "yjClcph", showOverflowTooltip: true },
@@ -163,6 +163,7 @@ const getList = (val) => {
     pageData.tableData = res.records.map(item => {
       return {
         ...item,
+        yjLx: '01', // 人员预警
         yjTp: item.yjlx == '01' ? item.yjTpreplace(ORDIMG, IMGYM) : item.yjTp
       }
     }) || [];
@@ -251,6 +252,7 @@ defineExpose({
 .el-loading-mask {
   background: rgba(0, 0, 0, 0.5) !important;
 }
+
 /* 预警级别行样式 */
 .warning-level-01 {
   background-color: rgba(255, 2, 2, 0.1) !important;
@@ -259,6 +261,7 @@ defineExpose({
 .warning-level-01:hover {
   background-color: rgba(255, 2, 2, 0.15) !important;
 }
+
 .warning-level-02 {
   background-color: rgba(255, 140, 0, 0.1) !important;
 }
@@ -266,6 +269,7 @@ defineExpose({
 .warning-level-02:hover {
   background-color: rgba(255, 140, 0, 0.15) !important;
 }
+
 .warning-level-03 {
   background-color: rgba(255, 210, 8, 0.1) !important;
 }
@@ -273,6 +277,7 @@ defineExpose({
 .warning-level-03:hover {
   background-color: rgba(255, 210, 8, 0.15) !important;
 }
+
 .warning-level-04 {
   background-color: rgba(0, 0, 255, 0.1) !important;
 }
@@ -280,6 +285,7 @@ defineExpose({
 .warning-level-04:hover {
   background-color: rgba(0, 0, 255, 0.15) !important;
 }
+
 /* 确保行样式应用到所有单元格 */
 .warning-level-01 td,
 .warning-level-02 td,
diff --git a/src/views/backOfficeSystem/fourColorManage/warningList/portraitWarning/index.vue b/src/views/backOfficeSystem/fourColorManage/warningList/portraitWarning/index.vue
index c960848..15010a8 100644
--- a/src/views/backOfficeSystem/fourColorManage/warningList/portraitWarning/index.vue
+++ b/src/views/backOfficeSystem/fourColorManage/warningList/portraitWarning/index.vue
@@ -13,11 +13,6 @@
     <!-- 搜索 -->
     <div ref="searchBox" class="searchBox" v-if="search">
       <el-form :model="listQuery" label-width="auto" :inline="true" ref="searchArr">
-        <!-- <el-form-item label="布控类型" prop="yjlx">
-          <el-select v-model="listQuery.yjlx" placeholder="请选择预警类型">
-            <el-option v-for="item in D_BZ_YJLX" :key="item.value" :label="item.label" :value="item.value" />
-          </el-select>
-        </el-form-item> -->
         <el-form-item label="布控人员" prop="yjRyxm	">
           <el-select clearable v-model="listQuery.yjRyxm" filterable remote reserve-keyword placeholder="请输入布控人员"
             :remote-method="remoteMethod" :loading="loading" style="width: 240px">
@@ -42,7 +37,7 @@
         ref="localWarningRef" :dict="{ D_GSXT_YJXX_CZZT, D_BZ_YJJB, D_BZ_YJLYXT }" :search="search" />
     </div>
   </div>
-  <el-dialog v-model="showDc" title="导出预警" width="80%" align-center>
+  <el-dialog v-model="showDc" title="导出预警" width="80%">
     <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="500"
       :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth">
       <template #yjTp="{ row }">
@@ -137,6 +132,8 @@ const shortcuts = [
   },
 ]
 const pageData = reactive({
+  /** 表格高度 */
+  tableHeight: 600,
   tableData: [], //表格数据
   keyCount: 0,
   tableConfiger: {
@@ -183,7 +180,7 @@ onMounted(() => {
   })
 });
 const listQuery = ref({
-  yjlx: '1', // 1.人员预警
+  // yjlx: '1', // 1.人员预警
 })
 const opentions = ref([])
 const localWarningRef = ref(null);
@@ -192,7 +189,7 @@ const localWarningRef = ref(null);
 const onSearch = () => {
   const promes = {
     yjRyxm: listQuery.value.yjRyxm,
-    yjlx: listQuery.value.yjlx,
+    // yjLx: listQuery.value.yjlx,
     startTime: listQuery.value.time ? listQuery.value.time[0] : '',
     endTime: listQuery.value.time ? listQuery.value.time[1] : '',
   }
@@ -234,7 +231,7 @@ const openSearch = () => {
 // 表格高度计算
 const tabHeightFn = () => {
   if (search.value) {
-    pageData.tableHeight = window.innerHeight - searchBox.value.offsetHeight - 250;
+    pageData.tableHeight = window.innerHeight - (searchBox.value?.offsetHeight || 0) - 250;
   } else {
     pageData.tableHeight = window.innerHeight - 250;
   }
diff --git a/src/views/backOfficeSystem/fourColorManage/warningList/vehicleWarning/components/localWarning.vue b/src/views/backOfficeSystem/fourColorManage/warningList/vehicleWarning/components/localWarning.vue
index 95aac4a..0fd459e 100644
--- a/src/views/backOfficeSystem/fourColorManage/warningList/vehicleWarning/components/localWarning.vue
+++ b/src/views/backOfficeSystem/fourColorManage/warningList/vehicleWarning/components/localWarning.vue
@@ -163,6 +163,7 @@ const getList = (val) => {
     pageData.tableData = res.records.map(item => {
       return {
         ...item,
+        yjLx: '02', // 车辆预警
         yjTp: item.yjlx == '01' ? item.yjTpreplace(ORDIMG, IMGYM) : item.yjTp
       }
     }) || [];
diff --git a/src/views/backOfficeSystem/fourColorManage/warningList/vehicleWarning/index.vue b/src/views/backOfficeSystem/fourColorManage/warningList/vehicleWarning/index.vue
index 0f8ef66..9b15d33 100644
--- a/src/views/backOfficeSystem/fourColorManage/warningList/vehicleWarning/index.vue
+++ b/src/views/backOfficeSystem/fourColorManage/warningList/vehicleWarning/index.vue
@@ -13,17 +13,6 @@
     <!-- 搜索 -->
     <div ref="searchBox" class="searchBox" v-if="search">
       <el-form :model="listQuery" label-width="auto" :inline="true" ref="searchArr">
-        <!-- <el-form-item label="布控类型" prop="yjlx">
-          <el-select v-model="listQuery.yjlx" placeholder="请选择预警类型">
-            <el-option v-for="item in D_BZ_YJLX" :key="item.value" :label="item.label" :value="item.value" />
-          </el-select>
-        </el-form-item> -->
-        <el-form-item label="布控人员" prop="yjRyxm	">
-          <el-select clearable v-model="listQuery.yjRyxm" filterable remote reserve-keyword placeholder="请输入布控人员"
-            :remote-method="remoteMethod" :loading="loading" style="width: 240px">
-            <el-option v-for="item in opentions" :key="item.rySfzh" :label="item.ryXm" :value="item.rySfzh" />
-          </el-select>
-        </el-form-item>
         <el-form-item label="时间筛选">
           <el-date-picker v-model="listQuery.time" type="datetimerange" :shortcuts="shortcuts" range-separator="To"
             start-placeholder="开始时间" end-placeholder="结束时间" value-format="YYYY-MM-DD HH:mm:ss"
@@ -42,7 +31,7 @@
         ref="localWarningRef" :dict="{ D_GSXT_YJXX_CZZT, D_BZ_YJJB, D_BZ_YJLYXT }" :search="search" />
     </div>
   </div>
-  <el-dialog v-model="showDc" title="导出预警" width="80%" align-center>
+  <el-dialog v-model="showDc" title="导出预警" width="80%">
     <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="500"
       :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth">
       <template #yjTp="{ row }">
@@ -137,6 +126,8 @@ const shortcuts = [
   },
 ]
 const pageData = reactive({
+   /** 表格高度 */
+  tableHeight: 600,
   tableData: [], //表格数据
   keyCount: 0,
   tableConfiger: {
@@ -183,7 +174,6 @@ onMounted(() => {
   })
 });
 const listQuery = ref({
-  yjlx: '2', // 2.车辆预警
 })
 const opentions = ref([])
 const localWarningRef = ref(null);
@@ -192,7 +182,7 @@ const localWarningRef = ref(null);
 const onSearch = () => {
   const promes = {
     yjRyxm: listQuery.value.yjRyxm,
-    yjlx: listQuery.value.yjlx,
+    // yjlx: listQuery.value.yjlx,
     startTime: listQuery.value.time ? listQuery.value.time[0] : '',
     endTime: listQuery.value.time ? listQuery.value.time[1] : '',
   }
@@ -234,7 +224,7 @@ const openSearch = () => {
 // 表格高度计算
 const tabHeightFn = () => {
   if (search.value) {
-    pageData.tableHeight = window.innerHeight - searchBox.value.offsetHeight - 250;
+    pageData.tableHeight = window.innerHeight - (searchBox.value?.offsetHeight || 0) - 250;
   } else {
     pageData.tableHeight = window.innerHeight - 250;
   }