TwoKe945 1 год назад
Родитель
Сommit
cd60650f42

+ 1 - 1
app/package.json

@@ -24,7 +24,7 @@
     "vue2-scale-box": "^0.1.6"
   },
   "devDependencies": {
-    "@vitejs/plugin-legacy": "^2.0.0",
+    "@vitejs/plugin-legacy": "^2.3.1",
     "@vitejs/plugin-vue2": "^1.1.2",
     "@vitejs/plugin-vue2-jsx": "^1.0.2",
     "autoprefixer": "^10.4.14",

+ 33 - 0
app/src/assets/images/application-line.svg

@@ -0,0 +1,33 @@
+<svg width="387" height="357" viewBox="0 0 387 357" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10 127.625C79.1842 139.422 218.682 141.981 268.355 113.668C318.029 85.3556 351 38.2341 373 6" stroke="url(#paint0_linear_994_1659)" stroke-width="2"/>
+<path d="M13 228.375C82.1842 216.578 221.682 214.019 271.355 242.332C321.029 270.644 354 317.766 376 350" stroke="url(#paint1_linear_994_1659)" stroke-width="2"/>
+<path d="M16 178H372" stroke="url(#paint2_linear_994_1659)" stroke-width="2"/>
+<circle cx="380" cy="350" r="7" fill="#61FFBD"/>
+<circle cx="371" cy="179" r="7" fill="#61DBFF"/>
+<circle cx="378" cy="7" r="7" fill="#0085FF"/>
+<path d="M11.7952 176.824C11.1145 177.184 11.0783 178.145 11.73 178.555L19.0616 183.165C19.7133 183.574 20.5642 183.125 20.5932 182.356L20.9192 173.702C20.9482 172.932 20.1336 172.42 19.4529 172.78L11.7952 176.824Z" fill="#61DBFF"/>
+<path d="M17.1331 124.367C17.8747 124.161 18.5615 124.834 18.3693 125.58L16.2071 133.966C16.0149 134.711 15.0879 134.969 14.5384 134.43L8.35703 128.364C7.80758 127.825 8.04782 126.894 8.78947 126.687L17.1331 124.367Z" fill="#61DBFF"/>
+<path d="M13.068 234.473C13.8068 234.689 14.5028 234.025 14.3209 233.277L12.2745 224.862C12.0926 224.114 11.1691 223.844 10.6123 224.375L4.34792 230.355C3.79109 230.886 4.01847 231.821 4.75721 232.038L13.068 234.473Z" fill="#61DBFF"/>
+<path d="M301 141H165.5C146.446 141 131 156.446 131 175.5C131 194.554 146.446 210 165.5 210H294C297.866 210 301 206.866 301 203V141Z" fill="url(#paint3_linear_994_1659)"/>
+<path d="M159.38 183.3H167.6C168.74 180.54 169.74 177.16 170.6 173.16L172.68 173.74C171.92 177.3 170.98 180.48 169.86 183.3H173.68V185.34H159.38V183.3ZM161.98 174.14C162.78 176.26 163.48 178.68 164.12 181.42L162.14 181.94C161.62 179.44 160.98 177.04 160.18 174.74L161.98 174.14ZM165.8 172.68C166.48 174.88 167.1 177.38 167.64 180.2L165.66 180.7C165.22 178.14 164.68 175.66 164 173.28L165.8 172.68ZM165.94 167.44C166.24 168 166.54 168.64 166.82 169.34H173.98V171.36H159.4V175.44C159.34 179.88 158.7 183.44 157.5 186.12L155.72 184.54C156.72 182.36 157.24 179.32 157.28 175.44V169.34H164.5C164.22 168.8 163.92 168.3 163.6 167.84L165.94 167.44ZM179.62 174.96V177.84H184.02V174.96H179.62ZM179.52 179.76C179.26 182.24 178.52 184.32 177.3 185.96L175.7 184.52C176.88 182.84 177.48 180.7 177.52 178.1V168.2H193.02V183.3C193.02 184.84 192.22 185.62 190.64 185.62H188.34L187.78 183.58C188.58 183.66 189.3 183.7 189.98 183.7C190.58 183.7 190.9 183.3 190.9 182.54V179.76H186.14V185.4H184.02V179.76H179.52ZM190.9 177.84V174.96H186.14V177.84H190.9ZM190.9 173.04V170.24H186.14V173.04H190.9ZM184.02 170.24H179.62V173.04H184.02V170.24Z" fill="white"/>
+
+
+<defs>
+<linearGradient id="paint0_linear_994_1659" x1="1.75" y1="126.13" x2="331.26" y2="83.9302" gradientUnits="userSpaceOnUse">
+<stop offset="0.661458" stop-color="#61DBFF"/>
+<stop offset="1" stop-color="#61DBFF" stop-opacity="0.22"/>
+</linearGradient>
+<linearGradient id="paint1_linear_994_1659" x1="3.01316" y1="251.403" x2="366.457" y2="283.252" gradientUnits="userSpaceOnUse">
+<stop offset="0.28125" stop-color="#61DBFF"/>
+<stop offset="1" stop-color="#61DBFF" stop-opacity="0.22"/>
+</linearGradient>
+<linearGradient id="paint2_linear_994_1659" x1="38.5756" y1="191.501" x2="372.435" y2="190.745" gradientUnits="userSpaceOnUse">
+<stop stop-color="#61DBFF"/>
+<stop offset="1" stop-color="#61DBFF" stop-opacity="0.24"/>
+</linearGradient>
+<linearGradient id="paint3_linear_994_1659" x1="79.5" y1="210" x2="269.5" y2="210" gradientUnits="userSpaceOnUse">
+<stop stop-color="#0DA7FE"/>
+<stop offset="1" stop-color="#44D2FF" stop-opacity="0"/>
+</linearGradient>
+</defs>
+</svg>

+ 19 - 9
app/src/views/Home/components/FireIndex/index.vue

@@ -172,11 +172,13 @@ export default {
         return this.fireIndexLabel[this.type]
       }
       if (this.type === 0) {
+        const temp = this.monthLabel.slice()
         if (this.activeIndex === 0) {
-          
-        return this.monthLabel.toSpliced(0, 1);
+          temp.splice(0, 1);
+        } else {
+          temp.splice(this.monthLabel.length -  1, 1);
         }
-        return this.monthLabel.toSpliced(this.monthLabel.length -  1, 1);
+        return temp;
       } else {
         return this.yearLabel
       }
@@ -233,13 +235,21 @@ export default {
         this.monthLabel = month.map(item => item.y)
         this.yearLabel = year.map(item => item.n)
         // console.log('009988--------',month);
-        this.monthData = [
-          month.map((item,index) =>  month.length - 1 === index ? ({ name: item.qhyy, value: item.hzqs, itemStyle: {
+        const temp1 = month.map((item,index) =>  month.length - 1 === index ? ({ name: item.qhyy, value: item.hzqs, itemStyle: {
             color: "#cccccc89",
-          } }) : ({ name: item.y, value: item.hzqs })).toSpliced(0, 1),
-          month.map(item => ({ name: item.y, value: item.wrs })).toSpliced(month.length - 1, 1),
-          month.map(item => ({ name: item.y, value: item.srs })).toSpliced(month.length - 1, 1),
-          month.map(item => ({ name: item.y, value: parseInt(item.zzjjss / 10000) })).toSpliced(month.length - 1, 1),
+          } }) : ({ name: item.y, value: item.hzqs }));
+        const temp2 = month.map(item => ({ name: item.y, value: item.wrs }));
+        const temp3 = month.map(item => ({ name: item.y, value: item.srs }));
+        const temp4 =   month.map(item => ({ name: item.y, value: parseInt(item.zzjjss / 10000) }));
+        temp1.splice(0, 1);
+        temp2.splice(month.length - 1, 1);
+        temp3.splice(month.length - 1, 1);
+        temp4.splice(month.length - 1, 1);
+        this.monthData = [
+          temp1,
+          temp2,
+          temp3,
+          temp4,
           []
         ];
         this.yearData = [

+ 1 - 1
app/src/views/Home/components/NewMapChartsCategory.vue

@@ -605,7 +605,6 @@ export default {
 .legend-item1{
   display: flex;
   align-items: center;
-  gap: 5px;
   .count {
     color: #fff;
     width: 50px;
@@ -617,6 +616,7 @@ export default {
   .color {
     width: 10px;
     height: 40px;
+    margin: 0px 10px;
     &.color-0 {
     background-color: #ff0b0b;
     }

+ 5 - 5
app/src/views/Home/components/RiskWarning.vue

@@ -270,11 +270,11 @@ export default {
               },
             },
             // data:[srcData[0].y,srcData[3].y,srcData[6].y,srcData[11].y]
-            data: srcData.map((item) => {
-              // return `${item.y.substring(5,7)}月`;
-
-              return item.y;
-            }).toSpliced(0, 1),
+            data: (function () {
+              const temp = srcData.map((item) => item.y);
+              temp.splice(0, 1)
+              return temp
+            })(),
           },
         ],
         yAxis: [

+ 7 - 1
app/src/views/login/index.vue

@@ -11,10 +11,16 @@
 </template>
 
 <script>
+import applicationLine from '../../assets/images/application-line.svg'
 export default {
+  data() {
+    return {
+      applicationLine
+    }
+  },
     methods:{
         ToHome(){
-                  this.$router.push('/home');
+          this.$router.push('/home');
         }
     }
 }

+ 6 - 2
app/vite.config.js

@@ -4,12 +4,16 @@ import { defineConfig } from "vite";
 import { babel } from '@rollup/plugin-babel';
 import vue2 from "@vitejs/plugin-vue2";
 import vue2Jsx from "@vitejs/plugin-vue2-jsx";
-
+import legacy from "@vitejs/plugin-legacy";
 // https://vitejs.dev/config/
 export default defineConfig({
   plugins: [
     vue2(),
-    vue2Jsx()
+    vue2Jsx(),
+    legacy({
+        targets: ["ie >= 11"],
+        additionalLegacyPolyfills: ["regenerator-runtime/runtime"],
+    }),
   ],
   resolve: {
     alias: {