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

src/views/map/Map.vue

@@ -322,7 +322,7 @@ export default defineComponent({
       let colors = [];
       if(hour<=1){
         colors = [
-          { min: 5000, max: 9999, color: 'rgba(0,0,0,0)' },
+          { min: 5000, max: 9999, color: '#ffffff' },
           { min: 100, max: 5000, color: '#fb00ff' },
           { min: 50, max: 100, color: '#0000f6' },
           { min: 25, max: 50, color: '#65b7f9' },
@@ -330,11 +330,11 @@ export default defineComponent({
           { min: 5, max: 10, color: '#6cda69' },
           { min: 2.5, max: 5, color: '#b1f99d' },
           { min: 0.5, max: 2.5, color: '#d7f9cd' },
-          { min: 0, max: 0.5, color: 'rgba(0,0,0,0)' },
+          { min: 0, max: 0.5, color: '#ffffff' },
         ];
       }else if(hour>1 && hour<=6){
         colors = [
-          { min: 5000, max: 9999, color: 'rgba(0,0,0,0)' },
+          { min: 5000, max: 9999, color: '#ffffff' },
           { min: 250, max: 5000, color: '#820041' },
           { min: 100, max: 250, color: '#ff00ff' },
           { min: 50, max: 100, color: '#0004fe' },
@@ -342,22 +342,22 @@ export default defineComponent({
           { min: 10, max: 25, color: '#35bf40' },
           { min: 5, max: 10, color: '#6cda6e' },
           { min: 0.5, max: 5, color: '#b2f8a1' },
-          { min: 0, max: 0.5, color: 'rgba(0,0,0,0)' },
+          { min: 0, max: 0.5, color: '#ffffff' },
         ];
       }else if(hour>6 && hour<=24){
         colors = [
-          { min: 5000, max: 9999, color: 'rgba(0,0,0,0)' },
+          { min: 5000, max: 9999, color: '#ffffff' },
           { min: 250, max: 5000, color: '#7e0240' },
           { min: 100, max: 250, color: '#fa00fb' },
           { min: 50, max: 100, color: '#0300fe' },
           { min: 25, max: 50, color: '#5fb8ff' },
           { min: 10, max: 25, color: '#3abc39' },
           { min: 0.5, max: 10, color: '#a4f48c' },
-          { min: 0, max: 0.5, color: 'rgba(0,0,0,0)' },
+          { min: 0, max: 0.5, color: '#ffffff' },
         ];
       }else if(hour>24){
         colors = [
-          { min: 8000, max: 9999, color: 'rgba(0,0,0,0)' },
+          { min: 8000, max: 9999, color: '#ffffff' },
           { min: 1500, max: 8000, color: '#980400' },
           { min: 1000, max: 1500, color: '#e70109' },
           { min: 600, max: 1000, color: '#ff6700' },
@@ -368,7 +368,7 @@ export default defineComponent({
           { min: 25, max: 50, color: '#5db8ff' },
           { min: 10, max: 25, color: '#40b640' },
           { min: 0.5, max: 10, color: '#a4f391' },
-          { min: 0, max: 0.5, color: 'rgba(0,0,0,0)' },
+          { min: 0, max: 0.5, color: '#ffffff' },
         ];
       }
       // let colors = [];

src/views/map/changeMap.vue

@@ -193,7 +193,6 @@ eventBus.on('rainLegend2', (e) => {
           minIndex=index
         }
       })
-      debugger
       rainLegendNow2.value = colors.slice(minIndex, maxIndex + 1);
   // if (Number(e.max) > 0.5) {
   //   let level1 = Number(((e.max - 0.5) / 3 + 0.5).toFixed(2))
@@ -275,11 +274,11 @@ const rainLegend = reactive([
     value: '50~99.9',
   },
   {
-    style: 'background:#fa00fa',
+    style: 'background:#f900fb',
     value: '100~250',
   },
   {
-    style: 'background:#810041',
+    style: 'background:#81013d',
     value: '>250',
   },
 ]);