diff --git a/src/views/backOfficeSystem/fourColorManage/warningControl/wrjWarning/components/addFrom.vue b/src/views/backOfficeSystem/fourColorManage/warningControl/wrjWarning/components/addFrom.vue
new file mode 100644
index 0000000..faa2de6
--- /dev/null
+++ b/src/views/backOfficeSystem/fourColorManage/warningControl/wrjWarning/components/addFrom.vue
@@ -0,0 +1,117 @@
+<template>
+  <div class="dialog" v-if="dialogForm">
+    <div class="head_box">
+      <span class="title">警情{{ title }} </span>
+      <div>
+        <!-- <el-button type="primary" size="small" :loading="loading" @click="submit">保存</el-button> -->
+        <el-button size="small" @click="close">关闭</el-button>
+      </div>
+    </div>
+    <div class="form_cnt">
+      <FormMessage :formList="formData" v-model="listQuery" ref="elform">
+        <template #yjTp>
+          <template v-if="!listQuery.yjTp || listQuery.yjTp.includes('baidu')">
+            <img src="@/assets/images/car.png" width="80" height="100" v-if="listQuery.yjLx == 2" />
+            <img src="@/assets/images/default_male.png" width="80" height="100" v-else />
+          </template>
+          <el-image v-else style="width: 80px; height:120px" :src="listQuery.yjTp" :preview-src-list="[listQuery.yjTp]"
+            show-progress>
+            <template #error>
+              <div class="image-slot error">
+                <img src="@/assets/images/car.png" width="80" height="100" v-if="listQuery.yjLx == 2" />
+                <img src="@/assets/images/default_male.png" width="80" height="100" v-else />
+              </div>
+            </template>
+          </el-image>
+        </template>
+      </FormMessage>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import FormMessage from "@/components/aboutTable/FormMessage.vue";
+import { tbYjxxGetInfo } from "@/api/yj.js";
+import { IdCard } from '@/utils/validate.js'
+import { ref, defineExpose, reactive, defineEmits, getCurrentInstance, watch ,onMounted,onUnmounted} from "vue";
+const emit = defineEmits(["updateDate"]);
+const props = defineProps({
+  dict: {
+    type: Object,
+    default: () => { }
+  }
+});
+const { proxy } = getCurrentInstance();
+onMounted(() => {
+  console.log("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx------------");
+
+})
+onUnmounted(() => {
+  console.log('--------------------------------------');
+
+})
+const dialogForm = ref(false); //弹窗
+const formData = ref([])
+watch(() => props.dict, (res) => {
+  if (res) {
+    formData.value = [
+      { label: "预警图片", prop: "yjTp", type: "slot" },
+      { label: "预警标题", prop: "yjBt", type: "input" },
+      { label: "预警人姓名", prop: "yjRyxm", type: "input" },
+      { label: "年龄", prop: "nl", type: "input" },
+      { label: "性别", prop: "xb", type: "input" },
+      { label: "预警级别", prop: "yjJb", type: "select", options: props.dict.D_BZ_YJJB },
+      { label: "相似度", prop: "xsd", type: "input" },
+      { label: "预警时间", prop: "yjSj", type: "input" },
+      { label: "预警地点", prop: "yjDz", type: "input" },
+      { label: "预警次数", prop: "yjCs", type: "input" },
+      { label: "处置状态", prop: "czzt", type: "select", options: props.dict.D_GSXT_YJXX_CZZT },
+      { label: "布控手机号", prop: "yjRysjh", type: "input" },
+      { label: "布控车牌号", prop: "yjClcph", type: "input" },
+      { label: "布控身份证", prop: "yjRysfzh", type: "input" },
+      { label: "预警标签", prop: "yjbqmc", type: "input" },
+      { label: "管辖部门", prop: "ssbm", type: "input" },
+      { label: "管辖县局", prop: "ssxgaj", type: "input" },
+      { label: "管辖市局", prop: "sssgaj", type: "input" },
+      { label: "接警员姓名", prop: "jjyxm", type: "input" },
+      { label: "预警内容", prop: "yjNr", type: "textarea", width: "100%" },
+    ]
+  }
+
+}, { deep: true, immediate: true })
+const listQuery = ref({}); //表单
+const loading = ref(false);
+const elform = ref();
+const title = ref("详情");
+const init = (type, row) => {
+  dialogForm.value = true;
+  tbYjxxGetInfo(row.id).then(res => {
+    listQuery.value = {
+      ...res,
+      nl: IdCard(res.yjRysfzh, 3) || "",
+      xb: IdCard(res.yjRysfzh, 2) || "",
+      xsd: res.xsd + '%'
+    }
+  })
+};
+// 关闭
+const close = () => {
+  listQuery.value = {};
+  loading.value = false;
+  dialogForm.value = false;
+  listQuery.value = {}
+
+};
+
+defineExpose({ init });
+</script>
+
+<style lang="scss" scoped>
+@import "~@/assets/css/layout.scss";
+@import "~@/assets/css/element-plus.scss";
+::v-deep {
+  .el-form-item__content {
+align-items: normal;
+  }
+}
+</style>
diff --git a/src/views/backOfficeSystem/fourColorManage/warningControl/wrjWarning/components/czjy.vue b/src/views/backOfficeSystem/fourColorManage/warningControl/wrjWarning/components/czjy.vue
new file mode 100644
index 0000000..d5171a0
--- /dev/null
+++ b/src/views/backOfficeSystem/fourColorManage/warningControl/wrjWarning/components/czjy.vue
@@ -0,0 +1,50 @@
+<template>
+    <el-dialog title="处置建议" v-model="visible" width="50%" v-if="visible" @close="closeHndle">
+        <el-form :model="form" ref="formRef" :rules="rules" label-width="120px" >
+            <el-form-item label="处置建议" prop="jynr">
+                <el-input v-model="form.jynr" placeholder="请输入处置建议" type="textarea"></el-input>
+            </el-form-item>
+                <div class="flex just-center">
+                    <el-button type="primary" @click="okSubmit">确定</el-button>
+                    <el-button @click="closeHndle">返回</el-button>
+                </div>
+        </el-form>
+    </el-dialog>
+</template>
+
+<script setup>
+import { qcckPost } from "@/api/qcckApi.js";
+import { ref , defineExpose} from 'vue'
+const emit = defineEmits(['okSubmit'])
+const visible = ref(false)
+const formRef = ref()
+const form = ref({})
+const rules = ref({
+  jynr: [
+    { required: true, message: '请输入处置建议', trigger: 'blur' }
+  ]
+})
+const init = (row) => {
+  visible.value = true;
+  form.value.yjid = row.id;
+}
+
+const closeHndle = () => {
+  visible.value = false;
+  form.value = {};
+}
+
+const okSubmit = async () => {
+  await formRef.value.validate((valid) => {
+    if (!valid)  return;
+    let params = {...form.value , lylx:'01'}
+    qcckPost(params,'/mosty-gsxt/yjxx/czjy/insert').then((res) => {
+        emit('okSubmit', {...form.value})
+        closeHndle()
+    })
+  })
+}
+defineExpose({
+  init
+})
+</script>
\ No newline at end of file
diff --git a/src/views/backOfficeSystem/fourColorManage/warningControl/wrjWarning/index.vue b/src/views/backOfficeSystem/fourColorManage/warningControl/wrjWarning/index.vue
index 1c9cf53..7a0b535 100644
--- a/src/views/backOfficeSystem/fourColorManage/warningControl/wrjWarning/index.vue
+++ b/src/views/backOfficeSystem/fourColorManage/warningControl/wrjWarning/index.vue
@@ -1,106 +1,156 @@
 <template>
   <div>
     <!-- 搜索 -->
-    <div ref="searchBox"  class="mt10 mb10">
-      <Search :searchArr="searchConfiger" @submit="onSearch" :key="pageData.keyCount">
-        <template #age="{ row }">
-          <div class="ageBox">
-            <el-input v-model="queryFrom.age_s" placeholder="开始年龄" type="number" :min="1" :max="100" style="width: 102px;"></el-input>
-            <span style="color: #333;" class="ml5 mr5">至</span>
-            <el-input v-model="queryFrom.age_b" placeholder="结束年龄" type="number" :min="parseInt(queryFrom.age_s)+1" :max="100" style="width: 102px;"></el-input>
-          </div>
-        </template>
-      </Search>
-    </div>
-    <PageTitle  :malginLeft="10" :height="35" backgroundColor="#ffff" :marginBottom="5" :marginTop="5">
+     <div ref="searchBox">
+       <Search :searchArr="searchConfiger" @submit="onSearch" @reset="onReset" :key="pageData.keyCount">
+          <template #yjRyxms>
+            <el-select clearable v-model="listQuery.yjRyxm" filterable remote allow-create default-first-optionreserve-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>
+          </template>
+        </Search>
+     </div>
+    <PageTitle :malginLeft="10" :height="35" backgroundColor="#ffff" :marginBottom="5" :marginTop="5">
       <template #left>
         <el-button type="primary" size="small" @click="exportExl">导出</el-button>
-        <el-button type="primary" size="small" @click="handleQs">签收</el-button>
+        <el-button type="primary" size="small" @click="handleQs" v-if="permission_sfqs">签收</el-button>
       </template>
     </PageTitle>
+
     <!-- 表格 -->
-    <div class="tabBox heightBox">
-      <MyTable expand 
+   <div class="tabBox tabBox_zdy">
+      <MyTable 
         :tableData="pageData.tableData" 
         :tableColumn="pageData.tableColumn" 
         :tableHeight="pageData.tableHeight"
         :key="pageData.keyCount" 
         :tableConfiger="pageData.tableConfiger" 
         :controlsWidth="pageData.controlsWidth"
-        @chooseData="handleChooseData"
+        expand
+        @chooseData="handleChooseData" 
+        :rowClassName="getRowClassName"
       >
         <template #expand="{ props }">
-          <div style="max-width: 100%">
-            <Items :row="props || {}" />
-          </div>
+          <Items :row="props"/>
         </template>
-        <template #czzt="{ row }">
-          <DictTag :value="row.czzt" :tag="false" :options="D_GSXT_YJXX_CZZT" />
+        <template #yjTp="{ row }">
+          <template v-if="!row.yjTp || row.yjTp.includes('baidu')">
+            <img src="@/assets/images/car.png" width="30" height="30" v-if="row.yjLx == 2" />
+            <img src="@/assets/images/default_male.png" width="30" height="30" v-else />
+          </template>
+          <el-image v-else style="width: 30px; height:30px" :src="row.yjTp" :preview-src-list="[row.yjTp]"
+            show-progress>
+            <template #error>
+              <div class="image-slot error">
+                <img src="@/assets/images/car.png" width="30" height="30" v-if="row.yjLx == 2" />
+                <img src="@/assets/images/default_male.png" width="30" height="30" v-else />
+              </div>
+            </template>
+          </el-image>
         </template>
-        <template #sex="{ row }">
-            <span v-if="row.yjRysfzh"> {{ IdCard(row.yjRysfzh,2) }} </span>
+        <template #nl="{ row }">
+          {{ IdCard(row.yjRysfzh, 3) }}
         </template>
-        <template #age="{ row }">
-            <span v-if="row.yjRysfzh"> {{ IdCard(row.yjRysfzh,3) }} </span>
+        <template #xb="{ row }">
+          {{ IdCard(row.yjRysfzh, 2) }}
         </template>
-        <template #yjJb="{ row }">
-          <DictTag :value="row.yjJb" :tag="false" :options="D_BZ_YJJB" />
-        </template>
-        <template #bqdl="{ row }">
-          <DictTag :value="row.bqdl" :tag="false"  :options="D_GS_QLZDRLX" />
+        <template #xsd="{ row }">
+          {{ row.xsd }}%
         </template>
         <template #yjLylx="{ row }">
-          <DictTag :value="row.yjLylx" :tag="false"  :options="D_BZ_YJLY" />
+          <DictTag v-model:value="row.yjLylx" :options="D_BZ_YJLY" />
         </template>
-       <template #yjLx="{ row }">
-          <DictTag :value="row.yjLx" :tag="false"  :options="D_GS_QLZDRYXX" />
+        <template #czzt="{ row }">
+          <DictTag v-model:value="row.czzt" :options="D_GSXT_YJXX_CZZT" />
         </template>
+        <template #yjJb="{ row }">
+          <DictTag v-model:value="row.yjJb" :options="D_BZ_YJJB" />
+        </template>
+        <!-- 操作 -->
         <template #controls="{ row }">
-          <el-link type="warning" v-if="row.sfbc != '1'" @click="failWarning(row)">报错</el-link>
-          <el-link type="warning" @click="pushWarning(row)">指派</el-link>
+          <el-link type="warning" @click="pushAssess(row)">全息档案</el-link>
+          <el-link type="primary" @click="handleCzjy(row)" v-if="roleCode">处置建议</el-link>
+          <!-- <el-link type="primary" @click="showDetail(row)">转合成</el-link> -->
+          <el-link type="success" @click="handleQsFk(row, '签收')" v-if="row.czzt == '01' && permission_sfqs">签收</el-link>
+          <el-link type="success" @click="handleQsFk(row, '反馈')" v-else-if="row.czzt == '02' && permission_sfqs">反馈</el-link>
+          <!-- <el-link type="success" @click="handleQsFk(row, '查看反馈')" v-else>查看反馈</el-link> -->
+          <el-link type="primary" @click="openAddFrom(row)">详情</el-link>
+          <el-link type="primary" @click="pushWarning(row)">指派</el-link>
         </template>
       </MyTable>
-      <Pages @changeNo="changeNo" @changeSize="changeSize" :tableHeight="pageData.tableHeight" :pageConfiger="{
-        ...pageData.pageConfiger,
-        total: pageData.total
-      }"></Pages>
+      <Pages 
+        @changeNo="changeNo" 
+        @changeSize="changeSize" 
+        :tableHeight="pageData.tableHeight" 
+        :pageConfiger="{ ...pageData.pageConfiger, total: pageData.total }">
+      </Pages>
     </div>
+
   </div>
+
+  <HolographicArchive v-model="assessShow" :dataList="dataList" />
+
+  <Information v-model="showDialog" title="发送指令" @submit='submitSendZl' @close='closeFszl'>
+    <SemdFqzl ref="semdFqzlRef" :itemData="itemData" @handleClose="handleClose" identification="yj" :tacitly="tacitly" />
+  </Information>
+
+  <!-- 详情 -->
+  <AddFromz ref="addFromRefs" :dict="{ D_GSXT_YJXX_CZZT, D_BZ_YJJB, D_BZ_YJLYXT }" />
+  <!-- 处置建议 -->
+  <Czjy ref="czjyRef" @okSubmit="getList"></Czjy>
+  <!-- 指派 -->
   <ZpForm v-model="warningShow" :dataList="dataList"/>
+  <!-- 反馈 -->
+  <FkDialog @change="getList" />
 </template>
 
 <script setup>
-import { getMultiDictVal } from "@/utils/dict.js"
+import { qcckGet, qcckPost } from "@/api/qcckApi.js";
+import emitter from "@/utils/eventBus.js";
+import { getItem, setItem } from '@/utils/storage'
 import { exportExlByObj } from "@/utils/exportExcel.js"
-import Items from '@/views/backOfficeSystem/fourColorManage/warningList/portraitWarning/item/items.vue'
-import ZpForm from "./zpForm.vue";
+import { getMultiDictVal } from "@/utils/dict.js"
+import { tbYjxxGetPageList } from '@/api/yj.js'
 import { IdCard } from '@/utils/validate.js'
-import Search from "@/components/aboutTable/Search.vue";
-import PageTitle from "@/components/aboutTable/PageTitle.vue";
+import { tbGsxtZdrySelectList } from "@/api/zdr.js"
+import { holographicProfileJump } from "@/utils/tools.js"
+import Items from './item/items.vue'
+import HolographicArchive from '@/views/home/components/holographicArchive.vue'
+import Information from "@/views/home/model/information.vue";
+import FkDialog from "@/views/backOfficeSystem/fourColorManage/warningControl/centerHome/components/fkDialog.vue";
+import ZpForm from "@/views/backOfficeSystem/fourColorManage/warningControl/sevenWarning/zpForm.vue";
+import Czjy from './components/czjy.vue';
+import AddFromz from './components/addFrom.vue';
 import MyTable from "@/components/aboutTable/MyTable.vue";
 import Pages from "@/components/aboutTable/Pages.vue";
-import { qcckGet, qcckPost } from "@/api/qcckApi.js";
-import { reactive, ref, onMounted, getCurrentInstance, } from "vue";
+import PageTitle from "@/components/aboutTable/PageTitle.vue";
+import Search from "@/components/aboutTable/Search.vue";
+import { reactive, ref, onMounted, getCurrentInstance } from "vue";
+const ORDIMG = 'https://89.40.7.122:38496/image'
+const IMGYM = 'https://sg.lz.dsj.xz/dhimage'
 const { proxy } = getCurrentInstance();
-const { D_BZ_YJLY,D_GS_QLZDRLX,D_BZ_YJJB, D_GS_QLZDRYXX,D_BZ_XB,D_GSXT_YJXX_CZZT } = proxy.$dict('D_BZ_YJLY','D_GS_QLZDRLX',"D_BZ_YJJB", "D_GS_QLZDRYXX", "D_BZ_XB","D_GSXT_YJXX_CZZT"); //获取字典数据
+const { D_GSXT_YJXX_CZZT,D_GS_QLZDRLX, D_BZ_YJJB, D_BZ_YJLYXT, D_BZ_YJLY, D_BZ_XB } = proxy.$dict("D_GSXT_YJXX_CZZT",'D_GS_QLZDRLX ', "D_BZ_YJJB", "D_BZ_YJLYXT", "D_BZ_YJLY", "D_BZ_XB")
 const searchBox = ref(); //搜索框
-const warningShow = ref(false);
-const dataList = ref([]);
+const roleCode = ref(false)
+const czjyRef = ref()
+const itemData = ref()
+const semdFqzlRef = ref()
+const warningShow = ref(false)
+const dataList = ref([])
+const showDialog = ref(false)// 发送指令
+const assessShow = ref(false)// 全息档案
 const searchConfiger = ref(
-  [
-    { label: "姓名", prop: 'yjRyxm', placeholder: "请输入姓名", showType: "input" },
-    // { label: "年龄段", prop: 'age', placeholder: "请输入身份证号码", showType: "Slot" },
-    { label: "性别", prop: 'xbdm', placeholder: "请选择性别", showType: "select", options: D_BZ_XB },
-    { label: "身份证", prop: 'yjRysfzh', placeholder: "请输入身份证号码", showType: "input" },
-    { label: "预警时间", prop: 'times', showType: "datetimerange" },
-    { label: "状态", prop: 'czzt', placeholder: "请选择状态", showType: "select", options: D_GSXT_YJXX_CZZT },
-    { label: "人员类别", prop: 'bqdl', placeholder: "请选择人员类别", showType: "select", options: D_GS_QLZDRLX },
-    { label: "细类", prop: 'yjbqmc', placeholder: "请输入细类", showType: "input" },
-    { label: "活动发生地址", prop: 'yjDz', placeholder: "请输入活动发生地址", showType: "input" },
-    { label: "接收单位", prop: 'ssbmdm',showType: "department" },
-  ]);
-
-const queryFrom = ref({});
+[
+  { label: "布控人员", prop: 'yjRyxms', showType: "Slot" },
+  { label: "性别", prop: 'xbdm', placeholder: "请选择性别", showType: "select", options: D_BZ_XB },
+  { label: "身份证", prop: 'yjRysfzh', placeholder: "请输入身份证号码", showType: "input" },
+  { label: "预警时间", prop: 'times', showType: "datetimerange" },
+  { label: "状态", prop: 'czzt', placeholder: "请选择状态", showType: "select", options: D_GSXT_YJXX_CZZT },
+  // { label: "人员类别", prop: 'bqdl', placeholder: "请选择人员类别", showType: "select", options: D_GS_QLZDRLX },
+  { label: "细类", prop: 'yjbqmc', placeholder: "请输入细类", showType: "input" },
+  { label: "活动发生地址", prop: 'yjDz', placeholder: "请输入活动发生地址", showType: "input" },
+  { label: "接收单位", prop: 'ssbmdm',showType: "department" },
+]);
 const pageData = reactive({
   tableData: [], //表格数据
   keyCount: 0,
@@ -110,42 +160,58 @@ const pageData = reactive({
     loading: false,
     haveControls: true
   },
+
   total: 0,
   pageConfiger: {
     pageSize: 20,
     pageCurrent: 1
   }, //分页
-  controlsWidth: 160, //操作栏宽度
+  controlsWidth: 250, //操作栏宽度
   tableColumn: [
-    { label: "状态", prop: "czzt", showSolt: true },
-    { label: "预警时间", prop: "yjSj" },
-    { label: "人员姓名", prop: "yjRyxm", },
-    { label: "身份证号", prop: "yjRysfzh", },
-    { label: "性别", prop: "sex" ,showSolt: true },
-    { label: "年龄", prop: "age", showSolt: true },
+    { label: "预警图片", prop: "yjTp", showSolt: true, width: 100 },
+    { label: "处置状态", prop: "czzt", showSolt: true },
+    { label: "预警时间", prop: "yjSj", showOverflowTooltip: true, width: 200 },
+    { label: "姓名", prop: "yjRyxm" },
+    { label: "性别", prop: "xb", showSolt: true, width: 80 },
+    { label: "年龄", prop: "nl", showSolt: true, width: 80 },
+    { label: "数据来源", prop: "yjLylx", showOverflowTooltip: true, showSolt: true },
+    { label: "身份证", prop: "yjRysfzh", showOverflowTooltip: true, width: 200 },
     { label: "预警级别", prop: "yjJb", showSolt: true },
-    { label: "人员类别", prop: "bqdl", showSolt: true },
-    { label: "细类", prop: "yjbqmc" },
-    { label: "轨迹类别", prop: "yjLylx", showSolt: true },
-    { label: "活动发生地", prop: "yjDz" },
-    { label: "接收单位", prop: "ssbm" },
-    { label: "预警次数", prop: "yjCs" },
+    { label: "相似度", prop: "xsd", showSolt: true },
+    { label: "所属部门", prop: "ssbm", showOverflowTooltip: true },
   ]
 });
+const addFromRefs = ref()
+const listQuery = ref({})
+const opentions = ref([])
+const loading = ref(false)
+const selectRows = ref([])
+const permission_sfqs = ref(false)
 
 onMounted(() => {
+  let str = getItem('deptId') ? getItem('deptId')[0].deptLevel : ''
+  permission_sfqs.value = str.startsWith('2'||'3') ? false : true;
+
+  let rols = getItem('roleList') ? getItem('roleList'):[]
+  let obj = rols.find(item => {
+    return  ['JS_666666','JS_777777','JS_888888'].includes(item.roleCode)
+  })
+  roleCode.value = obj ? true : false;
+
   tabHeightFn();
   getList()
 });
-
 // 搜索
+const onReset = () => {
+  listQuery.value.yjRyxm = ''
+}
 const onSearch = (val) => {
-  queryFrom.value = { ...val }
-  queryFrom.value.startTime = val.times ? val.times[0] : ''
-  queryFrom.value.endTime = val.times ? val.times[1] : ''
-  pageData.pageConfiger.pageCurrent = 1;
+  listQuery.value = { ...listQuery.value,...val };
+  listQuery.value.startTime = val.times ? val.times[0] : ''
+  listQuery.value.endTime = val.times ? val.times[1] : ''
   getList()
 }
+
 const changeNo = (val) => {
   pageData.pageConfiger.pageCurrent = val;
   getList()
@@ -154,71 +220,106 @@ const changeSize = (val) => {
   pageData.pageConfiger.pageSize = val;
   getList()
 }
+
 const getList = () => {
   pageData.tableConfiger.loading = true;
   const promes = {
-    ...queryFrom.value,
+    ...listQuery.value,
+    yjLx: '14', // 无人机预警
     pageCurrent: pageData.pageConfiger.pageCurrent,
-    pageSize: pageData.pageConfiger.pageSize,
+    pageSize: pageData.pageConfiger.pageSize
   }
   delete promes.times;
-  qcckPost(promes, '/mosty-gsxt/tbYjxx/getQlzdrPageList').then((res) => {
-    pageData.total = res.total || 0;
+  tbYjxxGetPageList(promes).then((res) => {
+    pageData.tableData = res.records.map(item => {
+      return {
+        ...item,
+        yjTp: item.yjlx == '01' ? item.yjTpreplace(ORDIMG, IMGYM) : item.yjTp
+      }
+    }) || [];
+    pageData.total = res.total;
     pageData.tableConfiger.loading = false;
-    pageData.tableData = res.records || []
   }).catch(() => {
     pageData.tableConfiger.loading = false;
   })
 }
 
-const pushWarning = (val) => {
-  warningShow.value = true;
-  dataList.value = val;
-}
 
 
-
-const failWarning = (val) => {
-    let ids = [val.id]
-    qcckPost({ids}, '/mosty-gsxt/tbYjxx/yjbc').then((res) => {
-      proxy.$message({ type: "success", message: "成功" });
-      getList();
+const remoteMethod = (query) => {
+  if (!query) return opentions.value = [];
+    loading.value = true
+    tbGsxtZdrySelectList({ ryXm: query }).then(res => {
+      opentions.value = res || [];
+      loading.value = false;
     }).catch(() => {
-      proxy.$message({ type: "error", message: "失败" });
-    });
+      loading.value = false
+    })
 }
 
+const getRowClassName = (row) => {
+  if (!row.row.yjJb) return '';
+  const level = String(row.row.yjJb);
+  if (level === '01' || level.includes('红') || level.includes('高')) return 'warning-level-01';
+  if (level === '02' || level.includes('橙') || level.includes('中')) return 'warning-level-02';
+  if (level === '03' || level.includes('黄') || level.includes('低')) return 'warning-level-03';
+  if (level === '04' || level.includes('蓝')) return 'warning-level-04';
+  return '';
+};
 
+// 处理签收
+const handleQsFk = (val, type) => {
+  switch (type) {
+    case '签收':
+      proxy.$confirm("是否确定要签收？", "警告", { type: "warning" }).then(() => {
+        qcckPost({ id: val.id }, "/mosty-gsxt/tbYjxx/yjqs").then(() => {
+          val.czzt = '02'
+          getList()
+          proxy.$message({ type: "success", message: "签收成功" });
+        });
+      })
+      break;
+    case '反馈':
+    case '查看反馈':
+      emitter.emit("openFkDialog", { id: val.id, type });
+      break;
+  }
+}
 
-/** 选中项 */
-const selectRows = ref([])
 const handleChooseData = (val) => {
   selectRows.value = val
 }
+
+// 导出
 const exportExl = () => {
   const titleObj = {
-    czzt_name: "状态",
+    czzt_cname: "处置状态",
     yjSj: "预警时间",
-    yjRyxm: "人员姓名",
-    yjRysfzh: "身份证号",
-    yjJb_name: "预警级别",
-    bqdl_name: "人员类别",
-    yjbqmc: "细类",
-    yjDz: "活动发生地",
-    ssbm: "接收单位",
+    yjRyxm: "姓名",
+    nl_cname: "年龄", // IdCard(row.yjRysfzh, 3)
+    yjLylx: "数据来源",
+    xb_cname: "性别",
+    yjJb_cname: "预警级别",
+    xsd_cname: "相似度",
+    yjDz: "预警地点",
     yjCs: "预警次数",
+    yjRysjh: "布控手机号",
+    yjClcph: "布控车牌号",
+    yjRysfzh: "身份证",
   }
   /** 导出【选中】的数据 （没有就全部）*/
   const needArr = selectRows.value?.length > 0 ? selectRows.value : pageData.tableData
   const data = needArr.map(item => {
     return {
       ...item,
-      czzt_name: getMultiDictVal(item.czzt, D_GSXT_YJXX_CZZT),
-      yjJb_name: getMultiDictVal(item.yjJb, D_BZ_YJJB),
-      bqdl_name: getMultiDictVal(item.bqdl, D_GS_QLZDRLX),
+      nl_cname: IdCard(item.yjRysfzh, 3),
+      xb_cname: IdCard(item.yjRysfzh, 2),
+      xsd_cname: (item.xsd > 0 ? item.xsd : 0) + '%',
+      czzt_cname: getMultiDictVal(item.czzt, D_GSXT_YJXX_CZZT),
+      yjJb_cname: getMultiDictVal(item.yjJb, D_BZ_YJJB),
     }
   })
-  exportExlByObj(titleObj, data, '七类重点')
+  exportExlByObj(titleObj, data, '无人机预警.xlsx')
 }
 
 const handleQs = () => {
@@ -238,15 +339,100 @@ const handleQs = () => {
   }).catch(() => { });
 }
 
+// 全息档案跳转
+const pushAssess = (val) => {
+  return holographicProfileJump(val.yjLx,val) 
+}
+
+const showDetail = (item) => {
+  showDialog.value = true;
+  itemData.value = item
+}
+const handleClose = () => {
+  showDialog.value = false;
+}
+
+const submitSendZl = () => {
+  semdFqzlRef.value.getsendFqzl()
+}
+const closeFszl = () => {
+  semdFqzlRef.value.close()
+}
+
+// 处置建议
+const handleCzjy = (row) => {
+  czjyRef.value.init(row)
+}
+
+// 详情
+const openAddFrom = (val) => {
+  addFromRefs.value.init('add', val)
+}
+
+
+// 指派
+const pushWarning = (val) => {
+  warningShow.value = true
+  dataList.value = val;
+}
 // 表格高度计算
 const tabHeightFn = () => {
   pageData.tableHeight = window.innerHeight - searchBox.value.offsetHeight - 290;
-  window.onresize = function () { tabHeightFn(); };
+  window.onresize = function () {
+    tabHeightFn();
+  };
 };
 </script>
 
-<style>
+<style lang="scss">
 .el-loading-mask {
   background: rgba(0, 0, 0, 0.5) !important;
 }
+
+/* 预警级别行样式 */
+.warning-level-01 {
+  background-color: rgba(255, 2, 2, 0.1) !important;
+}
+
+.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;
+}
+
+.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;
+}
+
+.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;
+}
+
+.warning-level-04:hover {
+  background-color: rgba(0, 0, 255, 0.15) !important;
+}
+
+/* 确保行样式应用到所有单元格 */
+.warning-level-01 td,
+.warning-level-02 td,
+.warning-level-03 td,
+.warning-level-04 td {
+  background-color: transparent !important;
+}
+
+.tabBox_zdy{
+  .el-table--fit {
+    overflow: unset !important;
+  }
+}
 </style>
diff --git a/src/views/backOfficeSystem/fourColorManage/warningControl/wrjWarning/item/items.vue b/src/views/backOfficeSystem/fourColorManage/warningControl/wrjWarning/item/items.vue
new file mode 100644
index 0000000..8d20445
--- /dev/null
+++ b/src/views/backOfficeSystem/fourColorManage/warningControl/wrjWarning/item/items.vue
@@ -0,0 +1,92 @@
+<template>
+  <div class="warning-item" >
+    <el-divider content-position="left">预警内容</el-divider>
+    <div class="item-row" style="border: none;"> {{ props.row.yjNr }} </div>
+    <el-empty v-if="!props.row.yjNr" :image-size="0.5"  description="暂无数据" />
+
+    <el-divider content-position="left">处置建议</el-divider>
+    <div class="item-row" v-for="(it,idx) in list" :key="idx">
+      <div class="info-item">
+        <span class="text">预警人姓名：{{ it.jryXm }}</span>
+        <span class="text">建议时间：{{ it.jysj }}</span>
+        <span class="text">所属部门：{{ it.ssbm }}</span>
+      </div>
+      <div class="info-item">建议内容：<span>{{ it.jynr || '暂无' }}</span></div>
+    </div>
+    <div>
+      <el-empty v-if="list.length === 0" :image-size="0.5"  description="暂无数据" />
+    </div>
+
+    <el-divider content-position="left">反馈内容</el-divider>
+    <div class="item-row" v-for="(it,idx) in Fklist" :key="idx">
+      <div class="info-item">
+        <span class="text">处置地址：{{ it.czdz }}</span>
+        <span class="text">处置时间：{{ it.czsj }}</span>
+      </div>
+      <div class="info-item">
+        <span class="text">常控不尿检理由：<span>{{ it.ckbnjly || '暂无' }}</span></span>
+        <span class="text">常控处置反馈补充信息：<span>{{ it.ckczbcxx || '暂无' }}</span></span>
+        <span class="text">常控立线侦察评估：<span>{{ it.cklxzcpg || '暂无' }}</span></span>
+        <span class="text">常控立线侦察评估依据：<span>{{ it.cklxzcpgyj || '暂无' }}</span></span>
+      </div>
+    </div>
+    <div>
+      <el-empty v-if="Fklist.length === 0" :image-size="0.5"  description="暂无数据" />
+    </div>
+    
+  </div>
+</template>
+<script setup>
+import { ref, onMounted,defineProps } from 'vue'
+import { qcckPost,qcckGet } from "@/api/qcckApi.js";
+const props = defineProps({
+  /** 表格行数据 */
+  row: {
+    type: Object,
+    default: () => ({})
+  },
+})
+const list = ref([])
+const Fklist = ref([])
+onMounted(() => {
+  if(!props.row.id) return;
+  qcckPost({yjid: props.row.id},'/mosty-gsxt/yjxx/czjy/getPageList').then((res) => {
+    list.value = res.records || []
+  })
+  qcckGet({},'/mosty-gsxt/tbYjxx/getInfo/'+ props.row.id).then((res) => {
+    Fklist.value = res.fkList || []
+  })
+})
+</script>
+<style lang="scss" scoped>
+.warning-item {
+  width: 100%;
+  padding: 15px;
+  box-sizing: border-box;
+  border-radius: 8px;
+  background-color: #fafafa;
+}
+.item-row{
+  border-bottom: 1px dashed #e8e8e8;
+  line-height: 36px;
+  padding-left: 2rem;
+  box-sizing: border-box;
+  &:last-nth-child(1){
+    border-bottom: none;
+  }
+}
+.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/wrjWarning/zpForm.vue b/src/views/backOfficeSystem/fourColorManage/warningControl/wrjWarning/zpForm.vue
deleted file mode 100644
index c9e058b..0000000
--- a/src/views/backOfficeSystem/fourColorManage/warningControl/wrjWarning/zpForm.vue
+++ /dev/null
@@ -1,76 +0,0 @@
-<!--预警指派展示组件  -->
-<template>
-  <el-dialog :draggable="true" :model-value="modelValue" :title="title" :width="width" @close="close" append-to-body>
-    <div class="archive-container">
-      <FormMessage :formList="formData" v-model="listQuery" ref="elform" :rules="rules" :labelWidth="90">
-      </FormMessage>
-    </div>
-    <template #footer>
-      <div class="dialog-footer" style="text-align: center;">
-        <el-button type="primary" @click="submit">确定</el-button>
-        <el-button @click="close">关闭</el-button>
-      </div>
-    </template>
-  </el-dialog>
-</template>
-<script setup>
-import { ref, defineProps, defineEmits, reactive, getCurrentInstance } from 'vue';
-import FormMessage from "@/components/aboutTable/FormMessage.vue";
-import { tbYjxxYjzp } from '@/api/yj'
-const { proxy } = getCurrentInstance();
-const props = defineProps({
-  modelValue: {
-    type: Boolean,
-    default: false
-  },
-  title: {
-    type: String,
-    default: '预警指派'
-  },
-  width: {
-    type: String,
-    default: '50%'
-  },
-  url: {
-    type: String,
-    default: ''
-  },
-  dataList: {
-    type: Object,
-    default: () => ({})
-  }
-});
-const listQuery = ref()
-const formData = ref([
-  { label: "指派部门", prop: "zpbmdm", depMc: 'zpbm', type: "department", width: '45%' },
-  { label: "指派原因", prop: "zpyy", type: "textarea", width: '80%' },
-])
-
-const rules = reactive({
-  zpbmdm: [{ required: true, message: "请选择指派部门", trigger: "blur" }],
-  zpyy: [{ required: true, message: "请输入指派原因", trigger: "change" }],
-});
-
-const elform = ref(null)
-const submit = async () => {
-  elform.value.submit(() => {
-    const params = { ...listQuery.value, yjid: props.dataList.id };
-    tbYjxxYjzp(params).then((res) => {
-      proxy.$message({ type: "success", message: "成功" });
-      close();
-    }).catch(() => {
-      proxy.$message({ type: "error", message: "失败" });
-    });
-  });
-}
-// 定义事件
-const emit = defineEmits(['update:modelValue']);
-const close = () => {
-elform.value.reset()
-  emit('update:modelValue', false);
-};
-</script>
-
-<style scoped>
-
-</style>