fix: 农事列表

src/api/config.js

@@ -34,5 +34,8 @@ module.exports = {
         "poi",
         "land_check",
         "bbs_my",
+        "farm",
+        "pointByRegionId",
+        "temp_blue_region",
     ]
 }

src/components/common/stepBox.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="step-content" :class="isDone ? `step-4` : `step-${card.orderStatus ? card.orderStatus : card.orderStatus === 0 ? card.orderStatus : card.status}`">
+    <div class="step-content" :class="`step-${orderStatus}`">
         <div class="step-text t-r">专家</div>
         <div class="step-text b-l">农服</div>
         <div class="step-text b-r">农资</div>
@@ -12,17 +12,13 @@
             <div class="step-time time-b-l" v-if="card.updateDate4">
                 {{ formatDate(card.updateDate4) }}
             </div> -->
-        <img class="step-img" :src="require(`@/assets/img/gallery/step-${isDone ? 4 : (card.orderStatus ? card.orderStatus : card.orderStatus === 0 ? card.orderStatus : card.status)}.png`)" />
+        <img class="step-img" :src="require(`@/assets/img/gallery/step-${orderStatus}.png`)" />
     </div>
 </template>
 
 <script setup>
 const props = defineProps({
-    card: {},
-    isDone: {
-        type: Boolean,
-        default: false
-    }
+    orderStatus: {},
 })
 
 // 正则表达式 将日期 YYYY-MM-DD 格式的字符串转换为 MM-DD

src/views/home/album/index.vue

@@ -22,18 +22,16 @@
                                         class="menu-icon"
                                         :src="
                                             require('@/assets/img/gallery/icon-' +
-                                                item.icon +
-                                                (item.statuss === 0 ? '-no' : '') +
-                                                '.png')
+                                                item.icon + '.png')
                                         "
                                     />
                                     <div
                                         :class="[
                                             'menu-name',
                                             {
-                                                noTime: item.status === 0,
-                                                onTime: item.status === 2,
-                                                now: item.status === 1,
+                                                feature: item.execute === 0 ||item.execute === 2,
+                                                onTime:  item.execute === 1,
+                                                now: item.execute === 3,
                                             },
                                         ]"
                                     >
@@ -48,13 +46,13 @@
                             class="done-card section"
                             v-for="(card, cardI) in farmWorkList"
                             :key="cardI"
-                            :class="{ flashing: card.status === 1 && isFlashing }"
+                            :class="{ flashing: card.execute === 3 && isFlashing && cardI === secondLastIndex }"
                         >
                             <div
                                 class="card-dom"
                                 :id="'section' + cardI"
                             ></div>
-                            <div v-if="card.status === 1 && indicatorChartData.content" class="log-wrap">
+                            <div v-if="card.execute === 3 && indicatorChartData.content && cardI === secondLastIndex" class="log-wrap">
                                 <div class="log-box">
                                     <div class="log-title PangMenZhengDao-FONT">
                                         <span>果园日志</span>
@@ -80,10 +78,10 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="card-wrap" :class="{ noCarousel: card.status !== 0, 'done': card.status === 0 }">
+                            <div class="card-wrap" :class="{ noCarousel: (card.execute !== 0 && card.execute !== 2), 'done': (card.execute === 4 || card.execute === 5) }">
                                 <div
                                     class="card-content"
-                                    :class="{ push: card.status === 1, hasBg: card.status === 2 && !card.hasBg }"
+                                    :class="{ push: card.execute === 3, hasBg: (card.execute === 0 || card.execute === 2) && !card.hasBg }"
                                 >
                                     <div
                                         class="card-top"
@@ -95,8 +93,8 @@
                                             <div v-if="card.type === 1" class="status-tag standard">标准农事</div>
                                             <div v-if="card.type === 2" class="status-tag advice">推荐农事</div>
                                             <div v-if="card.type === 0" class="status-tag warning">预警农事</div>
-                                            <!-- 右上角角标 -->
-                                            <div v-if="card.status === 2 && card.execute === 0" class="add-btn">
+                                             <!-- 右上角角标 -->
+                                             <div v-if="card.execute === 0" class="add-btn">
                                                 未触发
                                             </div>
                                             <div
@@ -106,10 +104,10 @@
                                                 未激活
                                             </div>
                                             <div v-if="card.execute === 3" class="add-btn">待执行</div>
-                                            <div v-if="card.status === 0 && card.execute === 4" class="add-btn recheck">
+                                            <div v-if="card.execute === 4" class="add-btn recheck">
                                                 已完成
                                             </div>
-                                            <div v-if="card.status === 0 && card.reCheck === 1" class="add-btn recheck">
+                                            <div v-if="card.execute === 5" class="add-btn recheck">
                                                 已复核
                                             </div>
                                             <div v-if="card.execute === 1" class="add-btn unactive">已失效</div>
@@ -121,7 +119,7 @@
                                                 优<img class="good" src="@/assets/img/weather_index/good.png" />
                                             </div>
                                         </div> -->
-                                        <div v-if="card.status === 0">
+                                        <div v-if="card.execute === 4 || card.execute === 5">
                                             <!-- 已完成 -->
                                             <div class="card-desc">
                                                 <span class="desc-title">服务主体：</span>
@@ -135,7 +133,7 @@
                                                 <span class="desc-title">指导专家：</span>
                                                 <span class="expert-link" @click="toExpert(card.expertName)">
                                                     {{ card.expertName }}
-                                                    <el-icon color="#F0AC37" class="icon" size="12"><Link /></el-icon>
+                                                    <el-icon color="#2199F8" class="icon" size="12"><Link /></el-icon>
                                                 </span>
                                             </div>
                                         </div>
@@ -144,24 +142,20 @@
                                                 <span class="desc-title">触发条件：</span>
                                                 {{ card.condition }}
                                             </div>
-                                            <div class="card-desc">
-                                                <span class="desc-title">农事编号：</span>
-                                                {{ card.code }}
-                                            </div>
-                                            <div v-if="card.status === 2" class="card-desc">
+                                            <div v-if="card.executeDate || card.solarName" class="card-desc">
                                                 <span class="desc-title">推荐时间：</span>
-                                                {{ card.solarName }}
+                                                {{ card.executeDate || card.solarName }}
                                             </div>
-                                            <div v-if="card.status === 1" class="card-desc">
-                                                <span class="desc-title">推荐时间：</span>
-                                                {{ card.executeDate }}
-                                            </div>
-                                            <div v-if="card.status === 0" class="card-desc">
+                                            <div v-if="card.execute === 4" class="card-desc">
                                                 <span class="desc-title">{{
-                                                    card.reCheck ? "复核时间：" : "执行时间："
+                                                    card.execute === 5 ? "复核时间：" : "执行时间："
                                                 }}</span>
                                                 {{ card.executeDate }}
                                             </div>
+                                            <div class="card-desc">
+                                                <span class="desc-title">农事编号：</span>
+                                                {{ card.code }}
+                                            </div>
                                         </div>
                                         <div class="card-desc last-desc">
                                             <span class="desc-title">药物处方：</span>
@@ -187,26 +181,27 @@
                                                 <div class="detail-text">查看详情></div>
                                             </div>
                                         </div>
-                                        <div class="card-link" v-if="card.status === 2" @click.stop="handlePage(card)">
-                                            <img src="@/assets/img/gallery/expert-icon.png" />
+                                        <div class="card-link" v-if="card.execute === 0 || card.execute === 2|| (card.execute === 3 && card.orderStatus === null)" @click.stop="handlePage(card)">
+                                            <!-- <img src="@/assets/img/weather_index/expert-icon.png" /> -->
+                                            <img class="expert-icon" :src="card.expertIcon" />
                                             <div class="expert-name">
                                                 {{ card.expertName
                                                 }}<el-icon size="12" class="icon"><ArrowRightBold /></el-icon>
                                             </div>
                                         </div>
                                         <div class="step-box" v-else>
-                                            <step-box :card="card" :isDone="card.status === 0 && (card.reCheck === 1 || card.execute === 4)" v-if="card.orderStatus || card.status === 0 || card.orderStatus === 0"></step-box>
+                                            <step-box :orderStatus="card.orderStatus" v-if="card.orderStatus || card.orderStatus === 0"></step-box>
                                         </div>
                                     </div>
                                     <chart
-                                        v-if="card.status !== 2 && card.indexChart.length && card.status !== 0"
+                                        v-if="card.execute === 3 && card.indexChart.length"
                                         :key="cardI"
                                         :indexName="card.indexName"
-                                        :type="card.status !== 1 ? 'normal' : 'feature'"
+                                        :type="(card.execute === 2 || card.execute === 0) ? 'feature' : 'normal'"
                                         :chartData="card.indexChart"
                                     ></chart>
 
-                                    <div v-if="card.status === 0 && card.userEvaluation">
+                                    <div v-if="(card.orderStatus === 4 || card.orderStatus === 5) && card.userEvaluation">
                                         <div class="evaluate">
                                             <div class="evaluate-title">用户评价</div>
                                             <div class="comment">
@@ -243,7 +238,7 @@
                                     </div>
                                 </div>
                             </div>
-                            <div v-if="card.status !== 2" :class="['over-img']">
+                            <div v-if="card.execute !== 0 && card.execute !== 2" :class="['over-img']">
                                 <!-- 图片列表 -->
                                 <album-carousel7d
                                     :key="farmName"
@@ -313,7 +308,7 @@ const handleRightScroll = () => {
     activeSection.value = null;
 };
 const debouncedHandleScroll = debounce(handleScroll, 100);
-const debouncedHandleScroll2 = debounce(handleRightScroll, 500);
+const debouncedHandleScroll2 = debounce(handleRightScroll, 501);
 // onMounted(() => {
 //     window.addEventListener("scroll", debouncedHandleScroll);
 //     // myPushChart = echarts.init(chartPushRef.value);
@@ -424,7 +419,7 @@ const initScrollToSection = (index) => {
 const secondLastIndex = ref(-1); // 初始化索引值
 const getSecondLastIndex = (data) => {
     // 过滤出 status 为 2 的项
-    const filteredItems = data.filter((item) => item.status === 1);
+    const filteredItems = data.filter((item) => item.execute === 3);
     // 获取倒数第二项
     if (filteredItems.length >= 1) {
         const secondLastItem = filteredItems[filteredItems.length - 1];
@@ -457,17 +452,12 @@ const startFlashing = () => {
 
 // 显示详情
 const showDetail = (card) => {
-    const pageParams = {
-        activeIndex: activeSection.value,
-        card,
-    };
     // eventBus.emit("detailDialog:showDialog", pageParams);
-    if (card.orderStatus || card.orderStatus === 0) {
-        router.push({ path: "/work_detail", query: { data: JSON.stringify(card), recordId: null } });
-    }
-    if (card.status === 0 && (card.reCheck === 1 || card.execute === 4)) {
+    if (card.orderStatus === 5 || card.orderStatus === 4) {
         // 农事成效
         router.push({ path: "/ns_recrod_effect", query: { data: JSON.stringify(card) } });
+    } else if (card.orderStatus || card.orderStatus === 0) {
+        router.push({ path: "/work_detail", query: { data: JSON.stringify(card), recordId: null } });
     }
 };
 
@@ -689,7 +679,7 @@ function addNsRecord(){
                     box-shadow: 0 2px 4px #ccc;
                     .btn-box {
                         height: 100%;
-                        background: linear-gradient(0deg,#FFFBF2 0%, #FF9500 31% , #FF9500 78%);
+                        background: linear-gradient(0deg,#fce6c0 0%, #FF9500 31% , #FF9500 78%);
                         border-radius: 30px;
                         display: flex;
                         align-items: center;
@@ -756,7 +746,7 @@ function addNsRecord(){
                                 }
                                 &.is-active {
                                     background: transparent;
-                                    color: #F0AC37;
+                                    // color: #F0AC37;
                                     .menu-name {
                                         // color: #666666;
                                     }
@@ -774,8 +764,11 @@ function addNsRecord(){
                     .noTime {
                         // color: #cccccc;
                     }
+                    .feature {
+                        color: rgba(255, 212, 137, 0.6);
+                    }
                     .now {
-                        color: rgba(33, 153, 248, 1);
+                        color: #F0AC37;
                     }
                     .onTime {
                         color: rgba(255, 212, 137, 0.6);
@@ -805,9 +798,9 @@ function addNsRecord(){
                         text-align: center;
                     }
                     .card-wrap {
-                        border: 1px solid #dddddd;
+                        // border: 1px solid #dddddd;
+                        // padding: 8px 8px;
                         border-radius: 8px;
-                        padding: 8px 8px;
                         position: relative;
                         z-index: 1;
                         // margin-top: -20px;

src/views/home/index.vue

@@ -47,7 +47,7 @@
         <div class="list">
           <chart-box name="农事列表" arrow="arrow-left" :class="{'list-wrap': rightIndex===0}">
             <template v-if="rightIndex===0">
-              <!-- <album></album> -->
+              <album></album>
               <!-- <img class="tabs" src="@/assets/images/home/ns-tabs.png" alt="">
               <div class="img-box">
                 <img @click="handleAct(item)" v-for="item in 2" :key="item" :src="require(`@/assets/images/home/0${act<=2&&act==item?item+'-act':item}.png`)" alt="">

src/views/workDetail/components/prescriptionBox.vue

@@ -10,9 +10,8 @@
             <div class="prescription-box">
                 <div class="step-box">
                     <step-box
-                        :card="infoItem"
-                        :isDone="infoItem.status === 0 && (infoItem.reCheck === 1 || infoItem.execute === 4)"
-                        v-if="infoItem.orderStatus || infoItem.status === 0 || infoItem.orderStatus === 0"
+                        :orderStatus="infoItem.orderStatus"
+                        v-if="infoItem.orderStatus || infoItem.orderStatus === 0"
                     ></step-box>
                 </div>
                 <div class="work-info-conetnt">

yarn.lock

@@ -4086,7 +4086,7 @@ ajv@^8.0.0:
 
 ajv@^8.8.0, ajv@^8.8.2:
   version "8.11.0"
-  resolved "https://registry.npmmirror.com/ajv/-/ajv-8.11.0.tgz"
+  resolved "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz"
   integrity sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==
   dependencies:
     fast-deep-equal "^3.1.1"
@@ -4529,13 +4529,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"
@@ -5634,7 +5627,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==
@@ -6594,7 +6587,7 @@ estraverse@^4.1.1:
 
 estraverse@^5.1.0:
   version "5.3.0"
-  resolved "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz"
+  resolved "https://registry.npmmirror.com/estraverse/-/estraverse-5.3.0.tgz"
   integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
 
 estraverse@^5.2.0:
@@ -6894,11 +6887,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"
@@ -7089,19 +7077,6 @@ fs.realpath@^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==
-
 function-bind@^1.1.1, function-bind@^1.1.2:
   version "1.1.2"
   resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz"
@@ -7235,7 +7210,7 @@ get-stream@^6.0.0:
 
 get-stream@^6.0.1:
   version "6.0.1"
-  resolved "https://registry.npmmirror.com/get-stream/-/get-stream-6.0.1.tgz"
+  resolved "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz"
   integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
 
 get-symbol-description@^1.0.2:
@@ -9238,7 +9213,7 @@ minimatch@^3.1.1:
 
 minimatch@^3.1.2:
   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"
@@ -9510,11 +9485,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"
@@ -9558,7 +9528,7 @@ negotiator@^0.6.3:
 
 negotiator@0.6.3:
   version "0.6.3"
-  resolved "https://registry.npmmirror.com/negotiator/-/negotiator-0.6.3.tgz"
+  resolved "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz"
   integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
 
 neo-async@^2.5.0, neo-async@^2.6.1, neo-async@^2.6.2:
@@ -11778,9 +11748,9 @@ schema-utils@^3.1.0:
     ajv-keywords "^3.5.2"
 
 schema-utils@^3.1.1:
-  version "3.3.0"
-  resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz"
-  integrity sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==
+  version "3.1.1"
+  resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz"
+  integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==
   dependencies:
     "@types/json-schema" "^7.0.8"
     ajv "^6.12.5"
@@ -11893,9 +11863,9 @@ serialize-javascript@^4.0.0:
     randombytes "^2.1.0"
 
 serialize-javascript@^6.0.0:
-  version "6.0.2"
-  resolved "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz"
-  integrity sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==
+  version "6.0.0"
+  resolved "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz"
+  integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==
   dependencies:
     randombytes "^2.1.0"
 
@@ -12233,7 +12203,7 @@ source-map-url@^0.4.0:
 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=
+  integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==
 
 source-map@^0.5.6:
   version "0.5.7"
@@ -12452,7 +12422,7 @@ string-width@^2.1.1:
 
 string-width@^5.0.0:
   version "5.1.2"
-  resolved "https://registry.npmmirror.com/string-width/-/string-width-5.1.2.tgz"
+  resolved "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz"
   integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==
   dependencies:
     eastasianwidth "^0.2.0"
@@ -12762,7 +12732,7 @@ text-segmentation@^1.0.3:
 
 text-table@^0.2.0:
   version "0.2.0"
-  resolved "https://registry.npmmirror.com/text-table/-/text-table-0.2.0.tgz"
+  resolved "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"
   integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
 
 text-table@~0.2.0:
@@ -13659,7 +13629,7 @@ wcwidth@^1.0.0:
 
 wcwidth@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmmirror.com/wcwidth/-/wcwidth-1.0.1.tgz"
+  resolved "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz"
   integrity sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==
   dependencies:
     defaults "^1.0.3"
@@ -13803,7 +13773,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==