diff --git a/src/router/index.js b/src/router/index.js
index 120dab2..1acc9b8 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -196,6 +196,12 @@ export const publicRoutes = [
               icon: "article"
             }
           },
+          {
+            path: "/controlWarning",
+            name: "controlWarning",
+            meta: { title: "布控预警", icon: "article" },
+            component: () => import("@/views/backOfficeSystem/fourColorManage/warningControl/controlWarning/index"),
+          },
         //   {
         //     path: "/fouColorWarning",
         //     name: "fouColorWarning",
diff --git a/src/views/backOfficeSystem/fourColorManage/warningControl/centerHome/components/fkDialog.vue b/src/views/backOfficeSystem/fourColorManage/warningControl/centerHome/components/fkDialog.vue
index aa1324b..4151153 100644
--- a/src/views/backOfficeSystem/fourColorManage/warningControl/centerHome/components/fkDialog.vue
+++ b/src/views/backOfficeSystem/fourColorManage/warningControl/centerHome/components/fkDialog.vue
@@ -92,7 +92,6 @@ onMounted(() => {
     showDialog.value = true;
     listQuery.value = { yjid: val.id }
     let url = ''
-    console.log(url);
     switch (props.lx) {
       case '01':
         url = '/mosty-gsxt/tbYjxx/getInfo/'
@@ -158,6 +157,9 @@ const submitForm = () => {
       case '04':
         url = '/mosty-gsxt/yjzxZhyj/yjfk'
         break;
+      case '05':
+        url = '/mosty-gsxt/tbYjxx/yjfk'
+        break;
     }
     qcckPost(prome, url).then(() => {
       loading.value = false;
diff --git a/src/views/backOfficeSystem/fourColorManage/warningControl/controlWarning/components/addFrom.vue b/src/views/backOfficeSystem/fourColorManage/warningControl/controlWarning/components/addFrom.vue
new file mode 100644
index 0000000..213900e
--- /dev/null
+++ b/src/views/backOfficeSystem/fourColorManage/warningControl/controlWarning/components/addFrom.vue
@@ -0,0 +1,79 @@
+<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" disabled v-model="listQuery" ref="elform">
+      </FormMessage>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import FormMessage from "@/components/aboutTable/FormMessage.vue";
+import { qcckGet, qcckPost } from "@/api/qcckApi.js";
+import { ref, defineExpose, reactive, defineEmits, getCurrentInstance, watch } from "vue";
+const emit = defineEmits(["updateDate"]);
+const props = defineProps({
+  dict: {
+    type: Object,
+    default: () => { }
+  }
+});
+const { proxy } = getCurrentInstance();
+const dialogForm = ref(false); //弹窗
+const formData = ref([])
+watch(() => props.dict, (res) => {
+  if (res) {
+    formData.value = [
+      { label: "预警人员姓名", prop: "yjRyxm", type: "input" },
+      { label: "预警人员身份证号码", prop: "yjRysfzh", type: "input" },
+      { label: "电话", prop: "dh", type: "input" },
+      { label: "预警标签", prop: "yjbqmc", type: "input" },
+      { label: "今日预警次数", prop: "yjJrcs", type: "input",lx:"number" },
+      { label: "标签颜色", prop: "yjJb", type: "select", options: props.dict.D_GS_SSYJ },
+      { label: "预警标题", prop: "yjBt", type: "input" },
+      { label: "预警内容", prop: "yjNr", type: "input" },
+      { label: "预警时间", prop: "yjFssj", type: "input" },
+      { label: "处置状态", prop: "czzt", type: "select", options: props.dict.D_GSXT_YJXX_CZZT },
+      { label: "所属部门", prop: "ssbm", type: "input" },
+      { label: "所属县局", prop: "ssxgaj", type: "input" },
+      { label: "所属市局", prop: "sssgaj", type: "input" },
+    ]
+  }
+}, { deep: true, immediate: true })
+const listQuery = ref({}); //表单
+const loading = ref(false);
+const title = ref("详情");
+const init = (type, row) => {
+  dialogForm.value = true;
+  qcckGet({},'/mosty-gsxt/tbYjxx/getInfo/'+ row.id).then((res) => {
+    listQuery.value = res || {}
+  })
+  
+};
+// 关闭
+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/controlWarning/components/czjy.vue b/src/views/backOfficeSystem/fourColorManage/warningControl/controlWarning/components/czjy.vue
new file mode 100644
index 0000000..11c5114
--- /dev/null
+++ b/src/views/backOfficeSystem/fourColorManage/warningControl/controlWarning/components/czjy.vue
@@ -0,0 +1,49 @@
+<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;
+    qcckPost(form.value,'/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/controlWarning/index.vue b/src/views/backOfficeSystem/fourColorManage/warningControl/controlWarning/index.vue
new file mode 100644
index 0000000..397e598
--- /dev/null
+++ b/src/views/backOfficeSystem/fourColorManage/warningControl/controlWarning/index.vue
@@ -0,0 +1,280 @@
+<template>
+  <div>
+    <div class="titleBox">
+      <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>
+          <span style="vertical-align: middle" v-else>关闭搜索</span>
+        </el-button>
+        <el-button type="primary" @click="exportExl">导出</el-button>
+      </PageTitle>
+    </div>
+    <!-- 搜索 -->
+    <div ref="searchBox" v-if="search">
+      <Searchs :searchArr="searchConfiger" @submit="onSearch" @reset="reset" :key="pageData.keyCount">
+        <template #jfd>
+          <div>
+            <el-input v-model="queryFrom.ksfz" type="number" placeholder="开始身份分值" style="width: 130px"></el-input>
+            <span style="color: #333;margin: 0 4px;">至</span>
+            <el-input v-model="queryFrom.jsfz" type="number" placeholder="结束身份分值" style="width: 130px"></el-input>
+          </div>
+        </template>
+      </Searchs>
+    </div>
+    <!-- 表格 -->
+    <div class="tabBox" :style="{ height: (pageData.tableHeight + 40) + 'px' }">
+      <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="pageData.tableHeight"
+        :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth" expand
+        @chooseData="handleChooseData">
+        <template #expand="{ props }">
+          <div class="expand-content" style="max-width: 100%">
+            <Items :row="props || {}" :dict="dict" />
+          </div>
+        </template>
+        <template #yjJb="{ row }">
+          <DictTag :value="row.yjJb" :tag="false" :color="bqYs(row.yjJb)" :options="D_GS_SSYJ" />
+        </template>
+        <template #czzt="{ row }">
+          <DictTag :value="row.czzt" :options="D_GSXT_YJXX_CZZT" />
+        </template>
+        <template #controls="{ row }">
+          <el-link type="warning" @click="pushAssess(row)">全息档案</el-link>
+          <el-link type="primary" @click="handleCzjy(row)" v-if="roleCode">处置建议</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-if="row.czzt == '02' && permission_sfqs" >反馈</el-link>
+          <el-link type="primary" @click="openAddFrom(row)">详情</el-link>
+        </template>
+      </MyTable>
+      <Pages @changeNo="changeNo" @changeSize="changeSize" :tableHeight="pageData.tableHeight" :pageConfiger="{
+        ...pageData.pageConfiger,
+        total: pageData.total
+      }"></Pages>
+    </div>
+  </div>
+  <FkDialog @change="getList" lx="05" />
+  <AddFrom ref="addModelRef" :dict="{ D_GSXT_YJXX_CZZT, D_BZ_YJJB, D_GS_SSYJ }" />
+  <!-- 处置建议 -->
+  <Czjy ref="czjyRef" @okSubmit="getList"></Czjy>
+</template>
+
+<script setup>
+import Czjy from './components/czjy.vue'
+import { getItem, setItem } from '@/utils/storage'
+import PageTitle from "@/components/aboutTable/PageTitle.vue";
+import Searchs from "@/components/aboutTable/Search.vue";
+import MyTable from "@/components/aboutTable/MyTable.vue";
+import Pages from "@/components/aboutTable/Pages.vue";
+import AddFrom from "./components/addFrom.vue";
+import FkDialog from "@/views/backOfficeSystem/fourColorManage/warningControl/centerHome/components/fkDialog.vue";
+import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue";
+import { qcckGet, qcckPost } from "@/api/qcckApi.js";
+import emitter from "@/utils/eventBus.js";
+import { holographicProfileJump } from "@/utils/tools.js"
+import Items from "./item/items.vue"
+import { exportExlByObj } from "@/utils/exportExcel.js"
+import { getMultiDictVal } from "@/utils/dict.js"
+const czjyRef = ref()
+const { proxy } = getCurrentInstance();
+const searchBox = ref();
+const { D_GSXT_YJXX_CZZT, D_GS_SSYJ,D_BZ_YJJB } = proxy.$dict("D_GSXT_YJXX_CZZT", "D_GS_SSYJ",'D_BZ_YJJB')
+const dict = reactive({ D_GSXT_YJXX_CZZT, D_GS_SSYJ })
+// 搜索配置
+const searchConfiger = ref([
+  { label: "姓名", prop: 'xm', placeholder: "请输入姓名", showType: "input" },
+  { label: "身份证号码", prop: 'sfzh', placeholder: "请输入身份证号码", showType: "input" },
+  { label: "预警标签", prop: 'yjbqmc', placeholder: "请输入预警标签", showType: "input" },
+  { label: "部门", prop: 'ssbmdm', placeholder: "请选择部门", showType: "department" },
+  { label: "级别", prop: 'yjJb', placeholder: "请选择级别", showType: "select" ,options: D_BZ_YJJB},
+  { label: "积分段", prop: 'jfd', placeholder: "请选择积分段", showType: "Slot" },
+]);
+
+const permission_sfqs = ref(false)
+const roleCode = ref(false)
+
+const queryFrom = ref({});
+
+// 页面数据
+const pageData = reactive({
+  tableData: [],
+  keyCount: 0,
+  tableConfiger: {
+    rowHieght: 61,
+    showSelectType: "checkBox",
+    loading: false,
+    haveControls: true,
+  },
+  total: 0,
+  pageConfiger: {
+    pageSize: 20,
+    pageCurrent: 1
+  },
+  controlsWidth: 300, //操作栏宽度
+  tableColumn: [
+    { label: "预警人员姓名", prop: "yjRyxm" },
+    { label: "预警人员身份证号码", prop: "yjRysfzh" },
+    { label: "预警标签", prop: "yjbqmc" },
+    { label: "今日预警次数", prop: "yjJrcs" },
+    { label: "标签颜色", prop: "yjJb", showSolt: true },
+    { label: "预警内容", prop: "yjNr" },
+    { label: "预警时间", prop: "yjFssj" },
+    { label: "处置状态", prop: "czzt", showSolt: true },
+    { label: "所属县局", prop: "ssxgaj" },
+    { label: "处置单位", prop: "ssbm" },
+  ]
+});
+
+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 onSearch = (val) => {
+  queryFrom.value = { ...queryFrom.value,...val };
+  pageData.pageConfiger.pageCurrent = 1;
+  getList();
+};
+
+const reset = () => {
+  delete queryFrom.value.ksfz
+  delete queryFrom.value.jsfz
+}
+
+const changeNo = (val) => {
+  pageData.pageConfiger.pageCurrent = val;
+  getList();
+};
+
+const changeSize = (val) => {
+  pageData.pageConfiger.pageSize = val;
+  getList();
+};
+
+const getList = () => {
+  pageData.tableConfiger.loading = true;
+  let params = {
+    ...queryFrom.value,
+    pageCurrent: pageData.pageConfiger.pageCurrent,
+    pageSize: pageData.pageConfiger.pageSize,
+  }
+  qcckPost(params,'/mosty-gsxt/tbYjxx/getBdbkPageList').then((res) => {
+    pageData.tableData = res?.records || []
+    pageData.total = res?.total || 0;
+    pageData.tableConfiger.loading = false;
+  }).catch(() => {
+    pageData.tableConfiger.loading = false;
+  });
+};
+
+// 处理签收
+const handleQsFk = (val, type) => {
+  switch (type) {
+    case '签收':
+      proxy.$confirm("是否确定要签收？", "警告", { type: "warning" }).then(() => {
+        qcckPost({ id: val.id }, "/mosty-gsxt/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 pushAssess = (val) => {
+  return holographicProfileJump(val?.sfzh) // 全息档案跳转
+}
+
+
+const bqYs = (val) => {
+  switch (val) {
+    case '01':
+      return '#ff0202'
+    case '02':
+      return '#ff8c00'
+    case '03':
+      return '#ffff00'
+    case '04':
+      return '#0000ff'
+    default:
+      return ''
+  }
+}
+
+// 新增
+const addModelRef = ref(null)
+const openAddFrom = (row) => {
+  addModelRef.value.init('add', row)
+}
+// 搜索栏
+const search = ref(false)
+const openSearch = () => {
+  search.value = !search.value
+  nextTick(() => {
+    tabHeightFn()
+  })
+}
+
+const handleCzjy = (row) => {
+  czjyRef.value.init( row)
+}
+// 表格高度计算
+const tabHeightFn = () => {
+  if (search.value) {
+    pageData.tableHeight = window.innerHeight - searchBox.value.offsetHeight - 250;
+  } else {
+    pageData.tableHeight = window.innerHeight - 250;
+  }
+  window.onresize = function() {
+    tabHeightFn();
+  };
+};
+/** 选中项 */
+const selectRows = ref([])
+const handleChooseData = (val) => {
+  selectRows.value = val
+}
+const exportExl = () => {
+  const titleObj = {
+    yjRyxm: "预警人员姓名",
+    yjRysfzh: "预警人员身份证号码",
+    yjbqmc: "预警标签",
+    yjJrcs: "今日预警次数",
+    yjJb_name: "标签颜色",
+    yjNr: "预警内容",
+    yjFssj: "预警时间",
+    czzt_name: "处置状态",
+    ssxgaj: "所属县局",
+    ssbm: "处置单位",
+  }
+  /** 导出【选中】的数据 （没有就全部）*/
+  const needArr = selectRows.value?.length > 0 ? selectRows.value : pageData.tableData
+  const data = needArr.map(item => {
+    return {
+      ...item,
+      yjJb_name: getMultiDictVal(item.yjJb, D_GS_SSYJ),
+      czzt_name: getMultiDictVal(item.czzt, D_GSXT_YJXX_CZZT),
+    }
+  })
+  exportExlByObj(titleObj, data, '预警布控')
+}
+
+</script>
+
+<style>
+.el-loading-mask {
+  background: rgba(0, 0, 0, 0.5) !important;
+}
+</style>
diff --git a/src/views/backOfficeSystem/fourColorManage/warningControl/controlWarning/item/items.vue b/src/views/backOfficeSystem/fourColorManage/warningControl/controlWarning/item/items.vue
new file mode 100644
index 0000000..00c636c
--- /dev/null
+++ b/src/views/backOfficeSystem/fourColorManage/warningControl/controlWarning/item/items.vue
@@ -0,0 +1,89 @@
+<template>
+  <div class="warning-item" >
+
+    <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" 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" description="暂无数据" />
+    </div>
+    
+  </div>
+</template>
+<script setup>
+import { ref, computed, onMounted } from 'vue'
+import { qcckPost,qcckGet } from "@/api/qcckApi.js";
+
+const props = defineProps({
+  /** 表格行数据 */
+  row: {
+    type: Object,
+    default: () => ({})
+  },
+  dict: {
+    type: Object,
+    default: () => ({
+      D_GS_SSYJ: [],
+      D_GSXT_YJXX_CZZT: []
+    })
+  },
+})
+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;
+  border-radius: 8px;
+  background-color: #fafafa;
+}
+.item-row{
+  border-bottom: 1px dashed #e8e8e8;
+  line-height: 36px;
+  padding-bottom: 10px;
+  margin-bottom: 10px;
+}
+.info-item{
+  line-height: 36px;
+  width: 100%;
+  .text{
+    display: inline-block;
+    width: 25%;
+    margin-right: 10px;
+  }
+}
+
+</style>
diff --git a/src/views/backOfficeSystem/fourColorManage/warningControl/identityWarning/index.vue b/src/views/backOfficeSystem/fourColorManage/warningControl/identityWarning/index.vue
index 0222fe3..dc1c786 100644
--- a/src/views/backOfficeSystem/fourColorManage/warningControl/identityWarning/index.vue
+++ b/src/views/backOfficeSystem/fourColorManage/warningControl/identityWarning/index.vue
@@ -151,7 +151,6 @@ const pageData = reactive({
 });
 
 onMounted(() => {
-  console.log(getItem('deptId'));
   let str = getItem('deptId') ? getItem('deptId')[0].deptLevel : ''
   permission_sfqs.value = str.startsWith('2'||'3') ? false : true;