diff --git a/src/components/aboutTable/FormMessage.vue b/src/components/aboutTable/FormMessage.vue
index 631a63d..0bed4ad 100644
--- a/src/components/aboutTable/FormMessage.vue
+++ b/src/components/aboutTable/FormMessage.vue
@@ -3,7 +3,7 @@
 
     <el-form-item v-for="(item, idx) in props.formList" :style="item.width && { width: item.width }" :prop="item.prop"  :label="item.label" :label-width="item.labelWidth" :key="idx">
       <!-- input表单 input-->
-      <MOSTY.Other v-if="item.type == 'input'" width="100%" clearable v-model="listQuery[item.prop]"  :placeholder="`请输入${item.label}`" :disabled="item.disabled" />
+      <MOSTY.Other v-if="item.type == 'input'" width="100%" clearable v-model="listQuery[item.prop]"  :placeholder="`请输入${item.label}`" :disabled="item.disabled" :readonly="item.readonly" />
       
       <el-input v-model="listQuery[item.prop]" v-else-if="item.type == 'textarea'" type="textarea" :rows="3"  :placeholder="`请输入${item.label}`" :disabled="item.disabled" />
       <!-- 数值 inputNumber-->
@@ -47,7 +47,7 @@
 </template>
 <script setup>
 import * as MOSTY from "@/components/MyComponents/index";
-import { ref, defineProps, defineEmits, defineExpose, watch, watchEffect } from "vue";
+import { ref, defineProps, defineEmits, defineExpose, watch, watchEffect, readonly } from "vue";
 const props = defineProps({
   //循环的值
   formList: {
diff --git a/src/views/backOfficeSystem/IntelligentControl/warningControl/components/fkDialog.vue b/src/views/backOfficeSystem/IntelligentControl/warningControl/components/fkDialog.vue
index 48af86d..8add1c6 100644
--- a/src/views/backOfficeSystem/IntelligentControl/warningControl/components/fkDialog.vue
+++ b/src/views/backOfficeSystem/IntelligentControl/warningControl/components/fkDialog.vue
@@ -1,76 +1,128 @@
 <template>
-    <el-dialog v-model="showDialog" :append-to-body="true" :destroy-on-close="true" title="新增人员" :close-on-click-modal="false">
-        <FormMessage v-model="listQuery" :formList="formData" labelWidth="160px" ref="elform" :rules="rules">
+    <el-dialog v-model="showDialog" :append-to-body="true" :destroy-on-close="true" :title="title" :close-on-click-modal="false">
+        <FormMessage v-model="listQuery" :disabled="title == '反馈' ? false : true" :formList="formData" labelWidth="160px" ref="elform" :rules="rules">
+          <template #mbzrmjxm>
+            <MOSTY.Other width="100%" @click="handleChoose('mbzrmjxm')" clearable v-model="listQuery.mbzrmjxm"  placeholder="请选择民警" :readonly="true" />
+          </template>
+          <template #czzrmj>
+            <MOSTY.Other width="100%" @click="handleChoose('czzrmj')" clearable v-model="listQuery.czzrmj"  placeholder="请选择民警" :readonly="true" />
+          </template>
         </FormMessage>
         <template #footer>
             <div class="flex just-center">
                 <el-button @click="close">取消</el-button>
-                <el-button type="primary" @click="submitForm">确认</el-button>
+                <el-button type="primary" @click="submitForm" :loading="loading" v-if="title == '反馈'">确认</el-button>
             </div>
         </template>
   </el-dialog>
+  <ChooseUser v-model="chooseUserVisible" v-if="chooseUserVisible" @choosedUsers="handleUserSelected" :roleIds="roleIds" :Single="true" />
 </template>
 
 <script setup>
+import ChooseUser from "@/components/ChooseList/ChooseUser/index.vue"
+import * as MOSTY from "@/components/MyComponents/index";
+import { qcckGet, qcckPost } from "@/api/qcckApi.js";
 import emitter from "@/utils/eventBus.js";
 import FormMessage from "@/components/aboutTable/FormMessage.vue";
 import { onMounted, reactive, ref ,getCurrentInstance} from 'vue';
+const emit = defineEmits(['change'])
 const { proxy } = getCurrentInstance();
-const { D_BZ_SF } = proxy.$dict('D_BZ_SF')
+const { D_BZ_SF ,D_YJXX_CZCSLX,D_YJXX_CZSSXZ,D_YJXX_CKCZJG,D_YJXX_CKZYLX } = proxy.$dict('D_YJXX_CKZYLX','D_BZ_SF','D_YJXX_CZCSLX','D_YJXX_CZSSXZ','D_YJXX_CKCZJG')
+const chooseUserVisible = ref(false)
+const roleIds = ref([])
 const elform = ref()
 const showDialog = ref(false)
+const loading = ref(false)
+const choosetype = ref('')
 const listQuery = ref({})
 const formData = ref([
-  { label: "发现目标状态", prop: "fxmbzt", type: "select",options: D_BZ_SF },
-  { label: "发现目标责任单位", prop: "fxmbzedw", type: "department" },
-  { label: "发现目标责任民警", prop: "fxzrmj", type: "input" },
+  { label: "发现目标状态", prop: "mbzt", type: "select",options: D_BZ_SF },
+  { label: "发现目标责任单位", prop: "mbzrdwdm", type: "department" ,depMc:'mbzrdw'},
+  { label: "发现目标责任民警", prop: "mbzrmjxm", type: "slot"},
   { label: "是否本人", prop: "sfbr", type: "select",options: D_BZ_SF },
   { label: "处置时间", prop: "czsj", type: "datetime" },
   { label: "处置地址", prop: "czdz", type: "textarea",width:'100%'},
   { label: "详细地址", prop: "xxdz", type: "textarea",width:'100%' },
-  { label: "处置责任单位", prop: "czzrdw", type: "department" },
-  { label: "处置责任民警", prop: "czzrmj", type: "input" },
-  { label: "常控处置措施类型", prop: "ckczcslx", type: "select" },
-  { label: "常控处置措施细类", prop: "ckczcsxl", type: "select" },
-  { label: "常控处置结果", prop: "ckczjg", type: "input" },
+  { label: "处置责任单位", prop: "czzrdwdm", type: "department",depMc:'czzrdw' },
+  { label: "处置责任民警", prop: "czzrmj", type: "slot" },
+  { label: "常控处置措施类型", prop: "ckczcslx", type: "select" ,options: D_YJXX_CZCSLX},
+  { label: "常控处置措施细类", prop: "ckczcsxl", type: "select",options: D_YJXX_CZSSXZ},
+  { label: "常控处置结果", prop: "ckczjg", type: "select",options: D_YJXX_CKCZJG },
   { label: "常控立线侦察评估", prop: "cklxzcpg", type: "input" },
   { label: "常控立线侦察依据", prop: "cklxzcpgyj", type: "input" },
-  { label: "常控从事职业类型", prop: "cszylx", type: "select" },
+  { label: "常控从事职业类型", prop: "ckzylx", type: "select",options: D_YJXX_CKZYLX },
   { label: "是否尿检", prop: "sfnj", type: "radio",options:  D_BZ_SF  },
-  { label: "常控不尿检理由", prop: "fjdz", type: "textarea",width:'100%' },
-  { label: "常控处置反馈补充信息", prop: "fjdz", type: "input" },
+  { label: "常控不尿检理由", prop: "ckbnjly", type: "textarea",width:'100%' },
+  { label: "常控处置反馈补充信息", prop: "ckczbcxx", type: "textarea",width:'100%' },
 ])
 const rules = reactive({
-  fxmbzt: [{ required: true, message: "请选择发现目标状态", trigger: "change" }],
+  mbzt: [{ required: true, message: "请选择发现目标状态", trigger: "change" }],
   fxmbzedw: [{ required: true, message: "请选择发现目标责任单位", trigger: "change" }],
-  fxzrmj: [{ required: true, message: "请选择发现目标责任民警", trigger: "change" }],
+  mbzrmjxm: [{ required: true, message: "请选择发现目标责任民警", trigger: "change" }],
   sfbr:[{ required: true, message: "请选择是否本人", trigger: "change" }],
   czsj:[{ required: true, message: "请选择处置时间", trigger: "change" }],
   czdz:[{ required: true, message: "请选择处置地址", trigger: "blur" }],
   xxdz:[{ required: true, message: "请选择详细地址", trigger: "blur" }],
-  czzrdw:[{ required: true, message: "请选择处置责任单位", trigger: "change" }],
+  czzrdwdm:[{ required: true, message: "请选择处置责任单位", trigger: "change" }],
   czzrmj:[{ required: true, message: "请选择处置责任民警", trigger: "change" }],
   ckczcslx:[{ required: true, message: "请选择常控处置措施类型", trigger: "change" }],
   ckczcsxl:[{ required: true, message: "请选择常控处置措施细类", trigger: "change" }],
   ckczjg:[{ required: true, message: "请输入常控处置结果", trigger: "blur" }],
   cklxzcpg:[{ required: true, message: "请输入常控立线侦察评估", trigger: "blur" }],
   cklxzcpgyj:[{ required: true, message: "请输入常控立线侦察依据", trigger: "blur" }],
-  cszylx:[{ required: true, message: "请选择常控从事职业类型", trigger: "change" }],
+  ckzylx:[{ required: true, message: "请选择常控从事职业类型", trigger: "change" }],
   sfnj:[{ required: true, message: "请选择是否尿检", trigger: "change" }],
 })
 
+const title = ref('')
 onMounted(() => {
-  emitter.on("openFkDialog", () => {
-    showDialog.value = true
+  emitter.on("openFkDialog", (val) => {
+    showDialog.value = true;
+    listQuery.value = {yjid:val.id}
+    title.value = val.type;
+    if(val.type == '查看反馈'){
+      qcckGet({}, "/mosty-gsxt/tbYjxx/getInfo/"+val.id).then((res) => {
+        let list = res.fkList || []
+        listQuery.value =  list.length > 0 ? list[0] : {};
+      });
+    }
   })
 })
 
+const handleChoose = (type)=>{
+  chooseUserVisible.value = true,
+  choosetype.value = type;
+
+}
+
+// 选取角色
+const handleUserSelected = (val) => {
+  switch(choosetype.value){
+    case 'mbzrmjxm':
+      listQuery.value.mbzrmjxm = val[0].userName
+      listQuery.value.mbzrmjsfzh = val[0].inDustRialId
+      break;
+      case 'czzrmj':
+      listQuery.value.czzrmj = val[0].userName
+      listQuery.value.czzrmjsfzh = val[0].inDustRialId
+      break;
+  }
+  
+}
+
 const submitForm = () =>{
     elform.value.submit((val)=>{
-        // let obj = { data:val,type:title.value ,index:order.value}
-        // emit('change',obj)
-        // emit('update:modelValue',false)
+    loading.value = true;
+    qcckPost(val, "/mosty-gsxt/tbYjxx/yjfk").then(() => {
+      loading.value = false;
+      proxy.$message({ type: "success", message: "反馈成功" });
+      emit('change')
+      close()
+    }).catch(() => {
+      loading.value = false;
     })
+       
+  })
 }
 
 const close = () => {
diff --git a/src/views/backOfficeSystem/IntelligentControl/warningControl/components/yjItem copy.vue b/src/views/backOfficeSystem/IntelligentControl/warningControl/components/yjItem copy.vue
new file mode 100644
index 0000000..9474f68
--- /dev/null
+++ b/src/views/backOfficeSystem/IntelligentControl/warningControl/components/yjItem copy.vue	
@@ -0,0 +1,239 @@
+<template>
+  <div class="personCard relative flex mb10 pointer" >
+    <div class="avatarBox relative">
+      <div class="marks f12 absolute" :class="changeBg(props.item.yjJb)">
+        <span>{{ changetText(props.item.yjJb) }}</span>
+      </div>
+      <div>
+        <el-image :preview-teleported="true" style="width: 80px; height: 110px" :src="props.item.yjTp" :preview-src-list="[props.item.yjTp]"/>
+      </div>
+      <div>  
+        <span class="smallbtn" @click.stop="()=>{}">全息档案</span>
+      </div>
+    </div>
+    <div class="infoBox">
+      <div class="items">
+        <div class="infoItem flex nowrap mb10">{{ props.item.yjRyxm }} <span class="bqbox ml6">{{ props.item.yjbq }}</span></div>
+        <div class="infoItem ellipsis">性别：<span class="value">{{ IdCard(props.item.yjRysfzh , 2 )}}</span></div>
+        <div class="infoItem ellipsis">身份证号：<span class="value">{{ props.item.yjRysfzh }}</span></div>
+        <div class="infoItem ellipsis">出生日期：<span class="value">{{ IdCard(props.item.yjRysfzh , 1 )}}</span></div>
+        <div class="infoItem ellipsis">相似度：<span class="value">{{ props.item.xsd * 100 }}%</span></div>
+        <div class="infoItem ellipsis">预警次数：<span class="value"><span class="num">{{ props.item.yjCs }}</span> 次</span></div>
+        <div class="infoItem flex nowrap">
+          <span class="smllbtn" @click.stop="handleQs(props.item)" >签收</span>
+          <span class="smllbtn" @click.stop="handleFK('反馈')" ref="buttonRef" > {{ props.item.sffk ? '查看反馈':'反馈' }} </span>
+        </div>
+      </div>
+      <div class="items">
+        <div class="infoItem ellipsis">预警级别：<span class="value">{{ props.item.yjJb }}</span></div>
+        <div class="infoItem ellipsis">预警标题:<span class="value">{{ props.item.yjBt }}</span></div>
+        <div class="infoItem ellipsis">预警内容：<span class="value">{{ props.item.yjNr }}</span></div>
+        <div class="infoItem ellipsis">预警地址：<span class="value">{{ props.item.yjDz }}</span></div>
+        <div class="infoItem ellipsis">预警时间：<span class="value">{{ props.item.yjSj }}</span></div>
+        <div class="infoItem ellipsis">签收时间：<span class="value">{{ props.item.qssj }}</span></div>
+        <div class="infoItem ellipsis">反馈时间：<span class="value">{{ props.item.fksj }}</span></div>
+      </div>
+    </div>
+  </div>
+
+  <!-- 虚拟触发 -->
+  <!-- <el-popover ref="popoverRef" :visible="isShowVisble" :width="400" :virtual-ref="buttonRef" trigger="click" title="反馈" virtual-triggering >
+    <el-form :model="chooseRow" ref="elRowForm" :inline="true" label-width="100px" :rules="rules">
+      <el-form-item label="反馈内容" prop="fknr" style="width: 100%;">
+        <MOSTY.Other style="width: 100%;" clearable v-model="chooseRow.fknr" type="textarea" placeholder="请输入不通过原因"/>
+      </el-form-item>
+    </el-form>
+    <div class="flex just-center mt10">
+      <el-button @click.stop="cancelRowSp">取消</el-button>
+      <el-button type="primary"  @click.stop="handleSendSp(props.item)"  v-loading="btnloading">确定</el-button>
+    </div>
+  </el-popover> -->
+</template>
+
+<script setup>
+import emitter from "@/utils/eventBus.js";
+import { qcckGet, qcckPost } from "@/api/qcckApi.js";
+import * as MOSTY from "@/components/MyComponents/index";
+import { IdCard } from '@/utils/validate.js'
+import { defineProps ,ref, reactive,getCurrentInstance } from "vue";
+const { proxy } = getCurrentInstance();
+const props = defineProps({
+  item: {
+    type: Object,
+    default: () => ({})
+  },
+  dic: {
+    type: Object,
+    default: () => ({})
+  },
+  type: {
+    type: String,
+    default: ""
+  }
+});
+
+const buttonRef = ref()
+const popoverRef = ref()
+const elRowForm = ref()
+const isShowVisble = ref(false)
+const chooseRow = ref({})
+const rules = reactive({
+  fknr: [{ required: true, message: "请输入反馈内容", trigger: "blur" }],
+})
+
+
+// 处理签收
+const handleQs = (val) =>{
+  proxy.$confirm("是否确定要签收？", "警告", { type: "warning" }).then(() => {
+    qcckPost({id:val.id}, "/mosty-gsxt/tbYjxx/yjqs").then(() => {
+      val.czzt = '02'
+      proxy.$message({ type: "success", message: "签收成功" });
+    });
+  })
+}
+
+// 反馈
+const handleFK = (val) =>{
+  emitter.emit("openFkDialog", {id:props.item.id,type:val});
+}
+
+
+// 切换背景
+const changeBg = (type) => {
+  switch (type) {
+    case "10":
+      return "marks_red";
+    case "20":
+      return "marks_orange";
+    case "30":
+      return "marks_yellow";
+    case "40":
+      return "marks_blue";
+    default:
+      return "marks_blue";
+  }
+};
+const changetText = (type) => {
+  switch (type) {
+    case "10":
+      return "处置";
+    case "20":
+      return "关注";
+    case "30":
+      return "提醒";
+    case "40":
+      return "不关注";
+    default:
+      return "不关注";
+  }
+};
+const showDetail = () => {
+  emit('showDetail',props.item)
+}
+
+</script>
+
+<style lang="scss" scoped>
+.personCard {
+  background: rgba(10, 49, 88, 0.6);
+  box-shadow: inset 0px 0px 10px 0px rgba(56, 119, 242, 0.5);
+  border-radius: 0px 0px 0px 0px;
+  border: 1px solid #0072ff;
+  padding: 10px;
+  box-sizing: border-box;
+  transition: all 0.3s;
+
+  &:hover {
+    background: rgba(17, 66, 96, 0.8);
+  }
+
+  ::v-deep .el-button{
+    span{
+      color: #fff;
+    }
+  }
+
+  .avatarBox {
+    margin-right: 5px;
+    overflow: hidden;
+    width: 80px;
+    .marks {
+      width: 70px;
+      height: 32px;
+      line-height: 40px;
+      text-align: center;
+      background: rgba(255, 62, 62, 0.75);
+      top: -4px;
+      left: -24px;
+      transform: rotate(-45deg);
+      z-index: 1;
+    }
+
+    .marks_red {
+      background: rgba(255, 62, 62, 0.35);
+    }
+
+    .marks_orange {
+      background: rgba(255, 155, 62, 0.35);
+    }
+
+    .marks_yellow {
+      background: rgba(255, 239, 62, 0.35);
+    }
+
+    .marks_blue {
+      background: rgba(0, 114, 255, 0.35);
+    }
+  }
+
+  .bqbox {
+    color: #ff0000;
+    padding: 0px 6px;
+    background: rgba(255, 0, 0, 0.3);
+    border-radius: 1px 1px 1px 1px;
+    border: 1px solid #ff0000;
+    border-radius: 4px;
+  }
+
+  .infoBox {
+    width: calc(100% - 90px);
+    display: flex;
+    justify-content: space-between;
+    .items{
+      width: 50%;
+    }
+    .infoItem {
+        font-size: 13px;
+        margin-bottom: 2px;
+        color: #fff;
+        .value {
+          color: #89afcf;
+        }
+        .smllbtn {
+          display: inline-block;
+          padding: 4px 8px;
+          box-sizing: border-box;
+          border-radius: 4px;
+          background: #0072ff;
+          border-radius: 5px 5px 5px 5px;
+          margin-right: 6px;
+          margin-top: 4px;
+          cursor: pointer;
+          
+        }
+      }
+  }
+}
+
+.smallbtn {
+  display: inline-block;
+  padding: 4px 10px;
+  border-radius: 4px;
+  background: #0072ff;
+  border-radius: 5px 5px 5px 5px;
+  margin-top: 6px;
+}
+.num{
+  color: #00ffff;
+}
+</style>
diff --git a/src/views/backOfficeSystem/IntelligentControl/warningControl/components/yjItem.vue b/src/views/backOfficeSystem/IntelligentControl/warningControl/components/yjItem.vue
index 9474f68..40dca46 100644
--- a/src/views/backOfficeSystem/IntelligentControl/warningControl/components/yjItem.vue
+++ b/src/views/backOfficeSystem/IntelligentControl/warningControl/components/yjItem.vue
@@ -20,8 +20,9 @@
         <div class="infoItem ellipsis">相似度：<span class="value">{{ props.item.xsd * 100 }}%</span></div>
         <div class="infoItem ellipsis">预警次数：<span class="value"><span class="num">{{ props.item.yjCs }}</span> 次</span></div>
         <div class="infoItem flex nowrap">
-          <span class="smllbtn" @click.stop="handleQs(props.item)" >签收</span>
-          <span class="smllbtn" @click.stop="handleFK('反馈')" ref="buttonRef" > {{ props.item.sffk ? '查看反馈':'反馈' }} </span>
+          <span class="smllbtn" @click.stop="handleQsFk(props.item,'签收')" v-if="props.item.yjJb != 10 && props.item.czzt == '01'">签收</span>
+          <span class="smllbtn" @click.stop="handleQsFk(props.item,'反馈')" v-if="props.item.yjJb != 10 && props.item.czzt == '02'"> 反馈 </span>
+          <span class="smllbtn" @click.stop="handleQsFk(props.item,'查看反馈')" v-if="props.item.yjJb != 10 && props.item.czzt == '03'"> 查看反馈 </span>
         </div>
       </div>
       <div class="items">
@@ -83,21 +84,23 @@ const rules = reactive({
 
 
 // 处理签收
-const handleQs = (val) =>{
-  proxy.$confirm("是否确定要签收？", "警告", { type: "warning" }).then(() => {
-    qcckPost({id:val.id}, "/mosty-gsxt/tbYjxx/yjqs").then(() => {
-      val.czzt = '02'
-      proxy.$message({ type: "success", message: "签收成功" });
-    });
-  })
+const handleQsFk = (val,type) =>{
+  switch(type){
+    case '签收':
+      proxy.$confirm("是否确定要签收？", "警告", { type: "warning" }).then(() => {
+        qcckPost({id:val.id}, "/mosty-gsxt/tbYjxx/yjqs").then(() => {
+          val.czzt = '02'
+          proxy.$message({ type: "success", message: "签收成功" });
+        });
+      })
+      break;
+    case '反馈':
+    case '查看反馈':
+      emitter.emit("openFkDialog", {id:val.id,type});
+      break;
+  }
 }
 
-// 反馈
-const handleFK = (val) =>{
-  emitter.emit("openFkDialog", {id:props.item.id,type:val});
-}
-
-
 // 切换背景
 const changeBg = (type) => {
   switch (type) {
diff --git a/src/views/backOfficeSystem/IntelligentControl/warningControl/index.vue b/src/views/backOfficeSystem/IntelligentControl/warningControl/index.vue
index e8ac49c..7aa0c27 100644
--- a/src/views/backOfficeSystem/IntelligentControl/warningControl/index.vue
+++ b/src/views/backOfficeSystem/IntelligentControl/warningControl/index.vue
@@ -64,11 +64,11 @@
   </div>
   </div>
   <Information v-model="showDialog" title="发送指令" @submit='submit'  @close='close'>
-   <SemdFqzl ref="semdFqzlRef" :itemData="itemData" @handleClose="handleClose" identification="yj" :tacitly="tacitly"/>
+  <SemdFqzl ref="semdFqzlRef" :itemData="itemData" @handleClose="handleClose" identification="yj" :tacitly="tacitly"/>
   </Information>
 
   <!-- 反馈按钮 -->
-  <FkDialog ></FkDialog>
+  <FkDialog @change="getList"></FkDialog>
 
 </template>