更新

、·# especially if it merges an updated upstream into a topic branch.

src/App.vue

@@ -7,7 +7,6 @@
     </keep-alive>
   </router-view>
 <Fzq />
-
 </template>
 <script setup>
 import Watermark from "@/components/Watermark.vue";

src/components/aboutTable/Search.vue

@@ -415,6 +415,13 @@ const reset = () => {
   emit("reset", true);
   emit("submit", searchObj);
 };
+
+// 暴露searchObj给父组件
+defineExpose({
+  searchObj,
+  submit,
+  reset
+});
 watchEffect(() => {
   loadingPage.value = true;
   let arr = JSON.parse(JSON.stringify(props.searchArr));

src/components/common/TestDiv copy.vue

@@ -0,0 +1,240 @@
+<template>
+  <div class="test-div" v-if="dataList && dataList.length > 0">
+    <div class="test-header">
+      <span class="test-title">消息通知</span>
+      <div class="header-right">
+        <span class="test-countdown">{{ countdown }}s</span>
+        <el-icon class="close-icon" @click="handleClose">
+          <Close />
+        </el-icon>
+      </div>
+    </div>
+    <div class="test-content">
+      <Item v-for="(item, index) in dataList" :key="index" :item="item" />
+    </div>
+  </div>
+</template>
+
+<script setup>
+// 测试div组件，用于在后台和大屏页面都显示
+import { ref, onMounted, onUnmounted } from 'vue'
+import { Close } from '@element-plus/icons-vue'
+import WebSoketClass from '@/utils/webSocket.js'
+import emitter from "@/utils/eventBus.js"; // 导入事件总线
+import Item from './item.vue'
+import { AudioPlayerClass } from '@/utils/audioPlayer.js'
+const webSoket = new WebSoketClass()
+const dataList = ref([])
+const timekeeping = ref(null)
+const countdown = ref(0) // 倒计时时间（秒）
+
+// 音频播放器实例映射
+const audioPlayers = ref({
+  '02': null, // 信息上报
+  '03': null, // 研判审批
+  '04': null, // 研判指令
+  '05': null  // 线索下发
+})
+
+// 音频文件路径映射
+const audioPaths = {
+  '02': require('@/assets/images/cjyp.mp3'),
+  '03': require('@/assets/images/ypbg.mp3'),
+  '04': require('@/assets/images/ypzl.mp3'),
+  '05': require('@/assets/images/xsyp.mp3')
+}
+
+// 初始化音频播放器
+const initAudioPlayers = () => {
+  Object.keys(audioPaths).forEach(type => {
+    try {
+      audioPlayers.value[type] = new AudioPlayerClass()
+      audioPlayers.value[type].init(audioPaths[type], false)
+    } catch (error) {
+      console.error(`初始化类型${type}的音频播放器失败:`, error)
+    }
+  })
+}
+
+// 根据类型播放音频
+const playAudioByType = (type) => {
+  if (audioPlayers.value[type]) {
+    try {
+      audioPlayers.value[type].play()
+    } catch (error) {
+      console.error(`播放类型${type}的音频失败:`, error)
+    }
+  }
+}
+// 手动关闭
+const handleClose = () => {
+  if (timekeeping.value) {
+    clearInterval(timekeeping.value)
+    timekeeping.value = null
+  }
+  dataList.value = []
+}
+
+// 重置倒计时
+const resetCountdown = () => {
+  if (timekeeping.value) {
+    clearInterval(timekeeping.value)
+  }
+  countdown.value = 15
+  timekeeping.value = setInterval(() => {
+    countdown.value--
+    if (countdown.value <= 0) {
+      clearInterval(timekeeping.value)
+      dataList.value = []
+      timekeeping.value = null
+    }
+  }, 1000)
+}
+onMounted(() => {
+  // 初始化音频播放器
+  initAudioPlayers()
+
+  emitter.on('webSocketMessage', (newsDate) => {
+    if (newsDate) {
+        dataList.value.unshift({...newsDate.data,typeMasgeLx:newsDate.type})
+        // 根据消息类型播放音频
+        playAudioByType(newsDate.type)
+      resetCountdown()
+    }
+  })
+  // 组件挂载时执行的操作
+  webSoket.connect()
+  console.log('组件挂载时执行的操作')
+})
+onUnmounted(() => {
+  webSoket.closeConnection()
+  emitter.off('webSocketMessage')
+  if (timekeeping.value) {
+    clearInterval(timekeeping.value)
+  }
+  // 销毁所有音频播放器实例
+  Object.values(audioPlayers.value).forEach(player => {
+    if (player) {
+      player.destroy()
+    }
+  })
+  // 组件卸载时执行的操作
+  console.log('组件卸载时执行的操作')
+})
+</script>
+
+<style scoped lang="scss">
+.test-div {
+  width: 400px;
+  max-height: 250px;
+  position: fixed;
+  bottom: 2%;
+  right: 2%;
+  z-index: 1999;
+  background: linear-gradient(135deg, #0a3b6d 0%, #1a5a9e 100%);
+  border: 1px solid rgba(0, 255, 255, 0.3);
+  border-radius: 12px;
+  box-shadow: 0 8px 32px rgba(0, 255, 255, 0.3), 0 0 20px rgba(0, 255, 255, 0.1);
+  overflow: hidden;
+  animation: slideIn 0.3s ease-out;
+
+  @keyframes slideIn {
+    from {
+      transform: translateX(100%);
+      opacity: 0;
+    }
+    to {
+      transform: translateX(0);
+      opacity: 1;
+    }
+  }
+}
+
+.test-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 12px 16px;
+  background: rgba(0, 255, 255, 0.1);
+  border-bottom: 1px solid rgba(0, 255, 255, 0.3);
+}
+
+.test-title {
+  font-size: 16px;
+  font-weight: bold;
+  color: #00ffff;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  text-shadow: 0 0 10px rgba(0, 255, 255, 0.7);
+
+  &::before {
+    content: '';
+    display: inline-block;
+    width: 8px;
+    height: 8px;
+    background-color: #00ffff;
+    border-radius: 50%;
+    box-shadow: 0 0 10px rgba(0, 255, 255, 0.8);
+    animation: pulse 1.5s ease-in-out infinite;
+  }
+
+  @keyframes pulse {
+    0%, 100% {
+      opacity: 1;
+      transform: scale(1);
+      box-shadow: 0 0 10px rgba(0, 255, 255, 0.8);
+    }
+    50% {
+      opacity: 0.8;
+      transform: scale(1.2);
+      box-shadow: 0 0 20px rgba(0, 255, 255, 1);
+    }
+  }
+}
+
+.header-right {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+}
+
+.test-countdown {
+  font-size: 14px;
+  color: #00ffff;
+  background: rgba(0, 255, 255, 0.1);
+  padding: 4px 12px;
+  border: 1px solid rgba(0, 255, 255, 0.3);
+  border-radius: 12px;
+  font-weight: 500;
+  text-shadow: 0 0 5px rgba(0, 255, 255, 0.5);
+}
+
+.close-icon {
+  font-size: 18px;
+  color: #00ffff;
+  cursor: pointer;
+  transition: all 0.3s ease;
+  padding: 4px;
+  border-radius: 4px;
+  text-shadow: 0 0 5px rgba(0, 255, 255, 0.5);
+
+  &:hover {
+    background: rgba(0, 255, 255, 0.2);
+    transform: rotate(90deg);
+    box-shadow: 0 0 10px rgba(0, 255, 255, 0.8);
+  }
+}
+
+.test-content {
+  max-height: 150px;
+  overflow-y: auto;
+  padding: 12px;
+  scrollbar-width: none; /* Firefox */
+  -ms-overflow-style: none; /* IE and Edge */
+
+  &::-webkit-scrollbar {
+    display: none; /* Chrome, Safari and Opera */
+  }
+}
+</style>

src/components/common/TestDiv.vue

@@ -0,0 +1,284 @@
+<template>
+  <div class="test-div" v-if="dataList && dataList.length > 0">
+    <div class="test-header">
+      <span class="test-title">消息通知</span>
+      <div class="header-right">
+        <span class="test-countdown">{{ countdown }}s</span>
+        <el-icon class="close-icon" @click="handleClose">
+          <Close />
+        </el-icon>
+      </div>
+    </div>
+    <div class="test-content">
+      <Item v-for="(item, index) in dataList" :key="index" :item="item" />
+    </div>
+  </div>
+</template>
+
+<script setup>
+// 测试div组件，用于在后台和大屏页面都显示
+import { ref, onMounted, onUnmounted } from 'vue'
+import { Close } from '@element-plus/icons-vue'
+import emitter from "@/utils/eventBus.js"; // 导入事件总线
+import { qcckGet } from '@/api/qcckApi'
+import Item from './item.vue'
+import { AudioPlayerClass } from '@/utils/audioPlayer.js'
+import {getItem} from '@/utils/storage.js'
+const dataList = ref([])
+const timekeeping = ref(null)
+const countdown = ref(0) // 倒计时时间（秒）
+
+// 音频播放器实例映射
+const audioPlayers = ref({
+  '02': null, // 信息上报
+  '03': null, // 研判审批
+  '04': null, // 研判指令
+  '05': null  // 线索下发
+})
+
+// 音频文件路径映射
+const audioPaths = {
+  '02': require('@/assets/images/cjyp.mp3'),
+  '03': require('@/assets/images/ypbg.mp3'),
+  '04': require('@/assets/images/ypzl.mp3'),
+  '05': require('@/assets/images/xsyp.mp3')
+}
+
+// 初始化音频播放器
+const initAudioPlayers = () => {
+  Object.keys(audioPaths).forEach(type => {
+    try {
+      audioPlayers.value[type] = new AudioPlayerClass()
+      audioPlayers.value[type].init(audioPaths[type], false)
+    } catch (error) {
+      console.error(`初始化类型${type}的音频播放器失败:`, error)
+    }
+  })
+}
+
+// 根据类型播放音频
+const playAudioByType = (type) => {
+  if (audioPlayers.value[type]) {
+    try {
+      audioPlayers.value[type].play()
+    } catch (error) {
+      console.error(`播放类型${type}的音频失败:`, error)
+    }
+  }
+}
+// 手动关闭
+const handleClose = () => {
+  if (timekeeping.value) {
+    clearInterval(timekeeping.value)
+    timekeeping.value = null
+  }
+  dataList.value = []
+}
+
+// 重置倒计时
+const resetCountdown = () => {
+  if (timekeeping.value) {
+    clearInterval(timekeeping.value)
+  }
+  countdown.value = 15
+  timekeeping.value = setInterval(() => {
+    countdown.value--
+    if (countdown.value <= 0) {
+      clearInterval(timekeeping.value)
+      dataList.value = []
+      timekeeping.value = null
+    }
+  }, 1000)
+}
+
+
+// 做一个定时器15s一次
+const checkNews = ref(null)
+const checkNewsInterval = 15000 // 15秒
+checkNews.value = setInterval(() => {
+  dataModel()
+}, checkNewsInterval)
+onMounted(() => {
+  // 初始化音频播放器
+  initAudioPlayers()
+  emitter.on('webSocketMessage', (newsDate) => {
+    if (newsDate) {
+      dataList.value = newsDate
+      // dataList.value.unshift({...newsDate.data,typeMasgeLx:newsDate.type})
+      // 根据消息类型播放音频
+      playAudioByType(newsDate[0].typeMasgeLx)
+      resetCountdown()
+    }
+  })
+})
+const idEntityCard = ref(getItem('idEntityCard'))
+const dataModel = () => {
+  qcckGet({}, '/mosty-gsxt/dsjJbxx/message').then(res => {
+    if (res) {
+      const yjmasg = res.filter(item => item.type === '01')
+      if (yjmasg.length > 0) {
+        emitter.emit('openYp', yjmasg[0].obj); // 触发音频播放
+      } else {
+const data=res.filter(item=>item.sfzList.includes(idEntityCard.value))
+        const infoMasge =data.map(item => {
+          return {
+            ...item.obj,
+            typeMasgeLx: item.type
+          }
+        })
+        console.log(infoMasge);
+        emitter.emit('webSocketMessage', infoMasge)
+      }
+    }
+  })
+
+}
+
+// if (newsDate.type === '01') {
+//           // 触发音频播放
+//           console.log('触发音频播放');
+//           emitter.emit('openYp', newsDate.data); // 传递消息数据
+//         } else {
+onUnmounted(() => {
+  emitter.off('webSocketMessage')
+  if (timekeeping.value) {
+    clearInterval(timekeeping.value)
+  }
+  // 销毁所有音频播放器实例
+  Object.values(audioPlayers.value).forEach(player => {
+    if (player) {
+      player.destroy()
+    }
+  })
+  // 清除定时器
+  if (checkNews.value) {
+    clearInterval(checkNews.value)
+    checkNews.value = null
+  }
+  // 组件卸载时执行的操作
+  console.log('组件卸载时执行的操作')
+})
+</script>
+
+<style scoped lang="scss">
+.test-div {
+  width: 400px;
+  max-height: 250px;
+  position: fixed;
+  bottom: 2%;
+  right: 2%;
+  z-index: 1999;
+  background: linear-gradient(135deg, #0a3b6d 0%, #1a5a9e 100%);
+  border: 1px solid rgba(0, 255, 255, 0.3);
+  border-radius: 12px;
+  box-shadow: 0 8px 32px rgba(0, 255, 255, 0.3), 0 0 20px rgba(0, 255, 255, 0.1);
+  overflow: hidden;
+  animation: slideIn 0.3s ease-out;
+
+  @keyframes slideIn {
+    from {
+      transform: translateX(100%);
+      opacity: 0;
+    }
+
+    to {
+      transform: translateX(0);
+      opacity: 1;
+    }
+  }
+}
+
+.test-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 12px 16px;
+  background: rgba(0, 255, 255, 0.1);
+  border-bottom: 1px solid rgba(0, 255, 255, 0.3);
+}
+
+.test-title {
+  font-size: 16px;
+  font-weight: bold;
+  color: #00ffff;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  text-shadow: 0 0 10px rgba(0, 255, 255, 0.7);
+
+  &::before {
+    content: '';
+    display: inline-block;
+    width: 8px;
+    height: 8px;
+    background-color: #00ffff;
+    border-radius: 50%;
+    box-shadow: 0 0 10px rgba(0, 255, 255, 0.8);
+    animation: pulse 1.5s ease-in-out infinite;
+  }
+
+  @keyframes pulse {
+
+    0%,
+    100% {
+      opacity: 1;
+      transform: scale(1);
+      box-shadow: 0 0 10px rgba(0, 255, 255, 0.8);
+    }
+
+    50% {
+      opacity: 0.8;
+      transform: scale(1.2);
+      box-shadow: 0 0 20px rgba(0, 255, 255, 1);
+    }
+  }
+}
+
+.header-right {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+}
+
+.test-countdown {
+  font-size: 14px;
+  color: #00ffff;
+  background: rgba(0, 255, 255, 0.1);
+  padding: 4px 12px;
+  border: 1px solid rgba(0, 255, 255, 0.3);
+  border-radius: 12px;
+  font-weight: 500;
+  text-shadow: 0 0 5px rgba(0, 255, 255, 0.5);
+}
+
+.close-icon {
+  font-size: 18px;
+  color: #00ffff;
+  cursor: pointer;
+  transition: all 0.3s ease;
+  padding: 4px;
+  border-radius: 4px;
+  text-shadow: 0 0 5px rgba(0, 255, 255, 0.5);
+
+  &:hover {
+    background: rgba(0, 255, 255, 0.2);
+    transform: rotate(90deg);
+    box-shadow: 0 0 10px rgba(0, 255, 255, 0.8);
+  }
+}
+
+.test-content {
+  max-height: 150px;
+  overflow-y: auto;
+  padding: 12px;
+  scrollbar-width: none;
+  /* Firefox */
+  -ms-overflow-style: none;
+  /* IE and Edge */
+
+  &::-webkit-scrollbar {
+    display: none;
+    /* Chrome, Safari and Opera */
+  }
+}
+</style>

src/components/common/item.vue

@@ -0,0 +1,156 @@
+<template>
+  <div class="test-item" v-if="item.typeMasgeLx == '02'" @click="goDetail(item.id, item.typeMasgeLx)">
+    <div class="item-header">
+      <div class="item-title">{{ item.qbmc || '' }}</div>
+      <div class="item-type">{{ informationMap[item.typeMasgeLx] }}</div>
+    </div>
+    <div class="item-message">{{ item.qbnr }}</div>
+    <div class="item-time">{{ item.xtCjsj || '' }}</div>
+  </div>
+  <div class="test-item" v-if="item.typeMasgeLx == '03'" @click="goDetail(item.id, item.typeMasgeLx)">
+    <div class="item-header">
+      <div class="item-title">{{ item.bgmc || '' }}</div>
+      <div class="item-type">{{ informationMap[item.typeMasgeLx] }}</div>
+    </div>
+    <div class="item-message" v-html="item.bgnr"></div>
+    <div class="item-time">{{ item.xtCjsj || '' }}</div>
+  </div>
+  <div class="test-item" v-if="item.typeMasgeLx == '04'" @click="goDetail(item.id, item.typeMasgeLx)">
+    <div class="item-header">
+      <div class="item-title">{{ item.zlbt || '' }}</div>
+      <div class="item-type">{{ informationMap[item.typeMasgeLx] }}</div>
+    </div>
+    <div class="item-message" v-html="item.zlnr"></div>
+    <div class="item-time">{{ item.xtCjsj || '' }}</div>
+  </div>
+  <div class="test-item" v-if="item.typeMasgeLx == '05'" @click="goDetail(item.id, item.typeMasgeLx)">
+    <div class="item-header">
+      <div class="item-title">{{ item.zlbt || '' }}</div>
+      <div class="item-type">{{ informationMap[item.typeMasgeLx] }}</div>
+    </div>
+    <div class="item-message" v-html="item.zlnr"></div>
+    <div class="item-time">{{ item.xtCjsj || '' }}</div>
+  </div>
+</template>
+<script setup>
+
+import { useRouter } from 'vue-router'
+const router = useRouter()
+const props = defineProps({
+  item: {
+    type: Object,
+    default: () => ({})
+  }
+})
+const informationMap = {
+  '01': '报警信息',
+  '02': '信息上报',
+  '03': '研判审批',
+  '04': '研判指令',
+  '05': '线索下发',
+}
+const emit=defineEmits(['goDetail'])
+const goDetail = (id, lx) => {
+  let path = ''
+  switch (lx) {
+    case '02':
+      path = '/InfoCollection'
+      break;
+    case '03':
+      path = '/strategicResearchs'
+      break;
+    default:
+    case '04':
+      path = '/judgmentCommand'
+      break;
+      case '05':
+        path = '/InstructionInformation'
+        break;
+  }
+  router.push({
+    path: path,
+    query: {
+      id: id
+    }
+  })
+}
+</script>
+<style lang="scss" scoped>
+.test-item {
+  background: rgba(10, 59, 109, 0.8);
+  border: 1px solid rgba(0, 255, 255, 0.3);
+  border-radius: 8px;
+  padding: 12px;
+  margin-bottom: 10px;
+  box-shadow: 0 2px 8px rgba(0, 255, 255, 0.2);
+  transition: all 0.3s ease;
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+
+  &:hover {
+    transform: translateY(-2px);
+    box-shadow: 0 4px 12px rgba(0, 255, 255, 0.4);
+    border-color: rgba(0, 255, 255, 0.6);
+  }
+
+  &:last-child {
+    margin-bottom: 0;
+  }
+}
+
+.item-header {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  width: 100%;
+}
+
+.item-title {
+  font-size: 14px;
+  font-weight: 500;
+  color: #00ffff;
+  flex: 0 0 60%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  text-shadow: 0 0 5px rgba(0, 255, 255, 0.5);
+}
+
+.item-type {
+  font-size: 12px;
+  font-weight: bold;
+  color: #00ffff;
+  background: linear-gradient(135deg, #00ffff 0%, #00aaff 100%);
+  -webkit-background-clip: text;
+  -webkit-text-fill-color: transparent;
+  background-clip: text;
+  flex: 1;
+  text-align: right;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  text-shadow: 0 0 5px rgba(0, 255, 255, 0.7);
+}
+
+.item-message {
+  font-size: 14px;
+  color: #cceeff;
+  line-height: 1.5;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  word-break: break-word;
+  margin: 4px 0;
+}
+
+.item-time {
+  font-size: 12px;
+  color: #66ccff;
+  text-align: right;
+  margin-top: 4px;
+  text-shadow: 0 0 3px rgba(0, 255, 255, 0.3);
+}
+</style>

src/components/fzq/fxq.vue

@@ -64,7 +64,6 @@ const startDrag = (e) => {
 // 处理移动
 const handleMove = (e) => {
   if (!isDragging.value) return;
-
   let clientX, clientY;
   if (e.type === 'mousemove') {
     clientX = e.clientX;

src/layout/index.vue

@@ -11,6 +11,7 @@
         <AppMain />
       </div>
     </div>
+    <TestDiv />
   </div>
 </template>
 
@@ -20,6 +21,7 @@ import NavBar from "./components/NavBar";
 import SideBar from "./components/SideBar/index";
 import AppMain from "./components/AppMain";
 import TagsView from "./components/TagsView";
+import TestDiv from "@/components/common/TestDiv.vue";
 </script>
 
 <style lang="scss" scoped>
@@ -35,7 +37,7 @@ import TagsView from "./components/TagsView";
   display: flex;
   overflow: hidden;
   .el-scrollbar {
-   
+
     .is-active {
       background: #fff;
     }
@@ -58,4 +60,4 @@ import TagsView from "./components/TagsView";
 ::v-deep .el-scrollbar__view{
   border-right: 1px solid #07376d;
 }
-</style>
+</style>

src/main.js

@@ -1,9 +1,6 @@
 import * as ElIcons from "@element-plus/icons-vue";
 import Axios from 'axios'
-
+import { createApp } from "vue";
-import {
-  createApp
-} from "vue";
 import App from "./App.vue";
 import router from "./router";
 import store from "./store";

src/plugins/utils/webSocket.js

@@ -1,5 +1,5 @@
 // let url = "ws://80.155.0.82:8006/mosty-api/mosty-websocket/socket/"; //线上
-let url = "ws://155.240.22.30:2109/mosty-api/mosty-websocket/socket/"; //线上
+let url = "wss://sg.lz.dsj.xz/websocket/mosty-websocket/socket/"; //线上
 
 if(process.env.NODE_ENV === 'development') {
   url = "ws://47.108.232.77:9537/mosty-api/mosty-websocket/socket/"; //本地

src/router/index.js

@@ -15,9 +15,7 @@ import store from "@/store";
  * 私有路由表
  */
 
-export const privateRoutes = [
+export const privateRoutes = [];
-
-];
 
 /**
  * 公开路由表
@@ -365,7 +363,7 @@ export const publicRoutes = [
           //   component: () => import("@/views/backOfficeSystem/HumanIntelligence/FollowLeads/index"),
           //   meta: { title: "转线索列表", icon: "article-create" },
           // },
-          
+
           // {
           //   path: "/CollectPoints",
           //   name: "CollectPoints",
@@ -375,7 +373,7 @@ export const publicRoutes = [
           //     icon: "article-create"
           //   }
           // },
-          
+
           {
             path: "/supplementReportList",
             name: "supplementReportList",
@@ -606,7 +604,7 @@ export const publicRoutes = [
               icon: "article-create"
             }
           },
-          
+
           {
             path: "/mpvGroup",
             name: "mpvGroup",
@@ -616,7 +614,7 @@ export const publicRoutes = [
               icon: "article-create"
             }
           },
-          
+
           {
             path: "/mpvCar",
             name: "mpvCar",
@@ -742,14 +740,15 @@ export const publicRoutes = [
             }
           },
           {
-            path: "/JobAppraisal",
+            path: "/appraisalManagement",
-            name: "JobAppraisal",
+            name: "appraisalManagement",
-            component: () => import("@/views/backOfficeSystem/HumanIntelligence/JobAppraisal/index"),
+            component: () => import("@/views/backOfficeSystem/HumanIntelligence/appraisalManagement/index"),
             meta: {
-              title: "工作考核",
+              title: "考核管理",
               icon: "article-create"
             }
           },
+
           {
             path: "/FileData",
             name: "FileData",
@@ -1180,7 +1179,7 @@ export const publicRoutes = [
               icon: "article-create"
             }
           },
-          
+
           {
             path: "/strategicResearch",
             name: "strategicResearch",
@@ -1190,6 +1189,15 @@ export const publicRoutes = [
               icon: "article-create"
             }
           },
+          {
+            path: "/JobAppraisal",
+            name: "JobAppraisal",
+            component: () => import("@/views/backOfficeSystem/HumanIntelligence/JobAppraisal/index"),
+            meta: {
+              title: "工作考核",
+              icon: "article-create"
+            }
+          },
           // {
           //     path: "/ResearchHome",
           //     name: "ResearchHome",

src/utils/sse.js

@@ -143,7 +143,6 @@ const connectSSEWithPost = (prompt, options = {}) => {
           reject(error);
         }
       };
-
       readStream();
     }).catch(error => {
       console.error('SSE请求错误:', error);

src/utils/webSocket.js

@@ -1,5 +1,5 @@
 // let url = "ws://89.40.9.89:2109/mosty-api/mosty-websocket/socket/"; //线上
-let url = "ws://155.240.22.30:2109/mosty-api/mosty-websocket/socket/"; //线上
+let url = "ws://89.40.9.93:50039/mosty-websocket/socket/"; //线上
 
 if (process.env.NODE_ENV === 'development') {
   url = "ws://47.108.232.77:9537/mosty-api/mosty-websocket/socket/"; //本地
@@ -86,8 +86,6 @@ class WebSoketClass {
           if (fun) fun(true);
         };
         this.ws.onclose = (e) => {
-          console.log(e);
-
           console.log('WebSocket连接已关闭，关闭码:', e.code, '原因:', e.reason);
           // 如果是正常关闭(1000)或手动关闭(1001)，不进行重连
           if (e.code !== 1000 && e.code !== 1001) {
@@ -165,7 +163,6 @@ class WebSoketClass {
   // 接收发送消息
   getMessage() {
     this.ws.onmessage = (e) => {
-      console.log(e);
 
       try {
         if (e.data) {
@@ -175,6 +172,9 @@ class WebSoketClass {
             // 触发音频播放
             console.log('触发音频播放');
             emitter.emit('openYp', newsDate.data); // 传递消息数据
+          } else {
+
+            emitter.emit('webSocketMessage', { data: newsDate.data, type: newsDate.type });
           }
           // else if (newsDate.type === 'ALARM_STOP' || newsDate.type === 'warning_stop') {
           //   // 触发音频停止
@@ -187,7 +187,7 @@ class WebSoketClass {
           //   emitter.emit('statusUpdate', newsDate.data);
           // }
           // // 通用消息事件
-          // emitter.emit('webSocketMessage', newsDate);
+
         }
       } catch (error) {
         console.error('处理WebSocket消息失败:', error);

src/views/backOfficeSystem/HumanIntelligence/appraisalManagement/components/Items.vue

@@ -0,0 +1,265 @@
+<template>
+  <div class="items-container">
+    <el-card class="item-card">
+      <template #header>
+        <div class="card-header">
+          <span class="card-title">考核详情</span>
+        </div>
+      </template>
+      <div class="item-grid">
+        <!-- <div class="item-row">
+          <div class="item-col">
+            <span class="item-label">研判分数：</span>
+            <span class="item-value">{{ row.ypfs || 0 }}</span>
+          </div>
+          <div class="item-col">
+            <span class="item-label">采集分数：</span>
+            <span class="item-value">{{ row.cjfs || 0 }}</span>
+          </div>
+        </div> -->
+        <div class="item-section">
+          <h4>分数详情</h4>
+          <div class="item-grid">
+            <div class="item-col">
+              <span class="item-label">研判分数：</span>
+              <span class="item-value">{{ row.ypfs || 0 }}</span>
+            </div>
+            <div class="item-col">
+              <span class="item-label">采集分数：</span>
+              <span class="item-value">{{ row.cjfs || 0 }}</span>
+            </div>
+          </div>
+        </div>
+        <div class="item-section">
+          <h4>七类人员</h4>
+          <div class="item-grid">
+            <div class="item-col">
+              <span class="item-label">总数：</span>
+              <span class="item-value">{{ row.qlryZs || 0 }}</span>
+            </div>
+            <div class="item-col">
+              <span class="item-label">签收数：</span>
+              <span class="item-value">{{ row.qlryQss || 0 }}</span>
+            </div>
+            <div class="item-col">
+              <span class="item-label">反馈数：</span>
+              <span class="item-value">{{ row.qlryFks || 0 }}</span>
+            </div>
+            <div class="item-col">
+              <span class="item-label">签收率：</span>
+              <span class="item-value">{{ (row.qlryQsl || 0) * 100 }}%</span>
+            </div>
+            <div class="item-col">
+              <span class="item-label">反馈率：</span>
+              <span class="item-value">{{ (row.qlryFkl || 0) * 100 }}%</span>
+            </div>
+          </div>
+        </div>
+
+        <div class="item-section">
+          <h4>人像预警</h4>
+          <div class="item-grid">
+            <div class="item-col">
+              <span class="item-label">总数：</span>
+              <span class="item-value">{{ row.rxyjZs || 0 }}</span>
+            </div>
+            <div class="item-col">
+              <span class="item-label">签收数：</span>
+              <span class="item-value">{{ row.rxyjQss || 0 }}</span>
+            </div>
+            <div class="item-col">
+              <span class="item-label">反馈数：</span>
+              <span class="item-value">{{ row.rxyjFks || 0 }}</span>
+            </div>
+            <div class="item-col">
+              <span class="item-label">签收率：</span>
+              <span class="item-value">{{ (row.rxyjQsl || 0) * 100 }}%</span>
+            </div>
+            <div class="item-col">
+              <span class="item-label">反馈率：</span>
+              <span class="item-value">{{ (row.rxyjFkl || 0) * 100 }}%</span>
+            </div>
+          </div>
+        </div>
+
+        <div class="item-section">
+          <h4>车辆预警</h4>
+          <div class="item-grid">
+            <div class="item-col">
+              <span class="item-label">总数：</span>
+              <span class="item-value">{{ row.clyjZs || 0 }}</span>
+            </div>
+            <div class="item-col">
+              <span class="item-label">签收数：</span>
+              <span class="item-value">{{ row.clyjQss || 0 }}</span>
+            </div>
+            <div class="item-col">
+              <span class="item-label">反馈数：</span>
+              <span class="item-value">{{ row.clyjFks || 0 }}</span>
+            </div>
+            <div class="item-col">
+              <span class="item-label">签收率：</span>
+              <span class="item-value">{{ (row.clyjQsl || 0) * 100 }}%</span>
+            </div>
+            <div class="item-col">
+              <span class="item-label">反馈率：</span>
+              <span class="item-value">{{ (row.clyjFkl || 0) * 100 }}%</span>
+            </div>
+          </div>
+        </div>
+
+        <div class="item-section">
+          <h4>布控预警</h4>
+          <div class="item-grid">
+            <div class="item-col">
+              <span class="item-label">总数：</span>
+              <span class="item-value">{{ row.bkyjZs || 0 }}</span>
+            </div>
+            <div class="item-col">
+              <span class="item-label">签收数：</span>
+              <span class="item-value">{{ row.bkyjQss || 0 }}</span>
+            </div>
+            <div class="item-col">
+              <span class="item-label">反馈数：</span>
+              <span class="item-value">{{ row.bkyjFks || 0 }}</span>
+            </div>
+            <div class="item-col">
+              <span class="item-label">签收率：</span>
+              <span class="item-value">{{ (row.bkyjQsl || 0) * 100 }}%</span>
+            </div>
+            <div class="item-col">
+              <span class="item-label">反馈率：</span>
+              <span class="item-value">{{ (row.bkyjFkl || 0) * 100 }}%</span>
+            </div>
+          </div>
+        </div>
+
+        <div class="item-section">
+          <h4>政保预警</h4>
+          <div class="item-grid">
+            <div class="item-col">
+              <span class="item-label">总数：</span>
+              <span class="item-value">{{ row.zbyjZs || 0 }}</span>
+            </div>
+            <div class="item-col">
+              <span class="item-label">签收数：</span>
+              <span class="item-value">{{ row.zbyjQss || 0 }}</span>
+            </div>
+            <div class="item-col">
+              <span class="item-label">反馈数：</span>
+              <span class="item-value">{{ row.zbyjFks || 0 }}</span>
+            </div>
+            <div class="item-col">
+              <span class="item-label">签收率：</span>
+              <span class="item-value">{{ (row.zbyjQsl || 0) * 100 }}%</span>
+            </div>
+            <div class="item-col">
+              <span class="item-label">反馈率：</span>
+              <span class="item-value">{{ (row.zbyjFkl || 0) * 100 }}%</span>
+            </div>
+          </div>
+        </div>
+
+        <!-- <div class="item-row">
+          <div class="item-col">
+            <span class="item-label">更新时间：</span>
+            <span class="item-value">{{ row.gxsj || '-' }}</span>
+          </div>
+        </div> -->
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script setup>
+import { defineProps } from 'vue';
+
+const props = defineProps({
+  row: {
+    type: Object,
+    default: () => ({})
+  }
+});
+</script>
+
+<style lang="scss" scoped>
+.items-container {
+  width: 100%;
+  padding: 10px;
+  height: 40vh;
+  overflow: auto;
+}
+
+.item-card {
+  margin-bottom: 10px;
+  background-color: #f0f0f0;
+}
+
+.card-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+
+  .card-title {
+    color: #000;
+  }
+}
+
+.item-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
+  gap: 15px;
+  margin-bottom: 20px;
+}
+
+.item-section {
+  margin-bottom: 25px;
+  padding-bottom: 15px;
+  border-bottom: 1px solid #f0f0f0;
+
+  h4 {
+    margin-bottom: 15px;
+    color: #303133;
+    font-size: 14px;
+    font-weight: bold;
+  }
+}
+
+.item-row {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 20px;
+  margin-bottom: 15px;
+}
+
+.item-col {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.item-label {
+  color: #606266;
+  font-size: 13px;
+  white-space: nowrap;
+}
+
+.item-value {
+  color: #303133;
+  font-size: 13px;
+  font-weight: 500;
+}
+
+// 响应式调整
+@media (max-width: 768px) {
+  .item-grid {
+    grid-template-columns: repeat(auto-fit, minmax(150px, 1fr));
+  }
+
+  .item-row {
+    flex-direction: column;
+    align-items: flex-start;
+    gap: 10px;
+  }
+}
+</style>

src/views/backOfficeSystem/HumanIntelligence/appraisalManagement/components/addForm.vue

@@ -0,0 +1,153 @@
+<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" v-if="title != '详情'">保存</el-button>
+        <el-button size="small" @click="close">关闭</el-button>
+      </div>
+    </div>
+    <div class="form_cnt">
+      <FormMessage v-model="listQuery" :formList="formData" ref="elform" :rules="rules" :disabled="title == '详情'">
+        <template #bkyj>
+          <el-divider content-position="left"><span style="color: blue;">布控预警</span></el-divider>
+        </template>
+        <template #clyj>
+          <el-divider content-position="left"><span style="color: blue;">车辆预警</span></el-divider>
+        </template>
+        <template #qlry>
+          <el-divider content-position="left"><span style="color: blue;">7类重点人员预警</span></el-divider>
+        </template>
+        <template #rxyj>
+          <el-divider content-position="left"><span style="color: blue;">人像预警</span></el-divider>
+        </template>
+        <template #zbyj>
+          <el-divider content-position="left"><span style="color: blue;">政保预警</span></el-divider>
+        </template>
+        <template #fs>
+          <el-divider content-position="left"><span style="color: blue;">考核分数</span></el-divider>
+        </template>
+      </FormMessage>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import FormMessage from "@/components/aboutTable/FormMessage.vue";
+import { qcckGet, qcckPost,qcckPut } from "@/api/qcckApi.js";
+import { ref, defineExpose, reactive, defineEmits, getCurrentInstance, } from "vue";
+const emit = defineEmits(["updateDate"]);
+const props = defineProps({
+  dic: Object
+});
+const listQuery = ref({
+  cjfs: 0,
+  ypfs: 0,
+  bkyjFkl: 0,
+  bkyjQsl: 0,
+  clyjFkl: 0,
+  clyjQsl: 0,
+  qlryFkl: 0,
+  qlryQsl: 0,
+  rxyjFkl: 0,
+  rxyjQsl: 0,
+  zbyjFkl: 0,
+  zbyjQsl: 0,
+
+}); //表单
+const { proxy } = getCurrentInstance();
+const dialogForm = ref(false); //弹窗
+const formData = ref([
+  { label: "考核部门", prop: "ssbmdm", depMc: "ssbm", type: "department" },
+  { label: "考核开始日期", prop: "ksrq", type: "date" },
+  { label: "考核结束日期", prop: "jsrq", type: "date" },
+  { label: "考核描述", prop: "khzbms", type: "textarea", width: "100%" },
+    { prop: "fs", type: "slot", width: "100%" },
+  { label: "采集分数", prop: "cjfs", type: "number", min: 0, max: 100, step: 1 },
+  { label: "研判分数", prop: "ypfs", type: "number", min: 0, max: 100, step: 1 },
+{ prop: "bkyj", type: "slot", width: "100%" },
+  { label: "布控预警反馈率", prop: "bkyjFkl", type: "number", min: 0, max: 100, step: 0.01 },
+  { label: "布控预警签收率", prop: "bkyjQsl", type: "number", min: 0, max: 100, step: 0.01 },
+  { prop: "clyj", type: "slot", width: "100%" },
+  { label: "车辆预警反馈率", prop: "clyjFkl", type: "number", min: 0, max: 100, step: 0.01 },
+  { label: "车辆预警签收率", prop: "clyjQsl", type: "number", min: 0, max: 100, step: 0.01 },
+  { prop: "qlry", type: "slot", width: "100%" },
+  { label: "7类重点人员反馈率", prop: "qlryFkl", type: "number", min: 0, max: 100, step: 0.01 },
+  { label: "7类重点人员签收率", prop: "qlryQsl", type: "number", min: 0, max: 100, step: 0.01 },
+  { prop: "rxyj", type: "slot", width: "100%" },
+  { label: "人像预警反馈率", prop: "rxyjFkl", type: "number", min: 0, max: 100, step: 0.01 },
+  { label: "人像预警签收率", prop: "rxyjQsl", type: "number", min: 0, max: 100, step: 0.01 },
+  { prop: "zbyj", type: "slot", width: "100%" },
+  { label: "政保预警反馈率", prop: "zbyjFkl", type: "number", min: 0, max: 100, step: 0.01 },
+  { label: "政保预警签收率", prop: "zbyjQsl", type: "number", min: 0, max: 100, step: 0.01 },
+
+]);
+
+const loading = ref(false);
+const elform = ref();
+const title = ref("");
+const rules = reactive({
+  ssbmdm: [{ required: true, message: "请选择考核部门", trigger: "change" }],
+  ksrq: [{ required: true, message: "请选择考核开始日期", trigger: "change" }],
+  jsrq: [{ required: true, message: "请选择考核结束日期", trigger: "change" }],
+  khzbms: [{ required: true, message: "请输入考核描述", trigger: "blur" }],
+  // ryXm: [{ required: true, message: "请输入人员姓名", trigger: "blur" }],
+});
+
+// 初始化数据
+const init = (type, row) => {
+  dialogForm.value = true;
+  title.value = type == "add" ? "新增" : type == "detail" ? "详情" : "编辑";
+  if (row) getDataById(row.id);
+};
+// 根据id查询详情
+const getDataById = (id) => {
+  qcckGet({ id }, `/mosty-gsxt/khgl/${id}`).then((res) => {
+    listQuery.value = res;
+  });
+};
+
+// 提交
+const submit = () => {
+  elform.value.submit((data) => {
+    let url = title.value == "新增" ? "/mosty-gsxt/khgl/addEntity" : "/mosty-gsxt/khgl/editEntity";
+    let params = { ...data };
+    console.log(params);
+    loading.value = true;
+
+    if (title.value == "新增") {
+      qcckPost(params, url).then(() => {
+      loading.value = false;
+      proxy.$message({ type: "success", message: title.value + "成功" });
+      emit("updateDate");
+      close();
+    }).catch(() => { loading.value = false; });
+    } else {
+      qcckPut(params, url).then(() => {
+      loading.value = false;
+      proxy.$message({ type: "success", message: title.value + "成功" });
+      emit("updateDate");
+      close();
+    }).catch(() => { loading.value = false; });
+}
+  });
+};
+
+// 关闭
+const close = () => {
+  listQuery.value = {};
+  dialogForm.value = false;
+  loading.value = false;
+};
+
+defineExpose({ init });
+</script>
+
+<style lang="scss" scoped>
+@import "~@/assets/css/layout.scss";
+@import "~@/assets/css/element-plus.scss";
+
+::v-deep .el-textarea__inner {
+  height: 18.5em !important;
+}
+</style>

src/views/backOfficeSystem/HumanIntelligence/appraisalManagement/index.vue

@@ -0,0 +1,171 @@
+<template>
+  <div>
+    <!-- 搜索 -->
+    <div ref="searchBox" class="mt10">
+      <Search :searchArr="searchConfiger" @submit="onSearch" />
+    </div>
+    <PageTitle :malginLeft="10" :height="35" backgroundColor="#ffff" :marginBottom="5" :marginTop="5">
+      <template #left>
+        <el-button size="small" type="primary" @click="addEdit('add', '')">
+          <el-icon style="vertical-align: middle">
+            <CirclePlus />
+          </el-icon>
+          <span style="vertical-align: middle">新增</span>
+        </el-button>
+      </template>
+    </PageTitle>
+    <!-- 表格 -->
+    <div class="tabBox">
+      <!-- <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="pageData.tableHeight"
+        :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth"> -->
+             <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="pageData.tableHeight"
+        expand :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth">
+        <template #expand="{ props }">
+          <div style="max-width: 100%">
+            <Items :row="props || {}" />
+          </div>
+        </template>
+        <!-- 操作 -->
+        <template #controls="{ row }">
+          <el-link size="small" type="success" @click="addEdit('edit', row)">编辑</el-link>
+             <el-link size="small" type="primary" @click="addEdit('detail', row)">详情</el-link>
+          <el-link size="small" type="danger" @click="deleteRow(row.id)">删除</el-link>
+        </template>
+      </MyTable>
+      <Pages @changeNo="changeNo" @changeSize="changeSize" :tableHeight="pageData.tableHeight" :pageConfiger="{
+        ...pageData.pageConfiger,
+        total: pageData.total
+      }" />
+    </div>
+    <!-- 详情 -->
+    <DetailForm v-if="show" @updateDate="getList" ref="detailDiloag"
+      :dic="{ D_BZ_WHCD, D_BZ_MZ, D_BZ_XB, D_BZ_ZZMM, D_GS_RLQB_JCQK }" />
+  </div>
+</template>
+
+<script setup>
+import PageTitle from "@/components/aboutTable/PageTitle.vue";
+import MyTable from "@/components/aboutTable/MyTable.vue";
+import Pages from "@/components/aboutTable/Pages.vue";
+import Search from "@/components/aboutTable/Search.vue";
+import DetailForm from "./components/addForm.vue";
+import Items from "./components/Items.vue";
+import { qcckGet, qcckPost, qcckDelete} from "@/api/qcckApi.js";
+import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue";
+const { proxy } = getCurrentInstance();
+const { D_GS_RLQB_JCQK, D_BZ_WHCD, D_BZ_MZ, D_BZ_XB, D_BZ_ZZMM } = proxy.$dict("D_GS_RLQB_JCQK", "D_BZ_WHCD", "D_BZ_MZ", "D_BZ_XB", "D_BZ_ZZMM"); //获取字典数据
+const detailDiloag = ref();
+const searchBox = ref(); //搜索框
+const show = ref(false);
+const searchConfiger = ref([
+  { label: "所属部门", prop: "ssbmdm", placeholder: "请选择所属部门", showType: "department" },
+  { label: "时间", prop: "startTime", placeholder: "请选择时间", showType: "datetimerange" }
+]);
+
+const pageData = reactive({
+  tableData: [],
+  keyCount: 0,
+  tableConfiger: {
+    rowHieght: 61,
+    showSelectType: "null",
+    loading: false
+  },
+  total: 0,
+  pageConfiger: {
+    pageSize: 20,
+    pageCurrent: 1
+  },
+  controlsWidth: 200,
+  tableColumn: [
+    // { label: "布控预警反馈率", prop: "bkyjFkl" },
+    // { label: "布控预警签收率", prop: "bkyjQsl"  },
+    // { label: "采集分数", prop: "cjfs" },
+    // { label: "车辆预警反馈率", prop: "clyjFkl" },
+    // { label: "车辆预警签收率", prop: "clyjQsl"},
+    // { label: "7类重点人员反馈率", prop: "qlryFkl" },
+    // { label: "7类重点人员签收率", prop: "qlryQsl" },
+    // { label: "人像预警反馈率", prop: "rxyjFkl" },
+    // { label: "人像预警签收率", prop: "rxyjQsl" },
+    // { label: "政保预警反馈率", prop: "zbyjFkl" },
+    // { label: "政保预警签收率", prop: "zbyjQsl" },
+    // { label: "采集分数", prop: "cjfs" },
+    // { label: "研判分数", prop: "ypfs" },
+    { label: "考核开始日期", prop: "ksrq" },
+    { label: "考核结束日期", prop: "jsrq" },
+    { label: "考核年份", prop: "khnf" },
+    { label: "所属部门", prop: "ssbm" },
+  ]
+});
+
+const queryFrom = ref({});
+
+onMounted(() => {
+  getList();
+  tabHeightFn();
+});
+
+// 搜索
+const onSearch = (val) => {
+  queryFrom.value = {
+    ...val,
+    startTime: val.startTime ? val.startTime[0] : "",
+    endTime: val.startTime ? val.startTime[0] : ""
+  };
+  pageData.pageConfiger.pageCurrent = 1;
+  getList();
+};
+
+const changeNo = (val) => {
+  pageData.pageConfiger.pageCurrent = val;
+  getList();
+};
+const changeSize = (val) => {
+  pageData.pageConfiger.pageSize = val;
+  getList();
+};
+
+// 获取列表
+const getList = () => {
+  pageData.tableConfiger.loading = true;
+  let data = { ...pageData.pageConfiger, ...queryFrom.value };
+  qcckGet(data, "/mosty-gsxt/khgl/getPageList").then((res) => {
+    pageData.tableData = res.records || [];
+    pageData.total = res.total;
+    pageData.tableConfiger.loading = false;
+  }).catch(() => {
+    pageData.tableConfiger.loading = false;
+  });
+};
+
+// 删除
+const deleteRow = (id) => {
+  proxy.$confirm("确定要删除", "警告", { type: "warning" }).then(() => {
+    qcckDelete({ ids:[id]}, "/mosty-gsxt/khgl/deleteEntity").then(() => {
+      proxy.$message({ type: "success", message: "删除成功" });
+      getList();
+    });
+  })
+};
+
+// 详情
+const addEdit = (type, row) => {
+  show.value = true;
+  nextTick(() => {
+    detailDiloag.value.init(type, row);
+  });
+};
+
+// 表格高度计算
+const tabHeightFn = () => {
+  pageData.tableHeight = window.innerHeight - searchBox.value.offsetHeight - 250;
+  window.onresize = function () {
+    tabHeightFn();
+  };
+};
+</script>
+
+<style>
+.el-loading-mask {
+  background: rgba(0, 0, 0, 0.5) !important;
+}
+</style>

src/views/backOfficeSystem/HumanIntelligence/infoCollection/components/addForm.vue

@@ -11,7 +11,7 @@
       <div class="form-content" v-loading="loading">
         <!-- <div class="form_cnt"> -->
         <FormMessage :disabled="disabled" v-model="listQuery" :formList="formData" ref="elform" :rules="rules">
-          <template #jbxx>
+          <!-- <template #jbxx>
             <div>
               <h3 class="tags-title">报送情况</h3>
               <div style="width: 200%;">
@@ -23,7 +23,7 @@
                 </el-descriptions>
               </div>
             </div>
-          </template>
+          </template> -->
           <template #shzt>
             <div v-if="disabled">
               <h3 class="tags-title">审核状态</h3>
@@ -566,17 +566,26 @@ defineExpose({ init });
 .form-container {
   display: flex;
   width: 100%;
+  height: calc(100% - 50px);
+  overflow: hidden;
 }
 
 .form-content {
-  // display: flex;
+  flex: 1;
-  width: 80%;
+  height: 100%;
+  overflow: hidden;
+  overflow-y: auto;
 }
 
 .timeline-container {
+  width: 400px;
+  padding-right: 10px;
+  box-sizing: border-box;
   border: 1px solid #ebeef5;
-  flex: 1;
   margin: 0 10px;
+  height: 100%;
+  overflow: hidden;
+  overflow-y: auto;
 }
 
 /* 时间线宽度 */

src/views/backOfficeSystem/HumanIntelligence/permissionApply/index.vue

@@ -60,8 +60,10 @@ const pageData = reactive({
   tableColumn: [
     { label: "申请人姓名", prop: "xm" },
     { label: "申请人身份证", prop: "sfzh"},
-    { label: "申请人联系电话", prop: "lxdh"},
+    { label: "申请人联系电话", prop: "lxdh" },
-    { label: "权限说明", prop: "qxsm" },
+     { label: "提交人姓名", prop: "tjrxm"},
+    { label: "提交人身份证号", prop: "tjrsfzh"},
+    { label: "权限说明", prop: "qxsm", showOverflowTooltip: true },
   ]
 });
 

src/views/backOfficeSystem/JudgmentHome/ResearchHome/components/discussionDialog.vue

@@ -1,6 +1,8 @@
 <template>
   <div>
-    <el-dialog :model-value="modelValue" :destroy-on-close="true" :title="title" @close="close" :close-on-click-modal="true">
+    <el-dialog :model-value="modelValue" :destroy-on-close="true" :title="title" @close="close"
+      :close-on-click-modal="true">
+      {{ getData }}
       <FormMessage v-model="listQuery" :formList="formData" labelWidth="120px" ref="elform" :rules="rules">
         <template #chryList>
           <el-input v-model="chryList" clearable placeholder="请选择参会人员" @click="isShowDialog = true"
@@ -24,6 +26,7 @@ import { ref, reactive, computed, getCurrentInstance } from 'vue'
 import FormMessage from "@/components/aboutTable/FormMessage.vue";
 import ChooseUser from "@/components/ChooseList/ChooseUser/index.vue"
 import { wshsAdd } from "@/api/huiShangyp/tacticalApi"
+import { qcckGet, qcckPost } from "@/api/qcckApi.js"
 const { proxy } = getCurrentInstance();
 const props = defineProps({
   modelValue: {
@@ -58,9 +61,11 @@ const rules = reactive({
   ]
 })
 const getData = computed(() => {
+  console.log(props.dataList, "测试");
+
   return {
     glxsid: props.dataList.glzjjdbh || props.dataList.asjbh,
-    glxsmc: props.dataList.ajmc || props.dataList.bjrmc
+    glxsmc: props.dataList.ajmc ||props.dataList.bcjjnr|| props.dataList.bjrmc
   }
 })
 const listQuery = ref({})
@@ -80,17 +85,41 @@ const close = () => {
 const submit = () => {
   elform.value.submit((val) => {
     if (val) {
-      const promes = {
+      let url
-        ...listQuery.value,
+
-        ...getData.value
+      switch (props.lx) {
+        case '01':
+          const dadta = {
+            ...listQuery.value,
+            ...getData.value,
+            lylx: props.lx
+          }
+          url = '/mosty-gsxt/lzJcjPjdb/createwWshs'
+          qcckPost(dadta, url).then(res => {
+            proxy.$message({
+              message: '添加成功',
+              type: 'success'
+            })
+            emits('update:modelValue', false)
+          })
+          break;
+        default:
+          const promes = {
+            ...listQuery.value,
+            ...getData.value
+          }
+          wshsAdd(promes).then(res => {
+            proxy.$message({
+              message: '添加成功',
+              type: 'success'
+            })
+            emits('update:modelValue', false)
+          })
+          break;
       }
-      wshsAdd(promes).then(res => {
+
-   proxy.$message({
+
-          message: '添加成功',
+
-          type: 'success'
-        })
-         emits('update:modelValue', false)
-      })
 
     }
   })

src/views/backOfficeSystem/JudgmentHome/judgmentCommand/addForm.vue

@@ -11,7 +11,6 @@
       <FormMessage v-model="listQuery" :formList="formData" ref="elform" :rules="rules">
       </FormMessage>
     </div>
-
   </div>
 
 </template>
@@ -21,11 +20,12 @@ import FormMessage from "@/components/aboutTable/FormMessage.vue";
 import { ref, defineExpose, reactive, defineEmits, getCurrentInstance, watch, computed } from "vue";
 import { addJudgmentCommandList, editJudgmentCommand, getJudgmentCommandDetail } from "@/api/huiShangyp/judgmentCommand.js"
 // import { getItem } from '@//utils/storage.js'
-
+import { useRouter } from 'vue-router'
 const emit = defineEmits(["updateDate", "getList"]);
 const props = defineProps({
   dict: Object
 });
+const router = useRouter()
 const imgMsg = ref([])
 const { proxy } = getCurrentInstance();
 const dialogForm = ref(false); //弹窗
@@ -118,6 +118,7 @@ const close = () => {
   listQuery.value = {};
   dialogForm.value = false;
   loading.value = false;
+    router.replace({ path: '/judgmentCommand' })// 移除id 避免刷新一直带参数
 };
 
 defineExpose({ init });

src/views/backOfficeSystem/JudgmentHome/judgmentCommand/index.vue

@@ -61,18 +61,11 @@ import FeedbackDialog from "./components/FeedbackDialog.vue";
 import { getItem } from '@//utils/storage.js'
 const { proxy } = getCurrentInstance();
 const { D_BZ_YPFS, D_BZ_YPLX } = proxy.$dict("D_BZ_YPFS", "D_BZ_YPLX")
-const detailDiloag = ref();
 const searchBox = ref(); //搜索框
 const userInfo = ref()
 onMounted(() => {
   userInfo.value = getItem('deptId')[0]
   tabHeightFn()
-  if (route.query.id) {
-    detailDiloag.value.init('edit', {
-      id: route.query.id
-    });
-    return
-  }
   getList()
 });
 
@@ -149,8 +142,13 @@ const tabHeightFn = () => {
   };
 };
 const route = useRoute()
-
 const addForm = ref(null)
+watch(() => route.query.id, (val) => {
+  console.log('val: ', val);
+    if (val) {
+  addForm.value.init('detail', {id:val}, '01');
+  }
+},{deep:true});
 const feedbackDialog = ref(false)
 const currentFeedbackRow = ref({})
 const getDataById = (type, row) => {

src/views/backOfficeSystem/JudgmentHome/strategicResearch/addForm.vue

@@ -98,7 +98,7 @@
  * @property {Array} fj - 附件数组
  * @property {string} wcqk - 完成情况（01 准备中、02 已完成）
  */
-
+import { qcckGet } from "@/api/qcckApi.js";
 import FormMessage from "@/components/aboutTable/FormMessage.vue";
 import UploadFile from "@/components/MyComponents/Upload/index.vue";
 // import ChooseUser from "@/components/ChooseList/ChooseUser/index.vue"
@@ -214,12 +214,13 @@ watch(() => listQuery.value.jsdxBmDm, (val) => {
   })
 })
 // 初始化数据
+
 const init = (type, row, wjlb) => {
   dialogForm.value = true;
   title.value = type == "add" ? "新增" : type == "edit" ? "编辑" : "详情";
   outRow.value = row
   if (row) {
-    getDataById(row.id)
+    getDataById(row.id )
   } else {
     listQuery.value = {
       bglx: props.bglx,  // 报告类型 01 战术研判 02战略研判
@@ -232,7 +233,7 @@ const init = (type, row, wjlb) => {
 };
 // 根据id查询详情
 const getDataById = (id) => {
-  sjzlGetInfo(id).then((res) => {
+  qcckGet({},'/mosty-gsxt/gsxtYpbg/'+id).then((res) => {
     listQuery.value = res || {};
     /** @type {Array<JudgmentDept>} 参与研判部门数据数组 */
     const cyypList = Array.isArray(res.cyypList) ? res.cyypList : []

src/views/backOfficeSystem/JudgmentHome/strategicResearch/addReport.vue

@@ -13,19 +13,19 @@
       </FormMessage>
       <div class="cntBox">
         <!-- 工具栏 -->
-        <Toolbar 
+        <Toolbar
-          style="border-bottom: 1px solid #ccc" 
+          style="border-bottom: 1px solid #ccc"
           :editor="editorRef"
           :defaultConfig="toolbarConfig"
           :mode="mode" />
         <!-- 编辑器 -->
-        <Editor 
+        <Editor
-          :style="`height: 480px; overflow-y: hidden`" 
+          :style="`height: 480px; overflow-y: hidden`"
-          v-model="textContent" 
+          v-model="textContent"
           :defaultConfig="editorConfig"
-          :mode="mode" 
+          :mode="mode"
-          @onCreated="handleCreated" 
+          @onCreated="handleCreated"
-          @onChange="handChange" 
+          @onChange="handChange"
         />
       </div>
       <div v-if="listQuery.id" style="display: flex; justify-content: center;">
@@ -47,6 +47,7 @@ import ExtractionText from "@/components/ExtractionText/index.vue";
 import FormMessage from "@/components/aboutTable/FormMessage.vue";
 import { qcckGet, qcckPost, qcckPut } from "@/api/qcckApi.js";
 import "@wangeditor/editor/dist/css/style.css";
+import { useRoute, useRouter } from 'vue-router'
 // import Consultation from './consultation.vue'
 import { Editor, Toolbar } from "@wangeditor/editor-for-vue";
 import { ref, defineExpose, reactive, defineEmits, getCurrentInstance, shallowRef, onBeforeUnmount, watch } from "vue";
@@ -117,12 +118,33 @@ const elform = ref();
 const title = ref("");
 
 // 初始化数据
-const init = (type,  row) => {
+const init = (type, row) => {
-  if(row) listQuery.value = JSON.parse(JSON.stringify(row));
   dialogForm.value = true;
   title.value = type == "add" ? "新增" :type == "edit"? "编辑" : "详情";
+
+
+  if (row) {
+    getDataById(row.id)
+  }
+  // listQuery.value = JSON.parse(JSON.stringify(row));
+
   setEditorTextContent()
 };
+// 根据id查询详情
+const getDataById = (id) => {
+  qcckGet({},'/mosty-gsxt/gsxtYpbg/'+id).then((res) => {
+    listQuery.value = res || {};
+    // /** @type {Array<JudgmentDept>} 参与研判部门数据数组 */
+    // const cyypList = Array.isArray(res.cyypList) ? res.cyypList : []
+    // listQuery.value.jsdxBmDm = cyypList.map(item => {
+    //   return item.ypbmdm
+    // })
+    // listQuery.value.jsdxBmMc = cyypList.map(item => {
+    //   return item.ypbmmc
+    // })
+  });
+};
+
 const getText = (val) => {
   listQuery.value.fj = val.text;
   setEditorTextContent()
@@ -175,7 +197,7 @@ const handleCreated = (editor) => {
 };
 //内容发生变化
 const handChange = (editor) => {
-  
+
   // 判断是否是一个空段落，是空就传空文本
 };
 onBeforeUnmount(() => {
@@ -183,12 +205,13 @@ onBeforeUnmount(() => {
   if (editor) editor.destroy();
 });
 
-
+const router = useRouter();
 // 关闭
 const close = () => {
   loading.value = false;
   dialogForm.value = false;
   listQuery.value = {}
+   router.replace({ path: '/strategicResearchs' })// 移除id 避免刷新一直带参数
 };
 
 

src/views/backOfficeSystem/JudgmentHome/strategicResearch/index.vue

@@ -65,28 +65,25 @@ import AddForm from "./addForm.vue";
 import addMeeting from "./addMeeting.vue";
 const { proxy } = getCurrentInstance();
 const { D_BZ_YPFS, D_BZ_YPLX, D_GS_BQ_LX } = proxy.$dict("D_BZ_YPFS", "D_BZ_YPLX", "D_GS_BQ_LX")
-
 /** 报告弹框 */
 const reportTc = ref();
 /** 会议弹框 */
 const meetingTc = ref();
 const searchBox = ref(); //搜索框
-const router = useRouter();
 const route = useRoute();
-
 onMounted(() => {
   tabHeightFn()
-  if (route.query.id) {
-    nextTick(() => {
-      addForm.value && addForm.value.init('edit', {
-        id: route.query.id
-      });
-      router.replace({ path: '/tacticalResearch' })// 移除id 避免刷新一直带参数
-    })
-  }
   getList()
 });
-
+watch(() => route.query.id, (val) => {
+  if (val) {
+    nextTick(() => {
+      reportTc.value && reportTc.value.init('edit', {
+        id: val
+      });
+    })
+  }
+},{deep:true});
 
 
 // 提交审核

src/views/backOfficeSystem/ResearchJudgment/InformationFlows/InstructionInformation/components/detailForm.vue

@@ -19,7 +19,7 @@
         </FormMessage>
       </div>
       <div v-if="title == '详情'" class="timeline-container">
-        <el-timeline class="timeline-wrapper" v-if="listQuery.czlcLis&&listQuery.czlcList.length > 0">
+        <el-timeline class="timeline-wrapper" v-if="listQuery.czlcLis && listQuery.czlcList.length > 0">
           <el-timeline-item placement="top" v-for="(activity, index) in listQuery.czlcList" :key="index"
             :timestamp="activity.czsj" :color="activity.czlx == '01' ? '#409eff' : '#67c23a'" size="large">
             <div class="timeline-content" :class="activity.czlx == '01' ? 'sign-type' : 'feedback-type'">
@@ -50,28 +50,40 @@
 import Xslist from '@/components/ChooseList/ChooseXs/index.vue'
 import FormMessage from '@/components/aboutTable/FormMessage.vue'
 import { qcckGet, qcckPost, qcckPut } from "@/api/qcckApi.js";
-import { ref, defineExpose, reactive, onMounted, defineEmits, getCurrentInstance, nextTick } from "vue";
+import { useRouter } from 'vue-router'
+import { ref, defineExpose, reactive, onMounted, defineEmits, getCurrentInstance, nextTick ,watch} from "vue";
 const emit = defineEmits(["updateDate"]);
 const props = defineProps({
-  dic: Object
+  dic: {
+    type: Object,
+    default: () => ({})
+  }
 });
 const chooseVisible = ref(false)
 const roleIds = ref([])
 const { proxy } = getCurrentInstance();
 const dialogForm = ref(false); //弹窗
-const formData = ref([
+
-  { label: "指令标题", prop: "zlbt", type: "input", },
+const formData = ref()
-  { label: "指令类型", prop: "zllx", type: "select", options: props.dic.D_GS_XS_ZLLX },
+
-  { label: "指令等级", prop: "zldj", type: "select", options: props.dic.D_GS_ZDQT_FXDJ },
+watch(() => props.dic, (newVal) => {
-  { label: "反馈结束时间", prop: "jssj", type: "datetime" },
+  if (newVal) {
-  { label: "联系人", prop: "zllxr", type: "input" },
+    formData.value = [
-  { label: "联系电话", prop: "zllxdh", type: "input" },
+      { label: "指令标题", prop: "zlbt", type: "input", },
-  { label: "关联线索", prop: "glxsid", type: "slot" },
+      { label: "指令类型", prop: "zllx", type: "select", options: props.dic.D_GS_XS_ZLLX },
-  { label: "主送单位", prop: "zsdw", type: "department" },
+      { label: "指令等级", prop: "zldj", type: "select", options: props.dic.D_GS_ZDQT_FXDJ },
-  { label: "抄送单位", prop: "csdw", type: "department" },
+      { label: "反馈结束时间", prop: "jssj", type: "datetime" },
-  { label: "指令内容", prop: "zlnr", type: "textarea", width: '100%' },
+      { label: "联系人", prop: "zllxr", type: "input" },
-  { label: "附件", prop: "fjzd", type: "upload", width: '100%' },
+      { label: "联系电话", prop: "zllxdh", type: "input" },
-]);
+      { label: "关联线索", prop: "glxsid", type: "slot" },
+      { label: "主送单位", prop: "zsdw", type: "department" },
+      { label: "抄送单位", prop: "csdw", type: "department" },
+      { label: "指令内容", prop: "zlnr", type: "textarea", width: '100%' },
+      { label: "附件", prop: "fjzd", type: "upload", width: '100%' },
+    ]
+  }
+},{deep: true})
+
 const listQuery = ref({}); //表单
 const loading = ref(false);
 const elform = ref();
@@ -129,12 +141,13 @@ const submit = () => {
     }).catch(() => { loading.value = false; });
   });
 };
-
+const router = useRouter()
 // 关闭
 const close = () => {
   listQuery.value = {};
   dialogForm.value = false;
   loading.value = false;
+  router.replace({ path: '/InstructionInformation' })// 移除id 避免刷新一直带参数
 };
 defineExpose({ init });
 </script>

src/views/backOfficeSystem/ResearchJudgment/InformationFlows/InstructionInformation/index.vue

@@ -58,8 +58,8 @@
       ></Pages>
     </div>
     <!-- 详情 -->
-    <DetailForm ref="detailDiloag" v-if="isShow" @updateDate="getList" :dic="{D_GS_XS_ZLLX,D_GS_ZDQT_FXDJ}" />
   </div>
+    <DetailForm ref="detailDiloag" @updateDate="getList" :dic="{D_GS_XS_ZLLX,D_GS_ZDQT_FXDJ}" />
   <Fk  v-model="isShowFk"  :dataList="dataList" @getList="getList"/>
 </template>
 
@@ -71,7 +71,8 @@ import Search from "@/components/aboutTable/Search.vue";
 import DetailForm from "./components/detailForm.vue";
 import Fk from "./components/fk.vue";
 import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
-import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue";
+import { useRoute } from "vue-router";
+import { reactive, ref, onMounted, getCurrentInstance, nextTick, watch } from "vue";
 import { getItem } from '@/utils/storage'
 const { proxy } = getCurrentInstance();
 const {D_GS_XS_SJLY,D_GS_XS_ZLLX,D_GS_ZDQT_FXDJ,D_GS_XS_CZZT} = proxy.$dict('D_GS_XS_SJLY','D_GS_XS_ZLLX','D_GS_ZDQT_FXDJ','D_GS_XS_CZZT')
@@ -110,14 +111,20 @@ const pageData = reactive({
       { label: '是否反馈', prop: 'sffk', showSolt: true },
       { label: '是否签收', prop: 'sfqs', showSolt: true },
     ]
-  });
+});
+  const route=useRoute()
 const userInfo=ref();
 onMounted(() => {
+  if (route.query.id) {
+    addEdit('detail', {id:route.query.id});
+  }
   userInfo.value=getItem('deptId')[0]
   getList()
   tabHeightFn();
 });
 
+
+
 // 搜索
 const onSearch = (val) =>{
   queryFrom.value = {...val}
@@ -166,6 +173,12 @@ const addEdit = (type, row) => {
     detailDiloag.value.init(type, row);
   })
 };
+
+watch(() => route.query.id, (val) => {
+  if (val) {
+ addEdit('detail', {id:route.query.id});
+  }
+},{deep:true})
 // 签收
 const signRow = (row) =>{
   proxy.$confirm("确定要签收", "警告", {type: "warning"}).then(() => {
@@ -189,8 +202,6 @@ const fkRow = (row) => {
 }
 const showBtn = (row) => {
   let item = row.xfbmList.find(v => v.ssbmdm == userInfo.value.deptCode)
-  console.log(item);
-
   return item?true:false
   // // if (item) {
   // //   return item.zlzt == '01' ? 'sign' : item.zlzt == '02' ? 'feedback' : ''

src/views/backOfficeSystem/policeReport/index.vue

@@ -2,26 +2,21 @@
   <div>
     <!-- 搜索 -->
     <div ref="searchBox" class="mt10 mb10">
-      <Search :searchArr="searchConfiger" @submit="onSearch" :key="pageData.keyCount"></Search>
+      <Search :searchArr="searchConfiger" ref="ces"  @submit="onSearch" :key="pageData.keyCount"></Search>
     </div>
 
-    <PageTitle  :malginLeft="10" :height="35" backgroundColor="#ffff" :marginBottom="5" :marginTop="5">
+    <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="getSlect">我的关注</el-button>
       </template>
     </PageTitle>
 
     <!-- 表格 -->
     <div class="tabBox heightBox">
-      <MyTable 
+      <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="pageData.tableHeight"
-        :tableData="pageData.tableData" 
+        :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth"
-        :tableColumn="pageData.tableColumn" 
+        @chooseData="handleChooseData">
-        :tableHeight="pageData.tableHeight"
-        :key="pageData.keyCount" 
-        :tableConfiger="pageData.tableConfiger" 
-        :controlsWidth="pageData.controlsWidth"
-        @chooseData="handleChooseData"
-      >
         <!-- <template #jjlx="{ row }">
           <DictTag :tag="false" :value="row.jjlx" :options="D_BZ_JQBQ" />
         </template> -->
@@ -31,39 +26,36 @@
         <template #jqlbdm="{ row }">
           <DictTag :tag="false" :value="row.jqlbdm" :options="JQLB" />
         </template>
-        <template #ypzt="{ row }">
+        <!-- <template #ypzt="{ row }">
-            {{ row.ypzt === '01' ? '已研判' : '未研判' }}
+          {{ row.ypzt === '01' ? '已研判' : '未研判' }}
+        </template> -->
+              <template #hszt="{ row }">
+          {{ row.hszt === '01' ? '未会商' : '已会商' }}
         </template>
         <!-- 操作 -->
         <template #controls="{ row }">
+          <el-link type="warning" @click="CreateConsultationMeeting(row)">创建会商</el-link>
+                    <el-link :type=" row.sfgz=='0'?'success':'danger'" @click="Attention(row,row.sfgz=='0'?'关注':'取消关注')">{{ row.sfgz=='0'?'关注':'取消关注' }}</el-link>
           <el-link type="primary" @click="addEdit('edit', row)">详情</el-link>
           <!-- <el-link type="warning" @click="handleYP('研判', row)">研判</el-link>
           <el-link type="danger" @click="handleYP('深度研判', row)">深度研判</el-link> -->
         </template>
       </MyTable>
-      <Pages 
+      <Pages @changeNo="changeNo" @changeSize="changeSize" :tableHeight="pageData.tableHeight"
-        @changeNo="changeNo" 
+        :pageConfiger="{ ...pageData.pageConfiger, total: pageData.total }">
-        @changeSize="changeSize" 
-        :tableHeight="pageData.tableHeight" 
-        :pageConfiger="{ ...pageData.pageConfiger, total: pageData.total }"
-      >
       </Pages>
     </div>
     <!-- 编辑详情 -->
-    <EditAddForm  
+    <EditAddForm v-if="show" ref="detailDiloag"
-      v-if="show" 
+      :dic="{ JQLB, JQLX, JQXL, JQZL, D_BZ_JQLY, D_BZ_JQFL, JQLB_DP, D_BZ_JQBQ, D_GS_SSYJ }" @updateDate="getList" />
-      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" />
+     <DiscussionDialog v-model="showDialog" :dataList="dataList" :lx="lx" />
   </div>
 </template>
 
 <script setup>
-import { qcckGet } from '@/api/qcckApi.js'
 import { getMultiDictVal } from "@/utils/dict.js"
 import { exportExlByObj } from "@/utils/exportExcel.js"
 import YpDialog from "./components/ypDialog.vue";
@@ -75,8 +67,11 @@ import Search from "@/components/aboutTable/Search.vue";
 import EditAddForm from "./components/editAddForm.vue";
 import { lzJcjPjdbSelectPage } from '@/api/semanticAnalysis.js'
 import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue";
+import DiscussionDialog from "@/views/backOfficeSystem/JudgmentHome/ResearchHome/components/discussionDialog.vue";
+import { qcckGet, qcckPost } from "@/api/qcckApi.js"
+
 const { proxy } = getCurrentInstance();
-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 { 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();
@@ -129,12 +124,12 @@ const pageData = reactive({
     { label: "报警时间", prop: "bjsj" },
     { label: "报警内容", prop: "bjnr", showOverflowTooltip: true },
     { label: "接警员姓名", prop: "jjyxm" },
-    { label: "警情级别", prop: "jqdjdm",showSolt:true },
+    { label: "警情级别", prop: "jqdjdm", showSolt: true },
     // { label: "警情标签", prop: "jjlx", showSolt: true },
-    { label: "警情类型", prop: "jqlbdm",showSolt:true },
+    { label: "警情类型", prop: "jqlbdm", showSolt: true },
     { label: "警情地址", prop: "jqdz" },
     { label: "补充接警内容", prop: "bcjjnr", showOverflowTooltip: true },
-    { label: "会商状态", prop: "ypzt",showSolt:true },
+    { label: "会商状态", prop: "hszt", showSolt: true },
 
   ]
 });
@@ -149,6 +144,13 @@ const onSearch = (val) => {
   pageData.pageConfiger.pageCurrent = 1;
   getList()
 }
+const ces=ref()
+// 点击关注
+const getSlect = () => {
+  listQuery.value = { ...ces.value.searchObj , sfgz: 1 };
+  pageData.pageConfiger.pageCurrent = 1;
+  getList()
+}
 
 const changeNo = (val) => {
   pageData.pageConfiger.pageCurrent = val;
@@ -167,7 +169,6 @@ const getList = () => {
     ...listQuery.value
   }
   lzJcjPjdbSelectPage(params).then(res => {
-    console.log(res);
     pageData.tableData = res.records || [];
     pageData.total = res.total;
   }).finally(() => {
@@ -184,9 +185,9 @@ const addEdit = (type, row) => {
 };
 
 const handleYP = (type, row) => {
-  if(type === '研判'){
+  if (type === '研判') {
     ypDialog.value.init(row);
-  }else{
+  } else {
     deepYpDialog.value.init(row);
   }
 }
@@ -216,11 +217,42 @@ const exportExl = () => {
       ...item,
       jqdjdm_name: getMultiDictVal(item.jqdjdm, D_GS_BQ_DJ),
       jqlbdm_name: getMultiDictVal(item.jqlbdm, JQLB),
-      ypzt_name: item.ypzt === '01' ? '已研判' : '未研判',
+      ypzt_name: item.hszt === '01' ? '未会商' : '已会商',
     }
   })
   exportExlByObj(titleObj, data, '警情管理')
 }
+// 创建会商
+const showDialog = ref(false)
+const dataList = ref({})
+const lx = ref('01')
+const CreateConsultationMeeting = (val) => {
+  dataList.value = val
+showDialog.value=true
+}
+// 是否关注
+const Attention = (val,str) => {
+proxy.$confirm(`是否${str}该警情？`, '提示', {
+  confirmButtonText: '确定',
+  cancelButtonText: '取消',
+  type: 'warning'
+}).then(() => {
+  // 关注警情
+qcckPost({
+  id: val.jjdbh,
+  sfgz: val.sfgz === '0' ? '1' : '0',
+},'/mosty-gsxt/lzJcjPjdb/jqgz').then(res => {
+    proxy.$message({
+      message: `${str}成功`,
+      type: 'success'
+    })
+    getList()
+})
+
+}).catch(() => {
+  // 取消关注
+});
+}
 
 
 // 表格高度计算

src/views/home/components/qxsqDialog.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <el-dialog title="权限申请" v-model="showDialog" width="500px" :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false" >
+        <el-dialog title="权限申请" v-model="showDialog" width="500px" :close-on-click-modal="false" :close-on-press-escape="false" :show-close="true" >
             <el-form :model="listQuery" label-width="120px" :rules="rules" ref="formRef">
                 <el-form-item label="申请人姓名" prop="xm">
                     <el-input placeholder="请输入申请人姓名" v-model="listQuery.xm" clearable></el-input>
@@ -14,6 +14,13 @@
                 <el-form-item label="权限说明" prop="qxsm">
                     <el-input placeholder="请输入权限说明" v-model="listQuery.qxsm" clearable type="textarea" :rows="3"></el-input>
                 </el-form-item>
+
+                       <el-form-item label="提交人姓名">
+                    <el-input placeholder="请输入提交人姓名" v-model="listQuery.tjrxm" clearable readonly></el-input>
+                </el-form-item>
+                <el-form-item label="提交人身份证">
+                    <el-input placeholder="请输入申请人身份证" v-model="listQuery.tjrsfzh" clearable readonly></el-input>
+                </el-form-item>
                     <div class="tc">
                         <el-button type="primary" :loading="loading" @click="okSubit">确定</el-button>
                         <el-button @click="reset()"> 重置 </el-button>
@@ -30,8 +37,10 @@ import emitter from "@/utils/eventBus.js";
 import { onMounted, ref,onUnmounted } from 'vue'
 const showDialog = ref(false)
 const listQuery = ref({
-    xm: getItem("USERNAME") || '',
+    tjrxm: getItem("USERNAME") || '',
-    sfzh: getItem("idEntityCard") || '',
+    tjrsfzh: getItem("idEntityCard") || '',
+    xm: '',
+    sfzh: '',
     lxdh: '',
     qxsm: '',
 })

src/views/home/index copy.vue

@@ -134,29 +134,29 @@ const getDepId = () => {
   const deptCode = deptId[0].deptCode ? deptId[0].deptCode : null
   if (deptLevel.startsWith('2')) {
     const data = Object.values(bm).map(item => item);
-    changeXzqh(data, true)
+    changeXzqh(data, true);
   } else {
     switch (deptCode) {
       case '54040200000'://巴宜区
-        changeXzqh(bm[542621])
+        changeXzqh(bm[542621]);
         break;
       case '54042400000'://波密县
-        changeXzqh(bm[542625])
+        changeXzqh(bm[542625]);
         break;
       case '54042500000'://察隅县
-        changeXzqh(bm[542626])
+        changeXzqh(bm[542626]);
         break;
       case '54042100000'://工布江达县
-        changeXzqh(bm[542622])
+        changeXzqh(bm[542622]);
         break;
       case '54042600000'://朗县
-        changeXzqh(bm[542627])
+        changeXzqh(bm[542627]);
         break;
       case '54042200000'://米林县
-        changeXzqh(bm[542623])
+        changeXzqh(bm[542623]);
         break;
       case '54042300000'://墨脱县
-        changeXzqh(bm[542624])
+        changeXzqh(bm[542624]);
         break;
       default:
         const data = Object.values(bm).map(item => item);

src/views/home/index.vue

@@ -1,7 +1,6 @@
 <template>
   <div class="homeBox" style="background-color: #07274d;">
     <!-- 头部 -->
-
     <Head></Head>
     <!-- 左边 -->
     <div class="home-aside asideL">
@@ -59,15 +58,13 @@
     </div>
     <!-- 中间 -->
     <div class="home-center">
-      <div class="middle-top">
+      <div class="middle-top"><Yszs /></div>
-        <Yszs />
-      </div>
       <div class="flex middle-bottom mt10">
         <div style="width: 30px;position: absolute;z-index: 100;left: 0;background-color: #07274d;height: 30px;text-align: center;line-height:30px;">
           <el-icon :size="20" v-if="ispLayBack" @click="closeLayBack">
             <Bell />
           </el-icon>
-          <el-icon :size="20" v-else @click="openLayBack">
+          <el-icon :size="20" v-else @click="ispLayBack=true">
             <MuteNotification />
           </el-icon>
         </div>
@@ -124,13 +121,12 @@
         <Bkcz></Bkcz>
       </div>
     </div>
-
   </div>
+  <TestDiv />
   <!-- 左边弹窗 -->
   <LeftDialog></LeftDialog>
   <!-- 人员弹窗 -->
   <PeoDialog ref="peoDialogRef"></PeoDialog>
-
   <!-- 权限申请 -->
   <QxsqDialog />
 </template>
@@ -160,24 +156,32 @@ import WarningDistrict from './model/WarningDistrict.vue'
 import WarningPoints from './model/warningPoints.vue'
 import { getItem, setItem } from "@/utils/storage";
 import emitter from "@/utils/eventBus.js";
-import { bm, centralPoint } from '@/views/backOfficeSystem/IntelligentControl/DeploymentArea/xzqh.js'
+import { bm } from '@/views/backOfficeSystem/IntelligentControl/DeploymentArea/xzqh.js'
 import Judgment from './model/judgment.vue'
 import { tbYjxxGetList } from '@/api/zdr.js'
 import GeneralWindow from './model/generalWindow.vue'
-import WebSoketClass from '@/utils/webSocket.js'
 import { timeValidate } from '@/utils/tools.js'
 import Statistics from './model/statistics.vue'
 import MyCase from './model/myCase.vue'
 // 导入音频播放器工具类
 import audioPlayer from '@/utils/audioPlayer'
+import TestDiv from "@/components/common/TestDiv.vue";
 const { proxy } = getCurrentInstance();
-const { D_BZ_JQDJ } = proxy.$dict('D_BZ_JQDJ')
-const webSoket = new WebSoketClass()
 const modelWarning = ref(true)
 const modelQbsb = ref(true)
 const searchText = ref('')
 const peoDialogRef = ref()
 const showSeatch = ref(false)
+const ispLayBack = ref(true)//播放音频
+const indexNum = ref(0) //当前展示的气泡框
+const showNotification = ref(false) //是否自动展开提示
+const allDep = ref([]) //所有部门
+const bnTimer = ref(null)
+const popupTimer = ref(null)
+const timing = ref(true)
+const reversalPushShow = ref(true)// 情报翻转
+const reversalShow = ref(true)// 论坛翻转
+
 const changeXzqh = (val, trg) => {
   setTimeout(() => {
     // 先移除已有的边界
@@ -265,10 +269,6 @@ const getDepId = () => {
   }
 }
 
-const indexNum = ref(0) //当前展示的气泡框
-const showNotification = ref(false) //是否自动展开提示
-const allDep = ref([]) //所有部门
-
 const handleOpenNotification = () => {
   clearInterval(popupTimer.value)
   showNotification.value = !showNotification.value;
@@ -283,6 +283,7 @@ const handleOpenNotification = () => {
     startPopupLoop()
   }
 }
+
 const makerCenter = () => {
   const dw = require("@/assets/point/dingwei.png")
   qcckGet({}, '/mosty-gsxt/lzJcjPjdb/selectCountNew').then(res => {
@@ -292,20 +293,12 @@ const makerCenter = () => {
   })
 
 }
-//播放音频
-const ispLayBack = ref(true)
-
-// 打开播放
-const openLayBack = () => {
-  ispLayBack.value = true
-}
 
 // 关闭播放
 const closeLayBack = () => {
   ispLayBack.value = false
   audioPlayer.pause()
 }
-
 // 初始化音频播放器
 const initAudioPlayer = () => {
   // 使用工具类初始化音频播放器
@@ -321,8 +314,6 @@ const initAudioPlayer = () => {
       console.error('初始化音频播放器失败:', error);
     })
 }
-const bnTimer = ref(null)
-const popupTimer = ref(null)
 
 const startPopupLoop = () => {
   clearInterval(popupTimer.value)
@@ -334,6 +325,62 @@ const startPopupLoop = () => {
     }
   }, 10000)
 }
+
+// 搜索
+const handleSearch = () => {
+  if(!searchText.value) return proxy.$message.warning('请输入身份证号');
+  qcckPost({ rysfzh: searchText.value },'/mosty-gsxt/tbYjxx/getPageAllList').then(res => {
+    peoDialogRef.value.init(res.records || [])
+  })
+}
+
+// 布控预警上图
+const getTbYjxxGetList = () => {
+  // 设置为当天时间范围：00:00:00 到 23:59:59
+  const today = new Date();
+  const startTime = new Date(today.getFullYear(), today.getMonth(), today.getDate(), 0, 0, 0).getTime();
+  const endTime = new Date(today.getFullYear(), today.getMonth(), today.getDate(), 23, 59, 59).getTime();
+  const promes = { startTime:timeValidate(startTime), endTime:timeValidate(endTime), }
+  tbYjxxGetList(promes).then(res => {
+    const coords = res.map(item => {
+      return { id: item.id, jd: item.jd, wd: item.wd, yjtp: item.yjTp, yjnr: item.yjNr, yjLx: item.yjlx, yjlx: '01', yjsj: item.yjSj, rysfzh: item.yjRysfzh, ryxm: item.yjRyxm }
+    })
+    const icon = require("@/assets/point/yj.png")
+    emitter.emit('addPoint', { coords: coords, icon: icon, flag: 'yj', fontColor: '#FF0000' })
+  })
+}
+
+const reversalPush = () => {
+  reversalPushShow.value = !reversalPushShow.value
+  // 移除clearInterval调用，避免定时器被清除
+}
+
+const reversal= () => {
+  reversalShow.value = !reversalShow.value
+  // 移除clearInterval调用，避免定时器被清除
+}
+
+// 鼠标移入
+const mouseEnter = () => {
+  clearInterval(timing.value)
+}
+
+// 鼠标移出
+const mouseLeave = () => {
+  // 清除可能存在的旧定时器，避免多个定时器同时运行
+  clearInterval(timing.value)
+  // 设置为5秒自动切换，更容易测试效果
+  timing.value = setInterval(() => {
+    reversalPush()
+    reversal()
+    changeModel()
+  }, 30000)
+}
+
+function changeModel(){
+  modelWarning.value = !modelWarning.value
+}
+
 // 组件挂载时初始化音频播放器
 onMounted(() => {
   getDepId()
@@ -346,7 +393,6 @@ onMounted(() => {
   getTbYjxxGetList()
   // 初始化音频播放器
   initAudioPlayer()
-  // webSoket.connect()
   // 监听音频播放事件，获取WebSocket消息数据
   emitter.on("openYp", (newsDate) => {
     // 使用工具类播放音频，自动处理静音切换
@@ -380,100 +426,17 @@ onMounted(() => {
   })
 })
 
-// 搜索
-const handleSearch = () => {
-  if(!searchText.value){
-    proxy.$message.warning('请输入身份证号')
-  }else{
-    qcckPost({ rysfzh: searchText.value },'/mosty-gsxt/tbYjxx/getPageAllList').then(res => {
-      peoDialogRef.value.init(res.records || [])
-    })
-  }
-}
-
-// 布控预警上图
-const getTbYjxxGetList = () => {
-  // 设置为当天时间范围：00:00:00 到 23:59:59
-  const today = new Date();
-  const startTime = new Date(today.getFullYear(), today.getMonth(), today.getDate(), 0, 0, 0).getTime();
-  const endTime = new Date(today.getFullYear(), today.getMonth(), today.getDate(), 23, 59, 59).getTime();
-  const promes = {
-    startTime:timeValidate(startTime),
-    endTime:timeValidate(endTime),
-  }
-  tbYjxxGetList(promes).then(res => {
-    const coords = res.map(item => {
-      return {
-        id: item.id,
-        jd: item.jd,
-        wd: item.wd,
-        yjtp: item.yjTp,
-        yjnr: item.yjNr,
-        yjLx: item.yjlx,
-        yjlx: '01',
-        yjsj: item.yjSj,
-        rysfzh: item.yjRysfzh,
-        ryxm: item.yjRyxm,
-      }
-    })
-    const icon = require("@/assets/point/yj.png")
-    emitter.emit('addPoint', { coords: coords, icon: icon, flag: 'yj', fontColor: '#FF0000' })
-  })
-}
-
-let timing = ref(true)
-// 情报翻转
-const reversalPushShow = ref(true)
-const reversalPush = () => {
-  reversalPushShow.value = !reversalPushShow.value
-  // 移除clearInterval调用，避免定时器被清除
-}
-// 论坛翻转
-const reversalShow = ref(true)
-const reversal= () => {
-  reversalShow.value = !reversalShow.value
-  // 移除clearInterval调用，避免定时器被清除
-}
-
-// 鼠标移入
-const mouseEnter = () => {
-  clearInterval(timing.value)
-}
-// 鼠标移出
-const mouseLeave = () => {
-  // 清除可能存在的旧定时器，避免多个定时器同时运行
-  clearInterval(timing.value)
-  // 设置为5秒自动切换，更容易测试效果
-  timing.value = setInterval(() => {
-    reversalPush()
-    reversal()
-    changeModel()
-  }, 30000)
-}
-
-function changeModel(){
-  modelWarning.value = !modelWarning.value
-}
 onUnmounted(() => {
   clearInterval(timing.value)
   clearInterval(bnTimer.value)
   clearInterval(popupTimer.value)
   // 组件卸载时停止音频播放并释放资源
-  if (audioPlayer) {
+  if (audioPlayer) audioPlayer.destroy();
-    audioPlayer.destroy()
-  }
-  // 组件卸载时关闭WebSocket连接
-  if (webSoket) {
-    webSoket.closeConnection()
-  }
 })
-
-
 </script>
 
 <style lang="scss" scoped>
 @import "@/assets/css/homeScreen.scss";
-
 .fxq {
   border-radius: 35px;
   width: 35px;
@@ -482,7 +445,6 @@ onUnmounted(() => {
   transform-origin: left center;
   overflow: hidden;
   margin-bottom: 10px;
-
   .icon {
     display: flex;
     align-items: center;
@@ -507,32 +469,24 @@ onUnmounted(() => {
     }
   }
 }
-
 .fxq2 {
   background-color: #9d88f9;
 }
-
 .fxq1:hover {
   width: 120px;
 }
-
 .fxq2:hover {
   width: 120px;
-
-  // background-color: red;
 }
-
 .fxq3:hover {
   width: 120px;
 }
-
 ::v-deep .badge-top-left .el-badge__content {
   top: 0;
   right: auto;
   left: -10px;
   transform: translateY(-50%) translateX(-50%);
 }
-
 .badge-content {
   display: flex;
   flex-direction: column;
@@ -543,11 +497,9 @@ onUnmounted(() => {
   min-height: 45px;
   /* 确保收缩时有足够空间显示第一个图标 */
 }
-
 .badge-content:not(.expanded) {
   max-height: 45px;
 }
-
 /* 收缩时只显示第一个图标，隐藏其他内容 */
 .badge-content:not(.expanded)> :not(:first-child) {
   opacity: 0;
@@ -594,7 +546,6 @@ onUnmounted(() => {
 .flip-wrapper {
   position: relative;
   width: 100%;
-  // height: calc(100%/3 - 8px);
   height: 100%;
   backface-visibility: hidden;
   perspective: 1000px;