Merge branch 'master' of http://192.168.2.21:11666/chenlong/xx_sw_dp

src/views/map/Map.vue

@@ -2084,22 +2084,40 @@ export default defineComponent({
                         ).init().setOff(-52, -0)
                         markerWindow.setId('imp&' + data.stcd);
                         markerWindow.setClassify('impoint_marker*')
+                        markerWindow.info = data;
                         window.impoint.push(markerWindow)
                         map.addOverlay(markerWindow)
                         }
                       })
                     })
+                    // 单独记录每一个的指标数量和当前滚动位置
+                    window.indexNumInfo=[]
+                    window.impoint&&window.impoint.forEach(i=>{
+                              // console.log(i,'8383')
+                              window.indexNumInfo.push({
+                                impointDataLengthNow:0,
+                                impointDataLength:i.info.sensor.length?i.info.sensor.length:0
+                              })
+                            })
                         // 指标滚动
                         window.impointFlowInterval=
                           setInterval(()=>{
-                            if(window.impointDataLength){
-                              if(window.impointDataLengthNow<window.impointDataLength-1){
-                                window.impointDataLengthNow++
+                            window.indexNumInfo&&window.indexNumInfo.forEach((i,index)=>{
+                                if(i.impointDataLengthNow<i.impointDataLength-1){
+                                i.impointDataLengthNow++
                               }else{
-                                window.impointDataLengthNow=0
+                                i.impointDataLengthNow=0
                               }
-                                jquery('.impopup-content').css({'margin-top':`-${52*window.impointDataLengthNow}px`})
-                              }                              
+                              jquery(`.impopup`).eq(index).children().css({'margin-top':`-${52*i.impointDataLengthNow}px`})
+                            })
+                            // if(window.impointDataLength){
+                            //   if(window.impointDataLengthNow<window.impointDataLength-1){
+                            //     window.impointDataLengthNow++
+                            //   }else{
+                            //     window.impointDataLengthNow=0
+                            //   }
+                            //     jquery('.impopup-content').css({'margin-top':`-${52*window.impointDataLengthNow}px`})
+                            //   }                              
                             },5000)  
                   }
                 })
@@ -2135,29 +2153,47 @@ export default defineComponent({
                           data.dlon=i.dlon
                           data.data_real=i.data_real
                           data.st_name=i.st_name
-                          console.log(i,j,3663)
+                          // console.log(i,j,3663)
                         let markerWindow=  new TFMap.HTMLElementOverLay(
                           { x:Number(data.dlon) , y: Number(data.dlat),z:Number(data.high)  },
                           TFMapUitl.impotPointDom(data)
                         ).init().setOff(-52, -0)
                         markerWindow.setId('imp&' + data.stcd);
                         markerWindow.setClassify('impoint_marker*')
+                        markerWindow.info = data;
                         window.impoint.push(markerWindow)
                         map.addOverlay(markerWindow)
                         }
                       })
                     })
+                    // 单独记录每一个的指标数量和当前滚动位置
+                    window.indexNumInfo=[]
+                    window.impoint&&window.impoint.forEach(i=>{
+                              // console.log(i,'8383')
+                              window.indexNumInfo.push({
+                                impointDataLengthNow:0,
+                                impointDataLength:i.info.sensor.length?i.info.sensor.length:0
+                              })
+                            })
                         // 指标滚动
                         window.impointFlowInterval=
                           setInterval(()=>{
-                            if(window.impointDataLength){
-                              if(window.impointDataLengthNow<window.impointDataLength-1){
-                                window.impointDataLengthNow++
+                            window.indexNumInfo&&window.indexNumInfo.forEach((i,index)=>{
+                                if(i.impointDataLengthNow<i.impointDataLength-1){
+                                i.impointDataLengthNow++
                               }else{
-                                window.impointDataLengthNow=0
+                                i.impointDataLengthNow=0
                               }
-                                jquery('.impopup-content').css({'margin-top':`-${52*window.impointDataLengthNow}px`})
-                              }                              
+                              jquery(`.impopup`).eq(index).children().css({'margin-top':`-${52*i.impointDataLengthNow}px`})
+                            })
+                            // if(window.impointDataLength){
+                            //   if(window.impointDataLengthNow<window.impointDataLength-1){
+                            //     window.impointDataLengthNow++
+                            //   }else{
+                            //     window.impointDataLengthNow=0
+                            //   }
+                            //     jquery('.impopup-content').css({'margin-top':`-${52*window.impointDataLengthNow}px`})
+                            //   }                              
                             },5000)  
                   }
                 })