临时提交

src/main/java/com/genersoft/iot/vmp/web/custom/conf/SignAuthenticationFilter.java

@@ -6,14 +6,12 @@ import cn.hutool.crypto.SmUtil;
 import cn.hutool.crypto.symmetric.SM4;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
-import com.genersoft.iot.vmp.conf.UserSetting;
 import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Component;
@@ -36,12 +34,6 @@ import java.util.TreeSet;
 @ConditionalOnProperty(value = "sy.enable", havingValue = "true")
 public class SignAuthenticationFilter extends OncePerRequestFilter {
 
-    private final static String WSHeader = "sec-websocket-protocol";
-
-
-    @Autowired
-    private UserSetting userSetting;
-
 
     @Override
     protected void doFilterInternal(HttpServletRequest servletRequest, HttpServletResponse response, FilterChain chain) throws IOException, ServletException {

web/src/views/channel/region/index.vue

@@ -73,7 +73,7 @@
         ref="channelListTable"
         size="medium"
         :data="channelList"
-        height="calc(100vh - 190px)"
+        :height="tableHeight"
         style="width: 100%"
         header-row-class-name="table-header"
         @selection-change="handleSelectionChange"
@@ -130,6 +130,7 @@ export default {
   data() {
     return {
       channelList: [],
+      tableHeight: `calc(100vh - ${this.$refs.queryForm.offsetHeight}px)`,
       searchStr: '',
       channelType: '',
       online: '',

web/src/views/map/index.vue

@@ -251,6 +251,7 @@ export default {
             src: this.getImageByChannel(data)
           }
         }
+
         this.infoBoxTempLayer = this.$refs.mapComponent.addPointLayer([cameraData])
       }
       let position = [data.gbLongitude, data.gbLatitude]
@@ -353,7 +354,9 @@ export default {
             this.channelLayer = this.$refs.mapComponent.updatePointLayer(this.channelLayer, cameraList, true)
           }else {
             console.log(cameraList.length)
-            this.channelLayer = this.$refs.mapComponent.addPointLayer(cameraList, clientEvent, null)
+            setTimeout(()=>{
+              this.channelLayer = this.$refs.mapComponent.addPointLayer(cameraList, clientEvent, null)
+            })
           }
           break
         case 2:
@@ -361,8 +364,10 @@ export default {
           if (this.channelLayer) {
             this.channelLayer = this.$refs.mapComponent.updatePointLayer(this.channelLayer, cameraList, true)
           }else {
-            this.channelLayer = this.$refs.mapComponent.addPointLayer(cameraList, clientEvent, {
-              declutter: true
+            setTimeout(()=>{
+              this.channelLayer = this.$refs.mapComponent.addPointLayer(cameraList, clientEvent, {
+                declutter: true
+              })
             })
           }
           break
@@ -371,7 +376,9 @@ export default {
           if (this.channelLayer) {
             this.channelLayer = this.$refs.mapComponent.updatePointLayerGroup(this.channelLayer, cameraListForLevelMap, true)
           }else {
-            this.channelLayer = this.$refs.mapComponent.addPointLayerGroup(cameraListForLevelMap, clientEvent)
+            setTimeout(() => {
+              this.channelLayer = this.$refs.mapComponent.addPointLayerGroup(cameraListForLevelMap, clientEvent)
+            })
           }
           break
         // case 4:
@@ -572,26 +579,32 @@ export default {
       let cameraList = cameraListForSource.slice()
 
       this.quicklyDrawThinLoading = true
-      this.drawThin(cameraList).then((layerGroupSource) => {
-        this.layerGroupSource = layerGroupSource
-        this.drawThinLayer = this.$refs.mapComponent.addPointLayerGroup(layerGroupSource, data => {
-          this.closeInfoBox()
-          this.$nextTick(() => {
-            if (data[0].edit) {
-              this.showEditInfo(data[0])
-            }else {
-              this.showChannelInfo(data[0])
-            }
+      setTimeout(() => {
+        this.drawThin(cameraList).then((layerGroupSource) => {
+          this.layerGroupSource = layerGroupSource
+          this.drawThinLayer = this.$refs.mapComponent.addPointLayerGroup(layerGroupSource, data => {
+            this.closeInfoBox()
+            this.$nextTick(() => {
+              if (data[0].edit) {
+                this.showEditInfo(data[0])
+              }else {
+                this.showChannelInfo(data[0])
+              }
+            })
+          })
+          this.quicklyDrawThinLoading = false
+          this.$message.success({
+            showClose: true,
+            message: '抽稀完成，请预览无误后保存抽稀结果'
           })
-        })
-        this.quicklyDrawThinLoading = false
-        this.$message.success({
-          showClose: true,
-          message: '抽稀完成，请预览无误后保存抽稀结果'
         })
       })
     },
     boxDrawThin: function (){
+      this.$message.info({
+        showClose: true,
+        message: '点击地图进行框选'
+      })
       // 绘制框
       this.$refs.mapComponent.startDrawBox((extent) => {