Merge branch 'master' of http://192.168.1.22:3000/Web/admin-sjzx

# Conflicts:
#	src/views/pqs/voltageSags/monitoringPoint/online/navigation/index.vue
修改冲突

src/api/system-boot/file.ts

@@ -31,7 +31,7 @@ export const uploadFile = (file: any, path: string) => {
         data: form
     }).then(res => {
         if (res.code == `A0000`) {
-            ElMessage.success('上传成功!')
+            ElMessage.success('文件上传成功!')
             return res
         }
     })

src/views/pqs/voltageSags/monitoringPoint/online/index.vue

@@ -1,5 +1,6 @@
 <template>
     <div class="default-main" style="position: relative">
+        
         <el-tabs v-model="activeName" type="border-card" class="demo-tabs">
             <el-tab-pane label="导航" name="1" :style="height" lazy>
                 <Navigation @changeTab="changeTab" ref="navigationRef" />
@@ -69,7 +70,8 @@ watch(
         })
     }
 )
-const changeTab = (e: string) => {
+const changeTab = (e: string,) => {
+   
     activeName.value = e
 }
 </script>

src/views/pqs/voltageSags/monitoringPoint/online/navigation/index.vue

@@ -74,7 +74,6 @@ const handleNodeClick = (data: any, node: any) => {
    
         monitoringPoint.setValue('lineId', data.id)
         monitoringPoint.setValue('lineName', data.alias)
-
     }
     setTimeout(() => {
         flag.value = true

src/views/pqs/voltageSags/monitoringPoint/online/navigation/map.vue

@@ -37,7 +37,7 @@
                 <span>无暂降</span>
             </div>
         </div>
-         <!-- v-if="hackReset" -->
+        <!-- v-if="hackReset" -->
         <baidu-map
             class="bm-view"
             v-if="hackReset"
@@ -269,7 +269,9 @@ const syncCenterAndZoom = (e: any) => {
     zoom.value = e.target.getZoom()
 }
 const markerClick = (e: any) => {
+    console.log("🚀 ~ markerClick ~ e:", e)
     infoWindowPoint.value = e
+    monitoringPoint.setValue('lineId', e.lineId)
     infoWindowPoint.value.show = true
 }
 const changeTab = (e: string) => {