diff --git a/src/App.vue b/src/App.vue
index 817c4c5..ce4b053 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -152,7 +152,7 @@ v-deep .el-loading-mask {
 }
 .popupCustomBox{
   position: relative;
-  background: #2a88e082;
+  background: rgba(2, 55, 114, 0.99);
   color: #fff;
   border-radius: 4px;
   box-shadow: 0 2px 8px rgba(0, 0, 0, 0.3);
@@ -179,7 +179,7 @@ v-deep .el-loading-mask {
     height: 0;
     border-left: 10px solid transparent;
     border-right: 10px solid transparent;
-    border-top: 10px solid #2a88e082;
+    border-top: 10px solid rgba(2, 55, 114, 0.99);
   }
   .popupCustomTitle_li{
     font-size: 12px;
diff --git a/src/router/index.js b/src/router/index.js
index 10f8e7c..7764570 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -329,7 +329,6 @@ export const publicRoutes = [
               icon: "article"
             }
           },
-
           {
             path: "/transferConsultationList",
             name: "transferConsultationList",
@@ -468,89 +467,90 @@ export const publicRoutes = [
           title: "会商研判",
           icon: "article"
         },
-        children: [{
-          path: "/policeReport",
-          name: "policeReport",
-          component: () => import("@/views/backOfficeSystem/policeReport/index.vue"),
-          meta: {
-            title: "警情管理",
-            icon: "article"
-          }
-        },
-        {
-          path: "/ResearchHome",
-          name: "ResearchHome",
-          component: () => import("@/views/backOfficeSystem/JudgmentHome/ResearchHome/index"),
-          meta: {
-            title: "智能研判",
-            icon: "article"
-          }
-        },
-        {
-          path: "/dataReduction",
-          name: "dataReduction",
-          component: () => import("@/views/backOfficeSystem/JudgmentHome/dataReduction/index"),
-          meta: {
-            title: "数据整理",
-            icon: "article"
-          }
-        },
-        //   {
-        //     path: "/situationHome",
-        //     name: "situationHome",
-        //     component: () => import("@/views/backOfficeSystem/JudgmentHome/situationHome/index"),
-        //     meta: {
-        //       title: "战略研判",
-        //       icon: "article"
-        //     }
-        //   },
-        // 后面写的研判
-        {
-          path: "/tacticalResearch",
-          name: "tacticalResearch",
-          component: () => import("@/views/backOfficeSystem/JudgmentHome/tacticalResearch/index.vue"),
-          meta: {
-            title: "战术研判",
-            icon: "article"
-          }
-        },
-        {
-          path: "/strategicResearch",
-          name: "strategicResearch",
-          component: () => import("@/views/backOfficeSystem/JudgmentHome/strategicResearch/index.vue"),
-          meta: {
-            title: "战略研判",
-            icon: "article"
-          }
-        },
-        {
-          path: "/judgmentCommand",
-          name: "judgmentCommand",
-          component: () => import("@/views/backOfficeSystem/JudgmentHome/judgmentCommand/index.vue"),
-          meta: {
-            title: "研判指令",
-            icon: "article"
-          }
-        },
+        children: [
+          {
+            path: "/policeReport",
+            name: "policeReport",
+            component: () => import("@/views/backOfficeSystem/policeReport/index.vue"),
+            meta: {
+              title: "警情管理",
+              icon: "article"
+            }
+          },
+          {
+            path: "/ResearchHome",
+            name: "ResearchHome",
+            component: () => import("@/views/backOfficeSystem/JudgmentHome/ResearchHome/index"),
+            meta: {
+              title: "智能研判",
+              icon: "article"
+            }
+          },
+          {
+            path: "/dataReduction",
+            name: "dataReduction",
+            component: () => import("@/views/backOfficeSystem/JudgmentHome/dataReduction/index"),
+            meta: {
+              title: "数据整理",
+              icon: "article"
+            }
+          },
+          //   {
+          //     path: "/situationHome",
+          //     name: "situationHome",
+          //     component: () => import("@/views/backOfficeSystem/JudgmentHome/situationHome/index"),
+          //     meta: {
+          //       title: "战略研判",
+          //       icon: "article"
+          //     }
+          //   },
+          // 后面写的研判
+          {
+            path: "/tacticalResearch",
+            name: "tacticalResearch",
+            component: () => import("@/views/backOfficeSystem/JudgmentHome/tacticalResearch/index.vue"),
+            meta: {
+              title: "战术研判",
+              icon: "article"
+            }
+          },
+          {
+            path: "/strategicResearch",
+            name: "strategicResearch",
+            component: () => import("@/views/backOfficeSystem/JudgmentHome/strategicResearch/index.vue"),
+            meta: {
+              title: "战略研判",
+              icon: "article"
+            }
+          },
+          {
+            path: "/judgmentCommand",
+            name: "judgmentCommand",
+            component: () => import("@/views/backOfficeSystem/JudgmentHome/judgmentCommand/index.vue"),
+            meta: {
+              title: "研判指令",
+              icon: "article"
+            }
+          },
 
-        // {
-        //   path: "/analysisReport",
-        //   name: "AnalysisReport",
-        //   component: () => import("@/views/backOfficeSystem/AnalysisReport/index"),
-        //   meta: {
-        //     title: "研判报告",
-        //     icon: "article"
-        //   }
-        // },
-        {
-          path: "/MeetingRoom",
-          name: "MeetingRoom",
-          component: () => import("@/views/backOfficeSystem/JudgmentHome/MeetingRoom/index"),
-          meta: {
-            title: "网上会商室",
-            icon: "article"
+          // {
+          //   path: "/analysisReport",
+          //   name: "AnalysisReport",
+          //   component: () => import("@/views/backOfficeSystem/AnalysisReport/index"),
+          //   meta: {
+          //     title: "研判报告",
+          //     icon: "article"
+          //   }
+          // },
+          {
+            path: "/MeetingRoom",
+            name: "MeetingRoom",
+            component: () => import("@/views/backOfficeSystem/JudgmentHome/MeetingRoom/index"),
+            meta: {
+              title: "网上会商室",
+              icon: "article"
+            }
           }
-        }
         ]
       },
       {
diff --git a/src/views/backOfficeSystem/policeReport/components/deepypDialog.vue b/src/views/backOfficeSystem/policeReport/components/deepypDialog.vue
new file mode 100644
index 0000000..9419ee9
--- /dev/null
+++ b/src/views/backOfficeSystem/policeReport/components/deepypDialog.vue
@@ -0,0 +1,93 @@
+<template>
+    <el-dialog title="深度研判" v-model="visible" v-if="visible" width="70%" @close="close">
+        <el-form :model="formData" :rules="rules" ref="formRef" label-width="120px" label-position="top">
+            <el-row :gutter="24">
+                <el-col :span="12">
+                    <el-form-item label="研判议题" prop="ypyt" class="mt10">
+                        <el-input v-model="formData.ypyt" placeholder="请输入研判议题" clearable />
+                    </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                    <el-form-item label="研判时间" prop="wcsj" class="mt10">
+                        <el-date-picker v-model="formData.wcsj" type="datetime" placeholder="请选择研判时间" style="width: 100%;" />
+                    </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                    <el-form-item label="报告类型" prop="bglx" class="mt10">
+                        <el-radio-group v-model="formData.bglx">
+                            <el-radio v-for="value in D_BZ_YPLX" :key="value.value" :label="value.value" :value="value.value" >{{value.label}}</el-radio>
+                        </el-radio-group>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                    <el-form-item label="参与研判部门" prop="deptIds" class="mt10">
+                        <MOSTY.Department clearable v-model="formData.ypbmdm" multiple style="width: 100%;" />
+                    </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                    <el-form-item label="研判要求" prop="ypyq" class="mt10">
+                        <el-input v-model="formData.ypyq" placeholder="请填写研判要求" type="textarea" rows="4" />
+                    </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                    <el-form-item class="mt10" center>
+                        <div style="margin: 0 auto;">
+                            <el-button type="primary" :loading="loading" @click="submitForm">提交</el-button>
+                            <el-button @click="close">取消</el-button>
+                        </div>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+        </el-form>
+    </el-dialog>
+</template>
+
+<script setup>
+    import * as MOSTY from "@/components/MyComponents/index";
+    import { ElMessage } from 'element-plus';
+    import { qcckPost } from '@/api/qcckApi'
+    import { ref,getCurrentInstance } from 'vue'
+    const emit = defineEmits(['change']);
+    const { proxy } = getCurrentInstance();
+    const { D_BZ_YPLX,D_BZ_YPFS } = proxy.$dict('D_BZ_YPLX','D_BZ_YPFS')
+    const visible = ref(true)
+    const loading = ref(false)
+    const formRef = ref()
+    const formData = ref({})
+    
+    const rules = ref({
+      ypyt: [{ required: true, message: '请输入研判议题', trigger: 'blur' }],
+      wcsj: [{ required: true, message: '请选择研判时间', trigger: 'change' }],
+      bglx: [{ required: true, message: '请选择报告类型', trigger: 'change' }],
+      ypfs: [{ required: true, message: '请选择研判方式', trigger: 'change' }],
+      deptIds: [{ required: true, message: '请选择参与研判部门', trigger: 'change' }],
+      ypyq: [{ required: true, message: '请输入研判内容', trigger: 'blur' }],
+    })
+    const init = (row) => {
+      visible.value = true;
+      formData.value = Object.assign({}, formData.value, row || {})
+    }
+    const close = () => {
+      visible.value = false;
+      formRef.value.resetFields();
+    }
+    const submitForm = () => {
+        formRef.value.validate((valid) => {
+            if (!valid) return;
+            let data = {  ...formData.value, yplx:'01' }
+            loading.value = true;
+            qcckPost(data,'/mosty-gsxt/lzJcjPjdb/sdyp').then(res => {
+                loading.value = false;
+                ElMessage.success('研判成功');
+                emit('change');
+                close();
+            }).catch(() => {
+                loading.value = false;
+                ElMessage.error('研判失败');
+            })
+        })
+    }
+    defineExpose({
+      init,
+    })
+</script>
diff --git a/src/views/backOfficeSystem/policeReport/components/ypDialog.vue b/src/views/backOfficeSystem/policeReport/components/ypDialog.vue
new file mode 100644
index 0000000..8e69fb9
--- /dev/null
+++ b/src/views/backOfficeSystem/policeReport/components/ypDialog.vue
@@ -0,0 +1,89 @@
+<template>
+    <el-dialog title="研判" v-model="visible" v-if="visible" width="50%" @close="close">
+        <el-form :model="formData" :rules="rules" ref="formRef" label-width="120px" label-position="top">
+            <el-divider content-position="left">警情基本信息</el-divider>
+            <el-descriptions class="margin-top" :column="3" border >
+                <el-descriptions-item>
+                    <template #label><div class="cell-item">接警单编号</div></template>
+                    {{ formData.jjdbh }}
+                </el-descriptions-item>
+
+                <el-descriptions-item>
+                    <template #label><div class="cell-item">报警电话</div></template>
+                    {{ formData.bjdh }}
+                </el-descriptions-item>
+
+                <el-descriptions-item>
+                    <template #label><div class="cell-item"> 报警时间 </div></template>
+                    {{ formData.bjsj }}
+                </el-descriptions-item>
+
+                <el-descriptions-item>
+                    <template #label><div class="cell-item">  接警员姓名 </div></template>
+                    {{ formData.jjyxm }}
+                </el-descriptions-item>
+
+                <el-descriptions-item>
+                    <template #label> <div class="cell-item">  警情地址 </div> </template>
+                    {{ formData.jqdz }}
+                </el-descriptions-item>
+            </el-descriptions>
+
+            <el-divider content-position="left">报警内容</el-divider>
+            <el-input v-model="formData.bjnr" placeholder="请输入报警内容" type="textarea" rows="4" readonly />
+
+
+            <el-form-item label="研判内容" prop="ypnr" class="mt20">
+                <el-input v-model="formData.ypnr" placeholder="请输入研判结果" type="textarea" rows="4" />
+            </el-form-item>
+
+            <el-form-item label="" class="mt20" center>
+                <div style="margin: 0 auto;">
+                    <el-button type="primary" :loading="loading" @click="submitForm">提交</el-button>
+                    <el-button @click="close">取消</el-button>
+                </div>
+            </el-form-item>
+        </el-form>
+    </el-dialog>
+</template>
+
+<script setup>
+    import { ElMessage } from 'element-plus';
+    import { qcckPost } from '@/api/qcckApi'
+    import { ref } from 'vue'
+    const emit = defineEmits(['change']);
+    const visible = ref(false)
+    const loading = ref(false)
+    const formRef = ref()
+    const formData = ref({})
+    const rules = ref({
+      ypnr: [{ required: true, message: '请输入研判内容', trigger: 'blur' }],
+    })
+    const init = (row) => {
+      visible.value = true;
+      formData.value = row
+    }
+    const close = () => {
+      visible.value = false;
+      formRef.value.resetFields();
+    }
+    const submitForm = () => {
+        formRef.value.validate((valid) => {
+            if (!valid) return;
+            let data = {  ...formData.value, yplx:'01' }
+            loading.value = true;
+            qcckPost(data,'/mosty-gsxt/lzJcjPjdb/ptyp').then(res => {
+                loading.value = false;
+                ElMessage.success('研判成功');
+                emit('change');
+                close();
+            }).catch(() => {
+                loading.value = false;
+                ElMessage.error('研判失败');
+            })
+        })
+    }
+    defineExpose({
+      init,
+    })
+</script>
\ No newline at end of file
diff --git a/src/views/backOfficeSystem/policeReport/index.vue b/src/views/backOfficeSystem/policeReport/index.vue
index 5da5f2a..26fd347 100644
--- a/src/views/backOfficeSystem/policeReport/index.vue
+++ b/src/views/backOfficeSystem/policeReport/index.vue
@@ -19,17 +19,22 @@
         <!-- <template #jjlx="{ row }">
           <DictTag :tag="false" :value="row.jjlx" :options="D_BZ_JQBQ" />
         </template> -->
+        <template #jqdjdm="{ row }">
+          <DictTag :tag="false" :value="row.jqdjdm" :options="D_GS_BQ_DJ" />
+        </template>
         <template #jqlbdm="{ row }">
           <DictTag :tag="false" :value="row.jqlbdm" :options="JQLB" />
         </template>
-        <template #jqdjdm="{ row }">
+        <!-- <template #jqdjdm="{ row }">
           <DictTag :tag="false" :value="row.jqdjdm" :options="D_BZ_JQDJ" />
-        </template>
+        </template> -->
         <!-- 操作 -->
         <template #controls="{ row }">
           <el-link type="warning" @click="addEdit('edit', row)">研判</el-link>
           <el-link type="danger" @click="addEdit('edit', row)">深度研判</el-link>
           <el-link type="primary" @click="addEdit('edit', row)">详情</el-link>
+          <el-link type="primary" @click="handleYP('研判', row)">研判</el-link>
+          <el-link type="primary" @click="handleYP('深度研判', row)">深度研判</el-link>
         </template>
       </MyTable>
       <Pages @changeNo="changeNo" @changeSize="changeSize" :tableHeight="pageData.tableHeight" :pageConfiger="{
@@ -38,12 +43,19 @@
       }"></Pages>
     </div>
     <!-- 编辑详情 -->
-    <EditAddForm v-if="show" ref="detailDiloag"
-      :dic="{ JQLB, JQLX, JQXL, JQZL, D_BZ_JQLY, D_BZ_JQFL, JQLB_DP, D_BZ_JQBQ, D_GS_SSYJ }" @updateDate="getList" />
+    <EditAddForm  v-if="show" ref="detailDiloag" :dic="{ JQLB,JQLX,JQXL,JQZL,D_BZ_JQLY,D_BZ_JQFL,JQLB_DP,D_BZ_JQBQ,D_GS_SSYJ }"
+      @updateDate="getList" />
+
+      <!-- 研判弹窗 -->
+      <YpDialog ref="ypDialog" @change="getList" />
+      <!-- <DeepYpDialog ref="deepYpDialog" @change="getList" /> -->
   </div>
 </template>
 
 <script setup>
+import YpDialog from "./components/ypDialog.vue";
+import DeepYpDialog from "./components/deepypDialog.vue";
+
 import PageTitle from "@/components/aboutTable/PageTitle.vue";
 import MyTable from "@/components/aboutTable/MyTable.vue";
 import Pages from "@/components/aboutTable/Pages.vue";
@@ -52,8 +64,9 @@ import EditAddForm from "./components/editAddForm.vue";
 import { lzJcjPjdbSelectPage } from '@/api/semanticAnalysis.js'
 import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue";
 const { proxy } = getCurrentInstance();
-const { JQLB, JQLX, JQXL, JQZL, D_BZ_JQLY, D_BZ_JQFL, JQLB_DP, D_BZ_JQBQ, D_GS_SSYJ, D_BZ_JQDJ } = proxy.$dict("JQLB", 'JQLX', 'JQXL', 'JQZL', 'D_BZ_JQLY', 'D_BZ_JQFL', 'JQLB_DP', 'D_BZ_JQBQ', 'D_GS_SSYJ', 'D_BZ_JQDJ'); //获取字典数据
-
+const { D_GS_BQ_DJ,JQLB,JQLX,JQXL,JQZL,D_BZ_JQLY,D_BZ_JQFL,JQLB_DP,D_BZ_JQBQ,D_GS_SSYJ } = proxy.$dict('D_GS_BQ_DJ',"JQLB",'JQLX','JQXL','JQZL','D_BZ_JQLY','D_BZ_JQFL','JQLB_DP','D_BZ_JQBQ','D_GS_SSYJ'); //获取字典数据
+const ypDialog = ref();
+const deepYpDialog = ref();
 const detailDiloag = ref();
 const show = ref(false)
 const searchConfiger = ref([
@@ -76,11 +89,11 @@ const searchConfiger = ref([
     showType: "input"
   },
   {
-    label: "警情等级",
+    label: "警情级别",
     prop: "jqdjdm",
-    placeholder: "请输入警情等级",
+    placeholder: "请选择警情级别",
     showType: "select",
-    options: D_BZ_JQDJ
+    options: D_GS_BQ_DJ
   },
 ]);
 const searchBox = ref(); //搜索框
@@ -97,15 +110,16 @@ const pageData = reactive({
     pageSize: 20,
     pageCurrent: 1
   }, //分页
-  controlsWidth: 240, //操作栏宽度
+  controlsWidth: 210, //操作栏宽度
   tableColumn: [
     { label: "接警单编号", prop: "jjdbh" },
     { label: "报警电话", prop: "bjdh" },
     { label: "报警时间", prop: "bjsj" },
     { label: "报警内容", prop: "bjnr", showOverflowTooltip: true },
     { label: "接警员姓名", prop: "jjyxm" },
-    { label: "警情类型", prop: "jqlbdm", showSolt: true },
-    { label: "警情级别", prop: "jqdjdm", showSolt: true },
+    { label: "警情级别", prop: "jqdjdm",showSolt:true },
+    // { label: "警情标签", prop: "jjlx", showSolt: true },
+    { label: "警情类型", prop: "jqlbdm",showSolt:true },
     { label: "警情地址", prop: "jqdz" },
     { label: "补充接警内容", prop: "bcjjnr", showOverflowTooltip: true },
 
@@ -161,6 +175,15 @@ const addEdit = (type, row) => {
   })
 };
 
+const handleYP = (type, row) => {
+  console.log(type, row);
+  if(type === '研判'){
+    ypDialog.value.init(row);
+  }else{
+    deepYpDialog.value.init(row);
+  }
+}
+
 
 // 表格高度计算
 const tabHeightFn = () => {
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 5e79d5b..aaa1ea3 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -242,13 +242,15 @@ const handleOpenNotification = () => {
     allDep.value.forEach(item => {
       emitter.emit("makerPopup", { data:item, flag: "hm_pop",type:'Custom'});
     })
+  } else {
+    // 关闭主动展开后，恢复循环单条气泡展示
+    startPopupLoop()
   }
 }
-const makerCenter = () => {
+const makerCenter = () => { 
   const dw = require("@/assets/point/dingwei.png")
   qcckGet({},'/mosty-gsxt/tbYjxx/selectSsbm').then(res=>{
     emitter.emit('deletePointArea','hm')
-    if(!showNotification.value) emitter.emit('deletePointArea','hm_pop')
     let list = res || [];
     list.forEach(item => {
       let obj = centralPoint.find(i => i.name == item.ssbm || i.ssbmdm == item.ssbmdm);
@@ -259,15 +261,6 @@ const makerCenter = () => {
     })
     allDep.value = list;
     emitter.emit("addPointArea", { coords:list, icon: dw, flag: "hm", size: '14px', showTitle: false, offset: [0, -25] });
-    if(!showNotification.value){
-      setTimeout(() => {
-        // 没有主动展开提示，默认循环一个一个展示
-        if(list.length > 0){
-          emitter.emit("makerPopup", { data:list[indexNum.value], flag: "hm_pop",type:'Custom'});
-          indexNum.value == list.length ? indexNum.value = 0 : indexNum.value++
-        }
-      }, 1000);
-    }
   })
 }
 //播放音频
@@ -300,13 +293,26 @@ const initAudioPlayer = () => {
     })
 }
 const bnTimer = ref(null)
+const popupTimer = ref(null)
+
+const startPopupLoop = () => {
+  clearInterval(popupTimer.value)
+  popupTimer.value = setInterval(() => {
+    if (!showNotification.value && allDep.value.length > 0) {
+      emitter.emit('deletePointArea','hm_pop')
+      emitter.emit("makerPopup", { data: allDep.value[indexNum.value], flag: "hm_pop", type:'Custom' })
+      indexNum.value = (indexNum.value + 1) % allDep.value.length
+    }
+  }, 10000)
+}
 // 组件挂载时初始化音频播放器
 onMounted(() => {
   getDepId()
   makerCenter()
   bnTimer.value = setInterval(()=>{
     makerCenter()
-  },10000)
+  },60000)
+  startPopupLoop()
   mouseLeave()
   getTbYjxxGetList()
   // 初始化音频播放器
@@ -410,6 +416,7 @@ function changeModel(){
 onUnmounted(() => {
   clearInterval(timing.value)
   clearInterval(bnTimer.value)
+  clearInterval(popupTimer.value)
   // 组件卸载时停止音频播放并释放资源
   if (audioPlayer) {
     audioPlayer.destroy()