Merge branch 'master' of http://112.124.40.88:5510/root/NanJingLamanRadarProject

# Conflicts:
#	04.系统编码/Frontend/src/components/RamanLidar.vue

04.系统编码/Frontend/src/components/RamanLidar.vue

@@ -203,8 +203,8 @@ export default {
       pm10Drawer: null
     }
     let options = reactive({
-
-      currentTab: 'MWR',
+      // currentTab: 'MWR',
+      currentTab: 'BingoCloud',
       currentRegion: 'jiangning',
       currentElement: 'PBLH',
       currentType: '边界层高度',

04.系统编码/Frontend/src/model/heat-map-drawer.ts

@@ -19,8 +19,6 @@ export class HeatMapDrawer{
     private readonly paddingBottom: number = 50;
     private colorChart: ColorChart = null;
     private values: any = null;
-    private readonly verticalScaleSpecialCount: number = 1;
-    private readonly horizontalScaleSpecialCount: number = 1;
 
     // 垂直刻度
     private readonly verticalScaleLine: number = 18;
@@ -145,13 +143,15 @@ export class HeatMapDrawer{
 
                 let targetValue = value[infoIndex].value;
                 let color = this.colorChart.getColor(targetValue);
-                value[infoIndex].updateBorderInfo(width, height);
+                value[infoIndex].updateBorderInfo(x, y, width, height);
                 if (color == null) continue;
                 this.canvasContext.fillStyle = color;
                 this.canvasContext.fillRect(x, y, width, height);
             }
-            // this.values[dataIndex] = this.values[dataIndex].reverse();
+            this.values[dataIndex] = this.values[dataIndex].reverse();
         }
+
+        console.log(this.values);
         this.createCalc(this.values);
     }
 

04.系统编码/Frontend/src/uilts/box-drawer.ts

@@ -447,7 +447,9 @@ export class Box implements IBox{
         this.id = this.uuid();
     }
 
-    updateBorderInfo(width: number, height: number): void{
+    updateBorderInfo(x: number, y: number, width: number, height: number): void{
+        this.x = x;
+        this.y = y;
         this.width = width;
         this.height = height;
     }