Merge branch 'main' of http://61.139.16.27:26684/zy_oyj/sgxt_web

src/components/GdMap/mapUtil.js

@@ -188,24 +188,24 @@ export function MapUtil(map) {
   }
   // 弹窗自定义标签内容
   function zdyContentHtml(flag,item){
-    const list = [
-      { jb: "一级",sl:'5',ypl:'100%' },
-      { jb: "二级",sl:'5',ypl:'100%' },
-      { jb: "三级",sl:'3',ypl:'60%' },
-      { jb: "四级",sl:'0',ypl:'20%' }
-    ];
     let html = ''
     switch (flag) {
       case 'hm_pop':
+        const list = [
+          { jb: "一级",sl:'5',ypl:'100%' },
+          { jb: "二级",sl:'5',ypl:'100%' },
+          { jb: "三级",sl:'3',ypl:'60%' },
+          { jb: "四级",sl:'0',ypl:'20%' }
+        ];
         html = `
         <div class="popupCustomBox">
           <div class="popupCustomTitle_title">
             <span>${item.ssbm}</span>
-            <span>今日警情${item.jqsl || 0}</span>
+            <span>今日警情${item.jrzs || 0}</span>
           </div>
           <ul>
             <li class="popupCustomTitle_li"><span>级别</span> <span>数量</span> <span>研判率</span> </li>
-            ${list.map(it => `<li class="popupCustomTitle_li"><span>${it.jb}</span> <span>${it.sl}</span> <span>${it.ypl}</span></li>`).join('')}
+            ${item.jqjb.map(it => `<li class="popupCustomTitle_li"><span>${it.jbmc}</span> <span>${it.jrsl}</span> <span>${it.ypbl}</span></li>`).join('')}
           </ul>
         </div>
         `

src/views/home/index.vue

@@ -113,7 +113,7 @@
 
 <script setup>
 import { qcckGet ,qcckPost} from "@/api/qcckApi.js";
-import { ref, onMounted, onUnmounted } from 'vue'
+import { ref, onMounted, onUnmounted,getCurrentInstance } from 'vue'
 import LeftDialog from './dialog/leftDialog'
 import GdMap from "@/components/GdMap/index.vue";
 import Head from './layout/head.vue'
@@ -142,6 +142,8 @@ import { timeValidate } from '@/utils/tools.js'
 import Statistics from './model/statistics.vue'
 // 导入音频播放器工具类
 import audioPlayer from '@/utils/audioPlayer'
+const { proxy } = getCurrentInstance();
+const { D_BZ_JQDJ } = proxy.$dict('D_BZ_JQDJ')
 const webSoket = new WebSoketClass()
 const modelWarning = ref(true)
 const changeXzqh = (val, trg) => {
@@ -234,7 +236,9 @@ const getDepId = () => {
 const indexNum = ref(0) //当前展示的气泡框
 const showNotification = ref(false) //是否自动展开提示
 const allDep = ref([]) //所有部门
+
 const handleOpenNotification = () => {
+  clearInterval(popupTimer.value)
   showNotification.value = !showNotification.value;
   emitter.emit('deletePointArea','hm_pop')
   if(showNotification.value){
@@ -249,16 +253,22 @@ const handleOpenNotification = () => {
 }
 const makerCenter = () => {
   const dw = require("@/assets/point/dingwei.png")
-  qcckGet({},'/mosty-gsxt/tbYjxx/selectSsbm').then(res=>{
+  qcckGet({},'/mosty-gsxt/lzJcjPjdb/selectCount').then(res=>{
+  // qcckGet({},'/mosty-gsxt/tbYjxx/selectSsbm').then(res=>{
     emitter.emit('deletePointArea','hm')
     let list = res || [];
     list.forEach(item => {
+      (item.jqjb || []).forEach(v=>{
+        v.jbmc = D_BZ_JQDJ.value.find(itm => itm.value == v.jbdm).label
+      })
       let obj = centralPoint.find(i => i.name == item.ssbm || i.ssbmdm == item.ssbmdm);
       if(obj){
         item.jd = obj.point[0];
         item.wd = obj.point[1];
       }
     })
+    
+    
     allDep.value = list;
     emitter.emit("addPointArea", { coords:list, icon: dw, flag: "hm", size: '14px', showTitle: false, offset: [0, -25] });
   })