diff --git a/src/views/backOfficeSystem/IntelligentControl/DeploymentArea/components/addForm.vue b/src/views/backOfficeSystem/IntelligentControl/DeploymentArea/components/addForm.vue index eb81f2c..b25fd2a 100644 --- a/src/views/backOfficeSystem/IntelligentControl/DeploymentArea/components/addForm.vue +++ b/src/views/backOfficeSystem/IntelligentControl/DeploymentArea/components/addForm.vue @@ -14,7 +14,7 @@ placeholder="请选择区域类型" /> - @@ -56,7 +56,7 @@ import { qcckGet, qcckPost } from "@/api/qcckApi.js"; import emitter from "@/utils/eventBus.js"; import GdMap from "@/components/GdMap/index.vue"; import * as MOSTY from "@/components/MyComponents/index"; -import { ref, defineProps, onMounted, nextTick, onUnmounted } from "vue"; +import { ref, defineProps, onMounted, nextTick, onUnmounted, watch } from "vue"; import ChooseGzy from "@/components/ChooseList/ChooseGzy/index.vue"; import { bm } from '../xzqh' const props = defineProps({ @@ -81,6 +81,12 @@ const rules = { pgis: [{ required: true, message: "请输入地图范围", trigger: ['change', 'blur'] }], sxts: [{ required: true, message: "请输入感知元信息", trigger: "blur" }], }; +const qxList = ref([]) +watch(()=>props.dic.D_BZ_XZQHDM,val=>{ + qxList.value = val.filter(item=>{ + if(item.dm.startsWith('54262')) return item; + }) +},{immediate:true,deep:true}) onMounted(() => { emitter.on('coordString', val => { diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 9f2e03c..6e944c0 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -324,6 +324,7 @@ const handleOpenNotification = () => { type: "Custom" }); }); + } else { // 关闭主动展开后,恢复循环单条气泡展示 startPopupLoop(); @@ -332,6 +333,7 @@ const handleOpenNotification = () => { const makerCenter = () => { const dw = require("@/assets/point/dingwei.png"); + qcckGet({}, "/mosty-gsxt/lzJcjPjdb/selectCountNew").then((res) => { let list = res || []; allDep.value = list; diff --git a/src/views/home/model/tacticalYp.vue b/src/views/home/model/tacticalYp.vue index 38d4004..3401a08 100644 --- a/src/views/home/model/tacticalYp.vue +++ b/src/views/home/model/tacticalYp.vue @@ -4,9 +4,9 @@ - {{ item.ypyq }} - {{ item.ypsj }}{{ item.cjrxm }} {{ item.ypyt }} + {{ item.ypsj }}{{ item.cjrxm }} + {{ item.ypyq }}