diff --git a/src/views/backOfficeSystem/fourColorManage/YjData/index.vue b/src/views/backOfficeSystem/fourColorManage/YjData/index.vue
index 43bdcc0..987c6ce 100644
--- a/src/views/backOfficeSystem/fourColorManage/YjData/index.vue
+++ b/src/views/backOfficeSystem/fourColorManage/YjData/index.vue
@@ -2,18 +2,18 @@
   <div>
     <PageTitle :malginLeft="10" :height="35" backgroundColor="#ffff" :marginBottom="5" :marginTop="5">
       <template #left>
-        <el-button v-for="(item,index) in butList" :key="index" :type="qh == index+1 ? 'primary' : 'default'" @click="add(index+1)" size="small">{{item}}</el-button>
+        <el-button v-for="(item,index) in butList" :key="index" :type="qh == item ? 'primary' : 'default'" @click="add(item)" size="small">{{item}}</el-button>
       </template>
     </PageTitle>
-    <FouColorWarning v-if="qh==1" />
-    <SevenWarning v-if="qh==2" />
-    <IdentityWarning v-if="qh==3" />
-    <BehaviorWarning v-if="qh==4" />
-    <CombinedWarning v-if="qh==5" />
-    <PortraitWarning v-if="qh==6" />
-    <VehicleWarning v-if="qh==7" />
-    <ControlWarning v-if="qh==8" />
-    <RegionalControl v-if="qh==9" />
+    <FouColorWarning v-if="qh=='预警整合'" />
+    <SevenWarning v-if="qh=='七类重点'" />
+    <IdentityWarning v-if="qh=='身份预警'" />
+    <BehaviorWarning v-if="qh=='行为预警'" />
+    <CombinedWarning v-if="qh=='组合预警'" />
+    <PortraitWarning v-if="qh=='人像预警'" />
+    <VehicleWarning v-if="qh=='车辆预警'" />
+    <ControlWarning v-if="qh=='布控预警'" />
+    <RegionalControl v-if="qh=='区域预警'" />
   </div>
 </template>
 <script setup>
@@ -29,7 +29,7 @@ import ControlWarning from "@/views/backOfficeSystem/fourColorManage/warningCont
 import RegionalControl from "@/views/backOfficeSystem/fourColorManage/warningControl/regionalControl/index.vue"
 import { ref } from "vue";
 const butList=ref(["预警整合","七类重点","身份预警","行为预警","组合预警","人像预警","车辆预警","布控预警","区域预警"])
-const qh = ref(1)
+const qh = ref('预警整合')
 const add = (flag) => {
   qh.value = flag
 }
diff --git a/src/views/backOfficeSystem/fourColorManage/warningControl/behaviorWarning/item/items copy.vue b/src/views/backOfficeSystem/fourColorManage/warningControl/behaviorWarning/item/items copy.vue
deleted file mode 100644
index 4d98ea5..0000000
--- a/src/views/backOfficeSystem/fourColorManage/warningControl/behaviorWarning/item/items copy.vue	
+++ /dev/null
@@ -1,106 +0,0 @@
-<template>
-  <div class="warning-item">
-    <div class="second-row">
-      <div class="info-item">预警人姓名：<span>{{ row.xm }}</span></div>
-      <div class="info-item">身份证号：<span>{{ row.sfzh }}</span></div>
-      <div class="info-item">电话：<span>{{ row.dh }}</span></div>
-    </div>
-    <div class="second-row">
-      <div class="info-item">行为大类：<span>{{ row.xldlmc }}</span></div>
-      <div class="info-item">行为子类：<span>{{ row.xwzlmc }}</span></div>
-      <div class="info-item">行为次数：<span>{{ row.xwcs }}次</span></div>
-    </div>
-    <div class="second-row">
-      <div class="info-item">
-        标签颜色：
-        <DictTag :value="row.bqys" :tag="false" :color="bqYs(row.bqys)"
-          :options="Array.isArray(props.dict.D_GS_SSYJ) ? props.dict.D_GS_SSYJ : []" />
-      </div>
-      <div class=" info-item">预警时间：<span>{{ row.yjsj }}</span>
-      </div>
-      <div class="info-item">行为分值：<span>{{ row.xwfz }}</span></div>
-    </div>
-    <div class="second-row">
-      <div class="info-item">
-        处置状态：
-
-        <DictTag v-model:value="row.czzt"
-          :options="Array.isArray(props.dict.D_GSXT_YJXX_CZZT) ? props.dict.D_GSXT_YJXX_CZZT : []" />
-      </div>
-      <div class="info-item">所属部门：<span>{{ row.ssbm }}</span></div>
-      <div class="info-item">所属县局：<span>{{ row.ssxgaj }}</span></div>
-    </div>
-    <div class="second-row">
-      <div class="info-item">所属市局：<span>{{ row.sssgaj }}</span></div>
-      <div class="info-item">接警员姓名：<span>{{ row.jjyxm }}</span></div>
-    </div>
-    <div class="second-row">
-      <div class="info-item full-width">行为描述：<span>{{ row.xwms }}</span></div>
-    </div>
-  </div>
-</template>
-
-<script setup>
-const props = defineProps({
-  /** 表格行数据 */
-  row: {
-    type: Object,
-    default: () => ({})
-  },
-  dict: {
-    type: Object,
-    default: () => ({
-      D_GS_SSYJ: [],
-      D_GSXT_YJXX_CZZT: []
-    })
-  },
-})
-
-const bqYs = (val) => {
-  if (val == '01') { // 红
-    return '#ff0202'
-  } else if (val == '02') { // 橙
-    return '#ff8c00'
-  } else if (val == '03') { // 黄
-    return '#c2c203' // 原亮黄色：ffff00
-  } else if (val == '04') { // 蓝
-    return '#0000ff'
-  }
-}
-
-</script>
-
-<style lang="scss" scoped>
-.warning-item {
-  width: 100%;
-  padding: 15px;
-  border: 1px solid #e8e8e8;
-  border-radius: 8px;
-  background-color: #fafafa;
-}
-
-.second-row {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 20px;
-  margin-bottom: 10px;
-}
-
-.info-item {
-  flex: 0 0 calc(33.33% - 20px);
-  box-sizing: border-box;
-  display: flex;
-  padding: 5px 0;
-  color: #333;
-
-  span {
-    font-weight: 500;
-    color: #606266;
-  }
-}
-
-// 全宽字段
-.full-width {
-  flex: 0 0 100% !important;
-}
-</style>
diff --git a/src/views/backOfficeSystem/fourColorManage/warningControl/combinedWarning/item/items copy.vue b/src/views/backOfficeSystem/fourColorManage/warningControl/combinedWarning/item/items copy.vue
deleted file mode 100644
index 0ba8826..0000000
--- a/src/views/backOfficeSystem/fourColorManage/warningControl/combinedWarning/item/items copy.vue	
+++ /dev/null
@@ -1,74 +0,0 @@
-<template>
-  <div class="warning-item">
-    <div class="second-row">
-      <div class="info-item">姓名：<span>{{ row.xm }}</span></div>
-      <div class="info-item">身份证号：<span>{{ row.sfzh }}</span></div>
-      <div class="info-item">电话：<span>{{ row.dh }}</span></div>
-    </div>
-    <div class="second-row">
-      <div class="info-item">组合大类：<span>{{ row.sfdlmc }}</span></div>
-      <div class="info-item">组合小类：<span>{{ row.sfzlmc }}</span></div>
-      <div class="info-item">组合次数：<span>{{ row.sfcs }}</span></div>
-    </div>
-    <div class="second-row">
-      <div class="info-item">
-        标签颜色：<DictTag v-model:value="row.bqys" :options="props.dict.D_GS_SSYJ" />
-      </div>
-      <div class="info-item">预警时间：<span>{{ row.yjsj }}</span></div>
-      <div class="info-item">预警分值：<span>{{ row.sffz }}</span></div>
-    </div>
-    <div class="second-row">
-      <div class="info-item">
-        处置状态：<DictTag v-model:value="row.czzt" :options="props.dict.D_GSXT_YJXX_CZZT" />
-      </div>
-      <div class="info-item">所属县局：<span>{{ row.ssbm }}</span></div>
-    </div>
-  </div>
-</template>
-
-<script setup>
-const props = defineProps({
-  /** 表格行数据 */
-  row: {
-    type: Object,
-    default: () => ({})
-  },
-  dict: {
-    type: Object,
-    default: () => ({
-      D_GS_SSYJ: [],
-      D_GSXT_YJXX_CZZT: []
-    })
-  },
-})
-</script>
-
-<style lang="scss" scoped>
-.warning-item {
-  width: 100%;
-  padding: 15px;
-  border: 1px solid #e8e8e8;
-  border-radius: 8px;
-  background-color: #fafafa;
-}
-
-.second-row {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 20px;
-  margin-bottom: 10px;
-}
-
-.info-item {
-  flex: 0 0 calc(33.33% - 20px);
-  box-sizing: border-box;
-  display: flex;
-  padding: 5px 0;
-  color: #333;
-
-  span {
-    font-weight: 500;
-    color: #606266;
-  }
-}
-</style>
diff --git a/src/views/backOfficeSystem/fourColorManage/warningControl/fouColorWarning/index.vue b/src/views/backOfficeSystem/fourColorManage/warningControl/fouColorWarning/index.vue
index ddc71bf..84ccd64 100644
--- a/src/views/backOfficeSystem/fourColorManage/warningControl/fouColorWarning/index.vue
+++ b/src/views/backOfficeSystem/fourColorManage/warningControl/fouColorWarning/index.vue
@@ -8,7 +8,12 @@
     <!-- 表格 -->
     <div class="tabBox heightBox">
       <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="pageData.tableHeight"
-        :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth">
+        expand :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth">
+        <template #expand="{ props }">
+          <div style="max-width: 100%">
+            <Items :row="props || {}" />
+          </div>
+        </template>
         <template #yjtp="{ row }">
           <div v-if="!row.yjtp || row.yjtp.includes('baidu')">
             <img src="@/assets/images/car.png" width="30" height="40" v-if="row.yjlb == 2" />
@@ -55,12 +60,11 @@
 </template>
 
 <script setup>
-import * as XLSX from "xlsx";
-import PageTitle from "@/components/aboutTable/PageTitle.vue";
+import Items from "./item/items.vue"
 import Search from "@/components/aboutTable/Search.vue";
 import MyTable from "@/components/aboutTable/MyTable.vue";
 import Pages from "@/components/aboutTable/Pages.vue";
-import { qcckGet, qcckPost } from "@/api/qcckApi.js";
+import { qcckPost } from "@/api/qcckApi.js";
 import HolographicArchive from '@/views/home/components/holographicArchive.vue'
 import { reactive, ref, onMounted, getCurrentInstance, computed, watch } from "vue";
 const { proxy } = getCurrentInstance();
diff --git a/src/views/backOfficeSystem/fourColorManage/warningControl/fouColorWarning/item/items.vue b/src/views/backOfficeSystem/fourColorManage/warningControl/fouColorWarning/item/items.vue
new file mode 100644
index 0000000..ca72d28
--- /dev/null
+++ b/src/views/backOfficeSystem/fourColorManage/warningControl/fouColorWarning/item/items.vue
@@ -0,0 +1,45 @@
+<template>
+  <div class="warning-item" >
+     <el-divider content-position="left">预警内容</el-divider>
+    <div class="item-row">
+      {{ props.row.yjnr || '暂无' }}
+    </div>
+  </div>
+</template>
+<script setup>
+const props = defineProps({
+  /** 表格行数据 */
+  row: {
+    type: Object,
+    default: () => ({})
+  },
+})
+</script>
+<style lang="scss" scoped>
+.warning-item {
+  width: 100%;
+  padding: 15px;
+  box-sizing: border-box;
+  border-radius: 8px;
+  background-color: #fafafa;
+}
+.item-row{
+  line-height: 36px;
+}
+.info-item{
+  line-height: 36px;
+  width: 100%;
+  .text{
+    display: inline-block;
+    width: 25%;
+    margin-right: 10px;
+  }
+}
+
+::v-deep .el-empty{
+  --el-empty-padding: 0px;
+  margin-bottom: 18px;
+  --el-empty-description-margin-top: 10px;
+}
+
+</style>
diff --git a/src/views/backOfficeSystem/fourColorManage/warningControl/identityWarning/item/items copy.vue b/src/views/backOfficeSystem/fourColorManage/warningControl/identityWarning/item/items copy.vue
deleted file mode 100644
index dd729f2..0000000
--- a/src/views/backOfficeSystem/fourColorManage/warningControl/identityWarning/item/items copy.vue	
+++ /dev/null
@@ -1,83 +0,0 @@
-<template>
-  <div class="warning-item">
-    <div class="second-row">
-      <div class="info-item">预警人姓名：<span>{{ row.xm }}</span></div>
-      <div class="info-item">身份证号：<span>{{ row.sfzh }}</span></div>
-      <div class="info-item">电话：<span>{{ row.dh }}</span></div>
-    </div>
-    <div class="second-row">
-      <div class="info-item">组合大类：<span>{{ row.sfdlmc }}</span></div>
-      <div class="info-item">组合小类：<span>{{ row.sfzlmc }}</span></div>
-      <div class="info-item">组合预警次数：<span>{{ row.sfcs }}次</span></div>
-    </div>
-    <div class="second-row">
-      <div class="info-item">
-        标签颜色：
-        <DictTag v-model:value="row.bqys" :options="props.dict.D_GS_SSYJ" />
-      </div>
-      <div class="info-item">预警时间：<span>{{ row.yjsj }}</span></div>
-      <div class="info-item">预警分值：<span>{{ row.sffz }}</span></div>
-    </div>
-    <div class="second-row">
-      <div class="info-item">
-        处置状态：
-        <DictTag v-model:value="row.czzt" :options="props.dict.D_GSXT_YJXX_CZZT" />
-      </div>
-      <div class="info-item">所属部门：<span>{{ row.ssbm }}</span></div>
-      <div class="info-item">所属县局：<span>{{ row.ssxgaj }}</span></div>
-    </div>
-    <div class="second-row">
-      <div class="info-item">所属市局：<span>{{ row.sssgaj }}</span></div>
-      <div class="info-item">接警员姓名：<span>{{ row.jjyxm }}</span></div>
-    </div>
-  </div>
-</template>
-<script setup>
-import { ref, computed } from 'vue'
-// import DictTag from '@/components/dictTag.vue'
-
-const props = defineProps({
-  /** 表格行数据 */
-  row: {
-    type: Object,
-    default: () => ({})
-  },
-  dict: {
-    type: Object,
-    default: () => ({
-      D_GS_SSYJ: [],
-      D_GSXT_YJXX_CZZT: []
-    })
-  },
-})
-// console.log('row😃: ', props.row);
-</script>
-<style lang="scss" scoped>
-.warning-item {
-  width: 100%;
-  padding: 15px;
-  border: 1px solid #e8e8e8;
-  border-radius: 8px;
-  background-color: #fafafa;
-}
-
-.second-row {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 20px;
-  margin-bottom: 10px;
-}
-
-.info-item {
-  flex: 0 0 calc(33.33% - 20px);
-  box-sizing: border-box;
-  display: flex;
-  padding: 5px 0;
-  color: #333;
-
-  span {
-    font-weight: 500;
-    color: #606266;
-  }
-}
-</style>
diff --git a/src/views/backOfficeSystem/fourColorManage/warningControl/regionalControl/item/items copy.vue b/src/views/backOfficeSystem/fourColorManage/warningControl/regionalControl/item/items copy.vue
deleted file mode 100644
index 0ba8826..0000000
--- a/src/views/backOfficeSystem/fourColorManage/warningControl/regionalControl/item/items copy.vue	
+++ /dev/null
@@ -1,74 +0,0 @@
-<template>
-  <div class="warning-item">
-    <div class="second-row">
-      <div class="info-item">姓名：<span>{{ row.xm }}</span></div>
-      <div class="info-item">身份证号：<span>{{ row.sfzh }}</span></div>
-      <div class="info-item">电话：<span>{{ row.dh }}</span></div>
-    </div>
-    <div class="second-row">
-      <div class="info-item">组合大类：<span>{{ row.sfdlmc }}</span></div>
-      <div class="info-item">组合小类：<span>{{ row.sfzlmc }}</span></div>
-      <div class="info-item">组合次数：<span>{{ row.sfcs }}</span></div>
-    </div>
-    <div class="second-row">
-      <div class="info-item">
-        标签颜色：<DictTag v-model:value="row.bqys" :options="props.dict.D_GS_SSYJ" />
-      </div>
-      <div class="info-item">预警时间：<span>{{ row.yjsj }}</span></div>
-      <div class="info-item">预警分值：<span>{{ row.sffz }}</span></div>
-    </div>
-    <div class="second-row">
-      <div class="info-item">
-        处置状态：<DictTag v-model:value="row.czzt" :options="props.dict.D_GSXT_YJXX_CZZT" />
-      </div>
-      <div class="info-item">所属县局：<span>{{ row.ssbm }}</span></div>
-    </div>
-  </div>
-</template>
-
-<script setup>
-const props = defineProps({
-  /** 表格行数据 */
-  row: {
-    type: Object,
-    default: () => ({})
-  },
-  dict: {
-    type: Object,
-    default: () => ({
-      D_GS_SSYJ: [],
-      D_GSXT_YJXX_CZZT: []
-    })
-  },
-})
-</script>
-
-<style lang="scss" scoped>
-.warning-item {
-  width: 100%;
-  padding: 15px;
-  border: 1px solid #e8e8e8;
-  border-radius: 8px;
-  background-color: #fafafa;
-}
-
-.second-row {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 20px;
-  margin-bottom: 10px;
-}
-
-.info-item {
-  flex: 0 0 calc(33.33% - 20px);
-  box-sizing: border-box;
-  display: flex;
-  padding: 5px 0;
-  color: #333;
-
-  span {
-    font-weight: 500;
-    color: #606266;
-  }
-}
-</style>
diff --git a/src/views/backOfficeSystem/fourColorManage/warningControl/sevenWarning/index.vue b/src/views/backOfficeSystem/fourColorManage/warningControl/sevenWarning/index.vue
index 203d869..6da611a 100644
--- a/src/views/backOfficeSystem/fourColorManage/warningControl/sevenWarning/index.vue
+++ b/src/views/backOfficeSystem/fourColorManage/warningControl/sevenWarning/index.vue
@@ -1,6 +1,5 @@
 <template>
   <div>
-
     <!-- 搜索 -->
     <div ref="searchBox"  class="mt10 mb10">
       <Search :searchArr="searchConfiger" @submit="onSearch" :key="pageData.keyCount">
@@ -16,7 +15,12 @@
     <!-- 表格 -->
     <div class="tabBox heightBox">
       <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="pageData.tableHeight"
-        :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth">
+        expand :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth">
+        <template #expand="{ props }">
+          <div style="max-width: 100%">
+            <Items :row="props || {}" />
+          </div>
+        </template>
         <template #czzt="{ row }">
           <DictTag :value="row.czzt" :tag="false" :options="D_GSXT_YJXX_CZZT" />
         </template>
@@ -53,10 +57,9 @@
 </template>
 
 <script setup>
+import Items from '@/views/backOfficeSystem/fourColorManage/warningList/portraitWarning/item/items.vue'
 import ZpForm from "./zpForm.vue";
-
 import { IdCard } from '@/utils/validate.js'
-import PageTitle from "@/components/aboutTable/PageTitle.vue";
 import Search from "@/components/aboutTable/Search.vue";
 import MyTable from "@/components/aboutTable/MyTable.vue";
 import Pages from "@/components/aboutTable/Pages.vue";
diff --git a/src/views/backOfficeSystem/fourColorManage/warningList/portraitWarning/index.vue b/src/views/backOfficeSystem/fourColorManage/warningList/portraitWarning/index.vue
index ab57150..14df368 100644
--- a/src/views/backOfficeSystem/fourColorManage/warningList/portraitWarning/index.vue
+++ b/src/views/backOfficeSystem/fourColorManage/warningList/portraitWarning/index.vue
@@ -16,7 +16,6 @@
     </PageTitle>
     <!-- 表格 -->
     <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="pageData.tableHeight - 160" ref="localWarningRef"
         :dict="{ D_GSXT_YJXX_CZZT, D_BZ_YJJB, D_BZ_YJLYXT, D_BZ_YJLY }" excelTitle="人像预警" />
     </div>
diff --git a/src/views/backOfficeSystem/fourColorManage/warningList/portraitWarning/item/items copy.vue b/src/views/backOfficeSystem/fourColorManage/warningList/portraitWarning/item/items copy.vue
deleted file mode 100644
index 61ad538..0000000
--- a/src/views/backOfficeSystem/fourColorManage/warningList/portraitWarning/item/items copy.vue	
+++ /dev/null
@@ -1,197 +0,0 @@
-<template>
-  <div class="warning-item">
-    <!-- 第一行：图片、姓名、年龄、性别 -->
-    <div class="first-row">
-      <div class="avatar-container">
-        <template v-if="!data.yjTp || data.yjTp.includes('baidu')">
-          <img src="@/assets/images/car.png" width="60" height="70" v-if="data.yjLx == 2" />
-          <img src="@/assets/images/default_male.png" width="60" height="70" v-else />
-        </template>
-        <el-image v-else style="width: 60px; height:70px" :src="data.yjTp" :preview-src-list="[data.yjTp]"
-          show-progress>
-          <template #error>
-            <div class="image-slot error">
-              <img src="@/assets/images/car.png" width="60" height="70" v-if="data.yjLx == 2" />
-              <img src="@/assets/images/default_male.png" width="60" height="70" v-else />
-            </div>
-          </template>
-        </el-image>
-      </div>
-      <div class="basic-info">
-        <div class="info-items  name">姓名：<span>{{ data.yjRyxm }}</span></div>
-        <div class="info-items gender">性别：<span>       {{ IdCard(data.yjRysfzh, 3) }}</span></div>
-        <div class="info-items age">年龄：<span>       {{ IdCard(data.yjRysfzh, 2) }}</span></div>
-      </div>
-    </div>
-
-    <!-- 第二行：其他所有字段 -->
-    <div class="second-row">
-      <div class="info-item title">预警标题：<span>{{ data.yjBt }}</span></div>
-      <div class="info-item level">
-        预警级别：
-         <DictTag :color="bqYs(data.yjJb)" :tag="false" v-model:value="data.yjJb" :options="props.dict.D_BZ_YJJB" />
-        <!-- <span :class="getLevelClass(data.yjJb)">{{ data.yjJb || data.yjLx }}</span> -->
-      </div>
-      <div class="info-item similarity">相似度：<span>{{ data.xsd }}%</span></div>
-    </div>
-    <div class="second-row">
-      <div class="info-item time">预警时间：<span>{{ data.yjSj }}</span></div>
-      <div class="info-item location">预警地点：<span>{{ data.yjDz }}</span></div>
-      <div class="info-item count">预警次数：<span>{{ data.yjCs }}次</span></div>
-    </div>
-    <div class="second-row">
-      <div class="info-item status">
-        处置状态： <DictTag v-model:value="data.czzt" :options="props.dict.D_GSXT_YJXX_CZZT" />
-
-      </div>
-      <div class="info-item phone">布控手机：<span>{{ data.yjRysjh }}</span></div>
-      <div class="info-item car">布控车牌号：<span>{{ data.yjClcph }}</span></div>
-    </div>
-    <div class="second-row">
-      <div class="info-item idcard">布控身份证：<span>{{ data.yjRysfzh }}</span></div>
-      <div class="info-item tag">预警标签：<span>{{ data.yjbqmc }}</span></div>
-      <div class="info-item department">管辖部门：<span>{{ data.ssbm }}</span></div>
-    </div>
-    <div class="second-row">
-      <div class="info-item county">管辖县局：<span>{{ data.ssxgaj }}</span></div>
-      <div class="info-item city">管辖市局：<span>{{ data.sssgaj }}</span></div>
-      <div class="info-item officer">接警员：<span>{{ data.jjyxm }}</span></div>
-    </div>
-    <div class="second-row">
-      <div class="info-item content full-width">预警内容：<span>{{ data.yjNr }}</span></div>
-    </div>
-  </div>
-</template>
-<script setup>
-import { ref, computed } from 'vue'
-import { bqYs } from '@/utils/tools'
-import { IdCard } from '@/utils/validate.js'
-const props = defineProps({
-  data: {
-    type: Object,
-    default: () => { }
-  },
-  dict: {
-    type: Object,
-    default: () => { }
-  },
-})
-
-</script>
-<style lang="scss" scoped>
-.warning-item {
-  width: 100%;
-  padding: 15px;
-  border: 1px solid #e8e8e8;
-  border-radius: 8px;
-  background-color: #fafafa;
-}
-
-.first-row {
-  display: flex;
-  align-items: center;
-  margin-bottom: 15px;
-  padding-bottom: 15px;
-  border-bottom: 1px solid #e0e0e0;
-}
-
-.avatar-container {
-  margin-right: 20px;
-}
-
-.basic-info {
-  display: flex;
-  gap: 30px;
-  align-items: center;
-}
-
-.second-row {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 20px;
-  margin-bottom: 10px;
-}
-.info-items {
-  box-sizing: border-box;
-  display: flex;
-  // justify-content: space-between;
-  padding: 5px 0;
-  color: #333;
-
-  span {
-    font-weight: 500;
-    color: #606266;
-  }
-}
-.info-item {
-  flex: 0 0 calc(33.33% - 20px);
-  box-sizing: border-box;
-  display: flex;
-  // justify-content: space-between;
-  padding: 5px 0;
-  color: #333;
-
-  span {
-    font-weight: 500;
-    color: #606266;
-  }
-}
-
-// 特殊字段样式
-.name span {
-  color: #1890ff;
-  font-weight: bold;
-}
-
-// 预警级别颜色
-.level-high span {
-  color: #f56c6c;
-  font-weight: bold;
-}
-
-.level-medium span {
-  color: #e6a23c;
-  font-weight: bold;
-}
-
-.level-low span {
-  color: #67c23a;
-  font-weight: bold;
-}
-
-// 处置状态颜色
-.status-completed span {
-  color: #67c23a;
-  font-weight: bold;
-}
-
-.status-processing span {
-  color: #409eff;
-  font-weight: bold;
-}
-
-.status-pending span {
-  color: #e6a23c;
-  font-weight: bold;
-}
-
-// 全宽字段
-.full-width {
-  flex: 0 0 100% !important;
-}
-
-// 内容字段特殊样式
-.content {
-  flex-direction: column;
-  align-items: flex-start;
-
-  span {
-    margin-top: 5px;
-    padding: 8px 12px;
-    background-color: #f0f9eb;
-    border-radius: 4px;
-    width: 100%;
-    box-sizing: border-box;
-  }
-}
-</style>
diff --git a/src/views/backOfficeSystem/fourColorManage/warningList/portraitWarning/item/items.vue b/src/views/backOfficeSystem/fourColorManage/warningList/portraitWarning/item/items.vue
index efd9ece..87e6a34 100644
--- a/src/views/backOfficeSystem/fourColorManage/warningList/portraitWarning/item/items.vue
+++ b/src/views/backOfficeSystem/fourColorManage/warningList/portraitWarning/item/items.vue
@@ -1,5 +1,10 @@
 <template>
   <div class="warning-item" >
+    <el-divider content-position="left">预警内容</el-divider>
+    <div class="item-row">
+      {{ props.row.yjnr || '暂无' }}
+    </div>
+
     <el-divider content-position="left">处置建议</el-divider>
     <div class="item-row" v-for="(it,idx) in list" :key="idx">
       <div class="info-item">
@@ -41,13 +46,6 @@ const props = defineProps({
     type: Object,
     default: () => ({})
   },
-  dict: {
-    type: Object,
-    default: () => ({
-      D_GS_SSYJ: [],
-      D_GSXT_YJXX_CZZT: []
-    })
-  },
 })
 const list = ref([])
 const Fklist = ref([])
@@ -74,6 +72,9 @@ onMounted(() => {
   line-height: 36px;
   padding-bottom: 10px;
   margin-bottom: 10px;
+  &:last-child{
+    border-bottom: none;
+  }
 }
 .info-item{
   line-height: 36px;