From 78771e9551cb38f611352cbfab505f9995b77a00 Mon Sep 17 00:00:00 2001
From: fengerli <528575642@qq.com>
Date: Tue, 2 Sep 2025 17:48:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/controlCenter/6170/index.vue                 | 10 ++++++++--
 .../controlCenter/controlPanel/components/map.vue      |  2 +-
 src/views/controlCenter/controlPanel/index.vue         |  5 +++++
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/views/controlCenter/6170/index.vue b/src/views/controlCenter/6170/index.vue
index 6b831d9..f7b4e72 100644
--- a/src/views/controlCenter/6170/index.vue
+++ b/src/views/controlCenter/6170/index.vue
@@ -339,18 +339,22 @@ const handleLaserClick = async () => {
 // 人员信息发送
 const registerPostInit = () => {
     if (!deviceDetail.value.personnelInfo.unitName) {
+        ElMessage.closeAll();
         proxy?.$modal.msgWarning('单位名称不能为空');
         return
     }
     if (!deviceDetail.value.personnelInfo.name) {
+        ElMessage.closeAll();
         proxy?.$modal.msgWarning('姓名不能为空');
         return
     }
     if (!deviceDetail.value.personnelInfo.position) {
+        ElMessage.closeAll();
         proxy?.$modal.msgWarning('职位不能为空');
         return
     }
     if (!deviceDetail.value.personnelInfo.code) {
+        ElMessage.closeAll();
         proxy?.$modal.msgWarning('ID不能为空');
         return
     }
@@ -397,7 +401,7 @@ const saveBtn = () => {
 // 强制报警
 const forceAlarm = async () => {
     try {
-        await proxy?.$modal.confirm('确定要对该设备开启强制报警？','');
+        await proxy?.$modal.confirm('确定要对该设备开启强制报警？', '');
         forceAlarmLoading.value = true
         // 2. 准备请求数据
         const batchId = generateShortId();
@@ -440,6 +444,7 @@ const forceAlarm = async () => {
 const sendTextMessage = async () => {
     // 防重复提交
     if (!deviceDetail.value.sendMsg) {
+        ElMessage.closeAll();
         proxy?.$modal.msgWarning('发送信息不能为空');
         return;
     }
@@ -514,7 +519,8 @@ onMounted(() => {
             .online {
                 color: #00ff00;
             }
-            .offline{
+
+            .offline {
                 color: rgb(224, 52, 52);
             }
         }
diff --git a/src/views/controlCenter/controlPanel/components/map.vue b/src/views/controlCenter/controlPanel/components/map.vue
index 5bb9843..ff8d72e 100644
--- a/src/views/controlCenter/controlPanel/components/map.vue
+++ b/src/views/controlCenter/controlPanel/components/map.vue
@@ -151,7 +151,7 @@ const renderMarkers = () => {
       map: mapInstance, 
       icon: new AMap.Icon({
         size: new AMap.Size(32, 32), // Marker显示尺寸
-        image: 'https://a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-default.png', 
+        image: '/src/assets/images/position_ico.png',
         imageSize: new AMap.Size(32, 32)
       })
     });
diff --git a/src/views/controlCenter/controlPanel/index.vue b/src/views/controlCenter/controlPanel/index.vue
index 0f2c930..fd94f1e 100644
--- a/src/views/controlCenter/controlPanel/index.vue
+++ b/src/views/controlCenter/controlPanel/index.vue
@@ -356,10 +356,12 @@ const getDeptTree = async () => {
 const sendTextMessage = () => {
   // 防重复提交
   if (!queryParams.value.deviceType) {
+      ElMessage.closeAll();
     proxy?.$modal.msgWarning('请先选择设备类型');
     return;
   }
   if (ids.value.length == 0) {
+      ElMessage.closeAll();
     proxy?.$modal.msgWarning('请先选中一条设备');
     return;
   }
@@ -368,6 +370,7 @@ const sendTextMessage = () => {
 // 发送文本消息确认
 const submitForm = async () => {
   if (!form.value.messageToSend) {
+      ElMessage.closeAll();
     proxy?.$modal.msgWarning('发送消息不能为空');
     return
   }
@@ -423,10 +426,12 @@ const cancel = () => {
 // 强制报警
 const forceAlarm = async () => {
   if (!queryParams.value.deviceType) {
+      ElMessage.closeAll();
     proxy?.$modal.msgWarning('请先选择设备类型');
     return;
   }
   if (ids.value.length == 0) {
+      ElMessage.closeAll();
     proxy?.$modal.msgWarning('请先选中一条设备');
     return;
   }