From 55c066dadbaea56101b22c9501f35f3bca24f4e5 Mon Sep 17 00:00:00 2001
From: huangchengfa <171504222@qq.com>
Date: Fri, 12 Dec 2025 18:08:51 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../warningList/portraitWarning/index.vue     | 37 ++++++++-----------
 .../warningList/vehicleWarning/index.vue      | 37 ++++++++-----------
 2 files changed, 32 insertions(+), 42 deletions(-)

diff --git a/src/views/backOfficeSystem/fourColorManage/warningList/portraitWarning/index.vue b/src/views/backOfficeSystem/fourColorManage/warningList/portraitWarning/index.vue
index 3a71c6c..c960848 100644
--- a/src/views/backOfficeSystem/fourColorManage/warningList/portraitWarning/index.vue
+++ b/src/views/backOfficeSystem/fourColorManage/warningList/portraitWarning/index.vue
@@ -2,7 +2,7 @@
   <div>
     <div class="titleBox">
 
-      <PageTitle title="预警列表">
+      <PageTitle title="人像预警">
         <el-button type="success" @click="openSearch">
           <Search style="width: 1em; height: 1em; margin-right: 8px" />
           <span style="vertical-align: middle" v-if="!search">搜索</span>
@@ -13,11 +13,11 @@
     <!-- 搜索 -->
     <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-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> -->
         <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">
@@ -36,17 +36,10 @@
       </el-form>
     </div>
     <!-- 表格 -->
-    <div class="tabBox" :style="{ height: (pageData.tableHeight + 40) + 'px' }">
-      <el-tabs v-model="activeName" type="card" class="demo-tabs" @tab-click="handleClick"
-        style="position: relative;z-index: 1;">
-        <el-tab-pane label="本地预警" name="local">
-          <div style="padding:0 10px;"> <el-button type="primary" @click="exportExcel">导出</el-button></div>
-          <LocalWarning :maxHeight="search ? (pageData.tableHeight - 200) : (pageData.tableHeight - 200)"
-            ref="localWarningRef" :dict="{ D_GSXT_YJXX_CZZT, D_BZ_YJJB, D_BZ_YJLYXT }" :search="search"/>
-          <!-- pageData.tableHeight-125 -->
-        </el-tab-pane>
-        <el-tab-pane label="区厅预警" name="district">区厅预警</el-tab-pane>
-      </el-tabs>
+    <div class="tabBox" :style="{ height: (pageData.tableHeight + 40) + 'px', paddingTop: '10px' }">
+      <div style="padding:0 10px;"> <el-button type="primary" @click="exportExcel">导出</el-button></div>
+      <LocalWarning :maxHeight="search ? (pageData.tableHeight - 200) : (pageData.tableHeight - 150)"
+        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>
@@ -112,7 +105,7 @@ import FileSaver from "file-saver";
 import emitter from "@/utils/eventBus.js";
 import * as XLSX from "xlsx";
 const { proxy } = getCurrentInstance();
-const { D_BZ_YJLX, D_GSXT_YJXX_CZZT, D_BZ_YJJB, D_BZ_YJLYXT } = proxy.$dict("D_BZ_YJLX", "D_GSXT_YJXX_CZZT", "D_BZ_YJJB", "D_BZ_YJLYXT")
+const { D_GSXT_YJXX_CZZT, D_BZ_YJJB, D_BZ_YJLYXT } = proxy.$dict("D_GSXT_YJXX_CZZT", "D_BZ_YJJB", "D_BZ_YJLYXT")
 const searchBox = ref(); //搜索框
 const shortcuts = [
   {
@@ -182,14 +175,16 @@ const addFromRefs = ref(null)
 onMounted(() => {
   tabHeightFn();
   emitter.on('openAddFrom', (val) => {
-    console.log( addFromRefs.value);
-if(addFromRefs.value) {
-    addFromRefs.value.init('add', val)
-  }
+    console.log(addFromRefs.value);
+    if (addFromRefs.value) {
+      addFromRefs.value.init('add', val)
+    }
     // addFromRefs.value.init('add', val)
   })
 });
-const listQuery = ref({})
+const listQuery = ref({
+  yjlx: '1', // 1.人员预警
+})
 const opentions = ref([])
 const localWarningRef = ref(null);
 // 搜索
@@ -243,7 +238,7 @@ const tabHeightFn = () => {
   } else {
     pageData.tableHeight = window.innerHeight - 250;
   }
-  window.onresize = function () {
+  window.onresize = function() {
     tabHeightFn();
   };
 };
diff --git a/src/views/backOfficeSystem/fourColorManage/warningList/vehicleWarning/index.vue b/src/views/backOfficeSystem/fourColorManage/warningList/vehicleWarning/index.vue
index 3a71c6c..0f8ef66 100644
--- a/src/views/backOfficeSystem/fourColorManage/warningList/vehicleWarning/index.vue
+++ b/src/views/backOfficeSystem/fourColorManage/warningList/vehicleWarning/index.vue
@@ -2,7 +2,7 @@
   <div>
     <div class="titleBox">
 
-      <PageTitle title="预警列表">
+      <PageTitle title="车辆预警">
         <el-button type="success" @click="openSearch">
           <Search style="width: 1em; height: 1em; margin-right: 8px" />
           <span style="vertical-align: middle" v-if="!search">搜索</span>
@@ -13,11 +13,11 @@
     <!-- 搜索 -->
     <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-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> -->
         <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">
@@ -36,17 +36,10 @@
       </el-form>
     </div>
     <!-- 表格 -->
-    <div class="tabBox" :style="{ height: (pageData.tableHeight + 40) + 'px' }">
-      <el-tabs v-model="activeName" type="card" class="demo-tabs" @tab-click="handleClick"
-        style="position: relative;z-index: 1;">
-        <el-tab-pane label="本地预警" name="local">
-          <div style="padding:0 10px;"> <el-button type="primary" @click="exportExcel">导出</el-button></div>
-          <LocalWarning :maxHeight="search ? (pageData.tableHeight - 200) : (pageData.tableHeight - 200)"
-            ref="localWarningRef" :dict="{ D_GSXT_YJXX_CZZT, D_BZ_YJJB, D_BZ_YJLYXT }" :search="search"/>
-          <!-- pageData.tableHeight-125 -->
-        </el-tab-pane>
-        <el-tab-pane label="区厅预警" name="district">区厅预警</el-tab-pane>
-      </el-tabs>
+    <div class="tabBox" :style="{ height: (pageData.tableHeight + 40) + 'px', paddingTop: '10px' }">
+      <div style="padding:0 10px;"> <el-button type="primary" @click="exportExcel">导出</el-button></div>
+      <LocalWarning :maxHeight="search ? (pageData.tableHeight - 200) : (pageData.tableHeight - 150)"
+        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>
@@ -112,7 +105,7 @@ import FileSaver from "file-saver";
 import emitter from "@/utils/eventBus.js";
 import * as XLSX from "xlsx";
 const { proxy } = getCurrentInstance();
-const { D_BZ_YJLX, D_GSXT_YJXX_CZZT, D_BZ_YJJB, D_BZ_YJLYXT } = proxy.$dict("D_BZ_YJLX", "D_GSXT_YJXX_CZZT", "D_BZ_YJJB", "D_BZ_YJLYXT")
+const { D_GSXT_YJXX_CZZT, D_BZ_YJJB, D_BZ_YJLYXT } = proxy.$dict("D_GSXT_YJXX_CZZT", "D_BZ_YJJB", "D_BZ_YJLYXT")
 const searchBox = ref(); //搜索框
 const shortcuts = [
   {
@@ -182,14 +175,16 @@ const addFromRefs = ref(null)
 onMounted(() => {
   tabHeightFn();
   emitter.on('openAddFrom', (val) => {
-    console.log( addFromRefs.value);
-if(addFromRefs.value) {
-    addFromRefs.value.init('add', val)
-  }
+    console.log(addFromRefs.value);
+    if (addFromRefs.value) {
+      addFromRefs.value.init('add', val)
+    }
     // addFromRefs.value.init('add', val)
   })
 });
-const listQuery = ref({})
+const listQuery = ref({
+  yjlx: '2', // 2.车辆预警
+})
 const opentions = ref([])
 const localWarningRef = ref(null);
 // 搜索
@@ -243,7 +238,7 @@ const tabHeightFn = () => {
   } else {
     pageData.tableHeight = window.innerHeight - 250;
   }
-  window.onresize = function () {
+  window.onresize = function() {
     tabHeightFn();
   };
 };