fix: 首页

src/api/modules/mini_farm.js

@@ -67,5 +67,9 @@ module.exports = {
     weather_warning_land_check: {
         url: config.base_dev_url + "land_check/weather_warning_land_check?key="+config.mini_key,
         type: "post",
-    }
+    },
+    userGarden: {
+        url: config.base_dev_url + "garden/listByUser?key="+config.mini_key,
+        type: "get",
+    },
 }

src/components/chartBox.vue

@@ -105,7 +105,7 @@ const handleShrink = () =>{
     border-radius: 8px;
     .chart-title{
       .name{
-        color: #FFD489;
+        color: #55E5C6;
       }
     }
   }

src/components/common/stepBox.vue

@@ -41,40 +41,40 @@ const formatDate = (dateStr) => {
     justify-content: center;
     &.step-0 {
         .t-r {
-            color: #FFD489;
+            color: #55E5C6;
         }
     }
     &.step-1 {
         .t-r {
-            color: #FFD489;
+            color: #55E5C6;
         }
         .b-r {
-            color: #FFD489;
+            color: #55E5C6;
         }
     }
     &.step-2 {
         .t-r {
-            color: #FFD489;
+            color: #55E5C6;
         }
         .b-r {
-            color: #FFD489;
+            color: #55E5C6;
         }
         .b-l {
-            color: #FFD489;
+            color: #55E5C6;
         }
     }
     &.step-3 {
         .t-r {
-            color: #FFD489;
+            color: #55E5C6;
         }
         .b-r {
-            color: #FFD489;
+            color: #55E5C6;
         }
         .b-l {
-            color: #FFD489;
+            color: #55E5C6;
         }
         .t-l {
-            color: #FFD489;
+            color: #55E5C6;
         }
     }
     &.step-4 {

src/components/fnHeader.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="header">
     <div class="title">
-      <img class="logo" src="@/assets/images/common/logo.png" alt="" />
-      <span>飞鸟智慧巡园平台</span>
-      <img class="logo-icon" src="@/assets/images/common/logo-icon.png" alt="" />
+      <!-- <img class="logo" src="@/assets/images/common/logo.png" alt="" /> -->
+      <span>百色农业大智慧中心</span>
+      <!-- <img class="logo-icon" src="@/assets/images/common/logo-icon.png" alt="" /> -->
     </div>
-    <div class="focus-farm" v-show="!hideSwitch">
+    <!-- <div class="focus-farm" v-show="!hideSwitch">
         <el-select
             v-model="farmVal"
             placeholder="我的关注农场"
@@ -16,21 +16,21 @@
             <el-option label="荔博园" :value="1" />
             <el-option label="井冈红糯基地" :value="2" />
         </el-select>
-    </div>
-    <div class="date" v-show="showDate">
+    </div> -->
+    <!-- <div class="date" v-show="showDate">
       <el-icon size="25"><MoreFilled /></el-icon>
       <div class="time">
         <div>{{time}}</div>
         <span>{{getCurrentFormattedTime('date')}} {{getCurrentDayOfWeek()}}</span>
       </div>
-    </div>
+    </div> -->
   </div>
   <!-- 四个方向的阴影 -->
-  <div class="page-shadow" v-show="!hideShadow">
+  <div class="page-shadow">
     <div class="page-bg bg-top"></div>
-    <div class="page-bg bg-right"></div>
-    <div class="page-bg bg-bottom"></div>
-    <div class="page-bg bg-left"></div>
+    <div class="page-bg bg-right" v-show="!hideShadow"></div>
+    <div class="page-bg bg-bottom" v-show="!hideShadow"></div>
+    <div class="page-bg bg-left" v-show="!hideShadow"></div>
   </div>
 </template>
 
@@ -50,7 +50,7 @@ const props = defineProps({
   },
   hideShadow: {
     type:Boolean,
-    defalut:false
+    defalut:true
   }
 })
 
@@ -94,9 +94,9 @@ function formatTimeToHHmmss(date) {
 const time = ref("21:05:46")
 const timer = ref(null)
 onMounted(()=>{
-  timer.value = setInterval(()=>{
-    time.value = getCurrentFormattedTime(new Date())
-  },1000)
+  // timer.value = setInterval(()=>{
+  //   time.value = getCurrentFormattedTime(new Date())
+  // },1000)
 })
 
 onUnmounted(()=>{
@@ -107,7 +107,7 @@ onUnmounted(()=>{
 <style lang="scss" scoped>
 .header {
   width: 100%;
-  height: 74px;
+  height: 87px;
   display: flex;
   justify-content: space-between;
   box-sizing: border-box;
@@ -122,6 +122,7 @@ onUnmounted(()=>{
     padding-left: 20px;
     display: flex;
     align-items: center;
+    justify-content: center;
     box-sizing: border-box;
     background: url("@/assets/images/common/header-bg.png") no-repeat center
       center / 100% 100%;
@@ -135,6 +136,7 @@ onUnmounted(()=>{
       }
     span {
       margin: 0 5px;
+      font-size: 42px;
       font-family: "PangMenZhengDao";
     }
   }
@@ -149,11 +151,11 @@ onUnmounted(()=>{
             height: 50px;
             line-height: 50px;
             .el-select__caret {
-                color: #ffd489;
+                color: #55E5C6;
             }
         }
         .el-select__placeholder {
-            color: #f7be5a;
+            color: #55E5C6;
             font-size: 20px;
             font-family: "PangMenZhengDao";
             text-align: center;
@@ -193,6 +195,7 @@ onUnmounted(()=>{
   background: linear-gradient( 0deg, rgba(0, 21, 31,0), #00151f);
 }
 .bg-right{
+  top: 0;
   right: 0;
   width: 600px;
   height: 100%;
@@ -205,6 +208,7 @@ onUnmounted(()=>{
   background: linear-gradient( 180deg, rgba(0, 21, 31,0), rgb(0, 21, 31,0.7));
 }
 .bg-left{
+  top: 0;
   left: 0;
   width: 600px;
   height: 100%;
@@ -224,7 +228,7 @@ onUnmounted(()=>{
         }
         .el-select-dropdown__item.is-selected {
             background: rgba(255, 212, 137, 0.2);
-            color: #ffd489;
+            color: #55E5C6;
         }
     }
     &.el-popper.is-light .el-popper__arrow:before {

src/components/toolList.vue

@@ -82,7 +82,7 @@ const handleActive = (value,index) =>{
     }
     &.active{
         background: #101010;
-        color: #FFD489;
+        color: #55E5C6;
     }
   }
 }

src/views/home/album/components/chart.vue

@@ -67,7 +67,7 @@ onMounted(() => {
                     type: "solid", // 这里可以省略，因为我们在下面通过itemStyle为每个点设置样式时会更具体
                 },
                 itemStyle: {
-                    color: "#FFD489", // 设置数据点颜色为红色
+                    color: "#55E5C6", // 设置数据点颜色为红色
                 },
                 
                 // markPoint: {
@@ -116,7 +116,7 @@ onMounted(() => {
                 type: "line",
                 symbolSize: 6,
                 itemStyle: {
-                    color: "#FFD489", // 设置数据点颜色为红色
+                    color: "#55E5C6", // 设置数据点颜色为红色
                 },
             },
         ];
@@ -134,7 +134,7 @@ onMounted(() => {
     //             type: "line",
     //             symbolSize: 6,
     //             itemStyle: {
-    //                 color: "#FFD489", // 设置数据点颜色为红色
+    //                 color: "#55E5C6", // 设置数据点颜色为红色
     //             },
     //         },
     //     ];
@@ -164,7 +164,7 @@ onMounted(() => {
     //                 type: "solid", // 这里可以省略，因为我们在下面通过itemStyle为每个点设置样式时会更具体
     //             },
     //             itemStyle: {
-    //                 color: "#FFD489", // 设置数据点颜色为红色
+    //                 color: "#55E5C6", // 设置数据点颜色为红色
     //             },
     //         },
     //         {

src/views/home/album/components/chartSeting.js

@@ -76,7 +76,7 @@ export const galleryLine = {
             type: 'line',
             symbolSize: 6,
             itemStyle: {
-                color: '#FFD489' // 设置数据点颜色为红色
+                color: '#55E5C6' // 设置数据点颜色为红色
             },
 
             // itemStyle: {
@@ -111,8 +111,8 @@ export const galleryIndicatorLine = {
           { name: '褪绿率', textStyle: { color: '#66B9FB' }, itemStyle: {color: "#66B9FB"} },
           { name: '花芽率', textStyle: { color: '#1B98FC' }, itemStyle: {color: "#1B98FC"} },
           { name: '花蕾率', textStyle: { color: '#036CC0' }, itemStyle: {color: "#036CC0"} },
-          { name: '生长异常', textStyle: { color: '#F7BE5A' }, itemStyle: {color: "#F7BE5A"} },
-          { name: '短花穗率', textStyle: { color: '#F7BE5A' }, itemStyle: {color: "#F7BE5A"} },
+          { name: '生长异常', textStyle: { color: '#55E5C6' }, itemStyle: {color: "#55E5C6"} },
+          { name: '短花穗率', textStyle: { color: '#55E5C6' }, itemStyle: {color: "#55E5C6"} },
           { name: '病虫异常', textStyle: { color: '#F99851' }, itemStyle: {color: "#F99851"} }
         ]
       },

src/views/home/album/index.vue

@@ -917,7 +917,7 @@ function addNsRecord(){
                                         position: absolute;
                                         right: -8px;
                                         top: 0;
-                                        background: #F7BE5A;
+                                        background: #55E5C6;
                                         color: #fff;
                                         font-size: 12px;
                                         border-radius: 0 8px 0 8px;
@@ -966,7 +966,7 @@ function addNsRecord(){
                                     display: flex;
                                     align-items: center;
                                     .detail-text {
-                                        color: #FFD489;
+                                        color: #55E5C6;
                                         padding-left: 6px;
                                     }
                                 }
@@ -1001,7 +1001,7 @@ function addNsRecord(){
                                 right: 6px;
                                 top: 20px;
                                 .expert-name {
-                                    background: #FFD489;
+                                    background: #55E5C6;
                                     border-radius: 4px;
                                     padding: 2px 6px 3px 10px;
                                     margin-top: 4px;
@@ -1047,7 +1047,7 @@ function addNsRecord(){
                         .log-box {
                             background: #232323;
                             border-radius: 8px;
-                            color: #FFD489;
+                            color: #55E5C6;
                             border: 1px solid rgba(255, 212, 137, 0.3);
                             .log-title {
                                 font-family: "PangMenZhengDao";

src/views/home/components/chartSeting.js

@@ -111,7 +111,7 @@ export const galleryIndicatorLine = {
           { name: '褪绿率', textStyle: { color: '#66B9FB' }, itemStyle: {color: "#66B9FB"} },
           { name: '花芽率', textStyle: { color: '#1B98FC' }, itemStyle: {color: "#1B98FC"} },
           { name: '花蕾率', textStyle: { color: '#036CC0' }, itemStyle: {color: "#036CC0"} },
-          { name: '生长异常', textStyle: { color: '#F7BE5A' }, itemStyle: {color: "#F7BE5A"} },
+          { name: '生长异常', textStyle: { color: '#55E5C6' }, itemStyle: {color: "#55E5C6"} },
           { name: '病虫异常', textStyle: { color: '#F99851' }, itemStyle: {color: "#F99851"} }
         ]
       },

src/views/home/components/homePage.vue

@@ -200,7 +200,7 @@ const gybg= ()=>{
       font-family: Arial, Helvetica, sans-serif;
       background: linear-gradient(180deg, rgb(85, 85, 85,0.4) 0%, rgb(35, 35, 35,1) 100%);
       span{
-        color: #FFD489;
+        color: #55E5C6;
       }
     }
     .title-left{
@@ -267,7 +267,7 @@ const gybg= ()=>{
           text-indent: 2em;
           margin-left: 8px;
           span{
-            color: #FFD489;
+            color: #55E5C6;
           }
         }
       }
@@ -291,7 +291,7 @@ const gybg= ()=>{
           .txt{
             font-size: 12px;
             span{
-              color: #FFD489;
+              color: #55E5C6;
             }
           }
         }

src/views/home/index.vue

@@ -426,14 +426,14 @@ const toFilePage = () => {
           div{
             width: 48%;
             height: 100%;
-            color: #FFD489;
+            color: #55E5C6;
             border: 1px solid rgba(255,213,137,0.6);
             border-radius: 2px;
             text-align: center;
             font-size: 12px;
             cursor: pointer;
             &.active{
-              background: #FFD489;
+              background: #55E5C6;
               color: #000;
             }
           }
@@ -539,7 +539,7 @@ const toFilePage = () => {
         }
         .edit-btn {
           padding: 2px 24px;
-          background: #FFD489;
+          background: #55E5C6;
           border-radius: 4px;
           color: #000;
         }

src/views/warningHome/components/alarmList.vue

@@ -1,9 +1,9 @@
 <template>
     <div class="alarm-wrap">
         <div class="alarm-t">
-            <div class="alarm-tag">
+            <!-- <div class="alarm-tag">
                 <img src="@/assets/images/warningHome/alarm-bg.png" />
-            </div>
+            </div> -->
             <div class="alarm-item-wrap">
                 <div class="item-wrap">
                     <div
@@ -14,14 +14,14 @@
                         :class="{ active: activeAlarm === item.id }"
                     >
                         {{ item.name }}
-                        <div class="active-arrow" v-if="activeAlarm === item.id">
+                        <!-- <div class="active-arrow" v-if="activeAlarm === item.id">
                             <img src="@/assets/images/warningHome/alarm-active-arrow.png" />
-                        </div>
+                        </div> -->
                     </div>
                 </div>
             </div>
         </div>
-        <div class="alarm-t alarm-b">
+        <!-- <div class="alarm-t alarm-b">
             <div class="alarm-tag">
                 <img src="@/assets/images/warningHome/alarm-bg2.png" />
             </div>
@@ -41,7 +41,7 @@
                     </div>
                 </div>
             </div>
-        </div>
+        </div> -->
     </div>
 </template>
 
@@ -52,7 +52,6 @@ import { onMounted, ref } from "vue";
 const alarmList = ref([
     { name: "低温冻害", id: 1 },
     { name: "干旱缺水", id: 2 },
-    { name: "冲梢风险", id: 3 },
     { name: "病虫风险", id: 4 },
 ]);
 const alarmFactorList = ref([
@@ -96,7 +95,7 @@ const toggleAlarm = (item, type) => {
     align-items: center;
     .alarm-t {
         width: 100%;
-        padding-top: 18px;
+        // padding-top: 18px;
         .alarm-tag {
             position: relative;
             left: -8px;
@@ -104,7 +103,7 @@ const toggleAlarm = (item, type) => {
         .alarm-item-wrap {
             padding: 0 12px;
             .item-wrap {
-                padding: 12px 0 24px 0;
+                padding: 12px 0 12px 0;
                 border-bottom: 1px solid rgba(255, 255, 255, 0.3);
                 .alarm-item {
                     cursor: pointer;
@@ -119,9 +118,9 @@ const toggleAlarm = (item, type) => {
                     font-family: "PangMenZhengDao";
                     border-radius: 4px;
                     &.active {
-                        margin-bottom: 34px;
+                        // margin-bottom: 34px;
                         position: relative;
-                        color: #ffd489;
+                        color: #55E5C6;
                         background: url("@/assets/images/warningHome/alarm-active.png") no-repeat center center / cover;
                     }
                     .active-arrow {

src/views/warningHome/components/album.vue

@@ -288,13 +288,13 @@ onMounted(() => {
     sampleId.value = 766;
     farmId.value = 88388;
 
-    eventBus.on("MockFarmLayer:click", ({ sampleIdVal, farmIdVal }) => {
-        sampleId.value = sampleIdVal;
-        farmId.value = farmIdVal;
-        getFarmDetail(farmId.value);
-        getFarmWorkList(farmId.value);
-        // getFarmLog()
-    });
+    // eventBus.on("MockFarmLayer:click", ({ sampleIdVal, farmIdVal }) => {
+    //     sampleId.value = sampleIdVal;
+    //     farmId.value = farmIdVal;
+    //     getFarmDetail(farmId.value);
+    //     getFarmWorkList(farmId.value);
+    //     // getFarmLog()
+    // });
     getFarmDetail(farmId.value);
     getFarmWorkList(farmId.value);
     window.addEventListener("scroll", debouncedHandleScroll);
@@ -499,9 +499,9 @@ const showDetail = (card) => {
                             height: 21px;
                             line-height: 21px;
                             border-radius: 2px;
-                            border: 0.5px solid #ffd489;
+                            border: 0.5px solid #55E5C6;
                             font-size: 12px;
-                            color: #ffd489;
+                            color: #55E5C6;
                         }
                     }
                     .garden-desc {
@@ -639,7 +639,7 @@ const showDetail = (card) => {
                     overflow: auto;
                     box-sizing: border-box;
                     .common-btn {
-                        background: #f7be5a;
+                        background: #55E5C6;
                         border-radius: 4px;
                         color: #fff;
                         padding: 8px 10px;
@@ -696,7 +696,7 @@ const showDetail = (card) => {
                                 padding-bottom: 8px;
                                 .serve-btn {
                                     padding: 3px 10px;
-                                    background: #f7be5a;
+                                    background: #55E5C6;
                                     border-radius: 22px;
                                     color: #fff;
                                     text-align: center;
@@ -718,7 +718,7 @@ const showDetail = (card) => {
                                     border-radius: 2px;
                                     border: 0.2px solid transparent;
                                     &.blue {
-                                        color: #f7be5a;
+                                        color: #55E5C6;
                                         background: rgba(33, 153, 248, 0.2);
                                     }
                                     &.good-wrap {
@@ -731,8 +731,8 @@ const showDetail = (card) => {
                                         }
                                     }
                                     &.standard {
-                                        color: #f7be5a;
-                                        border-color: #ffd489;
+                                        color: #55E5C6;
+                                        border-color: #55E5C6;
                                     }
                                     &.advice {
                                         color: rgba(252, 167, 3, 0.9);
@@ -752,7 +752,7 @@ const showDetail = (card) => {
                                         position: absolute;
                                         right: -8px;
                                         top: 0;
-                                        background: #f7be5a;
+                                        background: #55E5C6;
                                         color: #fff;
                                         font-size: 12px;
                                         border-radius: 0 8px 0 8px;
@@ -798,7 +798,7 @@ const showDetail = (card) => {
                                     display: flex;
                                     align-items: center;
                                     .detail-text {
-                                        color: #f7be5a;
+                                        color: #55E5C6;
                                         padding-left: 6px;
                                     }
                                 }
@@ -820,7 +820,7 @@ const showDetail = (card) => {
                                 right: 6px;
                                 top: 20px;
                                 .expert-name {
-                                    background: #ffd489;
+                                    background: #55E5C6;
                                     border-radius: 4px;
                                     padding: 2px 6px 3px 10px;
                                     margin-top: 4px;
@@ -864,7 +864,7 @@ const showDetail = (card) => {
                         .log-box {
                             // background: #fff8e0;
                             border-radius: 8px;
-                            border: 0.5px solid #ffd489;
+                            border: 0.5px solid #55E5C6;
                             .log-title {
                                 position: relative;
                                 top: -4px;
@@ -878,7 +878,7 @@ const showDetail = (card) => {
                             }
                             .log-content {
                                 padding-bottom: 10px;
-                                color: #ffd489;
+                                color: #55E5C6;
                                 .log-desc {
                                     padding: 0 10px;
                                     font-size: 12px;
@@ -906,12 +906,12 @@ const showDetail = (card) => {
 
             @keyframes flash {
                 0% {
-                    box-shadow: 0 0 5px #f7be5a;
-                    border-color: #f7be5a;
+                    box-shadow: 0 0 5px #55E5C6;
+                    border-color: #55E5C6;
                 }
                 100% {
-                    box-shadow: 0 0 20px #f7be5a;
-                    border: 2px solid #f7be5a;
+                    box-shadow: 0 0 20px #55E5C6;
+                    border: 2px solid #55E5C6;
                 }
             }
         }

src/views/warningHome/components/chart.vue

@@ -67,7 +67,7 @@ onMounted(() => {
                     type: "solid", // 这里可以省略，因为我们在下面通过itemStyle为每个点设置样式时会更具体
                 },
                 itemStyle: {
-                    color: "#FFD489", // 设置数据点颜色为红色
+                    color: "#55E5C6", // 设置数据点颜色为红色
                 },
                 
                 // markPoint: {
@@ -116,7 +116,7 @@ onMounted(() => {
                 type: "line",
                 symbolSize: 6,
                 itemStyle: {
-                    color: "#FFD489", // 设置数据点颜色为红色
+                    color: "#55E5C6", // 设置数据点颜色为红色
                 },
             },
         ];

src/views/warningHome/components/chartSeting.js

@@ -75,7 +75,7 @@ export const galleryLine = {
             type: 'line',
             symbolSize: 6,
             itemStyle: {
-                color: '#FFD489' // 设置数据点颜色为红色
+                color: '#55E5C6' // 设置数据点颜色为红色
             },
 
             // itemStyle: {
@@ -110,7 +110,7 @@ export const galleryIndicatorLine = {
           { name: '褪绿率', textStyle: { color: '#66B9FB' }, itemStyle: {color: "#66B9FB"} },
           { name: '花芽率', textStyle: { color: '#1B98FC' }, itemStyle: {color: "#1B98FC"} },
           { name: '花蕾率', textStyle: { color: '#036CC0' }, itemStyle: {color: "#036CC0"} },
-          { name: '生长异常', textStyle: { color: '#F7BE5A' }, itemStyle: {color: "#F7BE5A"} },
+          { name: '生长异常', textStyle: { color: '#55E5C6' }, itemStyle: {color: "#55E5C6"} },
           { name: '病虫异常', textStyle: { color: '#F99851' }, itemStyle: {color: "#F99851"} }
         ]
       },

src/views/warningHome/components/chat_components/index.vue

@@ -553,7 +553,7 @@ const scrollToBottom = () => {
     padding-bottom: 10px;
 }
 .ask-list {
-    color: #FFD489;
+    color: #55E5C6;
 }
 .to-map {
     display: flex;
@@ -586,7 +586,7 @@ const scrollToBottom = () => {
 .link {
     display: flex;
     .header-link {
-        color: #FFD489;
+        color: #55E5C6;
         display: flex;
         align-items: baseline;
         text-decoration: underline;
@@ -602,7 +602,7 @@ const scrollToBottom = () => {
     border-radius: 8px;
     // max-width: 60%;
     background: rgba(255, 212, 137, 0.1);
-    color: #FFD489;
+    color: #55E5C6;
     border-radius: 16px 2px 16px 16px;
     line-height: 24px;
     font-size: 14px;

src/views/warningHome/index.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="base-container no-events">
-        <fnHeader showDate></fnHeader>
+        <fnHeader :hideShadow="true"></fnHeader>
         <div class="content">
             <div class="warning-l left">
                 <div class="warning-top">
@@ -9,8 +9,7 @@
                         返回
                     </div>
                     <div class="top-l yes-events">
-                        <div>
-                            <el-cascader
+                            <!-- <el-cascader
                                 style="width: 184px"
                                 :show-all-levels="false"
                                 v-model="areaVal"
@@ -18,11 +17,37 @@
                                 :options="areaListOptions"
                                 @change="toggleArea"
                                 popper-class="area-cascader"
-                            />
-                        </div>
-                        <div class="type-box"><img src="@/assets/images/warningHome/lz.png" /></div>
+                            /> -->
+                            <div class="select-wrap">
+                                <el-select
+                                    v-model="areaVal"
+                                    placeholder="请选择"
+                                    style="width: 200px"
+                                    >
+                                    <el-option
+                                        v-for="item in areaOptions"
+                                        :key="item.value"
+                                        :label="item.label"
+                                        :value="item.value"
+                                    />
+                                </el-select>
+                            </div>
+                            <div class="select-wrap">
+                                <el-select
+                                    v-model="typeVal"
+                                    placeholder="请选择"
+                                    style="width: 200px"
+                                    >
+                                    <el-option
+                                        v-for="item in typeOptions"
+                                        :key="item.value"
+                                        :label="item.label"
+                                        :value="item.value"
+                                    />
+                                </el-select>
+                            </div>
                     </div>
-                    <div class="top-r yes-events">
+                    <!-- <div class="top-r yes-events">
                         <div class="data-box" @click="toggleBox('面积')" :class="{ active: activeBoxName === '面积' }">
                             <div class="data-value"><span>{{areaVal.includes('3186') ? 31.2 : 419.89}}</span>万亩</div>
                             <div class="data-name">种植面积</div>
@@ -40,14 +65,40 @@
                             <div class="data-value"><span>{{areaVal.includes('3186') ? 10.4 : 192.12}}</span>万吨</div>
                             <div class="data-name">预估产量</div>
                         </div>
-                    </div>
+                    </div> -->
                 </div>
                 <div class="warning-alarm yes-events" v-show="hideChatMapLayer">
                     <alarm-list></alarm-list>
                 </div>
-                <div class="time-wrap yes-events">
+                <!-- <div class="time-wrap yes-events">
                     <time-line></time-line>
+                </div> -->
+            </div>
+            <div class="warning-c yes-events">
+                <div class="center-content">
+                    <div class="warning-item">
+                        <div class="item-val">
+                            526
+                            <span class="unit">亩</span>
+                        </div>
+                        <div class="item-text">种植面积</div>
+                    </div>
+                    <div class="warning-item">
+                        <div class="item-val">
+                            526
+                            <span class="unit">户</span>
+                        </div>
+                        <div class="item-text">种植户数</div>
+                    </div>
+                    <div class="warning-item">
+                        <div class="item-val">
+                            526
+                            <span class="unit">亩</span>
+                        </div>
+                        <div class="item-text">种植产量</div>
+                    </div>
                 </div>
+                <img class="center-title-bg" src="@/assets/images/warningHome/center-title.png" alt="">
             </div>
             <div class="warning-r right yes-events">
                 <!-- <album></album> -->
@@ -61,9 +112,9 @@
                     <StaticMapLegend></StaticMapLegend>
                 </div>
             </div>
-            <div class="warning-search yes-events">
+            <!-- <div class="warning-search yes-events">
                 <img src="@/assets/images/warningHome/search-img.png" />
-                <!-- <div class="focus-farm">
+                <div class="focus-farm">
                     <el-select
                         v-model="farmVal"
                         placeholder="我的关注农场"
@@ -74,8 +125,8 @@
                         <el-option label="荔博园" :value="1" />
                         <el-option label="井冈红糯基地" :value="2" />
                     </el-select>
-                </div> -->
-            </div>
+                </div>
+            </div> -->
         </div>
     </div>
     <div ref="mapRef" class="bottom-map"></div>
@@ -121,7 +172,15 @@ let staticMapLayers = null;
 let staticMapPointLayers = null;
 const router = useRouter();
 
-const areaVal = ref(["3"]);
+const areaVal = ref(1);
+const areaOptions = ref([
+    {label: "百色",value: 1}
+])
+const typeVal = ref(1);
+const typeOptions = ref([
+    {label: "八角",value: 1},
+    {label: "油茶",value: 2},
+])
 const mapRef = ref();
 
 const legendImg = ref("");
@@ -241,11 +300,51 @@ const toggleBox = (name) => {
                 height: 100%;
             }
         }
+        .warning-c {
+            width: 600px;
+            display: flex;
+            justify-content: space-around;
+            position: absolute;
+            left: 50%;
+            transform: translateX(-50%);
+            .center-content {
+                position: relative;
+                width: 600px;
+                display: flex;
+                justify-content: space-around;
+                z-index: 2;
+            }
+            .center-title-bg {
+                position: absolute;
+                top: -100px;
+            }
+            .warning-item {
+                height: 78px;
+                display: flex;
+                flex-direction: column;
+                align-items: center;
+                justify-content: center;
+                .item-text {
+                    color: #55E5C8;
+                    font-size: 20px;
+                }
+                .item-val {
+                    font-family: "PangMenZhengDao";
+                    font-size: 36px;
+                    background: linear-gradient(180deg, #9CFFF3, #FFFFFF);
+                    -webkit-background-clip: text;
+                    color: transparent;
+                    .unit {
+                        font-size: 17px;
+                    }
+                }
+            }
+        }
         .warning-r {
             .map-legend {
                 position: absolute;
                 bottom: -33px;
-                left: -455px;
+                left: -352px;
                 width: 340px;
                 img {
                     width: 340px;
@@ -272,11 +371,11 @@ const toggleBox = (name) => {
                     height: 50px;
                     line-height: 50px;
                     .el-select__caret {
-                        color: #ffd489;
+                        color: #55E5C6;
                     }
                 }
                 .el-select__placeholder {
-                    color: #f7be5a;
+                    color: #55E5C6;
                     font-size: 20px;
                     font-family: "PangMenZhengDao";
                     text-align: center;
@@ -304,8 +403,10 @@ const toggleBox = (name) => {
             }
             .top-l {
                 display: flex;
-                flex-direction: column;
+                // flex-direction: column;
                 align-items: center;
+                position: relative;
+                top: -40px;
                 .type-box {
                     margin-top: 10px;
                     background: rgba(29, 29, 29, 0.54);
@@ -317,6 +418,10 @@ const toggleBox = (name) => {
                     width: 184px;
                 }
 
+                .select-wrap {
+                    background: url("@/assets/images/warningHome/select-bg.png") no-repeat center;
+                }
+
                 ::v-deep {
                     .el-input__wrapper {
                         background: rgba(29, 29, 29, 0.54);
@@ -325,23 +430,23 @@ const toggleBox = (name) => {
                         line-height: 50px;
                         padding: 0 10px;
                         .el-input__inner {
-                            color: #f7be5a;
+                            color: #55E5C6;
                             font-size: 20px;
                             font-family: "PangMenZhengDao";
                             text-align: center;
                         }
                     }
                     .el-select__wrapper {
-                        background: rgba(29, 29, 29, 0.54);
-                        box-shadow: 0 0 0 1px rgba(255, 212, 137, 0.3) inset;
-                        height: 50px;
-                        line-height: 50px;
+                        background: transparent;
+                        box-shadow: none;
+                        height: 40px;
+                        line-height: 40px;
                         .el-select__caret {
-                            color: #ffd489;
+                            color: #55E5C6;
                         }
                     }
                     .el-select__placeholder {
-                        color: #f7be5a;
+                        color: #55E5C6;
                         font-size: 20px;
                         font-family: "PangMenZhengDao";
                         text-align: center;
@@ -380,7 +485,7 @@ const toggleBox = (name) => {
                         font-family: "PangMenZhengDao";
                         span {
                             font-size: 38px;
-                            color: #f7be5a;
+                            color: #55E5C6;
                             padding-right: 2px;
                         }
                     }
@@ -393,7 +498,7 @@ const toggleBox = (name) => {
         }
         .warning-alarm {
             width: 88px;
-            padding-top: 14px;
+            padding-top: calc(40%);
         }
         .time-wrap {
             position: absolute;
@@ -436,7 +541,7 @@ const toggleBox = (name) => {
         }
         .el-select-dropdown__item.is-selected {
             background: rgba(255, 212, 137, 0.2);
-            color: #ffd489;
+            color: #55E5C6;
         }
     }
     &.el-popper.is-light .el-popper__arrow:before {
@@ -484,12 +589,12 @@ const toggleBox = (name) => {
         .el-cascader-node.in-active-path,
         .el-cascader-node.is-active,
         .el-cascader-node.is-selectable.in-checked-path {
-            color: #f7be5a;
+            color: #55E5C6;
             background: transparent;
         }
         .el-radio__input.is-checked .el-radio__inner {
-            background: #f7be5a;
-            border-color: #f7be5a;
+            background: #55E5C6;
+            border-color: #55E5C6;
         }
         .el-cascader-node:not(.is-disabled):hover,
         .el-cascader-node:not(.is-disabled):focus,

src/views/warningHome/map/mockFarmLayer.js

@@ -42,22 +42,22 @@ class MockFarmLayer {
             },
             zIndex:-1
         });
-        eventBus.on("warningMap:init", function (kmap) {
-            that.initLayer(kmap)
-            VE_API.mini_farm.weatherRiskVirtualFarmList().then(res => {
-                if(res.code ===0){
-                    that.setData(res.data)
-                }
-            })
-        })
+        // eventBus.on("warningMap:init", function (kmap) {
+        //     that.initLayer(kmap)
+        //     VE_API.mini_farm.weatherRiskVirtualFarmList().then(res => {
+        //         if(res.code ===0){
+        //             that.setData(res.data)
+        //         }
+        //     })
+        // })
 
-        eventBus.on("weatherTime:changeTime", function ({date}) {
-            VE_API.mini_farm.weatherRiskVirtualFarmList({date: "2025-"+date}).then(res => {
-                if(res.code ===0){
-                    that.setData(res.data)
-                }
-            })
-        })
+        // eventBus.on("weatherTime:changeTime", function ({date}) {
+        //     VE_API.mini_farm.weatherRiskVirtualFarmList({date: "2025-"+date}).then(res => {
+        //         if(res.code ===0){
+        //             that.setData(res.data)
+        //         }
+        //     })
+        // })
         // eventBus.on("MockFarmLayer:click", function ({event, feature}) {
         //     let targetSampleId = feature.get("targetSampleId")
         //     let mockFarmId = feature.get("mockFarmId")

src/views/warningHome/warningMap.js

@@ -24,7 +24,7 @@ class HomeMap {
     let level = 9;
     let coordinate = util.wktCastGeom(location).getFirstCoordinate();
     this.kmap = new KMap.Map(target, level, coordinate[0], coordinate[1], null, 9, 22);
-    eventBus.emit('warningMap:init', this.kmap);
+    // eventBus.emit('warningMap:init', this.kmap);
     this.addMapListen()
      // 添加比例尺控件
     const scaleLine = new ScaleLine({
@@ -50,11 +50,11 @@ class HomeMap {
     that.kmap.on('singleclick', function (event) {
       let hasFeature = false
       let feature = that.kmap.map.forEachFeatureAtPixel(event.pixel, function (feature, layer) {
-        if (layer instanceof VectorLayer && layer.get("name") === "MockFarmLayer") {
-          hasFeature = true
-          let fs = feature.get("features");
-          fs.length > 0 && eventBus.emit('MockFarmLayer:click', { sampleIdVal: fs[0].get("targetSampleId"), farmIdVal: fs[0].get("mockFarmId") });
-        }
+        // if (layer instanceof VectorLayer && layer.get("name") === "MockFarmLayer") {
+        //   hasFeature = true
+        //   let fs = feature.get("features");
+        //   fs.length > 0 && eventBus.emit('MockFarmLayer:click', { sampleIdVal: fs[0].get("targetSampleId"), farmIdVal: fs[0].get("mockFarmId") });
+        // }
         if (layer instanceof VectorLayer && layer.get("name") === "pointLayer") {
           hasFeature = true
           eventBus.emit("chat:showTrackDialog", feature.get("url"))
@@ -96,6 +96,15 @@ class HomeMap {
       console.log('address', this.address);
     });
   }
+
+  // 果园列表
+  getGardenList(userId) {
+    VE_API.mini_farm.userGarden({userId, show3dFarm: false}).then(res => {
+        if(res.code ===0){
+            // that.setData(res.data)
+        }
+    })
+  }
 }
 
 export default HomeMap;

yarn.lock

@@ -32,14 +32,7 @@
   resolved "https://registry.npmjs.org/@antfu/utils/-/utils-0.7.2.tgz"
   integrity sha512-vy9fM3pIxZmX07dL+VX1aZe7ynZ+YyB0jY+jE6r3hOK6GNY2t6W8rzpFC4tgpbXUYABkFQwgJq2XYXlxbXAI0g==
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz"
-  integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==
-  dependencies:
-    "@babel/highlight" "^7.16.7"
-
-"@babel/code-frame@^7.18.6":
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.18.6":
   version "7.18.6"
   resolved "https://registry.npmmirror.com/@babel/code-frame/-/code-frame-7.18.6.tgz"
   integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==
@@ -81,15 +74,6 @@
     eslint-visitor-keys "^2.1.0"
     semver "^6.3.0"
 
-"@babel/generator@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.16.8.tgz"
-  integrity sha512-1ojZwE9+lOXzcWdWmO6TbUzDfqLD39CmEhN8+2cX9XkDo5yW1OpgfejfliysR2AWLpMamTiOiAp/mtroaymhpw==
-  dependencies:
-    "@babel/types" "^7.16.8"
-    jsesc "^2.5.1"
-    source-map "^0.5.0"
-
 "@babel/generator@^7.18.6":
   version "7.18.7"
   resolved "https://registry.npmmirror.com/@babel/generator/-/generator-7.18.7.tgz"
@@ -159,13 +143,6 @@
     resolve "^1.14.2"
     semver "^6.1.2"
 
-"@babel/helper-environment-visitor@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz"
-  integrity sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
 "@babel/helper-environment-visitor@^7.18.6":
   version "7.18.6"
   resolved "https://registry.npmmirror.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.6.tgz"
@@ -178,15 +155,6 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-function-name@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz"
-  integrity sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==
-  dependencies:
-    "@babel/helper-get-function-arity" "^7.16.7"
-    "@babel/template" "^7.16.7"
-    "@babel/types" "^7.16.7"
-
 "@babel/helper-function-name@^7.18.6":
   version "7.18.6"
   resolved "https://registry.npmmirror.com/@babel/helper-function-name/-/helper-function-name-7.18.6.tgz"
@@ -195,20 +163,6 @@
     "@babel/template" "^7.18.6"
     "@babel/types" "^7.18.6"
 
-"@babel/helper-get-function-arity@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz"
-  integrity sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-hoist-variables@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz"
-  integrity sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
 "@babel/helper-hoist-variables@^7.18.6":
   version "7.18.6"
   resolved "https://registry.npmmirror.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz"
@@ -223,14 +177,7 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.12.13":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz"
-  integrity sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-module-imports@^7.18.6":
+"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.18.6":
   version "7.18.6"
   resolved "https://registry.npmmirror.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz"
   integrity sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==
@@ -258,12 +205,7 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz"
-  integrity sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==
-
-"@babel/helper-plugin-utils@^7.18.6":
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
   version "7.18.6"
   resolved "https://registry.npmmirror.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.6.tgz"
   integrity sha512-gvZnm1YAAxh13eJdkb9EWHBnF3eAub3XTLCZEehHT2kWxiKVRL64+ae5Y6Ivne0mVHmMYKT+xWgZO+gQhuLUBg==
@@ -303,13 +245,6 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-split-export-declaration@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz"
-  integrity sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
 "@babel/helper-split-export-declaration@^7.18.6":
   version "7.18.6"
   resolved "https://registry.npmmirror.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz"
@@ -317,11 +252,6 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-validator-identifier@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz"
-  integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==
-
 "@babel/helper-validator-identifier@^7.18.6":
   version "7.18.6"
   resolved "https://registry.npmmirror.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz"
@@ -351,15 +281,6 @@
     "@babel/traverse" "^7.18.6"
     "@babel/types" "^7.18.6"
 
-"@babel/highlight@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.7.tgz"
-  integrity sha512-aKpPMfLvGO3Q97V0qhw/V2SWNWlwfJknuwAunU7wZLSfrM4xTBvg7E5opUVi1kJTBKihE38CPg4nBiqX83PWYw==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.16.7"
-    chalk "^2.0.0"
-    js-tokens "^4.0.0"
-
 "@babel/highlight@^7.18.6":
   version "7.18.6"
   resolved "https://registry.npmmirror.com/@babel/highlight/-/highlight-7.18.6.tgz"
@@ -369,7 +290,7 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.16.4", "@babel/parser@^7.16.7", "@babel/parser@^7.16.8", "@babel/parser@^7.18.4", "@babel/parser@^7.18.6":
+"@babel/parser@^7.16.4", "@babel/parser@^7.18.4", "@babel/parser@^7.18.6":
   version "7.21.2"
   resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.21.2.tgz"
   integrity sha512-URpaIJQwEkEC2T9Kn+Ai6Xe/02iNaVCuT/PtoRz3GPVJVDpPd7mLo+VddTbhCRU9TXqW5mSrQfXZyi8kDKOVpQ==
@@ -1012,16 +933,7 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/template@^7.0.0", "@babel/template@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz"
-  integrity sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==
-  dependencies:
-    "@babel/code-frame" "^7.16.7"
-    "@babel/parser" "^7.16.7"
-    "@babel/types" "^7.16.7"
-
-"@babel/template@^7.18.6":
+"@babel/template@^7.0.0", "@babel/template@^7.18.6":
   version "7.18.6"
   resolved "https://registry.npmmirror.com/@babel/template/-/template-7.18.6.tgz"
   integrity sha512-JoDWzPe+wgBsTTgdnIma3iHNFC7YVJoPssVBDjiHfNlyt4YcunDtcDOUmfVDfCK5MfdsaIoX9PkijPhjH3nYUw==
@@ -1030,23 +942,7 @@
     "@babel/parser" "^7.18.6"
     "@babel/types" "^7.18.6"
 
-"@babel/traverse@^7.0.0", "@babel/traverse@^7.13.0":
-  version "7.16.8"
-  resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.8.tgz"
-  integrity sha512-xe+H7JlvKsDQwXRsBhSnq1/+9c+LlQcCK3Tn/l5sbx02HYns/cn7ibp9+RV1sIUqu7hKg91NWsgHurO9dowITQ==
-  dependencies:
-    "@babel/code-frame" "^7.16.7"
-    "@babel/generator" "^7.16.8"
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-function-name" "^7.16.7"
-    "@babel/helper-hoist-variables" "^7.16.7"
-    "@babel/helper-split-export-declaration" "^7.16.7"
-    "@babel/parser" "^7.16.8"
-    "@babel/types" "^7.16.8"
-    debug "^4.1.0"
-    globals "^11.1.0"
-
-"@babel/traverse@^7.18.6":
+"@babel/traverse@^7.0.0", "@babel/traverse@^7.13.0", "@babel/traverse@^7.18.6":
   version "7.18.6"
   resolved "https://registry.npmmirror.com/@babel/traverse/-/traverse-7.18.6.tgz"
   integrity sha512-zS/OKyqmD7lslOtFqbscH6gMLFYOfG1YPqCKfAW5KrTeolKqvB8UelR49Fpr6y93kYkW2Ik00mT1LOGiAGvizw==
@@ -1062,15 +958,7 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.4.4":
-  version "7.16.8"
-  resolved "https://registry.npmjs.org/@babel/types/-/types-7.16.8.tgz"
-  integrity sha512-smN2DQc5s4M7fntyjGtyIPbRJv6wW4rU/94fmYJ7PKQuZkC0qGMHXJbg6sNGt12JmVr4k5YaptI/XtiLJBnmIg==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.16.7"
-    to-fast-properties "^2.0.0"
-
-"@babel/types@^7.18.6", "@babel/types@^7.18.7":
+"@babel/types@^7.0.0", "@babel/types@^7.18.6", "@babel/types@^7.18.7", "@babel/types@^7.4.4":
   version "7.18.7"
   resolved "https://registry.npmmirror.com/@babel/types/-/types-7.18.7.tgz"
   integrity sha512-QG3yxTcTIBoAcQmkCs+wAPYZhu7Dk9rXKacINfNbdJDNERTbLQbHGyVG8q/YGMPeCJRIhSY0+fTc5+xuh6WPSQ==
@@ -3516,12 +3404,7 @@
   optionalDependencies:
     prettier "^1.18.2 || ^2.0.0"
 
-"@vue/devtools-api@^6.0.0-beta.11":
-  version "6.0.0-beta.21.1"
-  resolved "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.0.0-beta.21.1.tgz"
-  integrity sha512-FqC4s3pm35qGVeXRGOjTsRzlkJjrBLriDS9YXbflHLsfA9FrcKzIyWnLXoNm+/7930E8rRakXuAc2QkC50swAw==
-
-"@vue/devtools-api@^6.1.4":
+"@vue/devtools-api@^6.0.0-beta.11", "@vue/devtools-api@^6.1.4":
   version "6.2.0"
   resolved "https://registry.npmmirror.com/@vue/devtools-api/-/devtools-api-6.2.0.tgz"
   integrity sha512-pF1G4wky+hkifDiZSWn8xfuLOJI1ZXtuambpBEYaf7Xaf6zC/pM29rvAGpd3qaGXnr4BAXU1Pxz/VfvBGwexGA==
@@ -4506,13 +4389,6 @@ binary-extensions@^2.2.0:
   resolved "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz"
   integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
 
-bindings@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz"
-  integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==
-  dependencies:
-    file-uri-to-path "1.0.0"
-
 bl@^4.1.0:
   version "4.1.0"
   resolved "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz"
@@ -4641,7 +4517,7 @@ braces@^2.3.1, braces@^2.3.2:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
-braces@^3.0.1, braces@^3.0.2, braces@~3.0.2:
+braces@^3.0.2, braces@~3.0.2:
   version "3.0.2"
   resolved "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"
   integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
@@ -5247,7 +5123,7 @@ color-name@~1.1.4:
 color-name@1.1.3:
   version "1.1.3"
   resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"
-  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
+  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
 
 color-support@^1.1.3:
   version "1.1.3"
@@ -5259,12 +5135,7 @@ colord@^2.9.1:
   resolved "https://registry.npmjs.org/colord/-/colord-2.9.2.tgz"
   integrity sha512-Uqbg+J445nc1TKn4FoDPS6ZZqAvEDnwrH42yo8B40JSOgSLxMZ/gt3h4nmCtPLQeXhjJJkqBx7SCY35WnIixaQ==
 
-colorette@^2.0.10, colorette@^2.0.16:
-  version "2.0.16"
-  resolved "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz"
-  integrity sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==
-
-colorette@^2.0.17:
+colorette@^2.0.10, colorette@^2.0.16, colorette@^2.0.17:
   version "2.0.19"
   resolved "https://registry.npmmirror.com/colorette/-/colorette-2.0.19.tgz"
   integrity sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==
@@ -5284,7 +5155,12 @@ combined-stream@^1.0.8:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@*, commander@^2.20.0, commander@2:
+commander@*, commander@^8.3.0:
+  version "8.3.0"
+  resolved "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz"
+  integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
+
+commander@^2.20.0:
   version "2.20.3"
   resolved "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
@@ -5294,11 +5170,6 @@ commander@^7.2.0:
   resolved "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz"
   integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
 
-commander@^8.3.0:
-  version "8.3.0"
-  resolved "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz"
-  integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
-
 commander@^9.3.0:
   version "9.3.0"
   resolved "https://registry.npmmirror.com/commander/-/commander-9.3.0.tgz"
@@ -5309,6 +5180,11 @@ commander@~2.19.0:
   resolved "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz"
   integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
 
+commander@2:
+  version "2.20.3"
+  resolved "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz"
+  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
+
 commander@2.17.x:
   version "2.17.1"
   resolved "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz"
@@ -5360,7 +5236,7 @@ compression@^1.7.4, compression@1.7.4:
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
+  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
 concat-stream@^1.5.0:
   version "1.6.2"
@@ -5564,16 +5440,7 @@ cross-spawn@^6.0.0:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-cross-spawn@^7.0.2:
-  version "7.0.3"
-  resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
-  dependencies:
-    path-key "^3.1.0"
-    shebang-command "^2.0.0"
-    which "^2.0.1"
-
-cross-spawn@^7.0.3:
+cross-spawn@^7.0.2, cross-spawn@^7.0.3:
   version "7.0.3"
   resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz"
   integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
@@ -5611,7 +5478,7 @@ css-line-break@^2.1.0:
   dependencies:
     utrie "^1.0.2"
 
-css-loader@^6.5.0:
+css-loader@*, css-loader@^6.5.0:
   version "6.7.1"
   resolved "https://registry.npmmirror.com/css-loader/-/css-loader-6.7.1.tgz"
   integrity sha512-yB5CNFa14MbPJcomwNh3wLThtkZgcNyI2bNMRt8iE5Z8Vwl7f8vQXFAzn2HDOJvtDq2NTZBUGMSUNNyrv3/+cw==
@@ -6402,7 +6269,7 @@ escape-html@^1.0.3, escape-html@~1.0.3:
 escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5, escape-string-regexp@1.0.5:
   version "1.0.5"
   resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
-  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
+  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
 
 escape-string-regexp@^4.0.0:
   version "4.0.0"
@@ -6532,16 +6399,7 @@ eslint-webpack-plugin@^3.1.0:
     text-table "^0.2.0"
     v8-compile-cache "^2.0.3"
 
-espree@^9.3.1:
-  version "9.3.2"
-  resolved "https://registry.npmmirror.com/espree/-/espree-9.3.2.tgz"
-  integrity sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA==
-  dependencies:
-    acorn "^8.7.1"
-    acorn-jsx "^5.3.2"
-    eslint-visitor-keys "^3.3.0"
-
-espree@^9.3.2:
+espree@^9.3.1, espree@^9.3.2:
   version "9.3.2"
   resolved "https://registry.npmmirror.com/espree/-/espree-9.3.2.tgz"
   integrity sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA==
@@ -6871,11 +6729,6 @@ file-saver@^2.0.5:
   resolved "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz"
   integrity sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==
 
-file-uri-to-path@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"
-  integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
-
 fill-range@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz"
@@ -7064,20 +6917,7 @@ fs-write-stream-atomic@^1.0.8:
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
-  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
-
-fsevents@^1.2.7:
-  version "1.2.13"
-  resolved "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz"
-  integrity sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==
-  dependencies:
-    bindings "^1.5.0"
-    nan "^2.12.1"
-
-fsevents@~2.3.2:
-  version "2.3.2"
-  resolved "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz"
-  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
+  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
 function-bind@^1.1.1, function-bind@^1.1.2:
   version "1.1.2"
@@ -7237,7 +7077,7 @@ glob-parent@^3.1.0:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
-glob-parent@^5.1.2, glob-parent@~5.1.2:
+glob-parent@^5.1.2:
   version "5.1.2"
   resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"
   integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
@@ -7251,6 +7091,13 @@ glob-parent@^6.0.1:
   dependencies:
     is-glob "^4.0.3"
 
+glob-parent@~5.1.2:
+  version "5.1.2"
+  resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"
+  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
+  dependencies:
+    is-glob "^4.0.1"
+
 glob-to-regexp@^0.4.1:
   version "0.4.1"
   resolved "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz"
@@ -7382,7 +7229,7 @@ has-flag@^1.0.0:
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"
-  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
+  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==
 
 has-flag@^4.0.0:
   version "4.0.0"
@@ -7820,7 +7667,7 @@ infer-owner@^1.0.4:
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"
-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
+  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
   dependencies:
     once "^1.3.0"
     wrappy "1"
@@ -8027,7 +7874,7 @@ is-extendable@^1.0.1:
 is-extglob@^2.1.0, is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"
-  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
+  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
 
 is-file-esm@^1.0.0:
   version "1.0.0"
@@ -8224,7 +8071,7 @@ isarray@^2.0.5:
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"
-  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
+  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
 isobject@^2.0.0:
   version "2.1.0"
@@ -8240,7 +8087,12 @@ isobject@^2.1.0:
   dependencies:
     isarray "1.0.0"
 
-isobject@^3.0.0, isobject@^3.0.1:
+isobject@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.npmmirror.com/isobject/-/isobject-3.0.1.tgz"
+  integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==
+
+isobject@^3.0.1:
   version "3.0.1"
   resolved "https://registry.npmmirror.com/isobject/-/isobject-3.0.1.tgz"
   integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==
@@ -8617,12 +8469,7 @@ libnpmversion@^4.0.1:
     proc-log "^3.0.0"
     semver "^7.3.7"
 
-lilconfig@^2.0.3:
-  version "2.0.4"
-  resolved "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.4.tgz"
-  integrity sha512-bfTIN7lEsiooCocSISTWXkiWJkRqtL9wYtYy+8EK3Y41qh3mpwPU0ycTOgjdY9ErwXCc8QyrQp82bdL0Xkm9yA==
-
-lilconfig@2.0.5:
+lilconfig@^2.0.3, lilconfig@2.0.5:
   version "2.0.5"
   resolved "https://registry.npmmirror.com/lilconfig/-/lilconfig-2.0.5.tgz"
   integrity sha512-xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg==
@@ -8685,16 +8532,7 @@ loader-utils@^0.2.16:
     json5 "^0.5.0"
     object-assign "^4.0.1"
 
-loader-utils@^1.0.2:
-  version "1.4.0"
-  resolved "https://registry.npmmirror.com/loader-utils/-/loader-utils-1.4.0.tgz"
-  integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==
-  dependencies:
-    big.js "^5.2.2"
-    emojis-list "^3.0.0"
-    json5 "^1.0.1"
-
-loader-utils@^1.1.0:
+loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3:
   version "1.4.0"
   resolved "https://registry.npmmirror.com/loader-utils/-/loader-utils-1.4.0.tgz"
   integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==
@@ -8703,15 +8541,6 @@ loader-utils@^1.1.0:
     emojis-list "^3.0.0"
     json5 "^1.0.1"
 
-loader-utils@^1.2.3:
-  version "1.4.2"
-  resolved "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz"
-  integrity sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==
-  dependencies:
-    big.js "^5.2.2"
-    emojis-list "^3.0.0"
-    json5 "^1.0.1"
-
 loader-utils@^2.0.0:
   version "2.0.2"
   resolved "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.2.tgz"
@@ -9088,15 +8917,7 @@ micromatch@^3.1.10, micromatch@^3.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
-micromatch@^4.0.2, micromatch@^4.0.4:
-  version "4.0.4"
-  resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz"
-  integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
-  dependencies:
-    braces "^3.0.1"
-    picomatch "^2.2.3"
-
-micromatch@^4.0.5:
+micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5:
   version "4.0.5"
   resolved "https://registry.npmmirror.com/micromatch/-/micromatch-4.0.5.tgz"
   integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
@@ -9199,23 +9020,16 @@ minimalistic-crypto-utils@^1.0.1:
   resolved "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz"
   integrity sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==
 
-minimatch@*, minimatch@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimatch@^3.1.1:
+minimatch@*, minimatch@^3.0.4, minimatch@^3.1.2, minimatch@3.1.2:
   version "3.1.2"
-  resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz"
+  resolved "https://registry.npmmirror.com/minimatch/-/minimatch-3.1.2.tgz"
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
   dependencies:
     brace-expansion "^1.1.7"
 
-minimatch@^3.1.2:
+minimatch@^3.1.1:
   version "3.1.2"
-  resolved "https://registry.npmmirror.com/minimatch/-/minimatch-3.1.2.tgz"
+  resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz"
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
   dependencies:
     brace-expansion "^1.1.7"
@@ -9232,13 +9046,6 @@ minimatch@^7.4.3:
   dependencies:
     brace-expansion "^2.0.1"
 
-minimatch@3.1.2:
-  version "3.1.2"
-  resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz"
-  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
-  dependencies:
-    brace-expansion "^1.1.7"
-
 minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6:
   version "1.2.6"
   resolved "https://registry.npmmirror.com/minimist/-/minimist-1.2.6.tgz"
@@ -9487,11 +9294,6 @@ mz@^2.4.0:
     object-assign "^4.0.1"
     thenify-all "^1.0.0"
 
-nan@^2.12.1:
-  version "2.20.0"
-  resolved "https://registry.npmjs.org/nan/-/nan-2.20.0.tgz"
-  integrity sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw==
-
 nanoid@^3.3.4:
   version "3.3.4"
   resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz"
@@ -9887,7 +9689,7 @@ npmlog@^7.0.1:
 nprogress@^0.2.0:
   version "0.2.0"
   resolved "https://registry.npmjs.org/nprogress/-/nprogress-0.2.0.tgz"
-  integrity sha1-y480xTIT2JVyP8urkH6UIq28r7E=
+  integrity sha1-y480xTIT2JVyP8urkH6UIq28r7E= sha512-I19aIingLgR1fmhftnbWWO3dXc0hSxqHQHQb3H8m+K3TnEn/iSeTZZOyvKXWqQESMwuUVnatlCnZdLBZZt2VSA==
 
 nth-check@^2.0.1:
   version "2.0.1"
@@ -10031,7 +9833,7 @@ on-headers@~1.0.2:
 once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.npmjs.org/once/-/once-1.4.0.tgz"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
+  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
   dependencies:
     wrappy "1"
 
@@ -10323,14 +10125,19 @@ path-exists@^4.0.0:
 path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
+  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
 
 path-is-inside@1.0.2:
   version "1.0.2"
   resolved "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz"
   integrity sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w==
 
-path-key@^2.0.0, path-key@^2.0.1:
+path-key@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.npmmirror.com/path-key/-/path-key-2.0.1.tgz"
+  integrity sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==
+
+path-key@^2.0.1:
   version "2.0.1"
   resolved "https://registry.npmmirror.com/path-key/-/path-key-2.0.1.tgz"
   integrity sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==
@@ -10404,7 +10211,7 @@ picocolors@^1.0.0:
   resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz"
   integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
 
-picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3, picomatch@^2.3.1:
+picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
   version "2.3.1"
   resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
@@ -10974,17 +10781,7 @@ pumpify@^1.3.3:
     inherits "^2.0.3"
     pump "^2.0.0"
 
-punycode@^1.2.4:
-  version "1.4.1"
-  resolved "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"
-  integrity sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==
-
-punycode@^1.3.2:
-  version "1.4.1"
-  resolved "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"
-  integrity sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==
-
-punycode@^1.4.1:
+punycode@^1.2.4, punycode@^1.3.2, punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"
   integrity sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==
@@ -11068,7 +10865,12 @@ randomfill@^1.0.3:
     randombytes "^2.0.5"
     safe-buffer "^5.1.0"
 
-range-parser@^1.2.1, range-parser@~1.2.1:
+range-parser@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz"
+  integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
+
+range-parser@~1.2.1:
   version "1.2.1"
   resolved "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz"
   integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
@@ -12036,12 +11838,7 @@ side-channel@^1.0.4, side-channel@^1.0.6:
     get-intrinsic "^1.2.4"
     object-inspect "^1.13.1"
 
-signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3:
-  version "3.0.6"
-  resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz"
-  integrity sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==
-
-signal-exit@^3.0.7:
+signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7:
   version "3.0.7"
   resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz"
   integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
@@ -12207,11 +12004,6 @@ source-map-url@^0.4.0:
   resolved "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz"
   integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==
 
-source-map@^0.5.0:
-  version "0.5.7"
-  resolved "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"
-  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
-
 source-map@^0.5.6:
   version "0.5.7"
   resolved "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"
@@ -12642,7 +12434,7 @@ svg-sprite-loader@^4.1.3:
 svg-tags@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz"
-  integrity sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q=
+  integrity sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q= sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==
 
 svgo@^2.7.0:
   version "2.8.0"
@@ -12820,7 +12612,7 @@ to-arraybuffer@^1.0.0:
 to-fast-properties@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz"
-  integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
+  integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==
 
 to-object-path@^0.3.0:
   version "0.3.0"
@@ -12902,16 +12694,16 @@ treeverse@^3.0.0:
   resolved "https://registry.npmjs.org/treeverse/-/treeverse-3.0.0.tgz"
   integrity sha512-gcANaAnd2QDZFmHFEOF4k7uc1J/6a6z3DJMd/QwEyxLoKGiptJRwid582r7QIsFlFMIZ3SnxfS52S4hm2DHkuQ==
 
-tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.0, tslib@2.3.0:
-  version "2.3.0"
-  resolved "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz"
-  integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==
-
-tslib@^2.6.2:
+tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.0, tslib@^2.6.2:
   version "2.8.1"
   resolved "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz"
   integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==
 
+tslib@2.3.0:
+  version "2.3.0"
+  resolved "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz"
+  integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==
+
 tsml@1.0.1:
   version "1.0.1"
   resolved "https://registry.npmjs.org/tsml/-/tsml-1.0.1.tgz"
@@ -13459,7 +13251,12 @@ vue-cli-plugin-element-plus@^0.0.13:
   resolved "https://registry.npmjs.org/vue-cli-plugin-element-plus/-/vue-cli-plugin-element-plus-0.0.13.tgz"
   integrity sha512-ctG5mynJIyGLFBhS2JpzXmBWT3JRXwzMm5AoANUmBlbZHTruct1xQF2OKM/mfJv6tSfqCcEfgH8rGCAY5ca83Q==
 
-vue-demi@*, vue-demi@^0.13.2:
+vue-demi@*:
+  version "0.13.2"
+  resolved "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.13.2.tgz"
+  integrity sha512-41ukrclEbMddAyP7PvxMSYqnOSzPV6r7GNnyTSKSCNTaz19GehxmTiXyP9kwHSUv2+Dr6hHqiUiF7L1VAw2KdQ==
+
+vue-demi@^0.13.2:
   version "0.13.2"
   resolved "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.13.2.tgz"
   integrity sha512-41ukrclEbMddAyP7PvxMSYqnOSzPV6r7GNnyTSKSCNTaz19GehxmTiXyP9kwHSUv2+Dr6hHqiUiF7L1VAw2KdQ==
@@ -13780,7 +13577,7 @@ webpack-virtual-modules@^0.5.0:
     watchpack "^1.7.4"
     webpack-sources "^1.4.1"
 
-"webpack@^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.0.0", "webpack@^4.0.0 || ^5.0.0", "webpack@^4.1.0 || ^5.0.0-0", "webpack@^4.27.0 || ^5.0.0", "webpack@^4.37.0 || ^5.0.0", webpack@^5.0.0, webpack@^5.1.0, webpack@^5.20.0, webpack@^5.54.0, webpack@^5.73.0, webpack@>=2:
+"webpack@^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.0.0", "webpack@^3.0.0 || ^4.1.0 || ^5.0.0-0", "webpack@^4.0.0 || ^5.0.0", "webpack@^4.1.0 || ^5.0.0-0", "webpack@^4.27.0 || ^5.0.0", "webpack@^4.37.0 || ^5.0.0", webpack@^5.0.0, webpack@^5.1.0, webpack@^5.20.0, webpack@^5.54.0, webpack@^5.73.0, webpack@>=2:
   version "5.73.0"
   resolved "https://registry.npmmirror.com/webpack/-/webpack-5.73.0.tgz"
   integrity sha512-svjudQRPPa0YiOYa2lM/Gacw0r6PvxptHj4FuEKQ2kX05ZLkjbVc5MnPs6its5j7IZljnIqSVo/OsY2X0IpHGA==
@@ -13964,7 +13761,7 @@ wrap-ansi@^8.0.1:
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
+  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
 write-file-atomic@^5.0.0:
   version "5.0.0"